Merge branch 'main_develop' into switcher_stable

Author: irenelagno

README.md

@@ -33,7 +33,7 @@ Use the following table to verify you have the correct prerequisites to install
 		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
 	<tr>
-		<td>PHP 5.5.x or 5.6.x</td>
+		<td>PHP ~5.5.22 or 5.6.x</td>
 		<td><code>php -v</code></td>
 		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
 	</tr>

app/code/Magento/AdminNotification/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-admin-notification",
     "description": "N/A",
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0",
+        "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-store": "100.0.*",
         "magento/module-backend": "100.0.*",
         "magento/module-media-storage": "100.0.*",

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -7,15 +7,14 @@ Remove,Remove
 "You have %1 new system message","You have %1 new system message"
 "Incoming Message","Incoming Message"
 close,close
-"Read details","Read details"
 Notifications,Notifications
 "The message has been marked as Read.","The message has been marked as Read."
 "We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
 "Please select messages.","Please select messages."
 "A total of %1 record(s) have been marked as Read.","A total of %1 record(s) have been marked as Read."
-"The message has been removed.","The message has been removed."
-"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
 "Total of %1 record(s) have been removed.","Total of %1 record(s) have been removed."
+"We couldn't remove the messages because of an error.","We couldn't remove the messages because of an error."
+"The message has been removed.","The message has been removed."
 "1 Hour","1 Hour"
 "2 Hours","2 Hours"
 "6 Hours","6 Hours"
@@ -26,26 +25,27 @@ major,major
 minor,minor
 notice,notice
 "Wrong message type","Wrong message type"
-"{{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 <a href=""%1"">configuration</a>.","{{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 <a href=""%1"">configuration</a>."
+"Wrong notification ID specified.","Wrong notification ID specified."
+"{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>."
 "One or more of the Cache Types are invalidated: %1. ","One or more of the Cache Types are invalidated: %1. "
 "Please go to <a href=""%1"">Cache Management</a> and refresh cache types.","Please go to <a href=""%1"">Cache Management</a> and refresh cache types."
-"One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details."
+"We were unable to synchronize one or more media files. Please refer to the log file for details.","We were unable to synchronize one or more media files. Please refer to the log file for details."
 "Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
-"Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.","Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider."
-"We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento.","We appreciate our merchants' feedback. Please <a href=""#"" data-mage-init=%1>take our survey</a> and tell us about features you'd like to see in Magento."
+"Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider.","Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider."
 "Close popup","Close popup"
 Close,Close
+"System Messages:","System Messages:"
 "Critical System Messages","Critical System Messages"
 "Major System Messages","Major System Messages"
 "System messages","System messages"
-Notification,Notification
-Cancel,Cancel
-Acknowledge,Acknowledge
-"See All (%1 unread)","See All (%1 unread)"
-Actions,Actions
-Message,Message
+"See All (","See All ("
+" unread)"," unread)"
+"Show Toolbar","Show Toolbar"
+"Show List","Show List"
 "Use HTTPS to Get Feed","Use HTTPS to Get Feed"
 "Update Frequency","Update Frequency"
 "Last Update","Last Update"
 Severity,Severity
 "Date Added","Date Added"
+Message,Message
+Actions,Actions

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0",
+        "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-catalog": "100.0.*",
         "magento/module-catalog-inventory": "100.0.*",
         "magento/module-eav": "100.0.*",

app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv

@@ -0,0 +1,4 @@
+"Please correct the data sent.","Please correct the data sent."
+"Entity type model \'%1\' is not found","Entity type model \'%1\' is not found"
+"Entity type model must be an instance of \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
+"There are no product types available for export","There are no product types available for export"

app/code/Magento/Authorization/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0",
+        "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-backend": "100.0.*",
         "magento/framework": "100.0.*"
     },

app/code/Magento/Authorization/i18n/en_US.csv

@@ -0,0 +1,2 @@
+"We can\'t find the role for the user you wanted.","We can\'t find the role for the user you wanted."
+"Something went wrong while compiling a list of allowed resources. You can find out more in the exceptions log.","Something went wrong while compiling a list of allowed resources. You can find out more in the exceptions log."

