Skip to content

Commit

Permalink
Version 0.4.0, More british english: 'Shipping & Handling' vs 'Delive…
Browse files Browse the repository at this point in the history
…ry & Handling', Page_Widget: 'chooser' vs 'selector'
  • Loading branch information
MaWoScha committed Sep 29, 2015
1 parent 8872241 commit 288c9aa
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 10 deletions.
1 change: 1 addition & 0 deletions MagentoConnect.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ <h3>ChangeLog</h3>
<li><strong>0.1.0:</strong> Basisversion, only a Framework.</li>
<li><strong>0.2.0:</strong> Add: csv files (empty).</li>
<li><strong>0.3.0:</strong> Add: language pack from <a href="https://github.com/staempfli/magento-locale-en-gb/">Staempfli</a>.</li>
<li><strong>0.4.0:</strong> More british english: "Shipping & Handling" vs "Delivery & Handling"; "chooser" vs "selector".</li>
</ul>
2 changes: 1 addition & 1 deletion app/code/community/German/LocalePackGb/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<config>
<modules>
<German_LocalePackGb>
<version>0.3.0</version>
<version>0.4.0</version>
<locale>en_GB</locale>
<title>English (Great Britain) Language Pack</title>
<link_git>https://github.com/MaWoScha/German_LocalePack_en_GB</link_git>
Expand Down
10 changes: 10 additions & 0 deletions app/design/adminhtml/default/default/locale/en_GB/translate.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"Are You Sure?","Are you sure?"
"Store","Shop"
"Choose Store","Select Shop"
"Product In Stores","Product in shops"
"Shipping Address","Delivery Address"
"Dashboard","Dashboard"
"Dashboard Control","Dashboard Control"
"=========","== Mage-Connect.csv ======="
"License","Licence"
"License URI","Licence URL"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"Keep your eyes open for our special Back to School items and save A LOT!","Keep your eyes open for our special Back to School items and save A LOT!"
20 changes: 20 additions & 0 deletions app/design/frontend/default/rwd/locale/en_GB/translate.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
"###","- - - - - - - - - - - - - - - - - - - - -"
"###","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"
7 changes: 4 additions & 3 deletions app/locale/en_GB/Mage_Adminhtml.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"Any Store","Any Shop"
"Bestsellers","Best Sellers"
"Both (without and with tax)","Both (without and with VAT)"
"Can not initialize shipment for adding tracking number.","Cannot initialise shipment for adding tracking number."
"Can not initialize shipment for delete tracking number.","Cannot initialise shipment for delete tracking number."
"Can not initialize shipment for adding tracking number.","Cannot initialise delivery for adding tracking number."
"Can not initialize shipment for delete tracking number.","Cannot initialise delivery for delete tracking number."
"Can't delete design change","Cannot delete design change"
"Can't find email address.","Cannot find email address."
"Card Verification Number","Card Verification Number (CVV)"
Expand All @@ -17,7 +17,8 @@
"Catalog Rewrites were refreshed successfully","Catalogue Rewrites were refreshed successfully"
"CatalogInventory Stock Status rebuild error. Please try again later","Catalogue Inventory Stock Status rebuild error. Please try again later"
"CatalogInventory Stock Status was rebuilt successfully","Catalogue Inventory Stock Status was rebuilt successfully"
"Choose Store View","Choose Shop View"
"Choose Store View","Select Shop View"
"Choose an attribute","Select an attribute"
"Coupon Code","Voucher Code"
"Coupons","Vouchers"
"Create New Staging Store View","Create New Staging Shop View"
Expand Down
2 changes: 1 addition & 1 deletion app/locale/en_GB/Mage_Api.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Products will be added/updated to this shop if 'shop' column is blank or missing in the import file.)"
"Add new store view map","Add new shop view map"
"Catalog","Catalogue"
"Choose Store View","Choose Shop View"
"Choose Store View","Select Shop View"
"Create New Staging Store View","Create New Staging Shop View"
"Excl. Tax","Excl. VAT"
"Incl. Tax","Incl. VAT"
Expand Down
1 change: 1 addition & 0 deletions app/locale/en_GB/Mage_Bundle.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"Choose a selection...","Make a choice..."
"Excl. Tax","Excl. VAT"
"Incl. Tax","Incl. VAT"
"Ship Bundle Items","Deliver Bundle Items"
Expand Down
1 change: 1 addition & 0 deletions app/locale/en_GB/Mage_Catalog.csv
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"Catalog, Search","Catalogue, Search"
"Change or Retrieve attribute store view","Change or Retrieve attribute shop view"
"Check items to add to the cart or","Check items to add to the basket or"
"Choose an Option...","Select an option..."
"Comparable on Front-end","Comparable on Frontend"
"Duplicate website, country and state tax found.","Duplicate website, country and state VAT found."
"Flat Catalog module has a limit of %2$d filterable and/or sort able attributes. Currently there are %1$d. Please reduce the number of filterable/sort able attributes in order to use this module.","Flat Catalogue module has a limit of %2$d filterable and/or sort able attributes. Currently there are %1$d. Please reduce the number of filterable/sort able attributes in order to use this module."
Expand Down
1 change: 1 addition & 0 deletions app/locale/en_GB/Mage_Checkout.csv
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"My Cart (%s item)","My Basket (%s item)"
"My Cart (%s items)","My Basket (%s items)"
"My Cart Link","My Basket Link"
"Please choose to register or to checkout as a guest","Please make the choice to register or to checkout as a guest."
"Please enter a valid zip code. For example 90602 or 90602-1234.","Please enter a valid post or zip code. For example AB1 2BA, 90602 or 90602-1234."
"Please select shipping methods for all addresses","Please select delivery methods for all addresses"
"Select Shipping Method","Select Delivery Method"
Expand Down
2 changes: 2 additions & 0 deletions app/locale/en_GB/Mage_Install.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"Before you continue to your store, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more).","Before you continue to your shop, please make a note of your encryption key (Magento uses it to encrypt passwords, credit cards and more)."
"Choose this if you would like to test frontend and backend functionality.","Select this if you would like to test frontend and backend functionality."
"If you are a developer and would like to have the latest public updates, choose this option.","If you are a developer and would like to have the latest public updates, select this option."
"If you are running install wizard over previously downloaded and installed Magento installation, proceed with this method.","If you are running the install wizard over a previously downloaded and installed Magento installation, proceed with this method."
"Localization","Localisation"
"This Url is invalid","This URL is invalid"
Expand Down
1 change: 1 addition & 0 deletions app/locale/en_GB/Mage_Paypal.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"Authorize and Capture","Authorise and Capture"
"Card Verification Number","Card Verification Number (CVV)"
"Change Shipping Address","Change Delivery Address"
"Choose a secure bundled payment solution for your business.","Select a secure bundled payment solution for your business."
"Edit Shopping Cart","Edit Shopping Basket"
"Incl. Tax","Incl. VAT"
"Items in Your Shopping Cart","Items in Your Shopping Basket"
Expand Down
3 changes: 3 additions & 0 deletions app/locale/en_GB/Mage_Sales.csv
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"Invalid qty to ship for item ""%s""","Invalid qty to dispatch for item ""%s"""
"Invoice can not be canceled","Invoice can not be cancelled"
"Items Shipped","Items Dispatched"
"Items to Invoice and Ship","Items to Invoice and Dispatch"
"Items to Ship","Items to Dispatch"
"Move to Shopping Cart","Move to Shopping Basket"
"Multi-address error to show in shopping cart","Multi-address error to show in shopping basket"
Expand Down Expand Up @@ -95,6 +96,8 @@
"Tax Amount","VAT Amount"
"Tax Percent","VAT Percent"
"The item %s (SKU %s) doesn't exist in the catalog anymore","The item %s (SKU %s) does not exist in the catalogue any more"
"The shipment has been sent","The delivery has been dispatched"
"The shipping label has been created.","The despatch label has been created."
"Total Shipping Charges","Total Delivering Charges"
"Total Tax","Total VAT"
"Track all shipment(s)","Track all deliveries"
Expand Down
6 changes: 3 additions & 3 deletions app/locale/en_GB/Mage_Shipping.csv
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"Allow Shipping to multiple addresses","Allow delivery to multiple addresses"
"Duplicate Row #%s (Country ""%s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"")","Duplicate Row #%s (Country ""%s"", County/State ""%s"", Postcode/Zip ""%s"" and Value ""%s"")"
"Free Shipping","Free Delivery"
"Invalid Region/State ""%s"" in the Row #%s","Invalid County/State ""%s"" in the Row #%s"
"Invalid Shipping Price ""%s"" in the Row #%s","Invalid Delivery Price ""%s"" in the Row #%s"
"Invalid Region/State ""%s"" in the Row #%s.","Invalid County/State ""%s"" in the Row #%s."
"Invalid Shipping Price ""%s"" in the Row #%s.","Invalid Delivery Price ""%s"" in the Row #%s."
"Maximum qty allowed for Shipping to multiple addresses","Maximum qty allowed for delivery to multiple addresses"
"Region/State","County/State"
"Ship to Specific countries","Deliver to Specific countries"
"Ship to Specific countries","Deliver to specific countries"
"Ship to applicable countries","Deliver to applicable countries"
"Shipment #","Delivery #"
"Shipped or billed on:","Delivered or billed on:"
Expand Down
3 changes: 2 additions & 1 deletion app/locale/en_GB/Mage_Widget.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"Choose...","Select..."
"Error occurs during loading chooser.","Error occurs during loading selector."
"Non-Anchor Categories","Non anchored categories"
"Open Chooser","Open Selector"
"Open Chooser","Open selector"
2 changes: 1 addition & 1 deletion var/connect/German_LocalePack_en_GB.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Englisches Sprachpaket für Magento Commerce - Sprachversion für Großbritannie
Paquete de idioma inglés para Magento Commerce - Versión para Gran Bretaña</description>
<license>OSL</license>
<license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
<version>0.3.0</version>
<version>0.4.0</version>
<stability>stable</stability>
<notes>Compatible with Magento 1.6.x-1.9.2.x</notes>
<authors>
Expand Down

0 comments on commit 288c9aa

Please sign in to comment.