// Add one word to voucher emails.
Merge pull request #1684 from djfm/1.6

[+] LO : Added Norwegian (Bokmål) installer
// Typo: "Remote payment accepted"
// fowllow up https://github.com/PrestaShop/PrestaShop/pull/1685
// AdminShopController: better strings.
[-] BO : FixBug #PSCFV-11946
Merge pull request #1687 from xBorderie/patch-1

// AdminShopController: better strings.
// AdminStockConfigurationController: capitalize feature name.
Merge pull request #1688 from xBorderie/patch-2

// AdminStockConfigurationController: capitalize feature name.
// AdminSupplyOrdersController: strings updates.
[-] BO : FixBug #PSCSX-1762 - Add more test file
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// customers/list_header.tpl: better strings.
// StockAvailable: typo.
// typo
// AdminImportController: typos.
// FileUploader: typo.
// default-bootstrap/category-count.tpl: simpler strings.
Merge pull request #1689 from xBorderie/patch-5

// AdminSupplyOrdersController: strings updates.
Merge pull request #1690 from xBorderie/patch-1

// customers/list_header.tpl: better strings.