app/code/Magento/Authorizenet/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorizenet",
     "description": "N/A",
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0",
+        "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-sales": "100.0.*",
         "magento/module-store": "100.0.*",
         "magento/module-quote": "100.0.*",

app/code/Magento/Authorizenet/i18n/en_US.csv

@@ -1,100 +1,66 @@
-Cancel,Cancel
-"You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding.","You don't have enough on your credit card to pay for this purchase. To complete your purchase, click ""OK"" and add a credit card to use for the balance. Otherwise, you can cancel the purchase and release the partial payment we are holding."
-"Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way.","Your credit card has been declined. You can click OK to add another credit card to complete your purchase. Or you can cancel this credit transaction and pay a different way."
-"We canceled your payment and released any money we were holding.","We canceled your payment and released any money we were holding."
-"You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction.","You can't use any more credit cards for this payment, and you don't have enough to pay for this purchase. Sorry, but we'll have to cancel your transaction."
-"Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents.","Your order has not been placed, because the contents of the shopping cart and/or your address has been changed. Authorized amounts from your previous payment that were left pending are now released. Please go through the checkout process to purchase your cart contents."
-"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.","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."
-"Processed Amount","Processed Amount"
-"Remaining Balance","Remaining Balance"
+"You created the order.","You created the order."
 "Order saving error: %1","Order saving error: %1"
 "Please choose a payment method.","Please choose a payment method."
-"You created the order.","You created the order."
-"Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
-"There was an error canceling transactions. Please contact us or try again later.","There was an error canceling transactions. Please contact us or try again later."
-"We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
-"amount %1","amount %1"
-failed,failed
-successful,successful
+"We can\'t process your order right now. Please try again later.","We can\'t process your order right now. Please try again later."
+"Cannot place order.","Cannot place order."
 "Credit Card: xxxx-%1","Credit Card: xxxx-%1"
-"Authorize.Net Transaction ID %1","Authorize.Net Transaction ID %1"
+"amount %1","amount %1"
+failed.,failed.
+successful.,successful.
+"Authorize.Net Transaction ID %1.","Authorize.Net Transaction ID %1."
 authorize,authorize
 "authorize and capture","authorize and capture"
 capture,capture
 refund,refund
 void,void
-"This is an invalid amount for authorization.","This is an invalid amount for authorization."
-"This is an invalid amount for capture.","This is an invalid amount for capture."
-"This is an invalid amount for refund.","This is an invalid amount for refund."
-"This is an invalid split tenderId ID.","This is an invalid split tenderId ID."
-"Something went wrong while canceling the payment.","Something went wrong while canceling the payment."
-"Something went wrong while authorizing the payment.","Something went wrong while authorizing the payment."
-"Something went wrong while capturing the payment.","Something went wrong while capturing the payment."
-"The shopping cart contents and/or address has been changed.","The shopping cart contents and/or address has been changed."
-"This is an invalid amount for partial authorization.","This is an invalid amount for partial authorization."
-"Parent Authorize.Net transaction (ID %1) expired","Parent Authorize.Net transaction (ID %1) expired"
-"Something went wrong while voiding the payment.","Something went wrong while voiding the payment."
-"Something went wrong while refunding the payment.","Something went wrong while refunding the payment."
-"You have reached the maximum number of credit cards ' 'allowed to be used for the payment.","You have reached the maximum number of credit cards ' 'allowed to be used for the payment."
-"Something went wrong while authorizing the partial payment.","Something went wrong while authorizing the partial payment."
-"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
 "Gateway error: %1","Gateway error: %1"
-"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 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)."
-"Payment updating error.","Payment updating error."
-"Authorize Only","Authorize Only"
-"Authorize and Capture","Authorize and Capture"
+"Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
 "Invalid amount for capture.","Invalid amount for capture."
 "Payment capturing error.","Payment capturing error."
 "Invalid transaction ID.","Invalid transaction ID."
 "Payment voiding error.","Payment voiding error."
 "Invalid amount for refund.","Invalid amount for refund."
 "Payment refunding error.","Payment refunding error."
 "The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
-"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
+"This payment didn\'t work out because we can\'t find this order.","This payment didn\'t work out because we can\'t find this order."
 "There was a payment authorization error.","There was a payment authorization error."
