import sql-ledger 2.4.4SQL_LEDGER

27 files changed, 1002 insertions, 1540 deletions

diff --git a/sql-ledger/locale/en_GB/LANGUAGE b/sql-ledger/locale/en_GB/LANGUAGE
index bed69f729..8db503937 100644
--- a/sql-ledger/locale/en_GB/LANGUAGE
+++ b/sql-ledger/locale/en_GB/LANGUAGE
@@ -1 +1 @@
-British English
+English (British)
diff --git a/sql-ledger/locale/en_GB/admin b/sql-ledger/locale/en_GB/admin
index 580d1c6a4..b6fe06e63 100644
--- a/sql-ledger/locale/en_GB/admin
+++ b/sql-ledger/locale/en_GB/admin
@@ -2,17 +2,14 @@ $self{texts} = {
   'Access Control'              => 'Access Control',
   'Accounting'                  => 'Accounting',
   'Add User'                    => 'Add User',
-  'Address'                     => 'Address',
   'Administration'              => 'Administration',
   'Administrator'               => 'Administrator',
   'All Datasets up to date!'    => 'All Datasets up to date!',
+  'Cannot create Lock!'         => 'Cannot create Lock!',
   'Change Admin Password'       => 'Change Admin Password',
   'Change Password'             => 'Change Password',
-  'Character Set'               => 'Character Set',
   'Click on login name to edit!' => 'Click on login name to edit!',
-  'Company'                     => 'Company',
   'Connect to'                  => 'Connect to',
-  'Continue'                    => 'Continue',
   'Create Chart of Accounts'    => 'Create Chart of Accounts',
   'Create Dataset'              => 'Create Dataset',
   'DBI not installed!'          => 'DBI not installed!',
@@ -20,62 +17,45 @@ $self{texts} = {
   'Database Administration'     => 'Database Administration',
   'Database Driver not checked!' => 'Database Driver not checked!',
   'Database User missing!'      => 'Database User missing!',
-  'Dataset'                     => 'Dataset',
   'Dataset missing!'            => 'Dataset missing!',
   'Dataset updated!'            => 'Dataset updated!',
-  'Date Format'                 => 'Date Format',
-  'Delete'                      => 'Delete',
   'Delete Dataset'              => 'Delete Dataset',
   'Directory'                   => 'Directory',
   'Driver'                      => 'Driver',
-  'Dropdown Limit'              => 'Dropdown Limit',
-  'E-mail'                      => 'E-mail',
   'Edit User'                   => 'Edit User',
   'Existing Datasets'           => 'Existing Datasets',
-  'Fax'                         => 'Fax',
   'Host'                        => 'Host',
   'Hostname missing!'           => 'Hostname missing!',
-  'Incorrect Password!'         => 'Incorrect Password!',
-  'Language'                    => 'Language',
   'Leave host and port field empty unless you want to make a remote connection.' => 'Leave host and port field empty unless you want to make a remote connection.',
-  'Login'                       => 'Login',
+  'Lock System'                 => 'Lock System',
+  'Lockfile created!'           => 'Lockfile created!',
+  'Lockfile removed!'           => 'Lockfile removed!',
+  'Login name missing!'         => 'Login name missing!',
   'Multibyte Encoding'          => 'Multibyte Encoding',
-  'Name'                        => 'Name',
   'New Templates'               => 'New Templates',
   'No Database Drivers available!' => 'No Database Drivers available!',
   'No Dataset selected!'        => 'No Dataset selected!',
   'Nothing to delete!'          => 'Nothing to delete!',
-  'Number Format'               => 'Number Format',
   'Oracle Database Administration' => 'Oracle Database Administration',
-  'Password'                    => 'Password',
   'Password changed!'           => 'Password changed!',
   'Pg Database Administration'  => 'Pg Database Administration',
-  'Phone'                       => 'Phone',
+  'PgPP Database Administration' => 'PgPP Database Administration',
   'Port'                        => 'Port',
   'Port missing!'               => 'Port missing!',
-  'Printer'                     => 'Printer',
-  'Save'                        => 'Save',
-  'Select a Dataset to delete and press "Continue"' => 'Select a Dataset to delete and press "Continue"',
   'Setup Templates'             => 'Setup Templates',
-  'Ship via'                    => 'Ship via',
-  'Signature'                   => 'Signature',
-  'Stylesheet'                  => 'Stylesheet',
   'Templates'                   => 'Templates',
   'The following Datasets are not in use and can be deleted' => 'The following Datasets are not in use and can be deleted',
   'The following Datasets need to be updated' => 'The following Datasets need to be updated',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!',
   'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => 'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.',
+  'Unlock System'               => 'Unlock System',
   'Update Dataset'              => 'Update Dataset',
   'Use Templates'               => 'Use Templates',
-  'User'                        => 'User',
   'User deleted!'               => 'User deleted!',
   'User saved!'                 => 'User saved!',
-  'Version'                     => 'Version',
   'You must enter a host and port for local and remote connections!' => 'You must enter a host and port for local and remote connections!',
   'does not exist'              => 'does not exist',
   'is already a member!'        => 'is already a member!',
-  'localhost'                   => 'localhost',
-  'locked!'                     => 'locked!',
   'successfully created!'       => 'successfully created!',
   'successfully deleted!'       => 'successfully deleted!',
   'website'                     => 'website',
@@ -100,12 +80,17 @@ $self{subs} = {
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
   'get_value'                   => 'get_value',
+  'getpassword'                 => 'getpassword',
   'list_users'                  => 'list_users',
+  'lock_system'                 => 'lock_system',
   'login'                       => 'login',
   'login_name'                  => 'login_name',
+  'logout'                      => 'logout',
   'oracle_database_administration' => 'oracle_database_administration',
   'pg_database_administration'  => 'pg_database_administration',
+  'pgpp_database_administration' => 'pgpp_database_administration',
   'save'                        => 'save',
+  'unlock_system'               => 'unlock_system',
   'update_dataset'              => 'update_dataset',
   'add_user'                    => 'add_user',
   'change_admin_password'       => 'change_admin_password',
@@ -114,10 +99,14 @@ $self{subs} = {
   'create_dataset'              => 'create_dataset',
   'delete'                      => 'delete',
   'delete_dataset'              => 'delete_dataset',
+  'lock_system'                 => 'lock_system',
   'login'                       => 'login',
+  'logout'                      => 'logout',
   'oracle_database_administration' => 'oracle_database_administration',
   'pg_database_administration'  => 'pg_database_administration',
+  'pgpp_database_administration' => 'pgpp_database_administration',
   'save'                        => 'save',
+  'unlock_system'               => 'unlock_system',
   'update_dataset'              => 'update_dataset',
 };
 
diff --git a/sql-ledger/locale/en_GB/all b/sql-ledger/locale/en_GB/all
index e45542a0c..80e09f387 100644
--- a/sql-ledger/locale/en_GB/all
+++ b/sql-ledger/locale/en_GB/all
@@ -1,211 +1,316 @@
 # These are all the texts to build the translations files.
-# The file has the form of 'english text'  => 'foreign text',
-# you can add the translation in this file or in the 'missing' file
-# run locales.pl from this directory to rebuild the translation files
+# to build unique strings edit the module files instead
+# this file is just a shortcut to build strings which are the same
 
 $self{texts} = {
+  '>'                           => '',
+  'A'                           => '',
   'AP'                          => 'Purchases',
   'AP Aging'                    => 'Creditor Aging',
+  'AP Outstanding'              => '',
   'AP Transaction'              => 'Purchase Transaction',
   'AP Transactions'             => 'Purchase Transactions',
   'AR'                          => 'Sales',
   'AR Aging'                    => 'Debtor Aging',
+  'AR Outstanding'              => '',
   'AR Transaction'              => 'Sales Transaction',
   'AR Transactions'             => 'Sales Transactions',
   'About'                       => '',
-  'Access Control'              => '',
+  'Above'                       => '',
+  'Access Control'              => 'Access Control',
   'Account'                     => '',
   'Account Number'              => '',
   'Account Number missing!'     => '',
   'Account Type'                => '',
   'Account Type missing!'       => '',
   'Account deleted!'            => '',
+  'Account does not exist!'     => '',
   'Account saved!'              => '',
-  'Accounting'                  => '',
+  'Accounting'                  => 'Accounting',
   'Accounting Menu'             => '',
   'Accounts'                    => '',
+  'Accrual'                     => '',
+  'Activate Audit trails'       => '',
   'Active'                      => '',
   'Add'                         => '',
+  'Add AP Transaction'          => '',
+  'Add AR Transaction'          => '',
   'Add Account'                 => '',
-  'Add Accounts Payables Transaction' => 'Add Purchase Transaction',
-  'Add Accounts Receivables Transaction' => 'Add Sales Transaction',
   'Add Assembly'                => '',
-  'Add Customer'                => '',
+  'Add Business'                => '',
+  'Add Cash Transfer Transaction' => '',
+  'Add Customer'                => 'Add Debtor',
+  'Add Deduction'               => '',
+  'Add Department'              => '',
+  'Add Employee'                => '',
+  'Add Exchange Rate'           => '',
   'Add GIFI'                    => '',
   'Add General Ledger Transaction' => '',
   'Add Group'                   => '',
+  'Add Labor/Overhead'          => '',
+  'Add Language'                => '',
+  'Add POS Invoice'             => '',
   'Add Part'                    => '',
+  'Add Pricegroup'              => '',
   'Add Project'                 => '',
   'Add Purchase Order'          => '',
+  'Add Quotation'               => '',
+  'Add Request for Quotation'   => '',
+  'Add SIC'                     => '',
   'Add Sales Invoice'           => '',
   'Add Sales Order'             => '',
   'Add Service'                 => '',
   'Add Transaction'             => '',
-  'Add User'                    => '',
-  'Add Vendor'                  => '',
-  'Add Vendor Invoice'          => '',
+  'Add User'                    => 'Add User',
+  'Add Vendor'                  => 'Add Creditor',
+  'Add Vendor Invoice'          => 'Add Creditor Invoice',
+  'Add Warehouse'               => '',
   'Address'                     => '',
-  'Administration'              => '',
-  'Administrator'               => '',
+  'Administration'              => 'Administration',
+  'Administrator'               => 'Administrator',
+  'After Deduction'             => '',
   'All'                         => '',
-  'All Datasets up to date!'    => '',
+  'All Accounts'                => '',
+  'All Datasets up to date!'    => 'All Datasets up to date!',
+  'All Items'                   => '',
+  'Allowances'                  => '',
   'Amount'                      => '',
   'Amount Due'                  => '',
-  'Amount does not equal applied!' => '',
   'Amount missing!'             => '',
-  'Applied'                     => '',
   'Apr'                         => '',
   'April'                       => '',
   'Are you sure you want to delete Invoice Number' => '',
   'Are you sure you want to delete Order Number' => '',
+  'Are you sure you want to delete Quotation Number' => '',
   'Are you sure you want to delete Transaction' => '',
+  'Are you sure you want to remove the marked entries from the queue?' => '',
   'Assemblies'                  => '',
   'Assemblies restocked!'       => '',
-  'Assembly Number missing!'    => '',
+  'Assembly'                    => '',
   'Asset'                       => '',
   'Attachment'                  => '',
   'Audit Control'               => '',
+  'Audit trail removed up to'   => '',
+  'Audit trails disabled'       => '',
+  'Audit trails enabled'        => '',
   'Aug'                         => '',
   'August'                      => '',
+  'BIC'                         => '',
   'BOM'                         => '',
   'Backup'                      => '',
   'Backup sent to'              => '',
   'Balance'                     => '',
   'Balance Sheet'               => '',
+  'Based on'                    => '',
+  'Batch Printing'              => '',
   'Bcc'                         => '',
+  'Before Deduction'            => '',
+  'Beginning Balance'           => '',
+  'Below'                       => '',
+  'Billing Address'             => '',
   'Bin'                         => '',
+  'Bin List'                    => '',
+  'Bin Lists'                   => '',
   'Books are open'              => '',
-  'Bought'                      => '',
+  'Break'                       => '',
+  'Business'                    => '',
   'Business Number'             => '',
+  'Business deleted!'           => '',
+  'Business saved!'             => '',
   'C'                           => '',
   'COGS'                        => '',
+  'Cannot create Lock!'         => 'Cannot create Lock!',
   'Cannot delete account!'      => '',
-  'Cannot delete customer!'     => '',
+  'Cannot delete customer!'     => 'Cannot delete debtor!',
   'Cannot delete default account!' => '',
   'Cannot delete invoice!'      => '',
   'Cannot delete item!'         => '',
   'Cannot delete order!'        => '',
+  'Cannot delete quotation!'    => '',
   'Cannot delete transaction!'  => '',
-  'Cannot delete vendor!'       => '',
-  'Cannot have a value in both Debit and Credit!' => '',
-  'Cannot post a transaction without a value!' => '',
+  'Cannot delete vendor!'       => 'Cannot delete creditor',
+  'Cannot post Payment!'        => '',
+  'Cannot post Receipt!'        => '',
   'Cannot post invoice for a closed period!' => '',
   'Cannot post invoice!'        => '',
   'Cannot post payment for a closed period!' => '',
-  'Cannot post payment!'        => '',
   'Cannot post transaction for a closed period!' => '',
   'Cannot post transaction!'    => '',
   'Cannot process payment for a closed period!' => '',
+  'Cannot remove files!'        => '',
   'Cannot save account!'        => '',
+  'Cannot save defaults!'       => '',
   'Cannot save order!'          => '',
   'Cannot save preferences!'    => '',
+  'Cannot save quotation!'      => '',
+  'Cannot set account for more than one of AR, AP or IC' => '',
+  'Cannot set multiple options for' => '',
+  'Cannot set multiple options for Parts Inventory' => '',
+  'Cannot set multiple options for Service Items' => '',
   'Cannot stock assemblies!'    => '',
   'Cash'                        => '',
-  'Cash based'                  => '',
   'Cc'                          => '',
-  'Change Admin Password'       => '',
-  'Change Password'             => '',
+  'Change'                      => '',
+  'Change Admin Password'       => 'Change Admin Password',
+  'Change Password'             => 'Change Password',
   'Character Set'               => '',
   'Chart of Accounts'           => '',
   'Check'                       => 'Cheque',
-  'Check printed!'              => '',
-  'Check printing failed!'      => '',
-  'Cleared Balance'             => '',
-  'Click on login name to edit!' => '',
+  'Check Inventory'             => '',
+  'Checks'                      => 'Cheques',
+  'City'                        => '',
+  'Cleared'                     => '',
+  'Click on login name to edit!' => 'Click on login name to edit!',
   'Close Books up to'           => '',
   'Closed'                      => '',
+  'Code'                        => '',
+  'Code missing!'               => '',
   'Company'                     => '',
+  'Company Name'                => '',
   'Compare to'                  => '',
+  'Components'                  => '',
+  'Confirm'                     => '',
   'Confirm!'                    => '',
-  'Connect to'                  => '',
+  'Connect to'                  => 'Connect to',
   'Contact'                     => '',
   'Continue'                    => '',
+  'Contra'                      => '',
   'Copies'                      => '',
   'Copy to COA'                 => '',
-  'Create Chart of Accounts'    => '',
-  'Create Dataset'              => '',
+  'Cost'                        => '',
+  'Cost Center'                 => '',
+  'Could not save pricelist!'   => '',
+  'Could not save!'             => '',
+  'Could not transfer Inventory!' => '',
+  'Country'                     => '',
+  'Create Chart of Accounts'    => 'Create Chart of Accounts',
+  'Create Dataset'              => 'Create Dataset',
   'Credit'                      => '',
   'Credit Limit'                => '',
   'Curr'                        => '',
   'Currency'                    => '',
   'Current'                     => '',
-  'Customer'                    => '',
-  'Customer deleted!'           => '',
-  'Customer missing!'           => '',
-  'Customer not on file!'       => '',
-  'Customer saved!'             => '',
-  'Customers'                   => '',
-  'DBI not installed!'          => '',
-  'Database'                    => '',
-  'Database Administration'     => '',
-  'Database Driver not checked!' => '',
+  'Current Earnings'            => '',
+  'Customer'                    => 'Debtor',
+  'Customer History'            => '',
+  'Customer Number'             => 'Debtor Number',
+  'Customer deleted!'           => 'Debtor deleted!',
+  'Customer missing!'           => 'Debtor missing!',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Customer saved!'             => 'Debtor saved!',
+  'Customers'                   => 'Debtors',
+  'DBI not installed!'          => 'DBI not installed!',
+  'DOB'                         => '',
+  'Database'                    => 'Database',
+  'Database Administration'     => 'Database Administration',
+  'Database Driver not checked!' => 'Database Driver not checked!',
   'Database Host'               => '',
-  'Database User missing!'      => '',
+  'Database User missing!'      => 'Database User missing!',
   'Dataset'                     => '',
-  'Dataset missing!'            => '',
-  'Dataset updated!'            => '',
+  'Dataset is newer than version!' => '',
+  'Dataset missing!'            => 'Dataset missing!',
+  'Dataset updated!'            => 'Dataset updated!',
   'Date'                        => '',
   'Date Format'                 => '',
   'Date Paid'                   => '',
+  'Date Received'               => '',
   'Date missing!'               => '',
+  'Date received missing!'      => '',
   'Debit'                       => '',
-  'Debit and credit out of balance!' => '',
   'Dec'                         => '',
   'December'                    => '',
   'Decimalplaces'               => '',
+  'Decrease'                    => '',
+  'Deduct after'                => '',
+  'Deduction deleted!'          => '',
+  'Deduction saved!'            => '',
+  'Deductions'                  => '',
+  'Defaults'                    => '',
+  'Defaults saved!'             => '',
   'Delete'                      => '',
   'Delete Account'              => '',
-  'Delete Dataset'              => '',
+  'Delete Dataset'              => 'Delete Dataset',
   'Delivery Date'               => '',
+  'Department'                  => '',
+  'Department deleted!'         => '',
+  'Department saved!'           => '',
+  'Departments'                 => '',
   'Deposit'                     => '',
   'Description'                 => '',
+  'Description Translations'    => '',
+  'Description missing!'        => '',
+  'Detail'                      => '',
   'Difference'                  => '',
-  'Directory'                   => '',
+  'Directory'                   => 'Directory',
   'Discount'                    => '',
   'Done'                        => '',
   'Drawing'                     => '',
-  'Driver'                      => '',
+  'Driver'                      => 'Driver',
   'Dropdown Limit'              => '',
-  'Due'                         => '',
   'Due Date'                    => '',
   'Due Date missing!'           => '',
   'E-mail'                      => '',
   'E-mail Statement to'         => '',
   'E-mail address missing!'     => '',
+  'E-mailed'                    => '',
   'Edit'                        => '',
+  'Edit AP Transaction'         => '',
+  'Edit AR Transaction'         => '',
   'Edit Account'                => '',
-  'Edit Accounts Payables Transaction' => 'Edit Creditor Transaction',
-  'Edit Accounts Receivables Transaction' => 'Edit Debtor Transaction',
   'Edit Assembly'               => '',
-  'Edit Customer'               => '',
+  'Edit Business'               => '',
+  'Edit Cash Transfer Transaction' => '',
+  'Edit Customer'               => 'Edit Debtor',
+  'Edit Deduction'              => '',
+  'Edit Department'             => '',
+  'Edit Description Translations' => '',
+  'Edit Employee'               => '',
   'Edit GIFI'                   => '',
   'Edit General Ledger Transaction' => '',
   'Edit Group'                  => '',
+  'Edit Labor/Overhead'         => '',
+  'Edit Language'               => '',
+  'Edit POS Invoice'            => '',
   'Edit Part'                   => '',
   'Edit Preferences for'        => '',
+  'Edit Pricegroup'             => '',
   'Edit Project'                => '',
   'Edit Purchase Order'         => '',
+  'Edit Quotation'              => '',
+  'Edit Request for Quotation'  => '',
+  'Edit SIC'                    => '',
   'Edit Sales Invoice'          => '',
   'Edit Sales Order'            => '',
   'Edit Service'                => '',
   'Edit Template'               => '',
-  'Edit User'                   => '',
-  'Edit Vendor'                 => '',
-  'Edit Vendor Invoice'         => '',
+  'Edit User'                   => 'Edit User',
+  'Edit Vendor'                 => 'Edit Creditor',
+  'Edit Vendor Invoice'         => 'Edit Creditor Invoice',
+  'Edit Warehouse'              => '',
   'Employee'                    => '',
+  'Employee Name'               => '',
+  'Employee Number'             => '',
+  'Employee deleted!'           => '',
+  'Employee pays'               => '',
+  'Employee saved!'             => '',
+  'Employees'                   => '',
+  'Employer'                    => '',
+  'Employer pays'               => '',
+  'Enddate'                     => '',
   'Enforce transaction reversal for all dates' => '',
   'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' => '',
   'Equity'                      => '',
+  'Excempt age <'               => '',
   'Exch'                        => '',
-  'Exchangerate'                => '',
-  'Exchangerate Difference'     => '',
-  'Exchangerate for payment missing!' => '',
-  'Exchangerate missing!'       => '',
-  'Existing Datasets'           => '',
+  'Exchange Rate'               => '',
+  'Exchange rate for payment missing!' => '',
+  'Exchange rate missing!'      => '',
+  'Existing Datasets'           => 'Existing Datasets',
   'Expense'                     => '',
   'Expense Account'             => '',
   'Expense/Asset'               => '',
   'Extended'                    => '',
+  'FX'                          => '',
   'Fax'                         => '',
   'Feb'                         => '',
   'February'                    => '',
@@ -221,30 +326,40 @@ $self{texts} = {
   'Goods & Services'            => '',
   'Group'                       => '',
   'Group Items'                 => '',
+  'Group Translations'          => '',
   'Group deleted!'              => '',
   'Group missing!'              => '',
   'Group saved!'                => '',
   'Groups'                      => '',
+  'HR'                          => '',
   'HTML Templates'              => '',
   'Heading'                     => '',
-  'Host'                        => '',
-  'Hostname missing!'           => '',
+  'History'                     => '',
+  'Home Phone'                  => '',
+  'Host'                        => 'Host',
+  'Hostname missing!'           => 'Hostname missing!',
+  'IBAN'                        => '',
   'ID'                          => '',
   'Image'                       => '',
   'In-line'                     => '',
+  'Include Exchange Rate Difference' => '',
   'Include in Report'           => '',
   'Include in drop-down menus'  => '',
   'Include this account on the customer/vendor forms to flag customer/vendor as taxable?' => 'Include this account on debtor/creditor forms to set debtor/creditor taxable?',
-  'Income'                      => 'Revenue',
-  'Income Account'              => 'Revenue Account',
+  'Income'                      => '',
+  'Income Account'              => '',
   'Income Statement'            => '',
   'Incorrect Dataset version!'  => '',
   'Incorrect Password!'         => '',
+  'Increase'                    => '',
   'Individual Items'            => '',
+  'Internal Notes'              => '',
   'Inventory'                   => '',
   'Inventory Account'           => '',
   'Inventory quantity must be zero before you can set this assembly obsolete!' => '',
   'Inventory quantity must be zero before you can set this part obsolete!' => '',
+  'Inventory saved!'            => '',
+  'Inventory transferred!'      => '',
   'Invoice'                     => '',
   'Invoice Date'                => '',
   'Invoice Date missing!'       => '',
@@ -252,10 +367,13 @@ $self{texts} = {
   'Invoice Number missing!'     => '',
   'Invoice deleted!'            => '',
   'Invoice posted!'             => '',
+  'Invoice processed!'          => '',
   'Invoices'                    => '',
   'Is this a summary account to record' => '',
+  'Item already on pricelist!'  => '',
   'Item deleted!'               => '',
   'Item not on file!'           => '',
+  'Items'                       => '',
   'Jan'                         => '',
   'January'                     => '',
   'Jul'                         => '',
@@ -263,46 +381,73 @@ $self{texts} = {
   'Jun'                         => '',
   'June'                        => '',
   'LaTeX Templates'             => '',
+  'Labor/Overhead'              => '',
   'Language'                    => '',
-  'Last Cost'                   => '',
-  'Last Invoice Number'         => '',
+  'Language deleted!'           => '',
+  'Language saved!'             => '',
+  'Languages'                   => '',
+  'Languages not defined!'      => '',
   'Last Numbers & Default Accounts' => '',
-  'Last Purchase Order Number'  => '',
-  'Last Sales Order Number'     => '',
-  'Leave host and port field empty unless you want to make a remote connection.' => '',
+  'Leadtime'                    => '',
+  'Leave host and port field empty unless you want to make a remote connection.' => 'Leave host and port field empty unless you want to make a remote connection.',
   'Liability'                   => '',
   'Licensed to'                 => '',
   'Line Total'                  => '',
   'Link'                        => '',
   'Link Accounts'               => '',
+  'List'                        => '',
   'List Accounts'               => '',
+  'List Businesses'             => '',
+  'List Departments'            => '',
   'List GIFI'                   => '',
+  'List Languages'              => '',
   'List Price'                  => '',
+  'List Projects'               => '',
+  'List SIC'                    => '',
   'List Transactions'           => '',
+  'List Warehouses'             => '',
+  'Lock System'                 => 'Lock System',
+  'Lockfile created!'           => 'Lockfile created!',
+  'Lockfile removed!'           => 'Lockfile removed!',
   'Login'                       => '',
+  'Login name missing!'         => 'Login name missing!',
   'Logout'                      => '',
   'Make'                        => '',
+  'Manager'                     => '',
   'Mar'                         => '',
   'March'                       => '',
+  'Marked entries printed!'     => '',
+  'Markup'                      => '',
+  'Maximum'                     => '',
   'May'                         => '',
   'May '                        => '',
+  'Memo'                        => '',
+  'Menu Width'                  => '',
   'Message'                     => '',
+  'Method'                      => '',
   'Microfiche'                  => '',
   'Model'                       => '',
-  'Multibyte Encoding'          => '',
+  'Month'                       => '',
+  'Multibyte Encoding'          => 'Multibyte Encoding',
   'N/A'                         => '',
   'Name'                        => '',
   'Name missing!'               => '',
-  'New Templates'               => '',
+  'New Templates'               => 'New Templates',
   'No'                          => '',
-  'No Database Drivers available!' => '',
-  'No Dataset selected!'        => '',
+  'No Database Drivers available!' => 'No Database Drivers available!',
+  'No Dataset selected!'        => 'No Dataset selected!',
   'No email address for'        => '',
   'No.'                         => '',
+  'Non-taxable'                 => '',
+  'Non-taxable Purchases'       => '',
+  'Non-taxable Sales'           => '',
   'Notes'                       => '',
-  'Nothing applied!'            => '',
+  'Nothing entered!'            => '',
+  'Nothing outstanding for '    => '',
   'Nothing selected!'           => '',
-  'Nothing to delete!'          => '',
+  'Nothing to delete!'          => 'Nothing to delete!',
+  'Nothing to print!'           => '',
+  'Nothing to transfer!'        => '',
   'Nov'                         => '',
   'November'                    => '',
   'Number'                      => '',
@@ -313,9 +458,8 @@ $self{texts} = {
   'Oct'                         => '',
   'October'                     => '',
   'On Hand'                     => '',
-  'On Order'                    => '',
   'Open'                        => '',
-  'Oracle Database Administration' => '',
+  'Oracle Database Administration' => 'Oracle Database Administration',
   'Order'                       => '',
   'Order Date'                  => '',
   'Order Date missing!'         => '',
@@ -323,98 +467,185 @@ $self{texts} = {
   'Order Number'                => '',
   'Order Number missing!'       => '',
   'Order deleted!'              => '',
+  'Order processed!'            => '',
   'Order saved!'                => '',
-  'Ordered'                     => '',
   'Orphaned'                    => '',
+  'Out of balance transaction!' => '',
   'Out of balance!'             => '',
+  'Outstanding'                 => '',
   'PDF'                         => '',
+  'POS'                         => '',
+  'POS Invoice'                 => '',
   'Packing List'                => '',
   'Packing List Date missing!'  => '',
   'Packing List Number missing!' => '',
+  'Packing Lists'               => '',
   'Paid'                        => '',
-  'Paid in full'                => '',
   'Part'                        => '',
-  'Part Number missing!'        => '',
+  'Part Number'                 => '',
+  'Partnumber'                  => '',
   'Parts'                       => '',
   'Parts Inventory'             => '',
   'Password'                    => '',
-  'Password changed!'           => '',
+  'Password changed!'           => 'Password changed!',
+  'Password does not match!'    => '',
+  'Passwords do not match!'     => '',
   'Payables'                    => '',
   'Payment'                     => '',
   'Payment date missing!'       => '',
   'Payment posted!'             => '',
   'Payments'                    => '',
-  'Pg Database Administration'  => '',
+  'Payroll Deduction'           => '',
+  'Period'                      => '',
+  'Pg Database Administration'  => 'Pg Database Administration',
+  'PgPP Database Administration' => 'PgPP Database Administration',
   'Phone'                       => '',
-  'Port'                        => '',
-  'Port missing!'               => '',
+  'Pick List'                   => '',
+  'Pick Lists'                  => '',
+  'Port'                        => 'Port',
+  'Port missing!'               => 'Port missing!',
   'Post'                        => '',
   'Post as new'                 => '',
+  'Posted!'                     => '',
   'Postscript'                  => '',
   'Preferences'                 => '',
   'Preferences saved!'          => '',
+  'Prepayment'                  => '',
   'Price'                       => '',
+  'Pricegroup'                  => '',
+  'Pricegroup deleted!'         => '',
+  'Pricegroup missing!'         => '',
+  'Pricegroup saved!'           => '',
+  'Pricegroups'                 => '',
+  'Pricelist'                   => '',
   'Print'                       => '',
+  'Print and Post'              => '',
+  'Print and Save'              => '',
+  'Printed'                     => '',
   'Printer'                     => '',
+  'Printing ... '               => '',
+  'Profit Center'               => '',
   'Project'                     => '',
+  'Project Description Translations' => '',
   'Project Number'              => '',
   'Project Number missing!'     => '',
+  'Project Transactions'        => '',
   'Project deleted!'            => '',
   'Project not on file!'        => '',
   'Project saved!'              => '',
   'Projects'                    => '',
   'Purchase Order'              => '',
+  'Purchase Order Number'       => '',
   'Purchase Orders'             => '',
   'Qty'                         => '',
+  'Quantity exceeds available units to stock!' => '',
+  'Quarter'                     => '',
+  'Queue'                       => '',
+  'Queued'                      => '',
+  'Quotation'                   => '',
+  'Quotation '                  => '',
+  'Quotation Date'              => '',
+  'Quotation Date missing!'     => '',
+  'Quotation Number'            => '',
+  'Quotation Number missing!'   => '',
+  'Quotation deleted!'          => '',
+  'Quotations'                  => '',
+  'R'                           => '',
+  'RFQ'                         => '',
+  'RFQ '                        => '',
+  'RFQ Number'                  => '',
+  'RFQs'                        => '',
   'ROP'                         => '',
   'Rate'                        => '',
+  'Rate missing!'               => '',
   'Recd'                        => '',
   'Receipt'                     => '',
-  'Receipt printed!'            => '',
-  'Receipt printing failed!'    => '',
+  'Receipt posted!'             => '',
   'Receipts'                    => '',
   'Receivables'                 => '',
+  'Receive'                     => '',
+  'Receive Merchandise'         => '',
   'Reconciliation'              => '',
+  'Reconciliation Report'       => '',
   'Record in'                   => '',
   'Reference'                   => '',
   'Reference missing!'          => '',
   'Remaining'                   => '',
+  'Remove'                      => '',
+  'Remove Audit trails up to'   => '',
+  'Removed spoolfiles!'         => '',
+  'Removing marked entries from queue ...' => '',
   'Report for'                  => '',
   'Reports'                     => '',
+  'Request for Quotation'       => '',
+  'Request for Quotations'      => '',
   'Required by'                 => '',
   'Retained Earnings'           => '',
+  'Role'                        => '',
+  'S'                           => '',
+  'SIC'                         => '',
+  'SIC deleted!'                => '',
+  'SIC saved!'                  => '',
+  'SKU'                         => '',
+  'SSN'                         => '',
+  'Sale'                        => '',
   'Sales'                       => '',
   'Sales Invoice'               => '',
+  'Sales Invoice '              => '',
+  'Sales Invoice Number'        => '',
+  'Sales Invoice.'              => '',
+  'Sales Invoices'              => '',
   'Sales Order'                 => '',
+  'Sales Order Number'          => '',
   'Sales Orders'                => '',
+  'Sales Quotation Number'      => '',
   'Salesperson'                 => '',
   'Save'                        => '',
+  'Save Pricelist'              => '',
   'Save as new'                 => '',
   'Save to File'                => '',
   'Screen'                      => '',
-  'Select a Dataset to delete and press "Continue"' => '',
+  'Search'                      => '',
+  'Select'                      => '',
+  'Select Printer or Queue!'    => '',
   'Select all'                  => '',
   'Select from one of the items below' => '',
   'Select from one of the names below' => '',
   'Select from one of the projects below' => '',
+  'Select payment'              => '',
   'Select postscript or PDF!'   => '',
+  'Select txt, postscript or PDF!' => '',
+  'Sell'                        => '',
   'Sell Price'                  => '',
   'Send by E-Mail'              => '',
   'Sep'                         => '',
   'September'                   => '',
+  'Serial No.'                  => '',
+  'Serial Number'               => '',
   'Service'                     => '',
   'Service Items'               => '',
-  'Service Number missing!'     => '',
   'Services'                    => '',
-  'Setup Templates'             => '',
+  'Session Timeout'             => '',
+  'Session expired!'            => '',
+  'Setup Templates'             => 'Setup Templates',
   'Ship'                        => '',
+  'Ship Merchandise'            => '',
   'Ship to'                     => '',
   'Ship via'                    => '',
+  'Shipping'                    => '',
+  'Shipping Address'            => '',
+  'Shipping Date'               => '',
+  'Shipping Date missing!'      => '',
+  'Shipping Point'              => '',
   'Short'                       => '',
   'Signature'                   => '',
-  'Sold'                        => '',
   'Source'                      => '',
+  'Spoolfile'                   => '',
   'Standard'                    => '',
+  'Standard Industrial Codes'   => '',
+  'Startdate'                   => '',
+  'State'                       => '',
+  'State/Province'              => '',
   'Statement'                   => '',
   'Statement Balance'           => '',
   'Statement sent to'           => '',
@@ -422,78 +653,114 @@ $self{texts} = {
   'Stock'                       => '',
   'Stock Assembly'              => '',
   'Stylesheet'                  => '',
+  'Sub-contract GIFI'           => '',
   'Subject'                     => '',
   'Subtotal'                    => '',
+  'Summary'                     => '',
+  'Supervisor'                  => '',
   'System'                      => '',
+  'System Defaults'             => '',
   'Tax'                         => '',
   'Tax Accounts'                => '',
   'Tax Included'                => '',
+  'Tax Number'                  => '',
+  'Tax Number / SSN'            => '',
   'Tax collected'               => '',
   'Tax paid'                    => '',
   'Taxable'                     => '',
   'Template saved!'             => '',
-  'Templates'                   => '',
-  'Terms: Net'                  => '',
-  'The following Datasets are not in use and can be deleted' => '',
-  'The following Datasets need to be updated' => '',
-  'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => '',
+  'Templates'                   => 'Templates',
+  'Terms'                       => '',
+  'Text Templates'              => '',
+  'The following Datasets are not in use and can be deleted' => 'The following Datasets are not in use and can be deleted',
+  'The following Datasets need to be updated' => 'The following Datasets need to be updated',
+  'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!',
+  'Till'                        => '',
   'To'                          => '',
-  'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => '',
+  'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => 'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.',
   'Top Level'                   => '',
   'Total'                       => '',
+  'Trade Discount'              => '',
+  'Transaction'                 => '',
   'Transaction Date missing!'   => '',
   'Transaction deleted!'        => '',
   'Transaction posted!'         => '',
   'Transaction reversal enforced for all dates' => '',
   'Transaction reversal enforced up to' => '',
   'Transactions'                => '',
-  'Transactions exist, cannot delete customer!' => '',
-  'Transactions exist, cannot delete vendor!' => '',
-  'Transactions exist; cannot delete account!' => '',
+  'Transfer'                    => '',
+  'Transfer Inventory'          => '',
+  'Transfer to'                 => '',
+  'Translation'                 => '',
+  'Translation deleted!'        => '',
+  'Translation not on file!'    => '',
+  'Translations'                => '',
+  'Translations saved!'         => '',
   'Trial Balance'               => '',
+  'Type of Business'            => '',
   'Unit'                        => '',
   'Unit of measure'             => '',
+  'Unlock System'               => 'Unlock System',
   'Update'                      => '',
-  'Update Dataset'              => '',
+  'Update Dataset'              => 'Update Dataset',
   'Updated'                     => '',
-  'Use Templates'               => '',
+  'Upgrading to Version'        => '',
+  'Use Templates'               => 'Use Templates',
   'User'                        => '',
-  'User deleted!'               => '',
-  'User saved!'                 => '',
-  'Vendor'                      => '',
-  'Vendor Invoice'              => '',
-  'Vendor deleted!'             => '',
-  'Vendor missing!'             => '',
-  'Vendor not on file!'         => '',
-  'Vendor saved!'               => '',
-  'Vendors'                     => '',
+  'User deleted!'               => 'User deleted!',
+  'User saved!'                 => 'User saved!',
+  'Valid until'                 => '',
+  'Vendor'                      => 'Creditor',
+  'Vendor History'              => '',
+  'Vendor Invoice'              => 'Creditor Invoice',
+  'Vendor Invoice '             => '',
+  'Vendor Invoice Number'       => '',
+  'Vendor Invoice.'             => '',
+  'Vendor Invoices'             => '',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor deleted!'             => 'Creditor deleted!',
+  'Vendor missing!'             => 'Creditor missing!',
+  'Vendor not on file!'         => 'Creditor not on file!',
+  'Vendor saved!'               => 'Creditor saved!',
+  'Vendors'                     => 'Creditors',
   'Version'                     => '',
+  'Warehouse'                   => '',
+  'Warehouse deleted!'          => '',
+  'Warehouse saved!'            => '',
+  'Warehouses'                  => '',
+  'Warning!'                    => '',
   'Weight'                      => '',
   'Weight Unit'                 => '',
   'What type of item is this?'  => '',
-  'Year End'                    => '',
+  'Work Order'                  => '',
+  'Work Orders'                 => '',
+  'Work Phone'                  => '',
+  'Year'                        => '',
+  'Yearend'                     => '',
+  'Yearend date missing!'       => '',
+  'Yearend posted!'             => '',
+  'Yearend posting failed!'     => '',
   'Yes'                         => '',
-  'You are logged out!'         => '',
+  'You are logged out'          => '',
   'You did not enter a name!'   => '',
-  'You must enter a host and port for local and remote connections!' => '',
+  'You must enter a host and port for local and remote connections!' => 'You must enter a host and port for local and remote connections!',
+  'Zip/Postal Code'             => '',
+  'account cannot be set to any other type of account' => '',
   'as at'                       => '',
-  'collected on sales'          => '',
   'days'                        => '',
-  'does not exist'              => '',
+  'does not exist'              => 'does not exist',
+  'done'                        => '',
   'ea'                          => '',
-  'emailed to'                  => '',
   'for Period'                  => '',
-  'hr'                          => '',
-  'is already a member!'        => '',
+  'is already a member!'        => 'is already a member!',
   'is not a member!'            => '',
   'localhost'                   => '',
   'locked!'                     => '',
-  'paid on purchases'           => '',
-  'sent to printer'             => '',
-  'successfully created!'       => '',
-  'successfully deleted!'       => '',
-  'to'                          => '',
-  'website'                     => '',
+  'posted!'                     => '',
+  'sent'                        => '',
+  'successfully created!'       => 'successfully created!',
+  'successfully deleted!'       => 'successfully deleted!',
+  'website'                     => 'website',
 };
 
 1;
diff --git a/sql-ledger/locale/en_GB/am b/sql-ledger/locale/en_GB/am
index 6e322ca2c..5a5cadc45 100644
--- a/sql-ledger/locale/en_GB/am
+++ b/sql-ledger/locale/en_GB/am
@@ -1,139 +1,94 @@
 $self{texts} = {
   'AP'                          => 'Purchases',
   'AR'                          => 'Sales',
-  'Account'                     => 'Account',
-  'Account Number'              => 'Account Number',
-  'Account Number missing!'     => 'Account Number missing!',
-  'Account Type'                => 'Account Type',
-  'Account Type missing!'       => 'Account Type missing!',
-  'Account deleted!'            => 'Account deleted!',
-  'Account saved!'              => 'Account saved!',
-  'Add Account'                 => 'Add Account',
-  'Add GIFI'                    => 'Add GIFI',
-  'Address'                     => 'Address',
-  'Asset'                       => 'Asset',
-  'Audit Control'               => 'Audit Control',
-  'Backup sent to'              => 'Backup sent to',
-  'Books are open'              => 'Books are open',
-  'Business Number'             => 'Business Number',
-  'COGS'                        => 'COGS',
-  'Cannot delete account!'      => 'Cannot delete account!',
-  'Cannot delete default account!' => 'Cannot delete default account!',
-  'Cannot save account!'        => 'Cannot save account!',
-  'Cannot save preferences!'    => 'Cannot save preferences!',
-  'Character Set'               => 'Character Set',
-  'Chart of Accounts'           => 'Chart of Accounts',
-  'Close Books up to'           => 'Close Books up to',
-  'Company'                     => 'Company',
-  'Continue'                    => 'Continue',
-  'Copy to COA'                 => 'Copy to COA',
-  'Credit'                      => 'Credit',
-  'Date Format'                 => 'Date Format',
-  'Debit'                       => 'Debit',
-  'Delete'                      => 'Delete',
-  'Delete Account'              => 'Delete Account',
-  'Description'                 => 'Description',
-  'Dropdown Limit'              => 'Dropdown Limit',
-  'E-mail'                      => 'E-mail',
-  'Edit'                        => 'Edit',
-  'Edit Account'                => 'Edit Account',
-  'Edit GIFI'                   => 'Edit GIFI',
-  'Edit Preferences for'        => 'Edit Preferences for',
-  'Edit Template'               => 'Edit Template',
-  'Enforce transaction reversal for all dates' => 'Enforce transaction reversal for all dates',
-  'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' => 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies',
-  'Equity'                      => 'Equity',
-  'Expense'                     => 'Expense',
-  'Expense Account'             => 'Expense Account',
-  'Expense/Asset'               => 'Expense/Asset',
-  'Fax'                         => 'Fax',
-  'Foreign Exchange Gain'       => 'Foreign Exchange Gain',
-  'Foreign Exchange Loss'       => 'Foreign Exchange Loss',
-  'GIFI'                        => 'GIFI',
-  'GIFI deleted!'               => 'GIFI deleted!',
-  'GIFI missing!'               => 'GIFI missing!',
-  'GIFI saved!'                 => 'GIFI saved!',
-  'Heading'                     => 'Heading',
-  'Include in drop-down menus'  => 'Include in drop-down menus',
+  'Customer Number'             => 'Debtor Number',
   'Include this account on the customer/vendor forms to flag customer/vendor as taxable?' => 'Include this account on debtor/creditor forms to set debtor/creditor taxable?',
-  'Income'                      => 'Revenue',
-  'Income Account'              => 'Revenue Account',
-  'Inventory'                   => 'Inventory',
-  'Inventory Account'           => 'Inventory Account',
-  'Is this a summary account to record' => 'Is this a summary account to record',
-  'Language'                    => 'Language',
-  'Last Invoice Number'         => 'Last Invoice Number',
-  'Last Numbers & Default Accounts' => 'Last Numbers & Default Accounts',
-  'Last Purchase Order Number'  => 'Last Purchase Order Number',
-  'Last Sales Order Number'     => 'Last Sales Order Number',
-  'Liability'                   => 'Liability',
-  'Link'                        => 'Link',
-  'Name'                        => 'Name',
-  'No'                          => 'No',
-  'No email address for'        => 'No email address for',
-  'Number'                      => 'Number',
-  'Number Format'               => 'Number Format',
-  'Parts Inventory'             => 'Parts Inventory',
-  'Password'                    => 'Password',
-  'Payables'                    => 'Payables',
-  'Payment'                     => 'Payment',
-  'Phone'                       => 'Phone',
-  'Preferences saved!'          => 'Preferences saved!',
-  'Rate'                        => 'Rate',
-  'Receivables'                 => 'Receivables',
-  'Sales'                       => 'Sales',
-  'Save'                        => 'Save',
-  'Service Items'               => 'Service Items',
-  'Ship via'                    => 'Ship via',
-  'Signature'                   => 'Signature',
-  'Stylesheet'                  => 'Stylesheet',
-  'Tax'                         => 'Tax',
-  'Tax Accounts'                => 'Tax Accounts',
-  'Template saved!'             => 'Template saved!',
-  'Transaction reversal enforced for all dates' => 'Transaction reversal enforced for all dates',
-  'Transaction reversal enforced up to' => 'Transaction reversal enforced up to',
-  'Transactions exist; cannot delete account!' => 'Transactions exist; cannot delete account!',
-  'Weight Unit'                 => 'Weight Unit',
-  'Year End'                    => 'Year End',
-  'Yes'                         => 'Yes',
-  'does not exist'              => 'does not exist',
+  'Vendor Number'               => 'Creditor Number',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
+  'account_header'              => 'account_header',
   'add'                         => 'add',
+  'add_account'                 => 'add_account',
+  'add_business'                => 'add_business',
+  'add_department'              => 'add_department',
   'add_gifi'                    => 'add_gifi',
+  'add_language'                => 'add_language',
+  'add_sic'                     => 'add_sic',
+  'add_warehouse'               => 'add_warehouse',
   'audit_control'               => 'audit_control',
   'backup'                      => 'backup',
+  'business_header'             => 'business_header',
+  'company_logo'                => 'company_logo',
   'config'                      => 'config',
   'continue'                    => 'continue',
   'copy_to_coa'                 => 'copy_to_coa',
+  'defaults'                    => 'defaults',
   'delete'                      => 'delete',
   'delete_account'              => 'delete_account',
+  'delete_business'             => 'delete_business',
+  'delete_department'           => 'delete_department',
   'delete_gifi'                 => 'delete_gifi',
+  'delete_language'             => 'delete_language',
+  'delete_sic'                  => 'delete_sic',
+  'delete_warehouse'            => 'delete_warehouse',
+  'department_header'           => 'department_header',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'display_stylesheet'          => 'display_stylesheet',
   'doclose'                     => 'doclose',
   'edit'                        => 'edit',
+  'edit_account'                => 'edit_account',
+  'edit_business'               => 'edit_business',
+  'edit_department'             => 'edit_department',
   'edit_gifi'                   => 'edit_gifi',
+  'edit_language'               => 'edit_language',
+  'edit_sic'                    => 'edit_sic',
   'edit_template'               => 'edit_template',
+  'edit_warehouse'              => 'edit_warehouse',
   'form_footer'                 => 'form_footer',
-  'form_header'                 => 'form_header',
+  'generate_yearend'            => 'generate_yearend',
   'gifi_footer'                 => 'gifi_footer',
   'gifi_header'                 => 'gifi_header',
-  'list'                        => 'list',
+  'language_header'             => 'language_header',
+  'list_account'                => 'list_account',
+  'list_business'               => 'list_business',
+  'list_department'             => 'list_department',
   'list_gifi'                   => 'list_gifi',
+  'list_language'               => 'list_language',
+  'list_sic'                    => 'list_sic',
+  'list_warehouse'              => 'list_warehouse',
+  'menubar'                     => 'menubar',
   'save'                        => 'save',
   'save_account'                => 'save_account',
+  'save_as_new'                 => 'save_as_new',
+  'save_business'               => 'save_business',
+  'save_defaults'               => 'save_defaults',
+  'save_department'             => 'save_department',
   'save_gifi'                   => 'save_gifi',
+  'save_language'               => 'save_language',
   'save_preferences'            => 'save_preferences',
+  'save_sic'                    => 'save_sic',
   'save_template'               => 'save_template',
+  'save_warehouse'              => 'save_warehouse',
+  'section_menu'                => 'section_menu',
+  'sic_header'                  => 'sic_header',
+  'warehouse_header'            => 'warehouse_header',
+  'yearend'                     => 'yearend',
   'add_account'                 => 'add_account',
+  'add_business'                => 'add_business',
+  'add_department'              => 'add_department',
+  'add_language'                => 'add_language',
+  'add_sic'                     => 'add_sic',
+  'add_warehouse'               => 'add_warehouse',
   'continue'                    => 'continue',
   'copy_to_coa'                 => 'copy_to_coa',
   'delete'                      => 'delete',
   'edit'                        => 'edit',
   'edit_account'                => 'edit_account',
   'save'                        => 'save',
+  'save_as_new'                 => 'save_as_new',
 };
 
 1;
diff --git a/sql-ledger/locale/en_GB/ap b/sql-ledger/locale/en_GB/ap
index 4cad8780e..15230d9e7 100644
--- a/sql-ledger/locale/en_GB/ap
+++ b/sql-ledger/locale/en_GB/ap
@@ -1,96 +1,15 @@
 $self{texts} = {
   'AP Transaction'              => 'Purchase Transaction',
   'AP Transactions'             => 'Purchase Transactions',
-  'Account'                     => 'Account',
-  'Add Accounts Payables Transaction' => 'Add Purchase Transaction',
-  'Address'                     => 'Address',
-  'Amount'                      => 'Amount',
-  'Amount Due'                  => 'Amount Due',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Are you sure you want to delete Transaction' => 'Are you sure you want to delete Transaction',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Cannot delete transaction!'  => 'Cannot delete transaction!',
-  'Cannot post payment for a closed period!' => 'Cannot post payment for a closed period!',
-  'Cannot post transaction for a closed period!' => 'Cannot post transaction for a closed period!',
-  'Cannot post transaction!'    => 'Cannot post transaction!',
-  'Closed'                      => 'Closed',
-  'Confirm!'                    => 'Confirm!',
-  'Continue'                    => 'Continue',
-  'Currency'                    => 'Currency',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Date Paid'                   => 'Date Paid',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Description'                 => 'Description',
-  'Due Date'                    => 'Due Date',
-  'Due Date missing!'           => 'Due Date missing!',
-  'Edit Accounts Payables Transaction' => 'Edit Creditor Transaction',
-  'Employee'                    => 'Employee',
-  'Exch'                        => 'Exch',
-  'Exchangerate'                => 'Exchangerate',
-  'Exchangerate for payment missing!' => 'Exchangerate for payment missing!',
-  'Exchangerate missing!'       => 'Exchangerate missing!',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'ID'                          => 'ID',
-  'Include in Report'           => 'Include in Report',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date'                => 'Invoice Date',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number'              => 'Invoice Number',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Open'                        => 'Open',
-  'Order'                       => 'Order',
-  'Order Number'                => 'Order Number',
-  'Paid'                        => 'Paid',
-  'Payment date missing!'       => 'Payment date missing!',
-  'Payments'                    => 'Payments',
-  'Post'                        => 'Post',
-  'Post as new'                 => 'Post as new',
-  'Project'                     => 'Project',
-  'Project not on file!'        => 'Project not on file!',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Source'                      => 'Source',
-  'Subtotal'                    => 'Subtotal',
-  'Tax'                         => 'Tax',
-  'Tax Included'                => 'Tax Included',
-  'Total'                       => 'Total',
-  'Transaction deleted!'        => 'Transaction deleted!',
-  'Transaction posted!'         => 'Transaction posted!',
-  'Update'                      => 'Update',
-  'Vendor'                      => 'Vendor',
-  'Vendor Invoice'              => 'Vendor Invoice',
-  'Vendor missing!'             => 'Vendor missing!',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'Yes'                         => 'Yes',
-  'to'                          => 'to',
+  'Check'                       => 'Cheque',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor'                      => 'Creditor',
+  'Vendor missing!'             => 'Creditor missing!',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'ap_subtotal'                 => 'ap_subtotal',
@@ -101,32 +20,47 @@ $self{subs} = {
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
   'create_links'                => 'create_links',
+  'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'edit'                        => 'edit',
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
   'gl_transaction'              => 'gl_transaction',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
+  'payment_selected'            => 'payment_selected',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'print_check'                 => 'print_check',
+  'print_options'               => 'print_options',
+  'print_receipt'               => 'print_receipt',
+  'print_transaction'           => 'print_transaction',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
   'search'                      => 'search',
+  'section_menu'                => 'section_menu',
   'select_name'                 => 'select_name',
+  'select_payment'              => 'select_payment',
   'select_project'              => 'select_project',
   'update'                      => 'update',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_details'              => 'vendor_details',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
   'purchase_transaction'        => 'ap_transaction',
-  'add_purchase_transaction'    => 'add_accounts_payables_transaction',
+  'add_ap_transaction'          => 'add_ap_transaction',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
-  'edit_creditor_transaction'   => 'edit_accounts_payables_transaction',
+  'edit_ap_transaction'         => 'edit_ap_transaction',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
   'update'                      => 'update',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice.'             => 'vendor_invoice.',
   'yes'                         => 'yes',
 };
 
diff --git a/sql-ledger/locale/en_GB/ar b/sql-ledger/locale/en_GB/ar
index 926d80adc..998695e2d 100644
--- a/sql-ledger/locale/en_GB/ar
+++ b/sql-ledger/locale/en_GB/ar
@@ -1,99 +1,15 @@
 $self{texts} = {
   'AR Transaction'              => 'Sales Transaction',
   'AR Transactions'             => 'Sales Transactions',
-  'Account'                     => 'Account',
-  'Add Accounts Receivables Transaction' => 'Add Sales Transaction',
-  'Address'                     => 'Address',
-  'Amount'                      => 'Amount',
-  'Amount Due'                  => 'Amount Due',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Are you sure you want to delete Transaction' => 'Are you sure you want to delete Transaction',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Cannot delete transaction!'  => 'Cannot delete transaction!',
-  'Cannot post payment for a closed period!' => 'Cannot post payment for a closed period!',
-  'Cannot post transaction for a closed period!' => 'Cannot post transaction for a closed period!',
-  'Cannot post transaction!'    => 'Cannot post transaction!',
-  'Closed'                      => 'Closed',
-  'Confirm!'                    => 'Confirm!',
-  'Continue'                    => 'Continue',
-  'Credit Limit'                => 'Credit Limit',
-  'Currency'                    => 'Currency',
-  'Customer'                    => 'Customer',
-  'Customer missing!'           => 'Customer missing!',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Date Paid'                   => 'Date Paid',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Description'                 => 'Description',
-  'Due Date'                    => 'Due Date',
-  'Due Date missing!'           => 'Due Date missing!',
-  'Edit Accounts Receivables Transaction' => 'Edit Debtor Transaction',
-  'Exch'                        => 'Exch',
-  'Exchangerate'                => 'Exchangerate',
-  'Exchangerate for payment missing!' => 'Exchangerate for payment missing!',
-  'Exchangerate missing!'       => 'Exchangerate missing!',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'ID'                          => 'ID',
-  'Include in Report'           => 'Include in Report',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date'                => 'Invoice Date',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number'              => 'Invoice Number',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Open'                        => 'Open',
-  'Order'                       => 'Order',
-  'Order Number'                => 'Order Number',
-  'Paid'                        => 'Paid',
-  'Payment date missing!'       => 'Payment date missing!',
-  'Payments'                    => 'Payments',
-  'Post'                        => 'Post',
-  'Post as new'                 => 'Post as new',
-  'Project'                     => 'Project',
-  'Project not on file!'        => 'Project not on file!',
-  'Remaining'                   => 'Remaining',
-  'Sales Invoice'               => 'Sales Invoice',
-  'Salesperson'                 => 'Salesperson',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Ship via'                    => 'Ship via',
-  'Source'                      => 'Source',
-  'Subtotal'                    => 'Subtotal',
-  'Tax'                         => 'Tax',
-  'Tax Included'                => 'Tax Included',
-  'Total'                       => 'Total',
-  'Transaction deleted!'        => 'Transaction deleted!',
-  'Transaction posted!'         => 'Transaction posted!',
-  'Update'                      => 'Update',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'Yes'                         => 'Yes',
-  'to'                          => 'to',
+  'Check'                       => 'Cheque',
+  'Customer'                    => 'Debtor',
+  'Customer missing!'           => 'Debtor missing!',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
@@ -104,29 +20,44 @@ $self{subs} = {
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
   'create_links'                => 'create_links',
+  'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'edit'                        => 'edit',
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
   'gl_transaction'              => 'gl_transaction',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
+  'payment_selected'            => 'payment_selected',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'print_check'                 => 'print_check',
+  'print_options'               => 'print_options',
+  'print_receipt'               => 'print_receipt',
+  'print_transaction'           => 'print_transaction',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
   'search'                      => 'search',
+  'section_menu'                => 'section_menu',
   'select_name'                 => 'select_name',
+  'select_payment'              => 'select_payment',
   'select_project'              => 'select_project',
   'update'                      => 'update',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_details'              => 'vendor_details',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
   'sales_transaction'           => 'ar_transaction',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
-  'sales_invoice'               => 'sales_invoice',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'sales_invoice.'              => 'sales_invoice.',
   'update'                      => 'update',
   'yes'                         => 'yes',
 };
diff --git a/sql-ledger/locale/en_GB/arap b/sql-ledger/locale/en_GB/arap
index fe711dd27..df15acb6f 100644
--- a/sql-ledger/locale/en_GB/arap
+++ b/sql-ledger/locale/en_GB/arap
@@ -1,13 +1,6 @@
 $self{texts} = {
-  'Address'                     => 'Address',
-  'Continue'                    => 'Continue',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Description'                 => 'Description',
-  'Number'                      => 'Number',
-  'Project not on file!'        => 'Project not on file!',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Vendor not on file!'         => 'Vendor not on file!',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
@@ -20,10 +13,10 @@ $self{subs} = {
   'gl_transaction'              => 'gl_transaction',
   'name_selected'               => 'name_selected',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
   'select_name'                 => 'select_name',
   'select_project'              => 'select_project',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'continue'                    => 'continue',
 };
 
diff --git a/sql-ledger/locale/en_GB/arapprn b/sql-ledger/locale/en_GB/arapprn
new file mode 100644
index 000000000..c7a734ce8
--- /dev/null
+++ b/sql-ledger/locale/en_GB/arapprn
@@ -0,0 +1,19 @@
+$self{texts} = {
+  'Check'                       => 'Cheque',
+};
+
+$self{subs} = {
+  'customer_details'            => 'customer_details',
+  'payment_selected'            => 'payment_selected',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'print_check'                 => 'print_check',
+  'print_options'               => 'print_options',
+  'print_receipt'               => 'print_receipt',
+  'print_transaction'           => 'print_transaction',
+  'select_payment'              => 'select_payment',
+  'vendor_details'              => 'vendor_details',
+  'continue'                    => 'continue',
+};
+
+1;
diff --git a/sql-ledger/locale/en_GB/bp b/sql-ledger/locale/en_GB/bp
index fa9e3475a..80869fbb1 100644
--- a/sql-ledger/locale/en_GB/bp
+++ b/sql-ledger/locale/en_GB/bp
@@ -1,47 +1,19 @@
 $self{texts} = {
-  'Account'                     => 'Account',
-  'Are you sure you want to remove the marked entries from the queue?' => 'Are you sure you want to remove the marked entries from the queue?',
-  'Cannot remove files!'        => 'Cannot remove files!',
   'Checks'                      => 'Cheques',
-  'Confirm!'                    => 'Confirm!',
-  'Continue'                    => 'Continue',
   'Customer'                    => 'Debtor',
-  'Date'                        => 'Date',
-  'From'                        => 'From',
-  'Invoice'                     => 'Invoice',
-  'Invoice Number'              => 'Invoice Number',
-  'Marked entries printed!'     => 'Marked entries printed!',
-  'Order'                       => 'Order',
-  'Order Number'                => 'Order Number',
-  'Packing Lists'               => 'Packing Lists',
-  'Print'                       => 'Print',
-  'Printing ... '               => 'Printing ... ',
-  'Purchase Orders'             => 'Purchase Orders',
-  'Quotation'                   => 'Quotation',
-  'Quotation Number'            => 'Quotation Number',
-  'Quotations'                  => 'Quotations',
-  'RFQs'                        => 'RFQs',
-  'Receipts'                    => 'Receipts',
-  'Reference'                   => 'Reference',
-  'Remove'                      => 'Remove',
-  'Removed spoolfiles!'         => 'Removed spoolfiles!',
-  'Removing marked entries from queue ...' => 'Removing marked entries from queue ...',
-  'Sales Invoices'              => 'Sales Invoices',
-  'Sales Orders'                => 'Sales Orders',
-  'Select all'                  => 'Select all',
-  'Spoolfile'                   => 'Spoolfile',
-  'To'                          => 'To',
   'Vendor'                      => 'Creditor',
-  'Yes'                         => 'Yes',
-  'done'                        => 'done',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'continue'                    => 'continue',
+  'display'                     => 'display',
   'list_spool'                  => 'list_spool',
+  'menubar'                     => 'menubar',
   'print'                       => 'print',
   'remove'                      => 'remove',
   'search'                      => 'search',
+  'section_menu'                => 'section_menu',
   'select_all'                  => 'select_all',
   'yes'                         => 'yes',
   'continue'                    => 'continue',
diff --git a/sql-ledger/locale/en_GB/ca b/sql-ledger/locale/en_GB/ca
index ed5ddc227..a74fd6c54 100644
--- a/sql-ledger/locale/en_GB/ca
+++ b/sql-ledger/locale/en_GB/ca
@@ -1,42 +1,4 @@
 $self{texts} = {
-  'Account'                     => 'Account',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Balance'                     => 'Balance',
-  'Chart of Accounts'           => 'Chart of Accounts',
-  'Credit'                      => 'Credit',
-  'Date'                        => 'Date',
-  'Debit'                       => 'Debit',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Description'                 => 'Description',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'GIFI'                        => 'GIFI',
-  'Include in Report'           => 'Include in Report',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'List Transactions'           => 'List Transactions',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Reference'                   => 'Reference',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Subtotal'                    => 'Subtotal',
-  'to'                          => 'to',
 };
 
 $self{subs} = {
diff --git a/sql-ledger/locale/en_GB/cp b/sql-ledger/locale/en_GB/cp
index fd0ade6c0..adb3ddcb6 100644
--- a/sql-ledger/locale/en_GB/cp
+++ b/sql-ledger/locale/en_GB/cp
@@ -1,50 +1,14 @@
 $self{texts} = {
-  'Account'                     => 'Account',
-  'Address'                     => 'Address',
-  'Amount'                      => 'Amount',
-  'Amount does not equal applied!' => 'Amount does not equal applied!',
-  'Amount missing!'             => 'Amount missing!',
-  'Applied'                     => 'Applied',
-  'Cannot post payment!'        => 'Cannot post payment!',
-  'Cannot process payment for a closed period!' => 'Cannot process payment for a closed period!',
-  'Check'                       => 'Cheque',
-  'Check printed!'              => 'Check printed!',
-  'Check printing failed!'      => 'Check printing failed!',
-  'Continue'                    => 'Continue',
-  'Currency'                    => 'Currency',
-  'Customer'                    => 'Customer',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Date missing!'               => 'Date missing!',
-  'Description'                 => 'Description',
-  'Due'                         => 'Due',
-  'Exchangerate'                => 'Exchangerate',
-  'From'                        => 'From',
-  'Invoice'                     => 'Invoice',
-  'Invoices'                    => 'Invoices',
-  'Nothing applied!'            => 'Nothing applied!',
-  'Number'                      => 'Number',
-  'Paid in full'                => 'Paid in full',
-  'Payment'                     => 'Payment',
-  'Payment posted!'             => 'Payment posted!',
-  'Post'                        => 'Post',
-  'Print'                       => 'Print',
-  'Printer'                     => 'Printer',
-  'Project not on file!'        => 'Project not on file!',
-  'Receipt'                     => 'Receipt',
-  'Receipt printed!'            => 'Receipt printed!',
-  'Receipt printing failed!'    => 'Receipt printing failed!',
-  'Reference'                   => 'Reference',
-  'Screen'                      => 'Screen',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Update'                      => 'Update',
-  'Vendor'                      => 'Vendor',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'to'                          => 'to',
+  'AP'                          => 'Purchases',
+  'AR'                          => 'Sales',
+  'Customer'                    => 'Debtor',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor'                      => 'Creditor',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
@@ -53,21 +17,24 @@ $self{subs} = {
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
   'customer_details'            => 'customer_details',
+  'display'                     => 'display',
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
   'gl_transaction'              => 'gl_transaction',
   'list_invoices'               => 'list_invoices',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
   'payment'                     => 'payment',
   'post'                        => 'post',
   'print'                       => 'print',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
+  'section_menu'                => 'section_menu',
   'select_name'                 => 'select_name',
   'select_project'              => 'select_project',
   'update'                      => 'update',
   'vendor_details'              => 'vendor_details',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'continue'                    => 'continue',
   'post'                        => 'post',
   'print'                       => 'print',
diff --git a/sql-ledger/locale/en_GB/ct b/sql-ledger/locale/en_GB/ct
index 3daa8f4dc..351e1ac44 100644
--- a/sql-ledger/locale/en_GB/ct
+++ b/sql-ledger/locale/en_GB/ct
@@ -1,71 +1,81 @@
 $self{texts} = {
-  'Add'                         => 'Add',
-  'Address'                     => 'Address',
-  'All'                         => 'All',
-  'Bcc'                         => 'Bcc',
-  'Cannot delete customer!'     => 'Cannot delete customer!',
-  'Cannot delete vendor!'       => 'Cannot delete vendor!',
-  'Cc'                          => 'Cc',
-  'Contact'                     => 'Contact',
-  'Continue'                    => 'Continue',
-  'Credit Limit'                => 'Credit Limit',
-  'Customer deleted!'           => 'Customer deleted!',
-  'Customer saved!'             => 'Customer saved!',
-  'Customers'                   => 'Customers',
-  'Delete'                      => 'Delete',
-  'Discount'                    => 'Discount',
-  'E-mail'                      => 'E-mail',
-  'Edit Customer'               => 'Edit Customer',
-  'Edit Vendor'                 => 'Edit Vendor',
-  'Fax'                         => 'Fax',
-  'Include in Report'           => 'Include in Report',
-  'Invoice'                     => 'Invoice',
-  'Name'                        => 'Name',
-  'Name missing!'               => 'Name missing!',
-  'Notes'                       => 'Notes',
-  'Number'                      => 'Number',
-  'Order'                       => 'Order',
-  'Orphaned'                    => 'Orphaned',
-  'Phone'                       => 'Phone',
-  'Save'                        => 'Save',
-  'Ship to'                     => 'Ship to',
-  'Tax Included'                => 'Tax Included',
-  'Taxable'                     => 'Taxable',
-  'Terms: Net'                  => 'Terms: Net',
-  'Transactions exist, cannot delete customer!' => 'Transactions exist, cannot delete customer!',
-  'Transactions exist, cannot delete vendor!' => 'Transactions exist, cannot delete vendor!',
-  'Vendor deleted!'             => 'Vendor deleted!',
-  'Vendor saved!'               => 'Vendor saved!',
-  'Vendors'                     => 'Vendors',
-  'days'                        => 'days',
+  'AP Transaction'              => 'Purchase Transaction',
+  'AP Transactions'             => 'Purchase Transactions',
+  'AR Transaction'              => 'Sales Transaction',
+  'AR Transactions'             => 'Sales Transactions',
+  'Add Customer'                => 'Add Debtor',
+  'Add Vendor'                  => 'Add Creditor',
+  'Cannot delete customer!'     => 'Cannot delete debtor!',
+  'Cannot delete vendor!'       => 'Cannot delete creditor',
+  'Customer Number'             => 'Debtor Number',
+  'Customer deleted!'           => 'Debtor deleted!',
+  'Customer saved!'             => 'Debtor saved!',
+  'Customers'                   => 'Debtors',
+  'Edit Customer'               => 'Edit Debtor',
+  'Edit Vendor'                 => 'Edit Creditor',
+  'Vendor Invoice'              => 'Creditor Invoice',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor deleted!'             => 'Creditor deleted!',
+  'Vendor saved!'               => 'Creditor saved!',
+  'Vendors'                     => 'Creditors',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
+  'add_customer'                => 'add_customer',
+  'add_transaction'             => 'add_transaction',
+  'add_vendor'                  => 'add_vendor',
+  'ap_transaction'              => 'ap_transaction',
+  'ar_transaction'              => 'ar_transaction',
   'continue'                    => 'continue',
-  'customer_invoice'            => 'customer_invoice',
-  'customer_order'              => 'customer_order',
+  'customer_pricelist'          => 'customer_pricelist',
   'delete'                      => 'delete',
-  'delete_customer'             => 'delete_customer',
-  'delete_vendor'               => 'delete_vendor',
+  'display'                     => 'display',
   'edit'                        => 'edit',
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
-  'invoice'                     => 'invoice',
+  'history'                     => 'history',
+  'include_in_report'           => 'include_in_report',
+  'item_selected'               => 'item_selected',
+  'list_history'                => 'list_history',
   'list_names'                  => 'list_names',
-  'order'                       => 'order',
+  'list_subtotal'               => 'list_subtotal',
+  'menubar'                     => 'menubar',
+  'pricelist'                   => 'pricelist',
+  'pricelist_footer'            => 'pricelist_footer',
+  'pricelist_header'            => 'pricelist_header',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'rfq'                         => 'rfq',
+  'sales_invoice'               => 'sales_invoice',
+  'sales_order'                 => 'sales_order',
   'save'                        => 'save',
-  'save_customer'               => 'save_customer',
-  'save_vendor'                 => 'save_vendor',
+  'save_pricelist'              => 'save_pricelist',
   'search'                      => 'search',
+  'search_name'                 => 'search_name',
+  'section_menu'                => 'section_menu',
+  'select_item'                 => 'select_item',
+  'transactions'                => 'transactions',
+  'update'                      => 'update',
   'vendor_invoice'              => 'vendor_invoice',
-  'vendor_order'                => 'vendor_order',
-  'add'                         => 'add',
+  'vendor_pricelist'            => 'vendor_pricelist',
+  'purchase_transaction'        => 'ap_transaction',
+  'sales_transaction'           => 'ar_transaction',
+  'add_debtor'                  => 'add_customer',
+  'add_creditor'                => 'add_vendor',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
-  'invoice'                     => 'invoice',
-  'order'                       => 'order',
+  'pricelist'                   => 'pricelist',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'rfq'                         => 'rfq',
+  'sales_invoice'               => 'sales_invoice',
+  'sales_order'                 => 'sales_order',
   'save'                        => 'save',
+  'save_pricelist'              => 'save_pricelist',
+  'update'                      => 'update',
+  'creditor_invoice'            => 'vendor_invoice',
 };
 
 1;
diff --git a/sql-ledger/locale/en_GB/gl b/sql-ledger/locale/en_GB/gl
index dae8e86ca..bf5c56336 100644
--- a/sql-ledger/locale/en_GB/gl
+++ b/sql-ledger/locale/en_GB/gl
@@ -1,86 +1,12 @@
 $self{texts} = {
   'AP Transaction'              => 'Purchase Transaction',
   'AR Transaction'              => 'Sales Transaction',
-  'Account'                     => 'Account',
-  'Add General Ledger Transaction' => 'Add General Ledger Transaction',
-  'Address'                     => 'Address',
-  'All'                         => 'All',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Are you sure you want to delete Transaction' => 'Are you sure you want to delete Transaction',
-  'Asset'                       => 'Asset',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Balance'                     => 'Balance',
-  'Cannot delete transaction!'  => 'Cannot delete transaction!',
-  'Cannot have a value in both Debit and Credit!' => 'Cannot have a value in both Debit and Credit!',
-  'Cannot post a transaction without a value!' => 'Cannot post a transaction without a value!',
-  'Cannot post transaction for a closed period!' => 'Cannot post transaction for a closed period!',
-  'Confirm!'                    => 'Confirm!',
-  'Continue'                    => 'Continue',
-  'Credit'                      => 'Credit',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Debit'                       => 'Debit',
-  'Debit and credit out of balance!' => 'Debit and credit out of balance!',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Description'                 => 'Description',
-  'Edit General Ledger Transaction' => 'Edit General Ledger Transaction',
-  'Equity'                      => 'Equity',
-  'Expense'                     => 'Expense',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'GIFI'                        => 'GIFI',
-  'GL Transaction'              => 'GL Transaction',
-  'General Ledger'              => 'General Ledger',
-  'ID'                          => 'ID',
-  'Include in Report'           => 'Include in Report',
-  'Income'                      => 'Revenue',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Liability'                   => 'Liability',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Post'                        => 'Post',
-  'Post as new'                 => 'Post as new',
-  'Project'                     => 'Project',
-  'Project not on file!'        => 'Project not on file!',
-  'Reference'                   => 'Reference',
-  'Reference missing!'          => 'Reference missing!',
-  'Reports'                     => 'Reports',
-  'Sales Invoice'               => 'Sales Invoice',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Source'                      => 'Source',
-  'Subtotal'                    => 'Subtotal',
-  'Transaction Date missing!'   => 'Transaction Date missing!',
-  'Transaction deleted!'        => 'Transaction deleted!',
-  'Transaction posted!'         => 'Transaction posted!',
-  'Update'                      => 'Update',
-  'Vendor Invoice'              => 'Vendor Invoice',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'Yes'                         => 'Yes',
-  'to'                          => 'to',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
@@ -89,24 +15,28 @@ $self{subs} = {
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
+  'display_rows'                => 'display_rows',
   'edit'                        => 'edit',
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
-  'form_row'                    => 'form_row',
   'generate_report'             => 'generate_report',
   'gl_subtotal'                 => 'gl_subtotal',
   'gl_transaction'              => 'gl_transaction',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
   'post'                        => 'post',
+  'post_adjustment'             => 'post_adjustment',
   'post_as_new'                 => 'post_as_new',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
   'search'                      => 'search',
+  'section_menu'                => 'section_menu',
   'select_name'                 => 'select_name',
   'select_project'              => 'select_project',
   'update'                      => 'update',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
   'purchase_transaction'        => 'ap_transaction',
   'sales_transaction'           => 'ar_transaction',
@@ -115,9 +45,9 @@ $self{subs} = {
   'gl_transaction'              => 'gl_transaction',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
-  'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
   'update'                      => 'update',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
 };
 
diff --git a/sql-ledger/locale/en_GB/hr b/sql-ledger/locale/en_GB/hr
new file mode 100644
index 000000000..e24f22bb0
--- /dev/null
+++ b/sql-ledger/locale/en_GB/hr
@@ -0,0 +1,45 @@
+$self{texts} = {
+  'AP'                          => 'Purchases',
+  'Administrator'               => 'Administrator',
+};
+
+$self{subs} = {
+  'acc_menu'                    => 'acc_menu',
+  'add'                         => 'add',
+  'add_deduction'               => 'add_deduction',
+  'add_employee'                => 'add_employee',
+  'continue'                    => 'continue',
+  'deduction_footer'            => 'deduction_footer',
+  'deduction_header'            => 'deduction_header',
+  'deduction_links'             => 'deduction_links',
+  'delete'                      => 'delete',
+  'delete_deduction'            => 'delete_deduction',
+  'delete_employee'             => 'delete_employee',
+  'display'                     => 'display',
+  'edit'                        => 'edit',
+  'employee_footer'             => 'employee_footer',
+  'employee_header'             => 'employee_header',
+  'employee_links'              => 'employee_links',
+  'list_employees'              => 'list_employees',
+  'menubar'                     => 'menubar',
+  'save'                        => 'save',
+  'save_as_new'                 => 'save_as_new',
+  'save_deduction'              => 'save_deduction',
+  'save_employee'               => 'save_employee',
+  'search'                      => 'search',
+  'search_deduction'            => 'search_deduction',
+  'search_employee'             => 'search_employee',
+  'section_menu'                => 'section_menu',
+  'update'                      => 'update',
+  'update_deduction'            => 'update_deduction',
+  'update_employee'             => 'update_employee',
+  'add_deduction'               => 'add_deduction',
+  'add_employee'                => 'add_employee',
+  'continue'                    => 'continue',
+  'delete'                      => 'delete',
+  'save'                        => 'save',
+  'save_as_new'                 => 'save_as_new',
+  'update'                      => 'update',
+};
+
+1;
diff --git a/sql-ledger/locale/en_GB/ic b/sql-ledger/locale/en_GB/ic
index 2e61619ed..387caa850 100644
--- a/sql-ledger/locale/en_GB/ic
+++ b/sql-ledger/locale/en_GB/ic
@@ -1,167 +1,36 @@
 $self{texts} = {
-  'Active'                      => 'Active',
-  'Add'                         => 'Add',
-  'Add Assembly'                => 'Add Assembly',
-  'Add Part'                    => 'Add Part',
-  'Add Purchase Order'          => 'Add Purchase Order',
-  'Add Sales Order'             => 'Add Sales Order',
-  'Add Service'                 => 'Add Service',
-  'Address'                     => 'Address',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Assemblies'                  => 'Assemblies',
-  'Assemblies restocked!'       => 'Assemblies restocked!',
-  'Assembly Number missing!'    => 'Assembly Number missing!',
-  'Attachment'                  => 'Attachment',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'BOM'                         => 'BOM',
-  'Bcc'                         => 'Bcc',
-  'Bin'                         => 'Bin',
-  'Bought'                      => 'Bought',
-  'COGS'                        => 'COGS',
-  'Cannot delete item!'         => 'Cannot delete item!',
-  'Cannot stock assemblies!'    => 'Cannot stock assemblies!',
-  'Cc'                          => 'Cc',
-  'Closed'                      => 'Closed',
-  'Contact'                     => 'Contact',
-  'Continue'                    => 'Continue',
-  'Copies'                      => 'Copies',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Delivery Date'               => 'Delivery Date',
-  'Description'                 => 'Description',
-  'Drawing'                     => 'Drawing',
-  'E-mail'                      => 'E-mail',
-  'E-mail address missing!'     => 'E-mail address missing!',
-  'Edit Assembly'               => 'Edit Assembly',
-  'Edit Part'                   => 'Edit Part',
-  'Edit Service'                => 'Edit Service',
-  'Expense'                     => 'Expense',
-  'Extended'                    => 'Extended',
-  'Fax'                         => 'Fax',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'Group'                       => 'Group',
-  'Group Items'                 => 'Group Items',
-  'Image'                       => 'Image',
-  'In-line'                     => 'In-line',
-  'Include in Report'           => 'Include in Report',
-  'Income'                      => 'Revenue',
-  'Individual Items'            => 'Individual Items',
-  'Inventory'                   => 'Inventory',
-  'Inventory quantity must be zero before you can set this assembly obsolete!' => 'Inventory quantity must be zero before you can set this assembly obsolete!',
-  'Inventory quantity must be zero before you can set this part obsolete!' => 'Inventory quantity must be zero before you can set this part obsolete!',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number'              => 'Invoice Number',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Item deleted!'               => 'Item deleted!',
-  'Item not on file!'           => 'Item not on file!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Last Cost'                   => 'Last Cost',
-  'Line Total'                  => 'Line Total',
-  'Link Accounts'               => 'Link Accounts',
-  'List Price'                  => 'List Price',
-  'Make'                        => 'Make',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Message'                     => 'Message',
-  'Microfiche'                  => 'Microfiche',
-  'Model'                       => 'Model',
-  'Name'                        => 'Name',
-  'No.'                         => 'No.',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Number missing in Row'       => 'Number missing in Row',
-  'Obsolete'                    => 'Obsolete',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'On Hand'                     => 'On Hand',
-  'On Order'                    => 'On Order',
-  'Order'                       => 'Order',
-  'Order Date missing!'         => 'Order Date missing!',
-  'Order Number'                => 'Order Number',
-  'Order Number missing!'       => 'Order Number missing!',
-  'Ordered'                     => 'Ordered',
-  'Orphaned'                    => 'Orphaned',
-  'PDF'                         => 'PDF',
-  'Packing List'                => 'Packing List',
-  'Packing List Date missing!'  => 'Packing List Date missing!',
-  'Packing List Number missing!' => 'Packing List Number missing!',
-  'Part'                        => 'Part',
-  'Part Number missing!'        => 'Part Number missing!',
-  'Parts'                       => 'Parts',
-  'Phone'                       => 'Phone',
-  'Postscript'                  => 'Postscript',
-  'Price'                       => 'Price',
-  'Printer'                     => 'Printer',
-  'Project'                     => 'Project',
-  'Purchase Order'              => 'Purchase Order',
-  'Qty'                         => 'Qty',
-  'ROP'                         => 'ROP',
-  'Recd'                        => 'Recd',
-  'Required by'                 => 'Required by',
-  'Sales'                       => 'Sales',
-  'Sales Order'                 => 'Sales Order',
-  'Save'                        => 'Save',
-  'Save as new'                 => 'Save as new',
-  'Screen'                      => 'Screen',
-  'Select from one of the items below' => 'Select from one of the items below',
-  'Select postscript or PDF!'   => 'Select postscript or PDF!',
-  'Sell Price'                  => 'Sell Price',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Service'                     => 'Service',
-  'Service Number missing!'     => 'Service Number missing!',
-  'Services'                    => 'Services',
-  'Ship'                        => 'Ship',
-  'Ship to'                     => 'Ship to',
-  'Short'                       => 'Short',
-  'Sold'                        => 'Sold',
-  'Stock'                       => 'Stock',
-  'Stock Assembly'              => 'Stock Assembly',
-  'Subject'                     => 'Subject',
-  'Subtotal'                    => 'Subtotal',
-  'Tax'                         => 'Tax',
-  'To'                          => 'To',
-  'Top Level'                   => 'Top Level',
-  'Total'                       => 'Total',
-  'Unit'                        => 'Unit',
-  'Unit of measure'             => 'Unit of measure',
-  'Update'                      => 'Update',
-  'Updated'                     => 'Updated',
-  'Weight'                      => 'Weight',
-  'What type of item is this?'  => 'What type of item is this?',
-  'ea'                          => 'ea',
-  'emailed to'                  => 'emailed to',
-  'hr'                          => 'hr',
-  'sent to printer'             => 'sent to printer',
-  'to'                          => 'to',
+  'Customer'                    => 'Debtor',
+  'Customer Number'             => 'Debtor Number',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor'                      => 'Creditor',
+  'Vendor Invoice'              => 'Creditor Invoice',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
+  'add_assembly'                => 'add_assembly',
+  'add_labor_overhead'          => 'add_labor_overhead',
+  'add_part'                    => 'add_part',
+  'add_service'                 => 'add_service',
   'assembly_row'                => 'assembly_row',
+  'calc_markup'                 => 'calc_markup',
+  'check_customer'              => 'check_customer',
   'check_form'                  => 'check_form',
+  'check_vendor'                => 'check_vendor',
   'continue'                    => 'continue',
+  'create_form'                 => 'create_form',
   'customer_details'            => 'customer_details',
+  'customer_row'                => 'customer_row',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'e_mail'                      => 'e_mail',
   'edit'                        => 'edit',
+  'edit_assemblyitem'           => 'edit_assemblyitem',
   'form_footer'                 => 'form_footer',
   'form_header'                 => 'form_header',
   'generate_report'             => 'generate_report',
@@ -170,26 +39,34 @@ $self{subs} = {
   'link_part'                   => 'link_part',
   'list_assemblies'             => 'list_assemblies',
   'makemodel_row'               => 'makemodel_row',
+  'menubar'                     => 'menubar',
+  'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
-  'order'                       => 'order',
   'parts_subtotal'              => 'parts_subtotal',
   'post_as_new'                 => 'post_as_new',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
   'restock_assemblies'          => 'restock_assemblies',
+  'rfq'                         => 'rfq',
+  'sales_order'                 => 'sales_order',
   'save'                        => 'save',
   'save_as_new'                 => 'save_as_new',
   'search'                      => 'search',
+  'section_menu'                => 'section_menu',
   'select_item'                 => 'select_item',
+  'select_name'                 => 'select_name',
   'send_email'                  => 'send_email',
   'ship_to'                     => 'ship_to',
   'stock_assembly'              => 'stock_assembly',
   'update'                      => 'update',
   'validate_items'              => 'validate_items',
   'vendor_details'              => 'vendor_details',
-  'add'                         => 'add',
+  'vendor_row'                  => 'vendor_row',
   'add_assembly'                => 'add_assembly',
+  'add_labor/overhead'          => 'add_labor/overhead',
   'add_part'                    => 'add_part',
   'add_service'                 => 'add_service',
   'continue'                    => 'continue',
diff --git a/sql-ledger/locale/en_GB/io b/sql-ledger/locale/en_GB/io
index 1deb6dc2c..606f687bf 100644
--- a/sql-ledger/locale/en_GB/io
+++ b/sql-ledger/locale/en_GB/io
@@ -1,90 +1,12 @@
 $self{texts} = {
-  'Add Purchase Order'          => 'Add Purchase Order',
-  'Add Sales Order'             => 'Add Sales Order',
-  'Address'                     => 'Address',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Attachment'                  => 'Attachment',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Bcc'                         => 'Bcc',
-  'Bin'                         => 'Bin',
-  'Cc'                          => 'Cc',
-  'Contact'                     => 'Contact',
-  'Continue'                    => 'Continue',
-  'Copies'                      => 'Copies',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delivery Date'               => 'Delivery Date',
-  'Description'                 => 'Description',
-  'E-mail'                      => 'E-mail',
-  'E-mail address missing!'     => 'E-mail address missing!',
-  'Extended'                    => 'Extended',
-  'Fax'                         => 'Fax',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'Group'                       => 'Group',
-  'Group Items'                 => 'Group Items',
-  'In-line'                     => 'In-line',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Item not on file!'           => 'Item not on file!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Message'                     => 'Message',
-  'Name'                        => 'Name',
-  'No.'                         => 'No.',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Number missing in Row'       => 'Number missing in Row',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Order'                       => 'Order',
-  'Order Date missing!'         => 'Order Date missing!',
-  'Order Number missing!'       => 'Order Number missing!',
-  'PDF'                         => 'PDF',
-  'Packing List'                => 'Packing List',
-  'Packing List Date missing!'  => 'Packing List Date missing!',
-  'Packing List Number missing!' => 'Packing List Number missing!',
-  'Part'                        => 'Part',
-  'Phone'                       => 'Phone',
-  'Postscript'                  => 'Postscript',
-  'Price'                       => 'Price',
-  'Printer'                     => 'Printer',
-  'Project'                     => 'Project',
-  'Purchase Order'              => 'Purchase Order',
-  'Qty'                         => 'Qty',
-  'Recd'                        => 'Recd',
-  'Required by'                 => 'Required by',
-  'Sales Order'                 => 'Sales Order',
-  'Screen'                      => 'Screen',
-  'Select from one of the items below' => 'Select from one of the items below',
-  'Select postscript or PDF!'   => 'Select postscript or PDF!',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Service'                     => 'Service',
-  'Ship'                        => 'Ship',
-  'Ship to'                     => 'Ship to',
-  'Subject'                     => 'Subject',
-  'To'                          => 'To',
-  'Unit'                        => 'Unit',
-  'What type of item is this?'  => 'What type of item is this?',
-  'emailed to'                  => 'emailed to',
-  'sent to printer'             => 'sent to printer',
+  'Customer Number'             => 'Debtor Number',
+  'Vendor Number'               => 'Creditor Number',
 };
 
 $self{subs} = {
+  'calc_markup'                 => 'calc_markup',
   'check_form'                  => 'check_form',
+  'create_form'                 => 'create_form',
   'customer_details'            => 'customer_details',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
@@ -92,11 +14,14 @@ $self{subs} = {
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
   'new_item'                    => 'new_item',
-  'order'                       => 'order',
   'post_as_new'                 => 'post_as_new',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'rfq'                         => 'rfq',
+  'sales_order'                 => 'sales_order',
   'select_item'                 => 'select_item',
   'send_email'                  => 'send_email',
   'ship_to'                     => 'ship_to',
diff --git a/sql-ledger/locale/en_GB/ir b/sql-ledger/locale/en_GB/ir
index a87c72a96..0500910c5 100644
--- a/sql-ledger/locale/en_GB/ir
+++ b/sql-ledger/locale/en_GB/ir
@@ -1,142 +1,29 @@
 $self{texts} = {
-  'Account'                     => 'Account',
-  'Add Purchase Order'          => 'Add Purchase Order',
-  'Add Sales Order'             => 'Add Sales Order',
-  'Add Vendor Invoice'          => 'Add Vendor Invoice',
-  'Address'                     => 'Address',
-  'Amount'                      => 'Amount',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Are you sure you want to delete Invoice Number' => 'Are you sure you want to delete Invoice Number',
-  'Attachment'                  => 'Attachment',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Bcc'                         => 'Bcc',
-  'Bin'                         => 'Bin',
-  'Cannot delete invoice!'      => 'Cannot delete invoice!',
-  'Cannot post invoice for a closed period!' => 'Cannot post invoice for a closed period!',
-  'Cannot post invoice!'        => 'Cannot post invoice!',
-  'Cannot post payment for a closed period!' => 'Cannot post payment for a closed period!',
-  'Cc'                          => 'Cc',
-  'Confirm!'                    => 'Confirm!',
-  'Contact'                     => 'Contact',
-  'Continue'                    => 'Continue',
-  'Copies'                      => 'Copies',
-  'Currency'                    => 'Currency',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Delivery Date'               => 'Delivery Date',
-  'Description'                 => 'Description',
-  'Due Date'                    => 'Due Date',
-  'E-mail'                      => 'E-mail',
-  'E-mail address missing!'     => 'E-mail address missing!',
-  'Edit Vendor Invoice'         => 'Edit Vendor Invoice',
-  'Exch'                        => 'Exch',
-  'Exchangerate'                => 'Exchangerate',
-  'Exchangerate for payment missing!' => 'Exchangerate for payment missing!',
-  'Exchangerate missing!'       => 'Exchangerate missing!',
-  'Extended'                    => 'Extended',
-  'Fax'                         => 'Fax',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'Group'                       => 'Group',
-  'Group Items'                 => 'Group Items',
-  'In-line'                     => 'In-line',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date'                => 'Invoice Date',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number'              => 'Invoice Number',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Invoice deleted!'            => 'Invoice deleted!',
-  'Invoice posted!'             => 'Invoice posted!',
-  'Item not on file!'           => 'Item not on file!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Message'                     => 'Message',
-  'Name'                        => 'Name',
-  'No.'                         => 'No.',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Number missing in Row'       => 'Number missing in Row',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Order'                       => 'Order',
-  'Order Date missing!'         => 'Order Date missing!',
-  'Order Number'                => 'Order Number',
-  'Order Number missing!'       => 'Order Number missing!',
-  'PDF'                         => 'PDF',
-  'Packing List'                => 'Packing List',
-  'Packing List Date missing!'  => 'Packing List Date missing!',
-  'Packing List Number missing!' => 'Packing List Number missing!',
-  'Part'                        => 'Part',
-  'Payment date missing!'       => 'Payment date missing!',
-  'Payments'                    => 'Payments',
-  'Phone'                       => 'Phone',
-  'Post'                        => 'Post',
-  'Post as new'                 => 'Post as new',
-  'Postscript'                  => 'Postscript',
-  'Price'                       => 'Price',
-  'Printer'                     => 'Printer',
-  'Project'                     => 'Project',
-  'Project not on file!'        => 'Project not on file!',
-  'Purchase Order'              => 'Purchase Order',
-  'Qty'                         => 'Qty',
-  'Recd'                        => 'Recd',
-  'Record in'                   => 'Record in',
-  'Required by'                 => 'Required by',
-  'Sales Order'                 => 'Sales Order',
-  'Screen'                      => 'Screen',
-  'Select from one of the items below' => 'Select from one of the items below',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Select postscript or PDF!'   => 'Select postscript or PDF!',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Service'                     => 'Service',
-  'Ship'                        => 'Ship',
-  'Ship to'                     => 'Ship to',
-  'Source'                      => 'Source',
-  'Subject'                     => 'Subject',
-  'Subtotal'                    => 'Subtotal',
-  'Tax Included'                => 'Tax Included',
-  'To'                          => 'To',
-  'Total'                       => 'Total',
-  'Unit'                        => 'Unit',
-  'Update'                      => 'Update',
-  'Vendor'                      => 'Vendor',
-  'Vendor missing!'             => 'Vendor missing!',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'What type of item is this?'  => 'What type of item is this?',
-  'Yes'                         => 'Yes',
-  'ea'                          => 'ea',
-  'emailed to'                  => 'emailed to',
-  'sent to printer'             => 'sent to printer',
+  'Add Vendor Invoice'          => 'Add Creditor Invoice',
+  'Customer Number'             => 'Debtor Number',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Edit Vendor Invoice'         => 'Edit Creditor Invoice',
+  'Vendor'                      => 'Creditor',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor missing!'             => 'Creditor missing!',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
+  'calc_markup'                 => 'calc_markup',
   'check_form'                  => 'check_form',
   'check_name'                  => 'check_name',
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
+  'create_form'                 => 'create_form',
   'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'e_mail'                      => 'e_mail',
@@ -147,9 +34,9 @@ $self{subs} = {
   'invoice_links'               => 'invoice_links',
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
-  'order'                       => 'order',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
   'prepare_invoice'             => 'prepare_invoice',
@@ -157,7 +44,12 @@ $self{subs} = {
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'rfq'                         => 'rfq',
+  'sales_invoice_'              => 'sales_invoice_',
+  'sales_order'                 => 'sales_order',
+  'section_menu'                => 'section_menu',
   'select_item'                 => 'select_item',
   'select_name'                 => 'select_name',
   'select_project'              => 'select_project',
@@ -166,13 +58,13 @@ $self{subs} = {
   'update'                      => 'update',
   'validate_items'              => 'validate_items',
   'vendor_details'              => 'vendor_details',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
-  'order'                       => 'order',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
+  'purchase_order'              => 'purchase_order',
   'update'                      => 'update',
   'yes'                         => 'yes',
 };
diff --git a/sql-ledger/locale/en_GB/is b/sql-ledger/locale/en_GB/is
index bbfa3f0d3..cef203b9b 100644
--- a/sql-ledger/locale/en_GB/is
+++ b/sql-ledger/locale/en_GB/is
@@ -1,146 +1,27 @@
 $self{texts} = {
-  'Account'                     => 'Account',
-  'Add Purchase Order'          => 'Add Purchase Order',
-  'Add Sales Invoice'           => 'Add Sales Invoice',
-  'Add Sales Order'             => 'Add Sales Order',
-  'Address'                     => 'Address',
-  'Amount'                      => 'Amount',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Are you sure you want to delete Invoice Number' => 'Are you sure you want to delete Invoice Number',
-  'Attachment'                  => 'Attachment',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Bcc'                         => 'Bcc',
-  'Bin'                         => 'Bin',
-  'Cannot delete invoice!'      => 'Cannot delete invoice!',
-  'Cannot post invoice for a closed period!' => 'Cannot post invoice for a closed period!',
-  'Cannot post invoice!'        => 'Cannot post invoice!',
-  'Cannot post payment for a closed period!' => 'Cannot post payment for a closed period!',
-  'Cc'                          => 'Cc',
-  'Confirm!'                    => 'Confirm!',
-  'Contact'                     => 'Contact',
-  'Continue'                    => 'Continue',
-  'Copies'                      => 'Copies',
-  'Credit Limit'                => 'Credit Limit',
-  'Currency'                    => 'Currency',
-  'Customer'                    => 'Customer',
-  'Customer missing!'           => 'Customer missing!',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Delivery Date'               => 'Delivery Date',
-  'Description'                 => 'Description',
-  'Due Date'                    => 'Due Date',
-  'E-mail'                      => 'E-mail',
-  'E-mail address missing!'     => 'E-mail address missing!',
-  'Edit Sales Invoice'          => 'Edit Sales Invoice',
-  'Exch'                        => 'Exch',
-  'Exchangerate'                => 'Exchangerate',
-  'Exchangerate for payment missing!' => 'Exchangerate for payment missing!',
-  'Exchangerate missing!'       => 'Exchangerate missing!',
-  'Extended'                    => 'Extended',
-  'Fax'                         => 'Fax',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'Group'                       => 'Group',
-  'Group Items'                 => 'Group Items',
-  'In-line'                     => 'In-line',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date'                => 'Invoice Date',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number'              => 'Invoice Number',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Invoice deleted!'            => 'Invoice deleted!',
-  'Invoice posted!'             => 'Invoice posted!',
-  'Item not on file!'           => 'Item not on file!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Message'                     => 'Message',
-  'Name'                        => 'Name',
-  'No.'                         => 'No.',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Number missing in Row'       => 'Number missing in Row',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Order'                       => 'Order',
-  'Order Date missing!'         => 'Order Date missing!',
-  'Order Number'                => 'Order Number',
-  'Order Number missing!'       => 'Order Number missing!',
-  'PDF'                         => 'PDF',
-  'Packing List'                => 'Packing List',
-  'Packing List Date missing!'  => 'Packing List Date missing!',
-  'Packing List Number missing!' => 'Packing List Number missing!',
-  'Part'                        => 'Part',
-  'Payment date missing!'       => 'Payment date missing!',
-  'Payments'                    => 'Payments',
-  'Phone'                       => 'Phone',
-  'Post'                        => 'Post',
-  'Post as new'                 => 'Post as new',
-  'Postscript'                  => 'Postscript',
-  'Price'                       => 'Price',
-  'Print'                       => 'Print',
-  'Printer'                     => 'Printer',
-  'Project'                     => 'Project',
-  'Project not on file!'        => 'Project not on file!',
-  'Purchase Order'              => 'Purchase Order',
-  'Qty'                         => 'Qty',
-  'Recd'                        => 'Recd',
-  'Record in'                   => 'Record in',
-  'Remaining'                   => 'Remaining',
-  'Required by'                 => 'Required by',
-  'Sales Order'                 => 'Sales Order',
-  'Screen'                      => 'Screen',
-  'Select from one of the items below' => 'Select from one of the items below',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Select postscript or PDF!'   => 'Select postscript or PDF!',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Service'                     => 'Service',
-  'Ship'                        => 'Ship',
-  'Ship to'                     => 'Ship to',
-  'Ship via'                    => 'Ship via',
-  'Source'                      => 'Source',
-  'Subject'                     => 'Subject',
-  'Subtotal'                    => 'Subtotal',
-  'Tax Included'                => 'Tax Included',
-  'To'                          => 'To',
-  'Total'                       => 'Total',
-  'Unit'                        => 'Unit',
-  'Update'                      => 'Update',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'What type of item is this?'  => 'What type of item is this?',
-  'Yes'                         => 'Yes',
-  'ea'                          => 'ea',
-  'emailed to'                  => 'emailed to',
-  'sent to printer'             => 'sent to printer',
+  'Customer'                    => 'Debtor',
+  'Customer Number'             => 'Debtor Number',
+  'Customer missing!'           => 'Debtor missing!',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
+  'calc_markup'                 => 'calc_markup',
   'check_form'                  => 'check_form',
   'check_name'                  => 'check_name',
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
+  'create_form'                 => 'create_form',
   'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'e_mail'                      => 'e_mail',
@@ -151,17 +32,24 @@ $self{subs} = {
   'invoice_links'               => 'invoice_links',
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
-  'order'                       => 'order',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
   'prepare_invoice'             => 'prepare_invoice',
   'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
   'project_selected'            => 'project_selected',
-  'sales_invoice'               => 'sales_invoice',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'redirect'                    => 'redirect',
+  'rfq'                         => 'rfq',
+  'sales_invoice_'              => 'sales_invoice_',
+  'sales_order'                 => 'sales_order',
+  'section_menu'                => 'section_menu',
   'select_item'                 => 'select_item',
   'select_name'                 => 'select_name',
   'select_project'              => 'select_project',
@@ -170,15 +58,16 @@ $self{subs} = {
   'update'                      => 'update',
   'validate_items'              => 'validate_items',
   'vendor_details'              => 'vendor_details',
-  'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
   'e_mail'                      => 'e_mail',
-  'order'                       => 'order',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
   'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'sales_order'                 => 'sales_order',
   'ship_to'                     => 'ship_to',
   'update'                      => 'update',
   'yes'                         => 'yes',
diff --git a/sql-ledger/locale/en_GB/login b/sql-ledger/locale/en_GB/login
index 262a18ceb..462788f72 100644
--- a/sql-ledger/locale/en_GB/login
+++ b/sql-ledger/locale/en_GB/login
@@ -1,26 +1,11 @@
 $self{texts} = {
-  'About'                       => 'About',
-  'Database Host'               => 'Database Host',
-  'Dataset'                     => 'Dataset',
-  'Incorrect Dataset version!'  => 'Incorrect Dataset version!',
-  'Incorrect Password!'         => 'Incorrect Password!',
-  'Licensed to'                 => 'Licensed to',
-  'Login'                       => 'Login',
-  'Name'                        => 'Name',
-  'Password'                    => 'Password',
-  'User'                        => 'User',
-  'Version'                     => 'Version',
-  'You are logged out!'         => 'You are logged out!',
-  'You did not enter a name!'   => 'You did not enter a name!',
-  'is not a member!'            => 'is not a member!',
-  'localhost'                   => 'localhost',
 };
 
 $self{subs} = {
-  'company_logo'                => 'company_logo',
   'login'                       => 'login',
   'login_screen'                => 'login_screen',
   'logout'                      => 'logout',
+  'selectdataset'               => 'selectdataset',
   'login'                       => 'login',
 };
 
diff --git a/sql-ledger/locale/en_GB/menu b/sql-ledger/locale/en_GB/menu
index 4e478154e..e22491ece 100644
--- a/sql-ledger/locale/en_GB/menu
+++ b/sql-ledger/locale/en_GB/menu
@@ -1,72 +1,23 @@
 $self{texts} = {
   'AP'                          => 'Purchases',
   'AP Aging'                    => 'Creditor Aging',
+  'AP Transaction'              => 'Purchase Transaction',
   'AR'                          => 'Sales',
   'AR Aging'                    => 'Debtor Aging',
-  'Accounting Menu'             => 'Accounting Menu',
-  'Add Account'                 => 'Add Account',
-  'Add Assembly'                => 'Add Assembly',
-  'Add Customer'                => 'Add Customer',
-  'Add GIFI'                    => 'Add GIFI',
-  'Add Group'                   => 'Add Group',
-  'Add Part'                    => 'Add Part',
-  'Add Project'                 => 'Add Project',
-  'Add Service'                 => 'Add Service',
-  'Add Transaction'             => 'Add Transaction',
-  'Add Vendor'                  => 'Add Vendor',
-  'Assemblies'                  => 'Assemblies',
-  'Audit Control'               => 'Audit Control',
-  'Backup'                      => 'Backup',
-  'Balance Sheet'               => 'Balance Sheet',
-  'Cash'                        => 'Cash',
-  'Chart of Accounts'           => 'Chart of Accounts',
+  'AR Transaction'              => 'Sales Transaction',
+  'Add Customer'                => 'Add Debtor',
+  'Add Vendor'                  => 'Add Creditor',
   'Check'                       => 'Cheque',
-  'Customers'                   => 'Customers',
-  'General Ledger'              => 'General Ledger',
-  'Goods & Services'            => 'Goods & Services',
-  'Groups'                      => 'Groups',
-  'HTML Templates'              => 'HTML Templates',
-  'Income Statement'            => 'Income Statement',
-  'Invoice'                     => 'Invoice',
-  'LaTeX Templates'             => 'LaTeX Templates',
-  'List Accounts'               => 'List Accounts',
-  'List GIFI'                   => 'List GIFI',
-  'Logout'                      => 'Logout',
-  'Order Entry'                 => 'Order Entry',
-  'Packing List'                => 'Packing List',
-  'Parts'                       => 'Parts',
-  'Payment'                     => 'Payment',
-  'Payments'                    => 'Payments',
-  'Preferences'                 => 'Preferences',
-  'Projects'                    => 'Projects',
-  'Purchase Order'              => 'Purchase Order',
-  'Purchase Orders'             => 'Purchase Orders',
-  'Receipt'                     => 'Receipt',
-  'Receipts'                    => 'Receipts',
-  'Reconciliation'              => 'Reconciliation',
-  'Reports'                     => 'Reports',
-  'Sales Invoice'               => 'Sales Invoice',
-  'Sales Order'                 => 'Sales Order',
-  'Sales Orders'                => 'Sales Orders',
-  'Save to File'                => 'Save to File',
-  'Send by E-Mail'              => 'Send by E-Mail',
-  'Services'                    => 'Services',
-  'Statement'                   => 'Statement',
-  'Stock Assembly'              => 'Stock Assembly',
-  'Stylesheet'                  => 'Stylesheet',
-  'System'                      => 'System',
-  'Tax collected'               => 'Tax collected',
-  'Tax paid'                    => 'Tax paid',
-  'Transactions'                => 'Transactions',
-  'Trial Balance'               => 'Trial Balance',
-  'Vendor Invoice'              => 'Vendor Invoice',
-  'Vendors'                     => 'Vendors',
-  'Version'                     => 'Version',
+  'Checks'                      => 'Cheques',
+  'Customers'                   => 'Debtors',
+  'Vendor Invoice'              => 'Creditor Invoice',
+  'Vendors'                     => 'Creditors',
 };
 
 $self{subs} = {
   'acc_menu'                    => 'acc_menu',
   'display'                     => 'display',
+  'menubar'                     => 'menubar',
   'section_menu'                => 'section_menu',
 };
 
diff --git a/sql-ledger/locale/en_GB/oe b/sql-ledger/locale/en_GB/oe
index 2dfbb4736..8dbf58ac1 100644
--- a/sql-ledger/locale/en_GB/oe
+++ b/sql-ledger/locale/en_GB/oe
@@ -1,157 +1,37 @@
 $self{texts} = {
-  'Add'                         => 'Add',
-  'Add Purchase Order'          => 'Add Purchase Order',
-  'Add Sales Invoice'           => 'Add Sales Invoice',
-  'Add Sales Order'             => 'Add Sales Order',
-  'Add Vendor Invoice'          => 'Add Vendor Invoice',
-  'Address'                     => 'Address',
-  'Amount'                      => 'Amount',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Are you sure you want to delete Order Number' => 'Are you sure you want to delete Order Number',
-  'Attachment'                  => 'Attachment',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Bcc'                         => 'Bcc',
-  'Bin'                         => 'Bin',
-  'C'                           => 'C',
-  'Cannot delete order!'        => 'Cannot delete order!',
-  'Cannot save order!'          => 'Cannot save order!',
-  'Cc'                          => 'Cc',
-  'Closed'                      => 'Closed',
-  'Confirm!'                    => 'Confirm!',
-  'Contact'                     => 'Contact',
-  'Continue'                    => 'Continue',
-  'Copies'                      => 'Copies',
-  'Credit Limit'                => 'Credit Limit',
-  'Curr'                        => 'Curr',
-  'Currency'                    => 'Currency',
-  'Customer'                    => 'Customer',
-  'Customer missing!'           => 'Customer missing!',
-  'Customer not on file!'       => 'Customer not on file!',
-  'Date'                        => 'Date',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Delete'                      => 'Delete',
-  'Delivery Date'               => 'Delivery Date',
-  'Description'                 => 'Description',
-  'E-mail'                      => 'E-mail',
-  'E-mail address missing!'     => 'E-mail address missing!',
-  'Edit Purchase Order'         => 'Edit Purchase Order',
-  'Edit Sales Order'            => 'Edit Sales Order',
-  'Exchangerate'                => 'Exchangerate',
-  'Exchangerate missing!'       => 'Exchangerate missing!',
-  'Extended'                    => 'Extended',
-  'Fax'                         => 'Fax',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'Group'                       => 'Group',
-  'Group Items'                 => 'Group Items',
-  'ID'                          => 'ID',
-  'In-line'                     => 'In-line',
-  'Include in Report'           => 'Include in Report',
-  'Invoice'                     => 'Invoice',
-  'Invoice Date missing!'       => 'Invoice Date missing!',
-  'Invoice Number missing!'     => 'Invoice Number missing!',
-  'Item not on file!'           => 'Item not on file!',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Message'                     => 'Message',
-  'Name'                        => 'Name',
-  'No.'                         => 'No.',
-  'Notes'                       => 'Notes',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Number'                      => 'Number',
-  'Number missing in Row'       => 'Number missing in Row',
-  'O'                           => 'O',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'Open'                        => 'Open',
-  'Order'                       => 'Order',
-  'Order Date'                  => 'Order Date',
-  'Order Date missing!'         => 'Order Date missing!',
-  'Order Number'                => 'Order Number',
-  'Order Number missing!'       => 'Order Number missing!',
-  'Order deleted!'              => 'Order deleted!',
-  'Order saved!'                => 'Order saved!',
-  'PDF'                         => 'PDF',
-  'Packing List'                => 'Packing List',
-  'Packing List Date missing!'  => 'Packing List Date missing!',
-  'Packing List Number missing!' => 'Packing List Number missing!',
-  'Part'                        => 'Part',
-  'Phone'                       => 'Phone',
-  'Postscript'                  => 'Postscript',
-  'Price'                       => 'Price',
-  'Print'                       => 'Print',
-  'Printer'                     => 'Printer',
-  'Project'                     => 'Project',
-  'Project not on file!'        => 'Project not on file!',
-  'Purchase Order'              => 'Purchase Order',
-  'Purchase Orders'             => 'Purchase Orders',
-  'Qty'                         => 'Qty',
-  'Recd'                        => 'Recd',
-  'Remaining'                   => 'Remaining',
-  'Required by'                 => 'Required by',
-  'Sales Order'                 => 'Sales Order',
-  'Sales Orders'                => 'Sales Orders',
-  'Save'                        => 'Save',
-  'Save as new'                 => 'Save as new',
-  'Screen'                      => 'Screen',
-  'Select from one of the items below' => 'Select from one of the items below',
-  'Select from one of the names below' => 'Select from one of the names below',
-  'Select from one of the projects below' => 'Select from one of the projects below',
-  'Select postscript or PDF!'   => 'Select postscript or PDF!',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Service'                     => 'Service',
-  'Ship'                        => 'Ship',
-  'Ship to'                     => 'Ship to',
-  'Ship via'                    => 'Ship via',
-  'Subject'                     => 'Subject',
-  'Subtotal'                    => 'Subtotal',
-  'Tax'                         => 'Tax',
-  'Tax Included'                => 'Tax Included',
-  'Terms: Net'                  => 'Terms: Net',
-  'To'                          => 'To',
-  'Total'                       => 'Total',
-  'Unit'                        => 'Unit',
-  'Update'                      => 'Update',
-  'Vendor'                      => 'Vendor',
-  'Vendor missing!'             => 'Vendor missing!',
-  'Vendor not on file!'         => 'Vendor not on file!',
-  'What type of item is this?'  => 'What type of item is this?',
-  'Yes'                         => 'Yes',
-  'days'                        => 'days',
-  'ea'                          => 'ea',
-  'emailed to'                  => 'emailed to',
-  'sent to printer'             => 'sent to printer',
-  'to'                          => 'to',
+  'Add Vendor Invoice'          => 'Add Creditor Invoice',
+  'Customer'                    => 'Debtor',
+  'Customer Number'             => 'Debtor Number',
+  'Customer missing!'           => 'Debtor missing!',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor'                      => 'Creditor',
+  'Vendor Invoice'              => 'Creditor Invoice',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor missing!'             => 'Creditor missing!',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
+  'backorder_exchangerate'      => 'backorder_exchangerate',
+  'calc_markup'                 => 'calc_markup',
   'check_form'                  => 'check_form',
   'check_name'                  => 'check_name',
   'check_project'               => 'check_project',
   'continue'                    => 'continue',
   'create_backorder'            => 'create_backorder',
+  'create_form'                 => 'create_form',
   'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
+  'display_ship_receive'        => 'display_ship_receive',
+  'done'                        => 'done',
   'e_mail'                      => 'e_mail',
   'edit'                        => 'edit',
   'form_footer'                 => 'form_footer',
@@ -160,42 +40,67 @@ $self{subs} = {
   'invoice'                     => 'invoice',
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
+  'list_transfer'               => 'list_transfer',
+  'menubar'                     => 'menubar',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
-  'order'                       => 'order',
   'order_links'                 => 'order_links',
-  'orders'                      => 'orders',
   'post_as_new'                 => 'post_as_new',
   'prepare_order'               => 'prepare_order',
   'print'                       => 'print',
+  'print_and_save'              => 'print_and_save',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
   'project_selected'            => 'project_selected',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'quotation_'                  => 'quotation_',
+  'redirect'                    => 'redirect',
+  'rfq'                         => 'rfq',
+  'rfq_'                        => 'rfq_',
   'sales_invoice'               => 'sales_invoice',
+  'sales_invoice_'              => 'sales_invoice_',
+  'sales_order'                 => 'sales_order',
   'save'                        => 'save',
   'save_as_new'                 => 'save_as_new',
+  'save_exchangerate'           => 'save_exchangerate',
   'search'                      => 'search',
+  'search_transfer'             => 'search_transfer',
+  'section_menu'                => 'section_menu',
   'select_item'                 => 'select_item',
   'select_name'                 => 'select_name',
   'select_project'              => 'select_project',
   'send_email'                  => 'send_email',
+  'ship_receive'                => 'ship_receive',
   'ship_to'                     => 'ship_to',
   'subtotal'                    => 'subtotal',
+  'transactions'                => 'transactions',
+  'transfer'                    => 'transfer',
   'update'                      => 'update',
   'validate_items'              => 'validate_items',
   'vendor_details'              => 'vendor_details',
   'vendor_invoice'              => 'vendor_invoice',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'yes'                         => 'yes',
-  'add'                         => 'add',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
+  'done'                        => 'done',
   'e_mail'                      => 'e_mail',
-  'invoice'                     => 'invoice',
   'print'                       => 'print',
+  'print_and_save'              => 'print_and_save',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'quotation_'                  => 'quotation_',
+  'rfq'                         => 'rfq',
+  'rfq_'                        => 'rfq_',
+  'sales_invoice'               => 'sales_invoice',
+  'sales_order'                 => 'sales_order',
   'save'                        => 'save',
   'save_as_new'                 => 'save_as_new',
   'ship_to'                     => 'ship_to',
+  'transfer'                    => 'transfer',
   'update'                      => 'update',
+  'creditor_invoice'            => 'vendor_invoice',
   'yes'                         => 'yes',
 };
 
diff --git a/sql-ledger/locale/en_GB/pe b/sql-ledger/locale/en_GB/pe
index 58cd57a6f..7c8e75aae 100644
--- a/sql-ledger/locale/en_GB/pe
+++ b/sql-ledger/locale/en_GB/pe
@@ -1,45 +1,42 @@
 $self{texts} = {
-  'Add'                         => 'Add',
-  'Add Group'                   => 'Add Group',
-  'Add Project'                 => 'Add Project',
-  'All'                         => 'All',
-  'Continue'                    => 'Continue',
-  'Delete'                      => 'Delete',
-  'Description'                 => 'Description',
-  'Edit Group'                  => 'Edit Group',
-  'Edit Project'                => 'Edit Project',
-  'Group'                       => 'Group',
-  'Group deleted!'              => 'Group deleted!',
-  'Group missing!'              => 'Group missing!',
-  'Group saved!'                => 'Group saved!',
-  'Groups'                      => 'Groups',
-  'Number'                      => 'Number',
-  'Orphaned'                    => 'Orphaned',
-  'Project'                     => 'Project',
-  'Project Number missing!'     => 'Project Number missing!',
-  'Project deleted!'            => 'Project deleted!',
-  'Project saved!'              => 'Project saved!',
-  'Projects'                    => 'Projects',
-  'Save'                        => 'Save',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
+  'add_group'                   => 'add_group',
+  'add_pricegroup'              => 'add_pricegroup',
+  'add_project'                 => 'add_project',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
+  'display'                     => 'display',
   'edit'                        => 'edit',
-  'form_partsgroup_footer'      => 'form_partsgroup_footer',
-  'form_partsgroup_header'      => 'form_partsgroup_header',
-  'form_project_footer'         => 'form_project_footer',
-  'form_project_header'         => 'form_project_header',
+  'edit_translation'            => 'edit_translation',
+  'list_translations'           => 'list_translations',
+  'menubar'                     => 'menubar',
+  'partsgroup_footer'           => 'partsgroup_footer',
+  'partsgroup_header'           => 'partsgroup_header',
   'partsgroup_report'           => 'partsgroup_report',
+  'pricegroup_footer'           => 'pricegroup_footer',
+  'pricegroup_header'           => 'pricegroup_header',
+  'pricegroup_report'           => 'pricegroup_report',
+  'project_footer'              => 'project_footer',
+  'project_header'              => 'project_header',
   'project_report'              => 'project_report',
   'save'                        => 'save',
   'search'                      => 'search',
-  'add'                         => 'add',
+  'section_menu'                => 'section_menu',
+  'translation'                 => 'translation',
+  'translation_footer'          => 'translation_footer',
+  'translation_header'          => 'translation_header',
+  'update'                      => 'update',
+  'add_group'                   => 'add_group',
+  'add_pricegroup'              => 'add_pricegroup',
+  'add_project'                 => 'add_project',
   'continue'                    => 'continue',
   'delete'                      => 'delete',
   'save'                        => 'save',
+  'update'                      => 'update',
 };
 
 1;
diff --git a/sql-ledger/locale/en_GB/pos b/sql-ledger/locale/en_GB/pos
new file mode 100644
index 000000000..7be2abac5
--- /dev/null
+++ b/sql-ledger/locale/en_GB/pos
@@ -0,0 +1,26 @@
+$self{texts} = {
+  'Customer'                    => 'Debtor',
+  'Customer missing!'           => 'Debtor missing!',
+};
+
+$self{subs} = {
+  'add'                         => 'add',
+  'display_row'                 => 'display_row',
+  'edit'                        => 'edit',
+  'form_footer'                 => 'form_footer',
+  'form_header'                 => 'form_header',
+  'lookup_partsgroup'           => 'lookup_partsgroup',
+  'openinvoices'                => 'openinvoices',
+  'post'                        => 'post',
+  'print'                       => 'print',
+  'print_form'                  => 'print_form',
+  'print_options'               => 'print_options',
+  'receipts'                    => 'receipts',
+  'continue'                    => 'continue',
+  'delete'                      => 'delete',
+  'post'                        => 'post',
+  'print'                       => 'print',
+  'update'                      => 'update',
+};
+
+1;
diff --git a/sql-ledger/locale/en_GB/ps b/sql-ledger/locale/en_GB/ps
new file mode 100644
index 000000000..ff92328ca
--- /dev/null
+++ b/sql-ledger/locale/en_GB/ps
@@ -0,0 +1,112 @@
+$self{texts} = {
+  'AP Aging'                    => 'Creditor Aging',
+  'AR Aging'                    => 'Debtor Aging',
+  'AR Transaction'              => 'Sales Transaction',
+  'AR Transactions'             => 'Sales Transactions',
+  'Check'                       => 'Cheque',
+  'Customer'                    => 'Debtor',
+  'Customer Number'             => 'Debtor Number',
+  'Customer missing!'           => 'Debtor missing!',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor'                      => 'Creditor',
+  'Vendor Number'               => 'Creditor Number',
+  'Vendor not on file!'         => 'Creditor not on file!',
+};
+
+$self{subs} = {
+  'acc_menu'                    => 'acc_menu',
+  'add'                         => 'add',
+  'add_transaction'             => 'add_transaction',
+  'aging'                       => 'aging',
+  'ap_transaction'              => 'ap_transaction',
+  'ar_subtotal'                 => 'ar_subtotal',
+  'ar_transaction'              => 'ar_transaction',
+  'ar_transactions'             => 'ar_transactions',
+  'calc_markup'                 => 'calc_markup',
+  'check_form'                  => 'check_form',
+  'check_name'                  => 'check_name',
+  'check_project'               => 'check_project',
+  'continue'                    => 'continue',
+  'create_form'                 => 'create_form',
+  'create_links'                => 'create_links',
+  'customer_details'            => 'customer_details',
+  'delete'                      => 'delete',
+  'display'                     => 'display',
+  'display_form'                => 'display_form',
+  'display_row'                 => 'display_row',
+  'e_mail'                      => 'e_mail',
+  'edit'                        => 'edit',
+  'form_footer'                 => 'form_footer',
+  'form_header'                 => 'form_header',
+  'generate_ap_aging'           => 'generate_ap_aging',
+  'generate_ar_aging'           => 'generate_ar_aging',
+  'generate_balance_sheet'      => 'generate_balance_sheet',
+  'generate_income_statement'   => 'generate_income_statement',
+  'generate_projects'           => 'generate_projects',
+  'generate_tax_report'         => 'generate_tax_report',
+  'generate_trial_balance'      => 'generate_trial_balance',
+  'gl_transaction'              => 'gl_transaction',
+  'invoice_links'               => 'invoice_links',
+  'invoicetotal'                => 'invoicetotal',
+  'item_selected'               => 'item_selected',
+  'list_accounts'               => 'list_accounts',
+  'list_payments'               => 'list_payments',
+  'lookup_partsgroup'           => 'lookup_partsgroup',
+  'menubar'                     => 'menubar',
+  'name_selected'               => 'name_selected',
+  'new_item'                    => 'new_item',
+  'openinvoices'                => 'openinvoices',
+  'payment_selected'            => 'payment_selected',
+  'payment_subtotal'            => 'payment_subtotal',
+  'post'                        => 'post',
+  'post_as_new'                 => 'post_as_new',
+  'prepare_invoice'             => 'prepare_invoice',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'print_check'                 => 'print_check',
+  'print_form'                  => 'print_form',
+  'print_options'               => 'print_options',
+  'print_receipt'               => 'print_receipt',
+  'print_transaction'           => 'print_transaction',
+  'project_selected'            => 'project_selected',
+  'purchase_order'              => 'purchase_order',
+  'quotation'                   => 'quotation',
+  'receipts'                    => 'receipts',
+  'redirect'                    => 'redirect',
+  'report'                      => 'report',
+  'rfq'                         => 'rfq',
+  'sales_invoice_'              => 'sales_invoice_',
+  'sales_order'                 => 'sales_order',
+  'search'                      => 'search',
+  'section_menu'                => 'section_menu',
+  'select_all'                  => 'select_all',
+  'select_item'                 => 'select_item',
+  'select_name'                 => 'select_name',
+  'select_payment'              => 'select_payment',
+  'select_project'              => 'select_project',
+  'send_email'                  => 'send_email',
+  'ship_to'                     => 'ship_to',
+  'statement_details'           => 'statement_details',
+  'tax_subtotal'                => 'tax_subtotal',
+  'update'                      => 'update',
+  'validate_items'              => 'validate_items',
+  'vendor_details'              => 'vendor_details',
+  'vendor_invoice_'             => 'vendor_invoice_',
+  'yes'                         => 'yes',
+  'sales_transaction'           => 'ar_transaction',
+  'continue'                    => 'continue',
+  'delete'                      => 'delete',
+  'e_mail'                      => 'e_mail',
+  'post'                        => 'post',
+  'post_as_new'                 => 'post_as_new',
+  'print'                       => 'print',
+  'print_and_post'              => 'print_and_post',
+  'sales_invoice.'              => 'sales_invoice.',
+  'sales_order'                 => 'sales_order',
+  'select_all'                  => 'select_all',
+  'ship_to'                     => 'ship_to',
+  'update'                      => 'update',
+  'yes'                         => 'yes',
+};
+
+1;
diff --git a/sql-ledger/locale/en_GB/pw b/sql-ledger/locale/en_GB/pw
new file mode 100644
index 000000000..4a0b2b55b
--- /dev/null
+++ b/sql-ledger/locale/en_GB/pw
@@ -0,0 +1,9 @@
+$self{texts} = {
+};
+
+$self{subs} = {
+  'getpassword'                 => 'getpassword',
+  'continue'                    => 'continue',
+};
+
+1;
diff --git a/sql-ledger/locale/en_GB/rc b/sql-ledger/locale/en_GB/rc
index 952c378ec..a36388736 100644
--- a/sql-ledger/locale/en_GB/rc
+++ b/sql-ledger/locale/en_GB/rc
@@ -1,31 +1,16 @@
 $self{texts} = {
-  'Account'                     => 'Account',
-  'Balance'                     => 'Balance',
-  'Cleared Balance'             => 'Cleared Balance',
-  'Continue'                    => 'Continue',
-  'Date'                        => 'Date',
-  'Deposit'                     => 'Deposit',
-  'Description'                 => 'Description',
-  'Difference'                  => 'Difference',
-  'Done'                        => 'Done',
-  'Exchangerate Difference'     => 'Exchangerate Difference',
-  'From'                        => 'From',
-  'Out of balance!'             => 'Out of balance!',
-  'Payment'                     => 'Payment',
-  'Reconciliation'              => 'Reconciliation',
-  'Select all'                  => 'Select all',
-  'Source'                      => 'Source',
-  'Statement Balance'           => 'Statement Balance',
-  'Update'                      => 'Update',
-  'to'                          => 'to',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
   'continue'                    => 'continue',
+  'display'                     => 'display',
   'display_form'                => 'display_form',
   'done'                        => 'done',
   'get_payments'                => 'get_payments',
+  'menubar'                     => 'menubar',
   'reconciliation'              => 'reconciliation',
+  'section_menu'                => 'section_menu',
   'select_all'                  => 'select_all',
   'update'                      => 'update',
   'continue'                    => 'continue',
diff --git a/sql-ledger/locale/en_GB/rp b/sql-ledger/locale/en_GB/rp
index a66828e2f..b50f48c93 100644
--- a/sql-ledger/locale/en_GB/rp
+++ b/sql-ledger/locale/en_GB/rp
@@ -1,115 +1,50 @@
 $self{texts} = {
   'AP Aging'                    => 'Creditor Aging',
   'AR Aging'                    => 'Debtor Aging',
-  'Account'                     => 'Account',
-  'Accounts'                    => 'Accounts',
-  'Amount'                      => 'Amount',
-  'Apr'                         => 'Apr',
-  'April'                       => 'April',
-  'Attachment'                  => 'Attachment',
-  'Aug'                         => 'Aug',
-  'August'                      => 'August',
-  'Balance'                     => 'Balance',
-  'Balance Sheet'               => 'Balance Sheet',
-  'Bcc'                         => 'Bcc',
-  'Cash based'                  => 'Cash based',
-  'Cc'                          => 'Cc',
-  'Compare to'                  => 'Compare to',
-  'Continue'                    => 'Continue',
-  'Copies'                      => 'Copies',
-  'Credit'                      => 'Credit',
-  'Current'                     => 'Current',
-  'Customer'                    => 'Customer',
-  'Date'                        => 'Date',
-  'Debit'                       => 'Debit',
-  'Dec'                         => 'Dec',
-  'December'                    => 'December',
-  'Decimalplaces'               => 'Decimalplaces',
-  'Description'                 => 'Description',
-  'Due'                         => 'Due',
-  'E-mail'                      => 'E-mail',
-  'E-mail Statement to'         => 'E-mail Statement to',
-  'Feb'                         => 'Feb',
-  'February'                    => 'February',
-  'From'                        => 'From',
-  'GIFI'                        => 'GIFI',
-  'Heading'                     => 'Heading',
-  'ID'                          => 'ID',
-  'In-line'                     => 'In-line',
-  'Include in Report'           => 'Include in Report',
-  'Income Statement'            => 'Income Statement',
-  'Invoice'                     => 'Invoice',
-  'Jan'                         => 'Jan',
-  'January'                     => 'January',
-  'Jul'                         => 'Jul',
-  'July'                        => 'July',
-  'Jun'                         => 'Jun',
-  'June'                        => 'June',
-  'Mar'                         => 'Mar',
-  'March'                       => 'March',
-  'May'                         => 'May',
-  'May '                        => 'May ',
-  'Message'                     => 'Message',
-  'N/A'                         => 'N/A',
-  'Nothing selected!'           => 'Nothing selected!',
-  'Nov'                         => 'Nov',
-  'November'                    => 'November',
-  'Oct'                         => 'Oct',
-  'October'                     => 'October',
-  'PDF'                         => 'PDF',
-  'Payments'                    => 'Payments',
-  'Postscript'                  => 'Postscript',
-  'Print'                       => 'Print',
-  'Printer'                     => 'Printer',
-  'Project Number'              => 'Project Number',
-  'Receipts'                    => 'Receipts',
-  'Report for'                  => 'Report for',
-  'Retained Earnings'           => 'Retained Earnings',
-  'Screen'                      => 'Screen',
-  'Select all'                  => 'Select all',
-  'Select postscript or PDF!'   => 'Select postscript or PDF!',
-  'Sep'                         => 'Sep',
-  'September'                   => 'September',
-  'Source'                      => 'Source',
-  'Standard'                    => 'Standard',
-  'Statement'                   => 'Statement',
-  'Statement sent to'           => 'Statement sent to',
-  'Statements sent to printer!' => 'Statements sent to printer!',
-  'Subject'                     => 'Subject',
-  'Subtotal'                    => 'Subtotal',
-  'Tax'                         => 'Tax',
-  'Tax collected'               => 'Tax collected',
-  'Tax paid'                    => 'Tax paid',
-  'Total'                       => 'Total',
-  'Trial Balance'               => 'Trial Balance',
-  'Vendor'                      => 'Vendor',
-  'as at'                       => 'as at',
-  'collected on sales'          => 'collected on sales',
-  'for Period'                  => 'for Period',
-  'paid on purchases'           => 'paid on purchases',
-  'to'                          => 'to',
+  'Customer'                    => 'Debtor',
+  'Customer not on file!'       => 'Debtor not on file!',
+  'Vendor'                      => 'Creditor',
+  'Vendor not on file!'         => 'Creditor not on file!',
 };
 
 $self{subs} = {
+  'acc_menu'                    => 'acc_menu',
+  'add_transaction'             => 'add_transaction',
   'aging'                       => 'aging',
+  'ap_transaction'              => 'ap_transaction',
+  'ar_transaction'              => 'ar_transaction',
+  'check_name'                  => 'check_name',
+  'check_project'               => 'check_project',
   'continue'                    => 'continue',
+  'display'                     => 'display',
   'e_mail'                      => 'e_mail',
   'generate_ap_aging'           => 'generate_ap_aging',
   'generate_ar_aging'           => 'generate_ar_aging',
   'generate_balance_sheet'      => 'generate_balance_sheet',
   'generate_income_statement'   => 'generate_income_statement',
+  'generate_projects'           => 'generate_projects',
   'generate_tax_report'         => 'generate_tax_report',
   'generate_trial_balance'      => 'generate_trial_balance',
+  'gl_transaction'              => 'gl_transaction',
   'list_accounts'               => 'list_accounts',
   'list_payments'               => 'list_payments',
+  'menubar'                     => 'menubar',
+  'name_selected'               => 'name_selected',
+  'payment_subtotal'            => 'payment_subtotal',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
+  'project_selected'            => 'project_selected',
   'report'                      => 'report',
+  'sales_invoice_'              => 'sales_invoice_',
+  'section_menu'                => 'section_menu',
   'select_all'                  => 'select_all',
+  'select_name'                 => 'select_name',
+  'select_project'              => 'select_project',
   'send_email'                  => 'send_email',
   'statement_details'           => 'statement_details',
   'tax_subtotal'                => 'tax_subtotal',
+  'vendor_invoice_'             => 'vendor_invoice_',
   'continue'                    => 'continue',
   'e_mail'                      => 'e_mail',
   'print'                       => 'print',