-"This payment was not authorized because the transaction ID field is empty.","This payment was not authorized because the transaction ID field is empty."
-"Amount of %1 approved by payment gateway. Transaction ID: ""%2"".","Amount of %1 approved by payment gateway. Transaction ID: ""%2""."
-"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
+"Please enter a transaction ID to authorize this payment.","Please enter a transaction ID to authorize this payment."
+"Something went wrong: the paid amount doesn\'t match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn\'t match the order amount. Please correct this and try again."
+"Transaction %1 has been approved. Amount %2. Transaction status is ""%3""","Transaction %1 has been approved. Amount %2. Transaction status is ""%3"""
+"Transaction %1 has been voided/declined. Transaction status is ""%2"". Amount %3.","Transaction %1 has been voided/declined. Transaction status is ""%2"". Amount %3."
+"Authorize Only","Authorize Only"
+"Authorize and Capture","Authorize and Capture"
+"Unable to get transaction details. Try again later.","Unable to get transaction details. Try again later."
 "Credit Card Type","Credit Card Type"
 "Credit Card Number","Credit Card Number"
 "Expiration Date","Expiration Date"
 "Card Verification Number","Card Verification Number"
-"Click ""Cancel"" to remove any pending status and release money already processed during this payment.","Click ""Cancel"" to remove any pending status and release money already processed during this payment."
-"Please enter a different credit card number to complete your purchase.","Please enter a different credit card number to complete your purchase."
-"Credit Card %1","Credit Card %1"
-"Credit Card Information","Credit Card Information"
-"--Please Select--","--Please Select--"
-"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
-"What is this?","What is this?"
-"You'll be asked for your payment details before placing an order.","You'll be asked for your payment details before placing an order."
-"To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.","To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel."
-Processing...,Processing...
+"Fraud Detection ","Fraud Detection "
+"FDS Filter Action","FDS Filter Action"
+"AVS Response","AVS Response"
+"Card Code Response","Card Code Response"
+"CAVV Response","CAVV Response"
+"Fraud Filters","Fraud Filters"
+"Place Order","Place Order"
+"Authorize.net Direct Post","Authorize.net Direct Post"
 Enabled,Enabled
-"Sort Order","Sort Order"
+"Payment Action","Payment Action"
 Title,Title
-"3D Secure Card Validation","3D Secure Card Validation"
-"New Order Status","New Order Status"
-"No confirmation","No confirmation"
-Authorize.net,Authorize.net
-"Credit Card Types","Credit Card Types"
-"Credit Card Verification","Credit Card Verification"
-"Email Customer","Email Customer"
 "API Login ID","API Login ID"
-"Merchant's Email","Merchant's Email"
-"Test Mode","Test Mode"
-Debug,Debug
 "Transaction Key","Transaction Key"
-"Payment Action","Payment Action"
+"Merchant MD5","Merchant MD5"
+"New Order Status","New Order Status"
+"Test Mode","Test Mode"
+"Gateway URL","Gateway URL"
+"Transaction Details URL","Transaction Details URL"
 "Accepted Currency","Accepted Currency"
+Debug,Debug
+"Email Customer","Email Customer"
+"Merchant's Email","Merchant's Email"
+"Credit Card Types","Credit Card Types"
+"Credit Card Verification","Credit Card Verification"
 "Payment from Applicable Countries","Payment from Applicable Countries"
 "Payment from Specific Countries","Payment from Specific Countries"
 "Minimum Order Total","Minimum Order Total"
 "Maximum Order Total","Maximum Order Total"
-"Allow Partial Authorization","Allow Partial Authorization"
-"3D Secure","3D Secure"
-"Severe 3D Secure Card Validation","Severe 3D Secure Card Validation"
-"Severe Validation Removes Chargeback Liability on Merchant","Severe Validation Removes Chargeback Liability on Merchant"
-"If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement.","If you leave this empty, we'll use a default value. The custom URL may be provided by CardinalCommerce agreement."
-"Authorize.net Direct Post","Authorize.net Direct Post"
-"Merchant MD5","Merchant MD5"
-"Gateway URL","Gateway URL"
+"Sort Order","Sort Order"

app/code/Magento/Backend/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-backend",
     "description": "N/A",
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0",
+        "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-store": "100.0.*",
         "magento/module-directory": "100.0.*",
         "magento/module-developer": "100.0.*",