From dfee919915587ccb7fe967eee482b7cdc105e57f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Fri, 9 Jul 2010 13:22:09 +0200
Subject: [PATCH] Automatisches Ersetzen von <translate>...</translate> durch
 $T8
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Dieser Commit ersetzt die Commits 10d6315268e6c0217876f573c9be5e35fcbb4654
(Automatisches Ersetzen von <translate>...</translate> durch $T8) und
ce48ff49c3ac82602b29a4837b0882c1f567f17b (Automatisches Ersetzen von
<translate>...</translate> durch $T8 Teil 2).

Der Grundgedanke ist, den veralteten <translate> Tag durch den dynamischen
Funktionsaufruf T8.filter oder LxERP.t8 zu ersetzen um später die die Templates
flexibler zu machen. Im ersten Schritt werden daür in allen master Dateien die
<translate> Aufrufe mit dem im letzten Commit eingefügten Migrationsscript
ersetzt. Im zweiten Schritt werden Zeilenumbrüche innerhalb einer Übersetzung
manuell korrigiert.

Das Script ignoriert translates in Template Blöcken, ergo müssen diese von Hand
nachbearbeitet werden. Dieser Schritt fehlt in den beiden original Commits.

Als letzten Schritt werden Konstrukte der Art:

  [% 'Text mit [% HTML.escape(variable) %]' | $T8 %]

ersetzt durch

  [% LxERP.t8('Text mit #1', variable) | html %]

Wichtig dabei dass der Filter durch html erstzt wird, und bei Bedarf [% USE
LxERP %] ergänzt wird. Die locales müssen analog angepasst werden. Dieser
Schritt ist in den Original Commits ebenfalls nicht enthalten. Es betrifft etwa
20 Vorkommnisse im Programm, die meisten davon im Migrationsbereich. Es ist
vorher nicht aufgefallen, weil die recht selten angezeigt werden, hier ist eher
die Konsistenz gewünscht.

Die locales.pl in dieser Version ist noch nicht in der Lage Anführungszeichen
in LxERP.t8() Escapes richtig zu verabeiten, das eine Vorkommen davon ist
behoben.
---
 locale/de/all                                 |  21 +-
 locale/de/ap                                  |   1 +
 locale/de/ar                                  |   1 +
 locale/de/arap                                |   3 +
 locale/de/cp                                  |   1 +
 locale/de/do                                  |   1 +
 locale/de/ir                                  |   1 +
 locale/de/is                                  |   1 +
 locale/de/login                               |   1 +
 locale/de/oe                                  |   1 +
 locale/de/rp                                  |   1 +
 locale/de/todo                                |   1 +
 .../analyze_filter_de.html                    |  19 +-
 .../analyze_filter_master.html                |  24 +--
 .../analyze_overview_de.html                  |  55 +++---
 .../analyze_overview_master.html              |  55 +++---
 .../assistant_for_ap_ar_wrong_taxkeys_de.html |  15 +-
 ...istant_for_ap_ar_wrong_taxkeys_master.html |  20 +-
 ...for_invoice_inventory_with_taxkeys_de.html |  11 +-
 ...invoice_inventory_with_taxkeys_master.html |  15 +-
 .../assistant_for_wrong_taxes_de.html         |  27 +--
 .../assistant_for_wrong_taxes_master.html     |  27 +--
 .../assistant_for_wrong_taxkeys_de.html       |  51 ++---
 .../assistant_for_wrong_taxkeys_master.html   |  64 +++---
 .../delete_transaction_confirmation_de.html   |  11 +-
 ...elete_transaction_confirmation_master.html |  11 +-
 .../delete_transaction_de.html                |   9 +-
 .../delete_transaction_master.html            |   9 +-
 .../fix_ap_ar_wrong_taxkeys_de.html           |   7 +-
 .../fix_ap_ar_wrong_taxkeys_master.html       |   9 +-
 ...fix_invoice_inventory_with_taxkeys_de.html |   7 +-
 ...invoice_inventory_with_taxkeys_master.html |   9 +-
 .../fix_wrong_taxkeys_de.html                 |   7 +-
 .../fix_wrong_taxkeys_master.html             |   8 +-
 templates/webpages/admin/adminlogin_de.html   |  11 +-
 .../webpages/admin/adminlogin_master.html     |  11 +-
 .../webpages/admin/backup_dataset_de.html     |  25 +--
 .../admin/backup_dataset_email_done_de.html   |   6 +-
 .../backup_dataset_email_done_master.html     |   6 +-
 .../webpages/admin/backup_dataset_master.html |  25 +--
 .../admin/check_auth_database_de.html         |  25 +--
 .../admin/check_auth_database_master.html     |  30 ++-
 .../webpages/admin/check_auth_tables_de.html  |  17 +-
 .../admin/check_auth_tables_master.html       |  22 +--
 .../webpages/admin/create_dataset_de.html     |  15 +-
 .../webpages/admin/create_dataset_master.html |  17 +-
 .../admin/create_standard_group_ask_de.html   |  21 +-
 .../create_standard_group_ask_master.html     |  29 ++-
 templates/webpages/admin/dbadmin_de.html      |  25 +--
 templates/webpages/admin/dbadmin_master.html  |  25 +--
 templates/webpages/admin/dbcreate_de.html     |   9 +-
 templates/webpages/admin/dbcreate_master.html |   9 +-
 templates/webpages/admin/dbdelete_de.html     |   6 +-
 templates/webpages/admin/dbdelete_master.html |   6 +-
 .../webpages/admin/dbupgrade_all_done_de.html |   7 +-
 .../admin/dbupgrade_all_done_master.html      |   7 +-
 .../webpages/admin/dbupgrade_footer_de.html   |   3 +-
 .../admin/dbupgrade_footer_master.html        |   3 +-
 .../webpages/admin/dbupgrade_header_de.html   |   3 +-
 .../admin/dbupgrade_header_master.html        |   3 +-
 .../webpages/admin/delete_dataset_de.html     |   9 +-
 .../webpages/admin/delete_dataset_master.html |  12 +-
 .../admin/delete_group_confirm_de.html        |   9 +-
 .../admin/delete_group_confirm_master.html    |   9 +-
 templates/webpages/admin/edit_group_de.html   |  29 +--
 .../webpages/admin/edit_group_master.html     |  29 +--
 .../admin/edit_group_membership_de.html       |  13 +-
 .../admin/edit_group_membership_master.html   |  14 +-
 templates/webpages/admin/edit_groups_de.html  |  27 +--
 .../webpages/admin/edit_groups_master.html    |  27 +--
 templates/webpages/admin/edit_user_de.html    |  83 ++++----
 .../webpages/admin/edit_user_master.html      |  83 ++++----
 templates/webpages/admin/list_users_de.html   |  39 ++--
 .../webpages/admin/list_users_master.html     |  39 ++--
 .../webpages/admin/restore_dataset_de.html    |  21 +-
 .../admin/restore_dataset_master.html         |  21 +-
 .../restore_dataset_start_footer_de.html      |   8 +-
 .../restore_dataset_start_footer_master.html  |   8 +-
 .../restore_dataset_start_header_de.html      |   3 +-
 .../restore_dataset_start_header_master.html  |   3 +-
 .../webpages/admin/test_db_connection_de.html |   9 +-
 .../admin/test_db_connection_master.html      |  10 +-
 .../webpages/admin/update_dataset_de.html     |  19 +-
 .../webpages/admin/update_dataset_master.html |  19 +-
 .../admin/user_migration_complete_de.html     |   9 +-
 .../admin/user_migration_complete_master.html |  11 +-
 .../webpages/admin/user_migration_de.html     |  10 +-
 .../admin/user_migration_done_de.html         |   5 +-
 .../admin/user_migration_done_master.html     |   6 +-
 .../webpages/admin/user_migration_master.html |  17 +-
 templates/webpages/am/config_de.html          |  91 ++++-----
 templates/webpages/am/config_master.html      |  91 ++++-----
 .../am/confirm_delete_warehouse_de.html       |   9 +-
 .../am/confirm_delete_warehouse_master.html   |   9 +-
 templates/webpages/am/edit_accounts_de.html   |  84 ++++----
 .../webpages/am/edit_accounts_master.html     |  83 ++++----
 templates/webpages/am/edit_defaults_de.html   |  53 ++---
 .../webpages/am/edit_defaults_master.html     |  53 ++---
 .../webpages/am/edit_price_factor_de.html     |   9 +-
 .../webpages/am/edit_price_factor_master.html |   9 +-
 templates/webpages/am/edit_tax_de.html        |  19 +-
 templates/webpages/am/edit_tax_master.html    |  19 +-
 templates/webpages/am/edit_templates_de.html  |  19 +-
 .../webpages/am/edit_templates_master.html    |  19 +-
 templates/webpages/am/edit_units_de.html      |  48 ++---
 templates/webpages/am/edit_units_master.html  |  53 ++---
 templates/webpages/am/edit_warehouse_de.html  |  29 +--
 .../webpages/am/edit_warehouse_master.html    |  31 ++-
 .../webpages/am/list_account_details_de.html  |  25 +--
 .../am/list_account_details_master.html       |  25 +--
 templates/webpages/am/list_accounts_de.html   |  10 +-
 .../webpages/am/list_accounts_master.html     |   9 +-
 .../webpages/am/list_price_factors_de.html    |   7 +-
 .../am/list_price_factors_master.html         |   7 +-
 templates/webpages/am/list_tax_de.html        |  13 +-
 templates/webpages/am/list_tax_master.html    |  13 +-
 templates/webpages/am/list_warehouses_de.html |  11 +-
 .../webpages/am/list_warehouses_master.html   |  11 +-
 .../amcvar/display_cvar_config_form_de.html   |  67 +++----
 .../display_cvar_config_form_master.html      |  84 ++++----
 .../webpages/amcvar/list_cvar_configs_de.html |  33 ++--
 .../amcvar/list_cvar_configs_master.html      |  33 ++--
 .../webpages/amcvar/render_inputs_de.html     |   3 +-
 .../webpages/amcvar/render_inputs_master.html |   3 +-
 .../webpages/amcvar/search_filter_de.html     |  11 +-
 .../webpages/amcvar/search_filter_master.html |  11 +-
 .../ap/ap_transactions_bottom_de.html         |   7 +-
 .../ap/ap_transactions_bottom_master.html     |   7 +-
 templates/webpages/ap/search_de.html          |  79 ++++----
 templates/webpages/ap/search_master.html      |  79 ++++----
 .../ar/ar_transactions_bottom_de.html         |   7 +-
 .../ar/ar_transactions_bottom_master.html     |   7 +-
 templates/webpages/ar/search_de.html          |  93 ++++-----
 templates/webpages/ar/search_master.html      |  93 ++++-----
 .../bank_account_display_form_de.html         |  19 +-
 .../bank_account_display_form_master.html     |  19 +-
 .../bank_account_list_bottom_de.html          |   5 +-
 .../bank_account_list_bottom_master.html      |   5 +-
 .../webpages/common/search_history_de.html    |  61 +++---
 .../common/search_history_master.html         |  61 +++---
 .../webpages/common/show_history_de.html      |  27 +--
 .../webpages/common/show_history_master.html  |  27 +--
 .../webpages/common/show_vc_details_de.html   | 115 +++++------
 .../common/show_vc_details_master.html        | 115 +++++------
 templates/webpages/ct/form_footer_de.html     |  21 +-
 templates/webpages/ct/form_footer_master.html |  21 +-
 templates/webpages/ct/form_header_de.html     | 185 +++++++++---------
 templates/webpages/ct/form_header_master.html | 185 +++++++++---------
 templates/webpages/ct/get_delivery_de.html    |  21 +-
 .../webpages/ct/get_delivery_master.html      |  21 +-
 .../webpages/ct/list_names_bottom_de.html     |   5 +-
 .../webpages/ct/list_names_bottom_master.html |   5 +-
 templates/webpages/ct/search_de.html          |  63 +++---
 templates/webpages/ct/search_master.html      |  63 +++---
 .../SKR04_3804_already_exists_de.html         |   9 +-
 .../SKR04_3804_already_exists_master.html     |   9 +-
 .../dbupgrade/SKR04_3804_update_de.html       |  11 +-
 .../dbupgrade/SKR04_3804_update_master.html   |  11 +-
 .../buchungsgruppen_assemblies_de.html        |  49 ++---
 .../buchungsgruppen_assemblies_done_de.html   |   5 +-
 ...uchungsgruppen_assemblies_done_master.html |   5 +-
 .../buchungsgruppen_assemblies_master.html    |  49 ++---
 .../dbupgrade/buchungsgruppen_footer_de.html  |   5 +-
 .../buchungsgruppen_footer_master.html        |   5 +-
 .../dbupgrade/buchungsgruppen_header_de.html  |  21 +-
 .../buchungsgruppen_header_master.html        |  32 ++-
 .../dbupgrade/buchungsgruppen_parts_de.html   |  49 ++---
 .../buchungsgruppen_parts_done_de.html        |   5 +-
 .../buchungsgruppen_parts_done_master.html    |   5 +-
 .../buchungsgruppen_parts_master.html         |  49 ++---
 .../buchungsgruppen_services_de.html          |  49 ++---
 .../buchungsgruppen_services_done_de.html     |   5 +-
 .../buchungsgruppen_services_done_master.html |   5 +-
 .../buchungsgruppen_services_master.html      |  49 ++---
 .../webpages/dbupgrade/coa_guess_de.html      |   9 +-
 .../webpages/dbupgrade/coa_guess_master.html  |  10 +-
 .../dbupgrade/cp_greeting_update_form_de.html |   3 +-
 .../cp_greeting_update_form_master.html       |   3 +-
 templates/webpages/dbupgrade/error_de.html    |   7 +-
 .../webpages/dbupgrade/error_master.html      |   7 +-
 templates/webpages/dbupgrade/footer_de.html   |   5 +-
 .../webpages/dbupgrade/footer_master.html     |   5 +-
 templates/webpages/dbupgrade/header_de.html   |   3 +-
 .../webpages/dbupgrade/header_master.html     |   3 +-
 .../std_buchungsgruppen_unknown_coa_de.html   |   8 +-
 ...td_buchungsgruppen_unknown_coa_master.html |  10 +-
 .../webpages/dbupgrade/units_error_de.html    |   5 +-
 .../dbupgrade/units_error_master.html         |   5 +-
 .../webpages/dbupgrade/units_header_de.html   |  17 +-
 .../dbupgrade/units_header_master.html        |  25 +--
 .../webpages/dbupgrade/units_parts_de.html    |  29 +--
 .../dbupgrade/units_parts_done_de.html        |   5 +-
 .../dbupgrade/units_parts_done_master.html    |   5 +-
 .../dbupgrade/units_parts_master.html         |  35 ++--
 .../webpages/dbupgrade/units_services_de.html |  29 +--
 .../dbupgrade/units_services_done_de.html     |   5 +-
 .../dbupgrade/units_services_done_master.html |   5 +-
 .../dbupgrade/units_services_master.html      |  35 ++--
 .../dbupgrade/units_set_default_de.html       |  13 +-
 .../dbupgrade/units_set_default_done_de.html  |   7 +-
 .../units_set_default_done_master.html        |   7 +-
 .../dbupgrade/units_set_default_master.html   |  15 +-
 .../update_templates_warnings_de.html         |   5 +-
 .../update_templates_warnings_master.html     |   6 +-
 .../dbupgrade/upgrade_message2_de.html        |   4 +-
 .../dbupgrade/upgrade_message2_master.html    |   4 +-
 .../webpages/dbupgrade/warehouse_form_de.html |  21 +-
 .../dbupgrade/warehouse_form_master.html      |  21 +-
 templates/webpages/dbupgrade/warning_de.html  |   9 +-
 .../webpages/dbupgrade/warning_master.html    |  12 +-
 templates/webpages/do/delete_de.html          |  11 +-
 templates/webpages/do/delete_master.html      |  11 +-
 templates/webpages/do/form_footer_de.html     |  39 ++--
 templates/webpages/do/form_footer_master.html |  39 ++--
 templates/webpages/do/form_header_de.html     |  53 ++---
 templates/webpages/do/form_header_master.html |  53 ++---
 templates/webpages/do/orders_bottom_de.html   |   5 +-
 .../webpages/do/orders_bottom_master.html     |   5 +-
 templates/webpages/do/search_de.html          |  57 +++---
 templates/webpages/do/search_master.html      |  57 +++---
 templates/webpages/do/stock_in_form_de.html   |  25 +--
 .../webpages/do/stock_in_form_master.html     |  25 +--
 templates/webpages/do/stock_out_form_de.html  |  29 +--
 .../webpages/do/stock_out_form_master.html    |  29 +--
 templates/webpages/drafts/load_de.html        |  15 +-
 templates/webpages/drafts/load_master.html    |  15 +-
 templates/webpages/drafts/save_new_de.html    |   9 +-
 .../webpages/drafts/save_new_master.html      |   9 +-
 templates/webpages/dunning/add_de.html        |  23 +--
 templates/webpages/dunning/add_master.html    |  23 +--
 .../webpages/dunning/edit_config_de.html      |  37 ++--
 .../webpages/dunning/edit_config_master.html  |  39 ++--
 templates/webpages/dunning/search_de.html     |  29 +--
 templates/webpages/dunning/search_master.html |  29 +--
 templates/webpages/dunning/set_email_de.html  |   9 +-
 .../webpages/dunning/set_email_master.html    |   9 +-
 .../dunning/show_dunning_bottom_de.html       |   5 +-
 .../dunning/show_dunning_bottom_master.html   |   5 +-
 .../webpages/dunning/show_invoices_de.html    |  33 ++--
 .../dunning/show_invoices_master.html         |  35 ++--
 templates/webpages/fu/add_edit_de.html        |  27 +--
 templates/webpages/fu/add_edit_master.html    |  27 +--
 .../webpages/fu/edit_access_rights_de.html    |  13 +-
 .../fu/edit_access_rights_master.html         |  13 +-
 templates/webpages/fu/report_bottom_de.html   |   7 +-
 .../webpages/fu/report_bottom_master.html     |   7 +-
 .../webpages/fu/report_for_todo_list_de.html  |  17 +-
 .../fu/report_for_todo_list_master.html       |  17 +-
 templates/webpages/fu/search_de.html          |  33 ++--
 templates/webpages/fu/search_master.html      |  33 ++--
 .../webpages/generic/calculate_qty_de.html    |   5 +-
 .../generic/calculate_qty_master.html         |   5 +-
 .../webpages/generic/cov_selection_de.html    |   5 +-
 .../generic/cov_selection_master.html         |   5 +-
 templates/webpages/generic/edit_email_de.html |  15 +-
 .../webpages/generic/edit_email_master.html   |  15 +-
 templates/webpages/generic/error_de.html      |   5 +-
 templates/webpages/generic/error_master.html  |   5 +-
 .../webpages/generic/information_de.html      |   3 +-
 .../webpages/generic/information_master.html  |   3 +-
 templates/webpages/generic/new_item_de.html   |  11 +-
 .../webpages/generic/new_item_master.html     |  11 +-
 .../webpages/generic/part_selection_de.html   |  13 +-
 .../generic/part_selection_master.html        |  13 +-
 .../webpages/generic/print_options_de.html    |   7 +-
 .../generic/print_options_master.html         |   7 +-
 .../generic/select_delivery_customer_de.html  |   3 +-
 .../select_delivery_customer_master.html      |   3 +-
 .../webpages/generic/select_part_de.html      |  15 +-
 .../webpages/generic/select_part_master.html  |  15 +-
 .../webpages/generic/select_vendor_de.html    |   3 +-
 .../generic/select_vendor_master.html         |   3 +-
 .../generic/set_longdescription_de.html       |   5 +-
 .../generic/set_longdescription_master.html   |   5 +-
 .../edit_greetings_de.html                    |   9 +-
 .../edit_greetings_master.html                |   9 +-
 .../gl/generate_report_bottom_de.html         |  11 +-
 .../gl/generate_report_bottom_master.html     |  11 +-
 templates/webpages/ic/assembly_row_de.html    |   5 +-
 .../webpages/ic/assembly_row_master.html      |   5 +-
 templates/webpages/ic/choice_de.html          |   7 +-
 templates/webpages/ic/choice_master.html      |   7 +-
 .../webpages/ic/confirm_price_update_de.html  |  13 +-
 .../ic/confirm_price_update_master.html       |  13 +-
 templates/webpages/ic/form_footer_de.html     |  19 +-
 templates/webpages/ic/form_footer_master.html |  19 +-
 templates/webpages/ic/form_header_de.html     |  63 +++---
 templates/webpages/ic/form_header_master.html |  63 +++---
 .../ic/generate_report_bottom_de.html         |   9 +-
 .../ic/generate_report_bottom_master.html     |   9 +-
 templates/webpages/ic/makemodel_de.html       |   5 +-
 templates/webpages/ic/makemodel_master.html   |   5 +-
 .../ic/parts_language_selection_de.html       |   5 +-
 .../ic/parts_language_selection_master.html   |   5 +-
 templates/webpages/ic/price_row_de.html       |   5 +-
 templates/webpages/ic/price_row_master.html   |   5 +-
 templates/webpages/ic/search_de.html          | 101 +++++-----
 templates/webpages/ic/search_master.html      | 101 +++++-----
 .../webpages/ic/search_update_prices_de.html  |  43 ++--
 .../ic/search_update_prices_master.html       |  43 ++--
 templates/webpages/ir/_payments_de.html       |  21 +-
 templates/webpages/ir/_payments_master.html   |  21 +-
 templates/webpages/ir/form_footer_de.html     |  43 ++--
 templates/webpages/ir/form_footer_master.html |  43 ++--
 templates/webpages/ir/form_header_de.html     |  53 ++---
 templates/webpages/ir/form_header_master.html |  53 ++---
 templates/webpages/is/form_footer_de.html     |  69 +++----
 templates/webpages/is/form_footer_master.html |  69 +++----
 templates/webpages/is/form_header_de.html     |  81 ++++----
 templates/webpages/is/form_header_master.html |  81 ++++----
 .../login/auth_db_unreachable_de.html         |  11 +-
 .../login/auth_db_unreachable_master.html     |  15 +-
 .../login/authentication_pl_missing_de.html   |  11 +-
 .../authentication_pl_missing_master.html     |  16 +-
 templates/webpages/login/company_logo_de.html |  18 +-
 .../webpages/login/company_logo_master.html   |  18 +-
 templates/webpages/login/login_screen_de.html |   9 +-
 .../webpages/login/login_screen_master.html   |   9 +-
 .../webpages/login/password_error_de.html     |   5 +-
 .../webpages/login/password_error_master.html |   5 +-
 templates/webpages/menu/menunew_de.html       |  11 +-
 templates/webpages/menu/menunew_master.html   |  11 +-
 templates/webpages/menu/menuv3_de.html        |  11 +-
 templates/webpages/menu/menuv3_master.html    |  11 +-
 templates/webpages/menu/menuv4_de.html        |  11 +-
 templates/webpages/menu/menuv4_master.html    |  11 +-
 .../oe/check_for_direct_delivery_de.html      |  31 +--
 .../oe/check_for_direct_delivery_master.html  |  31 +--
 templates/webpages/oe/form_footer_de.html     |  55 +++---
 templates/webpages/oe/form_footer_master.html |  55 +++---
 templates/webpages/oe/form_header_de.html     |  61 +++---
 templates/webpages/oe/form_header_master.html |  61 +++---
 templates/webpages/oe/orders_bottom_de.html   |   5 +-
 .../webpages/oe/orders_bottom_master.html     |   5 +-
 .../webpages/oe/report_for_todo_list_de.html  |  21 +-
 .../oe/report_for_todo_list_master.html       |  21 +-
 templates/webpages/oe/sales_order_de.html     |   3 +-
 templates/webpages/oe/sales_order_master.html |   3 +-
 templates/webpages/oe/search_de.html          |  61 +++---
 templates/webpages/oe/search_master.html      |  61 +++---
 .../webpages/projects/project_form_de.html    |  21 +-
 .../projects/project_form_master.html         |  21 +-
 templates/webpages/projects/search_de.html    |  19 +-
 .../webpages/projects/search_master.html      |  19 +-
 .../csv_export_options_de.html                |  21 +-
 .../csv_export_options_master.html            |  21 +-
 .../report_generator/html_report_de.html      |   9 +-
 .../report_generator/html_report_master.html  |   9 +-
 .../pdf_export_options_de.html                |  35 ++--
 .../pdf_export_options_master.html            |  35 ++--
 templates/webpages/rp/aging_ar_bottom_de.html |   9 +-
 .../webpages/rp/aging_ar_bottom_master.html   |   9 +-
 templates/webpages/rp/balance_sheet_de.html   |  17 +-
 .../webpages/rp/balance_sheet_master.html     |  17 +-
 .../webpages/rp/html_report_susa_de.html      |  35 ++--
 .../webpages/rp/html_report_susa_master.html  |  35 ++--
 .../webpages/sepa/bank_transfer_add_de.html   |  19 +-
 .../sepa/bank_transfer_add_master.html        |  21 +-
 .../sepa/bank_transfer_create_de.html         |  31 +--
 .../sepa/bank_transfer_create_master.html     |  31 +--
 .../sepa/bank_transfer_created_de.html        |   7 +-
 .../sepa/bank_transfer_created_master.html    |   7 +-
 .../webpages/sepa/bank_transfer_edit_de.html  |  31 +--
 .../sepa/bank_transfer_edit_master.html       |  31 +--
 .../sepa/bank_transfer_list_bottom_de.html    |   7 +-
 .../bank_transfer_list_bottom_master.html     |   7 +-
 ...bank_transfer_mark_as_closed_step1_de.html |   9 +-
 ..._transfer_mark_as_closed_step1_master.html |  11 +-
 .../sepa/bank_transfer_search_de.html         |  29 +--
 .../sepa/bank_transfer_search_master.html     |  29 +--
 .../webpages/todo/show_todo_list_de.html      |   5 +-
 .../webpages/todo/show_todo_list_master.html  |   5 +-
 templates/webpages/ustva/config_step1_de.html |  35 ++--
 .../webpages/ustva/config_step1_master.html   |  35 ++--
 templates/webpages/ustva/config_step2_de.html |  51 ++---
 .../webpages/ustva/config_step2_master.html   |  52 ++---
 .../webpages/ustva/generic_taxreport_de.html  |  13 +-
 .../ustva/generic_taxreport_master.html       |  13 +-
 templates/webpages/ustva/report_de.html       |  45 ++---
 templates/webpages/ustva/report_master.html   |  45 ++---
 templates/webpages/wh/journal_filter_de.html  |  65 +++---
 .../webpages/wh/journal_filter_master.html    |  65 +++---
 .../wh/removal_parts_selection_de.html        |  25 +--
 .../wh/removal_parts_selection_master.html    |  25 +--
 templates/webpages/wh/report_filter_de.html   |  45 ++---
 .../webpages/wh/report_filter_master.html     |  45 ++---
 .../wh/transfer_parts_selection_de.html       |  27 +--
 .../wh/transfer_parts_selection_master.html   |  27 +--
 .../wh/warehouse_selection_assembly_de.html   |  21 +-
 .../warehouse_selection_assembly_master.html  |  21 +-
 .../webpages/wh/warehouse_selection_de.html   |  24 +--
 .../wh/warehouse_selection_master.html        |  27 ++-
 .../wh/warehouse_selection_stock_de.html      |  23 +--
 .../wh/warehouse_selection_stock_master.html  |  23 +--
 394 files changed, 4676 insertions(+), 4420 deletions(-)

diff --git a/locale/de/all b/locale/de/all
index 68a557f93..ca7444145 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -183,7 +183,7 @@ $self->{texts} = {
   'Ap aging on %s'              => 'Offene Verbindlichkeiten zum %s',
   'Application Error. No Format given' => 'Fehler in der Anwendung. Das Ausgabeformat fehlt.',
   'Application Error. Wrong Format' => 'Fehler in der Anwendung. Falsches Format: ',
-  'Applying [% HTML.escape(file) %]:' => 'F&uuml;hre [% HTML.escape(file) %] aus:',
+  'Applying #1:'                => 'Führe #1 aus',
   'Approximately #1 prices will be updated.' => 'Ungefähr #1 Preise werden aktualisiert.',
   'Apr'                         => 'Apr',
   'April'                       => 'April',
@@ -804,7 +804,7 @@ $self->{texts} = {
   'IV'                          => 'IV',
   'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => 'Wenn das automatische Erstellen einer Rechnung &uuml;ber Mahngeb&uuml;hren und Zinsen f&uuml;r ein Mahnlevel aktiviert ist, so werden die folgenden Konten f&uuml;r die Rechnung benutzt.',
   'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => 'Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so k&ouml;nnen Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:',
-  'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory &quot;[% HTML.escape(backupdir) %]&quot;.' => 'Falls Sie sich entscheiden, Lx-Office die Migration durchf&uuml;hren zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis &quot;[% HTML.escape(backupdir) %]&quot; erstellen und die Dateien anschlie&szlig;end l&ouml;schen.',
+  'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory &quot;#1&quot;.' => 'Falls Sie sich entscheiden, Lx-Office die Migration durchführen zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis "#1" erstellen und die Dateien anschließend löschen.',
   'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => 'Wenn Sie f&uuml;r die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerpl&auml;tze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.',
   'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => 'Wenn Sie diese Meldung sehen haben Sie wahrscheinlich ein frisches LX-Office Setup und noch keine Buchungsgruppen eingerichtet. Ein Administrator kann dies im Systemmen&uuml; erledigen.',
   'If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/authentication.pl&quot; and login into the admin module again.' => 'Wenn Sie einen der Parameter &auml;ndern wollen, so dr&uuml;cken Sie auf den &quot;Zur&uuml;ck&quot;-Button, bearbeiten Sie die Datei &quot;config/authentication.pl&quot;, und melden Sie sich erneut im Administrationsbereich an.',
@@ -962,7 +962,7 @@ $self->{texts} = {
   'Lx-Office can fix these problems automatically.' => 'Lx-Office kann solche Probleme automatisch beheben.',
   'Lx-Office has been switched to group-based access restrictions.' => 'Lx-Office wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.',
   'Lx-Office has found one or more problems in the general ledger.' => 'Lx-Office hat ein oder mehrere Probleme im Hauptbuch gefunden.',
-  'Lx-Office is about to update the database <b>[% HTML.escape(dbname) %]</b>. You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank <b>[% HTML.escape(dbname) %]</b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.',
+  'Lx-Office is about to update the database <b>#1</b>. You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank <b>#1</b> aktualisieren.',
   'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' => 'Lx-Office enth&auml;lt jetzt auch echte Lagerverwaultung anstatt reiner Mengenz&auml;hlung.',
   'Lx-Office website'           => 'Lx-Office-Webseite',
   'MAILED'                      => 'Gesendet',
@@ -1008,6 +1008,7 @@ $self->{texts} = {
   'Module name'                 => 'Modulname',
   'Monat'                       => 'Monat',
   'Monthly'                     => 'monatlich',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Multi mode not supported.'   => 'Multimodus wird nicht unterstützt.',
   'Multibyte Encoding'          => 'Schriftsatz',
@@ -1560,13 +1561,13 @@ $self->{texts} = {
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
   'The custom variable has been deleted.' => 'Die benutzerdefinierte Variable wurde gel&ouml;scht.',
   'The custom variable has been saved.' => 'Die benutzerdefinierte Variable wurde gespeichert.',
-  'The database [% HTML.escape(db) %] has been successfully deleted.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.',
+  'The database #1 has been successfully deleted.' => 'Die Datenbank #1 wurde erfolgreich gelöscht.',
   'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' => 'Die Datenbank zur Verwaltung der Benutzerdaten und zur Authentifizierung existiert nicht. Sie k&ouml;nnen Lx-Office diese Datenbank mit den folgenden Parametern anlegen lassen:',
-  'The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:',
+  'The database update/creation did not succeed. The file #1 contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei #1 enthielt den folgenden Fehler:',
   'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.',
   'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.',
-  'The dataset [% HTML.escape(db) %] has been successfully created.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.',
-  'The dataset backup has been sent via email to [% HTML.escape(to) %].' => 'Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.',
+  'The dataset #1 has been successfully created.' => 'Die Datenbank #1 wurde erfolgreich angelegt.',
+  'The dataset backup has been sent via email to #1.' => 'Die Datenbanksicherung wurde per Email an #1 verschickt.',
   'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.',
   'The dataset name is missing.' => 'Der Datenbankname fehlt.',
   'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes h&auml;ngt vom Variablentypen ab:',
@@ -1605,7 +1606,7 @@ $self->{texts} = {
   'The name is missing in row %d.' => 'Der Name fehlt in Zeile %d.',
   'The name is missing.'        => 'Der Name fehlt.',
   'The name must only consist of letters, numbers and underscores and start with a letter.' => 'Der Name darf nur aus Buchstaben (keine Umlaute), Ziffern und Unterstrichen bestehen und muss mit einem Buchstaben beginnen.',
-  'The old file containing the user information is still present (&quot;[% HTML.escape(memberfile) %]&quot;). Do you want to migrate these users into the database? If not then you will not be able to log in with any of the users present in the old file. ' => 'Die alte Datei mit den Benutzerdaten existiert in dieser Installation noch immer (&quot;[% HTML.escape(memberfile) %]&quot;). Wollen Sie diese Benutzer in die neue Authentifizierungsdatenbank migrieren lassen? Falls nicht, so werden Sie sich nicht mehr mit den Benutzerdaten aus der alten Mitgliedsdatei anmelden k&ouml;nnen.',
+  'The old file containing the user information is still present (&quot;#1&quot;). Do you want to migrate these users into the database? If not then you will not be able to log in with any of the users present in the old file.' => 'Die alte Datei mit den Benutzerdaten existiert in dieser Installation noch immer (&quot;#1&quot;). Wollen Sie diese Benutzer in die neue Authentifizierungsdatenbank migrieren lassen? Falls nicht, so werden Sie sich nicht mehr mit den Benutzerdaten aus der alten Mitgliedsdatei anmelden können.',
   'The option field is empty.'  => 'Das Optionsfeld ist leer.',
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',
   'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.',
@@ -1616,7 +1617,7 @@ $self->{texts} = {
   'The pg_dump process could not be started.' => 'Der pg_dump-Prozess konnte nicht gestartet werden.',
   'The pg_restore process could not be started.' => 'Der pg_restore-Prozess konnte nicht gestartet werden.',
   'The preferred one is to install packages provided by your operating system distribution (e.g. Debian or RPM packages).' => 'Die bevorzugte Art, ein Perl-Modul zu installieren, ist durch Installation eines von Ihrem Betriebssystem zur Verf&uuml;gung gestellten Paketes (z.B. Debian-Pakete oder RPM).',
-  'The program\'s exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war [% HTML.escape(retval) %] (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
+  'The programs exit code was #1 (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war #1 (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
   'The project has been added.' => 'Das Projekt wurde erfasst.',
   'The project has been saved.' => 'Das Projekt wurde gespeichert.',
   'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' => 'Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:',
@@ -1674,7 +1675,7 @@ $self->{texts} = {
   'This could have happened for two reasons:' => 'Dies kann aus zwei Gründen geschehen sein:',
   'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.',
   'This group will be called &quot;Full Access&quot;.' => 'Diese Gruppe wird &quot;Vollzugriff&quot; genannt.',
-  'This installation uses an unknown chart of accounts (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;[% HTML.escape(coa) %]&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.',
+  'This installation uses an unknown chart of accounts (&quot;#1&quot;). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;#1&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine &Auml;nderungen vorgenommen!',
   'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' => 'Diese Liste ist auf 15 Zeilen begrenzt. Wenn Sie eine vollständige Liste benötigen, erstellen Sie bitte einen Bericht.',
   'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' => 'Das bedeutet, dass ein Benutzer eine Kreditorenbuchung angelegt und in ihr einen Umsatzsteuer-Steuerschlüssel verwendet oder eine Debitorenbuchung mit Vorsteuer-Steuerschlüssel angelegt hat.',
diff --git a/locale/de/ap b/locale/de/ap
index f8f3ae5f1..fac21417f 100644
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -150,6 +150,7 @@ $self->{texts} = {
   'Missing amount'              => 'Fehlbetrag',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/ar b/locale/de/ar
index 56e4af69e..9003cb0e7 100644
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -154,6 +154,7 @@ $self->{texts} = {
   'Missing amount'              => 'Fehlbetrag',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/arap b/locale/de/arap
index aa5dcaf73..de6f9808e 100644
--- a/locale/de/arap
+++ b/locale/de/arap
@@ -46,6 +46,7 @@ $self->{texts} = {
   'Create and edit sales quotations' => 'Angebote erfassen und bearbeiten',
   'Create and edit vendor invoices' => 'Eingangsrechnungen erfassen und bearbeiten',
   'Credit Note'                 => 'Gutschrift',
+  'Customer'                    => 'Kunde',
   'Customer Number'             => 'Kundennummer',
   'Customer details'            => 'Kundendetails',
   'Customer not on file or locked!' => 'Dieser Kunde existiert nicht oder ist gesperrt.',
@@ -79,6 +80,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
@@ -135,6 +137,7 @@ $self->{texts} = {
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
+  'Vendor'                      => 'Lieferant',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor not on file or locked!' => 'Dieser Lieferant existiert nicht oder ist gesperrt.',
   'Vendor not on file!'         => 'Lieferant ist nicht in der Datenbank!',
diff --git a/locale/de/cp b/locale/de/cp
index 11ee88810..687b97d67 100644
--- a/locale/de/cp
+++ b/locale/de/cp
@@ -96,6 +96,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/do b/locale/de/do
index d2f4471a0..5443cd89e 100644
--- a/locale/de/do
+++ b/locale/de/do
@@ -155,6 +155,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/ir b/locale/de/ir
index f6614b346..7d2b1c180 100644
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -148,6 +148,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/is b/locale/de/is
index 9b7ee618f..8cd031ce3 100644
--- a/locale/de/is
+++ b/locale/de/is
@@ -153,6 +153,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/login b/locale/de/login
index fa52176d3..c39e35202 100644
--- a/locale/de/login
+++ b/locale/de/login
@@ -199,6 +199,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/oe b/locale/de/oe
index 46e5e18a2..7f3abcfe7 100644
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -181,6 +181,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/rp b/locale/de/rp
index 9c9b71df3..2b85eca04 100644
--- a/locale/de/rp
+++ b/locale/de/rp
@@ -143,6 +143,7 @@ $self->{texts} = {
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
   'Monthly'                     => 'monatlich',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/locale/de/todo b/locale/de/todo
index 2072ad4e6..768bc63ca 100644
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -196,6 +196,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'More than one #1 found matching, please be more specific.' => 'Mehr als ein #1 wurde gefunden, bitte geben Sie den Namen genauer an.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
diff --git a/templates/webpages/acctranscorrections/analyze_filter_de.html b/templates/webpages/acctranscorrections/analyze_filter_de.html
index 9f5e94206..867bbadfd 100644
--- a/templates/webpages/acctranscorrections/analyze_filter_de.html
+++ b/templates/webpages/acctranscorrections/analyze_filter_de.html
@@ -1,32 +1,33 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
  <p><div class="listheading">[% title %]</div></p>
 
  <p>
-  Frühere Versionen von Lx-Office enthielten Bugs, die zu falschen Einträgen im Hauptbuch geführt haben können.
-  Diese Einträge können nicht automatisch bereinigt werden.
-  Dieses Modul kann Ihnen helfen, problematische Einträge im Hauptbuch zu identifizieren und teilweise zu beheben. Dabei werden je nach Problem mögliche Lösungen aufgezeigt, wobei Sie die entscheiden können, welche Probleme automatisch gelöst werden sollen.
+  [% 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' | $T8 %]
+  [% 'These wrong entries cannot be fixed automatically.' | $T8 %]
+  [% 'This module can help you identify and correct such entries by analyzing the general ledger and presenting you likely solutions but also allowing you to fix problems yourself.' | $T8 %]
  </p>
 
  <form name="filter" method="post" action="acctranscorrections.pl">
 
-  <p>Analysezeitraum:</p>
+  <p>[% 'Time period for the analysis:' | $T8 %]</p>
 
   <p>
    <table>
     <tr>
      <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
-     <td><label for="scope_full">Alle Hauptbucheinträge</label></td>
+     <td><label for="scope_full">[% 'All general ledger entries' | $T8 %]</label></td>
     </tr>
 
     <tr>
      <td><input type="radio" name="scope" id="scope_period" value="period"></td>
      <td>
-      Zeitraum:
-      von
+      [% 'Period:' | $T8 %]
+      [% 'from (time)' | $T8 %]
       <input name="transdate_from" id="transdate_from" size="10">
       <input type="button" name="transdate_from_trigger" id="transdate_from_trigger" value="?">
-      bis
+      [% 'to (time)' | $T8 %]
       <input name="transdate_to" id="transdate_to" size="10">
       <input type="button" name="transdate_to_trigger" id="transdate_to_trigger" value="?">
      </td>
@@ -35,7 +36,7 @@
   </p>
 
   <p>
-   <input type="submit" value="Analyse beginnen">
+   <input type="submit" value="[% 'Start analysis' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="analyze">
diff --git a/templates/webpages/acctranscorrections/analyze_filter_master.html b/templates/webpages/acctranscorrections/analyze_filter_master.html
index 12ce06285..867bbadfd 100644
--- a/templates/webpages/acctranscorrections/analyze_filter_master.html
+++ b/templates/webpages/acctranscorrections/analyze_filter_master.html
@@ -1,37 +1,33 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
  <p><div class="listheading">[% title %]</div></p>
 
  <p>
-  <translate>Earlier versions of Lx-Office contained bugs which might
-   have led to wrong entries in the general ledger.</translate>
-  <translate>These wrong entries cannot be fixed
-   automatically.</translate>
-  <translate>This module can help you identify and correct such
-   entries by analyzing the general ledger and presenting you likely
-   solutions but also allowing you to fix problems
-   yourself.</translate>
+  [% 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' | $T8 %]
+  [% 'These wrong entries cannot be fixed automatically.' | $T8 %]
+  [% 'This module can help you identify and correct such entries by analyzing the general ledger and presenting you likely solutions but also allowing you to fix problems yourself.' | $T8 %]
  </p>
 
  <form name="filter" method="post" action="acctranscorrections.pl">
 
-  <p><translate>Time period for the analysis:</translate></p>
+  <p>[% 'Time period for the analysis:' | $T8 %]</p>
 
   <p>
    <table>
     <tr>
      <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
-     <td><label for="scope_full"><translate>All general ledger entries</translate></label></td>
+     <td><label for="scope_full">[% 'All general ledger entries' | $T8 %]</label></td>
     </tr>
 
     <tr>
      <td><input type="radio" name="scope" id="scope_period" value="period"></td>
      <td>
-      <translate>Period:</translate>
-      <translate>from (time)</translate>
+      [% 'Period:' | $T8 %]
+      [% 'from (time)' | $T8 %]
       <input name="transdate_from" id="transdate_from" size="10">
       <input type="button" name="transdate_from_trigger" id="transdate_from_trigger" value="?">
-      <translate>to (time)</translate>
+      [% 'to (time)' | $T8 %]
       <input name="transdate_to" id="transdate_to" size="10">
       <input type="button" name="transdate_to_trigger" id="transdate_to_trigger" value="?">
      </td>
@@ -40,7 +36,7 @@
   </p>
 
   <p>
-   <input type="submit" value="<translate>Start analysis</translate>">
+   <input type="submit" value="[% 'Start analysis' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="analyze">
diff --git a/templates/webpages/acctranscorrections/analyze_overview_de.html b/templates/webpages/acctranscorrections/analyze_overview_de.html
index 99eb3db5e..883c4e707 100644
--- a/templates/webpages/acctranscorrections/analyze_overview_de.html
+++ b/templates/webpages/acctranscorrections/analyze_overview_de.html
@@ -1,30 +1,31 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
- <p>Lx-Office hat ein oder mehrere Probleme im Hauptbuch gefunden.</p>
+ <p>[% 'Lx-Office has found one or more problems in the general ledger.' | $T8 %]</p>
 
  <p>
-  Zeitraum:
+  [% 'Period' | $T8 %]:
   [%- IF transdate_from || transdate_to %]
    [%- IF transdate_from %]
-   von [% transdate_from %]
+   [% 'from (time)' | $T8 %] [% transdate_from %]
    [%- END %]
    [%- IF transdate_to %]
-   bis [% transdate_to %]
+   [% 'to (time)' | $T8 %] [% transdate_to %]
    [%- END %]
   [%- ELSE %]
-  alle Einträge
+  [% 'all entries' | $T8 %]
   [%- END %]
  </p>
 
  <p>
   <table width="100%">
    <tr>
-    <th class="listheading">Buchung</th>
-    <th class="listheading">Problem</th>
-    <th class="listheading">Lösung</th>
+    <th class="listheading">[% 'Transaction' | $T8 %]</th>
+    <th class="listheading">[% 'Problem' | $T8 %]</th>
+    <th class="listheading">[% 'Solution' | $T8 %]</th>
    </tr>
 
    [%- FOREACH problem = PROBLEMS %]
@@ -32,7 +33,7 @@
     <td valign="top">
      [%- IF problem.type == 'ap_ar_wrong_taxkeys' %]
       [%- IF problem.ap_problems.size %]
-       Kreditorenbuchungen
+       [% 'AP Transactions' | $T8 %]
        [%- FOREACH ap = problem.ap_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
@@ -41,7 +42,7 @@
 
       [%- IF problem.ar_problems.size %]
        [%- IF problem.ap_problems.size %]; [%- END %]
-       Debitorenbuchungen
+       [% 'AR Transactions' | $T8 %]
        [%- FOREACH ar = problem.ar_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
@@ -51,7 +52,7 @@
 
      [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
       [%- IF problem.ar_problems.size %]
-       Verkaufsrechnungen
+       [% 'Sales invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ar_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -60,7 +61,7 @@
 
       [%- IF problem.ap_problems.size %]
        [%- IF problem.ar_problems.size %]; [%- END %]
-       Einkaufsrechnungen
+       [% 'Purchase invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ap_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -69,7 +70,7 @@
 
      [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
       [%- IF problem.ar_problems.size %]
-       Verkaufsrechnungen
+       [% 'Sales invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ar_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -78,7 +79,7 @@
 
       [%- IF problem.ap_problems.size %]
        [%- IF problem.ar_problems.size %]; [%- END %]
-       Einkaufsrechnungen
+       [% 'Purchase invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ap_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -89,11 +90,11 @@
 
      <a href="[% problem.link %]">
       [%- IF problem.data.module == 'ar' %]
-      Debitorenbuchung
+      [% 'AR Transaction' | $T8 %]
       [%- ELSIF problem.data.module == 'ap' %]
-      Kreditorenbuchung
+      [% 'AP Transaction' | $T8 %]
       [%- ELSE %]
-      Dialogbuchung
+      [% 'General Ledger Transaction' | $T8 %]
       [%- END %]
       [% HTML.escape(problem.data.reference) %]
      </a>
@@ -105,43 +106,43 @@
 
     <td valign="top">
      [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     Sowohl auf der Soll- als auch auf der Haben-Seite gesplittete Buchung
+     [% 'Transaction has been split on both the credit and the debit side' | $T8 %]
 
      [%- ELSIF problem.type == 'wrong_taxkeys' %]
-     Gespeicherte Steuerschlüssel sind falsch
+     [% 'Wrong tax keys recorded' | $T8 %]
 
      [%- ELSIF problem.type == 'wrong_taxes' %]
-     Gespeicherte Steuern passen nicht zum Steuerschlüssel
+     [% 'Wrong taxes recorded' | $T8 %]
 
      [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     Kreditorenbuchungen mit Umsatzsteuer-Steuerschlüsseln und/oder Debitorenbuchungen mit Vorsteuer-Steuerschlüsseln
+     [% 'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' | $T8 %]
 
      [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     Einkaufs- und Verkaufsrechnungen mit Warenbestandsbuchungen mit Steuerschlüsseln
+     [% 'Sales and purchase invoices with inventory transactions with taxkeys' | $T8 %]
 
      [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
-     Fehlende Steuerschl&uuml;ssel in Rechnungen mit Steuern
+     [% 'Missing taxkeys in invoices with taxes.' | $T8 %]
 
      [%- END %]
     </td>
 
     <td valign="top">
      [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     Diese Buchung muss manuell in mehrere Buchungen aufgeteilt werden.
+     [% 'This transaction has to be split into several transactions manually.' | $T8 %]
 
      [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
      <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
-      Korrekturassistenten starten
+      [% 'Start the correction assistant' | $T8 %]
      </a>
 
      [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
      <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
-      Korrekturassistenten starten
+      [% 'Start the correction assistant' | $T8 %]
      </a>
 
      [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
      <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
-      Korrekturassistenten starten
+      [% 'Start the correction assistant' | $T8 %]
      </a>
 
      [%- END %]
diff --git a/templates/webpages/acctranscorrections/analyze_overview_master.html b/templates/webpages/acctranscorrections/analyze_overview_master.html
index 408bc04fe..883c4e707 100644
--- a/templates/webpages/acctranscorrections/analyze_overview_master.html
+++ b/templates/webpages/acctranscorrections/analyze_overview_master.html
@@ -1,30 +1,31 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
- <p><translate>Lx-Office has found one or more problems in the general ledger.</translate></p>
+ <p>[% 'Lx-Office has found one or more problems in the general ledger.' | $T8 %]</p>
 
  <p>
-  <translate>Period</translate>:
+  [% 'Period' | $T8 %]:
   [%- IF transdate_from || transdate_to %]
    [%- IF transdate_from %]
-   <translate>from (time)</translate> [% transdate_from %]
+   [% 'from (time)' | $T8 %] [% transdate_from %]
    [%- END %]
    [%- IF transdate_to %]
-   <translate>to (time)</translate> [% transdate_to %]
+   [% 'to (time)' | $T8 %] [% transdate_to %]
    [%- END %]
   [%- ELSE %]
-  <translate>all entries</translate>
+  [% 'all entries' | $T8 %]
   [%- END %]
  </p>
 
  <p>
   <table width="100%">
    <tr>
-    <th class="listheading"><translate>Transaction</translate></th>
-    <th class="listheading"><translate>Problem</translate></th>
-    <th class="listheading"><translate>Solution</translate></th>
+    <th class="listheading">[% 'Transaction' | $T8 %]</th>
+    <th class="listheading">[% 'Problem' | $T8 %]</th>
+    <th class="listheading">[% 'Solution' | $T8 %]</th>
    </tr>
 
    [%- FOREACH problem = PROBLEMS %]
@@ -32,7 +33,7 @@
     <td valign="top">
      [%- IF problem.type == 'ap_ar_wrong_taxkeys' %]
       [%- IF problem.ap_problems.size %]
-       <translate>AP Transactions</translate>
+       [% 'AP Transactions' | $T8 %]
        [%- FOREACH ap = problem.ap_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
@@ -41,7 +42,7 @@
 
       [%- IF problem.ar_problems.size %]
        [%- IF problem.ap_problems.size %]; [%- END %]
-       <translate>AR Transactions</translate>
+       [% 'AR Transactions' | $T8 %]
        [%- FOREACH ar = problem.ar_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
@@ -51,7 +52,7 @@
 
      [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
       [%- IF problem.ar_problems.size %]
-       <translate>Sales invoices</translate>
+       [% 'Sales invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ar_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -60,7 +61,7 @@
 
       [%- IF problem.ap_problems.size %]
        [%- IF problem.ar_problems.size %]; [%- END %]
-       <translate>Purchase invoices</translate>
+       [% 'Purchase invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ap_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -69,7 +70,7 @@
 
      [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
       [%- IF problem.ar_problems.size %]
-       <translate>Sales invoices</translate>
+       [% 'Sales invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ar_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -78,7 +79,7 @@
 
       [%- IF problem.ap_problems.size %]
        [%- IF problem.ar_problems.size %]; [%- END %]
-       <translate>Purchase invoices</translate>
+       [% 'Purchase invoices' | $T8 %]
        [%- FOREACH subproblem = problem.ap_problems %]
         [%- UNLESS loop.first %], [%- END %]
         <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
@@ -89,11 +90,11 @@
 
      <a href="[% problem.link %]">
       [%- IF problem.data.module == 'ar' %]
-      <translate>AR Transaction</translate>
+      [% 'AR Transaction' | $T8 %]
       [%- ELSIF problem.data.module == 'ap' %]
-      <translate>AP Transaction</translate>
+      [% 'AP Transaction' | $T8 %]
       [%- ELSE %]
-      <translate>General Ledger Transaction</translate>
+      [% 'General Ledger Transaction' | $T8 %]
       [%- END %]
       [% HTML.escape(problem.data.reference) %]
      </a>
@@ -105,43 +106,43 @@
 
     <td valign="top">
      [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     <translate>Transaction has been split on both the credit and the debit side</translate>
+     [% 'Transaction has been split on both the credit and the debit side' | $T8 %]
 
      [%- ELSIF problem.type == 'wrong_taxkeys' %]
-     <translate>Wrong tax keys recorded</translate>
+     [% 'Wrong tax keys recorded' | $T8 %]
 
      [%- ELSIF problem.type == 'wrong_taxes' %]
-     <translate>Wrong taxes recorded</translate>
+     [% 'Wrong taxes recorded' | $T8 %]
 
      [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
-     <translate>AP transactions with sales taxkeys and/or AR transactions with input taxkeys</translate>
+     [% 'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' | $T8 %]
 
      [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
-     <translate>Sales and purchase invoices with inventory transactions with taxkeys</translate>
+     [% 'Sales and purchase invoices with inventory transactions with taxkeys' | $T8 %]
 
      [%- ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
-     <translate>Missing taxkeys in invoices with taxes.</translate>
+     [% 'Missing taxkeys in invoices with taxes.' | $T8 %]
 
      [%- END %]
     </td>
 
     <td valign="top">
      [%- IF problem.type == 'split_multiple_credit_and_debit' %]
-     <translate>This transaction has to be split into several transactions manually.</translate>
+     [% 'This transaction has to be split into several transactions manually.' | $T8 %]
 
      [%- ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
      <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
-      <translate>Start the correction assistant</translate>
+      [% 'Start the correction assistant' | $T8 %]
      </a>
 
      [%- ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
      <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
-      <translate>Start the correction assistant</translate>
+      [% 'Start the correction assistant' | $T8 %]
      </a>
 
      [%- ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
      <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
-      <translate>Start the correction assistant</translate>
+      [% 'Start the correction assistant' | $T8 %]
      </a>
 
      [%- END %]
diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html
index f97c05575..6115d92cb 100644
--- a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html
+++ b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_de.html
@@ -1,20 +1,21 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Es gibt mindestens eine Buchung, bei der ein logisch nicht passender Steuerschlüssel ausgewählt wurde.
+  [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %]
 
-  Das bedeutet, dass ein Benutzer eine Kreditorenbuchung angelegt und in ihr einen Umsatzsteuer-Steuerschlüssel verwendet oder eine Debitorenbuchung mit Vorsteuer-Steuerschlüssel angelegt hat.
+  [% 'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' | $T8 %]
  </p>
 
  <p>
-  Lx-Office kann solche Probleme automatisch beheben.
+  [% 'Lx-Office can fix these problems automatically.' | $T8 %]
 
-  Bei Kreditorenbuchungen werden die Umsatzsteuer-Steuerschlüssel durch Vorsteuer-Steuerschlüssel mit demselben Steuersatz ersetzt.
+  [% 'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' | $T8 %]
 
-  Bei Debitorenbuchungen werden die Vorsteuer-Steuerschlüssel durch Umsatzsteuer-Steuerschlüssel mit demselben Steuersatz ersetzt.
+  [% 'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' | $T8 %]
  </p>
 
  <form name="Form" action="acctranscorrections.pl" method="post">
@@ -22,8 +23,8 @@
   <p>
    <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="Buchungen korrigieren">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
+   <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html
index a310aa973..6115d92cb 100644
--- a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html
+++ b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys_master.html
@@ -1,25 +1,21 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>There is at least one transaction for which the user has
-   chosen a logically wrong taxkey.</translate>
+  [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %]
 
-  <translate>This means that the user has created an AP transaction
-   and chosen a taxkey for sales taxes, or that he has created an AR
-   transaction and chosen a taxkey for input taxes.</translate>
+  [% 'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' | $T8 %]
  </p>
 
  <p>
-  <translate>Lx-Office can fix these problems automatically.</translate>
+  [% 'Lx-Office can fix these problems automatically.' | $T8 %]
 
-  <translate>For AP transactions it will replace the sales taxkeys
-   with input taxkeys with the same tax rate.</translate>
+  [% 'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' | $T8 %]
 
-  <translate>For AR transactions it will replace the input taxkeys
-   with sales taxkeys with the same tax rate.</translate>
+  [% 'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' | $T8 %]
  </p>
 
  <form name="Form" action="acctranscorrections.pl" method="post">
@@ -27,8 +23,8 @@
   <p>
    <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="<translate>Fix transactions</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+   <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html
index 0a29b51d9..a0fa6586c 100644
--- a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html
+++ b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_de.html
@@ -1,16 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Es gibt mindestens eine Einkaufs- oder Verkaufsrechnung, für die Lx-Office einen Steuerschlüssel ungleich 0 verzeichnet hat, obwohl für Warenbestandsbuchugen bei Rechnungen nie Steuern gebucht werden.
+  [% 'There is at least one sales or purchase invoice for which Lx-Office recorded an inventory transaction with taxkeys even though no tax was recorded.' | $T8 %]
  </p>
 
  <p>
-  Lx-Office kann solche Probleme automatisch beheben.
+  [% 'Lx-Office can fix these problems automatically.' | $T8 %]
 
-  Es wird einfach die Steuerschlüssel auf  0 setzen, was "keine Steuer" bedeutet und für solche Warenbestandsbuchungen der richtige Wert ist.
+  [% 'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' | $T8 %]
  </p>
 
  <form name="Form" action="acctranscorrections.pl" method="post">
@@ -18,8 +19,8 @@
   <p>
    <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="Buchungen korrigieren">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
+   <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html
index 32ada4291..a0fa6586c 100644
--- a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html
+++ b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys_master.html
@@ -1,20 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>There is at least one sales or purchase invoice for which
-   Lx-Office recorded an inventory transaction with taxkeys even
-   though no tax was recorded.</translate>
+  [% 'There is at least one sales or purchase invoice for which Lx-Office recorded an inventory transaction with taxkeys even though no tax was recorded.' | $T8 %]
  </p>
 
  <p>
-  <translate>Lx-Office can fix these problems automatically.</translate>
+  [% 'Lx-Office can fix these problems automatically.' | $T8 %]
 
-  <translate>It will simply set the taxkey to 0 (meaning "no taxes")
-   which is the correct value for such inventory
-   transactions.</translate>
+  [% 'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' | $T8 %]
  </p>
 
  <form name="Form" action="acctranscorrections.pl" method="post">
@@ -22,8 +19,8 @@
   <p>
    <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" class="submit" value="<translate>Fix transactions</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+   <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html
index 8b045cb31..1195f287e 100644
--- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html
+++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_de.html
@@ -1,33 +1,34 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Die folgende Buchung enthält falsche Steuern:
+  [% 'The following transaction contains wrong taxes:' | $T8 %]
   <a href="[% problem.link %]">
    [%- IF problem.data.module == 'ar' %]
-   Debitorenbuchung
+   [% 'AR Transaction' | $T8 %]
    [%- ELSIF problem.data.module == 'ap' %]
-   Kreditorenbuchung
+   [% 'AP Transaction' | $T8 %]
    [%- ELSE %]
-   Dialogbuchung
+   [% 'General Ledger Transaction' | $T8 %]
    [%- END %]
    [% HTML.escape(problem.data.reference) %]
   </a>
  </p>
 
- <p>Aktuell sieht die Buchung wie folgt aus:</p>
+ <p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
 
  <p>
   <table>
    <tr>
-    <th class="listheading">Konto</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-    <th class="listheading">Steuerschlüssel</th>
-    <th class="listheading">Gespeicherte Steuern</th>
-    <th class="listheading">Erwartete Steuern</th>
+    <th class="listheading">[% 'Account' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Taxkey' | $T8 %]</th>
+    <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
+    <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
     <th class="listheading"></th>
    </tr>
 
@@ -71,8 +72,8 @@
   <p>
    <input type="hidden" name="action" value="delete_transaction">
    <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="submit" class="submit" value="Buchung löschen">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
+   <input type="submit" class="submit" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html
index f35960d72..1195f287e 100644
--- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html
+++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes_master.html
@@ -1,33 +1,34 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>The following transaction contains wrong taxes:</translate>
+  [% 'The following transaction contains wrong taxes:' | $T8 %]
   <a href="[% problem.link %]">
    [%- IF problem.data.module == 'ar' %]
-   <translate>AR Transaction</translate>
+   [% 'AR Transaction' | $T8 %]
    [%- ELSIF problem.data.module == 'ap' %]
-   <translate>AP Transaction</translate>
+   [% 'AP Transaction' | $T8 %]
    [%- ELSE %]
-   <translate>General Ledger Transaction</translate>
+   [% 'General Ledger Transaction' | $T8 %]
    [%- END %]
    [% HTML.escape(problem.data.reference) %]
   </a>
  </p>
 
- <p><translate>At the moment the transaction looks like this:</translate></p>
+ <p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
 
  <p>
   <table>
    <tr>
-    <th class="listheading"><translate>Account</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-    <th class="listheading"><translate>Taxkey</translate></th>
-    <th class="listheading"><translate>Recorded Tax</translate></th>
-    <th class="listheading"><translate>Expected Tax</translate></th>
+    <th class="listheading">[% 'Account' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Taxkey' | $T8 %]</th>
+    <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
+    <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
     <th class="listheading"></th>
    </tr>
 
@@ -71,8 +72,8 @@
   <p>
    <input type="hidden" name="action" value="delete_transaction">
    <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
-   <input type="submit" class="submit" value="<translate>Delete transaction</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+   <input type="submit" class="submit" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html
index 611f76e80..c287a30c9 100644
--- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html
+++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_de.html
@@ -1,60 +1,61 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Die folgende Buchung enthält falsche Steuerschlüssel:
+  [% 'The following transaction contains wrong taxkeys:' | $T8 %]
   <a href="[% problem.link %]">
    [%- IF problem.data.module == 'ar' %]
-   Debitorenbuchung
+   [% 'AR Transaction' | $T8 %]
    [%- ELSIF problem.data.module == 'ap' %]
-   Kreditorenbuchung
+   [% 'AP Transaction' | $T8 %]
    [%- ELSE %]
-   Dialogbuchung
+   [% 'General Ledger Transaction' | $T8 %]
    [%- END %]
    [% HTML.escape(problem.data.reference) %]
   </a>
  </p>
 
  <p>
-  Dies kann aus zwei Gründen geschehen sein:
+  [% 'This could have happened for two reasons:' | $T8 %]
 
-  Zum Einen gab es einen Bug in Lx-Office, der dazu führte, dass bei Buchungen mit verschiedenen Steuerschlüssel auf ein Konto teilweise falsche Steuerschlüssel gespeichert wurden.
+  [% 'The first reason is that Lx-Office contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' | $T8 %]
 
-  Zum Anderen war es möglich, die Steuern unabhängig vom ausgewählten Steuerschlüssel selber einzugeben.
+  [% 'The second reason is that Lx-Office allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %]
 
-  Solche Einträge sind aber nicht DATEV-exportiertbar und müssen ebenfalls korrigiert werden.
+  [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %]
  </p>
 
  <p>
-  Nachfolgend wird angezeigt, wie die Buchung momentan aussieht.
+  [% 'The transaction is shown below in its current state.' | $T8 %]
 
-  Sie haben die Möglichkeit, die Buchung zu korrigieren, indem Sie in den Drop-Down-Boxen die richtigen Steuerschlüssel auswählen und anschließend auf den Button "Buchung korrigieren" drücken.
+  [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %]
 
-  Auch nach einer Korrektur kann es mit dieser Buchung noch weitere Probleme geben (z.B. nicht zum Steuerschlüssel passende Steuern), weshalb ein erneutes Ausführen der Hauptbuchanalyse empfohlen wird.
+  [% 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don't match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]
  </p>
 
  <p>
-  Alternativ können Sie die Buchung auch mit löschen lassen und sie anschließend neu eingeben.
+  [% 'You can also delete this transaction and re-enter it manually.' | $T8 %]
 
-  Drücken Sie dafür auf den Button "Buchung löschen".
+  [% 'In order to do that hit the button "Delete transaction".' | $T8 %]
  </p>
 
- <p>Aktuell sieht die Buchung wie folgt aus:</p>
+ <p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
 
  <form method="post" action="acctranscorrections.pl" name="Form">
   <p>
    <table>
     <tr>
-     <th class="listheading">Konto</th>
-     <th class="listheading">Soll</th>
-     <th class="listheading">Haben</th>
-     <th class="listheading">Gespeicherte Steuern</th>
-     <th class="listheading">Gespeicherter Steuerschlüssel</th>
-     <th class="listheading">Erwartete Steuern</th>
+     <th class="listheading">[% 'Account' | $T8 %]</th>
+     <th class="listheading">[% 'Debit' | $T8 %]</th>
+     <th class="listheading">[% 'Credit' | $T8 %]</th>
+     <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
+     <th class="listheading">[% 'Recorded taxkey' | $T8 %]</th>
+     <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
      <th class="listheading"></th>
-     <th class="listheading">Richtiger Steuerschlüssel</th>
+     <th class="listheading">[% 'Correct taxkey' | $T8 %]</th>
     </tr>
 
     [%- SET curr_row = 0 %]
@@ -97,7 +98,7 @@
          <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
          <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
          <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
-          <option value="">---bitte auswählen---</option>
+          <option value="">[% '---please select---' | $T8 %]</option>
           [%- FOREACH taxkey = row.correct_taxkeys %]
            <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
           [%- END %]
@@ -119,9 +120,9 @@
    <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
    <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
    <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
-   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="Buchung korrigieren" disabled>
-   <input type="submit" class="submit" name="action_delete_transaction" value="Buchung löschen">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
+   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled>
+   <input type="submit" class="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html
index 44fb60336..c287a30c9 100644
--- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html
+++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html
@@ -1,73 +1,61 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>The following transaction contains wrong taxkeys:</translate>
+  [% 'The following transaction contains wrong taxkeys:' | $T8 %]
   <a href="[% problem.link %]">
    [%- IF problem.data.module == 'ar' %]
-   <translate>AR Transaction</translate>
+   [% 'AR Transaction' | $T8 %]
    [%- ELSIF problem.data.module == 'ap' %]
-   <translate>AP Transaction</translate>
+   [% 'AP Transaction' | $T8 %]
    [%- ELSE %]
-   <translate>General Ledger Transaction</translate>
+   [% 'General Ledger Transaction' | $T8 %]
    [%- END %]
    [% HTML.escape(problem.data.reference) %]
   </a>
  </p>
 
  <p>
-  <translate>This could have happened for two reasons:</translate>
+  [% 'This could have happened for two reasons:' | $T8 %]
 
-  <translate>The first reason is that Lx-Office contained a bug which
-  resulted in the wrong taxkeys being recorded for transactions in
-  which two entries are posted for the same chart with different
-  taxkeys.</translate>
+  [% 'The first reason is that Lx-Office contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' | $T8 %]
 
-  <translate>The second reason is that Lx-Office allowed the user to
-  enter the tax amount manually regardless of the taxkey
-  used.</translate>
+  [% 'The second reason is that Lx-Office allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %]
 
-  <translate>Such entries cannot be exported into the DATEV format and
-   have to be fixed as well.</translate>
+  [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %]
  </p>
 
  <p>
-  <translate>The transaction is shown below in its current state.</translate>
+  [% 'The transaction is shown below in its current state.' | $T8 %]
 
-  <translate>You can correct this transaction by chosing the correct
-   taxkeys from the drop down boxes and hitting the button "Fix
-   transaction" afterwards.</translate>
+  [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %]
 
-  <translate>It is possible that even after such a correction there is
-   something wrong with this transaction (e.g. taxes that don't match
-   the selected taxkey). Therefore you should re-run the general ledger
-   analysis.</translate>
+  [% 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don't match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]
  </p>
 
  <p>
-  <translate>You can also delete this transaction and re-enter it
-   manually.</translate>
+  [% 'You can also delete this transaction and re-enter it manually.' | $T8 %]
 
-  <translate>In order to do that hit the button "Delete
-   transaction".</translate>
+  [% 'In order to do that hit the button "Delete transaction".' | $T8 %]
  </p>
 
- <p><translate>At the moment the transaction looks like this:</translate></p>
+ <p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
 
  <form method="post" action="acctranscorrections.pl" name="Form">
   <p>
    <table>
     <tr>
-     <th class="listheading"><translate>Account</translate></th>
-     <th class="listheading"><translate>Debit</translate></th>
-     <th class="listheading"><translate>Credit</translate></th>
-     <th class="listheading"><translate>Recorded Tax</translate></th>
-     <th class="listheading"><translate>Recorded taxkey</translate></th>
-     <th class="listheading"><translate>Expected Tax</translate></th>
+     <th class="listheading">[% 'Account' | $T8 %]</th>
+     <th class="listheading">[% 'Debit' | $T8 %]</th>
+     <th class="listheading">[% 'Credit' | $T8 %]</th>
+     <th class="listheading">[% 'Recorded Tax' | $T8 %]</th>
+     <th class="listheading">[% 'Recorded taxkey' | $T8 %]</th>
+     <th class="listheading">[% 'Expected Tax' | $T8 %]</th>
      <th class="listheading"></th>
-     <th class="listheading"><translate>Correct taxkey</translate></th>
+     <th class="listheading">[% 'Correct taxkey' | $T8 %]</th>
     </tr>
 
     [%- SET curr_row = 0 %]
@@ -110,7 +98,7 @@
          <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
          <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
          <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
-          <option value=""><translate>---please select---</translate></option>
+          <option value="">[% '---please select---' | $T8 %]</option>
           [%- FOREACH taxkey = row.correct_taxkeys %]
            <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
           [%- END %]
@@ -132,9 +120,9 @@
    <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
    <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
    <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
-   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="<translate>Fix transaction</translate>" disabled>
-   <input type="submit" class="submit" name="action_delete_transaction" value="<translate>Delete transaction</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+   <input type="submit" class="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled>
+   <input type="submit" class="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html
index 39fb2c67e..c07547135 100644
--- a/templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html
+++ b/templates/webpages/acctranscorrections/delete_transaction_confirmation_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
 <body>
@@ -5,11 +6,11 @@
 
  <p>
   [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('Wollen Sie wirklich die Debitorenbuchung #1 löschen?', reference)) %]
+  [%- LxERP.t8('Do you really want to delete AR transaction #1?', reference) | html %]
   [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('Wollen Sie wirklich die Kreditorenbuchung #1 löschen?', reference)) %]
+  [%- LxERP.t8('Do you really want to delete AP transaction #1?', reference) | html %]
   [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('Wollen Sie wirklich die Dialogbuchung #1 löschen?', reference)) %]
+  [%- LxERP.t8('Do you really want to delete GL transaction #1?', reference) | html %]
   [%- END %]
  </p>
 
@@ -24,8 +25,8 @@
    <input type="hidden" name="confirmation" value="1">
    <input type="hidden" name="action" value="delete_transaction">
 
-   <input type="submit" value="Ja">
-   <input type="button" onclick="history.back()" value="Nein">
+   <input type="submit" value="[% 'Yes' | $T8 %]">
+   <input type="button" onclick="history.back()" value="[% 'No' | $T8 %]">
   </form>
  </p>
 </body>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html b/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html
index bfc667502..c07547135 100644
--- a/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html
+++ b/templates/webpages/acctranscorrections/delete_transaction_confirmation_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
 <body>
@@ -5,11 +6,11 @@
 
  <p>
   [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('<translate>Do you really want to delete AR transaction #1?</translate>', reference)) %]
+  [%- LxERP.t8('Do you really want to delete AR transaction #1?', reference) | html %]
   [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('<translate>Do you really want to delete AP transaction #1?</translate>', reference)) %]
+  [%- LxERP.t8('Do you really want to delete AP transaction #1?', reference) | html %]
   [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('<translate>Do you really want to delete GL transaction #1?</translate>', reference)) %]
+  [%- LxERP.t8('Do you really want to delete GL transaction #1?', reference) | html %]
   [%- END %]
  </p>
 
@@ -24,8 +25,8 @@
    <input type="hidden" name="confirmation" value="1">
    <input type="hidden" name="action" value="delete_transaction">
 
-   <input type="submit" value="<translate>Yes</translate>">
-   <input type="button" onclick="history.back()" value="<translate>No</translate>">
+   <input type="submit" value="[% 'Yes' | $T8 %]">
+   <input type="button" onclick="history.back()" value="[% 'No' | $T8 %]">
   </form>
  </p>
 </body>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_de.html b/templates/webpages/acctranscorrections/delete_transaction_de.html
index d992ecfef..2c461b04f 100644
--- a/templates/webpages/acctranscorrections/delete_transaction_de.html
+++ b/templates/webpages/acctranscorrections/delete_transaction_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
 <body>
@@ -5,11 +6,11 @@
 
  <p>
   [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('Die Debitorenbuchung #1 wurde gelöscht.', reference)) %]
+  [%- LxERP.t8('The AR transaction #1 has been deleted.', reference) | html %]
   [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('Die Kreditorenbuchung #1 wurde gelöscht.', reference)) %]
+  [%- LxERP.t8('The AP transaction #1 has been deleted.', reference) | html %]
   [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('Die Dialogbuchung #1 wurde gelöscht.', reference)) %]
+  [%- LxERP.t8('The GL transaction #1 has been deleted.', reference) | html %]
   [%- END %]
  </p>
 
@@ -18,7 +19,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 </body>
diff --git a/templates/webpages/acctranscorrections/delete_transaction_master.html b/templates/webpages/acctranscorrections/delete_transaction_master.html
index 9bae3777a..2c461b04f 100644
--- a/templates/webpages/acctranscorrections/delete_transaction_master.html
+++ b/templates/webpages/acctranscorrections/delete_transaction_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
 <body>
@@ -5,11 +6,11 @@
 
  <p>
   [%- IF module == 'ar' %]
-  [%- HTML.escape(LxERP.format_string('<translate>The AR transaction #1 has been deleted.</translate>', reference)) %]
+  [%- LxERP.t8('The AR transaction #1 has been deleted.', reference) | html %]
   [%- ELSIF module == 'ap' %]
-  [%- HTML.escape(LxERP.format_string('<translate>The AP transaction #1 has been deleted.</translate>', reference)) %]
+  [%- LxERP.t8('The AP transaction #1 has been deleted.', reference) | html %]
   [%- ELSE %]
-  [%- HTML.escape(LxERP.format_string('<translate>The GL transaction #1 has been deleted.</translate>', reference)) %]
+  [%- LxERP.t8('The GL transaction #1 has been deleted.', reference) | html %]
   [%- END %]
  </p>
 
@@ -18,7 +19,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 </body>
diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html
index 134b5d660..f0999282f 100644
--- a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html
+++ b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_de.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Die Probleme mit falschen Steuerschlüssel bei Kreditoren- und Debitorenbuchungen wurden behoben.
+  [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
 
-  Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
  </p>
 
  <p>
@@ -14,7 +15,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html
index 2e75f2742..f0999282f 100644
--- a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html
+++ b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys_master.html
@@ -1,14 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>The wrong taxkeys for AP and AR transactions have been
-   fixed.</translate>
+  [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
 
-  <translate>Please re-run the analysis for broken general ledger
-   entries by clicking this button:</translate>
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
  </p>
 
  <p>
@@ -16,7 +15,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html
index 920e0645b..ee0c244a6 100644
--- a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html
+++ b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_de.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Die falschen Steuerschlüssel für Warenbestandsbuchungen bei Einkaufs- und Verkaufsrechnungen wurden behoben.
+  [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
 
-  Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
  </p>
 
  <p>
@@ -14,7 +15,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html
index 8fb9bb84c..ee0c244a6 100644
--- a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html
+++ b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys_master.html
@@ -1,14 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>The wrong taxkeys for inventory transactions for sales
-   and purchase invoices have been fixed.</translate>
+  [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
 
-  <translate>Please re-run the analysis for broken general ledger
-   entries by clicking this button:</translate>
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
  </p>
 
  <p>
@@ -16,7 +15,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html
index 64a6cdaa2..7a3f04434 100644
--- a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html
+++ b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_de.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Die Steuerschlüssel wurden nach Ihrer Auswahl korrigiert.
+  [% 'The wrong taxkeys have been fixed.' | $T8 %]
 
-  Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
  </p>
 
  <p>
@@ -14,7 +15,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="Analyse wiederholen">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html
index fca2c2e45..7a3f04434 100644
--- a/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html
+++ b/templates/webpages/acctranscorrections/fix_wrong_taxkeys_master.html
@@ -1,13 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>The wrong taxkeys have been fixed.</translate>
+  [% 'The wrong taxkeys have been fixed.' | $T8 %]
 
-  <translate>Please re-run the analysis for broken general ledger
-   entries by clicking this button:</translate>
+  [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
  </p>
 
  <p>
@@ -15,7 +15,7 @@
 
    <input type="hidden" name="action" value="redirect">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
-   <input type="submit" value="<translate>Re-run analysis</translate>">
+   <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/admin/adminlogin_de.html b/templates/webpages/admin/adminlogin_de.html
index cc37bee57..e82187431 100644
--- a/templates/webpages/admin/adminlogin_de.html
+++ b/templates/webpages/admin/adminlogin_de.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
 
  <div align="center">
 
   <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
 
-  <h1 class="login">Version [% HTML.escape(version) %]</h1>
+  <h1 class="login">[% 'Version' | $T8 %] [% HTML.escape(version) %]</h1>
 
-  <h2>Administration</h2>
+  <h2>[% 'Administration' | $T8 %]</h2>
 
   [% IF error_message %]
   <p><span class="error_message">[% error_message %]</span></p>
@@ -16,16 +17,16 @@
 
    <table>
     <tr>
-     <th>Passwort</th>
+     <th>[% 'Password' | $T8 %]</th>
      <td><input type="password" name="rpw" id="rpw"></td>
-     <td><input type="submit" class="submit" name="action" value="Anmeldung"></td>
+     <td><input type="submit" class="submit" name="action" value="[% 'Login' | $T8 %]"></td>
     </tr>
     <input type="hidden" name="action" value="login">
    </table>
 
   </form>
 
-  <p><a href="http://www.lx-office.org/">Lx-Office-Webseite</a></p>
+  <p><a href="http://www.lx-office.org/">[% 'Lx-Office website' | $T8 %]</a></p>
 
  </div>
 
diff --git a/templates/webpages/admin/adminlogin_master.html b/templates/webpages/admin/adminlogin_master.html
index 43f5be213..e82187431 100644
--- a/templates/webpages/admin/adminlogin_master.html
+++ b/templates/webpages/admin/adminlogin_master.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
 
  <div align="center">
 
   <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
 
-  <h1 class="login"><translate>Version</translate> [% HTML.escape(version) %]</h1>
+  <h1 class="login">[% 'Version' | $T8 %] [% HTML.escape(version) %]</h1>
 
-  <h2><translate>Administration</translate></h2>
+  <h2>[% 'Administration' | $T8 %]</h2>
 
   [% IF error_message %]
   <p><span class="error_message">[% error_message %]</span></p>
@@ -16,16 +17,16 @@
 
    <table>
     <tr>
-     <th><translate>Password</translate></th>
+     <th>[% 'Password' | $T8 %]</th>
      <td><input type="password" name="rpw" id="rpw"></td>
-     <td><input type="submit" class="submit" name="action" value="<translate>Login</translate>"></td>
+     <td><input type="submit" class="submit" name="action" value="[% 'Login' | $T8 %]"></td>
     </tr>
     <input type="hidden" name="action" value="login">
    </table>
 
   </form>
 
-  <p><a href="http://www.lx-office.org/"><translate>Lx-Office website</translate></a></p>
+  <p><a href="http://www.lx-office.org/">[% 'Lx-Office website' | $T8 %]</a></p>
 
  </div>
 
diff --git a/templates/webpages/admin/backup_dataset_de.html b/templates/webpages/admin/backup_dataset_de.html
index 2ff379916..073774187 100644
--- a/templates/webpages/admin/backup_dataset_de.html
+++ b/templates/webpages/admin/backup_dataset_de.html
@@ -1,9 +1,10 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
 
  <script type="text/javascript">
   <!--
       function set_subject() {
-        var subject_template = "Sicherung der Datenbank";
+        var subject_template = "[% 'Backup of dataset' | $T8 %]";
         var subject = document.Form.subject.value;
 
         if ((subject == "") || (subject.substr(0, subject_template.length) == subject_template)) {
@@ -16,7 +17,7 @@
  <h2>[% title %]</h2>
 
  [% IF NO_DATABSES %]
-  Auf diesem Server wurden keine Datenbanken gefunden.
+  [% 'No databases have been found on this server.' | $T8 %]
 
   [% ELSE %]
 
@@ -29,44 +30,44 @@
    <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
    <p>
-    Bitte w&auml;hlen Sie die zu sichernde Datenbank gefunden:
+    [% 'Please select the database you want to backup' | $T8 %]:
     <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
    </p>
 
    <table>
     <tr>
      <td valign="top"><input type="radio" name="destination" id="destination_download" value="download" checked></td>
-     <td valign="top"><label for="destination_download">Die Sicherungsdatei herunterladen</label></td>
+     <td valign="top"><label for="destination_download">[% 'Download the backup' | $T8 %]</label></td>
     </tr>
 
     <tr>
      <td valign="top"><input type="radio" name="destination" id="destination_email" value="email"></td>
      <td valign="top">
-      <label for="destination_email">Die Sicherungsdatei per Email verschicken</label><br>
+      <label for="destination_email">[% 'Send the backup via Email' | $T8 %]</label><br>
 
       <table>
        <tr>
-        <td valign="top" align="right">Von</td>
+        <td valign="top" align="right">[% 'From' | $T8 %]</td>
         <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right">An</td>
+        <td valign="top" align="right">[% 'To' | $T8 %]</td>
         <td valign="top"><input name="to" size="40"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right">Cc</td>
+        <td valign="top" align="right">[% 'Cc' | $T8 %]</td>
         <td valign="top"><input name="cc" size="40"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right">Betreff</td>
+        <td valign="top" align="right">[% 'Subject' | $T8 %]</td>
         <td valign="top"><input name="subject" size="40"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right">Nachricht</td>
+        <td valign="top" align="right">[% 'Message' | $T8 %]</td>
         <td valign="top"><textarea name="message" cols="40" rows="10"></textarea></td>
        </tr>
 
@@ -85,8 +86,8 @@
 
    <br>
 
-   <input type="submit" class="submit" name="action" value="Weiter">
-   <input type="submit" class="submit" name="action" value="Zurück">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
 
   </form>
 
diff --git a/templates/webpages/admin/backup_dataset_email_done_de.html b/templates/webpages/admin/backup_dataset_email_done_de.html
index 7f2d34b8d..68f31d771 100644
--- a/templates/webpages/admin/backup_dataset_email_done_de.html
+++ b/templates/webpages/admin/backup_dataset_email_done_de.html
@@ -1,12 +1,14 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<body class="admin">
 
  <h2>[% title %]</h2>
 
- <p>Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.</p>
+ <p>[% LxERP.t8('The dataset backup has been sent via email to #1.', to) | html %]</p>
 
  <form method="post" action="admin.pl">
   <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="Weiter">
+  <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 </body>
 </html>
diff --git a/templates/webpages/admin/backup_dataset_email_done_master.html b/templates/webpages/admin/backup_dataset_email_done_master.html
index f76c1e5f8..68f31d771 100644
--- a/templates/webpages/admin/backup_dataset_email_done_master.html
+++ b/templates/webpages/admin/backup_dataset_email_done_master.html
@@ -1,12 +1,14 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<body class="admin">
 
  <h2>[% title %]</h2>
 
- <p><translate>The dataset backup has been sent via email to [% HTML.escape(to) %].</translate></p>
+ <p>[% LxERP.t8('The dataset backup has been sent via email to #1.', to) | html %]</p>
 
  <form method="post" action="admin.pl">
   <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="<translate>Continue</translate>">
+  <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 </body>
 </html>
diff --git a/templates/webpages/admin/backup_dataset_master.html b/templates/webpages/admin/backup_dataset_master.html
index d795a9b20..073774187 100644
--- a/templates/webpages/admin/backup_dataset_master.html
+++ b/templates/webpages/admin/backup_dataset_master.html
@@ -1,9 +1,10 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
 
  <script type="text/javascript">
   <!--
       function set_subject() {
-        var subject_template = "<translate>Backup of dataset</translate>";
+        var subject_template = "[% 'Backup of dataset' | $T8 %]";
         var subject = document.Form.subject.value;
 
         if ((subject == "") || (subject.substr(0, subject_template.length) == subject_template)) {
@@ -16,7 +17,7 @@
  <h2>[% title %]</h2>
 
  [% IF NO_DATABSES %]
-  <translate>No databases have been found on this server.</translate>
+  [% 'No databases have been found on this server.' | $T8 %]
 
   [% ELSE %]
 
@@ -29,44 +30,44 @@
    <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
    <p>
-    <translate>Please select the database you want to backup</translate>:
+    [% 'Please select the database you want to backup' | $T8 %]:
     <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
    </p>
 
    <table>
     <tr>
      <td valign="top"><input type="radio" name="destination" id="destination_download" value="download" checked></td>
-     <td valign="top"><label for="destination_download"><translate>Download the backup</translate></label></td>
+     <td valign="top"><label for="destination_download">[% 'Download the backup' | $T8 %]</label></td>
     </tr>
 
     <tr>
      <td valign="top"><input type="radio" name="destination" id="destination_email" value="email"></td>
      <td valign="top">
-      <label for="destination_email"><translate>Send the backup via Email</translate></label><br>
+      <label for="destination_email">[% 'Send the backup via Email' | $T8 %]</label><br>
 
       <table>
        <tr>
-        <td valign="top" align="right"><translate>From</translate></td>
+        <td valign="top" align="right">[% 'From' | $T8 %]</td>
         <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right"><translate>To</translate></td>
+        <td valign="top" align="right">[% 'To' | $T8 %]</td>
         <td valign="top"><input name="to" size="40"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right"><translate>Cc</translate></td>
+        <td valign="top" align="right">[% 'Cc' | $T8 %]</td>
         <td valign="top"><input name="cc" size="40"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right"><translate>Subject</translate></td>
+        <td valign="top" align="right">[% 'Subject' | $T8 %]</td>
         <td valign="top"><input name="subject" size="40"></td>
        </tr>
 
        <tr>
-        <td valign="top" align="right"><translate>Message</translate></td>
+        <td valign="top" align="right">[% 'Message' | $T8 %]</td>
         <td valign="top"><textarea name="message" cols="40" rows="10"></textarea></td>
        </tr>
 
@@ -85,8 +86,8 @@
 
    <br>
 
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
-   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
 
   </form>
 
diff --git a/templates/webpages/admin/check_auth_database_de.html b/templates/webpages/admin/check_auth_database_de.html
index e1d4ef025..4c554130e 100644
--- a/templates/webpages/admin/check_auth_database_de.html
+++ b/templates/webpages/admin/check_auth_database_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -5,46 +6,46 @@
  <form method="post" action="admin.pl">
 
   <p>
-   Die Datenbank zur Verwaltung der Benutzerdaten und zur Authentifizierung existiert nicht. Sie k&ouml;nnen Lx-Office diese Datenbank mit den folgenden Parametern anlegen lassen:
+   [% 'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' | $T8 %]
   </p>
 
   <table border="0">
    <tr>
-    <td>Datenbankcomputer:</td>
+    <td>[% 'Host' | $T8 %]:</td>
     <td>[% HTML.escape(db_host) %]</td>
    </tr>
    <tr>
-    <td>Port:</td>
+    <td>[% 'Port' | $T8 %]:</td>
     <td>[% HTML.escape(db_port) %]</td>
    </tr>
    <tr>
-    <td>Benutzername:</td>
+    <td>[% 'User name' | $T8 %]:</td>
     <td>[% HTML.escape(db_user) %]</td>
    </tr>
    <tr>
-    <td>Datenbankname:</td>
+    <td>[% 'Database name' | $T8 %]:</td>
     <td>[% HTML.escape(db_db) %]</td>
    </tr>
   </table>
 
   <p>
-   Bitte geben Sie den Namen der Datenbank an, die als Vorlage f&uuml;r die neue Datenbank benutzt wird:
+   [% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %]
   </p>
 
-  <p>Datenbankvorlage: <input name="db_template" value="template1"></p>
+  <p>[% 'Template database' | $T8 %]: <input name="db_template" value="template1"></p>
 
   <p>
-   Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so k&ouml;nnen Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:
+   [% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %]
   </p>
 
   <table border="0"
    <tr>
-    <td>Datenbankadministrator:</td>
+    <td>[% 'Superuser name' | $T8 %]:</td>
     <td><input name="db_superuser"></td>
    </tr>
 
    <tr>
-    <td>Passwort:</td>
+    <td>[% 'Password' | $T8 %]:</td>
     <td><input type="password" name="db_superuser_password"></td>
    </tr>
   </table>
@@ -52,8 +53,8 @@
   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="action" value="create_auth_db">
 
-  <input type="submit" class="submit" value="Datenbank anlegen">
-  <input type="button" class="submit" onclick="history.back()" value="Zurück">
+  <input type="submit" class="submit" value="[% 'Create Dataset' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/check_auth_database_master.html b/templates/webpages/admin/check_auth_database_master.html
index 313f0573b..4c554130e 100644
--- a/templates/webpages/admin/check_auth_database_master.html
+++ b/templates/webpages/admin/check_auth_database_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -5,51 +6,46 @@
  <form method="post" action="admin.pl">
 
   <p>
-   <translate>The database for user management and authentication does
-    not exist. You can create let Lx-Office create it with the
-    following parameters:</translate>
+   [% 'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' | $T8 %]
   </p>
 
   <table border="0">
    <tr>
-    <td><translate>Host</translate>:</td>
+    <td>[% 'Host' | $T8 %]:</td>
     <td>[% HTML.escape(db_host) %]</td>
    </tr>
    <tr>
-    <td><translate>Port</translate>:</td>
+    <td>[% 'Port' | $T8 %]:</td>
     <td>[% HTML.escape(db_port) %]</td>
    </tr>
    <tr>
-    <td><translate>User name</translate>:</td>
+    <td>[% 'User name' | $T8 %]:</td>
     <td>[% HTML.escape(db_user) %]</td>
    </tr>
    <tr>
-    <td><translate>Database name</translate>:</td>
+    <td>[% 'Database name' | $T8 %]:</td>
     <td>[% HTML.escape(db_db) %]</td>
    </tr>
   </table>
 
   <p>
-   <translate>Please enter the name of the database that will be
-    used as the template for the new database:</translate>
+   [% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %]
   </p>
 
-  <p><translate>Template database</translate>: <input name="db_template" value="template1"></p>
+  <p>[% 'Template database' | $T8 %]: <input name="db_template" value="template1"></p>
 
   <p>
-   <translate>If the database user listed above does not have the
-    right to create a database then enter the name and password of the
-    superuser below:</translate>
+   [% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %]
   </p>
 
   <table border="0"
    <tr>
-    <td><translate>Superuser name</translate>:</td>
+    <td>[% 'Superuser name' | $T8 %]:</td>
     <td><input name="db_superuser"></td>
    </tr>
 
    <tr>
-    <td><translate>Password</translate>:</td>
+    <td>[% 'Password' | $T8 %]:</td>
     <td><input type="password" name="db_superuser_password"></td>
    </tr>
   </table>
@@ -57,8 +53,8 @@
   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="action" value="create_auth_db">
 
-  <input type="submit" class="submit" value="<translate>Create Dataset</translate>">
-  <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+  <input type="submit" class="submit" value="[% 'Create Dataset' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/check_auth_tables_de.html b/templates/webpages/admin/check_auth_tables_de.html
index 79579ba3f..64ef01b29 100644
--- a/templates/webpages/admin/check_auth_tables_de.html
+++ b/templates/webpages/admin/check_auth_tables_de.html
@@ -1,32 +1,33 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  <p>
-  Die Tabellen zum Speichern der Benutzerdaten und zur Benutzerauthentifizierung wurden nicht gefunden. Sie werden in der folgenden Datenbank angelegt:
+  [% 'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' | $T8 %]
  </p>
 
  <table border="0">
   <tr>
-   <td>Datenbankcomputer:</td>
+   <td>[% 'Host' | $T8 %]:</td>
    <td>[% HTML.escape(db_host) %]</td>
   </tr>
   <tr>
-   <td>Port:</td>
+   <td>[% 'Port' | $T8 %]:</td>
    <td>[% HTML.escape(db_port) %]</td>
   </tr>
   <tr>
-   <td>Benutzername:</td>
+   <td>[% 'User name' | $T8 %]:</td>
    <td>[% HTML.escape(db_user) %]</td>
   </tr>
   <tr>
-   <td>Datenbankname:</td>
+   <td>[% 'Database name' | $T8 %]:</td>
    <td>[% HTML.escape(db_db) %]</td>
   </tr>
  </table>
 
  <p>
-  Wenn Sie einen der Parameter &auml;ndern wollen, so dr&uuml;cken Sie auf den &quot;Zur&uuml;ck&quot;-Button, bearbeiten Sie die Datei &quot;config/authentication.pl&quot;, und melden Sie sich erneut im Administrationsbereich an.
+  [% 'If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/authentication.pl&quot; and login into the admin module again.' | $T8 %]
  </p>
 
  <form method="post" action="admin.pl">
@@ -34,8 +35,8 @@
   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="action" value="create_auth_tables">
 
-  <input type="submit" class="submit" value="Tabellen anlegen">
-  <input type="button" class="submit" onclick="history.back()" value="Zurück">
+  <input type="submit" class="submit" value="[% 'Create tables' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/check_auth_tables_master.html b/templates/webpages/admin/check_auth_tables_master.html
index 5ce296e67..64ef01b29 100644
--- a/templates/webpages/admin/check_auth_tables_master.html
+++ b/templates/webpages/admin/check_auth_tables_master.html
@@ -1,37 +1,33 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  <p>
-  <translate>The tables for user management and authentication do not
-   exist. They will be created in the next step in the following
-   database:</translate>
+  [% 'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' | $T8 %]
  </p>
 
  <table border="0">
   <tr>
-   <td><translate>Host</translate>:</td>
+   <td>[% 'Host' | $T8 %]:</td>
    <td>[% HTML.escape(db_host) %]</td>
   </tr>
   <tr>
-   <td><translate>Port</translate>:</td>
+   <td>[% 'Port' | $T8 %]:</td>
    <td>[% HTML.escape(db_port) %]</td>
   </tr>
   <tr>
-   <td><translate>User name</translate>:</td>
+   <td>[% 'User name' | $T8 %]:</td>
    <td>[% HTML.escape(db_user) %]</td>
   </tr>
   <tr>
-   <td><translate>Database name</translate>:</td>
+   <td>[% 'Database name' | $T8 %]:</td>
    <td>[% HTML.escape(db_db) %]</td>
   </tr>
  </table>
 
  <p>
-  <translate>If you want to change any of these parameters then press
-   the &quot;Back&quot; button, edit the file
-   &quot;config/authentication.pl&quot; and login into the admin module
-   again.</translate>
+  [% 'If you want to change any of these parameters then press the &quot;Back&quot; button, edit the file &quot;config/authentication.pl&quot; and login into the admin module again.' | $T8 %]
  </p>
 
  <form method="post" action="admin.pl">
@@ -39,8 +35,8 @@
   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="action" value="create_auth_tables">
 
-  <input type="submit" class="submit" value="<translate>Create tables</translate>">
-  <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+  <input type="submit" class="submit" value="[% 'Create tables' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/create_dataset_de.html b/templates/webpages/admin/create_dataset_de.html
index f830d3113..db60b3b05 100644
--- a/templates/webpages/admin/create_dataset_de.html
+++ b/templates/webpages/admin/create_dataset_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
   <h2>[% title %]</h2>
@@ -5,23 +6,23 @@
   <form method="post" action="admin.pl">
 
    <p>
-    Sie können entweder eine neue Datenbank erstellen oder eine existierende auswählen.
-    In letzterem Fall werden die von Lx-Office benötigten Tabellen in dieser existierenden Datenbank angelegt.
+    [% 'You can either create a new database or chose an existing database.' | $T8 %]
+    [% 'In the latter case the tables needed by Lx-Office will be created in that database.' | $T8 %]
    </p>
 
    <table>
     <tr>
-     <th valign="top" align="right" nowrap>existierende Datenbanken</th>
+     <th valign="top" align="right" nowrap>[% 'Existing Datasets' | $T8 %]</th>
      <td valign="top">[% HTML.escape(dbsources) %]</td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Datenbank anlegen</th>
+     <th align="right" nowrap>[% 'Create Dataset' | $T8 %]</th>
      <td><input name="db"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Schriftsatz</th>
+     <th align="right" nowrap>[% 'Multibyte Encoding' | $T8 %]</th>
      <td>
       [%- IF FORCE_DBENCODING %]
       <input type="hidden" name="encoding" value="[% HTML.escape(FORCE_DBENCODING) %]">
@@ -35,7 +36,7 @@
     </tr>
 
     <tr>
-     <th valign="top" align="right" nowrap>Kontenplan anlegen</th>
+     <th valign="top" align="right" nowrap>[% 'Create Chart of Accounts' | $T8 %]</th>
      <td>
       <select name="chart">
        [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
@@ -58,7 +59,7 @@
 
    <hr size="3" noshade>
 
-   <p><input type="submit" class="submit" name="action" value="Weiter"></p>
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
 
   </form>
 
diff --git a/templates/webpages/admin/create_dataset_master.html b/templates/webpages/admin/create_dataset_master.html
index 7e633b665..db60b3b05 100644
--- a/templates/webpages/admin/create_dataset_master.html
+++ b/templates/webpages/admin/create_dataset_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
   <h2>[% title %]</h2>
@@ -5,25 +6,23 @@
   <form method="post" action="admin.pl">
 
    <p>
-    <translate>You can either create a new database or chose an
-     existing database.</translate>
-    <translate>In the latter case the tables needed by Lx-Office will
-     be created in that database.</translate>
+    [% 'You can either create a new database or chose an existing database.' | $T8 %]
+    [% 'In the latter case the tables needed by Lx-Office will be created in that database.' | $T8 %]
    </p>
 
    <table>
     <tr>
-     <th valign="top" align="right" nowrap><translate>Existing Datasets</translate></th>
+     <th valign="top" align="right" nowrap>[% 'Existing Datasets' | $T8 %]</th>
      <td valign="top">[% HTML.escape(dbsources) %]</td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Create Dataset</translate></th>
+     <th align="right" nowrap>[% 'Create Dataset' | $T8 %]</th>
      <td><input name="db"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Multibyte Encoding</translate></th>
+     <th align="right" nowrap>[% 'Multibyte Encoding' | $T8 %]</th>
      <td>
       [%- IF FORCE_DBENCODING %]
       <input type="hidden" name="encoding" value="[% HTML.escape(FORCE_DBENCODING) %]">
@@ -37,7 +36,7 @@
     </tr>
 
     <tr>
-     <th valign="top" align="right" nowrap><translate>Create Chart of Accounts</translate></th>
+     <th valign="top" align="right" nowrap>[% 'Create Chart of Accounts' | $T8 %]</th>
      <td>
       <select name="chart">
        [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
@@ -60,7 +59,7 @@
 
    <hr size="3" noshade>
 
-   <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
 
   </form>
 
diff --git a/templates/webpages/admin/create_standard_group_ask_de.html b/templates/webpages/admin/create_standard_group_ask_de.html
index 9b446f547..fae84772d 100644
--- a/templates/webpages/admin/create_standard_group_ask_de.html
+++ b/templates/webpages/admin/create_standard_group_ask_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -6,41 +7,41 @@
 
   <p>
 
-   Lx-Office wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.
+   [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %]
 
-   Sie m&uuml;ssen mindestens eine Benutzergruppe anlegen, ihr Zugriff auf die verschiedenen Funktionsbereiche von Lx-Office gew&auml;hren und Benutzer dieser Gruppe zuordnen.
+   [% 'You have to create at least one group, grant it access to Lx-Office's functions and assign users to it.' | $T8 %]
 
-   Andernfalls haben alle Benutzer nur Zugriff auf ihre Benutzereinstellungen.
+   [% 'Otherwise all users will only have access to their own settings.' | $T8 %]
 
   </p>
 
   <p>
 
-   Im Rahmen dieser Benutzerdatenmigration kann Lx-Office eine solche Gruppe f&uuml;r Sie anlegen und allen Benutzern Zugriff auf alle Lx-Office-Funktionen gew&auml;hren.
+   [% 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office's functions.' | $T8 %]
 
-   Dieses entspricht dem Verhalten von Lx-Office vor Version 2.4.4.
+   [% 'This corresponds to Lx-Office's behavior prior to version 2.4.4.' | $T8 %]
 
   </p>
 
   <p>
 
-   Alternativ k&ouml;nnen Sie diesen Schritt &uuml;berspringen und selber Gruppen anlegen.
+   [% 'Alternatively you can skip this step and create groups yourself.' | $T8 %]
 
   </p>
 
   <p>
 
-   Wollen Sie, dass Lx-Office eine Gruppe mit Zugriff auf alle Funktionen anlegt?
+   [% 'Do you want Lx-Office to create a group for access to all functions?' | $T8 %]
 
-   Diese Gruppe wird &quot;Vollzugriff&quot; genannt.
+   [% 'This group will be called &quot;Full Access&quot;.' | $T8 %]
 
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
 
   <p>
-   <input type="submit" class="submit" name="action_create_standard_group" value="Ja">
-   <input type="submit" class="submit" name="action_dont_create_standard_group" value="Nein">
+   <input type="submit" class="submit" name="action_create_standard_group" value="[% 'Yes' | $T8 %]">
+   <input type="submit" class="submit" name="action_dont_create_standard_group" value="[% 'No' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/create_standard_group_ask_master.html b/templates/webpages/admin/create_standard_group_ask_master.html
index 1513b3802..fae84772d 100644
--- a/templates/webpages/admin/create_standard_group_ask_master.html
+++ b/templates/webpages/admin/create_standard_group_ask_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -6,49 +7,41 @@
 
   <p>
 
-   <translate>Lx-Office has been switched to group-based access
-    restrictions.</translate>
+   [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %]
 
-   <translate>You have to create at least one group, grant it access
-    to Lx-Office's functions and assign users to it.</translate>
+   [% 'You have to create at least one group, grant it access to Lx-Office's functions and assign users to it.' | $T8 %]
 
-   <translate>Otherwise all users will only have access to their own
-    settings.</translate>
+   [% 'Otherwise all users will only have access to their own settings.' | $T8 %]
 
   </p>
 
   <p>
 
-   <translate>During this user migration Lx-Office can create such a
-    group for you and grant all users access to all of Lx-Office's
-    functions.</translate>
+   [% 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office's functions.' | $T8 %]
 
-   <translate>This corresponds to Lx-Office's behavior prior to
-    version 2.4.4.</translate>
+   [% 'This corresponds to Lx-Office's behavior prior to version 2.4.4.' | $T8 %]
 
   </p>
 
   <p>
 
-   <translate>Alternatively you can skip this step and create groups
-    yourself.</translate>
+   [% 'Alternatively you can skip this step and create groups yourself.' | $T8 %]
 
   </p>
 
   <p>
 
-   <translate>Do you want Lx-Office to create a group for access to
-    all functions?</translate>
+   [% 'Do you want Lx-Office to create a group for access to all functions?' | $T8 %]
 
-   <translate>This group will be called &quot;Full Access&quot;.</translate>
+   [% 'This group will be called &quot;Full Access&quot;.' | $T8 %]
 
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
 
   <p>
-   <input type="submit" class="submit" name="action_create_standard_group" value="<translate>Yes</translate>">
-   <input type="submit" class="submit" name="action_dont_create_standard_group" value="<translate>No</translate>">
+   <input type="submit" class="submit" name="action_create_standard_group" value="[% 'Yes' | $T8 %]">
+   <input type="submit" class="submit" name="action_dont_create_standard_group" value="[% 'No' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/dbadmin_de.html b/templates/webpages/admin/dbadmin_de.html
index 987560492..7533dcd56 100644
--- a/templates/webpages/admin/dbadmin_de.html
+++ b/templates/webpages/admin/dbadmin_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
   <h2>[% title %]</h2>
@@ -18,25 +19,25 @@
 
           <tr>
 
-           <th align="right">Datenbankcomputer</th>
+           <th align="right">[% 'Host' | $T8 %]</th>
            <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
-           <th align="right">Port</th>
+           <th align="right">[% 'Port' | $T8 %]</th>
            <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
 
           </tr>
 
           <tr>
 
-           <th align="right">Benutzer</th>
+           <th align="right">[% 'User' | $T8 %]</th>
            <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
-           <th align="right">Passwort</th>
+           <th align="right">[% 'Password' | $T8 %]</th>
            <td><input type="password" name="dbpasswd" size="10"></td>
 
           </tr>
 
           <tr>
 
-           <th align="right">Datenbankvorlage</th>
+           <th align="right">[% 'Database template' | $T8 %]</th>
            <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
 
           </tr>
@@ -51,21 +52,21 @@
 
       <br>
 
-      <input type="submit" class="submit" name="action" value="Datenbank anlegen">
-      <input type="submit" class="submit" name="action" value="Datenbank aktualisieren">
-      <input type="submit" class="submit" name="action" value="Datenbank löschen">
+      <input type="submit" class="submit" name="action" value="[% 'Create Dataset' | $T8 %]">
+      <input type="submit" class="submit" name="action" value="[% 'Update Dataset' | $T8 %]">
+      <input type="submit" class="submit" name="action" value="[% 'Delete Dataset' | $T8 %]">
       [% IF ALLOW_DBBACKUP %]
-       <input type="submit" class="submit" name="action" value="Datenbank sichern">
-       <input type="submit" class="submit" name="action" value="Datenbank wiederherstellen">
+       <input type="submit" class="submit" name="action" value="[% 'Backup Dataset' | $T8 %]">
+       <input type="submit" class="submit" name="action" value="[% 'Restore Dataset' | $T8 %]">
       [% END %]
      </td>
     </tr>
    </table>
   </form>
 
-  <p>In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine &Auml;nderungen vorgenommen!</p>
+  <p>[% 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' | $T8 %]</p>
 
-  <p>F&uuml;r lokale Verbindungen "Rechner" und "Port" freilassen.</p>
+  <p>[% 'Leave host and port field empty unless you want to make a remote connection.' | $T8 %]</p>
 
 </body>
 </html>
diff --git a/templates/webpages/admin/dbadmin_master.html b/templates/webpages/admin/dbadmin_master.html
index 8b098c2b4..7533dcd56 100644
--- a/templates/webpages/admin/dbadmin_master.html
+++ b/templates/webpages/admin/dbadmin_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
   <h2>[% title %]</h2>
@@ -18,25 +19,25 @@
 
           <tr>
 
-           <th align="right"><translate>Host</translate></th>
+           <th align="right">[% 'Host' | $T8 %]</th>
            <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
-           <th align="right"><translate>Port</translate></th>
+           <th align="right">[% 'Port' | $T8 %]</th>
            <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
 
           </tr>
 
           <tr>
 
-           <th align="right"><translate>User</translate></th>
+           <th align="right">[% 'User' | $T8 %]</th>
            <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
-           <th align="right"><translate>Password</translate></th>
+           <th align="right">[% 'Password' | $T8 %]</th>
            <td><input type="password" name="dbpasswd" size="10"></td>
 
           </tr>
 
           <tr>
 
-           <th align="right"><translate>Database template</translate></th>
+           <th align="right">[% 'Database template' | $T8 %]</th>
            <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
 
           </tr>
@@ -51,21 +52,21 @@
 
       <br>
 
-      <input type="submit" class="submit" name="action" value="<translate>Create Dataset</translate>">
-      <input type="submit" class="submit" name="action" value="<translate>Update Dataset</translate>">
-      <input type="submit" class="submit" name="action" value="<translate>Delete Dataset</translate>">
+      <input type="submit" class="submit" name="action" value="[% 'Create Dataset' | $T8 %]">
+      <input type="submit" class="submit" name="action" value="[% 'Update Dataset' | $T8 %]">
+      <input type="submit" class="submit" name="action" value="[% 'Delete Dataset' | $T8 %]">
       [% IF ALLOW_DBBACKUP %]
-       <input type="submit" class="submit" name="action" value="<translate>Backup Dataset</translate>">
-       <input type="submit" class="submit" name="action" value="<translate>Restore Dataset</translate>">
+       <input type="submit" class="submit" name="action" value="[% 'Backup Dataset' | $T8 %]">
+       <input type="submit" class="submit" name="action" value="[% 'Restore Dataset' | $T8 %]">
       [% END %]
      </td>
     </tr>
    </table>
   </form>
 
-  <p><translate>This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!</translate></p>
+  <p>[% 'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' | $T8 %]</p>
 
-  <p><translate>Leave host and port field empty unless you want to make a remote connection.</translate></p>
+  <p>[% 'Leave host and port field empty unless you want to make a remote connection.' | $T8 %]</p>
 
 </body>
 </html>
diff --git a/templates/webpages/admin/dbcreate_de.html b/templates/webpages/admin/dbcreate_de.html
index 756460fbe..31fffca0e 100644
--- a/templates/webpages/admin/dbcreate_de.html
+++ b/templates/webpages/admin/dbcreate_de.html
@@ -1,14 +1,17 @@
-[% USE HTML %]<body class="admin">
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body class="admin">
 
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p>Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.</p>
+   <p>[% LxERP.t8('The dataset #1 has been successfully created.', db) | html %]</p>
 
    <input type="hidden" name="nextsub" value="list_users">
 
-   <p><input type="submit" class="submit" name="action" value="Weiter"></p>
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
 
   </form>
 
diff --git a/templates/webpages/admin/dbcreate_master.html b/templates/webpages/admin/dbcreate_master.html
index d15a2f783..31fffca0e 100644
--- a/templates/webpages/admin/dbcreate_master.html
+++ b/templates/webpages/admin/dbcreate_master.html
@@ -1,14 +1,17 @@
-[% USE HTML %]<body class="admin">
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<body class="admin">
 
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p><translate>The dataset [% HTML.escape(db) %] has been successfully created.</translate></p>
+   <p>[% LxERP.t8('The dataset #1 has been successfully created.', db) | html %]</p>
 
    <input type="hidden" name="nextsub" value="list_users">
 
-   <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
 
   </form>
 
diff --git a/templates/webpages/admin/dbdelete_de.html b/templates/webpages/admin/dbdelete_de.html
index c62eb51ba..c3537da4e 100644
--- a/templates/webpages/admin/dbdelete_de.html
+++ b/templates/webpages/admin/dbdelete_de.html
@@ -1,14 +1,16 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<body class="admin">
 
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p>Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.</p>
+   <p>[% LxERP.t8('The database #1 has been successfully deleted.', db) | html %]</p>
 
    <input type="hidden" name="nextsub" value="list_users">
 
-   <p><input type="submit" class="submit" name="action" value="Weiter"></p>
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
   </form>
 
 </body>
diff --git a/templates/webpages/admin/dbdelete_master.html b/templates/webpages/admin/dbdelete_master.html
index c744e5d21..c3537da4e 100644
--- a/templates/webpages/admin/dbdelete_master.html
+++ b/templates/webpages/admin/dbdelete_master.html
@@ -1,14 +1,16 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<body class="admin">
 
   <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p><translate>The database [% HTML.escape(db) %] has been successfully deleted.</translate></p>
+   <p>[% LxERP.t8('The database #1 has been successfully deleted.', db) | html %]</p>
 
    <input type="hidden" name="nextsub" value="list_users">
 
-   <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
+   <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
   </form>
 
 </body>
diff --git a/templates/webpages/admin/dbupgrade_all_done_de.html b/templates/webpages/admin/dbupgrade_all_done_de.html
index 07648005c..b55a3d57b 100644
--- a/templates/webpages/admin/dbupgrade_all_done_de.html
+++ b/templates/webpages/admin/dbupgrade_all_done_de.html
@@ -1,18 +1,19 @@
+[%- USE T8 %]
 [% USE HTML%]
 [% IF NOTHING_TO_DO %]
- <p>Es wurden keine Datenbanken ausgew&auml;hlt.</p>
+ <p>[% 'No datasets have been selected.' | $T8 %]</p>
 
  [% ELSE %]
 
  <hr>
 
- <p>Alle Datenbankupdates wurden eingespielt.</p>
+ <p>[% 'All database upgrades have been applied.' | $T8 %]</p>
 [% END %]
 
 <form method="post" action="admin.pl">
  <input type="hidden" name="nextsub" value="list_users">
 
- <input type="submit" name="action" value="Weiter">
+ <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
 </form>
 
 </body>
diff --git a/templates/webpages/admin/dbupgrade_all_done_master.html b/templates/webpages/admin/dbupgrade_all_done_master.html
index 788420186..b55a3d57b 100644
--- a/templates/webpages/admin/dbupgrade_all_done_master.html
+++ b/templates/webpages/admin/dbupgrade_all_done_master.html
@@ -1,18 +1,19 @@
+[%- USE T8 %]
 [% USE HTML%]
 [% IF NOTHING_TO_DO %]
- <p><translate>No datasets have been selected.</translate></p>
+ <p>[% 'No datasets have been selected.' | $T8 %]</p>
 
  [% ELSE %]
 
  <hr>
 
- <p><translate>All database upgrades have been applied.</translate></p>
+ <p>[% 'All database upgrades have been applied.' | $T8 %]</p>
 [% END %]
 
 <form method="post" action="admin.pl">
  <input type="hidden" name="nextsub" value="list_users">
 
- <input type="submit" name="action" value="<translate>Continue</translate>">
+ <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
 </form>
 
 </body>
diff --git a/templates/webpages/admin/dbupgrade_footer_de.html b/templates/webpages/admin/dbupgrade_footer_de.html
index 3d31bbf7e..28e285684 100644
--- a/templates/webpages/admin/dbupgrade_footer_de.html
+++ b/templates/webpages/admin/dbupgrade_footer_de.html
@@ -1 +1,2 @@
-<p>...fertig</p>
+[%- USE T8 %]
+<p>[% '...done' | $T8 %]</p>
diff --git a/templates/webpages/admin/dbupgrade_footer_master.html b/templates/webpages/admin/dbupgrade_footer_master.html
index 9ac4e8abb..28e285684 100644
--- a/templates/webpages/admin/dbupgrade_footer_master.html
+++ b/templates/webpages/admin/dbupgrade_footer_master.html
@@ -1 +1,2 @@
-<p><translate>...done</translate></p>
+[%- USE T8 %]
+<p>[% '...done' | $T8 %]</p>
diff --git a/templates/webpages/admin/dbupgrade_header_de.html b/templates/webpages/admin/dbupgrade_header_de.html
index 8408cf9ad..cc3704916 100644
--- a/templates/webpages/admin/dbupgrade_header_de.html
+++ b/templates/webpages/admin/dbupgrade_header_de.html
@@ -1 +1,2 @@
-[% USE HTML %]<div class="listtop" width="100%">Datenbankaktualisierung ([% HTML.escape(dbname) %])</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop" width="100%">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</div>
diff --git a/templates/webpages/admin/dbupgrade_header_master.html b/templates/webpages/admin/dbupgrade_header_master.html
index a5a27b607..cc3704916 100644
--- a/templates/webpages/admin/dbupgrade_header_master.html
+++ b/templates/webpages/admin/dbupgrade_header_master.html
@@ -1 +1,2 @@
-[% USE HTML %]<div class="listtop" width="100%"><translate>Dataset upgrade</translate> ([% HTML.escape(dbname) %])</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop" width="100%">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</div>
diff --git a/templates/webpages/admin/delete_dataset_de.html b/templates/webpages/admin/delete_dataset_de.html
index ceb91de84..2062aed2f 100644
--- a/templates/webpages/admin/delete_dataset_de.html
+++ b/templates/webpages/admin/delete_dataset_de.html
@@ -1,13 +1,14 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
  <h2>[% title %]</h2>
 
  <form method="post" action="admin.pl">
 
-  <p>Sie k&ouml;nnen nur Datenbanken l&ouml;schen, die momentan nicht in Benutzung sind.
-   Wenn Sie eine solche Datenbank l&ouml;schen wollen, so m&uuml;ssen Sie zuerst die Benutzer bearbeiten, die die fragliche Datenbank benutzen, und sie so &auml;ndern, dass sie eine andere Datenbank benutzen.</p>
+  <p>[% 'You can only delete datasets that are not in use.' | $T8 %]
+   [% 'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' | $T8 %]</p>
 
-  <p>Bitte w&auml;hlen Sie die zu l&ouml;schende Datenbank aus:
+  <p>[% 'Please seletct the dataset you want to delete:' | $T8 %]
    <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
   </p>
 
@@ -23,7 +24,7 @@
 
   <input type="hidden" name="nextsub" value="dbdelete">
 
-  <p><input type="submit" class="submit" name="action" value="Weiter"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
 
  </form>
 
diff --git a/templates/webpages/admin/delete_dataset_master.html b/templates/webpages/admin/delete_dataset_master.html
index e84509d4d..2062aed2f 100644
--- a/templates/webpages/admin/delete_dataset_master.html
+++ b/templates/webpages/admin/delete_dataset_master.html
@@ -1,16 +1,14 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
  <h2>[% title %]</h2>
 
  <form method="post" action="admin.pl">
 
-  <p><translate>You can only delete datasets that are not in
-    use.</translate>
-   <translate>If you want to delete such a dataset you have to edit
-    the user(s) that are using the dataset in question and have them
-    use another dataset.</translate></p>
+  <p>[% 'You can only delete datasets that are not in use.' | $T8 %]
+   [% 'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' | $T8 %]</p>
 
-  <p><translate>Please seletct the dataset you want to delete:</translate>
+  <p>[% 'Please seletct the dataset you want to delete:' | $T8 %]
    <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
   </p>
 
@@ -26,7 +24,7 @@
 
   <input type="hidden" name="nextsub" value="dbdelete">
 
-  <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]"></p>
 
  </form>
 
diff --git a/templates/webpages/admin/delete_group_confirm_de.html b/templates/webpages/admin/delete_group_confirm_de.html
index 01108f248..2f684a5c8 100644
--- a/templates/webpages/admin/delete_group_confirm_de.html
+++ b/templates/webpages/admin/delete_group_confirm_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form name="Form" method="post" action="admin.pl">
 
@@ -5,13 +6,13 @@
   <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="confirmed" value="1">
 
-  <div class="listtop">Gruppe l&ouml;schen</div>
+  <div class="listtop">[% 'Delete group' | $T8 %]</div>
 
-  <p>Wollen Sie wirklich diese Gruppe l&ouml;schen: [% name %] ?</p>
+  <p>[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?</p>
 
   <input type="hidden" name="delete_nextsub" value="delete_group">
-  <input type="submit" class="submit" name="action" value="Löschen">
-  <button type="button" onclick="history.back()">Zurück</button>
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+  <button type="button" onclick="history.back()">[% 'Back' | $T8 %]</button>
 
  </form>
 
diff --git a/templates/webpages/admin/delete_group_confirm_master.html b/templates/webpages/admin/delete_group_confirm_master.html
index ac7e63e08..2f684a5c8 100644
--- a/templates/webpages/admin/delete_group_confirm_master.html
+++ b/templates/webpages/admin/delete_group_confirm_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form name="Form" method="post" action="admin.pl">
 
@@ -5,13 +6,13 @@
   <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="confirmed" value="1">
 
-  <div class="listtop"><translate>Delete group</translate></div>
+  <div class="listtop">[% 'Delete group' | $T8 %]</div>
 
-  <p><translate>Do you really want to delete this group:</translate> [% name %] ?</p>
+  <p>[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?</p>
 
   <input type="hidden" name="delete_nextsub" value="delete_group">
-  <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
-  <button type="button" onclick="history.back()"><translate>Back</translate></button>
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+  <button type="button" onclick="history.back()">[% 'Back' | $T8 %]</button>
 
  </form>
 
diff --git a/templates/webpages/admin/edit_group_de.html b/templates/webpages/admin/edit_group_de.html
index ec0441b9f..177fbc9be 100644
--- a/templates/webpages/admin/edit_group_de.html
+++ b/templates/webpages/admin/edit_group_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form name="Form" method="post" action="admin.pl">
 
@@ -9,16 +10,16 @@
   <p>[% message %]</p>
   [% END %]
 
-  <div class="listtop">Gruppe bearbeiten [% HTML.escape(name) %]</div>
+  <div class="listtop">[% 'Edit group ' | $T8 %] [% HTML.escape(name) %]</div>
 
   <table width="100%">
    <tr>
     <td>
      <table>
       <tr class="listheading">
-       <td><b>Benutzer in<br>dieser Gruppe</b></td>
+       <td><b>[% 'Users in<br>this group' | $T8 %]</b></td>
        <td>&nbsp;</td>
-       <td><b>Benutzer nicht in dieser Gruppe</b></td>
+       <td><b>[% 'Users not in this group' | $T8 %]</b></td>
       </tr>
 
       <tr>
@@ -29,10 +30,10 @@
        </td>
 
        <td valign="center">
-        <input type="submit" class="submit" name="action" value="Zu Gruppe hinzufügen">
+        <input type="submit" class="submit" name="action" value="[% 'Add to group' | $T8 %]">
         <br>
         <br>
-        <input type="submit" class="submit" name="action" value="Aus Gruppe entfernen">
+        <input type="submit" class="submit" name="action" value="[% 'Remove from group' | $T8 %]">
        </td>
 
        <td valign="center">
@@ -44,7 +45,7 @@
 
       <tr>
        <td>
-        <input type="submit" class="submit" name="action" value="Zurück">
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
        </td>
       </tr>
      </table>
@@ -53,7 +54,7 @@
 
      <table>
       <tr class="listheading">
-       <td colspan="2">Rechte bearbeiten</td>
+       <td colspan="2">[% 'Edit rights' | $T8 %]</td>
       </tr>
 
       [% FOREACH right = RIGHTS %]
@@ -72,9 +73,9 @@
       <tr>
        <td>
         <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="Speichern">
+        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
         &nbsp;
-        <input type="submit" class="submit" name="action" value="Zurück">
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
        </td>
       </tr>
      </table>
@@ -83,25 +84,25 @@
 
      <table>
       <tr class="listheading">
-       <td colspan="2">Gruppe umbenennen</td>
+       <td colspan="2">[% 'Rename the group' | $T8 %]</td>
       </tr>
 
       <tr>
-       <td>Name:</td>
+       <td>[% 'Name' | $T8 %]:</td>
        <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
       </tr>
 
       <tr>
-       <td>Beschreibung:</td>
+       <td>[% 'Description' | $T8 %]:</td>
        <td><input name="description" value="[% HTML.escape(description) %]"></td>
       </tr>
 
       <tr>
        <td>
         <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="Speichern">
+        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
         &nbsp;
-        <input type="submit" class="submit" name="action" value="Zurück">
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
        </td>
       </tr>
      </table>
diff --git a/templates/webpages/admin/edit_group_master.html b/templates/webpages/admin/edit_group_master.html
index 7e7be7e22..177fbc9be 100644
--- a/templates/webpages/admin/edit_group_master.html
+++ b/templates/webpages/admin/edit_group_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form name="Form" method="post" action="admin.pl">
 
@@ -9,16 +10,16 @@
   <p>[% message %]</p>
   [% END %]
 
-  <div class="listtop"><translate>Edit group </translate> [% HTML.escape(name) %]</div>
+  <div class="listtop">[% 'Edit group ' | $T8 %] [% HTML.escape(name) %]</div>
 
   <table width="100%">
    <tr>
     <td>
      <table>
       <tr class="listheading">
-       <td><b><translate>Users in<br>this group</translate></b></td>
+       <td><b>[% 'Users in<br>this group' | $T8 %]</b></td>
        <td>&nbsp;</td>
-       <td><b><translate>Users not in this group</translate></b></td>
+       <td><b>[% 'Users not in this group' | $T8 %]</b></td>
       </tr>
 
       <tr>
@@ -29,10 +30,10 @@
        </td>
 
        <td valign="center">
-        <input type="submit" class="submit" name="action" value="<translate>Add to group</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Add to group' | $T8 %]">
         <br>
         <br>
-        <input type="submit" class="submit" name="action" value="<translate>Remove from group</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Remove from group' | $T8 %]">
        </td>
 
        <td valign="center">
@@ -44,7 +45,7 @@
 
       <tr>
        <td>
-        <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
        </td>
       </tr>
      </table>
@@ -53,7 +54,7 @@
 
      <table>
       <tr class="listheading">
-       <td colspan="2"><translate>Edit rights</translate></td>
+       <td colspan="2">[% 'Edit rights' | $T8 %]</td>
       </tr>
 
       [% FOREACH right = RIGHTS %]
@@ -72,9 +73,9 @@
       <tr>
        <td>
         <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
         &nbsp;
-        <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
        </td>
       </tr>
      </table>
@@ -83,25 +84,25 @@
 
      <table>
       <tr class="listheading">
-       <td colspan="2"><translate>Rename the group</translate></td>
+       <td colspan="2">[% 'Rename the group' | $T8 %]</td>
       </tr>
 
       <tr>
-       <td><translate>Name</translate>:</td>
+       <td>[% 'Name' | $T8 %]:</td>
        <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
       </tr>
 
       <tr>
-       <td><translate>Description</translate>:</td>
+       <td>[% 'Description' | $T8 %]:</td>
        <td><input name="description" value="[% HTML.escape(description) %]"></td>
       </tr>
 
       <tr>
        <td>
         <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
         &nbsp;
-        <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
+        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
        </td>
       </tr>
      </table>
diff --git a/templates/webpages/admin/edit_group_membership_de.html b/templates/webpages/admin/edit_group_membership_de.html
index 2b3560c0f..3792aa42a 100644
--- a/templates/webpages/admin/edit_group_membership_de.html
+++ b/templates/webpages/admin/edit_group_membership_de.html
@@ -1,8 +1,9 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
- <div class="listtop">Gruppenmitgliedschaften bearbeiten</div>
+ <div class="listtop">[% 'Edit group membership' | $T8 %]</div>
 
- <p>W&auml;hlen Sie diejenigen Checkboxen aus, die die Benutzer zu den gew&uuml;schten Gruppen zuordnen.</p>
+ <p>[% 'Select the checkboxes that match users to the groups they should belong to.' | $T8 %]</p>
 
  <form action="admin.pl">
 
@@ -12,8 +13,8 @@
 
     [% IF user.repeat_headings %]
     <tr>
-     <th class="listheading" valign="bottom">Anmeldung</th>
-     <th class="listheading" valign="bottom">Name</th>
+     <th class="listheading" valign="bottom">[% 'Login' | $T8 %]</th>
+     <th class="listheading" valign="bottom">[% 'Name' | $T8 %]</th>
      [% FOREACH column = HEADINGS %]<th class="listheading" valign="bottom" align="center">[% LxERP.turn90(column.title) %]</th>
      [% END %]
     </tr>
@@ -36,8 +37,8 @@
   <input type="hidden" name="back_nextsub" value="edit_groups">
 
   <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
-   <input type="submit" class="submit" name="action" value="Zurück">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/edit_group_membership_master.html b/templates/webpages/admin/edit_group_membership_master.html
index ce0fa8d50..3792aa42a 100644
--- a/templates/webpages/admin/edit_group_membership_master.html
+++ b/templates/webpages/admin/edit_group_membership_master.html
@@ -1,9 +1,9 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
- <div class="listtop"><translate>Edit group membership</translate></div>
+ <div class="listtop">[% 'Edit group membership' | $T8 %]</div>
 
- <p><translate>Select the checkboxes that match users to the groups
-   they should belong to.</translate></p>
+ <p>[% 'Select the checkboxes that match users to the groups they should belong to.' | $T8 %]</p>
 
  <form action="admin.pl">
 
@@ -13,8 +13,8 @@
 
     [% IF user.repeat_headings %]
     <tr>
-     <th class="listheading" valign="bottom"><translate>Login</translate></th>
-     <th class="listheading" valign="bottom"><translate>Name</translate></th>
+     <th class="listheading" valign="bottom">[% 'Login' | $T8 %]</th>
+     <th class="listheading" valign="bottom">[% 'Name' | $T8 %]</th>
      [% FOREACH column = HEADINGS %]<th class="listheading" valign="bottom" align="center">[% LxERP.turn90(column.title) %]</th>
      [% END %]
     </tr>
@@ -37,8 +37,8 @@
   <input type="hidden" name="back_nextsub" value="edit_groups">
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
-   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/edit_groups_de.html b/templates/webpages/admin/edit_groups_de.html
index efd3414f8..fcf034a2b 100644
--- a/templates/webpages/admin/edit_groups_de.html
+++ b/templates/webpages/admin/edit_groups_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form name="Form" method="post" action="admin.pl">
 
@@ -6,11 +7,11 @@
   <p>[% message %]</p>
   [% END %]
 
-  <div class="listtop">Gruppen bearbeiten</div>
+  <div class="listtop">[% 'Edit groups' | $T8 %]</div>
 
   <br>
 
-  <div class="listheading">Gruppen bearbeiten und l&ouml;schen</div>
+  <div class="listheading">[% 'Edit and delete a group' | $T8 %]</div>
 
   [% IF num_groups %]
   <p>
@@ -21,49 +22,49 @@
    </select>
   </p>
   [% ELSE %]
-  <p>Es wurden noch keine Gruppen angelegt.</p>
+  <p>[% 'No groups have been added yet.' | $T8 %]</p>
   [% END %]
 
   <p>
    [% IF num_groups %]
    <input type="hidden" name="edit_nextsub" value="edit_group">
    <input type="hidden" name="delete_nextsub" value="delete_group">
-   <input type="submit" class="submit" name="action" value="Bearbeiten">
-   <input type="submit" class="submit" name="action" value="Löschen">
+   <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [% END %]
    <input type="hidden" name="back_nextsub" value="list_users">
-   <input type="submit" class="submit" name="action" value="Zurück">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
  <hr size="2" noshade>
 
- <div class="listheading">Gruppenzugehörigkeit</div>
+ <div class="listheading">[% 'Group membership' | $T8 %]</div>
 
- <p>Bearbeiten der Mitgliedschaft aller Benutzer in allen Gruppen:</p>
+ <p>[% 'Edit the membership of all users in all groups:' | $T8 %]</p>
 
  <form method="post" action="admin.pl">
   <p>
    <input type="hidden" name="edit_nextsub" value="edit_group_membership">
-   <input type="submit" class="submit" name="action" value="Bearbeiten">
+   <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
   </p>
 
  </form>
 
  <hr size="2" noshade>
 
- <div class="listheading">Neue Gruppe erfassen</div>
+ <div class="listheading">[% 'Add a new group' | $T8 %]</div>
 
  <form method="post" action="admin.pl">
   <p>
    <table border="0">
     <tr>
-     <td>Name:</td>
+     <td>[% 'Name' | $T8 %]:</td>
      <td><input name="name" maxlength="50"></td>
     </tr>
 
     <tr>
-     <td>Beschreibung:</td>
+     <td>[% 'Description' | $T8 %]:</td>
      <td><input name="description"></td>
     </tr>
    </table>
@@ -71,7 +72,7 @@
 
   <p>
    <input type="hidden" name="add_nextsub" value="add_group">
-   <input type="submit" class="submit" name="action" value="Erfassen">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/edit_groups_master.html b/templates/webpages/admin/edit_groups_master.html
index 97cde086b..fcf034a2b 100644
--- a/templates/webpages/admin/edit_groups_master.html
+++ b/templates/webpages/admin/edit_groups_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form name="Form" method="post" action="admin.pl">
 
@@ -6,11 +7,11 @@
   <p>[% message %]</p>
   [% END %]
 
-  <div class="listtop"><translate>Edit groups</translate></div>
+  <div class="listtop">[% 'Edit groups' | $T8 %]</div>
 
   <br>
 
-  <div class="listheading"><translate>Edit and delete a group</translate></div>
+  <div class="listheading">[% 'Edit and delete a group' | $T8 %]</div>
 
   [% IF num_groups %]
   <p>
@@ -21,49 +22,49 @@
    </select>
   </p>
   [% ELSE %]
-  <p><translate>No groups have been added yet.</translate></p>
+  <p>[% 'No groups have been added yet.' | $T8 %]</p>
   [% END %]
 
   <p>
    [% IF num_groups %]
    <input type="hidden" name="edit_nextsub" value="edit_group">
    <input type="hidden" name="delete_nextsub" value="delete_group">
-   <input type="submit" class="submit" name="action" value="<translate>Edit</translate>">
-   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [% END %]
    <input type="hidden" name="back_nextsub" value="list_users">
-   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
  <hr size="2" noshade>
 
- <div class="listheading"><translate>Group membership</translate></div>
+ <div class="listheading">[% 'Group membership' | $T8 %]</div>
 
- <p><translate>Edit the membership of all users in all groups:</translate></p>
+ <p>[% 'Edit the membership of all users in all groups:' | $T8 %]</p>
 
  <form method="post" action="admin.pl">
   <p>
    <input type="hidden" name="edit_nextsub" value="edit_group_membership">
-   <input type="submit" class="submit" name="action" value="<translate>Edit</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
   </p>
 
  </form>
 
  <hr size="2" noshade>
 
- <div class="listheading"><translate>Add a new group</translate></div>
+ <div class="listheading">[% 'Add a new group' | $T8 %]</div>
 
  <form method="post" action="admin.pl">
   <p>
    <table border="0">
     <tr>
-     <td><translate>Name</translate>:</td>
+     <td>[% 'Name' | $T8 %]:</td>
      <td><input name="name" maxlength="50"></td>
     </tr>
 
     <tr>
-     <td><translate>Description</translate>:</td>
+     <td>[% 'Description' | $T8 %]:</td>
      <td><input name="description"></td>
     </tr>
    </table>
@@ -71,7 +72,7 @@
 
   <p>
    <input type="hidden" name="add_nextsub" value="add_group">
-   <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
index 7a8ada680..81eb1ea5e 100644
--- a/templates/webpages/admin/edit_user_de.html
+++ b/templates/webpages/admin/edit_user_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -29,7 +30,7 @@
     <td>
      <table>
       <tr>
-       <th align="right">Anmeldung</th>
+       <th align="right">[% 'Login' | $T8 %]</th>
        <td>
         [%- IF edit %]
          <input type="hidden" name="login" value="[% HTML.escape(myc_login) %]">[% HTML.escape(myc_login) %]
@@ -40,57 +41,57 @@
       </tr>
 
       <tr>
-       <th align="right">Passwort</th>
+       <th align="right">[% 'Password' | $T8 %]</th>
        <td>[% IF CAN_CHANGE_PASSWORD %]<input type="password" name="new_password" size="8" value="********">[% ELSE %]********[% END %]</td>
       </tr>
 
       <tr>
-       <th align="right">Name</th>
+       <th align="right">[% 'Name' | $T8 %]</th>
        <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
       </tr>
 
       <tr>
-       <th align="right">eMail</th>
+       <th align="right">[% 'E-mail' | $T8 %]</th>
        <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right">Unterschrift</th>
+       <th align="right">[% 'Signature' | $T8 %]</th>
        <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
       </tr>
 
       <tr>
-       <th align="right">Telefon</th>
+       <th align="right">[% 'Phone' | $T8 %]</th>
        <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
       </tr>
 
       <tr>
-       <th align="right">Fax</th>
+       <th align="right">[% 'Fax' | $T8 %]</th>
        <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
       </tr>
 
       <tr>
-       <th align="right">Firma</th>
+       <th align="right">[% 'Company' | $T8 %]</th>
        <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right">Adresse</th>
+       <th align="right">[% 'Address' | $T8 %]</th>
        <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
       </tr>
 
       <tr valign="top">
-       <th align="right">Steuernummer</th>
+       <th align="right">[% 'Tax number' | $T8 %]</th>
        <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right">USt-IdNr.</th>
+       <th align="right">[% 'Ust-IDNr' | $T8 %]</th>
        <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right">DUNS-Nr.</th>
+       <th align="right">[% 'DUNS-Nr' | $T8 %]</th>
        <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
       </tr>
      </table>
@@ -99,7 +100,7 @@
     <td>
      <table>
       <tr>
-       <th align="right">Datumsformat</th>
+       <th align="right">[% 'Date Format' | $T8 %]</th>
        <td>
         <select name="dateformat">
          [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
@@ -109,7 +110,7 @@
       </tr>
 
       <tr>
-       <th align="right">Zahlenformat</th>
+       <th align="right">[% 'Number Format' | $T8 %]</th>
        <td>
         <select name="numberformat">
          [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
@@ -119,12 +120,12 @@
       </tr>
 
       <tr>
-       <th align="right">Auswahllistenbegrenzung</th>
+       <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
        <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
       </tr>
 
       <tr>
-       <th align="right">Sprache</th>
+       <th align="right">[% 'Language' | $T8 %]</th>
        <td>
         <select name="countrycode">
          [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -134,7 +135,7 @@
       </tr>
 
       <tr>
-       <th align="right">Stilvorlage</th>
+       <th align="right">[% 'Stylesheet' | $T8 %]</th>
        <td>
         <select name="userstylesheet">
          [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -144,11 +145,11 @@
       </tr>
 
       <tr>
-       <th align="right">Drucker</th>
+       <th align="right">[% 'Printer' | $T8 %]</th>
        <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
       </tr>
       <tr>
-       <th align="right">benutze Vorlagen</th>
+       <th align="right">[% 'Use Templates' | $T8 %]</th>
        <td>
         <select name="usetemplates">
          [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -157,11 +158,11 @@
        </td>
       </tr>
       <tr>
-       <th align="right">neue Vorlagen</th>
+       <th align="right">[% 'New Templates' | $T8 %]</th>
        <td><input name="newtemplates"></td>
       </tr>
       <tr>
-       <th align="right">Vorlagen auswählen</th>
+       <th align="right">[% 'Setup Templates' | $T8 %]</th>
        <td>
         <select name="mastertemplates">
          [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -170,14 +171,14 @@
        </td>
       </tr>
       <tr>
-       <th align="right">Menüsetup</th>
+       <th align="right">[% 'Setup Menu' | $T8 %]</th>
        <td>
         <select name="menustyle">
-         <option value="v3"[% IF menustyle_v3 %] selected[% END %]>Oben (mit CSS)</option>
-         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>Oben (mit CSS, neu)</option>
-         <option value="neu"[% IF menustyle_neu %] selected[% END %]>Oben (mit Javascript)</option>
-         <option value="xml"[% IF menustyle_xml %] selected[% END %]>Oben (XUL; nur f&uuml;r Mozilla Firefox)</option>
-         <option value="old"[% IF menustyle_old %] selected[% END %]>Alt (seitlich)</option>
+         <option value="v3"[% IF menustyle_v3 %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
+         <option value="neu"[% IF menustyle_neu %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+         <option value="xml"[% IF menustyle_xml %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
+         <option value="old"[% IF menustyle_old %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
         </select>
        </td>
       </tr>
@@ -188,35 +189,35 @@
    </tr>
 
    <tr class="listheading">
-    <th colspan="2">Datenbank</th>
+    <th colspan="2">[% 'Database' | $T8 %]</th>
    </tr>
 
    <tr>
     <td colspan="2">
      <table>
       <tr>
-       <th align="right">Treiber</th>
+       <th align="right">[% 'Driver' | $T8 %]</th>
        <td>PostgreSQL</td>
-       <th align="right">Datenbankcomputer</th>
+       <th align="right">[% 'Host' | $T8 %]</th>
        <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
       </tr>
 
       <tr>
-       <th align="right">Datenbank</th>
+       <th align="right">[% 'Dataset' | $T8 %]</th>
        <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
-       <th align="right">Port</th>
+       <th align="right">[% 'Port' | $T8 %]</th>
        <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
       </tr>
 
       <tr>
-       <th align="right">Benutzer</th>
+       <th align="right">[% 'User' | $T8 %]</th>
        <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
-       <th align="right">Passwort</th>
+       <th align="right">[% 'Password' | $T8 %]</th>
        <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
       </tr>
 
       <tr>
-       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="Verbindung testen"></td>
+       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="[% 'Test connection' | $T8 %]"></td>
       </tr>
      </table>
     </td>
@@ -226,11 +227,11 @@
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
    <tr class="listheading">
-    <th colspan="2">Gruppenzugehörigkeit</th>
+    <th colspan="2">[% 'Group membership' | $T8 %]</th>
    </tr>
 
    <tr>
-    <td colspan="2">Der Benutzer ist Mitglied in den folgenden Gruppen:</td>
+    <td colspan="2">[% 'The user is a member in the following group(s):' | $T8 %]</td>
    </tr>
 
    <tr>
@@ -246,7 +247,7 @@
   <input name="callback" type="hidden" value="admin.pl?action=list_users">
 
   <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_save_user" value="Speichern">
+  <input type="submit" class="submit" name="action_save_user" value="[% 'Save' | $T8 %]">
 
   [% IF edit %]
    [% FOREACH row = GROUPS %]
@@ -254,8 +255,8 @@
    [% END %]
    <input type="hidden" name="new_user_login" id="new_user_login" value="">
    <input type="hidden" name="action_save_user_as_new" id="action_save_user_as_new" value="">
-   <input type="button" class="submit" id="save_as_new_button" value="als neu speichern">
-   <input type="submit" class="submit" name="action_delete_user" value="Löschen">
+   <input type="button" class="submit" id="save_as_new_button" value="[% 'Save as new' | $T8 %]">
+   <input type="submit" class="submit" name="action_delete_user" value="[% 'Delete' | $T8 %]">
    <input type="hidden" name="edit" value="1">
   [% END %]
 
@@ -265,7 +266,7 @@
   <!--
     $(document).ready(function() {
       $("#save_as_new_button").click(function() {
-        var new_user_login = prompt('Bitte geben Sie das Login für den neuen Benutzer ein.', '');
+        var new_user_login = prompt('[% 'Please enter the login for the new user.' | $T8 %]', '');
         if (!new_user_login || (new_user_login == ''))
           return;
 
diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
index d75f2ce5d..81eb1ea5e 100644
--- a/templates/webpages/admin/edit_user_master.html
+++ b/templates/webpages/admin/edit_user_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -29,7 +30,7 @@
     <td>
      <table>
       <tr>
-       <th align="right"><translate>Login</translate></th>
+       <th align="right">[% 'Login' | $T8 %]</th>
        <td>
         [%- IF edit %]
          <input type="hidden" name="login" value="[% HTML.escape(myc_login) %]">[% HTML.escape(myc_login) %]
@@ -40,57 +41,57 @@
       </tr>
 
       <tr>
-       <th align="right"><translate>Password</translate></th>
+       <th align="right">[% 'Password' | $T8 %]</th>
        <td>[% IF CAN_CHANGE_PASSWORD %]<input type="password" name="new_password" size="8" value="********">[% ELSE %]********[% END %]</td>
       </tr>
 
       <tr>
-       <th align="right"><translate>Name</translate></th>
+       <th align="right">[% 'Name' | $T8 %]</th>
        <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>E-mail</translate></th>
+       <th align="right">[% 'E-mail' | $T8 %]</th>
        <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right"><translate>Signature</translate></th>
+       <th align="right">[% 'Signature' | $T8 %]</th>
        <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>Phone</translate></th>
+       <th align="right">[% 'Phone' | $T8 %]</th>
        <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>Fax</translate></th>
+       <th align="right">[% 'Fax' | $T8 %]</th>
        <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>Company</translate></th>
+       <th align="right">[% 'Company' | $T8 %]</th>
        <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right"><translate>Address</translate></th>
+       <th align="right">[% 'Address' | $T8 %]</th>
        <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
       </tr>
 
       <tr valign="top">
-       <th align="right"><translate>Tax number</translate></th>
+       <th align="right">[% 'Tax number' | $T8 %]</th>
        <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right"><translate>Ust-IDNr</translate></th>
+       <th align="right">[% 'Ust-IDNr' | $T8 %]</th>
        <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
       </tr>
 
       <tr valign="top">
-       <th align="right"><translate>DUNS-Nr</translate></th>
+       <th align="right">[% 'DUNS-Nr' | $T8 %]</th>
        <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
       </tr>
      </table>
@@ -99,7 +100,7 @@
     <td>
      <table>
       <tr>
-       <th align="right"><translate>Date Format</translate></th>
+       <th align="right">[% 'Date Format' | $T8 %]</th>
        <td>
         <select name="dateformat">
          [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
@@ -109,7 +110,7 @@
       </tr>
 
       <tr>
-       <th align="right"><translate>Number Format</translate></th>
+       <th align="right">[% 'Number Format' | $T8 %]</th>
        <td>
         <select name="numberformat">
          [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
@@ -119,12 +120,12 @@
       </tr>
 
       <tr>
-       <th align="right"><translate>Dropdown Limit</translate></th>
+       <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
        <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>Language</translate></th>
+       <th align="right">[% 'Language' | $T8 %]</th>
        <td>
         <select name="countrycode">
          [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -134,7 +135,7 @@
       </tr>
 
       <tr>
-       <th align="right"><translate>Stylesheet</translate></th>
+       <th align="right">[% 'Stylesheet' | $T8 %]</th>
        <td>
         <select name="userstylesheet">
          [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -144,11 +145,11 @@
       </tr>
 
       <tr>
-       <th align="right"><translate>Printer</translate></th>
+       <th align="right">[% 'Printer' | $T8 %]</th>
        <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
       </tr>
       <tr>
-       <th align="right"><translate>Use Templates</translate></th>
+       <th align="right">[% 'Use Templates' | $T8 %]</th>
        <td>
         <select name="usetemplates">
          [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -157,11 +158,11 @@
        </td>
       </tr>
       <tr>
-       <th align="right"><translate>New Templates</translate></th>
+       <th align="right">[% 'New Templates' | $T8 %]</th>
        <td><input name="newtemplates"></td>
       </tr>
       <tr>
-       <th align="right"><translate>Setup Templates</translate></th>
+       <th align="right">[% 'Setup Templates' | $T8 %]</th>
        <td>
         <select name="mastertemplates">
          [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
@@ -170,14 +171,14 @@
        </td>
       </tr>
       <tr>
-       <th align="right"><translate>Setup Menu</translate></th>
+       <th align="right">[% 'Setup Menu' | $T8 %]</th>
        <td>
         <select name="menustyle">
-         <option value="v3"[% IF menustyle_v3 %] selected[% END %]><translate>Top (CSS)</translate></option>
-         <option value="v4"[% IF menustyle_v4 %] selected[% END %]><translate>Top (CSS) new</translate></option>
-         <option value="neu"[% IF menustyle_neu %] selected[% END %]><translate>Top (Javascript)</translate></option>
-         <option value="xml"[% IF menustyle_xml %] selected[% END %]><translate>Top (XUL; only for Mozilla Firefox)</translate></option>
-         <option value="old"[% IF menustyle_old %] selected[% END %]><translate>Old (on the side)</translate></option>
+         <option value="v3"[% IF menustyle_v3 %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
+         <option value="neu"[% IF menustyle_neu %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+         <option value="xml"[% IF menustyle_xml %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
+         <option value="old"[% IF menustyle_old %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
         </select>
        </td>
       </tr>
@@ -188,35 +189,35 @@
    </tr>
 
    <tr class="listheading">
-    <th colspan="2"><translate>Database</translate></th>
+    <th colspan="2">[% 'Database' | $T8 %]</th>
    </tr>
 
    <tr>
     <td colspan="2">
      <table>
       <tr>
-       <th align="right"><translate>Driver</translate></th>
+       <th align="right">[% 'Driver' | $T8 %]</th>
        <td>PostgreSQL</td>
-       <th align="right"><translate>Host</translate></th>
+       <th align="right">[% 'Host' | $T8 %]</th>
        <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>Dataset</translate></th>
+       <th align="right">[% 'Dataset' | $T8 %]</th>
        <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
-       <th align="right"><translate>Port</translate></th>
+       <th align="right">[% 'Port' | $T8 %]</th>
        <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
       </tr>
 
       <tr>
-       <th align="right"><translate>User</translate></th>
+       <th align="right">[% 'User' | $T8 %]</th>
        <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
-       <th align="right"><translate>Password</translate></th>
+       <th align="right">[% 'Password' | $T8 %]</th>
        <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
       </tr>
 
       <tr>
-       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="<translate>Test connection</translate>"></td>
+       <td colspan="2"><input type="button" class="submit" onclick="open_connection_test_window();" value="[% 'Test connection' | $T8 %]"></td>
       </tr>
      </table>
     </td>
@@ -226,11 +227,11 @@
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
    <tr class="listheading">
-    <th colspan="2"><translate>Group membership</translate></th>
+    <th colspan="2">[% 'Group membership' | $T8 %]</th>
    </tr>
 
    <tr>
-    <td colspan="2"><translate>The user is a member in the following group(s):</translate></td>
+    <td colspan="2">[% 'The user is a member in the following group(s):' | $T8 %]</td>
    </tr>
 
    <tr>
@@ -246,7 +247,7 @@
   <input name="callback" type="hidden" value="admin.pl?action=list_users">
 
   <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_save_user" value="<translate>Save</translate>">
+  <input type="submit" class="submit" name="action_save_user" value="[% 'Save' | $T8 %]">
 
   [% IF edit %]
    [% FOREACH row = GROUPS %]
@@ -254,8 +255,8 @@
    [% END %]
    <input type="hidden" name="new_user_login" id="new_user_login" value="">
    <input type="hidden" name="action_save_user_as_new" id="action_save_user_as_new" value="">
-   <input type="button" class="submit" id="save_as_new_button" value="<translate>Save as new</translate>">
-   <input type="submit" class="submit" name="action_delete_user" value="<translate>Delete</translate>">
+   <input type="button" class="submit" id="save_as_new_button" value="[% 'Save as new' | $T8 %]">
+   <input type="submit" class="submit" name="action_delete_user" value="[% 'Delete' | $T8 %]">
    <input type="hidden" name="edit" value="1">
   [% END %]
 
@@ -265,7 +266,7 @@
   <!--
     $(document).ready(function() {
       $("#save_as_new_button").click(function() {
-        var new_user_login = prompt('<translate>Please enter the login for the new user.</translate>', '');
+        var new_user_login = prompt('[% 'Please enter the login for the new user.' | $T8 %]', '');
         if (!new_user_login || (new_user_login == ''))
           return;
 
diff --git a/templates/webpages/admin/list_users_de.html b/templates/webpages/admin/list_users_de.html
index 9889f5fe8..6d7309f42 100644
--- a/templates/webpages/admin/list_users_de.html
+++ b/templates/webpages/admin/list_users_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="">
 
  <form method="post" action="admin.pl">
@@ -7,13 +8,13 @@
   <p>
    <table width="100%">
     <tr>
-     <th class="listtop">Anmeldung</th>
-     <th class="listtop">Name</th>
-     <th class="listtop">Firma</th>
-     <th class="listtop">Treiber</th>
-     <th class="listtop">Datenbankcomputer</th>
-     <th class="listtop">Datenbank</th>
-     <th class="listtop">Vorlagen</th>
+     <th class="listtop">[% 'Login' | $T8 %]</th>
+     <th class="listtop">[% 'Name' | $T8 %]</th>
+     <th class="listtop">[% 'Company' | $T8 %]</th>
+     <th class="listtop">[% 'Driver' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Templates' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = MEMBERS %]
@@ -33,35 +34,35 @@
   </p>
 
 
-  <input type="submit" class="submit" name="action" value="Benutzer erfassen">
-  <input type="submit" class="submit" name="action" value="Gruppen bearbeiten">
-  <input type="submit" class="submit" name="action" value="Datenbankadministration">
+  <input type="submit" class="submit" name="action" value="[% 'Add User' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Edit groups' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Pg Database Administration' | $T8 %]">
   [% IF LOCKED %]
-   <input type="submit" class="submit" name="action" value="System entsperren">
+   <input type="submit" class="submit" name="action" value="[% 'Unlock System' | $T8 %]">
    [% ELSE %]
-   <input type="submit" class="submit" name="action" value="System sperren">
+   <input type="submit" class="submit" name="action" value="[% 'Lock System' | $T8 %]">
   [% END %]
-  <input type="submit" class="submit" name="action" value="Abmeldung">
+  <input type="submit" class="submit" name="action" value="[% 'Logout' | $T8 %]">
 
-  <p>Zum Bearbeiten den Zugriffsnamen anklicken!</p>
+  <p>[% 'Click on login name to edit!' | $T8 %]</p>
 
-  <p>Um einer Gruppe einen neuen Benutzer hinzuzuf&uuml;gen, passen Sie die Daten eines Benutzers an, und drücken Sie "als neu speichern". Unter dem neuen Namen wird dann ein Benutzer mit denselben Gruppenrechten angelegt.</p>
+  <p>[% '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.' | $T8 %]</p>
  </form>
 
  <form method="post" action="login.pl">
 
-  <div class="listheading">Lx-Office ERP Anmeldung</div>
+  <div class="listheading">Lx-Office ERP [% 'Login' | $T8 %]</div>
 
   <table border="0">
    <tr>
-    <th align="right">Name</th>
+    <th align="right">[% 'Name' | $T8 %]</th>
     <td><input class="login" name="login"></td>
     <td>&nbsp;</td>
    </tr>
    <tr>
-    <th align="right">Passwort</th>
+    <th align="right">[% 'Password' | $T8 %]</th>
     <td><input class="login" type="password" name="password"></td>
-    <td><input type="submit" name="action" value="Anmeldung"></td>
+    <td><input type="submit" name="action" value="[% 'Login' | $T8 %]"></td>
    </tr>
   </table>
 
diff --git a/templates/webpages/admin/list_users_master.html b/templates/webpages/admin/list_users_master.html
index fca83aa9f..6d7309f42 100644
--- a/templates/webpages/admin/list_users_master.html
+++ b/templates/webpages/admin/list_users_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="">
 
  <form method="post" action="admin.pl">
@@ -7,13 +8,13 @@
   <p>
    <table width="100%">
     <tr>
-     <th class="listtop"><translate>Login</translate></th>
-     <th class="listtop"><translate>Name</translate></th>
-     <th class="listtop"><translate>Company</translate></th>
-     <th class="listtop"><translate>Driver</translate></th>
-     <th class="listtop"><translate>Host</translate></th>
-     <th class="listtop"><translate>Dataset</translate></th>
-     <th class="listtop"><translate>Templates</translate></th>
+     <th class="listtop">[% 'Login' | $T8 %]</th>
+     <th class="listtop">[% 'Name' | $T8 %]</th>
+     <th class="listtop">[% 'Company' | $T8 %]</th>
+     <th class="listtop">[% 'Driver' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Templates' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = MEMBERS %]
@@ -33,35 +34,35 @@
   </p>
 
 
-  <input type="submit" class="submit" name="action" value="<translate>Add User</translate>">
-  <input type="submit" class="submit" name="action" value="<translate>Edit groups</translate>">
-  <input type="submit" class="submit" name="action" value="<translate>Pg Database Administration</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Add User' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Edit groups' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'Pg Database Administration' | $T8 %]">
   [% IF LOCKED %]
-   <input type="submit" class="submit" name="action" value="<translate>Unlock System</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Unlock System' | $T8 %]">
    [% ELSE %]
-   <input type="submit" class="submit" name="action" value="<translate>Lock System</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Lock System' | $T8 %]">
   [% END %]
-  <input type="submit" class="submit" name="action" value="<translate>Logout</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Logout' | $T8 %]">
 
-  <p><translate>Click on login name to edit!</translate></p>
+  <p>[% 'Click on login name to edit!' | $T8 %]</p>
 
-  <p><translate>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.</translate></p>
+  <p>[% '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.' | $T8 %]</p>
  </form>
 
  <form method="post" action="login.pl">
 
-  <div class="listheading">Lx-Office ERP <translate>Login</translate></div>
+  <div class="listheading">Lx-Office ERP [% 'Login' | $T8 %]</div>
 
   <table border="0">
    <tr>
-    <th align="right"><translate>Name</translate></th>
+    <th align="right">[% 'Name' | $T8 %]</th>
     <td><input class="login" name="login"></td>
     <td>&nbsp;</td>
    </tr>
    <tr>
-    <th align="right"><translate>Password</translate></th>
+    <th align="right">[% 'Password' | $T8 %]</th>
     <td><input class="login" type="password" name="password"></td>
-    <td><input type="submit" name="action" value="<translate>Login</translate>"></td>
+    <td><input type="submit" name="action" value="[% 'Login' | $T8 %]"></td>
    </tr>
   </table>
 
diff --git a/templates/webpages/admin/restore_dataset_de.html b/templates/webpages/admin/restore_dataset_de.html
index 28e0d2d39..c37f89828 100644
--- a/templates/webpages/admin/restore_dataset_de.html
+++ b/templates/webpages/admin/restore_dataset_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
 
  <h2>[% title %]</h2>
@@ -11,25 +12,25 @@
   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
   <p>
-   Bitte geben Sie den Namen der Datenbank ein, in der Sie die Sicherung wiederherstellen wollen.
-   Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.
-   Sie k&ouml;nnen eine fehlende Datenbank erstellen, indem Sie jetzt zu&uuml;ck gehen und den Punkt &quot;Datenbank anlegen&quot; w&auml;hlen.
+   [% 'Please enter the name of the dataset you want to restore the backup in.' | $T8 %]
+   [% 'The dataset has to exist before a restoration can be started.' | $T8 %]
+   [% 'You can create a missing dataset by going back and chosing &quot;Create Dataset&quot;.' | $T8 %]
   </p>
 
   <p>
-   Die von Ihnen hochzuladende Sicherungsdatei muss mit dem Programm und den Parametern &quot;pg_dump -o -Ft&quot; erstellt worden sein.
-   Sie darf optional mit &quot;gzip&quot; komprimiert sein.
-   Dateien, die von Lx-Office' Funktion &quot;Datenbank sichern&quot; erstellt wurden, erf&uuml;llen diese Kriterien.
+   [% 'The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.' | $T8 %]
+   [% 'It may optionally be compressed with &quot;gzip&quot;.' | $T8 %]
+   [% 'Files created by Lx-Office's &quot;Backup Dataset&quot; function are such files.' | $T8 %]
   </p>
 
   <table>
    <tr>
-    <td valign="top">Datenbankname</td>
+    <td valign="top">[% 'Dataset name' | $T8 %]</td>
     <td valign="top"><input name="new_dbname"></td>
    </tr>
 
    <tr>
-    <th valign="top">Schriftsatz</th>
+    <th valign="top">[% 'Multibyte Encoding' | $T8 %]</th>
     <td>
      <select name="dbencoding">
       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
@@ -38,7 +39,7 @@
    </tr>
 
    <tr>
-    <td valign="top">Sicherungsdatei</td>
+    <td valign="top">[% 'Backup file' | $T8 %]</td>
     <td valign="top"><input type="file" accept="*" name="content"></td>
    </tr>
   </table>
@@ -49,7 +50,7 @@
 
   <br>
 
-  <input type="submit" class="submit" name="action" value="Weiter">
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/restore_dataset_master.html b/templates/webpages/admin/restore_dataset_master.html
index a160272f4..c37f89828 100644
--- a/templates/webpages/admin/restore_dataset_master.html
+++ b/templates/webpages/admin/restore_dataset_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
 
  <h2>[% title %]</h2>
@@ -11,25 +12,25 @@
   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
   <p>
-   <translate>Please enter the name of the dataset you want to restore the backup in.</translate>
-   <translate>The dataset has to exist before a restoration can be started.</translate>
-   <translate>You can create a missing dataset by going back and chosing &quot;Create Dataset&quot;.</translate>
+   [% 'Please enter the name of the dataset you want to restore the backup in.' | $T8 %]
+   [% 'The dataset has to exist before a restoration can be started.' | $T8 %]
+   [% 'You can create a missing dataset by going back and chosing &quot;Create Dataset&quot;.' | $T8 %]
   </p>
 
   <p>
-   <translate>The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.</translate>
-   <translate>It may optionally be compressed with &quot;gzip&quot;.</translate>
-   <translate>Files created by Lx-Office's &quot;Backup Dataset&quot; function are such files.</translate>
+   [% 'The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.' | $T8 %]
+   [% 'It may optionally be compressed with &quot;gzip&quot;.' | $T8 %]
+   [% 'Files created by Lx-Office's &quot;Backup Dataset&quot; function are such files.' | $T8 %]
   </p>
 
   <table>
    <tr>
-    <td valign="top"><translate>Dataset name</translate></td>
+    <td valign="top">[% 'Dataset name' | $T8 %]</td>
     <td valign="top"><input name="new_dbname"></td>
    </tr>
 
    <tr>
-    <th valign="top"><translate>Multibyte Encoding</translate></th>
+    <th valign="top">[% 'Multibyte Encoding' | $T8 %]</th>
     <td>
      <select name="dbencoding">
       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
@@ -38,7 +39,7 @@
    </tr>
 
    <tr>
-    <td valign="top"><translate>Backup file</translate></td>
+    <td valign="top">[% 'Backup file' | $T8 %]</td>
     <td valign="top"><input type="file" accept="*" name="content"></td>
    </tr>
   </table>
@@ -49,7 +50,7 @@
 
   <br>
 
-  <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/restore_dataset_start_footer_de.html b/templates/webpages/admin/restore_dataset_start_footer_de.html
index 24854389c..1c3a90763 100644
--- a/templates/webpages/admin/restore_dataset_start_footer_de.html
+++ b/templates/webpages/admin/restore_dataset_start_footer_de.html
@@ -1,15 +1,17 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %] </pre>
 
  <hr>
 
  <p>
-  Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von &quot;pg_restore&quot; an, um festzustellen, ob die Wiederherstellung erfolgreich war.
-  Der Exitcode des Programms war [% HTML.escape(retval) %] (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).
+  [% 'The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.' | $T8 %]
+  [% LxERP.t8("The programs exit code was #1 (&quot;0&quot; usually means that everything went OK).", retval) | html %]
  </p>
 
  <form method="post" action="admin.pl">
   <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="Weiter">
+  <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 </body>
 </html>
diff --git a/templates/webpages/admin/restore_dataset_start_footer_master.html b/templates/webpages/admin/restore_dataset_start_footer_master.html
index da55e2dc2..1c3a90763 100644
--- a/templates/webpages/admin/restore_dataset_start_footer_master.html
+++ b/templates/webpages/admin/restore_dataset_start_footer_master.html
@@ -1,15 +1,17 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %] </pre>
 
  <hr>
 
  <p>
-  <translate>The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.</translate>
-  <translate>The program's exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).</translate>
+  [% 'The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.' | $T8 %]
+  [% LxERP.t8("The programs exit code was #1 (&quot;0&quot; usually means that everything went OK).", retval) | html %]
  </p>
 
  <form method="post" action="admin.pl">
   <input type="hidden" name="nextsub" value="list_users">
-  <input type="submit" name="action" value="<translate>Continue</translate>">
+  <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 </body>
 </html>
diff --git a/templates/webpages/admin/restore_dataset_start_header_de.html b/templates/webpages/admin/restore_dataset_start_header_de.html
index e34055938..7ee292c91 100644
--- a/templates/webpages/admin/restore_dataset_start_header_de.html
+++ b/templates/webpages/admin/restore_dataset_start_header_de.html
@@ -1,8 +1,9 @@
+[%- USE T8 %]
 <body class="admin">
 
  <h2>[% title %]</h2>
 
- <p>Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:</p>
+ <p>[% 'The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:' | $T8 %]</p>
 
  <hr>
 
diff --git a/templates/webpages/admin/restore_dataset_start_header_master.html b/templates/webpages/admin/restore_dataset_start_header_master.html
index accca00d4..7ee292c91 100644
--- a/templates/webpages/admin/restore_dataset_start_header_master.html
+++ b/templates/webpages/admin/restore_dataset_start_header_master.html
@@ -1,8 +1,9 @@
+[%- USE T8 %]
 <body class="admin">
 
  <h2>[% title %]</h2>
 
- <p><translate>The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:</translate></p>
+ <p>[% 'The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:' | $T8 %]</p>
 
  <hr>
 
diff --git a/templates/webpages/admin/test_db_connection_de.html b/templates/webpages/admin/test_db_connection_de.html
index ced5658fa..865efeac9 100644
--- a/templates/webpages/admin/test_db_connection_de.html
+++ b/templates/webpages/admin/test_db_connection_de.html
@@ -1,16 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  [%- IF connection_ok %]
 
- <p>Die Verbindung zur Datenbank wurde erfolgreich hergestellt.</p>
+ <p>[% 'The connection was established successfully.' | $T8 %]</p>
 
  [%- ELSE %]
 
  <p>
-  Die Verbindung zur Datenbank konnte nicht hergestellt werden.
-  Fehlermeldung des Datenbanktreibers:
+  [% 'The connection to the database could not be established.' | $T8 %]
+  [% 'Error message from the database driver:' | $T8 %]
  </p>
 
  <p>[% HTML.escape(errstr) %]</p>
@@ -19,7 +20,7 @@
 
  <p>
   <form>
-   <input type="button" class="submit" onclick="window.close()" value="Fenster Schlie&szlig;en">
+   <input type="button" class="submit" onclick="window.close()" value="[% 'Close Window' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/admin/test_db_connection_master.html b/templates/webpages/admin/test_db_connection_master.html
index 25dedacb0..865efeac9 100644
--- a/templates/webpages/admin/test_db_connection_master.html
+++ b/templates/webpages/admin/test_db_connection_master.html
@@ -1,17 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  [%- IF connection_ok %]
 
- <p><translate>The connection was established successfully.</translate></p>
+ <p>[% 'The connection was established successfully.' | $T8 %]</p>
 
  [%- ELSE %]
 
  <p>
-  <translate>The connection to the database could not be
-   established.</translate>
-  <translate>Error message from the database driver:</translate>
+  [% 'The connection to the database could not be established.' | $T8 %]
+  [% 'Error message from the database driver:' | $T8 %]
  </p>
 
  <p>[% HTML.escape(errstr) %]</p>
@@ -20,7 +20,7 @@
 
  <p>
   <form>
-   <input type="button" class="submit" onclick="window.close()" value="<translate>Close Window</translate>">
+   <input type="button" class="submit" onclick="window.close()" value="[% 'Close Window' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/admin/update_dataset_de.html b/templates/webpages/admin/update_dataset_de.html
index cf286c549..8d3208642 100644
--- a/templates/webpages/admin/update_dataset_de.html
+++ b/templates/webpages/admin/update_dataset_de.html
@@ -1,24 +1,25 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
  <h2>[% title %]</h2>
 
  [% IF ALL_UPDATED %]
-  Alle Datenbanken sind auf aktuellem Stand.
+  [% 'All Datasets up to date!' | $T8 %]
 
   [% ELSE %]
 
   <form method="post" action="admin.pl">
 
-   <p>Folgende Datenbanken müssen aktualisiert werden:</p>
+   <p>[% 'The following Datasets need to be updated' | $T8 %]:</p>
 
    <table>
     <tr>
-     <th class="listtop">Aktualisieren?</th>
-     <th class="listtop">Datenbank</th>
-     <th class="listtop">Treiber</th>
-     <th class="listtop">Datenbankcomputer</th>
-     <th class="listtop">Port</th>
-     <th class="listtop">Benutzer</th>
+     <th class="listtop">[% 'Update?' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Driver' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Port' | $T8 %]</th>
+     <th class="listtop">[% 'User' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = NEED_UPDATES %]
@@ -46,7 +47,7 @@
 
    <br>
 
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
 
   </form>
 
diff --git a/templates/webpages/admin/update_dataset_master.html b/templates/webpages/admin/update_dataset_master.html
index 268cf8798..8d3208642 100644
--- a/templates/webpages/admin/update_dataset_master.html
+++ b/templates/webpages/admin/update_dataset_master.html
@@ -1,24 +1,25 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="admin">
 
  <h2>[% title %]</h2>
 
  [% IF ALL_UPDATED %]
-  <translate>All Datasets up to date!</translate>
+  [% 'All Datasets up to date!' | $T8 %]
 
   [% ELSE %]
 
   <form method="post" action="admin.pl">
 
-   <p><translate>The following Datasets need to be updated</translate>:</p>
+   <p>[% 'The following Datasets need to be updated' | $T8 %]:</p>
 
    <table>
     <tr>
-     <th class="listtop"><translate>Update?</translate></th>
-     <th class="listtop"><translate>Dataset</translate></th>
-     <th class="listtop"><translate>Driver</translate></th>
-     <th class="listtop"><translate>Host</translate></th>
-     <th class="listtop"><translate>Port</translate></th>
-     <th class="listtop"><translate>User</translate></th>
+     <th class="listtop">[% 'Update?' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Driver' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+     <th class="listtop">[% 'Port' | $T8 %]</th>
+     <th class="listtop">[% 'User' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = NEED_UPDATES %]
@@ -46,7 +47,7 @@
 
    <br>
 
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
 
   </form>
 
diff --git a/templates/webpages/admin/user_migration_complete_de.html b/templates/webpages/admin/user_migration_complete_de.html
index 29257b88f..5f5114caa 100644
--- a/templates/webpages/admin/user_migration_complete_de.html
+++ b/templates/webpages/admin/user_migration_complete_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -5,17 +6,17 @@
  <form method="post" action="admin.pl">
 
   [%- IF standard_group_created %]
-  <p>Eine Gruppe namens &quot;Vollzugriff&quot; wurde angelegt.</p>
+  <p>[% 'A group named &quot;Full Access&quot; has been created.' | $T8 %]</p>
   [%- END %]
 
 
-  <p>Der Prozess der Benutzerdatenmigration ist abgeschlossen.
-   Sie werden nun zum Administrationsbereich weitergeleitet.</p>
+  <p>[% 'The user migration process is complete.' | $T8 %]
+   [% 'You will now be forwarded to the administration panel.' | $T8 %]</p>
 
   <input type="hidden" name="nextsub" value="list_users">
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/user_migration_complete_master.html b/templates/webpages/admin/user_migration_complete_master.html
index dcf0eb8e1..5f5114caa 100644
--- a/templates/webpages/admin/user_migration_complete_master.html
+++ b/templates/webpages/admin/user_migration_complete_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -5,19 +6,17 @@
  <form method="post" action="admin.pl">
 
   [%- IF standard_group_created %]
-  <p><translate>A group named &quot;Full Access&quot; has been
-    created.</translate></p>
+  <p>[% 'A group named &quot;Full Access&quot; has been created.' | $T8 %]</p>
   [%- END %]
 
 
-  <p><translate>The user migration process is complete.</translate>
-   <translate>You will now be forwarded to the administration
-   panel.</translate></p>
+  <p>[% 'The user migration process is complete.' | $T8 %]
+   [% 'You will now be forwarded to the administration panel.' | $T8 %]</p>
 
   <input type="hidden" name="nextsub" value="list_users">
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/user_migration_de.html b/templates/webpages/admin/user_migration_de.html
index c57f83d2d..ef34e55e7 100644
--- a/templates/webpages/admin/user_migration_de.html
+++ b/templates/webpages/admin/user_migration_de.html
@@ -1,3 +1,5 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -5,18 +7,18 @@
  <form method="post" action="admin.pl">
 
   <p>
-   Die alte Datei mit den Benutzerdaten existiert in dieser Installation noch immer (&quot;[% HTML.escape(memberfile) %]&quot;). Wollen Sie diese Benutzer in die neue Authentifizierungsdatenbank migrieren lassen? Falls nicht, so werden Sie sich nicht mehr mit den Benutzerdaten aus der alten Mitgliedsdatei anmelden k&ouml;nnen.
+   [% LxERP.t8('The old file containing the user information is still present (&quot;#1&quot;). Do you want to migrate these users into the database? If not then you will not be able to log in with any of the users present in the old file.', memberfile) | html %]
   </p>
 
   <p>
-   Falls Sie sich entscheiden, Lx-Office die Migration durchf&uuml;hren zu lassen, so wird Lx-Office ein Backup der alten Dateien im Verzeichnis &quot;[% HTML.escape(backupdir) %]&quot; erstellen und die Dateien anschlie&szlig;end l&ouml;schen.
+   [% LxERP.t8('If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory &quot;#1&quot;.', backupdir) | html %]
   </p>
 
   <input type="hidden" name="yes_nextsub" value="migrate_users">
   <input type="hidden" name="no_nextsub" value="list_users">
 
-  <input type="submit" class="submit" name="action" value="Ja">
-  <input type="submit" class="submit" name="action" value="Nein">
+  <input type="submit" class="submit" name="action" value="[% 'Yes' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'No' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/user_migration_done_de.html b/templates/webpages/admin/user_migration_done_de.html
index 286248aed..c20263c39 100644
--- a/templates/webpages/admin/user_migration_done_de.html
+++ b/templates/webpages/admin/user_migration_done_de.html
@@ -1,16 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  <form method="post" action="admin.pl">
 
-  <p>Die folgenden Benutzer wurden in die Authentifizierungsdatenbank migriert:</p>
+  <p>[% 'The following users have been migrated into the authentication database:' | $T8 %]</p>
 
   <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
 
   <input type="hidden" name="nextsub" value="create_standard_group_ask">
 
-  <input type="submit" class="submit" name="action" value="Weiter">
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/user_migration_done_master.html b/templates/webpages/admin/user_migration_done_master.html
index dd7b32ae6..c20263c39 100644
--- a/templates/webpages/admin/user_migration_done_master.html
+++ b/templates/webpages/admin/user_migration_done_master.html
@@ -1,17 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  <form method="post" action="admin.pl">
 
-  <p><translate>The following users have been migrated into the
-    authentication database:</translate></p>
+  <p>[% 'The following users have been migrated into the authentication database:' | $T8 %]</p>
 
   <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
 
   <input type="hidden" name="nextsub" value="create_standard_group_ask">
 
-  <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/user_migration_master.html b/templates/webpages/admin/user_migration_master.html
index b9f5d4d5d..ef34e55e7 100644
--- a/templates/webpages/admin/user_migration_master.html
+++ b/templates/webpages/admin/user_migration_master.html
@@ -1,3 +1,5 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -5,25 +7,18 @@
  <form method="post" action="admin.pl">
 
   <p>
-   <translate>The old file containing the user information is still
-    present (&quot;[% HTML.escape(memberfile) %]&quot;). Do you want to
-    migrate these users into the database? If not then you will not be
-    able to log in with any of the users present in the old file.
-   </translate>
+   [% LxERP.t8('The old file containing the user information is still present (&quot;#1&quot;). Do you want to migrate these users into the database? If not then you will not be able to log in with any of the users present in the old file.', memberfile) | html %]
   </p>
 
   <p>
-   <translate>If you chose to let Lx-Office do the migration then
-    Lx-Office will also remove the old member file after creating a
-    backup copy of it in the directory
-    &quot;[% HTML.escape(backupdir) %]&quot;.</translate>
+   [% LxERP.t8('If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory &quot;#1&quot;.', backupdir) | html %]
   </p>
 
   <input type="hidden" name="yes_nextsub" value="migrate_users">
   <input type="hidden" name="no_nextsub" value="list_users">
 
-  <input type="submit" class="submit" name="action" value="<translate>Yes</translate>">
-  <input type="submit" class="submit" name="action" value="<translate>No</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Yes' | $T8 %]">
+  <input type="submit" class="submit" name="action" value="[% 'No' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/am/config_de.html b/templates/webpages/am/config_de.html
index f064f8d99..280db9d67 100644
--- a/templates/webpages/am/config_de.html
+++ b/templates/webpages/am/config_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onLoad="fokus()">
 
  <p>
@@ -7,10 +8,10 @@
  <form method="post" action="am.pl" name="Form">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="page_personal_settings">Pers&ouml;nliche Einstellungen</a></li>
-   <li><a href="#" rel="page_display_options">Anzeigeoptionen</a></li>
-   <li><a href="#" rel="page_print_options">Druckoptionen</a></li>
-   <li><a href="#" rel="page_todo_list_options">Aufgabenlistenoptionen</a></li>
+   <li class="selected"><a href="#" rel="page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
+   <li><a href="#" rel="page_display_options">[% 'Display options' | $T8 %]</a></li>
+   <li><a href="#" rel="page_print_options">[% 'Print options' | $T8 %]</a></li>
+   <li><a href="#" rel="page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
   </ul>
 
   <input type="hidden" name="type" value="preferences">
@@ -22,12 +23,12 @@
 
     <table>
      <tr>
-      <th align="right">Name</th>
+      <th align="right">[% 'Name' | $T8 %]</th>
       <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
      </tr>
 
      <tr>
-      <th align="right">Passwort</th>
+      <th align="right">[% 'Password' | $T8 %]</th>
       <td>
        [%- IF CAN_CHANGE_PASSWORD %]
        <input type="password" name="new_password" size="10" value="********">
@@ -38,30 +39,30 @@
      </tr>
 
      <tr>
-      <th align="right">eMail</th>
+      <th align="right">[% 'E-mail' | $T8 %]</th>
       <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
      </tr>
 
      <tr valign="top">
-      <th align="right">Unterschrift</th>
+      <th align="right">[% 'Signature' | $T8 %]</th>
       <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
      </tr>
 
      <tr>
-      <th align="right">Telefon</th>
+      <th align="right">[% 'Phone' | $T8 %]</th>
       <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
      </tr>
 
      <tr>
-      <th align="right">Fax</th>
+      <th align="right">[% 'Fax' | $T8 %]</th>
       <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
      </tr>
      <tr>
-      <th align="right">Firma</th>
+      <th align="right">[% 'Company' | $T8 %]</th>
       <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
      </tr>
      <tr valign="top">
-      <th align="right">Adresse</th>
+      <th align="right">[% 'Address' | $T8 %]</th>
       <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
      </tr>
     </table>
@@ -73,7 +74,7 @@
 
     <table>
      <tr>
-      <th align="right">Datumsformat</th>
+      <th align="right">[% 'Date Format' | $T8 %]</th>
       <td>
        <select name="dateformat">
         [%- FOREACH row = DATEFORMATS %]
@@ -83,7 +84,7 @@
       </td>
      </tr>
      <tr>
-      <th align="right">Zahlenformat (Ausgabe)</th>
+      <th align="right">[% 'Output Number Format' | $T8 %]</th>
       <td>
        <select name="numberformat">
         [%- FOREACH row = NUMBERFORMATS %]
@@ -94,12 +95,12 @@
      </tr>
 
      <tr>
-      <th align="right">Auswahllistenbegrenzung</th>
+      <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
       <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
      </tr>
 
      <tr>
-      <th align="right">Sprache</th>
+      <th align="right">[% 'Language' | $T8 %]</th>
       <td>
        <select name="countrycode">
         [%- FOREACH row = COUNTRYCODES %]
@@ -110,7 +111,7 @@
      </tr>
 
      <tr>
-      <th align="right">Stilvorlage</th>
+      <th align="right">[% 'Stylesheet' | $T8 %]</th>
       <td>
        <select name="usestylesheet">
         [%- FOREACH row = STYLESHEETS %]
@@ -121,39 +122,39 @@
      </tr>
 
      <tr>
-      <th align="right">Menüsetup</th>
+      <th align="right">[% 'Setup Menu' | $T8 %]</th>
       <td>
        <select name="menustyle">
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>Oben (mit CSS)</option>
-        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>Oben (mit CSS, neu)</option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>Oben (mit Javascript)</option>
-        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>Oben (XUL; nur f&uuml;r Mozilla Firefox)</option>
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>Alt (seitlich)</option>
+        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
+        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
+        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
        </select>
       </td>
      </tr>
 
      <tr valign="top">
-      <th align="right">Favoriten</th>
+      <th align="right">[% 'Favorites' | $T8 %]</th>
       <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
      </tr>
 
      <tr>
-      <th align="right">Formulardetails (zweite Positionszeile)</th>
+      <th align="right">[% 'Form details (second row)' | $T8 %]</th>
       <td>
        <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>Standardm&auml;&szlig;ig anzeigen</option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>Standardm&auml;&szlig;ig verstecken</option>
+        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
 
      <tr>
-      <th align="right">Suchoptionen für Benutzerdefinierte Variablen verstecken</th>
+      <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
       <td>
        <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>Standardm&auml;&szlig;ig anzeigen</option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>Standardm&auml;&szlig;ig verstecken</option>
+        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
@@ -168,7 +169,7 @@
      <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
 
      <tr>
-      <th align="right">Standardvorlagenformat</th>
+      <th align="right">[% 'Default template format' | $T8 %]</th>
       <td>
        <select name="template_format">
         [%- FOREACH row = TEMPLATE_FORMATS %]
@@ -179,7 +180,7 @@
      </tr>
 
      <tr>
-      <th align="right">Standardausgabekanal</th>
+      <th align="right">[% 'Default output medium' | $T8 %]</th>
       <td>
        <select name="default_media">
         [%- FOREACH row = MEDIA %]
@@ -190,7 +191,7 @@
      </tr>
 
      <tr>
-      <th align="right">Standarddrucker</th>
+      <th align="right">[% 'Default printer' | $T8 %]</th>
       <td>
        <select name="default_printer_id">
         [%- FOREACH row = PRINTERS %]
@@ -201,7 +202,7 @@
      </tr>
 
      <tr>
-      <th align="right">Anzahl Kopien</th>
+      <th align="right">[% 'Number of copies' | $T8 %]</th>
       <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
      </tr>
     </table>
@@ -213,41 +214,41 @@
 
     <table>
      <tr>
-      <th align="right">Aufgabenliste nach dem Anmelden anzeigen</th>
+      <th align="right">[% 'Show your TODO list after loggin in' | $T8 %]</th>
       <td colspan="2">
        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_1">Ja</label>
+       <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_0">Nein</label>
+       <label for="todo_cfg_show_after_login_0">[% 'No' | $T8 %]</label>
       </td>
      </tr>
 
      <tr class="listheading">
-      <th colspan="3">Konfiguration f&uuml;r die einzelnen Aufgabenlistenpunkte</th>
+      <th colspan="3">[% 'Configuration of individual TODO items' | $T8 %]</th>
      </tr>
 
      <tr>
-      <th align="right">Zeige Wiedervorlagen...</th>
+      <th align="right">[% 'Show follow ups...' | $T8 %]</th>
       <td>
        <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups">...auf der Aufgabenliste</label>
+       <label for="todo_cfg_show_follow_ups">[% '...on the TODO list' | $T8 %]</label>
       </td>
       <td>
        <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login">...nach dem Anmelden</label>
+       <label for="todo_cfg_show_follow_ups_login">[% '...after loggin in' | $T8 %]</label>
       </td>
      </tr>
 
      [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
      <tr>
-      <th align="right">Überfällige Angebote und Preisanfragen anzeigen...</th>
+      <th align="right">[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
       <td>
        <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations">...auf der Aufgabenliste</label>
+       <label for="todo_cfg_show_overdue_sales_quotations">[% '...on the TODO list' | $T8 %]</label>
       </td>
       <td>
        <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login">...nach dem Anmelden</label>
+       <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after loggin in' | $T8 %]</label>
       </td>
      </tr>
      [%- END %]
@@ -257,7 +258,7 @@
    </div>
   </div>
 
-  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
  </form>
 
  <script type="text/javascript">
diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
index e24919eb6..280db9d67 100644
--- a/templates/webpages/am/config_master.html
+++ b/templates/webpages/am/config_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onLoad="fokus()">
 
  <p>
@@ -7,10 +8,10 @@
  <form method="post" action="am.pl" name="Form">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="page_personal_settings"><translate>Personal settings</translate></a></li>
-   <li><a href="#" rel="page_display_options"><translate>Display options</translate></a></li>
-   <li><a href="#" rel="page_print_options"><translate>Print options</translate></a></li>
-   <li><a href="#" rel="page_todo_list_options"><translate>TODO list options</translate></a></li>
+   <li class="selected"><a href="#" rel="page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
+   <li><a href="#" rel="page_display_options">[% 'Display options' | $T8 %]</a></li>
+   <li><a href="#" rel="page_print_options">[% 'Print options' | $T8 %]</a></li>
+   <li><a href="#" rel="page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
   </ul>
 
   <input type="hidden" name="type" value="preferences">
@@ -22,12 +23,12 @@
 
     <table>
      <tr>
-      <th align="right"><translate>Name</translate></th>
+      <th align="right">[% 'Name' | $T8 %]</th>
       <td><input name="name" size="15" value="[% HTML.escape(myconfig_name) %]"></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Password</translate></th>
+      <th align="right">[% 'Password' | $T8 %]</th>
       <td>
        [%- IF CAN_CHANGE_PASSWORD %]
        <input type="password" name="new_password" size="10" value="********">
@@ -38,30 +39,30 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>E-mail</translate></th>
+      <th align="right">[% 'E-mail' | $T8 %]</th>
       <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
      </tr>
 
      <tr valign="top">
-      <th align="right"><translate>Signature</translate></th>
+      <th align="right">[% 'Signature' | $T8 %]</th>
       <td><textarea name="signature" rows="3" cols="50">[% HTML.escape(myconfig_signature) %]</textarea></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Phone</translate></th>
+      <th align="right">[% 'Phone' | $T8 %]</th>
       <td><input name="tel" size="14" value="[% HTML.escape(myconfig_tel) %]"></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Fax</translate></th>
+      <th align="right">[% 'Fax' | $T8 %]</th>
       <td><input name="fax" size="14" value="[% HTML.escape(myconfig_fax) %]"></td>
      </tr>
      <tr>
-      <th align="right"><translate>Company</translate></th>
+      <th align="right">[% 'Company' | $T8 %]</th>
       <td><input name="company" size="30" value="[% HTML.escape(myconfig_company) %]"></td>
      </tr>
      <tr valign="top">
-      <th align="right"><translate>Address</translate></th>
+      <th align="right">[% 'Address' | $T8 %]</th>
       <td><textarea name="address" rows="4" cols="50">[% HTML.escape(myconfig_address) %]</textarea></td>
      </tr>
     </table>
@@ -73,7 +74,7 @@
 
     <table>
      <tr>
-      <th align="right"><translate>Date Format</translate></th>
+      <th align="right">[% 'Date Format' | $T8 %]</th>
       <td>
        <select name="dateformat">
         [%- FOREACH row = DATEFORMATS %]
@@ -83,7 +84,7 @@
       </td>
      </tr>
      <tr>
-      <th align="right"><translate>Output Number Format</translate></th>
+      <th align="right">[% 'Output Number Format' | $T8 %]</th>
       <td>
        <select name="numberformat">
         [%- FOREACH row = NUMBERFORMATS %]
@@ -94,12 +95,12 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>Dropdown Limit</translate></th>
+      <th align="right">[% 'Dropdown Limit' | $T8 %]</th>
       <td><input name="vclimit" size="10" value="[% HTML.escape(myconfig_vclimit) %]"></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Language</translate></th>
+      <th align="right">[% 'Language' | $T8 %]</th>
       <td>
        <select name="countrycode">
         [%- FOREACH row = COUNTRYCODES %]
@@ -110,7 +111,7 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>Stylesheet</translate></th>
+      <th align="right">[% 'Stylesheet' | $T8 %]</th>
       <td>
        <select name="usestylesheet">
         [%- FOREACH row = STYLESHEETS %]
@@ -121,39 +122,39 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>Setup Menu</translate></th>
+      <th align="right">[% 'Setup Menu' | $T8 %]</th>
       <td>
        <select name="menustyle">
-        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]><translate>Top (CSS)</translate></option>
-        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]><translate>Top (CSS) new</translate></option>
-        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]><translate>Top (Javascript)</translate></option>
-        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]><translate>Top (XUL; only for Mozilla Firefox)</translate></option>
-        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]><translate>Old (on the side)</translate></option>
+        <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+        <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
+        <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
+        <option value="old"[% IF myconfig_menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
        </select>
       </td>
      </tr>
 
      <tr valign="top">
-      <th align="right"><translate>Favorites</translate></th>
+      <th align="right">[% 'Favorites' | $T8 %]</th>
       <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Form details (second row)</translate></th>
+      <th align="right">[% 'Form details (second row)' | $T8 %]</th>
       <td>
        <select name="show_form_details">
-        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]><translate>Show by default</translate></option>
-        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]><translate>Hide by default</translate></option>
+        <option value="1"[% IF  myconfig_show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="0"[% IF !myconfig_show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Show custom variable search inputs</translate></th>
+      <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
       <td>
        <select name="hide_cvar_search_options">
-        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]><translate>Show by default</translate></option>
-        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]><translate>Hide by default</translate></option>
+        <option value="0"[% IF !myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+        <option value="1"[% IF  myconfig_hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
        </select>
       </td>
      </tr>
@@ -168,7 +169,7 @@
      <input name="printer" type="hidden" value="[% HTML.escape(myconfig_printer) %]">
 
      <tr>
-      <th align="right"><translate>Default template format</translate></th>
+      <th align="right">[% 'Default template format' | $T8 %]</th>
       <td>
        <select name="template_format">
         [%- FOREACH row = TEMPLATE_FORMATS %]
@@ -179,7 +180,7 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>Default output medium</translate></th>
+      <th align="right">[% 'Default output medium' | $T8 %]</th>
       <td>
        <select name="default_media">
         [%- FOREACH row = MEDIA %]
@@ -190,7 +191,7 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>Default printer</translate></th>
+      <th align="right">[% 'Default printer' | $T8 %]</th>
       <td>
        <select name="default_printer_id">
         [%- FOREACH row = PRINTERS %]
@@ -201,7 +202,7 @@
      </tr>
 
      <tr>
-      <th align="right"><translate>Number of copies</translate></th>
+      <th align="right">[% 'Number of copies' | $T8 %]</th>
       <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
      </tr>
     </table>
@@ -213,41 +214,41 @@
 
     <table>
      <tr>
-      <th align="right"><translate>Show your TODO list after loggin in</translate></th>
+      <th align="right">[% 'Show your TODO list after loggin in' | $T8 %]</th>
       <td colspan="2">
        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_1"><translate>Yes</translate></label>
+       <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_0"><translate>No</translate></label>
+       <label for="todo_cfg_show_after_login_0">[% 'No' | $T8 %]</label>
       </td>
      </tr>
 
      <tr class="listheading">
-      <th colspan="3"><translate>Configuration of individual TODO items</translate></th>
+      <th colspan="3">[% 'Configuration of individual TODO items' | $T8 %]</th>
      </tr>
 
      <tr>
-      <th align="right"><translate>Show follow ups...</translate></th>
+      <th align="right">[% 'Show follow ups...' | $T8 %]</th>
       <td>
        <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups"><translate>...on the TODO list</translate></label>
+       <label for="todo_cfg_show_follow_ups">[% '...on the TODO list' | $T8 %]</label>
       </td>
       <td>
        <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login"><translate>...after loggin in</translate></label>
+       <label for="todo_cfg_show_follow_ups_login">[% '...after loggin in' | $T8 %]</label>
       </td>
      </tr>
 
      [%- IF AUTH_RIGHTS_SALES_QUOTATION_EDIT %]
      <tr>
-      <th align="right"><translate>Show overdue sales quotations and requests for quotations...</translate></th>
+      <th align="right">[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
       <td>
        <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations"><translate>...on the TODO list</translate></label>
+       <label for="todo_cfg_show_overdue_sales_quotations">[% '...on the TODO list' | $T8 %]</label>
       </td>
       <td>
        <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login"><translate>...after loggin in</translate></label>
+       <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after loggin in' | $T8 %]</label>
       </td>
      </tr>
      [%- END %]
@@ -257,7 +258,7 @@
    </div>
   </div>
 
-  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
  </form>
 
  <script type="text/javascript">
diff --git a/templates/webpages/am/confirm_delete_warehouse_de.html b/templates/webpages/am/confirm_delete_warehouse_de.html
index 624441280..541b29a71 100644
--- a/templates/webpages/am/confirm_delete_warehouse_de.html
+++ b/templates/webpages/am/confirm_delete_warehouse_de.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
- <p>Wollen Sie dieses Lager wirklich l&ouml;schen?</p>
+ <p>[% 'Do you really want to delete this warehouse?' | $T8 %]</p>
 
- <p>Lager: [% HTML.escape(orig_description) %]</p>
+ <p>[% 'Warehouse' | $T8 %]: [% HTML.escape(orig_description) %]</p>
 
  <form action="am.pl" method="post">
 
@@ -13,8 +14,8 @@
   <input type="hidden" name="type" value="warehouse">
   <input type="hidden" name="confirmed" value="1">
 
-  <button type="button" class="submit" onclick="history.back()">Zurück</button>
-  <input type="submit" class="submit" name="action" value="Löschen">
+  <button type="button" class="submit" onclick="history.back()">[% 'Back' | $T8 %]</button>
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
  </form>
 
 </body>
diff --git a/templates/webpages/am/confirm_delete_warehouse_master.html b/templates/webpages/am/confirm_delete_warehouse_master.html
index 24bec53c1..541b29a71 100644
--- a/templates/webpages/am/confirm_delete_warehouse_master.html
+++ b/templates/webpages/am/confirm_delete_warehouse_master.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
- <p><translate>Do you really want to delete this warehouse?</translate></p>
+ <p>[% 'Do you really want to delete this warehouse?' | $T8 %]</p>
 
- <p><translate>Warehouse</translate>: [% HTML.escape(orig_description) %]</p>
+ <p>[% 'Warehouse' | $T8 %]: [% HTML.escape(orig_description) %]</p>
 
  <form action="am.pl" method="post">
 
@@ -13,8 +14,8 @@
   <input type="hidden" name="type" value="warehouse">
   <input type="hidden" name="confirmed" value="1">
 
-  <button type="button" class="submit" onclick="history.back()"><translate>Back</translate></button>
-  <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
+  <button type="button" class="submit" onclick="history.back()">[% 'Back' | $T8 %]</button>
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
  </form>
 
 </body>
diff --git a/templates/webpages/am/edit_accounts_de.html b/templates/webpages/am/edit_accounts_de.html
index fab2c0281..6ccb7a20e 100644
--- a/templates/webpages/am/edit_accounts_de.html
+++ b/templates/webpages/am/edit_accounts_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
@@ -33,20 +34,20 @@ window.onload = function() {
 
 <fieldset>
   <legend>
-    Grundeinstellungen
+    [% 'Main Preferences' | $T8 %]
   </legend>
   <table>
     <tr>
       <td>
         <label>
-          Kontonummer
+          [% 'Account Number' | $T8 %]
         </label></td>
         <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
     </tr>
     <tr>
       <td>
         <label>
-          Beschreibung
+          [% 'Description' | $T8 %]
         </label>
       </td>
       <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
@@ -54,7 +55,7 @@ window.onload = function() {
     <tr>
       <td>
         <label>
-          Kontentyp
+          [% 'Chart Type' | $T8 %]
 
         </label>
       </td>
@@ -63,76 +64,76 @@ window.onload = function() {
   </table>
 </fieldset>
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Kontoart</legend>
+  <legend>[% 'Account Type' | $T8 %]</legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
           [% select_category %]</select>
 </fieldset>
 
 [% IF ChartTypeIsAccount %]
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Buchungskonto in</legend>
+  <legend>[% 'Is this a summary account to record' | $T8 %]</legend>
     <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
-    &nbsp;Verkauf
+    &nbsp;[% 'AR' | $T8 %]
     <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
-    &nbsp;Einkauf
+    &nbsp;[% 'AP' | $T8 %]
     <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
-    &nbsp;Inventar
+    &nbsp;[% 'Inventory' | $T8 %]
 </fieldset>
 
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend>In Aufklappmenü aufnehmen</legend>
-  <p style='font-weight:normal'>Dieser Block ist nur dann gültig, wenn das Konto KEIN Buchungskonto ist, und wenn ein gültiger Steuerschlüssel für das Konto existiert. Wird das Konto als Buchungskonto markiert, werden diese Einstellungen entfernt.</p>
+  <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
+  <p style='font-weight:normal'>[% 'These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.' | $T8 %]</p>
   <table width="100%">
     <tr>
-      <th align="left">Forderungen</th>
-      <th align="left">Verbindlichkeiten</th>
-      <th align="left">Warenliste</th>
-      <th align="left">Dienstleistungen</th>
+      <th align="left">[% 'Receivables' | $T8 %]</th>
+      <th align="left">[% 'Payables' | $T8 %]</th>
+      <th align="left">[% 'Parts Inventory' | $T8 %]</th>
+      <th align="left">[% 'Service Items' | $T8 %]</th>
     </tr>
     <tr>
       <td>
         <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
           [% HTML.escape(AR_amount) %]>&nbsp;
-        Erlöskonto <br>
+        [% 'Revenue' | $T8 %] <br>
         <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
           [% HTML.escape(AR_paid) %]>&nbsp;
-        Zahlungseingang <br>
+        [% 'Receipt' | $T8 %] <br>
         <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
           [% HTML.escape(AR_tax) %]>&nbsp;
-        Steuer
+        [% 'Tax' | $T8 %]
       </td>
       <td>
         <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
           [% HTML.escape(AP_amount) %]>&nbsp;
-        Aufwand/Anlagen <br>
+        [% 'Expense/Asset' | $T8 %] <br>
         <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
           [% HTML.escape(AP_paid) %]>&nbsp;
-        Zahlungsausgang <br>
+        [% 'Payment' | $T8 %] <br>
         <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
             [% HTML.escape(AP_tax) %]>&nbsp;
-        Steuer
+        [% 'Tax' | $T8 %]
       </td>
       <td>
         <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
           [% HTML.escape(IC_sale) %]>&nbsp;
-        Erlöskonto <br>
+        [% 'Revenue' | $T8 %] <br>
         <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
           [% HTML.escape(IC_cogs) %]>&nbsp;
-        Aufwandskonto <br>
+        [% 'Expense' | $T8 %] <br>
         <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
           [% HTML.escape(IC_taxpart) %]>&nbsp;
-        Steuer
+        [% 'Tax' | $T8 %]
       </td>
       <td>
         <input name=IC_income type=checkbox class=checkbox value="IC_income"
           [% HTML.escape(IC_income) %]>&nbsp;
-        Erlöskonto <br>
+        [% 'Revenue' | $T8 %] <br>
         <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
           [% HTML.escape(IC_expense) %]>&nbsp;
-        Aufwandskonto <br>
+        [% 'Expense' | $T8 %] <br>
         <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
           [% HTML.escape(IC_taxservice) %]>&nbsp;
-        Steuer
+        [% 'Tax' | $T8 %]
       </td>
     </tr>
   </table>
@@ -140,17 +141,17 @@ window.onload = function() {
 
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>
-    Steuerautomatik und UStVA
+    [% 'Taxkeys and Taxreport Preferences' | $T8 %]
   </legend>
-  <p style='font-weight:normal'>Achtung: Steuerschlüssel brauchen ein gültiges "Gültig ab"-Datum und werden andernfalls ignoriert.</p>
+  <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' | $T8 %]</p>
 
             <table>
 [% IF account_exists %]
               <tr>
-                <th align="left">Steuerschlüssel</th>
-                <th align="left">Gültig ab</th>
-                <th align="left">UStVA</th>
-                <th align="left">Löschen ? </th>
+                <th align="left">[% 'Taxkey' | $T8 %]</th>
+                <th align="left">[% 'valid from' | $T8 %]</th>
+                <th align="left">[% 'pos_ustva' | $T8 %]</th>
+                <th align="left">[% 'delete' | $T8 %] ? </th>
               </tr>
 [% FOREACH tk = ACCOUNT_TAXKEYS %]
               <tr>
@@ -173,8 +174,7 @@ window.onload = function() {
 [% END %]
 [% ELSE %]
 <tr>
-  <td align="center" colspan="4"><p>Einstellungen sind nach
-  dem Speichern des Kontos verfügbar...</p>
+  <td align="center" colspan="4"><p>[% 'Save account first to insert taxkeys' | $T8 %]</p>
   </td>
 </tr>
 [% END %]
@@ -182,29 +182,29 @@ window.onload = function() {
 </fieldset>
 
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend>Sonstige Einstellungen</legend>
+  <legend>[% 'Report and misc. Preferences' | $T8 %]</legend>
   <table>
         <tr>
-          <th align="left">Einnahmen-/Überschussrechnung</th>
+          <th align="left">[% 'EUER' | $T8 %]</th>
           <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
         </tr>
         <tr>
-          <th align="left">BWA</th>
+          <th align="left">[% 'BWA' | $T8 %]</th>
           <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
         </tr>
         <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
         <!-- tr>
-          <th align="left">Bilanz</th>
+          <th align="left">[% 'Bilanz' | $T8 %]</th>
           <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
         </tr -->
         <tr>
-          <th align="left">Datevexport</th>
+          <th align="left">[% 'Datevautomatik' | $T8 %]</th>
           <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
         </tr>
         <tr>
-          <th align="left">Folgekonto</th>
+          <th align="left">[% 'Folgekonto' | $T8 %]</th>
           <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
-          <th align="left">Gültig ab</th>
+          <th align="left">[% 'Valid from' | $T8 %]</th>
           <td><input name="valid_from" value="[% valid_from %]"></td>
         </tr>
   </table>
diff --git a/templates/webpages/am/edit_accounts_master.html b/templates/webpages/am/edit_accounts_master.html
index d6b0dc937..6ccb7a20e 100644
--- a/templates/webpages/am/edit_accounts_master.html
+++ b/templates/webpages/am/edit_accounts_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
@@ -33,20 +34,20 @@ window.onload = function() {
 
 <fieldset>
   <legend>
-    <translate>Main Preferences</translate>
+    [% 'Main Preferences' | $T8 %]
   </legend>
   <table>
     <tr>
       <td>
         <label>
-          <translate>Account Number</translate>
+          [% 'Account Number' | $T8 %]
         </label></td>
         <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
     </tr>
     <tr>
       <td>
         <label>
-          <translate>Description</translate>
+          [% 'Description' | $T8 %]
         </label>
       </td>
       <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
@@ -54,7 +55,7 @@ window.onload = function() {
     <tr>
       <td>
         <label>
-          <translate>Chart Type</translate>
+          [% 'Chart Type' | $T8 %]
 
         </label>
       </td>
@@ -63,76 +64,76 @@ window.onload = function() {
   </table>
 </fieldset>
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Account Type</translate></legend>
+  <legend>[% 'Account Type' | $T8 %]</legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
           [% select_category %]</select>
 </fieldset>
 
 [% IF ChartTypeIsAccount %]
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Is this a summary account to record</translate></legend>
+  <legend>[% 'Is this a summary account to record' | $T8 %]</legend>
     <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
-    &nbsp;<translate>AR</translate>
+    &nbsp;[% 'AR' | $T8 %]
     <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
-    &nbsp;<translate>AP</translate>
+    &nbsp;[% 'AP' | $T8 %]
     <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
-    &nbsp;<translate>Inventory</translate>
+    &nbsp;[% 'Inventory' | $T8 %]
 </fieldset>
 
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Include in drop-down menus</translate></legend>
-  <p style='font-weight:normal'><translate>These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.</translate></p>
+  <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
+  <p style='font-weight:normal'>[% 'These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.' | $T8 %]</p>
   <table width="100%">
     <tr>
-      <th align="left"><translate>Receivables</translate></th>
-      <th align="left"><translate>Payables</translate></th>
-      <th align="left"><translate>Parts Inventory</translate></th>
-      <th align="left"><translate>Service Items</translate></th>
+      <th align="left">[% 'Receivables' | $T8 %]</th>
+      <th align="left">[% 'Payables' | $T8 %]</th>
+      <th align="left">[% 'Parts Inventory' | $T8 %]</th>
+      <th align="left">[% 'Service Items' | $T8 %]</th>
     </tr>
     <tr>
       <td>
         <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
           [% HTML.escape(AR_amount) %]>&nbsp;
-        <translate>Revenue</translate> <br>
+        [% 'Revenue' | $T8 %] <br>
         <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
           [% HTML.escape(AR_paid) %]>&nbsp;
-        <translate>Receipt</translate> <br>
+        [% 'Receipt' | $T8 %] <br>
         <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
           [% HTML.escape(AR_tax) %]>&nbsp;
-        <translate>Tax</translate>
+        [% 'Tax' | $T8 %]
       </td>
       <td>
         <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
           [% HTML.escape(AP_amount) %]>&nbsp;
-        <translate>Expense/Asset</translate> <br>
+        [% 'Expense/Asset' | $T8 %] <br>
         <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
           [% HTML.escape(AP_paid) %]>&nbsp;
-        <translate>Payment</translate> <br>
+        [% 'Payment' | $T8 %] <br>
         <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
             [% HTML.escape(AP_tax) %]>&nbsp;
-        <translate>Tax</translate>
+        [% 'Tax' | $T8 %]
       </td>
       <td>
         <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
           [% HTML.escape(IC_sale) %]>&nbsp;
-        <translate>Revenue</translate> <br>
+        [% 'Revenue' | $T8 %] <br>
         <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
           [% HTML.escape(IC_cogs) %]>&nbsp;
-        <translate>Expense</translate> <br>
+        [% 'Expense' | $T8 %] <br>
         <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
           [% HTML.escape(IC_taxpart) %]>&nbsp;
-        <translate>Tax</translate>
+        [% 'Tax' | $T8 %]
       </td>
       <td>
         <input name=IC_income type=checkbox class=checkbox value="IC_income"
           [% HTML.escape(IC_income) %]>&nbsp;
-        <translate>Revenue</translate> <br>
+        [% 'Revenue' | $T8 %] <br>
         <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
           [% HTML.escape(IC_expense) %]>&nbsp;
-        <translate>Expense</translate> <br>
+        [% 'Expense' | $T8 %] <br>
         <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
           [% HTML.escape(IC_taxservice) %]>&nbsp;
-        <translate>Tax</translate>
+        [% 'Tax' | $T8 %]
       </td>
     </tr>
   </table>
@@ -140,17 +141,17 @@ window.onload = function() {
 
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>
-    <translate>Taxkeys and Taxreport Preferences</translate>
+    [% 'Taxkeys and Taxreport Preferences' | $T8 %]
   </legend>
-  <p style='font-weight:normal'><translate>Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.</translate></p>
+  <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' | $T8 %]</p>
 
             <table>
 [% IF account_exists %]
               <tr>
-                <th align="left"><translate>Taxkey</translate></th>
-                <th align="left"><translate>valid from</translate></th>
-                <th align="left"><translate>pos_ustva</translate></th>
-                <th align="left"><translate>delete</translate> ? </th>
+                <th align="left">[% 'Taxkey' | $T8 %]</th>
+                <th align="left">[% 'valid from' | $T8 %]</th>
+                <th align="left">[% 'pos_ustva' | $T8 %]</th>
+                <th align="left">[% 'delete' | $T8 %] ? </th>
               </tr>
 [% FOREACH tk = ACCOUNT_TAXKEYS %]
               <tr>
@@ -173,7 +174,7 @@ window.onload = function() {
 [% END %]
 [% ELSE %]
 <tr>
-  <td align="center" colspan="4"><p><translate>Save account first to insert taxkeys</translate></p>
+  <td align="center" colspan="4"><p>[% 'Save account first to insert taxkeys' | $T8 %]</p>
   </td>
 </tr>
 [% END %]
@@ -181,29 +182,29 @@ window.onload = function() {
 </fieldset>
 
 <fieldset class="DEPENDS ON charttype BEING A">
-  <legend><translate>Report and misc. Preferences</translate></legend>
+  <legend>[% 'Report and misc. Preferences' | $T8 %]</legend>
   <table>
         <tr>
-          <th align="left"><translate>EUER</translate></th>
+          <th align="left">[% 'EUER' | $T8 %]</th>
           <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
         </tr>
         <tr>
-          <th align="left"><translate>BWA</translate></th>
+          <th align="left">[% 'BWA' | $T8 %]</th>
           <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
         </tr>
         <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
         <!-- tr>
-          <th align="left"><translate>Bilanz</translate></th>
+          <th align="left">[% 'Bilanz' | $T8 %]</th>
           <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
         </tr -->
         <tr>
-          <th align="left"><translate>Datevautomatik</translate></th>
+          <th align="left">[% 'Datevautomatik' | $T8 %]</th>
           <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
         </tr>
         <tr>
-          <th align="left"><translate>Folgekonto</translate></th>
+          <th align="left">[% 'Folgekonto' | $T8 %]</th>
           <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
-          <th align="left"><translate>Valid from</translate></th>
+          <th align="left">[% 'Valid from' | $T8 %]</th>
           <td><input name="valid_from" value="[% valid_from %]"></td>
         </tr>
   </table>
diff --git a/templates/webpages/am/edit_defaults_de.html b/templates/webpages/am/edit_defaults_de.html
index c4298c7a8..ff5cf0420 100644
--- a/templates/webpages/am/edit_defaults_de.html
+++ b/templates/webpages/am/edit_defaults_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -9,60 +10,60 @@
   <p>
    <table>
     <tr class="listheading">
-     <th colspan="4">Nummernkreise</th>
+     <th colspan="4">[% 'Ranges of numbers' | $T8 %]</th>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Rechnungsnummer</th>
+     <th align="right" nowrap>[% 'Last Invoice Number' | $T8 %]</th>
      <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-     <th align="right" nowrap>Letzte Kundennummer</th>
+     <th align="right" nowrap>[% 'Last Customer Number' | $T8 %]</th>
      <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Gutschriftnummer</th>
+     <th align="right" nowrap>[% 'Last Credit Note Number' | $T8 %]</th>
      <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-     <th align="right" nowrap>Letzte Lieferantennummer</th>
+     <th align="right" nowrap>[% 'Last Vendor Number' | $T8 %]</th>
      <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Auftragsnummer</th>
+     <th align="right" nowrap>[% 'Last Sales Order Number' | $T8 %]</th>
      <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Lieferantenautragsnummer</th>
+     <th align="right" nowrap>[% 'Last Purchase Order Number' | $T8 %]</th>
      <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-     <th align="right" nowrap>Letzte Artikelnummer</th>
+     <th align="right" nowrap>[% 'Last Article Number' | $T8 %]</th>
      <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Angebotsnummer</th>
+     <th align="right" nowrap>[% 'Last Sales Quotation Number' | $T8 %]</th>
      <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-     <th align="right" nowrap>Letzte Dienstleistungsnr.</th>
+     <th align="right" nowrap>[% 'Last Service Number' | $T8 %]</th>
      <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Anfragenummer</th>
+     <th align="right" nowrap>[% 'Last RFQ Number' | $T8 %]</th>
      <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Letzte Lieferscheinnummer (Verkauf)</th>
+     <th align="right" nowrap>[% 'Last Sales Delivery Order Number' | $T8 %]</th>
      <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
-     <th align="right" nowrap>Letzte Lieferscheinnummer (Einkauf)</th>
+     <th align="right" nowrap>[% 'Last Purchase Delivery Order Number' | $T8 %]</th>
      <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
     </tr>
 
     <tr class="listheading">
-     <th colspan="4">Standardkonten</th>
+     <th colspan="4">[% 'Default Accounts' | $T8 %]</th>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Warenbestand</th>
+     <th align="right" nowrap>[% 'Inventory Account' | $T8 %]</th>
      <td colspan="3">
       <select name="inventory_accno">
        [%- FOREACH row = ACCNOS_IC %]
@@ -73,7 +74,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Erlöskonto</th>
+     <th align="right" nowrap>[% 'Revenue Account' | $T8 %]</th>
      <td colspan="3">
       <select name="income_accno">
        [%- FOREACH row = ACCNOS_IC_INCOME %]
@@ -84,7 +85,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Aufwandskonto</th>
+     <th align="right" nowrap>[% 'Expense Account' | $T8 %]</th>
      <td colspan="3">
       <select name="expense_accno">
        [%- FOREACH row = ACCNOS_IC_EXPENSE %]
@@ -95,7 +96,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Wechselkurserträge</th>
+     <th align="right" nowrap>[% 'Foreign Exchange Gain' | $T8 %]</th>
      <td colspan="3">
       <select name="fxgain_accno">
        [%- FOREACH row = ACCNOS_FX_GAIN %]
@@ -106,7 +107,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Wechselkursaufwendungen</th>
+     <th align="right" nowrap>[% 'Foreign Exchange Loss' | $T8 %]</th>
      <td colspan="3">
       <select name="fxloss_accno">
        [%- FOREACH row = ACCNOS_FX_LOSS %]
@@ -117,26 +118,26 @@
     </tr>
 
     <tr class="listheading">
-     <th colspan="4">Verschiedenes</th>
+     <th colspan="4">[% 'Miscellaneous' | $T8 %]</th>
     </tr>
 
     <tr>
-     <th align="right">Firmennummer</th>
+     <th align="right">[% 'Business Number' | $T8 %]</th>
      <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right">Jahresende (mm/dd)</th>
+     <th align="right">[% 'Year End' | $T8 %] (mm/dd)</th>
      <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
     </tr>
 
     <tr>
-     <th align="right">W&auml;hrungen <sup>(1)</sup></th>
+     <th align="right">[% 'Currencies' | $T8 %] <sup>(1)</sup></th>
      <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
     </tr>
 
     <tr>
-     <th align="right">Gewichtseinheit</th>
+     <th align="right">[% 'Weight unit' | $T8 %]</th>
  <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
      <td>
       [%- INCLUDE 'generic/multibox.html'
@@ -155,12 +156,12 @@
 
   <hr height="3" noshade>
 
-  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
 
   <hr height="3" noshade>
 
   <p>
-   (1) Geben Sie Ihre und weitere Währungen mit bis zu drei Buchstaben pro Währung und Währungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)
+   (1) [% 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' | $T8 %]
   </p>
  </form>
 
diff --git a/templates/webpages/am/edit_defaults_master.html b/templates/webpages/am/edit_defaults_master.html
index f73ea15a3..ff5cf0420 100644
--- a/templates/webpages/am/edit_defaults_master.html
+++ b/templates/webpages/am/edit_defaults_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
@@ -9,60 +10,60 @@
   <p>
    <table>
     <tr class="listheading">
-     <th colspan="4"><translate>Ranges of numbers</translate></th>
+     <th colspan="4">[% 'Ranges of numbers' | $T8 %]</th>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last Invoice Number</translate></th>
+     <th align="right" nowrap>[% 'Last Invoice Number' | $T8 %]</th>
      <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-     <th align="right" nowrap><translate>Last Customer Number</translate></th>
+     <th align="right" nowrap>[% 'Last Customer Number' | $T8 %]</th>
      <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last Credit Note Number</translate></th>
+     <th align="right" nowrap>[% 'Last Credit Note Number' | $T8 %]</th>
      <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-     <th align="right" nowrap><translate>Last Vendor Number</translate></th>
+     <th align="right" nowrap>[% 'Last Vendor Number' | $T8 %]</th>
      <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last Sales Order Number</translate></th>
+     <th align="right" nowrap>[% 'Last Sales Order Number' | $T8 %]</th>
      <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last Purchase Order Number</translate></th>
+     <th align="right" nowrap>[% 'Last Purchase Order Number' | $T8 %]</th>
      <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-     <th align="right" nowrap><translate>Last Article Number</translate></th>
+     <th align="right" nowrap>[% 'Last Article Number' | $T8 %]</th>
      <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last Sales Quotation Number</translate></th>
+     <th align="right" nowrap>[% 'Last Sales Quotation Number' | $T8 %]</th>
      <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-     <th align="right" nowrap><translate>Last Service Number</translate></th>
+     <th align="right" nowrap>[% 'Last Service Number' | $T8 %]</th>
      <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last RFQ Number</translate></th>
+     <th align="right" nowrap>[% 'Last RFQ Number' | $T8 %]</th>
      <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Last Sales Delivery Order Number</translate></th>
+     <th align="right" nowrap>[% 'Last Sales Delivery Order Number' | $T8 %]</th>
      <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
-     <th align="right" nowrap><translate>Last Purchase Delivery Order Number</translate></th>
+     <th align="right" nowrap>[% 'Last Purchase Delivery Order Number' | $T8 %]</th>
      <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
     </tr>
 
     <tr class="listheading">
-     <th colspan="4"><translate>Default Accounts</translate></th>
+     <th colspan="4">[% 'Default Accounts' | $T8 %]</th>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Inventory Account</translate></th>
+     <th align="right" nowrap>[% 'Inventory Account' | $T8 %]</th>
      <td colspan="3">
       <select name="inventory_accno">
        [%- FOREACH row = ACCNOS_IC %]
@@ -73,7 +74,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Revenue Account</translate></th>
+     <th align="right" nowrap>[% 'Revenue Account' | $T8 %]</th>
      <td colspan="3">
       <select name="income_accno">
        [%- FOREACH row = ACCNOS_IC_INCOME %]
@@ -84,7 +85,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Expense Account</translate></th>
+     <th align="right" nowrap>[% 'Expense Account' | $T8 %]</th>
      <td colspan="3">
       <select name="expense_accno">
        [%- FOREACH row = ACCNOS_IC_EXPENSE %]
@@ -95,7 +96,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Foreign Exchange Gain</translate></th>
+     <th align="right" nowrap>[% 'Foreign Exchange Gain' | $T8 %]</th>
      <td colspan="3">
       <select name="fxgain_accno">
        [%- FOREACH row = ACCNOS_FX_GAIN %]
@@ -106,7 +107,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Foreign Exchange Loss</translate></th>
+     <th align="right" nowrap>[% 'Foreign Exchange Loss' | $T8 %]</th>
      <td colspan="3">
       <select name="fxloss_accno">
        [%- FOREACH row = ACCNOS_FX_LOSS %]
@@ -117,26 +118,26 @@
     </tr>
 
     <tr class="listheading">
-     <th colspan="4"><translate>Miscellaneous</translate></th>
+     <th colspan="4">[% 'Miscellaneous' | $T8 %]</th>
     </tr>
 
     <tr>
-     <th align="right"><translate>Business Number</translate></th>
+     <th align="right">[% 'Business Number' | $T8 %]</th>
      <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Year End</translate> (mm/dd)</th>
+     <th align="right">[% 'Year End' | $T8 %] (mm/dd)</th>
      <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Currencies</translate> <sup>(1)</sup></th>
+     <th align="right">[% 'Currencies' | $T8 %] <sup>(1)</sup></th>
      <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Weight unit</translate></th>
+     <th align="right">[% 'Weight unit' | $T8 %]</th>
  <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
      <td>
       [%- INCLUDE 'generic/multibox.html'
@@ -155,12 +156,12 @@
 
   <hr height="3" noshade>
 
-  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
 
   <hr height="3" noshade>
 
   <p>
-   (1) <translate>Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies</translate>
+   (1) [% 'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies' | $T8 %]
   </p>
  </form>
 
diff --git a/templates/webpages/am/edit_price_factor_de.html b/templates/webpages/am/edit_price_factor_de.html
index bf7f3d867..105f8b30f 100644
--- a/templates/webpages/am/edit_price_factor_de.html
+++ b/templates/webpages/am/edit_price_factor_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
@@ -9,12 +10,12 @@
   <p>
    <table border="0">
     <tr>
-     <td align="right">Beschreibung</td>
+     <td align="right">[% 'Description' | $T8 %]</td>
      <td><input name="description" value="[% HTML.escape(description) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Faktor</td>
+     <td align="right">[% 'Factor' | $T8 %]</td>
      <td><input name="factor" value="[% HTML.escape(factor) %]"></td>
     </tr>
    </table>
@@ -26,8 +27,8 @@
    <input type="hidden" name="type" value="price_factor">
 
    <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-   <input type="submit" name="action" value="Speichern">
-   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="Löschen">[% END %][% END %]
+   <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="[% 'Delete' | $T8 %]">[% END %][% END %]
   </p>
  </form>
 
diff --git a/templates/webpages/am/edit_price_factor_master.html b/templates/webpages/am/edit_price_factor_master.html
index 8306b780d..105f8b30f 100644
--- a/templates/webpages/am/edit_price_factor_master.html
+++ b/templates/webpages/am/edit_price_factor_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
@@ -9,12 +10,12 @@
   <p>
    <table border="0">
     <tr>
-     <td align="right"><translate>Description</translate></td>
+     <td align="right">[% 'Description' | $T8 %]</td>
      <td><input name="description" value="[% HTML.escape(description) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Factor</translate></td>
+     <td align="right">[% 'Factor' | $T8 %]</td>
      <td><input name="factor" value="[% HTML.escape(factor) %]"></td>
     </tr>
    </table>
@@ -26,8 +27,8 @@
    <input type="hidden" name="type" value="price_factor">
 
    <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-   <input type="submit" name="action" value="<translate>Save</translate>">
-   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="<translate>Delete</translate>">[% END %][% END %]
+   <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+   [% IF id %][% IF orphaned %]<input type="submit" name="action" value="[% 'Delete' | $T8 %]">[% END %][% END %]
   </p>
  </form>
 
diff --git a/templates/webpages/am/edit_tax_de.html b/templates/webpages/am/edit_tax_de.html
index ee8ba4b91..c495e6913 100644
--- a/templates/webpages/am/edit_tax_de.html
+++ b/templates/webpages/am/edit_tax_de.html
@@ -1,36 +1,37 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form method="post" action="am.pl">
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="type" value="tax">
 
-  <div class="listtop">Steuer [% title %]</div>
+  <div class="listtop">[% 'Tax-O-Matic' | $T8 %] [% title %]</div>
 
   <table width="100%">
    <tr>
-    <td>Steuerschlüssel</td>
+    <td>[% 'tax_taxkey' | $T8 %]</td>
     <td><input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]"></td>
    </tr>
 
    <tr>
-    <td>Steuername</td>
+    <td>[% 'tax_taxdescription' | $T8 %]</td>
     <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
    </tr>
 
    <tr>
-    <td>Prozentsatz</td>
+    <td>[% 'tax_percent' | $T8 %]</td>
     <td><input name="rate" size="10" value="[% HTML.escape(rate) %]"> %</td>
    </tr>
 
    <tr>
-    <td>Automatikkonto</td>
-    <td><select name="chart_id"><option value="0">Kein</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
+    <td>[% 'tax_chartaccno' | $T8 %]</td>
+    <td><select name="chart_id"><option value="0">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
    </tr>
 
   </table>
 
   [% UNLESS orphaned %]
   <br />
-  Konten, die mit dieser Steuer verknüpft sind:
+  [% 'Chartaccounts connected to this Tax:' | $T8 %]
   [% FOREACH row = TAXINUSE %]
   <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
   [% END %]
@@ -39,10 +40,10 @@
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <input type="submit" class="submit" name="action" value="Speichern">
+  <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
 
   [% IF orphaned %]
-  <input type="submit" class="submit" name="action" value="Löschen">
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
   [% END %]
 
 </form>
diff --git a/templates/webpages/am/edit_tax_master.html b/templates/webpages/am/edit_tax_master.html
index 3d4aed3a2..c495e6913 100644
--- a/templates/webpages/am/edit_tax_master.html
+++ b/templates/webpages/am/edit_tax_master.html
@@ -1,36 +1,37 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <form method="post" action="am.pl">
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="type" value="tax">
 
-  <div class="listtop"><translate>Tax-O-Matic</translate> [% title %]</div>
+  <div class="listtop">[% 'Tax-O-Matic' | $T8 %] [% title %]</div>
 
   <table width="100%">
    <tr>
-    <td><translate>tax_taxkey</translate></td>
+    <td>[% 'tax_taxkey' | $T8 %]</td>
     <td><input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]"></td>
    </tr>
 
    <tr>
-    <td><translate>tax_taxdescription</translate></td>
+    <td>[% 'tax_taxdescription' | $T8 %]</td>
     <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
    </tr>
 
    <tr>
-    <td><translate>tax_percent</translate></td>
+    <td>[% 'tax_percent' | $T8 %]</td>
     <td><input name="rate" size="10" value="[% HTML.escape(rate) %]"> %</td>
    </tr>
 
    <tr>
-    <td><translate>tax_chartaccno</translate></td>
-    <td><select name="chart_id"><option value="0"><translate>None</translate></option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
+    <td>[% 'tax_chartaccno' | $T8 %]</td>
+    <td><select name="chart_id"><option value="0">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
    </tr>
 
   </table>
 
   [% UNLESS orphaned %]
   <br />
-  <translate>Chartaccounts connected to this Tax:</translate>
+  [% 'Chartaccounts connected to this Tax:' | $T8 %]
   [% FOREACH row = TAXINUSE %]
   <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
   [% END %]
@@ -39,10 +40,10 @@
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
 
   [% IF orphaned %]
-  <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
   [% END %]
 
 </form>
diff --git a/templates/webpages/am/edit_templates_de.html b/templates/webpages/am/edit_templates_de.html
index 2ffcbe836..70f66fbc6 100644
--- a/templates/webpages/am/edit_templates_de.html
+++ b/templates/webpages/am/edit_templates_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listheading">[% title %]</div>
@@ -8,13 +9,13 @@
 
   [% IF SHOW_EDIT_OPTIONS %]
    <p>
-    Druckvorlage
+    [% 'Template' | $T8 %]
     <select name="formname">
      [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
     </select>
 
     [% IF LANGUAGE.size %]
-     Sprache
+     [% 'Language' | $T8 %]
      <select name="language">
       <option></option>
       [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
@@ -22,7 +23,7 @@
     [% END %]
 
     [% IF PRINTER.size %]
-     Drucker
+     [% 'Printer' | $T8 %]
      <select name="printer">
       <option></option>
       [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
@@ -31,7 +32,7 @@
 
     <input type="hidden" name="display_nextsub" value="display_template">
 
-    <input name="action" type="submit" class="submit" value="Anzeigen">
+    <input name="action" type="submit" class="submit" value="[% 'Display' | $T8 %]">
 
    </p>
 
@@ -43,7 +44,7 @@
   [% IF SHOW_CONTENT %]
    <p>
     <div class="listtop">
-     [% IF CAN_EDIT %]Datei bearbeiten[% ELSE %]Datei anzeigen[% END %] [% HTML.escape(display_filename) %]
+     [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
     </div>
    </p>
 
@@ -52,20 +53,20 @@
 
     <p>
      <input type="hidden" name="save_nextsub" value="save_template">
-     <input type="submit" name="action" value="Speichern">
-     <input type="button" onclick="history.back()" value="Zurück">
+     <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+     <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
     </p>
 
     [% ELSE %]
 
     <input type="hidden" name="edit_nextsub" value="edit_template">
 
-    <p><input name="action" type="submit" class="submit" value="Bearbeiten"></p>
+    <p><input name="action" type="submit" class="submit" value="[% 'Edit' | $T8 %]"></p>
 
     <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
 
     [% IF SHOW_SECOND_EDIT_BUTTON %]
-     <p><input name="action" type="submit" class="submit" value="Bearbeiten"></p>
+     <p><input name="action" type="submit" class="submit" value="[% 'Edit' | $T8 %]"></p>
     [% END %]
 
    [% END %] <!-- CAN_EDIT -->
diff --git a/templates/webpages/am/edit_templates_master.html b/templates/webpages/am/edit_templates_master.html
index fcf223c9e..70f66fbc6 100644
--- a/templates/webpages/am/edit_templates_master.html
+++ b/templates/webpages/am/edit_templates_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listheading">[% title %]</div>
@@ -8,13 +9,13 @@
 
   [% IF SHOW_EDIT_OPTIONS %]
    <p>
-    <translate>Template</translate>
+    [% 'Template' | $T8 %]
     <select name="formname">
      [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
     </select>
 
     [% IF LANGUAGE.size %]
-     <translate>Language</translate>
+     [% 'Language' | $T8 %]
      <select name="language">
       <option></option>
       [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
@@ -22,7 +23,7 @@
     [% END %]
 
     [% IF PRINTER.size %]
-     <translate>Printer</translate>
+     [% 'Printer' | $T8 %]
      <select name="printer">
       <option></option>
       [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
@@ -31,7 +32,7 @@
 
     <input type="hidden" name="display_nextsub" value="display_template">
 
-    <input name="action" type="submit" class="submit" value="<translate>Display</translate>">
+    <input name="action" type="submit" class="submit" value="[% 'Display' | $T8 %]">
 
    </p>
 
@@ -43,7 +44,7 @@
   [% IF SHOW_CONTENT %]
    <p>
     <div class="listtop">
-     [% IF CAN_EDIT %]<translate>Edit file</translate>[% ELSE %]<translate>Display file</translate>[% END %] [% HTML.escape(display_filename) %]
+     [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
     </div>
    </p>
 
@@ -52,20 +53,20 @@
 
     <p>
      <input type="hidden" name="save_nextsub" value="save_template">
-     <input type="submit" name="action" value="<translate>Save</translate>">
-     <input type="button" onclick="history.back()" value="<translate>Back</translate>">
+     <input type="submit" name="action" value="[% 'Save' | $T8 %]">
+     <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
     </p>
 
     [% ELSE %]
 
     <input type="hidden" name="edit_nextsub" value="edit_template">
 
-    <p><input name="action" type="submit" class="submit" value="<translate>Edit</translate>"></p>
+    <p><input name="action" type="submit" class="submit" value="[% 'Edit' | $T8 %]"></p>
 
     <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
 
     [% IF SHOW_SECOND_EDIT_BUTTON %]
-     <p><input name="action" type="submit" class="submit" value="<translate>Edit</translate>"></p>
+     <p><input name="action" type="submit" class="submit" value="[% 'Edit' | $T8 %]"></p>
     [% END %]
 
    [% END %] <!-- CAN_EDIT -->
diff --git a/templates/webpages/am/edit_units_de.html b/templates/webpages/am/edit_units_de.html
index 30d64d728..649447013 100644
--- a/templates/webpages/am/edit_units_de.html
+++ b/templates/webpages/am/edit_units_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF saved_message %]
@@ -18,29 +19,22 @@
  </table>
 
  <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der
-  sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen,
-  dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen
-  Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So
-  ist die Definition von &quot;kg&quot; mit der Basiseinheit
-  &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von
-  &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor
-  &quot;0,001&quot; hingegen nicht.
+  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
  </p>
 
  <hr>
 
  <table width="100%">
-  <tr><th class="listtop">Einheit hinzuf&uuml;gen</th></tr>
+  <tr><th class="listtop">[% 'Add unit' | $T8 %]</th></tr>
  </table>
 
  <table>
   <tr>
-   <th align="right">Einheit</th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
    <td><input name="new_name" size="20" maxlength="20"></td>
   </tr>
   <tr>
-   <th align="right">Basiseinheit</th>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
    <td>
     <select name="new_base_unit">
      [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
@@ -48,7 +42,7 @@
    </td>
   </tr>
   <tr>
-   <th align="right">Faktor</th>
+   <th align="right">[% 'Factor' | $T8 %]</th>
    <td><input name="new_factor"></td>
   </tr>
 
@@ -56,39 +50,39 @@
    <tr>
     <th align="right">[% language.description %]</th>
     <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
-    <th align="right">Plural</th>
+    <th align="right">[% 'Plural' | $T8 %]</th>
     <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
    </tr>
   [% END %]
  </table>
 
- <input type="submit" class="submit" name="action" value="Erfassen">
+ <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
 
  <hr>
 
  <table width="100%">
-  <tr><th class="listtop">Einheiten bearbeiten</th></tr>
+  <tr><th class="listtop">[% 'Edit units' | $T8 %]</th></tr>
  </table>
 
  <p>
-  Einheiten, die bereits in Benutzung sind (z.B. bei einer Warendefinition, einer Rechnung oder bei einer Lagerbuchung) k&ouml;nnen nachtr&auml;glich nicht mehr ver&auml;ndert werden.
+  [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
  </p>
 
  <p>
-  Einheiten, die zum L&ouml;schen markiert sind, werden beim Speichern gel&ouml;scht.
+  [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
  </p>
 
  <p>
-  Bei den &Uuml;bersetzungen k&ouml;nnen Sie unterschiedliche Varianten f&uuml;r singular und plural angeben (z.B. &quot;day&quot; und &quot;days&quot;).
+  [% 'You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <th class="listheading" width="32" align="center" valign="center"><img alt="hoch" src="image/up.png"><img alt="runter" src="image/down.png"></th>
-   <th class="listheading">Löschen</th>
-   <th class="listheading">Einheit</th>
-   <th class="listheading">Basiseinheit</th>
-   <th class="listheading">Faktor</th>
+   <th class="listheading" width="32" align="center" valign="center"><img alt="[% 'up' | $T8 %]" src="image/up.png"><img alt="[% 'down' | $T8 %]" src="image/down.png"></th>
+   <th class="listheading">[% 'Delete' | $T8 %]</th>
+   <th class="listheading">[% 'Unit' | $T8 %]</th>
+   <th class="listheading">[% 'Base unit' | $T8 %]</th>
+   <th class="listheading">[% 'Factor' | $T8 %]</th>
    [% FOREACH language = LANGUAGES %]
     <th class="listheading">[% language.description %]</th>
    [% END %]
@@ -96,7 +90,7 @@
 
   [% FOREACH row = UNITS %]
    <tr>
-    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="hoch" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="runter" src="image/down.png" border="0"></a>[% END %]</td>
+    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="[% 'up' | $T8 %]" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="[% 'down' | $T8 %]" src="image/down.png" border="0"></a>[% END %]</td>
     [% IF row.in_use %]
      <td>
       <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
@@ -124,9 +118,9 @@
 
     [% FOREACH language = row.UNITLANGUAGES %]
      <td>
-      S:
+      [% 'singular first char' | $T8 %]:
       <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
-      P:
+      [% 'plural first char' | $T8 %]:
       <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
      </td>
     [% END %]
@@ -136,7 +130,7 @@
   [% END %]
  </table>
 
- <input type="submit" class="submit" name="action" value="Speichern">
+ <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/am/edit_units_master.html b/templates/webpages/am/edit_units_master.html
index 1960e4675..649447013 100644
--- a/templates/webpages/am/edit_units_master.html
+++ b/templates/webpages/am/edit_units_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF saved_message %]
@@ -18,29 +19,22 @@
  </table>
 
  <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der
-  sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen,
-  dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen
-  Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So
-  ist die Definition von &quot;kg&quot; mit der Basiseinheit
-  &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von
-  &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor
-  &quot;0,001&quot; hingegen nicht.
+  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
  </p>
 
  <hr>
 
  <table width="100%">
-  <tr><th class="listtop"><translate>Add unit</translate></th></tr>
+  <tr><th class="listtop">[% 'Add unit' | $T8 %]</th></tr>
  </table>
 
  <table>
   <tr>
-   <th align="right"><translate>Unit</translate></th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
    <td><input name="new_name" size="20" maxlength="20"></td>
   </tr>
   <tr>
-   <th align="right"><translate>Base unit</translate></th>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
    <td>
     <select name="new_base_unit">
      [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
@@ -48,7 +42,7 @@
    </td>
   </tr>
   <tr>
-   <th align="right"><translate>Factor</translate></th>
+   <th align="right">[% 'Factor' | $T8 %]</th>
    <td><input name="new_factor"></td>
   </tr>
 
@@ -56,44 +50,39 @@
    <tr>
     <th align="right">[% language.description %]</th>
     <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
-    <th align="right"><translate>Plural</translate></th>
+    <th align="right">[% 'Plural' | $T8 %]</th>
     <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
    </tr>
   [% END %]
  </table>
 
- <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
+ <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
 
  <hr>
 
  <table width="100%">
-  <tr><th class="listtop"><translate>Edit units</translate></th></tr>
+  <tr><th class="listtop">[% 'Edit units' | $T8 %]</th></tr>
  </table>
 
  <p>
-  <translate>Units that have already been used (e.g. for parts and
-   services or in invoices or warehouse transactions) cannot be
-   changed.</translate>
+  [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
  </p>
 
  <p>
-  <translate>Units marked for deletion will be deleted upon
-   saving.</translate>
+  [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
  </p>
 
  <p>
-  <translate>You can declare different translations for singular and
-   plural for each unit (e.g. &quot;day&quot; and
-   &quot;days).</translate>
+  [% 'You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <th class="listheading" width="32" align="center" valign="center"><img alt="<translate>up</translate>" src="image/up.png"><img alt="<translate>down</translate>" src="image/down.png"></th>
-   <th class="listheading"><translate>Delete</translate></th>
-   <th class="listheading"><translate>Unit</translate></th>
-   <th class="listheading"><translate>Base unit</translate></th>
-   <th class="listheading"><translate>Factor</translate></th>
+   <th class="listheading" width="32" align="center" valign="center"><img alt="[% 'up' | $T8 %]" src="image/up.png"><img alt="[% 'down' | $T8 %]" src="image/down.png"></th>
+   <th class="listheading">[% 'Delete' | $T8 %]</th>
+   <th class="listheading">[% 'Unit' | $T8 %]</th>
+   <th class="listheading">[% 'Base unit' | $T8 %]</th>
+   <th class="listheading">[% 'Factor' | $T8 %]</th>
    [% FOREACH language = LANGUAGES %]
     <th class="listheading">[% language.description %]</th>
    [% END %]
@@ -101,7 +90,7 @@
 
   [% FOREACH row = UNITS %]
    <tr>
-    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="<translate>up</translate>" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="<translate>down</translate>" src="image/down.png" border="0"></a>[% END %]</td>
+    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="[% 'up' | $T8 %]" src="image/up.png" border="0"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="[% 'down' | $T8 %]" src="image/down.png" border="0"></a>[% END %]</td>
     [% IF row.in_use %]
      <td>
       <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
@@ -129,9 +118,9 @@
 
     [% FOREACH language = row.UNITLANGUAGES %]
      <td>
-      <translate>singular first char</translate>:
+      [% 'singular first char' | $T8 %]:
       <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
-      <translate>plural first char</translate>:
+      [% 'plural first char' | $T8 %]:
       <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
      </td>
     [% END %]
@@ -141,7 +130,7 @@
   [% END %]
  </table>
 
- <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+ <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/am/edit_warehouse_de.html b/templates/webpages/am/edit_warehouse_de.html
index 81bf9a4de..a9d4d3baf 100644
--- a/templates/webpages/am/edit_warehouse_de.html
+++ b/templates/webpages/am/edit_warehouse_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
 
  [% IF saved_message %]
@@ -11,11 +12,11 @@
   <input type="hidden" name="type" value="warehouse">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <div class="listtop">[% IF id %]Lager bearbeiten[% ELSE %]Lager erfassen[% END %]</div>
+  <div class="listtop">[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</div>
 
   <table border="0">
    <tr>
-    <td align="right">Beschreibung</td>
+    <td align="right">[% 'Description' | $T8 %]</td>
     <td>
      <input name="description" size="60" value="[% HTML.escape(description) %]">
      <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
@@ -23,25 +24,25 @@
    </tr>
 
    <tr>
-    <td align="right">Ung&uuml;ltig</td>
+    <td align="right">[% 'Invalid' | $T8 %]</td>
     <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
    </tr>
 
    <tr>
-    <td align="right">Anzahl neuer Lagerpl&auml;tze</td>
+    <td align="right">[% 'Number of new bins' | $T8 %]</td>
     <td><input name="number_of_new_bins"></td>
    </tr>
 
    <tr>
-    <td align="right">Namenspr&auml;fix f&uuml;r die neuen Lagerpl&auml;tze</td>
-    <td><input name="prefix" value="Lagerplatz"></td>
+    <td align="right">[% 'Prefix for the new bins' names' | $T8 %]</td>
+    <td><input name="prefix" value="[% 'Bin' | $T8 %]"></td>
    </tr>
   </table>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
    [%- IF id %][%- UNLESS in_use %]
-   <input type="submit" class="submit" name="action" value="Löschen">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [%- END %][%- END %]
   </p>
 
@@ -51,15 +52,15 @@
 
  <hr height="3">
 
- <div class="listtop">Lagerpl&auml;tze bearbeiten</div>
+ <div class="listtop">[% 'Edit Bins' | $T8 %]</div>
 
  [% UNLESS BINS.size %]
- <p>Es wurden zu diesem Lager noch keine Lagerpl&auml;tze angelegt.</p>
+ <p>[% 'No bins have been added to this warehouse yet.' | $T8 %]</p>
 
  [% ELSE %]
 
  <p>
-  Lagerpl&auml;tze, die bereits benutzt wurden, k&ouml;nnen nicht mehr gel&ouml;scht werden. Deswegen fehlt bei ihnen die Checkbox in der Spalte &quot;L&ouml;schen&quot;.
+  [% 'Bins that have been used in the past cannot be deleted anymore. For these bins there's no checkbox in the &quot;Delete&quot; column.' | $T8 %]
  </p>
 
  <form method="post" action="am.pl">
@@ -71,8 +72,8 @@
 
   <table border="0">
    <tr>
-    <th class="listheading">Löschen</th><th class="listheading">Beschreibung</th>
-    <th class="listheading">Löschen</th><th class="listheading">Beschreibung</th>
+    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
+    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
    </tr>
    [%- SET row_odd = '1' %]
    [%- USE bin_it = Iterator(BINS) %]
@@ -100,7 +101,7 @@
 
   <input type="hidden" name="rowcount" value="[% BINS.size %]">
 
-  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
  </form>
 
  [% END %]
diff --git a/templates/webpages/am/edit_warehouse_master.html b/templates/webpages/am/edit_warehouse_master.html
index d6f21ce21..a9d4d3baf 100644
--- a/templates/webpages/am/edit_warehouse_master.html
+++ b/templates/webpages/am/edit_warehouse_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
 
  [% IF saved_message %]
@@ -11,11 +12,11 @@
   <input type="hidden" name="type" value="warehouse">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <div class="listtop">[% IF id %]<translate>Edit Warehouse</translate>[% ELSE %]<translate>Add Warehouse</translate>[% END %]</div>
+  <div class="listtop">[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</div>
 
   <table border="0">
    <tr>
-    <td align="right"><translate>Description</translate></td>
+    <td align="right">[% 'Description' | $T8 %]</td>
     <td>
      <input name="description" size="60" value="[% HTML.escape(description) %]">
      <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
@@ -23,25 +24,25 @@
    </tr>
 
    <tr>
-    <td align="right"><translate>Invalid</translate></td>
+    <td align="right">[% 'Invalid' | $T8 %]</td>
     <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Number of new bins</translate></td>
+    <td align="right">[% 'Number of new bins' | $T8 %]</td>
     <td><input name="number_of_new_bins"></td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Prefix for the new bins' names</translate></td>
-    <td><input name="prefix" value="<translate>Bin</translate>"></td>
+    <td align="right">[% 'Prefix for the new bins' names' | $T8 %]</td>
+    <td><input name="prefix" value="[% 'Bin' | $T8 %]"></td>
    </tr>
   </table>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
    [%- IF id %][%- UNLESS in_use %]
-   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [%- END %][%- END %]
   </p>
 
@@ -51,17 +52,15 @@
 
  <hr height="3">
 
- <div class="listtop"><translate>Edit Bins</translate></div>
+ <div class="listtop">[% 'Edit Bins' | $T8 %]</div>
 
  [% UNLESS BINS.size %]
- <p><translate>No bins have been added to this warehouse yet.</translate></p>
+ <p>[% 'No bins have been added to this warehouse yet.' | $T8 %]</p>
 
  [% ELSE %]
 
  <p>
-  <translate>Bins that have been used in the past cannot be deleted
-   anymore. For these bins there's no checkbox in the
-   &quot;Delete&quot; column.</translate>
+  [% 'Bins that have been used in the past cannot be deleted anymore. For these bins there's no checkbox in the &quot;Delete&quot; column.' | $T8 %]
  </p>
 
  <form method="post" action="am.pl">
@@ -73,8 +72,8 @@
 
   <table border="0">
    <tr>
-    <th class="listheading"><translate>Delete</translate></th><th class="listheading"><translate>Description</translate></th>
-    <th class="listheading"><translate>Delete</translate></th><th class="listheading"><translate>Description</translate></th>
+    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
+    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
    </tr>
    [%- SET row_odd = '1' %]
    [%- USE bin_it = Iterator(BINS) %]
@@ -102,7 +101,7 @@
 
   <input type="hidden" name="rowcount" value="[% BINS.size %]">
 
-  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
+  <p><input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]"></p>
  </form>
 
  [% END %]
diff --git a/templates/webpages/am/list_account_details_de.html b/templates/webpages/am/list_account_details_de.html
index 9caeece34..884dc7d2b 100644
--- a/templates/webpages/am/list_account_details_de.html
+++ b/templates/webpages/am/list_account_details_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %] [% FOREACH row = CA %]
 <table width="100%">
 
@@ -22,15 +23,15 @@
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">Steuerautomatik</td>
+  <td colspan="5" class="coa_details_header">[% 'Taxlink_coa' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">Steuerschlüssel</td>
-  <td class="coa_details_header2">Automatikkonto</td>
-  <td class="coa_details_header2">Steuer</td>
-  <td class="coa_details_header2">USTVA Kennz.</td>
-  <td class="coa_details_header2">Gültig ab</td>
+  <td class="coa_details_header2">[% 'Taxkey_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Taxaccount_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Taxdescription_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Posustva_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Startdate_coa' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
@@ -42,21 +43,21 @@
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">Berichte</td>
+  <td colspan="5" class="coa_details_header">[% 'Report Positions' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">BWA</td>
-  <td class="coa_details_header2">Bilanz</td>
-  <td class="coa_details_header2">E/ÜR</td>
-  <td colspan="2" class="coa_details_header2">Datevexport</td>
+  <td class="coa_details_header2">[% 'pos_bwa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'pos_bilanz' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'pos_eur' | $T8 %]</td>
+  <td colspan="2" class="coa_details_header2">[% 'Datevautomatik' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
   <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
   <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
   <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
-  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]An[% ELSE %]Aus[% END %]</td>
+  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %]</td>
  </tr>
 </table>
 
diff --git a/templates/webpages/am/list_account_details_master.html b/templates/webpages/am/list_account_details_master.html
index a83a82eab..884dc7d2b 100644
--- a/templates/webpages/am/list_account_details_master.html
+++ b/templates/webpages/am/list_account_details_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %] [% FOREACH row = CA %]
 <table width="100%">
 
@@ -22,15 +23,15 @@
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header"><translate>Taxlink_coa</translate></td>
+  <td colspan="5" class="coa_details_header">[% 'Taxlink_coa' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2"><translate>Taxkey_coa</translate></td>
-  <td class="coa_details_header2"><translate>Taxaccount_coa</translate></td>
-  <td class="coa_details_header2"><translate>Taxdescription_coa</translate></td>
-  <td class="coa_details_header2"><translate>Posustva_coa</translate></td>
-  <td class="coa_details_header2"><translate>Startdate_coa</translate></td>
+  <td class="coa_details_header2">[% 'Taxkey_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Taxaccount_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Taxdescription_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Posustva_coa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'Startdate_coa' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
@@ -42,21 +43,21 @@
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header"><translate>Report Positions</translate></td>
+  <td colspan="5" class="coa_details_header">[% 'Report Positions' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2"><translate>pos_bwa</translate></td>
-  <td class="coa_details_header2"><translate>pos_bilanz</translate></td>
-  <td class="coa_details_header2"><translate>pos_eur</translate></td>
-  <td colspan="2" class="coa_details_header2"><translate>Datevautomatik</translate></td>
+  <td class="coa_details_header2">[% 'pos_bwa' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'pos_bilanz' | $T8 %]</td>
+  <td class="coa_details_header2">[% 'pos_eur' | $T8 %]</td>
+  <td colspan="2" class="coa_details_header2">[% 'Datevautomatik' | $T8 %]</td>
  </tr>
 
  <tr class="coa_listrow[% loop.count % 2 %]">
   <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
   <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
   <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
-  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]<translate>On</translate>[% ELSE %]<translate>Off</translate>[% END %]</td>
+  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %]</td>
  </tr>
 </table>
 
diff --git a/templates/webpages/am/list_accounts_de.html b/templates/webpages/am/list_accounts_de.html
index 2f0543a06..8392bf55f 100644
--- a/templates/webpages/am/list_accounts_de.html
+++ b/templates/webpages/am/list_accounts_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <br/><div id='pjxdebugrequest'></div><br/>
@@ -18,11 +19,10 @@
   </colgroup>
 
   <tr class="coa_listheading">
-   <td class="coa_listheading_element">Konto</td>
-   <td colspan="3" class="coa_listheading_element">Beschreibung (Klick
-  öffnet einzelne Kontendetails)</td>
-   <td class="coa_listheading_element">Soll</td>
-   <td class="coa_listheading_element">Haben</td>
+   <td class="coa_listheading_element">[% 'Account' | $T8 %]</td>
+   <td colspan="3" class="coa_listheading_element">[% 'Description (Click on Description for details)' | $T8 %]</td>
+   <td class="coa_listheading_element">[% 'Debit' | $T8 %]</td>
+   <td class="coa_listheading_element">[% 'Credit' | $T8 %]</td>
   </tr>
 
   [% SET row_odd = '1' %][% FOREACH row = CA %]
diff --git a/templates/webpages/am/list_accounts_master.html b/templates/webpages/am/list_accounts_master.html
index da998e229..8392bf55f 100644
--- a/templates/webpages/am/list_accounts_master.html
+++ b/templates/webpages/am/list_accounts_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <br/><div id='pjxdebugrequest'></div><br/>
@@ -18,10 +19,10 @@
   </colgroup>
 
   <tr class="coa_listheading">
-   <td class="coa_listheading_element"><translate>Account</translate></td>
-   <td colspan="3" class="coa_listheading_element"><translate>Description (Click on Description for details)</translate></td>
-   <td class="coa_listheading_element"><translate>Debit</translate></td>
-   <td class="coa_listheading_element"><translate>Credit</translate></td>
+   <td class="coa_listheading_element">[% 'Account' | $T8 %]</td>
+   <td colspan="3" class="coa_listheading_element">[% 'Description (Click on Description for details)' | $T8 %]</td>
+   <td class="coa_listheading_element">[% 'Debit' | $T8 %]</td>
+   <td class="coa_listheading_element">[% 'Credit' | $T8 %]</td>
   </tr>
 
   [% SET row_odd = '1' %][% FOREACH row = CA %]
diff --git a/templates/webpages/am/list_price_factors_de.html b/templates/webpages/am/list_price_factors_de.html
index f6708e140..73c9f3130 100644
--- a/templates/webpages/am/list_price_factors_de.html
+++ b/templates/webpages/am/list_price_factors_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
@@ -9,8 +10,8 @@
    <tr>
     <td class="listheading" width="0%"></td>
     <td class="listheading" width="0%"></td>
-    <td class="listheading" width="80%">Beschreibung</td>
-    <td class="listheading" width="20%">Faktor</td>
+    <td class="listheading" width="80%">[% 'Description' | $T8 %]</td>
+    <td class="listheading" width="20%">[% 'Factor' | $T8 %]</td>
    </tr>
 
    [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
@@ -31,7 +32,7 @@
    <input type="hidden" name="type" value="price_factor">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-   <input type="submit" class="submit" name="action" value="Erfassen">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/am/list_price_factors_master.html b/templates/webpages/am/list_price_factors_master.html
index ff560d6d5..73c9f3130 100644
--- a/templates/webpages/am/list_price_factors_master.html
+++ b/templates/webpages/am/list_price_factors_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
@@ -9,8 +10,8 @@
    <tr>
     <td class="listheading" width="0%"></td>
     <td class="listheading" width="0%"></td>
-    <td class="listheading" width="80%"><translate>Description</translate></td>
-    <td class="listheading" width="20%"><translate>Factor</translate></td>
+    <td class="listheading" width="80%">[% 'Description' | $T8 %]</td>
+    <td class="listheading" width="20%">[% 'Factor' | $T8 %]</td>
    </tr>
 
    [% SET row_odd = '1' %][% FOREACH factor = PRICE_FACTORS %]
@@ -31,7 +32,7 @@
    <input type="hidden" name="type" value="price_factor">
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-   <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/am/list_tax_de.html b/templates/webpages/am/list_tax_de.html
index 39c66a5b4..3d24b5177 100644
--- a/templates/webpages/am/list_tax_de.html
+++ b/templates/webpages/am/list_tax_de.html
@@ -1,14 +1,15 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  <table>
   <tr>
-   <th class="listheading">Steuerschlüssel</th>
-   <th class="listheading">Steuername</th>
-   <th class="listheading">Prozent</th>
-   <th class="listheading">Automatikkonto</th>
-   <th class="listheading">Beschreibung</th>
+   <th class="listheading">[% 'tax_taxkey' | $T8 %]</th>
+   <th class="listheading">[% 'tax_taxdescription' | $T8 %]</th>
+   <th class="listheading">[% 'tax_rate' | $T8 %]</th>
+   <th class="listheading">[% 'taxnumber' | $T8 %]</th>
+   <th class="listheading">[% 'account_description' | $T8 %]</th>
   </tr>
 
   [% SET row_odd = '1' %][% FOREACH row = TAX %]
@@ -27,7 +28,7 @@
 
    <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
    <input type="hidden" name="type" value="tax">
-   <input class="submit" type="submit" name="action" value="Erfassen">
+   <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/am/list_tax_master.html b/templates/webpages/am/list_tax_master.html
index 8c565128c..3d24b5177 100644
--- a/templates/webpages/am/list_tax_master.html
+++ b/templates/webpages/am/list_tax_master.html
@@ -1,14 +1,15 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <div class="listtop">[% title %]</div>
 
  <table>
   <tr>
-   <th class="listheading"><translate>tax_taxkey</translate></th>
-   <th class="listheading"><translate>tax_taxdescription</translate></th>
-   <th class="listheading"><translate>tax_rate</translate></th>
-   <th class="listheading"><translate>taxnumber</translate></th>
-   <th class="listheading"><translate>account_description</translate></th>
+   <th class="listheading">[% 'tax_taxkey' | $T8 %]</th>
+   <th class="listheading">[% 'tax_taxdescription' | $T8 %]</th>
+   <th class="listheading">[% 'tax_rate' | $T8 %]</th>
+   <th class="listheading">[% 'taxnumber' | $T8 %]</th>
+   <th class="listheading">[% 'account_description' | $T8 %]</th>
   </tr>
 
   [% SET row_odd = '1' %][% FOREACH row = TAX %]
@@ -27,7 +28,7 @@
 
    <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
    <input type="hidden" name="type" value="tax">
-   <input class="submit" type="submit" name="action" value="<translate>Add</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/am/list_warehouses_de.html b/templates/webpages/am/list_warehouses_de.html
index 5f31c5577..843abe586 100644
--- a/templates/webpages/am/list_warehouses_de.html
+++ b/templates/webpages/am/list_warehouses_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
@@ -9,9 +10,9 @@
    <tr>
     <td class="listheading" width="0%"></td>
     <td class="listheading" width="0%"></td>
-    <td class="listheading" width="70%">Beschreibung</td>
-    <td class="listheading" width="20%">Anzahl Lagerpl&auml;tze</td>
-    <td class="listheading" width="10%">Ung&uuml;ltig</td>
+    <td class="listheading" width="70%">[% 'Description' | $T8 %]</td>
+    <td class="listheading" width="20%">[% 'Number of bins' | $T8 %]</td>
+    <td class="listheading" width="10%">[% 'Invalid' | $T8 %]</td>
    </tr>
 
    [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
@@ -20,7 +21,7 @@
     <td>[% IF warehouse.next_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.next_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
     <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
     <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
-    <td>[% IF warehouse.invalid %]Ja[% ELSE %]Nein[% END %]</td>
+    <td>[% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
    </tr>
    [% END %]
   </table>
@@ -32,7 +33,7 @@
   <form method="post" action="am.pl">
    <input type="hidden" name="type" value="warehouse">
 
-   <input type="submit" class="submit" name="action" value="Erfassen">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/am/list_warehouses_master.html b/templates/webpages/am/list_warehouses_master.html
index c9859c7b4..843abe586 100644
--- a/templates/webpages/am/list_warehouses_master.html
+++ b/templates/webpages/am/list_warehouses_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
@@ -9,9 +10,9 @@
    <tr>
     <td class="listheading" width="0%"></td>
     <td class="listheading" width="0%"></td>
-    <td class="listheading" width="70%"><translate>Description</translate></td>
-    <td class="listheading" width="20%"><translate>Number of bins</translate></td>
-    <td class="listheading" width="10%"><translate>Invalid</translate></td>
+    <td class="listheading" width="70%">[% 'Description' | $T8 %]</td>
+    <td class="listheading" width="20%">[% 'Number of bins' | $T8 %]</td>
+    <td class="listheading" width="10%">[% 'Invalid' | $T8 %]</td>
    </tr>
 
    [% SET row_odd = '1' %][% FOREACH warehouse = WAREHOUSES %]
@@ -20,7 +21,7 @@
     <td>[% IF warehouse.next_id %]<a href="[% url_base %]&action=swap_warehouses&id1=[% HTML.url(warehouse.next_id) %]&id2=[% HTML.url(warehouse.id) %]"><img border="0" src="image/down.png"></a>[% END %]</td>
     <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
     <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
-    <td>[% IF warehouse.invalid %]<translate>Yes</translate>[% ELSE %]<translate>No</translate>[% END %]</td>
+    <td>[% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
    </tr>
    [% END %]
   </table>
@@ -32,7 +33,7 @@
   <form method="post" action="am.pl">
    <input type="hidden" name="type" value="warehouse">
 
-   <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
   </form>
  </p>
 
diff --git a/templates/webpages/amcvar/display_cvar_config_form_de.html b/templates/webpages/amcvar/display_cvar_config_form_de.html
index 20ee21d9a..6851e24fe 100644
--- a/templates/webpages/amcvar/display_cvar_config_form_de.html
+++ b/templates/webpages/amcvar/display_cvar_config_form_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="document.Form.name.focus();">
 
  <style type="text/css">
@@ -13,7 +14,7 @@
   <p>
    <table>
     <tr>
-     <td align="right">Modul</td>
+     <td align="right">[% 'Module' | $T8 %]</td>
      <td>
       [%- INCLUDE generic/multibox.html
             name      = 'module',
@@ -24,17 +25,17 @@
     </tr>
 
     <tr>
-     <td align="right">Name<sup><span class="small">(1)</span></sup></td>
+     <td align="right">[% 'Name' | $T8 %]<sup><span class="small">(1)</span></sup></td>
      <td><input name="name" value="[% HTML.escape(name) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Beschreibung<sup><span class="small">(2)</span></sup></td>
+     <td align="right">[% 'Description' | $T8 %]<sup><span class="small">(2)</span></sup></td>
      <td><input name="description" value="[% HTML.escape(description) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Typ</td>
+     <td align="right">[% 'Type' | $T8 %]</td>
      <td>
       <select name="type">
        [%- FOREACH row = TYPES %]
@@ -45,44 +46,44 @@
     </tr>
 
     <tr>
-     <td align="right">Standardwert<sup><span class="small">(3)</span></sup></td>
+     <td align="right">[% 'Default value' | $T8 %]<sup><span class="small">(3)</span></sup></td>
      <td><input name="default_value" value="[% HTML.escape(default_value) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Optionen<sup><span class="small">(4)</span></sup></td>
+     <td align="right">[% 'Options' | $T8 %]<sup><span class="small">(4)</span></sup></td>
      <td><input name="options" value="[% HTML.escape(options) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Durchsuchbar<sup><span class="small"></span></sup></td>
+     <td align="right">[% 'Searchable' | $T8 %]<sup><span class="small"></span></sup></td>
      <td>
       <input type="radio" name="searchable" id="searchable_1" value="1"[% IF searchable %] checked[% END %]>
-      <label for="searchable_1">Ja</label>
+      <label for="searchable_1">[% 'Yes' | $T8 %]</label>
       <input type="radio" name="searchable" id="searchable_0" value="0"[% UNLESS searchable %] checked[% END %]>
-      <label for="searchable_0">Nein</label>
+      <label for="searchable_0">[% 'No' | $T8 %]</label>
      </td>
     </tr>
 
     <tr>
-     <td align="right">In Berichten anzeigbar<sup><span class="small"></span></sup></td>
+     <td align="right">[% 'Includeable in reports' | $T8 %]<sup><span class="small"></span></sup></td>
      <td>
       <select name="inclusion">
-       <option value="no"[% UNLESS includeable %] selected[% END %]>Nein</option>
-       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]>Ja</option>
-       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]>Ja, standardm&auml;&szlig;ig an</option>
+       <option value="no"[% UNLESS includeable %] selected[% END %]>[% 'No' | $T8 %]</option>
+       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]>[% 'Yes' | $T8 %]</option>
+       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]>[% 'Yes, included by default' | $T8 %]</option>
       </select>
      </td>
     </tr>
 
     [%- IF module == 'IC' %]
     <tr>
-     <td align="right">Bearbeitbar<sup><span class="small">(5)</span></sup></td>
+     <td align="right">[% 'Editable' | $T8 %]<sup><span class="small">(5)</span></sup></td>
      <td>
       <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
-      <label for="flag_editable_1">Ja</label>
+      <label for="flag_editable_1">[% 'Yes' | $T8 %]</label>
       <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
-      <label for="flag_editable_0">Nein</label>
+      <label for="flag_editable_0">[% 'No' | $T8 %]</label>
      </td>
     </tr>
     [%- END %]
@@ -92,54 +93,54 @@
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
 
   <p>
-   <input type="submit" name="action" value="Speichern">
+   <input type="submit" name="action" value="[% 'Save' | $T8 %]">
    [%- IF id %]
-   <input type="submit" name="action" value="Löschen">
+   <input type="submit" name="action" value="[% 'Delete' | $T8 %]">
    [%- END %]
   </p>
 
   <hr>
 
-  <h3>Anmerkungen</h3>
+  <h3>[% 'Annotations' | $T8 %]</h3>
 
   <p>
-   (1) Der Variablenname darf nur aus Zeichen (keine Umlaute), Ziffern und Unterstrichen bestehen. Er muss mit einem Buchstaben beginnen. Beispiel: weihnachtsgruss_verschicken
+   (1) [% 'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' | $T8 %]
   </p>
 
   <p>
-   (2) Die Beschreibung wird in der jeweiligen Maske angezeigt. Sie sollte kurz und pr&auml;gnant sein.
+   (2) [% 'The description is shown on the form. Chose something short and descriptive.' | $T8 %]
   </p>
 
   <p>
-   (3) Die Bedeutung des Standardwertes h&auml;ngt vom Variablentypen ab:
+   (3) [% 'The default value depends on the variable type:' | $T8 %]
    <br>
    <ul>
-    <li>Textzeilen, Textfelder und Zahlenvariablen: Der Standardwert wird so wie er ist &uuml;bernommen.</li>
-    <li>Ja/Nein-Variablen: Wenn der Standardwert nicht leer ist, so wird die Checkbox standardm&auml;&szlig;ig angehakt.</li>
-    <li>Datums- und Uhrzeitvariablen: Wenn der Standardwert 'NOW' ist, so wird das aktuelle Datum/die aktuelle Uhrzeit eingef&uuml;gt. Andernfalls wird der Standardwert so wie er ist benutzt.</li>
+    <li>[% 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]</li>
+    <li>[% 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]</li>
+    <li>[% 'Date and timestamp variables: If the default value equals 'NOW' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]</li>
    </ul>
   </p>
 
   <p>
-   (4) Die verf&uuml;gbaren Optionen h&auml;ngen vom Variablentypen ab:
+   (4) [% 'The available options depend on the varibale type:' | $T8 %]
    <br>
    <ul>
-    <li>Textzeilen: 'MAXLENGTH=n' setzt eine Maximall&auml;nge von n Zeichen.</li>
-    <li>Textfelder: 'WIDTH=w HEIGHT=h' setzen die Breite und die H&ouml;he des Textfeldes. Wenn nicht anders angegeben, so werden sie 30 Zeichen breit und f&uuml;nf Zeichen hoch dargestellt.</li>
-    <li>Zahlenvariablen: Mit 'PRECISION=n' erzwingt man, dass Zahlen mit n Nachkommastellen formatiert werden.</li>
-    <li>Auswahlboxen: Das Optionenfeld muss die f&uuml;r die Auswahl verf&uuml;gbaren Eintr&auml;ge enthalten. Die Eintr&auml;ge werden mit '##' voneinander getrennt. Beispiel: 'Fr&uuml;h##Normal##Sp&auml;t'.</li>
+    <li>[% 'Text variables: 'MAXLENGTH=n' sets the maximum entry length to 'n'.' | $T8 %]</li>
+    <li>[% 'Text field variables: 'WIDTH=w HEIGHT=h' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]</li>
+    <li>[% 'Number variables: 'PRECISION=n' forces numbers to be shown with exactly n decimal places.' | $T8 %]</li>
+    <li>[% 'Selection fields: The option field must contain the available options for the selection. Options are separated by '##', for example 'Early##Normal##Late'.' | $T8 %]</li>
    </ul>
    <br>
-   Andere Eingaben werden ignoriert.
+   [% 'Other values are ignored.' | $T8 %]
   </p>
 
   [%- IF module == 'IC' %]
   <p>
    (5)
 
-   Eine als 'editierbar' markierte Variable kann in jedem Angebot, Auftrag, jeder Rechnung etc für jede Position geändert werden.
+   [% 'A variable marked as 'editable' can be changed in each quotation, order, invoice etc.' | $T8 %]
 
-   Andernfalls steht die Variable nur beim Ausdruck zur Verfügung.
+   [% 'Otherwise the variable is only available for printing.' | $T8 %]
   </p>
   [%- END %]
 
diff --git a/templates/webpages/amcvar/display_cvar_config_form_master.html b/templates/webpages/amcvar/display_cvar_config_form_master.html
index 3f6fa83dd..6851e24fe 100644
--- a/templates/webpages/amcvar/display_cvar_config_form_master.html
+++ b/templates/webpages/amcvar/display_cvar_config_form_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="document.Form.name.focus();">
 
  <style type="text/css">
@@ -13,7 +14,7 @@
   <p>
    <table>
     <tr>
-     <td align="right"><translate>Module</translate></td>
+     <td align="right">[% 'Module' | $T8 %]</td>
      <td>
       [%- INCLUDE generic/multibox.html
             name      = 'module',
@@ -24,17 +25,17 @@
     </tr>
 
     <tr>
-     <td align="right"><translate>Name</translate><sup><span class="small">(1)</span></sup></td>
+     <td align="right">[% 'Name' | $T8 %]<sup><span class="small">(1)</span></sup></td>
      <td><input name="name" value="[% HTML.escape(name) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Description</translate><sup><span class="small">(2)</span></sup></td>
+     <td align="right">[% 'Description' | $T8 %]<sup><span class="small">(2)</span></sup></td>
      <td><input name="description" value="[% HTML.escape(description) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Type</translate></td>
+     <td align="right">[% 'Type' | $T8 %]</td>
      <td>
       <select name="type">
        [%- FOREACH row = TYPES %]
@@ -45,44 +46,44 @@
     </tr>
 
     <tr>
-     <td align="right"><translate>Default value</translate><sup><span class="small">(3)</span></sup></td>
+     <td align="right">[% 'Default value' | $T8 %]<sup><span class="small">(3)</span></sup></td>
      <td><input name="default_value" value="[% HTML.escape(default_value) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Options</translate><sup><span class="small">(4)</span></sup></td>
+     <td align="right">[% 'Options' | $T8 %]<sup><span class="small">(4)</span></sup></td>
      <td><input name="options" value="[% HTML.escape(options) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Searchable</translate><sup><span class="small"></span></sup></td>
+     <td align="right">[% 'Searchable' | $T8 %]<sup><span class="small"></span></sup></td>
      <td>
       <input type="radio" name="searchable" id="searchable_1" value="1"[% IF searchable %] checked[% END %]>
-      <label for="searchable_1"><translate>Yes</translate></label>
+      <label for="searchable_1">[% 'Yes' | $T8 %]</label>
       <input type="radio" name="searchable" id="searchable_0" value="0"[% UNLESS searchable %] checked[% END %]>
-      <label for="searchable_0"><translate>No</translate></label>
+      <label for="searchable_0">[% 'No' | $T8 %]</label>
      </td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Includeable in reports</translate><sup><span class="small"></span></sup></td>
+     <td align="right">[% 'Includeable in reports' | $T8 %]<sup><span class="small"></span></sup></td>
      <td>
       <select name="inclusion">
-       <option value="no"[% UNLESS includeable %] selected[% END %]><translate>No</translate></option>
-       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]><translate>Yes</translate></option>
-       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]><translate>Yes, included by default</translate></option>
+       <option value="no"[% UNLESS includeable %] selected[% END %]>[% 'No' | $T8 %]</option>
+       <option value="yes"[% IF includeable && !included_by_default %] selected[% END %]>[% 'Yes' | $T8 %]</option>
+       <option value="yes_default_on"[% IF included_by_default %] selected[% END %]>[% 'Yes, included by default' | $T8 %]</option>
       </select>
      </td>
     </tr>
 
     [%- IF module == 'IC' %]
     <tr>
-     <td align="right"><translate>Editable</translate><sup><span class="small">(5)</span></sup></td>
+     <td align="right">[% 'Editable' | $T8 %]<sup><span class="small">(5)</span></sup></td>
      <td>
       <input type="radio" name="flag_editable" id="flag_editable_1" value="1"[% IF flag_editable %] checked[% END %]>
-      <label for="flag_editable_1"><translate>Yes</translate></label>
+      <label for="flag_editable_1">[% 'Yes' | $T8 %]</label>
       <input type="radio" name="flag_editable" id="flag_editable_0" value="0"[% UNLESS flag_editable %] checked[% END %]>
-      <label for="flag_editable_0"><translate>No</translate></label>
+      <label for="flag_editable_0">[% 'No' | $T8 %]</label>
      </td>
     </tr>
     [%- END %]
@@ -92,71 +93,54 @@
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
 
   <p>
-   <input type="submit" name="action" value="<translate>Save</translate>">
+   <input type="submit" name="action" value="[% 'Save' | $T8 %]">
    [%- IF id %]
-   <input type="submit" name="action" value="<translate>Delete</translate>">
+   <input type="submit" name="action" value="[% 'Delete' | $T8 %]">
    [%- END %]
   </p>
 
   <hr>
 
-  <h3><translate>Annotations</translate></h3>
+  <h3>[% 'Annotations' | $T8 %]</h3>
 
   <p>
-   (1) <translate>The variable name must only consist of letters,
-    numbers and underscores. It must begin with a letter. Example:
-    send_christmas_present</translate>
+   (1) [% 'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' | $T8 %]
   </p>
 
   <p>
-   (2) <translate>The description is shown on the form. Chose
-    something short and descriptive.</translate>
+   (2) [% 'The description is shown on the form. Chose something short and descriptive.' | $T8 %]
   </p>
 
   <p>
-   (3) <translate>The default value depends on the variable type:</translate>
+   (3) [% 'The default value depends on the variable type:' | $T8 %]
    <br>
    <ul>
-    <li><translate>Text, text field and number variables: The default
-      value will be used as-is.</translate></li>
-    <li><translate>Boolean variables: If the default value is
-      non-empty then the checkbox will be checked by default and
-      unchecked otherwise.</translate></li>
-    <li><translate>Date and timestamp variables: If the default value
-      equals 'NOW' then the current date/current timestamp will be
-      used. Otherwise the default value is copied as-is.</translate></li>
+    <li>[% 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]</li>
+    <li>[% 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]</li>
+    <li>[% 'Date and timestamp variables: If the default value equals 'NOW' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]</li>
    </ul>
   </p>
 
   <p>
-   (4) <translate>The available options depend on the varibale
-    type:</translate>
+   (4) [% 'The available options depend on the varibale type:' | $T8 %]
    <br>
    <ul>
-    <li><translate>Text variables: 'MAXLENGTH=n' sets the maximum
-      entry length to 'n'.</translate></li>
-    <li><translate>Text field variables: 'WIDTH=w HEIGHT=h' sets the
-      width and height of the text field. They default to 30 and 5
-      respectively.</translate></li>
-    <li><translate>Number variables: 'PRECISION=n' forces numbers to
-      be shown with exactly n decimal places.</translate></li>
-    <li><translate>Selection fields: The option field must contain the
-      available options for the selection. Options are separated by
-      '##', for example 'Early##Normal##Late'.</translate></li>
+    <li>[% 'Text variables: 'MAXLENGTH=n' sets the maximum entry length to 'n'.' | $T8 %]</li>
+    <li>[% 'Text field variables: 'WIDTH=w HEIGHT=h' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]</li>
+    <li>[% 'Number variables: 'PRECISION=n' forces numbers to be shown with exactly n decimal places.' | $T8 %]</li>
+    <li>[% 'Selection fields: The option field must contain the available options for the selection. Options are separated by '##', for example 'Early##Normal##Late'.' | $T8 %]</li>
    </ul>
    <br>
-   <translate>Other values are ignored.</translate>
+   [% 'Other values are ignored.' | $T8 %]
   </p>
 
   [%- IF module == 'IC' %]
   <p>
    (5)
 
-   <translate>A variable marked as 'editable' can be changed in each
-    quotation, order, invoice etc.</translate>
+   [% 'A variable marked as 'editable' can be changed in each quotation, order, invoice etc.' | $T8 %]
 
-   <translate>Otherwise the variable is only available for
-    printing.</translate>
+   [% 'Otherwise the variable is only available for printing.' | $T8 %]
   </p>
   [%- END %]
 
diff --git a/templates/webpages/amcvar/list_cvar_configs_de.html b/templates/webpages/amcvar/list_cvar_configs_de.html
index 817483095..f2890f780 100644
--- a/templates/webpages/amcvar/list_cvar_configs_de.html
+++ b/templates/webpages/amcvar/list_cvar_configs_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
@@ -9,13 +10,13 @@
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
   <p>
-   Benutzerdefinierte Variablen für Modul
+   [% 'Custom variables for module' | $T8 %]
    [%- INCLUDE generic/multibox.html
          name      = 'module',
          id_key    = 'module',
          label_key = 'description',
          DATA      = MODULES %]
-   <input type="submit" class="submit" name="action_list_cvar_configs" value="Zeigen">
+   <input type="submit" class="submit" name="action_list_cvar_configs" value="[% 'Show' | $T8 %]">
   </p>
 
   <p>
@@ -23,13 +24,13 @@
     <tr>
      <td class="listheading" width="0%"></td>
      <td class="listheading" width="0%"></td>
-     <td class="listheading" width="20%">Name</td>
-     <td class="listheading" width="20%">Beschreibung</td>
-     <td class="listheading" width="20%">Typ</td>
-     <td class="listheading" width="20%">Durchsuchbar</td>
-     <td class="listheading" width="20%">In Berichten anzeigbar</td>
+     <td class="listheading" width="20%">[% 'Name' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Description' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Type' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Searchable' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Includeable in reports' | $T8 %]</td>
      [%- IF module == 'IC' %]
-     <td class="listheading" width="20%">Bearbeitbar</td>
+     <td class="listheading" width="20%">[% 'Editable' | $T8 %]</td>
      [%- END %]
     </tr>
 
@@ -60,28 +61,28 @@
 
      <td>
       [%- IF cfg.searchable %]
-      Ja
+      [% 'Yes' | $T8 %]
       [%- ELSE %]
-      Nein
+      [% 'No' | $T8 %]
       [%- END %]
      </td>
 
      <td>
       [%- IF cfg.included_by_default %]
-      Ja, standardm&auml;&szlig;ig an
+      [% 'Yes, included by default' | $T8 %]
       [%- ELSIF cfg.includeable %]
-      Ja
+      [% 'Yes' | $T8 %]
       [%- ELSE %]
-      Nein
+      [% 'No' | $T8 %]
       [%- END %]
      </td>
 
      [%- IF module == 'IC' %]
      <td>
       [%- IF cfg.flag_editable %]
-      Ja
+      [% 'Yes' | $T8 %]
       [%- ELSE %]
-      Nein
+      [% 'No' | $T8 %]
       [%- END %]
      </td>
      [%- END %]
@@ -93,7 +94,7 @@
   <hr height="3">
 
   <p>
-   <input type="submit" class="submit" name="action_add_cvar_config" value="Erfassen">
+   <input type="submit" class="submit" name="action_add_cvar_config" value="[% 'Add' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/amcvar/list_cvar_configs_master.html b/templates/webpages/amcvar/list_cvar_configs_master.html
index 385fb4401..f2890f780 100644
--- a/templates/webpages/amcvar/list_cvar_configs_master.html
+++ b/templates/webpages/amcvar/list_cvar_configs_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
@@ -9,13 +10,13 @@
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
   <p>
-   <translate>Custom variables for module</translate>
+   [% 'Custom variables for module' | $T8 %]
    [%- INCLUDE generic/multibox.html
          name      = 'module',
          id_key    = 'module',
          label_key = 'description',
          DATA      = MODULES %]
-   <input type="submit" class="submit" name="action_list_cvar_configs" value="<translate>Show</translate>">
+   <input type="submit" class="submit" name="action_list_cvar_configs" value="[% 'Show' | $T8 %]">
   </p>
 
   <p>
@@ -23,13 +24,13 @@
     <tr>
      <td class="listheading" width="0%"></td>
      <td class="listheading" width="0%"></td>
-     <td class="listheading" width="20%"><translate>Name</translate></td>
-     <td class="listheading" width="20%"><translate>Description</translate></td>
-     <td class="listheading" width="20%"><translate>Type</translate></td>
-     <td class="listheading" width="20%"><translate>Searchable</translate></td>
-     <td class="listheading" width="20%"><translate>Includeable in reports</translate></td>
+     <td class="listheading" width="20%">[% 'Name' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Description' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Type' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Searchable' | $T8 %]</td>
+     <td class="listheading" width="20%">[% 'Includeable in reports' | $T8 %]</td>
      [%- IF module == 'IC' %]
-     <td class="listheading" width="20%"><translate>Editable</translate></td>
+     <td class="listheading" width="20%">[% 'Editable' | $T8 %]</td>
      [%- END %]
     </tr>
 
@@ -60,28 +61,28 @@
 
      <td>
       [%- IF cfg.searchable %]
-      <translate>Yes</translate>
+      [% 'Yes' | $T8 %]
       [%- ELSE %]
-      <translate>No</translate>
+      [% 'No' | $T8 %]
       [%- END %]
      </td>
 
      <td>
       [%- IF cfg.included_by_default %]
-      <translate>Yes, included by default</translate>
+      [% 'Yes, included by default' | $T8 %]
       [%- ELSIF cfg.includeable %]
-      <translate>Yes</translate>
+      [% 'Yes' | $T8 %]
       [%- ELSE %]
-      <translate>No</translate>
+      [% 'No' | $T8 %]
       [%- END %]
      </td>
 
      [%- IF module == 'IC' %]
      <td>
       [%- IF cfg.flag_editable %]
-      <translate>Yes</translate>
+      [% 'Yes' | $T8 %]
       [%- ELSE %]
-      <translate>No</translate>
+      [% 'No' | $T8 %]
       [%- END %]
      </td>
      [%- END %]
@@ -93,7 +94,7 @@
   <hr height="3">
 
   <p>
-   <input type="submit" class="submit" name="action_add_cvar_config" value="<translate>Add</translate>">
+   <input type="submit" class="submit" name="action_add_cvar_config" value="[% 'Add' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/amcvar/render_inputs_de.html b/templates/webpages/amcvar/render_inputs_de.html
index 50fb4cb3e..335a77c9f 100644
--- a/templates/webpages/amcvar/render_inputs_de.html
+++ b/templates/webpages/amcvar/render_inputs_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 [%- SET var_name = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) -%]
@@ -7,7 +8,7 @@
 
 [%- ELSIF !var.valid %]
   [%- IF show_disabled_message %]
-<i>Element deaktiviert</i>
+<i>[% 'Element disabled' | $T8 %]</i>
   [%- END %]
 
 [%- ELSIF var.type == 'bool' %]
diff --git a/templates/webpages/amcvar/render_inputs_master.html b/templates/webpages/amcvar/render_inputs_master.html
index ed746a506..335a77c9f 100644
--- a/templates/webpages/amcvar/render_inputs_master.html
+++ b/templates/webpages/amcvar/render_inputs_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 [%- SET var_name = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) -%]
@@ -7,7 +8,7 @@
 
 [%- ELSIF !var.valid %]
   [%- IF show_disabled_message %]
-<i><translate>Element disabled</translate></i>
+<i>[% 'Element disabled' | $T8 %]</i>
   [%- END %]
 
 [%- ELSIF var.type == 'bool' %]
diff --git a/templates/webpages/amcvar/search_filter_de.html b/templates/webpages/amcvar/search_filter_de.html
index f25b428ad..0bf105e78 100644
--- a/templates/webpages/amcvar/search_filter_de.html
+++ b/templates/webpages/amcvar/search_filter_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
    [%- FOREACH var = variables %]
@@ -9,15 +10,15 @@
      [%- IF var.type == 'bool' %]
      <select name="cvar_[% HTML.escape(var.name) %]">
       <option value="">---</option>
-      <option value="yes">Ja</option>
-      <option value="no">Nein</option>
+      <option value="yes">[% 'Yes' | $T8 %]</option>
+      <option value="no">[% 'No' | $T8 %]</option>
      </select>
 
      [%- ELSIF var.type == 'date' %]
-     von
+     [% 'from (time)' | $T8 %]
      <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
      <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
-     bis
+     [% 'to (time)' | $T8 %]
      <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
      <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
 
@@ -62,7 +63,7 @@
    [%- END %]
    [%- END %]
 [% IF hidden_cvar_filters %]
-   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>Klicken Sie hier, um nach benutzerdefinierten Variablen zu suchen</i></a></td></tr>
+   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>[% 'click here to edit cvars' | $T8 %]</i></a></td></tr>
    <script type='text/javascript'>
      $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
      $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
diff --git a/templates/webpages/amcvar/search_filter_master.html b/templates/webpages/amcvar/search_filter_master.html
index 9151d131d..0bf105e78 100644
--- a/templates/webpages/amcvar/search_filter_master.html
+++ b/templates/webpages/amcvar/search_filter_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
    [%- FOREACH var = variables %]
@@ -9,15 +10,15 @@
      [%- IF var.type == 'bool' %]
      <select name="cvar_[% HTML.escape(var.name) %]">
       <option value="">---</option>
-      <option value="yes"><translate>Yes</translate></option>
-      <option value="no"><translate>No</translate></option>
+      <option value="yes">[% 'Yes' | $T8 %]</option>
+      <option value="no">[% 'No' | $T8 %]</option>
      </select>
 
      [%- ELSIF var.type == 'date' %]
-     <translate>from (time)</translate>
+     [% 'from (time)' | $T8 %]
      <input name="cvar_[% HTML.escape(var.name) %]_from" id="cvar_[% HTML.escape(var.name) %]_from" size="12">
      <input type="button" name="cvar_[% HTML.escape(var.name) %]_from_button" id="cvar_[% HTML.escape(var.name) %]_from_trigger" value="?">
-     <translate>to (time)</translate>
+     [% 'to (time)' | $T8 %]
      <input name="cvar_[% HTML.escape(var.name) %]_to" id="cvar_[% HTML.escape(var.name) %]_to" size="12">
      <input type="button" name="cvar_[% HTML.escape(var.name) %]_to_button" id="cvar_[% HTML.escape(var.name) %]_to_trigger" value="?">
 
@@ -62,7 +63,7 @@
    [%- END %]
    [%- END %]
 [% IF hidden_cvar_filters %]
-   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i><translate>click here to edit cvars</translate></i></a></td></tr>
+   <tr><td></td><td colspan="3"><a href="#" id="cvar_filter-toggle"><i>[% 'click here to edit cvars' | $T8 %]</i></a></td></tr>
    <script type='text/javascript'>
      $('#cvar_filter-toggle').click(function() { $('[id^="cvar_filter"]').toggle(); $('[id^="l_cvartd_"]').toggle(); });
      $(document).ready(function(){ $('[id^="cvar_filter_"]').hide(); $('[id^="l_cvartd_"]').hide(); });
diff --git a/templates/webpages/ap/ap_transactions_bottom_de.html b/templates/webpages/ap/ap_transactions_bottom_de.html
index c9442d0f0..abc51a197 100644
--- a/templates/webpages/ap/ap_transactions_bottom_de.html
+++ b/templates/webpages/ap/ap_transactions_bottom_de.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %] <form method="post" action="ap.pl">
 
   <input name="callback" type="hidden" value="[% callback %]">
 
-  Neu erfassen<br>
+  [% 'Create new' | $T8 %]<br>
 
-  <input class="submit" type="submit" name="action" value="Kreditorenbuchung">
-  <input class="submit" type="submit" name="action" value="Einkaufsrechnung">
+  <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/ap/ap_transactions_bottom_master.html b/templates/webpages/ap/ap_transactions_bottom_master.html
index 0be66fb4d..abc51a197 100644
--- a/templates/webpages/ap/ap_transactions_bottom_master.html
+++ b/templates/webpages/ap/ap_transactions_bottom_master.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %] <form method="post" action="ap.pl">
 
   <input name="callback" type="hidden" value="[% callback %]">
 
-  <translate>Create new</translate><br>
+  [% 'Create new' | $T8 %]<br>
 
-  <input class="submit" type="submit" name="action" value="<translate>AP Transaction</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Vendor Invoice</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/ap/search_de.html b/templates/webpages/ap/search_de.html
index 37ca33849..4b1139790 100644
--- a/templates/webpages/ap/search_de.html
+++ b/templates/webpages/ap/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 <body>
 
  <form method=post name="search" action=[% script %]>
@@ -9,7 +10,7 @@
    <td>
     <table>
      <tr>
-      <th align=right>Lieferant</th>
+      <th align=right>[% 'Vendor' | $T8 %]</th>
       <td colspan=3>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'vendor',
@@ -26,7 +27,7 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap>Abteilung</th>
+      <th align=right nowrap>[% 'Department' | $T8 %]</th>
       <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'department',
@@ -40,19 +41,19 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap>Rechnungsnummer</th>
+      <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
       <td colspan=3><input name=invnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap>Auftragsnummer</th>
+      <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
       <td colspan=3><input name=ordnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap>Bemerkungen</th>
+      <th align=right nowrap>[% 'Notes' | $T8 %]</th>
       <td colspan=3><input name=notes size=40></td>
      </tr>
      <tr>
-      <th align="right">Projektnummer</th>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
       <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          =  'project_id',
@@ -67,15 +68,15 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap>Von</th>
+      <th align=right nowrap>[% 'From' | $T8 %]</th>
       <td>
        <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=?>
+       <input type=button name=transdatefrom id="trigger1" value=[% 'button' | $T8 %]>
       </td>
-     <th align=right>bis</th>
+     <th align=right>[% 'Bis' | $T8 %]</th>
      <td>
       <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=?>
+      <input type=button name=transdateto name=transdateto id="trigger2" value=[% 'button' | $T8 %]>
      </td>
     </tr>
    <input type=hidden name=sort value=transdate>
@@ -86,77 +87,77 @@
      <td>
       <table>
        <tr>
-        <th align=right nowrap>In Bericht aufnehmen</th>
+        <th align=right nowrap>[% 'Include in Report' | $T8 %]</th>
         <td>
          <table width=100%>
           <tr>
            <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Offen</td>
+           <td nowrap>[% 'Open' | $T8 %]</td>
            <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Geschlossen</td>
+           <td nowrap>[% 'Closed' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungsnummer</td>
+           <td nowrap>[% 'ID' | $T8 %]</td>
            <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsnummer</td>
+           <td nowrap>[% 'Invoice Number' | $T8 %]</td>
            <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Auftragsnummer</td>
+           <td nowrap>[% 'Order Number' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Lieferant</td>
+           <td nowrap>[% 'Vendor' | $T8 %]</td>
            <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsdatum</td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
            <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Betrag</td>
+           <td nowrap>[% 'Amount' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuer</td>
+           <td nowrap>[% 'Tax' | $T8 %]</td>
            <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Summe</td>
+           <td nowrap>[% 'Total' | $T8 %]</td>
            <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungsdatum</td>
+           <td nowrap>[% 'Date Paid' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>bezahlt</td>
+           <td nowrap>[% 'Paid' | $T8 %]</td>
            <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Fälligkeitsdatum</td>
+           <td nowrap>[% 'Due Date' | $T8 %]</td>
            <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Betrag fällig</td>
+           <td nowrap>[% 'Amount Due' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bemerkungen</td>
+           <td nowrap>[% 'Notes' | $T8 %]</td>
            <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bearbeiter</td>
+           <td nowrap>[% 'Employee' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zwischensumme</td>
+           <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Projektnummer</td>
+           <td nowrap>[% 'Project Number' | $T8 %]</td>
          </tr>
          <tr>
-          <td colspan=4 align=left><b>Lieferant </td>
+          <td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td>
          </tr>
          <tr>
            <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Lieferantennummer</td>
+           <td nowrap>[% 'Vendor Number' | $T8 %]</td>
            <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Land</td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>USt-IdNr.</td>
+           <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
            <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuersatz</td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungskonditionen</td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungskonto</td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
           </tr>
          </table>
         </td>
@@ -170,7 +171,7 @@
    </table>
    <input type=hidden name=nextsub value=[% nextsub %]>
    <br>
-   <input class=submit type=submit name=action value="Weiter">
+   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
   </form>
  </body>
  <script type="text/javascript">
@@ -179,8 +180,8 @@
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
     focus();
-    setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
-    setupPoints('[% numberformat | html %]','Falsches Format');
+    setupDateFormat('[% dateformat | html %]','[% 'Falsches Datumsformat!' | $T8 %]');
+    setupPoints('[% numberformat | html %]','[% 'wrongformat' | $T8 %]');
    })
  //-->
  </script>
diff --git a/templates/webpages/ap/search_master.html b/templates/webpages/ap/search_master.html
index 90d7667a1..4b1139790 100644
--- a/templates/webpages/ap/search_master.html
+++ b/templates/webpages/ap/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 <body>
 
  <form method=post name="search" action=[% script %]>
@@ -9,7 +10,7 @@
    <td>
     <table>
      <tr>
-      <th align=right><translate>Vendor</translate></th>
+      <th align=right>[% 'Vendor' | $T8 %]</th>
       <td colspan=3>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'vendor',
@@ -26,7 +27,7 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Department</translate></th>
+      <th align=right nowrap>[% 'Department' | $T8 %]</th>
       <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'department',
@@ -40,19 +41,19 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Invoice Number</translate></th>
+      <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
       <td colspan=3><input name=invnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Order Number</translate></th>
+      <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
       <td colspan=3><input name=ordnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Notes</translate></th>
+      <th align=right nowrap>[% 'Notes' | $T8 %]</th>
       <td colspan=3><input name=notes size=40></td>
      </tr>
      <tr>
-      <th align="right"><translate>Project Number</translate></th>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
       <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          =  'project_id',
@@ -67,15 +68,15 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>From</translate></th>
+      <th align=right nowrap>[% 'From' | $T8 %]</th>
       <td>
        <input name=transdatefrom id=transdatefrom size=11 title="dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=transdatefrom id="trigger1" value=<translate>button</translate>>
+       <input type=button name=transdatefrom id="trigger1" value=[% 'button' | $T8 %]>
       </td>
-     <th align=right><translate>Bis</translate></th>
+     <th align=right>[% 'Bis' | $T8 %]</th>
      <td>
       <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur=\"check_right_date_format(this)\">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=<translate>button</translate>>
+      <input type=button name=transdateto name=transdateto id="trigger2" value=[% 'button' | $T8 %]>
      </td>
     </tr>
    <input type=hidden name=sort value=transdate>
@@ -86,77 +87,77 @@
      <td>
       <table>
        <tr>
-        <th align=right nowrap><translate>Include in Report</translate></th>
+        <th align=right nowrap>[% 'Include in Report' | $T8 %]</th>
         <td>
          <table width=100%>
           <tr>
            <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Open</translate></td>
+           <td nowrap>[% 'Open' | $T8 %]</td>
            <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Closed</translate></td>
+           <td nowrap>[% 'Closed' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>ID</translate></td>
+           <td nowrap>[% 'ID' | $T8 %]</td>
            <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Number</translate></td>
+           <td nowrap>[% 'Invoice Number' | $T8 %]</td>
            <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Order Number</translate></td>
+           <td nowrap>[% 'Order Number' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Vendor</translate></td>
+           <td nowrap>[% 'Vendor' | $T8 %]</td>
            <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Date</translate></td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
            <td align=right><input name="l_netamount" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Amount</translate></td>
+           <td nowrap>[% 'Amount' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Tax</translate></td>
+           <td nowrap>[% 'Tax' | $T8 %]</td>
            <td align=right><input name="l_amount" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Total</translate></td>
+           <td nowrap>[% 'Total' | $T8 %]</td>
            <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Date Paid</translate></td>
+           <td nowrap>[% 'Date Paid' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Paid</translate></td>
+           <td nowrap>[% 'Paid' | $T8 %]</td>
            <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Due Date</translate></td>
+           <td nowrap>[% 'Due Date' | $T8 %]</td>
            <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Amount Due</translate></td>
+           <td nowrap>[% 'Amount Due' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Notes</translate></td>
+           <td nowrap>[% 'Notes' | $T8 %]</td>
            <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Employee</translate></td>
+           <td nowrap>[% 'Employee' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Subtotal</translate></td>
+           <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Project Number</translate></td>
+           <td nowrap>[% 'Project Number' | $T8 %]</td>
          </tr>
          <tr>
-          <td colspan=4 align=left><b><translate>Vendor</translate> </td>
+          <td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td>
          </tr>
          <tr>
            <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Vendor Number</translate></td>
+           <td nowrap>[% 'Vendor Number' | $T8 %]</td>
            <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Country</translate></td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>USt-IdNr.</translate></td>
+           <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
            <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Steuersatz</translate></td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Payment Terms</translate></td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Buchungskonto</translate></td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
           </tr>
          </table>
         </td>
@@ -170,7 +171,7 @@
    </table>
    <input type=hidden name=nextsub value=[% nextsub %]>
    <br>
-   <input class=submit type=submit name=action value="<translate>Continue</translate>">
+   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
   </form>
  </body>
  <script type="text/javascript">
@@ -179,8 +180,8 @@
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
     focus();
-    setupDateFormat('[% dateformat | html %]','<translate>Falsches Datumsformat!</translate>');
-    setupPoints('[% numberformat | html %]','<translate>wrongformat</translate>');
+    setupDateFormat('[% dateformat | html %]','[% 'Falsches Datumsformat!' | $T8 %]');
+    setupPoints('[% numberformat | html %]','[% 'wrongformat' | $T8 %]');
    })
  //-->
  </script>
diff --git a/templates/webpages/ar/ar_transactions_bottom_de.html b/templates/webpages/ar/ar_transactions_bottom_de.html
index b70f89d04..57bacca38 100644
--- a/templates/webpages/ar/ar_transactions_bottom_de.html
+++ b/templates/webpages/ar/ar_transactions_bottom_de.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %] <form method="post" action="ar.pl">
 
   <input name="callback" type="hidden" value="[% callback %]">
 
-  Neu erfassen<br>
+  [% 'Create new' | $T8 %]<br>
 
-  <input class="submit" type="submit" name="action" value="Debitorenbuchung">
-  <input class="submit" type="submit" name="action" value="Rechnung">
+  <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/ar/ar_transactions_bottom_master.html b/templates/webpages/ar/ar_transactions_bottom_master.html
index a6ffc7b51..57bacca38 100644
--- a/templates/webpages/ar/ar_transactions_bottom_master.html
+++ b/templates/webpages/ar/ar_transactions_bottom_master.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %] <form method="post" action="ar.pl">
 
   <input name="callback" type="hidden" value="[% callback %]">
 
-  <translate>Create new</translate><br>
+  [% 'Create new' | $T8 %]<br>
 
-  <input class="submit" type="submit" name="action" value="<translate>AR Transaction</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Sales Invoice</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/ar/search_de.html b/templates/webpages/ar/search_de.html
index b90aa3bc4..cf8c70a54 100644
--- a/templates/webpages/ar/search_de.html
+++ b/templates/webpages/ar/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 <body>
 
  <form method=post name="search" action=[% script %]>
@@ -9,7 +10,7 @@
    <td>
     <table>
      <tr>
-      <th align=right>Kunde</th>
+      <th align=right>[% 'Customer' | $T8 %]</th>
       <td colspan=3>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'customer',
@@ -26,7 +27,7 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap>Abteilung</th>
+      <th align=right nowrap>[% 'Department' | $T8 %]</th>
       <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'department',
@@ -40,23 +41,23 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap>Rechnungsnummer</th>
+      <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
       <td colspan=3><input name=invnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap>Auftragsnummer</th>
+      <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
       <td colspan=3><input name=ordnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap>Vorgangsbezeichnung</th>
+      <th align=right nowrap>[% 'Transaction description' | $T8 %]</th>
       <td colspan=3><input name=transaction_description size=40></td>
      </tr>
      <tr>
-      <th align=right nowrap>Bemerkungen</th>
+      <th align=right nowrap>[% 'Notes' | $T8 %]</th>
       <td colspan=3><input name=notes size=40></td>
      </tr>
      <tr>
-      <th align="right">Projektnummer</th>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
       <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          =  'project_id',
@@ -71,15 +72,15 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap>Von</th>
+      <th align=right nowrap>[% 'From' | $T8 %]</th>
       <td>
        <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-       <input type=button name=transdatefrom id="trigger1" value=?>
+       <input type=button name=transdatefrom id="trigger1" value=[% 'button' | $T8 %]>
       </td>
-     <th align=right>bis</th>
+     <th align=right>[% 'Bis' | $T8 %]</th>
      <td>
       <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=?>
+      <input type=button name=transdateto name=transdateto id="trigger2" value=[% 'button' | $T8 %]>
      </td>
     </tr>
    <input type=hidden name=sort value=transdate>
@@ -90,89 +91,89 @@
      <td>
       <table>
        <tr>
-        <th align=right nowrap>In Bericht aufnehmen</th>
+        <th align=right nowrap>[% 'Include in Report' | $T8 %]</th>
         <td>
          <table width=100%>
           <tr>
            <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Offen</td>
+           <td nowrap>[% 'Open' | $T8 %]</td>
            <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Geschlossen</td>
+           <td nowrap>[% 'Closed' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungsnummer</td>
+           <td nowrap>[% 'ID' | $T8 %]</td>
            <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsnummer</td>
+           <td nowrap>[% 'Invoice Number' | $T8 %]</td>
            <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Auftragsnummer</td>
+           <td nowrap>[% 'Order Number' | $T8 %]</td>
            <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Rechnungsdatum</td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>Kunde</td>
+           <td nowrap>[% 'Customer' | $T8 %]</td>
            <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap>Betrag</td>
+           <td nowrap>[% 'Amount' | $T8 %]</td>
            <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuer</td>
+           <td nowrap>[% 'Tax' | $T8 %]</td>
            <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap>Summe</td>
+           <td nowrap>[% 'Total' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungsdatum</td>
+           <td nowrap>[% 'Date Paid' | $T8 %]</td>
            <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>bezahlt</td>
+           <td nowrap>[% 'Paid' | $T8 %]</td>
            <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Fälligkeitsdatum</td>
+           <td nowrap>[% 'Due Date' | $T8 %]</td>
            <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Betrag fällig</td>
+           <td nowrap>[% 'Amount Due' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bemerkungen</td>
+           <td nowrap>[% 'Notes' | $T8 %]</td>
            <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Verkäufer</td>
+           <td nowrap>[% 'Salesperson' | $T8 %]</td>
            <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Versandort</td>
+           <td nowrap>[% 'Shipping Point' | $T8 %]</td>
            <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Transportmittel</td>
+           <td nowrap>[% 'Ship via' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> Ertrag</td>
+           <td nowrap> [% 'Ertrag' | $T8 %]</td>
            <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> Ertrag prozentual</td>
+           <td nowrap> [% 'Ertrag prozentual' | $T8 %]</td>
            <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Bearbeiter</td>
+           <td nowrap>[% 'Employee' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zwischensumme</td>
+           <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Projektnummer</td>
+           <td nowrap>[% 'Project Number' | $T8 %]</td>
            <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Vorgangsbezeichnung</td>
+           <td nowrap>[% 'Transaction description' | $T8 %]</td>
           </tr>
           <tr>
-           <td colspan=4 align=left><b>Kunde </td>
+           <td colspan=4 align=left><b>[% 'Customer' | $T8 %] </td>
           </tr>
           <tr>
            <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Kundennummer</td>
+           <td nowrap>[% 'Customer Number' | $T8 %]</td>
            <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Land</td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>USt-IdNr.</td>
+           <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
            <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Steuersatz</td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Zahlungskonditionen</td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap>Buchungskonto</td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
           </tr>
          </table>
         </td>
@@ -186,7 +187,7 @@
    </table>
    <input type=hidden name=nextsub value=[% nextsub %]>
    <br>
-   <input class=submit type=submit name=action value="Weiter">
+   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
   </form>
  <script type="text/javascript">
  <!--
@@ -194,8 +195,8 @@
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
     $('customer').focus();
-    setupDateFormat('[% dateformat | html %]','Falsches Datumsformat!');
-    setupPoints('[% numberformat | html %]','Falsches Format');
+    setupDateFormat('[% dateformat | html %]','[% 'Falsches Datumsformat!' | $T8 %]');
+    setupPoints('[% numberformat | html %]','[% 'wrongformat' | $T8 %]');
    })
  //-->
  </script>
diff --git a/templates/webpages/ar/search_master.html b/templates/webpages/ar/search_master.html
index 7b1342580..cf8c70a54 100644
--- a/templates/webpages/ar/search_master.html
+++ b/templates/webpages/ar/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 <body>
 
  <form method=post name="search" action=[% script %]>
@@ -9,7 +10,7 @@
    <td>
     <table>
      <tr>
-      <th align=right><translate>Customer</translate></th>
+      <th align=right>[% 'Customer' | $T8 %]</th>
       <td colspan=3>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'customer',
@@ -26,7 +27,7 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Department</translate></th>
+      <th align=right nowrap>[% 'Department' | $T8 %]</th>
       <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'department',
@@ -40,23 +41,23 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Invoice Number</translate></th>
+      <th align=right nowrap>[% 'Invoice Number' | $T8 %]</th>
       <td colspan=3><input name=invnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Order Number</translate></th>
+      <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
       <td colspan=3><input name=ordnumber size=20></td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Transaction description</translate></th>
+      <th align=right nowrap>[% 'Transaction description' | $T8 %]</th>
       <td colspan=3><input name=transaction_description size=40></td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>Notes</translate></th>
+      <th align=right nowrap>[% 'Notes' | $T8 %]</th>
       <td colspan=3><input name=notes size=40></td>
      </tr>
      <tr>
-      <th align="right"><translate>Project Number</translate></th>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
       <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          =  'project_id',
@@ -71,15 +72,15 @@
       </td>
      </tr>
      <tr>
-      <th align=right nowrap><translate>From</translate></th>
+      <th align=right nowrap>[% 'From' | $T8 %]</th>
       <td>
        <input name=transdatefrom id=transdatefrom size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-       <input type=button name=transdatefrom id="trigger1" value=<translate>button</translate>>
+       <input type=button name=transdatefrom id="trigger1" value=[% 'button' | $T8 %]>
       </td>
-     <th align=right><translate>Bis</translate></th>
+     <th align=right>[% 'Bis' | $T8 %]</th>
      <td>
       <input name=transdateto id=transdateto size=11 title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
-      <input type=button name=transdateto name=transdateto id="trigger2" value=<translate>button</translate>>
+      <input type=button name=transdateto name=transdateto id="trigger2" value=[% 'button' | $T8 %]>
      </td>
     </tr>
    <input type=hidden name=sort value=transdate>
@@ -90,89 +91,89 @@
      <td>
       <table>
        <tr>
-        <th align=right nowrap><translate>Include in Report</translate></th>
+        <th align=right nowrap>[% 'Include in Report' | $T8 %]</th>
         <td>
          <table width=100%>
           <tr>
            <td align=right><input name=open class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Open</translate></td>
+           <td nowrap>[% 'Open' | $T8 %]</td>
            <td align=right><input name=closed class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Closed</translate></td>
+           <td nowrap>[% 'Closed' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>ID</translate></td>
+           <td nowrap>[% 'ID' | $T8 %]</td>
            <td align=right><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Number</translate></td>
+           <td nowrap>[% 'Invoice Number' | $T8 %]</td>
            <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Order Number</translate></td>
+           <td nowrap>[% 'Order Number' | $T8 %]</td>
            <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Invoice Date</translate></td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Customer</translate></td>
+           <td nowrap>[% 'Customer' | $T8 %]</td>
            <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap><translate>Amount</translate></td>
+           <td nowrap>[% 'Amount' | $T8 %]</td>
            <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Tax</translate></td>
+           <td nowrap>[% 'Tax' | $T8 %]</td>
            <td align=right><input name="l_amount" class=checkbox type=checkbox value="Y" checked></td>
-           <td nowrap><translate>Total</translate></td>
+           <td nowrap>[% 'Total' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_datepaid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Date Paid</translate></td>
+           <td nowrap>[% 'Date Paid' | $T8 %]</td>
            <td align=right><input name="l_paid" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap><translate>Paid</translate></td>
+           <td nowrap>[% 'Paid' | $T8 %]</td>
            <td align=right><input name="l_duedate" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Due Date</translate></td>
+           <td nowrap>[% 'Due Date' | $T8 %]</td>
            <td align=right><input name="l_due" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Amount Due</translate></td>
+           <td nowrap>[% 'Amount Due' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Notes</translate></td>
+           <td nowrap>[% 'Notes' | $T8 %]</td>
            <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Salesperson</translate></td>
+           <td nowrap>[% 'Salesperson' | $T8 %]</td>
            <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Shipping Point</translate></td>
+           <td nowrap>[% 'Shipping Point' | $T8 %]</td>
            <td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Ship via</translate></td>
+           <td nowrap>[% 'Ship via' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> <translate>Ertrag</translate></td>
+           <td nowrap> [% 'Ertrag' | $T8 %]</td>
            <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
-           <td nowrap> <translate>Ertrag prozentual</translate></td>
+           <td nowrap> [% 'Ertrag prozentual' | $T8 %]</td>
            <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Employee</translate></td>
+           <td nowrap>[% 'Employee' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Subtotal</translate></td>
+           <td nowrap>[% 'Subtotal' | $T8 %]</td>
            <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Project Number</translate></td>
+           <td nowrap>[% 'Project Number' | $T8 %]</td>
            <td align=right><input name="l_transaction_description" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Transaction description</translate></td>
+           <td nowrap>[% 'Transaction description' | $T8 %]</td>
           </tr>
           <tr>
-           <td colspan=4 align=left><b><translate>Customer</translate> </td>
+           <td colspan=4 align=left><b>[% 'Customer' | $T8 %] </td>
           </tr>
           <tr>
            <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Customer Number</translate></td>
+           <td nowrap>[% 'Customer Number' | $T8 %]</td>
            <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Country</translate></td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>USt-IdNr.</translate></td>
+           <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
            <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Steuersatz</translate></td>
+           <td nowrap>[% 'Steuersatz' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Payment Terms</translate></td>
+           <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td>
-           <td nowrap><translate>Buchungskonto</translate></td>
+           <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
           </tr>
          </table>
         </td>
@@ -186,7 +187,7 @@
    </table>
    <input type=hidden name=nextsub value=[% nextsub %]>
    <br>
-   <input class=submit type=submit name=action value="<translate>Continue</translate>">
+   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
   </form>
  <script type="text/javascript">
  <!--
@@ -194,8 +195,8 @@
    Calendar.setup( { inputField : "transdateto", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
    $(document).ready(function(){
     $('customer').focus();
-    setupDateFormat('[% dateformat | html %]','<translate>Falsches Datumsformat!</translate>');
-    setupPoints('[% numberformat | html %]','<translate>wrongformat</translate>');
+    setupDateFormat('[% dateformat | html %]','[% 'Falsches Datumsformat!' | $T8 %]');
+    setupPoints('[% numberformat | html %]','[% 'wrongformat' | $T8 %]');
    })
  //-->
  </script>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form_de.html b/templates/webpages/bankaccounts/bank_account_display_form_de.html
index 89faee13c..5ea200721 100644
--- a/templates/webpages/bankaccounts/bank_account_display_form_de.html
+++ b/templates/webpages/bankaccounts/bank_account_display_form_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -12,32 +13,32 @@
   <p>
    <table>
     <tr>
-     <td align="right">Kontonummer</td>
+     <td align="right">[% 'Account number' | $T8 %]</td>
      <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Bankleitzahl</td>
+     <td align="right">[% 'Bank code' | $T8 %]</td>
      <td><input name="account.bank_code" size="20" maxlength="100" value="[% HTML.escape(account.bank_code) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Bank</td>
+     <td align="right">[% 'Bank' | $T8 %]</td>
      <td><input name="account.bank" size="30" value="[% HTML.escape(account.bank) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">IBAN</td>
+     <td align="right">[% 'IBAN' | $T8 %]</td>
      <td><input name="account.iban" size="30" maxlength="100" value="[% HTML.escape(account.iban) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">BIC</td>
+     <td align="right">[% 'BIC' | $T8 %]</td>
      <td><input name="account.bic" size="30" maxlength="100" value="[% HTML.escape(account.bic) %]"></td>
     </tr>
 
     <tr>
-     <td align="right">Buchungskonto</td>
+     <td align="right">[% 'Chart' | $T8 %]</td>
      <td>
       [%- INCLUDE generic/multibox.html
             name      = 'account.chart_id',
@@ -58,10 +59,10 @@
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
 [%- IF account.id %]
-   <input type="submit" name="action_bank_account_save" value="Speichern">
-   <input type="submit" name="action_bank_account_delete" value="Löschen">
+   <input type="submit" name="action_bank_account_save" value="[% 'Save' | $T8 %]">
+   <input type="submit" name="action_bank_account_delete" value="[% 'Delete' | $T8 %]">
 [%- ELSE %]
-   <input type="submit" name="action_bank_account_save" value="Erfassen">
+   <input type="submit" name="action_bank_account_save" value="[% 'Add' | $T8 %]">
 [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form_master.html b/templates/webpages/bankaccounts/bank_account_display_form_master.html
index 05b08a6e8..5ea200721 100644
--- a/templates/webpages/bankaccounts/bank_account_display_form_master.html
+++ b/templates/webpages/bankaccounts/bank_account_display_form_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -12,32 +13,32 @@
   <p>
    <table>
     <tr>
-     <td align="right"><translate>Account number</translate></td>
+     <td align="right">[% 'Account number' | $T8 %]</td>
      <td><input name="account.account_number" size="20" maxlength="100" value="[% HTML.escape(account.account_number) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Bank code</translate></td>
+     <td align="right">[% 'Bank code' | $T8 %]</td>
      <td><input name="account.bank_code" size="20" maxlength="100" value="[% HTML.escape(account.bank_code) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Bank</translate></td>
+     <td align="right">[% 'Bank' | $T8 %]</td>
      <td><input name="account.bank" size="30" value="[% HTML.escape(account.bank) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>IBAN</translate></td>
+     <td align="right">[% 'IBAN' | $T8 %]</td>
      <td><input name="account.iban" size="30" maxlength="100" value="[% HTML.escape(account.iban) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>BIC</translate></td>
+     <td align="right">[% 'BIC' | $T8 %]</td>
      <td><input name="account.bic" size="30" maxlength="100" value="[% HTML.escape(account.bic) %]"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Chart</translate></td>
+     <td align="right">[% 'Chart' | $T8 %]</td>
      <td>
       [%- INCLUDE generic/multibox.html
             name      = 'account.chart_id',
@@ -58,10 +59,10 @@
    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
 [%- IF account.id %]
-   <input type="submit" name="action_bank_account_save" value="<translate>Save</translate>">
-   <input type="submit" name="action_bank_account_delete" value="<translate>Delete</translate>">
+   <input type="submit" name="action_bank_account_save" value="[% 'Save' | $T8 %]">
+   <input type="submit" name="action_bank_account_delete" value="[% 'Delete' | $T8 %]">
 [%- ELSE %]
-   <input type="submit" name="action_bank_account_save" value="<translate>Add</translate>">
+   <input type="submit" name="action_bank_account_save" value="[% 'Add' | $T8 %]">
 [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom_de.html b/templates/webpages/bankaccounts/bank_account_list_bottom_de.html
index 152f1b632..eeab8cc35 100644
--- a/templates/webpages/bankaccounts/bank_account_list_bottom_de.html
+++ b/templates/webpages/bankaccounts/bank_account_list_bottom_de.html
@@ -1,8 +1,9 @@
+[%- USE T8 %]
 [% USE HTML %]
  <form action="bankaccounts.pl" method="post">
   <p>
-   Neues Bankkonto<br>
-   <input type="submit" value="Erfassen">
+   [% 'New bank account' | $T8 %]<br>
+   <input type="submit" value="[% 'Add' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="bank_account_add">
diff --git a/templates/webpages/bankaccounts/bank_account_list_bottom_master.html b/templates/webpages/bankaccounts/bank_account_list_bottom_master.html
index 1e69cd4ab..eeab8cc35 100644
--- a/templates/webpages/bankaccounts/bank_account_list_bottom_master.html
+++ b/templates/webpages/bankaccounts/bank_account_list_bottom_master.html
@@ -1,8 +1,9 @@
+[%- USE T8 %]
 [% USE HTML %]
  <form action="bankaccounts.pl" method="post">
   <p>
-   <translate>New bank account</translate><br>
-   <input type="submit" value="<translate>Add</translate>">
+   [% 'New bank account' | $T8 %]<br>
+   <input type="submit" value="[% 'Add' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="bank_account_add">
diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html
index 5b98d9533..6e15e9ef1 100644
--- a/templates/webpages/common/search_history_de.html
+++ b/templates/webpages/common/search_history_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
@@ -9,7 +10,7 @@
 
   <table>
     <tr>
-      <th class ="listtop">Historien Suchmaschine</th>
+      <th class ="listtop">[% 'history search engine' | $T8 %]</th>
       </th>
     </tr>
     <tr>
@@ -41,22 +42,22 @@
 
           var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
           var translated = new Object();
-          translated['SAVED'] = 'Gespeichert';
-          translated['DELETED'] = 'Gelöscht';
-          translated['ADDED'] = 'Hinzugefügt';
-          translated['PAYMENT POSTED'] = 'Rechung gebucht';
-          translated['POSTED'] = 'Gebucht';
-          translated['POSTED AS NEW'] = 'Als neu gebucht'
-          translated['SAVED FOR DUNNING'] = 'Gespeichert';
-          translated['DUNNING STARTED'] = 'Mahnprozess gestartet';
-          translated['PRINTED'] = 'Gedruckt';
+          translated['SAVED'] = '[% 'SAVED' | $T8 %]';
+          translated['DELETED'] = '[% 'DELETED' | $T8 %]';
+          translated['ADDED'] = '[% 'ADDED' | $T8 %]';
+          translated['PAYMENT POSTED'] = '[% 'PAYMENT POSTED' | $T8 %]';
+          translated['POSTED'] = '[% 'POSTED' | $T8 %]';
+          translated['POSTED AS NEW'] = '[% 'POSTED AS NEW' | $T8 %]'
+          translated['SAVED FOR DUNNING'] = '[% 'SAVED FOR DUNNING' | $T8 %]';
+          translated['DUNNING STARTED'] = '[% 'DUNNING STARTED' | $T8 %]';
+          translated['PRINTED'] = '[% 'PRINTED' | $T8 %]';
 
           var jscalender = "<table valign=\"top\">"
-                  + "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
-                  + "<tr><td>von:&nbsp;"
+                  + "<tr><td colspan=\"2\"><b>[% 'Period' | $T8 %]:&nbsp;</b></td></tr>"
+                  + "<tr><td>[% 'from (time)' | $T8 %]:&nbsp;"
                   + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"
                   + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
-                  + "&nbsp;</td><td>bis:&nbsp;"
+                  + "&nbsp;</td><td>[% 'to (time)' | $T8 %]:&nbsp;"
                   + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"
                   + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
           var mitarbeiter = "<table valign=\"top\">"
@@ -94,7 +95,7 @@
             }
             else {
               defaults.splice(remove,1);
-              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>Sie haben bereits die folgenden Einschr&auml;nkungen vorgenommen:</b><br>") : ("<br>")) + translated[last];
+              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>[% 'You've already chosen the following limitations:' | $T8 %]</b><br>") : ("<br>")) + translated[last];
               if(defaults.length > 0) {
                 document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
                 tempString = "<select id='selectForm'><option></option>";
@@ -111,7 +112,7 @@
           }
 
           function resetAll() {
-            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">Ja";
+            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">[% 'Yes' | $T8 %]";
             document.getElementById('inputText').innerHTML = "";
           }
           //-->
@@ -119,24 +120,24 @@
         <table>
           <tr>
             <td>
-              <b>Wonach</b> wollen Sie suchen?:
+              [% '<b>What</b> do you want to look for?' | $T8 %]:
             </td>
             <td>
               <select name="what2search" id="what2search">
-                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">Artikelnummer</option>
-                <option name="Kundennummer" value="Kundennummer" id="Kundennummer">Kundennummer</option>
-                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">Lieferantennummer</option>
-                <option name="Projektnummer" value="Projektnummer" id="Projektnummer">Projektnummer</option>
-                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">Buchungsnummer</option>
-                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">Eingangsrechnungsnummer</option>
-                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">Ausgangsrechnungsnummer</option>
-                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">Mahnungsnummer</option>
+                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">[% 'Part Number' | $T8 %]</option>
+                <option name="Kundennummer" value="Kundennummer" id="Kundennummer">[% 'Customer Number' | $T8 %]</option>
+                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">[% 'Vendor Number' | $T8 %]</option>
+                <option name="Projektnummer" value="Projektnummer" id="Projektnummer">[% 'Project Number' | $T8 %]</option>
+                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">[% 'ID' | $T8 %]</option>
+                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">[% 'Incoming invoice number' | $T8 %]</option>
+                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">[% 'Sales invoice number' | $T8 %]</option>
+                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">[% 'Dunning number' | $T8 %]</option>
               </select>
             </td>
           </tr>
           <tr>
             <td>
-             Nach welchem <b>Begriff</b> wollen Sie suchen?
+             [% 'What's the <b>term</b> you're looking for?' | $T8 %]
             </td>
             <td>
               <input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
@@ -144,13 +145,13 @@
           </tr>
           <tr>
             <td valign="top">
-             Wollen Sie Ihre Suche <b>spezialisieren</b>?
+             [% 'Do you want to <b>limit</b> your search?' | $T8 %]
             </td>
             <td>
-              <table valign=\"top\" cellpadding=\"0\" marginheight=\"0\" marginwidth=\"0\" cellspacing=\"0\" topmargin=\"0\" leftmargin=\"0\">
+              <table valign="top" cellpadding="0" marginheight="0" marginwidth="0" cellspacing="0" topmargin="0" leftmargin="0">
                 <tr>
                   <td>
-                    <div id="selectTable"><a href="javascript:addForm('INIT')">Ja</a></div>
+                    <div id="selectTable"><a href="javascript:addForm('INIT')">[% 'Yes' | $T8 %]</a></div>
                     <div id="inputText"></div>
                   </td>
                 </tr>
@@ -171,8 +172,8 @@
           </tr>
           <tr>
             <td colspan="6">
-              <input type="submit" class="submit" value="abschicken">
-              <input type="reset" class="submit" value="zurücksetzen" onClick="javascript:resetAll();">
+              <input type="submit" class="submit" value="[% 'submit' | $T8 %]">
+              <input type="reset" class="submit" value="[% 'reset' | $T8 %]" onClick="javascript:resetAll();">
             </td>
             <td>
             </td>
diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
index 1f8411f72..6e15e9ef1 100644
--- a/templates/webpages/common/search_history_master.html
+++ b/templates/webpages/common/search_history_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
@@ -9,7 +10,7 @@
 
   <table>
     <tr>
-      <th class ="listtop"><translate>history search engine</translate></th>
+      <th class ="listtop">[% 'history search engine' | $T8 %]</th>
       </th>
     </tr>
     <tr>
@@ -41,22 +42,22 @@
 
           var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
           var translated = new Object();
-          translated['SAVED'] = '<translate>SAVED</translate>';
-          translated['DELETED'] = '<translate>DELETED</translate>';
-          translated['ADDED'] = '<translate>ADDED</translate>';
-          translated['PAYMENT POSTED'] = '<translate>PAYMENT POSTED</translate>';
-          translated['POSTED'] = '<translate>POSTED</translate>';
-          translated['POSTED AS NEW'] = '<translate>POSTED AS NEW</translate>'
-          translated['SAVED FOR DUNNING'] = '<translate>SAVED FOR DUNNING</translate>';
-          translated['DUNNING STARTED'] = '<translate>DUNNING STARTED</translate>';
-          translated['PRINTED'] = '<translate>PRINTED</translate>';
+          translated['SAVED'] = '[% 'SAVED' | $T8 %]';
+          translated['DELETED'] = '[% 'DELETED' | $T8 %]';
+          translated['ADDED'] = '[% 'ADDED' | $T8 %]';
+          translated['PAYMENT POSTED'] = '[% 'PAYMENT POSTED' | $T8 %]';
+          translated['POSTED'] = '[% 'POSTED' | $T8 %]';
+          translated['POSTED AS NEW'] = '[% 'POSTED AS NEW' | $T8 %]'
+          translated['SAVED FOR DUNNING'] = '[% 'SAVED FOR DUNNING' | $T8 %]';
+          translated['DUNNING STARTED'] = '[% 'DUNNING STARTED' | $T8 %]';
+          translated['PRINTED'] = '[% 'PRINTED' | $T8 %]';
 
           var jscalender = "<table valign=\"top\">"
-                  + "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
-                  + "<tr><td><translate>from (time)</translate>:&nbsp;"
+                  + "<tr><td colspan=\"2\"><b>[% 'Period' | $T8 %]:&nbsp;</b></td></tr>"
+                  + "<tr><td>[% 'from (time)' | $T8 %]:&nbsp;"
                   + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"
                   + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
-                  + "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
+                  + "&nbsp;</td><td>[% 'to (time)' | $T8 %]:&nbsp;"
                   + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"
                   + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
           var mitarbeiter = "<table valign=\"top\">"
@@ -94,7 +95,7 @@
             }
             else {
               defaults.splice(remove,1);
-              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b><translate>You've already chosen the following limitations:</translate></b><br>") : ("<br>")) + translated[last];
+              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>[% 'You've already chosen the following limitations:' | $T8 %]</b><br>") : ("<br>")) + translated[last];
               if(defaults.length > 0) {
                 document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
                 tempString = "<select id='selectForm'><option></option>";
@@ -111,7 +112,7 @@
           }
 
           function resetAll() {
-            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\"><translate>Yes</translate>";
+            document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">[% 'Yes' | $T8 %]";
             document.getElementById('inputText').innerHTML = "";
           }
           //-->
@@ -119,24 +120,24 @@
         <table>
           <tr>
             <td>
-              <translate><b>What</b> do you want to look for?</translate>:
+              [% '<b>What</b> do you want to look for?' | $T8 %]:
             </td>
             <td>
               <select name="what2search" id="what2search">
-                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer"><translate>Part Number</translate></option>
-                <option name="Kundennummer" value="Kundennummer" id="Kundennummer"><translate>Customer Number</translate></option>
-                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer"><translate>Vendor Number</translate></option>
-                <option name="Projektnummer" value="Projektnummer" id="Projektnummer"><translate>Project Number</translate></option>
-                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer"><translate>ID</translate></option>
-                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer"><translate>Incoming invoice number</translate></option>
-                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer"><translate>Sales invoice number</translate></option>
-                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer"><translate>Dunning number</translate></option>
+                <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">[% 'Part Number' | $T8 %]</option>
+                <option name="Kundennummer" value="Kundennummer" id="Kundennummer">[% 'Customer Number' | $T8 %]</option>
+                <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">[% 'Vendor Number' | $T8 %]</option>
+                <option name="Projektnummer" value="Projektnummer" id="Projektnummer">[% 'Project Number' | $T8 %]</option>
+                <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">[% 'ID' | $T8 %]</option>
+                <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">[% 'Incoming invoice number' | $T8 %]</option>
+                <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">[% 'Sales invoice number' | $T8 %]</option>
+                <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">[% 'Dunning number' | $T8 %]</option>
               </select>
             </td>
           </tr>
           <tr>
             <td>
-             <translate>What's the <b>term</b> you're looking for?</translate>
+             [% 'What's the <b>term</b> you're looking for?' | $T8 %]
             </td>
             <td>
               <input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
@@ -144,13 +145,13 @@
           </tr>
           <tr>
             <td valign="top">
-             <translate>Do you want to <b>limit</b> your search?</translate>
+             [% 'Do you want to <b>limit</b> your search?' | $T8 %]
             </td>
             <td>
-              <table valign=\"top\" cellpadding=\"0\" marginheight=\"0\" marginwidth=\"0\" cellspacing=\"0\" topmargin=\"0\" leftmargin=\"0\">
+              <table valign="top" cellpadding="0" marginheight="0" marginwidth="0" cellspacing="0" topmargin="0" leftmargin="0">
                 <tr>
                   <td>
-                    <div id="selectTable"><a href="javascript:addForm('INIT')"><translate>Yes</translate></a></div>
+                    <div id="selectTable"><a href="javascript:addForm('INIT')">[% 'Yes' | $T8 %]</a></div>
                     <div id="inputText"></div>
                   </td>
                 </tr>
@@ -171,8 +172,8 @@
           </tr>
           <tr>
             <td colspan="6">
-              <input type="submit" class="submit" value="<translate>submit</translate>">
-              <input type="reset" class="submit" value="<translate>reset</translate>" onClick="javascript:resetAll();">
+              <input type="submit" class="submit" value="[% 'submit' | $T8 %]">
+              <input type="reset" class="submit" value="[% 'reset' | $T8 %]" onClick="javascript:resetAll();">
             </td>
             <td>
             </td>
diff --git a/templates/webpages/common/show_history_de.html b/templates/webpages/common/show_history_de.html
index 1fb0f2416..1b9b7e127 100644
--- a/templates/webpages/common/show_history_de.html
+++ b/templates/webpages/common/show_history_de.html
@@ -1,17 +1,18 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% IF SUCCESS %]
 
 [% BLOCK column_header %]
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
              [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
-               <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
+               <tr><td><a title="[% 'order' | $T8 %]" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
              [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--0" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
+               <tr><td><a href="[% callback %]&order=[% column %]--0" title="[% 'order' | $T8 %]" style="border: solid 1px #aaaade;">&and;</a></td></tr>
              [% END %]
              [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
-               <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
+               <tr><td><a title="[% 'order' | $T8 %]" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
              [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--1" title="Reihenfolge" style="border: solid 1px #aaaade;">&or;</a></td></tr>
+               <tr><td><a href="[% callback %]&order=[% column %]--1" title="[% 'order' | $T8 %]" style="border: solid 1px #aaaade;">&or;</a></td></tr>
              [% END %]
             </table>
 [% END %]
@@ -22,7 +23,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-           &nbsp;Zeitpunkt&nbsp;
+           &nbsp;[% 'Zeitpunkt' | $T8 %]&nbsp;
           </td>
           <td valign="top">
            [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
@@ -34,7 +35,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-            &nbsp;Mitarbeiter&nbsp;
+            &nbsp;[% 'Mitarbeiter' | $T8 %]&nbsp;
           </td>
           <td valign="top">
            [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
@@ -46,7 +47,7 @@
       <table>
         <tr>
           <td>
-            &nbsp;Aktion&nbsp;
+            &nbsp;[% 'Aktion' | $T8 %]&nbsp;
           </td>
         </tr>
       </table>
@@ -55,7 +56,7 @@
       <table>
         <tr>
           <td>
-            &nbsp;Zusatz&nbsp;
+            &nbsp;[% 'Zusatz' | $T8 %]&nbsp;
           </td>
         </tr>
       </table>
@@ -64,7 +65,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-           &nbsp;ID-Nummer (intern)&nbsp;
+           &nbsp;[% 'ID-Nummer' | $T8 %]&nbsp;
           </td>
           <td valign="top">
             [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
@@ -76,7 +77,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-           &nbsp;Buchungsnummer&nbsp;
+           &nbsp;[% 'Belegnummer' | $T8 %]&nbsp;
           </td>
           <td valign="top">
             [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
@@ -111,12 +112,12 @@
 </tbody>
 </table>
 [% ELSE %]
-<b>Keine Suchergebnisse gefunden!</b><br>
+<b>[% 'Keine Suchergebnisse gefunden!' | $T8 %]</b><br>
 [% END %]
 <p>
 [% IF NONEWWINDOW %]
-<input type="button" onclick="javascript:history.back(-1);" value="zurück">
+<input type="button" onclick="javascript:history.back(-1);" value="[% 'back' | $T8 %]">
 [% ELSE %]
-<input type="button" onclick="javascript:window.close();" value="schließen">
+<input type="button" onclick="javascript:window.close();" value="[% 'close' | $T8 %]">
 [% END %]
 </p>
diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index 584749661..1b9b7e127 100644
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -1,17 +1,18 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% IF SUCCESS %]
 
 [% BLOCK column_header %]
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
              [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
-               <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
+               <tr><td><a title="[% 'order' | $T8 %]" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
              [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--0" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
+               <tr><td><a href="[% callback %]&order=[% column %]--0" title="[% 'order' | $T8 %]" style="border: solid 1px #aaaade;">&and;</a></td></tr>
              [% END %]
              [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
-               <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
+               <tr><td><a title="[% 'order' | $T8 %]" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
              [% ELSE %]
-               <tr><td><a href="[% callback %]&order=[% column %]--1" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
+               <tr><td><a href="[% callback %]&order=[% column %]--1" title="[% 'order' | $T8 %]" style="border: solid 1px #aaaade;">&or;</a></td></tr>
              [% END %]
             </table>
 [% END %]
@@ -22,7 +23,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-           &nbsp;<translate>Zeitpunkt</translate>&nbsp;
+           &nbsp;[% 'Zeitpunkt' | $T8 %]&nbsp;
           </td>
           <td valign="top">
            [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
@@ -34,7 +35,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-            &nbsp;<translate>Mitarbeiter</translate>&nbsp;
+            &nbsp;[% 'Mitarbeiter' | $T8 %]&nbsp;
           </td>
           <td valign="top">
            [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
@@ -46,7 +47,7 @@
       <table>
         <tr>
           <td>
-            &nbsp;<translate>Aktion</translate>&nbsp;
+            &nbsp;[% 'Aktion' | $T8 %]&nbsp;
           </td>
         </tr>
       </table>
@@ -55,7 +56,7 @@
       <table>
         <tr>
           <td>
-            &nbsp;<translate>Zusatz</translate>&nbsp;
+            &nbsp;[% 'Zusatz' | $T8 %]&nbsp;
           </td>
         </tr>
       </table>
@@ -64,7 +65,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-           &nbsp;<translate>ID-Nummer</translate>&nbsp;
+           &nbsp;[% 'ID-Nummer' | $T8 %]&nbsp;
           </td>
           <td valign="top">
             [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
@@ -76,7 +77,7 @@
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-           &nbsp;<translate>Belegnummer</translate>&nbsp;
+           &nbsp;[% 'Belegnummer' | $T8 %]&nbsp;
           </td>
           <td valign="top">
             [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
@@ -111,12 +112,12 @@
 </tbody>
 </table>
 [% ELSE %]
-<b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
+<b>[% 'Keine Suchergebnisse gefunden!' | $T8 %]</b><br>
 [% END %]
 <p>
 [% IF NONEWWINDOW %]
-<input type="button" onclick="javascript:history.back(-1);" value="<translate>back</translate>">
+<input type="button" onclick="javascript:history.back(-1);" value="[% 'back' | $T8 %]">
 [% ELSE %]
-<input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
+<input type="button" onclick="javascript:window.close();" value="[% 'close' | $T8 %]">
 [% END %]
 </p>
diff --git a/templates/webpages/common/show_vc_details_de.html b/templates/webpages/common/show_vc_details_de.html
index df0dd9844..49363ea01 100644
--- a/templates/webpages/common/show_vc_details_de.html
+++ b/templates/webpages/common/show_vc_details_de.html
@@ -1,19 +1,20 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 [% BLOCK jump_block %]
  <p>
-  Springe zu <a href="#billing">Rechnungsadresse</a>
+  [% 'Jump to' | $T8 %] <a href="#billing">[% 'Billing Address' | $T8 %]</a>
   [%- FOREACH shipto = SHIPTO %]
    ,
    <a href="#shipping[% loop.count %]">
-    Lieferadresse
+    [% 'Shipping Address' | $T8 %]
     &quot;[% HTML.escape(shipto.shiptoname) %]&quot;
    </a>
   [%- END %]
   [%- FOREACH contact = CONTACTS %]
    ,
    <a href="#contact[% loop.count %]">
-    Ansprechpartner
+    [% 'Contact Person' | $T8 %]
     &quot;[% HTML.escape(contact.cp_name) %]&quot;
    </a>
   [%- END %]
@@ -25,133 +26,133 @@
 <body>
 
  <div width="100%" class="listtop">
-  [% IF is_customer %]Kundendetails[% ELSE %]Lieferantendetails[% END %] &quot;[% HTML.escape(name) %]&quot;
+  [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] &quot;[% HTML.escape(name) %]&quot;
  </div>
 
  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
- <a name="billing"><div class="listheading">Rechnungsadresse</div></a>
+ <a name="billing"><div class="listheading">[% 'Billing Address' | $T8 %]</div></a>
 
  <table>
   <tr>
   [% IF is_customer %]
-   <td align="right">Kundennummer</td>
+   <td align="right">[% 'Customer Number' | $T8 %]</td>
    <td>[% HTML.escape(customernumber) %]</td>
   [% ELSE %]
-   <td align="right">Lieferantennummer</td>
+   <td align="right">[% 'Vendor Number' | $T8 %]</td>
    <td>[% HTML.escape(vendornumber) %]</td>
   [% END %]
   </tr>
 
   <tr>
-   <td align="right">Firmenname</td>
+   <td align="right">[% 'Company Name' | $T8 %]</td>
    <td>[% HTML.escape(name) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Abteilung</td>
+   <td align="right">[% 'Department' | $T8 %]</td>
    <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
   </tr>
 
   <tr>
-   <td align="right">Straße</td>
+   <td align="right">[% 'Street' | $T8 %]</td>
    <td>[% HTML.escape(street) %]</td>
   </tr>
 
   <tr>
-   <td align="right">PLZ, Ort</td>
+   <td align="right">[% 'Zip, City' | $T8 %]</td>
    <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Land</td>
+   <td align="right">[% 'Country' | $T8 %]</td>
    <td>[% HTML.escape(country) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Ansprechpartner</td>
+   <td align="right">[% 'Contact Person' | $T8 %]</td>
    <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Telefon</td>
+   <td align="right">[% 'Phone' | $T8 %]</td>
    <td>[% HTML.escape(phone) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Fax</td>
+   <td align="right">[% 'Fax' | $T8 %]</td>
    <td>[% HTML.escape(fax) %]</td>
   </tr>
 
   <tr>
-   <td align="right">eMail</td>
+   <td align="right">[% 'E-mail' | $T8 %]</td>
    <td>[% HTML.escape(email) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Homepage</td>
+   <td align="right">[% 'Homepage' | $T8 %]</td>
    <td>[% HTML.escape(homepage) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Kreditlimit</td>
+   <td align="right">[% 'Credit Limit' | $T8 %]</td>
    <td>[% HTML.escape(creditlimit) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Rabatt</td>
+   <td align="right">[% 'Discount' | $T8 %]</td>
    <td>[% HTML.escape(discount) %]%</td>
   </tr>
 
   <tr>
-   <td align="right">Zahlungskonditionen</td>
+   <td align="right">[% 'Payment Terms' | $T8 %]</td>
    <td>[% HTML.escape(payment_terms) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Steuernummer</td>
+   <td align="right">[% 'Tax Number' | $T8 %]</td>
    <td>[% HTML.escape(taxnumber) %]</td>
   </tr>
 
   <tr>
-   <td align="right">USt-IdNr.</td>
+   <td align="right">[% 'USt-IdNr.' | $T8 %]</td>
    <td>[% HTML.escape(ustid) %]</td>
   </tr>
 
   [% IF is_customer %]
    <tr>
-    <td align="right">KNr. beim Kunden</td>
+    <td align="right">[% 'KNr. beim Kunden' | $T8 %]</td>
     <td>[% HTML.escape(c_vendor_id) %]</td>
    </tr>
   [% END %]
 
   <tr>
-   <td align="right">Kontonummer</td>
+   <td align="right">[% 'Account Number' | $T8 %]</td>
    <td>[% HTML.escape(account_number) %]</td>
   </tr>
 
   <tr>
-   <td align="right">BLZ</td>
+   <td align="right">[% 'Bank Code' | $T8 %]</td>
    <td>[% HTML.escape(bank_code) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Bank</td>
+   <td align="right">[% 'Bank' | $T8 %]</td>
    <td>[% HTML.escape(bank) %]</td>
   </tr>
 
   <tr>
-   <td align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</td>
+   <td align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</td>
    <td>[% HTML.escape(business) %]</td>
   </tr>
 
   <tr>
-   <td align="right">Sprache</td>
+   <td align="right">[% 'Language' | $T8 %]</td>
    <td>[% HTML.escape(language) %]</td>
   </tr>
 
   <tr>
-   <td align="right" valign="top">Bemerkungen</td>
+   <td align="right" valign="top">[% 'Notes' | $T8 %]</td>
    <td valign="top">[% HTML.escape(notes) %]</td>
   </tr>
 
@@ -166,51 +167,51 @@
 
   [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
-  <a name="shipping[% loop.count %]"><div class="listheading">Lieferadresse &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
+  <a name="shipping[% loop.count %]"><div class="listheading">[% 'Shipping Address' | $T8 %] &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
 
   <table>
    <tr>
-    <td align="right">Firmenname</td>
+    <td align="right">[% 'Company Name' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptoname) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Abteilung</td>
+    <td align="right">[% 'Department' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
    </tr>
 
    <tr>
-    <td align="right">Straße</td>
+    <td align="right">[% 'Street' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptostreet) %]</td>
    </tr>
 
    <tr>
-    <td align="right">PLZ, Ort</td>
+    <td align="right">[% 'Zip, City' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Land</td>
+    <td align="right">[% 'Country' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptocountry) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Ansprechpartner</td>
+    <td align="right">[% 'Contact Person' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptocontact) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Telefon</td>
+    <td align="right">[% 'Phone' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptophone) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Fax</td>
+    <td align="right">[% 'Fax' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptofax) %]</td>
    </tr>
 
    <tr>
-    <td align="right">eMail</td>
+    <td align="right">[% 'E-mail' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptoemail) %]</td>
    </tr>
 
@@ -232,91 +233,91 @@
 
   [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
-  <a name="contact[% loop.count %]"><div class="listheading">Ansprechpartner &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
+  <a name="contact[% loop.count %]"><div class="listheading">[% 'Contact Person' | $T8 %] &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
 
   <table>
    <tr>
-    <td align="right">Anrede</td>
+    <td align="right">[% 'Greeting' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_greeting) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Titel</td>
+    <td align="right">[% 'Title' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_title) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Vorname</td>
+    <td align="right">[% 'Given Name' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_givenname) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Name</td>
+    <td align="right">[% 'Name' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_name) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Abteilung</td>
+    <td align="right">[% 'Department' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_abteilung) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Telefon 1 </td>
+    <td align="right">[% 'Phone1' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_phone1) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Telefon 2</td>
+    <td align="right">[% 'Phone2' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_phone2) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Fax</td>
+    <td align="right">[% 'Fax' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_fax) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Mobile 1</td>
+    <td align="right">[% 'Mobile1' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_mobile1) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Mobile 2</td>
+    <td align="right">[% 'Mobile2' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_mobile2) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Sat. Tel.</td>
+    <td align="right">[% 'Sat. Phone' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_satphone) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Sat. Fax</td>
+    <td align="right">[% 'Sat. Fax' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_satfax) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Projekt</td>
+    <td align="right">[% 'Project' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_project) %]</td>
    </tr>
 
    <tr>
-    <td align="right">eMail</td>
+    <td align="right">[% 'E-mail' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_email) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Privates Tel.</td>
+    <td align="right">[% 'Private Phone' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_privatphone) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Private eMail</td>
+    <td align="right">[% 'Private E-mail' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_privatemail) %]</td>
    </tr>
 
    <tr>
-    <td align="right">Geburtstag</td>
+    <td align="right">[% 'Birthday' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_birthday) %]</td>
    </tr>
 
diff --git a/templates/webpages/common/show_vc_details_master.html b/templates/webpages/common/show_vc_details_master.html
index 54b00b485..49363ea01 100644
--- a/templates/webpages/common/show_vc_details_master.html
+++ b/templates/webpages/common/show_vc_details_master.html
@@ -1,19 +1,20 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 [% BLOCK jump_block %]
  <p>
-  <translate>Jump to</translate> <a href="#billing"><translate>Billing Address</translate></a>
+  [% 'Jump to' | $T8 %] <a href="#billing">[% 'Billing Address' | $T8 %]</a>
   [%- FOREACH shipto = SHIPTO %]
    ,
    <a href="#shipping[% loop.count %]">
-    <translate>Shipping Address</translate>
+    [% 'Shipping Address' | $T8 %]
     &quot;[% HTML.escape(shipto.shiptoname) %]&quot;
    </a>
   [%- END %]
   [%- FOREACH contact = CONTACTS %]
    ,
    <a href="#contact[% loop.count %]">
-    <translate>Contact Person</translate>
+    [% 'Contact Person' | $T8 %]
     &quot;[% HTML.escape(contact.cp_name) %]&quot;
    </a>
   [%- END %]
@@ -25,133 +26,133 @@
 <body>
 
  <div width="100%" class="listtop">
-  [% IF is_customer %]<translate>Customer details</translate>[% ELSE %]<translate>Vendor details</translate>[% END %] &quot;[% HTML.escape(name) %]&quot;
+  [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] &quot;[% HTML.escape(name) %]&quot;
  </div>
 
  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
- <a name="billing"><div class="listheading"><translate>Billing Address</translate></div></a>
+ <a name="billing"><div class="listheading">[% 'Billing Address' | $T8 %]</div></a>
 
  <table>
   <tr>
   [% IF is_customer %]
-   <td align="right"><translate>Customer Number</translate></td>
+   <td align="right">[% 'Customer Number' | $T8 %]</td>
    <td>[% HTML.escape(customernumber) %]</td>
   [% ELSE %]
-   <td align="right"><translate>Vendor Number</translate></td>
+   <td align="right">[% 'Vendor Number' | $T8 %]</td>
    <td>[% HTML.escape(vendornumber) %]</td>
   [% END %]
   </tr>
 
   <tr>
-   <td align="right"><translate>Company Name</translate></td>
+   <td align="right">[% 'Company Name' | $T8 %]</td>
    <td>[% HTML.escape(name) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Department</translate></td>
+   <td align="right">[% 'Department' | $T8 %]</td>
    <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Street</translate></td>
+   <td align="right">[% 'Street' | $T8 %]</td>
    <td>[% HTML.escape(street) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Zip, City</translate></td>
+   <td align="right">[% 'Zip, City' | $T8 %]</td>
    <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Country</translate></td>
+   <td align="right">[% 'Country' | $T8 %]</td>
    <td>[% HTML.escape(country) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Contact Person</translate></td>
+   <td align="right">[% 'Contact Person' | $T8 %]</td>
    <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Phone</translate></td>
+   <td align="right">[% 'Phone' | $T8 %]</td>
    <td>[% HTML.escape(phone) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Fax</translate></td>
+   <td align="right">[% 'Fax' | $T8 %]</td>
    <td>[% HTML.escape(fax) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>E-mail</translate></td>
+   <td align="right">[% 'E-mail' | $T8 %]</td>
    <td>[% HTML.escape(email) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Homepage</translate></td>
+   <td align="right">[% 'Homepage' | $T8 %]</td>
    <td>[% HTML.escape(homepage) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Credit Limit</translate></td>
+   <td align="right">[% 'Credit Limit' | $T8 %]</td>
    <td>[% HTML.escape(creditlimit) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Discount</translate></td>
+   <td align="right">[% 'Discount' | $T8 %]</td>
    <td>[% HTML.escape(discount) %]%</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Payment Terms</translate></td>
+   <td align="right">[% 'Payment Terms' | $T8 %]</td>
    <td>[% HTML.escape(payment_terms) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Tax Number</translate></td>
+   <td align="right">[% 'Tax Number' | $T8 %]</td>
    <td>[% HTML.escape(taxnumber) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>USt-IdNr.</translate></td>
+   <td align="right">[% 'USt-IdNr.' | $T8 %]</td>
    <td>[% HTML.escape(ustid) %]</td>
   </tr>
 
   [% IF is_customer %]
    <tr>
-    <td align="right"><translate>KNr. beim Kunden</translate></td>
+    <td align="right">[% 'KNr. beim Kunden' | $T8 %]</td>
     <td>[% HTML.escape(c_vendor_id) %]</td>
    </tr>
   [% END %]
 
   <tr>
-   <td align="right"><translate>Account Number</translate></td>
+   <td align="right">[% 'Account Number' | $T8 %]</td>
    <td>[% HTML.escape(account_number) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Bank Code</translate></td>
+   <td align="right">[% 'Bank Code' | $T8 %]</td>
    <td>[% HTML.escape(bank_code) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Bank</translate></td>
+   <td align="right">[% 'Bank' | $T8 %]</td>
    <td>[% HTML.escape(bank) %]</td>
   </tr>
 
   <tr>
-   <td align="right">[% IF is_customer %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</td>
+   <td align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</td>
    <td>[% HTML.escape(business) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><translate>Language</translate></td>
+   <td align="right">[% 'Language' | $T8 %]</td>
    <td>[% HTML.escape(language) %]</td>
   </tr>
 
   <tr>
-   <td align="right" valign="top"><translate>Notes</translate></td>
+   <td align="right" valign="top">[% 'Notes' | $T8 %]</td>
    <td valign="top">[% HTML.escape(notes) %]</td>
   </tr>
 
@@ -166,51 +167,51 @@
 
   [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
-  <a name="shipping[% loop.count %]"><div class="listheading"><translate>Shipping Address</translate> &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
+  <a name="shipping[% loop.count %]"><div class="listheading">[% 'Shipping Address' | $T8 %] &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
 
   <table>
    <tr>
-    <td align="right"><translate>Company Name</translate></td>
+    <td align="right">[% 'Company Name' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptoname) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Department</translate></td>
+    <td align="right">[% 'Department' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Street</translate></td>
+    <td align="right">[% 'Street' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptostreet) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Zip, City</translate></td>
+    <td align="right">[% 'Zip, City' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Country</translate></td>
+    <td align="right">[% 'Country' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptocountry) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Contact Person</translate></td>
+    <td align="right">[% 'Contact Person' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptocontact) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Phone</translate></td>
+    <td align="right">[% 'Phone' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptophone) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Fax</translate></td>
+    <td align="right">[% 'Fax' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptofax) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>E-mail</translate></td>
+    <td align="right">[% 'E-mail' | $T8 %]</td>
     <td>[% HTML.escape(row.shiptoemail) %]</td>
    </tr>
 
@@ -232,91 +233,91 @@
 
   [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
-  <a name="contact[% loop.count %]"><div class="listheading"><translate>Contact Person</translate> &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
+  <a name="contact[% loop.count %]"><div class="listheading">[% 'Contact Person' | $T8 %] &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
 
   <table>
    <tr>
-    <td align="right"><translate>Greeting</translate></td>
+    <td align="right">[% 'Greeting' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_greeting) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Title</translate></td>
+    <td align="right">[% 'Title' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_title) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Given Name</translate></td>
+    <td align="right">[% 'Given Name' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_givenname) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Name</translate></td>
+    <td align="right">[% 'Name' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_name) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Department</translate></td>
+    <td align="right">[% 'Department' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_abteilung) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Phone1</translate></td>
+    <td align="right">[% 'Phone1' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_phone1) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Phone2</translate></td>
+    <td align="right">[% 'Phone2' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_phone2) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Fax</translate></td>
+    <td align="right">[% 'Fax' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_fax) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Mobile1</translate></td>
+    <td align="right">[% 'Mobile1' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_mobile1) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Mobile2</translate></td>
+    <td align="right">[% 'Mobile2' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_mobile2) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Sat. Phone</translate></td>
+    <td align="right">[% 'Sat. Phone' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_satphone) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Sat. Fax</translate></td>
+    <td align="right">[% 'Sat. Fax' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_satfax) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Project</translate></td>
+    <td align="right">[% 'Project' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_project) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>E-mail</translate></td>
+    <td align="right">[% 'E-mail' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_email) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Private Phone</translate></td>
+    <td align="right">[% 'Private Phone' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_privatphone) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Private E-mail</translate></td>
+    <td align="right">[% 'Private E-mail' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_privatemail) %]</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Birthday</translate></td>
+    <td align="right">[% 'Birthday' | $T8 %]</td>
     <td>[% HTML.escape(row.cp_birthday) %]</td>
    </tr>
 
diff --git a/templates/webpages/ct/form_footer_de.html b/templates/webpages/ct/form_footer_de.html
index 2f7546b29..0fc528913 100644
--- a/templates/webpages/ct/form_footer_de.html
+++ b/templates/webpages/ct/form_footer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 <input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
@@ -8,25 +9,25 @@
 <input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
 
 <br>
-  <input class="submit" type="submit" name="action" accesskey="s" value="Speichern">
-  <input class="submit" type="submit" name="action" accesskey="s" value="Speichern und schließen">
+  <input class="submit" type="submit" name="action" accesskey="s" value="[% 'Save' | $T8 %]">
+  <input class="submit" type="submit" name="action" accesskey="s" value="[% 'Save and Close' | $T8 %]">
   [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="Speichern und Debitorenbuchung erfassen">
+  <input class="submit" type="submit" name="action" value="[% 'Save and AR Transaction' | $T8 %]">
   [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="Speichern und Kreditorenbuchung erfassen">
+  <input class="submit" type="submit" name="action" value="[% 'Save and AP Transaction' | $T8 %]">
   [%- END %]
-  <input class="submit" type="submit" name="action" value="Speichern und Rechnung erfassen">
-  <input class="submit" type="submit" name="action" value="Speichern und Auftrag erfassen">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Invoice' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Order' | $T8 %]">
   [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="Speichern und Angebot">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Quotation' | $T8 %]">
   [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="Speichern und Lieferantenanfrage">
+  <input class="submit" type="submit" name="action" value="[% 'Save and RFQ' | $T8 %]">
   [%- END %]
 [%- IF id AND is_orphaned %]
-  <input class="submit" type="submit" name="action" value="Löschen">
+  <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
 [%- END %]
 [%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="Historie">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="[% 'history' | $T8 %]">
 [%- END %]
 
   </form>
diff --git a/templates/webpages/ct/form_footer_master.html b/templates/webpages/ct/form_footer_master.html
index cf536179c..0fc528913 100644
--- a/templates/webpages/ct/form_footer_master.html
+++ b/templates/webpages/ct/form_footer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 <input name="id" type="hidden" id="cvid" value="[% HTML.escape(id) %]">
@@ -8,25 +9,25 @@
 <input type="hidden" name="db" id="db" value="[% HTML.escape(db) %]">
 
 <br>
-  <input class="submit" type="submit" name="action" accesskey="s" value="<translate>Save</translate>">
-  <input class="submit" type="submit" name="action" accesskey="s" value="<translate>Save and Close</translate>">
+  <input class="submit" type="submit" name="action" accesskey="s" value="[% 'Save' | $T8 %]">
+  <input class="submit" type="submit" name="action" accesskey="s" value="[% 'Save and Close' | $T8 %]">
   [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and AR Transaction</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save and AR Transaction' | $T8 %]">
   [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and AP Transaction</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save and AP Transaction' | $T8 %]">
   [%- END %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and Invoice</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Save and Order</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Invoice' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Order' | $T8 %]">
   [%- IF is_customer %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and Quotation</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save and Quotation' | $T8 %]">
   [%- ELSE %]
-  <input class="submit" type="submit" name="action" value="<translate>Save and RFQ</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save and RFQ' | $T8 %]">
   [%- END %]
 [%- IF id AND is_orphaned %]
-  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
 [%- END %]
 [%- IF id %]
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="<translate>history</translate>">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %]);" name="history" id="history" value="[% 'history' | $T8 %]">
 [%- END %]
 
   </form>
diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
index 8d885dc53..71a2a165b 100644
--- a/templates/webpages/ct/form_header_de.html
+++ b/templates/webpages/ct/form_header_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body onLoad="fokus()">
 
@@ -6,13 +7,13 @@
  <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="billing">Rechnungsadresse</a></li>
-   <li><a href="#" rel="shipto">Lieferadresse</a></li>
+   <li class="selected"><a href="#" rel="billing">[% 'Billing Address' | $T8 %]</a></li>
+   <li><a href="#" rel="shipto">[% 'Shipping Address' | $T8 %]</a></li>
    <li><a href="#" rel="contacts">Ansprechpartner</a></li>
-   <li><a href="#" rel="deliveries">Lieferungen</a></li>
-   <li><a href="#" rel="vcnotes">Bemerkungen</a></li>
+   <li><a href="#" rel="deliveries">[% 'Lieferungen' | $T8 %]</a></li>
+   <li><a href="#" rel="vcnotes">[% 'Notes' | $T8 %]</a></li>
    [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
    [%- END %]
   </ul>
 
@@ -24,7 +25,7 @@
      <tr height="5"></tr>
      [% IF conf_vertreter %]
       <tr>
-       <th align="right">[% IF is_customer %]Kundentyp[%- ELSE %]Lieferantentyp[%- END %]</th>
+       <th align="right">[% IF is_customer %][% 'Type of Customer' | $T8 %][%- ELSE %][% 'Type of Vendor' | $T8 %][%- END %]</th>
        <td>
         [%- INCLUDE generic/multibox.html
               name       = 'business',
@@ -36,7 +37,7 @@
        </td>
       </tr>
       <tr>
-       <th align="right">Vertreter</th>
+       <th align="right">[% 'Representative' | $T8 %]</th>
        <td>
         [%- INCLUDE generic/multibox.html
               name      = 'salesman_id',
@@ -49,16 +50,16 @@
      [%- END %]
      <tr>
       [%- IF is_customer %]
-      <th align="right" nowrap>Kundennummer</th>
+      <th align="right" nowrap>[% 'Customer Number' | $T8 %]</th>
       <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
       [%- ELSE %]
-      <th align="right" nowrap>Lieferantennummer</th>
+      <th align="right" nowrap>[% 'Vendor Number' | $T8 %]</th>
       <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
       [%- END %]
      </tr>
 
      <tr>
-      <th align="right" nowrap>Anrede</th>
+      <th align="right" nowrap>[% 'Greeting' | $T8 %]</th>
       <td>
        <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
@@ -72,12 +73,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>[% IF is_customer %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
+      <th align="right" nowrap>[% IF is_customer %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Abteilung</th>
+      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
       <td>
        <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
        <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
@@ -85,12 +86,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Straße</th>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
       <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>PLZ/Stadt</th>
+      <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
       <td>
        <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
        <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
@@ -98,42 +99,42 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Land</th>
+      <th align="right" nowrap>[% 'Country' | $T8 %]</th>
       <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Kontakt</th>
+      <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
       <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Telefon</th>
+      <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
       <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Fax</th>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
       <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>eMail</th>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
       <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Homepage</th>
+      <th align="right" nowrap>[% 'Homepage' | $T8 %]</th>
       <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
      </tr>
     </table>
 
     <table>
      <tr>
-      <th align="right">Kreditlimit</th>
+      <th align="right">[% 'Credit Limit' | $T8 %]</th>
       <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
       <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-      <th align="right">Zahlungskonditionen</th>
+      <th align="right">[% 'Payment Terms' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'payment_id',
@@ -144,53 +145,53 @@
        -%]
       </td>
 
-      <th align="right">Rabatt</th>
+      <th align="right">[% 'Discount' | $T8 %]</th>
       <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
      </tr>
 
      <tr>
-      <th align="right">Steuernummer</th>
+      <th align="right">[% 'Tax Number / SSN' | $T8 %]</th>
       <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
       <!-- Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein -->
-      <th align="right">USt-IdNr.</th>
+      <th align="right">[% 'sales tax identification number' | $T8 %]</th>
       <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
       [%- IF is_customer %]
-      <th align="right">unsere Lieferanten-Nr. beim Kunden</th>
+      <th align="right">[% 'our vendor number at customer' | $T8 %]</th>
       <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
       [%- ELSE %]
-      <th align="right">Kundennummer</th>
+      <th align="right">[% 'Customer Number' | $T8 %]</th>
       <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
       [%- END %]
      </tr>
 
      <tr>
-      <th align="right">Kontonummer</th>
+      <th align="right">[% 'Account Number' | $T8 %]</th>
       <td><input name="account_number" size="10" maxlength="100" value="[% HTML.escape(account_number) %]"></td>
-      <th align="right">Bankleitzahl</th>
+      <th align="right">[% 'Bank Code Number' | $T8 %]</th>
       <td><input name="bank_code" size="10" maxlength="100" value="[% HTML.escape(bank_code) %]"></td>
-      <th align="right">Bank</th>
+      <th align="right">[% 'Bank' | $T8 %]</th>
       <td><input name="bank" size="20" value="[% HTML.escape(bank) %]"></td>
      </tr>
 
      <tr>
-      <th align="right">IBAN</th>
+      <th align="right">[% 'IBAN' | $T8 %]</th>
       <td><input name="iban" size="10" maxlength="100" value="[% HTML.escape(iban) %]"></td>
-      <th align="right">BIC</th>
+      <th align="right">[% 'BIC' | $T8 %]</th>
       <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
      </tr>
 
      [%- IF conf_vertreter %]
       <tr>
-       <th align="right">Benutzername</th>
+       <th align="right">[% 'Username' | $T8 %]</th>
        <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
-       <th align="right">Passwort</th>
+       <th align="right">[% 'Password' | $T8 %]</th>
        <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
       </tr>
      [%- END %]
 
      <tr>
       [% UNLESS conf_vertreter %]
-       <th align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[%- END %]</th>
+       <th align="right">[% IF is_customer %][% 'Type of Customer' | $T8 %][% ELSE %][% 'Type of Vendor' | $T8 %][%- END %]</th>
        <td>
         [%- INCLUDE generic/multibox.html
               name       = 'business',
@@ -201,7 +202,7 @@
         -%]
        </td>
       [%- END %]
-      <th align="right">Sprache</th>
+      <th align="right">[% 'Language' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'language_id',
@@ -213,7 +214,7 @@
       </td>
 
       [%- IF is_customer %]
-      <th align="right">Preisgruppe</th>
+      <th align="right">[% 'Preisklasse' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'klass',
@@ -227,14 +228,14 @@
      </tr>
 
      <tr>
-      <td align="right">Ungültig</td>
+      <td align="right">[% 'Obsolete' | $T8 %]</td>
       <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-      <td align="right">Lastschrift</td>
+      <td align="right">[% 'direct debit' | $T8 %]</td>
       <td><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
      </tr>
 
      <tr>
-      <th align="right">Steuersatz</th>
+      <th align="right">[% 'Steuersatz' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'taxzone_id',
@@ -245,7 +246,7 @@
        -%]
       </td>
       [%- IF is_customer && !conf_vertreter %]
-      <th align="right">Verkäufer/in</th>
+      <th align="right">[% 'Salesman' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'salesman_id',
@@ -261,7 +262,7 @@
 
     <table>
      <tr>
-      <th align="left" nowrap>Bemerkungen</th>
+      <th align="left" nowrap>[% 'Notes' | $T8 %]</th>
      </tr>
 
      <tr>
@@ -276,7 +277,7 @@
 
     <table width="100%">
      <tr>
-      <th align="right">Lieferadresse</th>
+      <th align="right">[% 'Shipping Address' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'shipto_id',
@@ -291,12 +292,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Firmenname</th>
+      <th align="right" nowrap>[% 'Company Name' | $T8 %]</th>
       <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Abteilung</th>
+      <th align="right" nowrap>[% 'Abteilung' | $T8 %]</th>
       <td>
        <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
        <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
@@ -304,12 +305,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Straße</th>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
       <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>PLZ/Stadt</th>
+      <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
       <td>
        <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
        <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
@@ -317,27 +318,27 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Land</th>
+      <th align="right" nowrap>[% 'Country' | $T8 %]</th>
       <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Kontakt</th>
+      <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
       <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Telefon</th>
+      <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
       <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>Fax</th>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
       <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap>eMail</th>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
       <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
      </tr>
 
@@ -349,7 +350,7 @@
      </tr>
     </table>
 
-    <input type="submit" id="delete_shipto" name="action" value="Lieferadresse löschen" disabled>
+    <input type="submit" id="delete_shipto" name="action" value="[% 'Delete Shipto' | $T8 %]" disabled>
     <br style="clear: left" />
    </div>
 
@@ -357,7 +358,7 @@
     <table>
      <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
      <tr>
-      <th align="right">Ansprechpartner</th>
+      <th align="right">[% 'Ansprechpartner' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'cp_id',
@@ -371,18 +372,18 @@
      </tr>
 
     <tr>
-     <th align="left" nowrap>Geschlecht</th>
+     <th align="left" nowrap>[% 'Gender' | $T8 %]</th>
      <td>
       <select id="cp_gender" name="cp_gender">
-       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]>männlich</option>
-       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]>weiblich</option>
+       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]>[% 'male' | $T8 %]</option>
+       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]>[% 'female' | $T8 %]</option>
       </select>
      </td>
     </tr>
     <tr>
 
      <tr>
-      <th align="left" nowrap>Titel</th>
+      <th align="left" nowrap>[% 'Title' | $T8 %]</th>
       <td>
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
@@ -397,7 +398,7 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap>Abteilung</th>
+      <th align="left" nowrap>[% 'Department' | $T8 %]</th>
       <td>
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
@@ -412,72 +413,72 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap>Vorname</th>
+      <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
       <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Name</th>
+      <th align="left" nowrap>[% 'Name' | $T8 %]</th>
       <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Telefon 1 </th>
+      <th align="left" nowrap>[% 'Phone1' | $T8 %]</th>
       <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Telefon 2</th>
+      <th align="left" nowrap>[% 'Phone2' | $T8 %]</th>
       <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Fax</th>
+      <th align="left" nowrap>[% 'Fax' | $T8 %]</th>
       <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Mobile 1</th>
+      <th align="left" nowrap>[% 'Mobile1' | $T8 %]</th>
       <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Mobile 2</th>
+      <th align="left" nowrap>[% 'Mobile2' | $T8 %]</th>
       <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Sat. Tel.</th>
+      <th align="left" nowrap>[% 'Sat. Phone' | $T8 %]</th>
       <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Sat. Fax</th>
+      <th align="left" nowrap>[% 'Sat. Fax' | $T8 %]</th>
       <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Projekt</th>
+      <th align="left" nowrap>[% 'Project' | $T8 %]</th>
       <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>eMail</th>
+      <th align="left" nowrap>[% 'E-mail' | $T8 %]</th>
       <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Privates Tel.</th>
+      <th align="left" nowrap>[% 'Private Phone' | $T8 %]</th>
       <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Private eMail</th>
+      <th align="left" nowrap>[% 'Private E-mail' | $T8 %]</th>
       <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>Geburtstag</th>
+      <th align="left" nowrap>[% 'Birthday' | $T8 %]</th>
       <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
      </tr>
 
@@ -486,19 +487,19 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap>Bcc</th>
+      <th align="left" nowrap>[% 'Bcc' | $T8 %]</th>
       <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
      </tr>
     </table>
 
-    <input type="submit" id="delete_contact" name="action" value="Ansprechpartner löschen" disabled>
+    <input type="submit" id="delete_contact" name="action" value="[% 'Delete Contact' | $T8 %]" disabled>
     <br style="clear: left" />
    </div>
 
    <div id="deliveries" class="tabcontent">
     <table>
      <tr>
-      <th align="right">Lieferadresse</th>
+      <th align="right">[% 'Shipping Address' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'delivery_id',
@@ -512,12 +513,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Von</th>
+      <th align="right" nowrap>[% 'From' | $T8 %]</th>
       <td>
        <input id="from" name="from" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + this.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(from) %]">
        <input type="button" name="fromB" id="trigger_from" value="?">
       </td>
-      <th align="right" nowrap>Bis</th>
+      <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
       <td>
        <input id="to" name="to" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + from.value, 'to__' + this.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(to) %]">
        <input type="button" name="toB" id="trigger_to" value="?">
@@ -541,13 +542,13 @@
     <p>
      <table>
       <tr>
-       <th class="listheading">Löschen</th>
-       <th class="listheading">Betreff</th>
-       <th class="listheading">Erstellt am</th>
-       <th class="listheading">Erstellt von</th>
-       <th class="listheading">Wiedervorlagedatum</th>
-       <th class="listheading">Wiedervorlage f&uuml;r</th>
-       <th class="listheading">Wiedervorlage erledigt</th>
+       <th class="listheading">[% 'Delete' | $T8 %]</th>
+       <th class="listheading">[% 'Subject' | $T8 %]</th>
+       <th class="listheading">[% 'Created on' | $T8 %]</th>
+       <th class="listheading">[% 'Created by' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up Date' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up for' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up done' | $T8 %]</th>
       </tr>
 
       [%- FOREACH row = NOTES %]
@@ -559,7 +560,7 @@
        <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
        <td>[% HTML.escape(row.follow_up_date) %]</td>
        <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]Ja[% ELSE %]Nein[% END %][% END %]</td>
+       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %][% END %]</td>
       </tr>
       [%- END %]
 
@@ -569,7 +570,7 @@
     </p>
     [%- END %]
 
-    <div class="listtop">[% IF NOTE_id %]Notiz bearbeiten[% ELSE %]Notiz erfassen[% END %]</div>
+    <div class="listtop">[% IF NOTE_id %][% 'Edit note' | $T8 %][% ELSE %][% 'Add note' | $T8 %][% END %]</div>
 
     <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
     <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
@@ -577,21 +578,21 @@
     <p>
      <table>
       <tr>
-       <td valign="right">Betreff</td>
+       <td valign="right">[% 'Subject' | $T8 %]</td>
        <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
       </tr>
 
       <tr>
-       <td valign="right" align="top">Text</td>
+       <td valign="right" align="top">[% 'Body' | $T8 %]</td>
        <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
       </tr>
 
       <tr>
-       <td valign="right">Wiedervorlage am</td>
+       <td valign="right">[% 'Follow-Up On' | $T8 %]</td>
        <td>
         <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
         <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-        f&uuml;r
+        [% 'for' | $T8 %]
         <select name="FU_created_for_user">
          [%- FOREACH row = ALL_EMPLOYEES %]
          <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
@@ -606,7 +607,7 @@
        <td>&nbsp;</td>
        <td>
         <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-        <label for="FU_done">Wiedervorlage erledigt</label>
+        <label for="FU_done">[% 'Follow-Up done' | $T8 %]</label>
        </td>
       </tr>
      </table>
diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
index ec9a62a85..71a2a165b 100644
--- a/templates/webpages/ct/form_header_master.html
+++ b/templates/webpages/ct/form_header_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body onLoad="fokus()">
 
@@ -6,13 +7,13 @@
  <form method="post" name="ct" action="ct.pl" onKeyUp="highlight(event)" onClick="highlight(event)">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="billing"><translate>Billing Address</translate></a></li>
-   <li><a href="#" rel="shipto"><translate>Shipping Address</translate></a></li>
+   <li class="selected"><a href="#" rel="billing">[% 'Billing Address' | $T8 %]</a></li>
+   <li><a href="#" rel="shipto">[% 'Shipping Address' | $T8 %]</a></li>
    <li><a href="#" rel="contacts">Ansprechpartner</a></li>
-   <li><a href="#" rel="deliveries"><translate>Lieferungen</translate></a></li>
-   <li><a href="#" rel="vcnotes"><translate>Notes</translate></a></li>
+   <li><a href="#" rel="deliveries">[% 'Lieferungen' | $T8 %]</a></li>
+   <li><a href="#" rel="vcnotes">[% 'Notes' | $T8 %]</a></li>
    [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
    [%- END %]
   </ul>
 
@@ -24,7 +25,7 @@
      <tr height="5"></tr>
      [% IF conf_vertreter %]
       <tr>
-       <th align="right">[% IF is_customer %]<translate>Type of Customer</translate>[%- ELSE %]<translate>Type of Vendor</translate>[%- END %]</th>
+       <th align="right">[% IF is_customer %][% 'Type of Customer' | $T8 %][%- ELSE %][% 'Type of Vendor' | $T8 %][%- END %]</th>
        <td>
         [%- INCLUDE generic/multibox.html
               name       = 'business',
@@ -36,7 +37,7 @@
        </td>
       </tr>
       <tr>
-       <th align="right"><translate>Representative</translate></th>
+       <th align="right">[% 'Representative' | $T8 %]</th>
        <td>
         [%- INCLUDE generic/multibox.html
               name      = 'salesman_id',
@@ -49,16 +50,16 @@
      [%- END %]
      <tr>
       [%- IF is_customer %]
-      <th align="right" nowrap><translate>Customer Number</translate></th>
+      <th align="right" nowrap>[% 'Customer Number' | $T8 %]</th>
       <td><input name="customernumber" size="35" value="[% HTML.escape(customernumber) %]"></td>
       [%- ELSE %]
-      <th align="right" nowrap><translate>Vendor Number</translate></th>
+      <th align="right" nowrap>[% 'Vendor Number' | $T8 %]</th>
       <td><input name="vendornumber" size="35" value="[% HTML.escape(vendornumber) %]"></td>
       [%- END %]
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Greeting</translate></th>
+      <th align="right" nowrap>[% 'Greeting' | $T8 %]</th>
       <td>
        <input id="greeting" name="greeting" size="30" value="[% HTML.escape(greeting) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
@@ -72,12 +73,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>[% IF is_customer %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
+      <th align="right" nowrap>[% IF is_customer %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Department</translate></th>
+      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
       <td>
        <input name="department_1" size="16" maxlength="75" value="[% HTML.escape(department_1) %]">
        <input name="department_2" size="16" maxlength="75" value="[% HTML.escape(department_2) %]">
@@ -85,12 +86,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Street</translate></th>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
       <td><input name="street" size="35" maxlength="75" value="[% HTML.escape(street) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
+      <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
       <td>
        <input name="zipcode" size="5" maxlength="10" value="[% HTML.escape(zipcode) %]">
        <input name="city" size="30" maxlength="75" value="[% HTML.escape(city) %]">
@@ -98,42 +99,42 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Country</translate></th>
+      <th align="right" nowrap>[% 'Country' | $T8 %]</th>
       <td><input name="country" size="35" maxlength="75" value="[% HTML.escape(country) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Contact</translate></th>
+      <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
       <td><input name="contact" size="28" maxlength="75" value="[% HTML.escape(contact) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Phone</translate></th>
+      <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
       <td><input name="phone" size="30" maxlength="30" value="[% HTML.escape(phone) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Fax</translate></th>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
       <td><input name="fax" size="30" maxlength="30" value="[% HTML.escape(fax) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>E-mail</translate></th>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
       <td><input name="email" size="45" value="[% HTML.escape(email) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Homepage</translate></th>
+      <th align="right" nowrap>[% 'Homepage' | $T8 %]</th>
       <td><input name="homepage" size="45" value="[% HTML.escape(homepage) %]"></td>
      </tr>
     </table>
 
     <table>
      <tr>
-      <th align="right"><translate>Credit Limit</translate></th>
+      <th align="right">[% 'Credit Limit' | $T8 %]</th>
       <td><input name="creditlimit" size="9" value="[% LxERP.format_amount(creditlimit, 0) %]"></td>
       <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
-      <th align="right"><translate>Payment Terms</translate></th>
+      <th align="right">[% 'Payment Terms' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'payment_id',
@@ -144,53 +145,53 @@
        -%]
       </td>
 
-      <th align="right"><translate>Discount</translate></th>
+      <th align="right">[% 'Discount' | $T8 %]</th>
       <td><input name="discount" size="4" value="[% LxERP.format_amount(discount) %]"> %</td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Tax Number / SSN</translate></th>
+      <th align="right">[% 'Tax Number / SSN' | $T8 %]</th>
       <td><input name="taxnumber" size="20" value="[% HTML.escape(taxnumber) %]"></td>
       <!-- Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein -->
-      <th align="right"><translate>sales tax identification number</translate></th>
+      <th align="right">[% 'sales tax identification number' | $T8 %]</th>
       <td><input name="ustid" maxlength="14" size="20" value="[% HTML.escape(ustid) %]"></td>
       [%- IF is_customer %]
-      <th align="right"><translate>our vendor number at customer</translate></th>
+      <th align="right">[% 'our vendor number at customer' | $T8 %]</th>
       <td><input name="c_vendor_id" size="10" value="[% HTML.escape(c_vendor_id) %]"></td>
       [%- ELSE %]
-      <th align="right"><translate>Customer Number</translate></th>
+      <th align="right">[% 'Customer Number' | $T8 %]</th>
       <td><input name="v_customer_id" size="10" value="[% HTML.escape(v_customer_id) %]"></td>
       [%- END %]
      </tr>
 
      <tr>
-      <th align="right"><translate>Account Number</translate></th>
+      <th align="right">[% 'Account Number' | $T8 %]</th>
       <td><input name="account_number" size="10" maxlength="100" value="[% HTML.escape(account_number) %]"></td>
-      <th align="right"><translate>Bank Code Number</translate></th>
+      <th align="right">[% 'Bank Code Number' | $T8 %]</th>
       <td><input name="bank_code" size="10" maxlength="100" value="[% HTML.escape(bank_code) %]"></td>
-      <th align="right"><translate>Bank</translate></th>
+      <th align="right">[% 'Bank' | $T8 %]</th>
       <td><input name="bank" size="20" value="[% HTML.escape(bank) %]"></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>IBAN</translate></th>
+      <th align="right">[% 'IBAN' | $T8 %]</th>
       <td><input name="iban" size="10" maxlength="100" value="[% HTML.escape(iban) %]"></td>
-      <th align="right"><translate>BIC</translate></th>
+      <th align="right">[% 'BIC' | $T8 %]</th>
       <td><input name="bic" size="10" maxlength="100" value="[% HTML.escape(bic) %]"></td>
      </tr>
 
      [%- IF conf_vertreter %]
       <tr>
-       <th align="right"><translate>Username</translate></th>
+       <th align="right">[% 'Username' | $T8 %]</th>
        <td><input name="username" maxlength="50" value="[% HTML.escape(username) %]"></td>
-       <th align="right"><translate>Password</translate></th>
+       <th align="right">[% 'Password' | $T8 %]</th>
        <td><input name="user_password" value="[% HTML.escape(user_password) %]"></td>
       </tr>
      [%- END %]
 
      <tr>
       [% UNLESS conf_vertreter %]
-       <th align="right">[% IF is_customer %]<translate>Type of Customer</translate>[% ELSE %]<translate>Type of Vendor</translate>[%- END %]</th>
+       <th align="right">[% IF is_customer %][% 'Type of Customer' | $T8 %][% ELSE %][% 'Type of Vendor' | $T8 %][%- END %]</th>
        <td>
         [%- INCLUDE generic/multibox.html
               name       = 'business',
@@ -201,7 +202,7 @@
         -%]
        </td>
       [%- END %]
-      <th align="right"><translate>Language</translate></th>
+      <th align="right">[% 'Language' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'language_id',
@@ -213,7 +214,7 @@
       </td>
 
       [%- IF is_customer %]
-      <th align="right"><translate>Preisklasse</translate></th>
+      <th align="right">[% 'Preisklasse' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'klass',
@@ -227,14 +228,14 @@
      </tr>
 
      <tr>
-      <td align="right"><translate>Obsolete</translate></td>
+      <td align="right">[% 'Obsolete' | $T8 %]</td>
       <td><input name="obsolete" class="checkbox" type="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
-      <td align="right"><translate>direct debit</translate></td>
+      <td align="right">[% 'direct debit' | $T8 %]</td>
       <td><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Steuersatz</translate></th>
+      <th align="right">[% 'Steuersatz' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'taxzone_id',
@@ -245,7 +246,7 @@
        -%]
       </td>
       [%- IF is_customer && !conf_vertreter %]
-      <th align="right"><translate>Salesman</translate></th>
+      <th align="right">[% 'Salesman' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'salesman_id',
@@ -261,7 +262,7 @@
 
     <table>
      <tr>
-      <th align="left" nowrap><translate>Notes</translate></th>
+      <th align="left" nowrap>[% 'Notes' | $T8 %]</th>
      </tr>
 
      <tr>
@@ -276,7 +277,7 @@
 
     <table width="100%">
      <tr>
-      <th align="right"><translate>Shipping Address</translate></th>
+      <th align="right">[% 'Shipping Address' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'shipto_id',
@@ -291,12 +292,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Company Name</translate></th>
+      <th align="right" nowrap>[% 'Company Name' | $T8 %]</th>
       <td><input id="shiptoname" name="shiptoname" size="35" maxlength="75" value="[% HTML.escape(shiptoname) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Abteilung</translate></th>
+      <th align="right" nowrap>[% 'Abteilung' | $T8 %]</th>
       <td>
        <input id="shiptodepartment_1" name="shiptodepartment_1" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_1) %]">
        <input id="shiptodepartment_2" name="shiptodepartment_2" size="16" maxlength="75" value="[% HTML.escape(shiptodepartment_2) %]">
@@ -304,12 +305,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Street</translate></th>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
       <td><input id="shiptostreet" name="shiptostreet" size="35" maxlength="75" value="[% HTML.escape(shiptostreet) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Zipcode</translate>/<translate>City</translate></th>
+      <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
       <td>
        <input id="shiptozipcode" name="shiptozipcode" size="5" maxlength="75" value="[% HTML.escape(shiptozipcode) %]">
        <input id="shiptocity" name="shiptocity" size="30" maxlength="75" value="[% HTML.escape(shiptocity) %]">
@@ -317,27 +318,27 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Country</translate></th>
+      <th align="right" nowrap>[% 'Country' | $T8 %]</th>
       <td><input id="shiptocountry" name="shiptocountry" size="35" maxlength="75" value="[% HTML.escape(shiptocountry) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Contact</translate></th>
+      <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
       <td><input id="shiptocontact" name="shiptocontact" size="30" maxlength="75" value="[% HTML.escape(shiptocontact) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Phone</translate></th>
+      <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
       <td><input id="shiptophone" name="shiptophone" size="30" maxlength="30" value="[% HTML.escape(shiptophone) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Fax</translate></th>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
       <td><input id="shiptofax" name="shiptofax" size="30" maxlength="30" value="[% HTML.escape(shiptofax) %]"></td>
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>E-mail</translate></th>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
       <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
      </tr>
 
@@ -349,7 +350,7 @@
      </tr>
     </table>
 
-    <input type="submit" id="delete_shipto" name="action" value="<translate>Delete Shipto</translate>" disabled>
+    <input type="submit" id="delete_shipto" name="action" value="[% 'Delete Shipto' | $T8 %]" disabled>
     <br style="clear: left" />
    </div>
 
@@ -357,7 +358,7 @@
     <table>
      <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
      <tr>
-      <th align="right"><translate>Ansprechpartner</translate></th>
+      <th align="right">[% 'Ansprechpartner' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'cp_id',
@@ -371,18 +372,18 @@
      </tr>
 
     <tr>
-     <th align="left" nowrap><translate>Gender</translate></th>
+     <th align="left" nowrap>[% 'Gender' | $T8 %]</th>
      <td>
       <select id="cp_gender" name="cp_gender">
-       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]><translate>male</translate></option>
-       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]><translate>female</translate></option>
+       <option value="m"[% IF cp_gender == 'm' %] selected[% END %]>[% 'male' | $T8 %]</option>
+       <option value="f"[% IF cp_gender == 'f' %] selected[% END %]>[% 'female' | $T8 %]</option>
       </select>
      </td>
     </tr>
     <tr>
 
      <tr>
-      <th align="left" nowrap><translate>Title</translate></th>
+      <th align="left" nowrap>[% 'Title' | $T8 %]</th>
       <td>
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
@@ -397,7 +398,7 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Department</translate></th>
+      <th align="left" nowrap>[% 'Department' | $T8 %]</th>
       <td>
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
        [%- INCLUDE generic/multibox.html
@@ -412,72 +413,72 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Given Name</translate></th>
+      <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
       <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Name</translate></th>
+      <th align="left" nowrap>[% 'Name' | $T8 %]</th>
       <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="[% HTML.escape(cp_name) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Phone1</translate></th>
+      <th align="left" nowrap>[% 'Phone1' | $T8 %]</th>
       <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="[% HTML.escape(cp_phone1) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Phone2</translate></th>
+      <th align="left" nowrap>[% 'Phone2' | $T8 %]</th>
       <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="[% HTML.escape(cp_phone2) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Fax</translate></th>
+      <th align="left" nowrap>[% 'Fax' | $T8 %]</th>
       <td><input id="cp_fax" name="cp_fax" size="40" value="[% HTML.escape(cp_fax) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Mobile1</translate></th>
+      <th align="left" nowrap>[% 'Mobile1' | $T8 %]</th>
       <td><input id="cp_mobile1" name="cp_mobile1" size="40" value="[% HTML.escape(cp_mobile1) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Mobile2</translate></th>
+      <th align="left" nowrap>[% 'Mobile2' | $T8 %]</th>
       <td><input id="cp_mobile2" name="cp_mobile2" size="40" value="[% HTML.escape(cp_mobile2) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Sat. Phone</translate></th>
+      <th align="left" nowrap>[% 'Sat. Phone' | $T8 %]</th>
       <td><input id="cp_satphone" name="cp_satphone" size="40" value="[% HTML.escape(cp_satphone) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Sat. Fax</translate></th>
+      <th align="left" nowrap>[% 'Sat. Fax' | $T8 %]</th>
       <td><input id="cp_satfax" name="cp_satfax" size="40" value="[% HTML.escape(cp_satfax) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Project</translate></th>
+      <th align="left" nowrap>[% 'Project' | $T8 %]</th>
       <td><input id="cp_project" name="cp_project" size="40" value="[% HTML.escape(cp_project) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>E-mail</translate></th>
+      <th align="left" nowrap>[% 'E-mail' | $T8 %]</th>
       <td><input id="cp_email" name="cp_email" size="40" value="[% HTML.escape(cp_email) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Private Phone</translate></th>
+      <th align="left" nowrap>[% 'Private Phone' | $T8 %]</th>
       <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Private E-mail</translate></th>
+      <th align="left" nowrap>[% 'Private E-mail' | $T8 %]</th>
       <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Birthday</translate></th>
+      <th align="left" nowrap>[% 'Birthday' | $T8 %]</th>
       <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
      </tr>
 
@@ -486,19 +487,19 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap><translate>Bcc</translate></th>
+      <th align="left" nowrap>[% 'Bcc' | $T8 %]</th>
       <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
      </tr>
     </table>
 
-    <input type="submit" id="delete_contact" name="action" value="<translate>Delete Contact</translate>" disabled>
+    <input type="submit" id="delete_contact" name="action" value="[% 'Delete Contact' | $T8 %]" disabled>
     <br style="clear: left" />
    </div>
 
    <div id="deliveries" class="tabcontent">
     <table>
      <tr>
-      <th align="right"><translate>Shipping Address</translate></th>
+      <th align="right">[% 'Shipping Address' | $T8 %]</th>
       <td>
        [%- INCLUDE generic/multibox.html
              name       = 'delivery_id',
@@ -512,12 +513,12 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>From</translate></th>
+      <th align="right" nowrap>[% 'From' | $T8 %]</th>
       <td>
        <input id="from" name="from" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + this.value, 'to__' + to.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(from) %]">
        <input type="button" name="fromB" id="trigger_from" value="?">
       </td>
-      <th align="right" nowrap><translate>To (time)</translate></th>
+      <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
       <td>
        <input id="to" name="to" size="10" maxlength="10" onChange="get_delivery(['shipto_id__' + delivery_id.value, 'from__' + from.value, 'to__' + this.value, 'id__' + cvid.value, 'db__' + db.value], ['delivery'])" value="[% HTML.escape(to) %]">
        <input type="button" name="toB" id="trigger_to" value="?">
@@ -541,13 +542,13 @@
     <p>
      <table>
       <tr>
-       <th class="listheading"><translate>Delete</translate></th>
-       <th class="listheading"><translate>Subject</translate></th>
-       <th class="listheading"><translate>Created on</translate></th>
-       <th class="listheading"><translate>Created by</translate></th>
-       <th class="listheading"><translate>Follow-Up Date</translate></th>
-       <th class="listheading"><translate>Follow-Up for</translate></th>
-       <th class="listheading"><translate>Follow-Up done</translate></th>
+       <th class="listheading">[% 'Delete' | $T8 %]</th>
+       <th class="listheading">[% 'Subject' | $T8 %]</th>
+       <th class="listheading">[% 'Created on' | $T8 %]</th>
+       <th class="listheading">[% 'Created by' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up Date' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up for' | $T8 %]</th>
+       <th class="listheading">[% 'Follow-Up done' | $T8 %]</th>
       </tr>
 
       [%- FOREACH row = NOTES %]
@@ -559,7 +560,7 @@
        <td>[% IF row.created_by_name %][% HTML.escape(row.created_by_name) %][% ELSE %][% HTML.escape(row.created_by_login) %][% END %]</td>
        <td>[% HTML.escape(row.follow_up_date) %]</td>
        <td>[% IF row.created_for_name %][% HTML.escape(row.created_for_name) %][% ELSE %][% HTML.escape(row.created_for_login) %][% END %]</td>
-       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %]<translate>Yes</translate>[% ELSE %]<translate>No</translate>[% END %][% END %]</td>
+       <td>[% IF row.follow_up_date %][% IF row.follow_up_done %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %][% END %]</td>
       </tr>
       [%- END %]
 
@@ -569,7 +570,7 @@
     </p>
     [%- END %]
 
-    <div class="listtop">[% IF NOTE_id %]<translate>Edit note</translate>[% ELSE %]<translate>Add note</translate>[% END %]</div>
+    <div class="listtop">[% IF NOTE_id %][% 'Edit note' | $T8 %][% ELSE %][% 'Add note' | $T8 %][% END %]</div>
 
     <input type="hidden" name="NOTE_id" value="[% HTML.escape(NOTE_id) %]">
     <input type="hidden" name="FU_id" value="[% HTML.escape(FU_id) %]">
@@ -577,21 +578,21 @@
     <p>
      <table>
       <tr>
-       <td valign="right"><translate>Subject</translate></td>
+       <td valign="right">[% 'Subject' | $T8 %]</td>
        <td><input name="NOTE_subject" value="[% HTML.escape(NOTE_subject) %]" size="50"></td>
       </tr>
 
       <tr>
-       <td valign="right" align="top"><translate>Body</translate></td>
+       <td valign="right" align="top">[% 'Body' | $T8 %]</td>
        <td align="top"><textarea cols="50" rows="10" name="NOTE_body">[% HTML.escape(NOTE_body) %]</textarea></td>
       </tr>
 
       <tr>
-       <td valign="right"><translate>Follow-Up On</translate></td>
+       <td valign="right">[% 'Follow-Up On' | $T8 %]</td>
        <td>
         <input name="FU_date" id="FU_date" value="[% HTML.escape(FU_date) %]" size="12">
         <input type="button" name="FU_date_button" id="FU_date_trigger" value="?">
-        <translate>for</translate>
+        [% 'for' | $T8 %]
         <select name="FU_created_for_user">
          [%- FOREACH row = ALL_EMPLOYEES %]
          <option value="[% HTML.escape(row.id) %]"[% IF (NOTE_id && (row.id == FU_created_for_user)) || (row.login == login) %] selected[% END %]>
@@ -606,7 +607,7 @@
        <td>&nbsp;</td>
        <td>
         <input type="checkbox" name="FU_done" id="FU_done" value="1"[% IF FU_done %] checked[% END %]>
-        <label for="FU_done"><translate>Follow-Up done</translate></label>
+        <label for="FU_done">[% 'Follow-Up done' | $T8 %]</label>
        </td>
       </tr>
      </table>
diff --git a/templates/webpages/ct/get_delivery_de.html b/templates/webpages/ct/get_delivery_de.html
index a8c0d9798..73d2154ec 100644
--- a/templates/webpages/ct/get_delivery_de.html
+++ b/templates/webpages/ct/get_delivery_de.html
@@ -1,20 +1,21 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <table width="100%">
   <tr>
     <td>
       <table width="100%">
         <tr class="listheading">
-          <th class="listheading">Lieferadresse</th>
-          <th class="listheading">Rechnung</th>
-          <th class="listheading">Auftrag</th>
-          <th class="listheading">Rechnungsdatum</th>
-          <th class="listheading">Beschreibung</th>
-          <th class="listheading">Menge</th>
-          <th class="listheading">Einheit</th>
+          <th class="listheading">[% 'Shipping Address' | $T8 %]</th>
+          <th class="listheading">[% 'Invoice' | $T8 %]</th>
+          <th class="listheading">[% 'Order' | $T8 %]</th>
+          <th class="listheading">[% 'Invdate' | $T8 %]</th>
+          <th class="listheading">[% 'Description' | $T8 %]</th>
+          <th class="listheading">[% 'Qty' | $T8 %]</th>
+          <th class="listheading">[% 'Unit' | $T8 %]</th>
 [%- IF is_customer %]
-          <th class="listheading">Verkaufspreis</th>
+          <th class="listheading">[% 'Sell Price' | $T8 %]</th>
 [%- ELSE %]
-          <th class="listheading">Einkaufspreis</th>
+          <th class="listheading">[% 'Last Cost' | $T8 %]</th>
 [%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
@@ -36,5 +37,5 @@
 
      </table>
 [%- IF DELIVERY.size == 15 %]
-     <p>Diese Liste ist auf 15 Zeilen begrenzt. Wenn Sie eine vollständige Liste benötigen, erstellen Sie bitte einen Bericht.</p>
+     <p>[% 'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' | $T8 %]</p>
 [%- END %]
diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html
index 156bd11e8..73d2154ec 100644
--- a/templates/webpages/ct/get_delivery_master.html
+++ b/templates/webpages/ct/get_delivery_master.html
@@ -1,20 +1,21 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <table width="100%">
   <tr>
     <td>
       <table width="100%">
         <tr class="listheading">
-          <th class="listheading"><translate>Shipping Address</translate></th>
-          <th class="listheading"><translate>Invoice</translate></th>
-          <th class="listheading"><translate>Order</translate></th>
-          <th class="listheading"><translate>Invdate</translate></th>
-          <th class="listheading"><translate>Description</translate></th>
-          <th class="listheading"><translate>Qty</translate></th>
-          <th class="listheading"><translate>Unit</translate></th>
+          <th class="listheading">[% 'Shipping Address' | $T8 %]</th>
+          <th class="listheading">[% 'Invoice' | $T8 %]</th>
+          <th class="listheading">[% 'Order' | $T8 %]</th>
+          <th class="listheading">[% 'Invdate' | $T8 %]</th>
+          <th class="listheading">[% 'Description' | $T8 %]</th>
+          <th class="listheading">[% 'Qty' | $T8 %]</th>
+          <th class="listheading">[% 'Unit' | $T8 %]</th>
 [%- IF is_customer %]
-          <th class="listheading"><translate>Sell Price</translate></th>
+          <th class="listheading">[% 'Sell Price' | $T8 %]</th>
 [%- ELSE %]
-          <th class="listheading"><translate>Last Cost</translate></th>
+          <th class="listheading">[% 'Last Cost' | $T8 %]</th>
 [%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
@@ -36,5 +37,5 @@
 
      </table>
 [%- IF DELIVERY.size == 15 %]
-     <p><translate>This list is capped at 15 items to keep it fast. If you need a full list, please use reports.</translate></p>
+     <p>[% 'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' | $T8 %]</p>
 [%- END %]
diff --git a/templates/webpages/ct/list_names_bottom_de.html b/templates/webpages/ct/list_names_bottom_de.html
index 2d6625f9f..0fd53897e 100644
--- a/templates/webpages/ct/list_names_bottom_de.html
+++ b/templates/webpages/ct/list_names_bottom_de.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<form method="post" action="ct.pl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
  <input name="db" type="hidden" value="[% HTML.escape(db) %]">
 
- [% IF IS_CUSTOMER %]Neuer Kunde[% ELSE %]Neuer Lieferant[% END %]<br>
+ [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]<br>
 
- <input class="submit" type="submit" name="action" value="Erfassen">
+ <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/ct/list_names_bottom_master.html b/templates/webpages/ct/list_names_bottom_master.html
index f95a18c87..0fd53897e 100644
--- a/templates/webpages/ct/list_names_bottom_master.html
+++ b/templates/webpages/ct/list_names_bottom_master.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<form method="post" action="ct.pl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
  <input name="db" type="hidden" value="[% HTML.escape(db) %]">
 
- [% IF IS_CUSTOMER %]<translate>New customer</translate>[% ELSE %]<translate>New vendor</translate>[% END %]<br>
+ [% IF IS_CUSTOMER %][% 'New customer' | $T8 %][% ELSE %][% 'New vendor' | $T8 %][% END %]<br>
 
- <input class="submit" type="submit" name="action" value="<translate>Add</translate>">
+ <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/ct/search_de.html b/templates/webpages/ct/search_de.html
index 07734787f..74697749a 100644
--- a/templates/webpages/ct/search_de.html
+++ b/templates/webpages/ct/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="fokus()">
 
  <form method="post" action="ct.pl" name="Form">
@@ -8,43 +9,43 @@
 
   <table>
    <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundennummer[% ELSE %]Lieferantennummer[% END %]</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</th>
     <td><input name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" size="35"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>Kontakt</th>
+    <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
     <td><input name="contact" size="35"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>eMail</th>
+    <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
     <td><input name="email" size="35"></td>
    </tr>
    <tr>
-    <th align="right" nowrap>Ansprechpartner (Nachname)</th>
+    <th align="right" nowrap>[% 'Contact person (surname)' | $T8 %]</th>
     <td><input name="cp_name" size="35"></td>
    </tr>
    </tr>
-    <th align="right" nowrap>Rechnungsadresse (Straße)</th>
+    <th align="right" nowrap>[% 'Billing/shipping address (street)' | $T8 %]</th>
     <td><input name="addr_street" size="35"></td>
    </tr>
  <tr>
-    <th align="right" nowrap>Rechnungsadresse (PLZ)</th>
+    <th align="right" nowrap>[% 'Billing/shipping address (zipcode)' | $T8 %]</th>
     <td><input name="addr_zipcode" size="35"></td>
  </tr>
    <tr>
-    <th align="right" nowrap>Rechnungsadresse (Stadt)</th>
+    <th align="right" nowrap>[% 'Billing/shipping address (city)' | $T8 %]</th>
     <td><input name="addr_city" size="35"></td>
    </tr>
    [% IF SHOW_BUSINESS_TYPES %]
    <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
     <td>
      <select name="business_id"><option value=""></option>
       [% FOREACH bt = ALL_BUSINESS_TYPES %]<option value="[% HTML.escape(bt.id) %]">[% HTML.escape(bt.description) %]</option>[% END %]
@@ -58,92 +59,92 @@
    <tr>
     <td></td>
     <td>
-     <input name="status" class="radio" type="radio" value="all" checked> Alle
-     <input name="status" class="radio" type="radio" value="orphaned"> Nie benutzt
+     <input name="status" class="radio" type="radio" value="all" checked> [% 'All' | $T8 %]
+     <input name="status" class="radio" type="radio" value="orphaned"> [% 'Orphaned' | $T8 %]
     </td>
    </tr>
 
    <tr>
     <td></td>
-    <td><input name="obsolete" class="radio" type="radio" value="all"> Alle
-     <input name="obsolete" class="radio" type="radio" value="Y"> Ungültig
-     <input name="obsolete" class="radio" type="radio" value="N" checked> Gültig
+    <td><input name="obsolete" class="radio" type="radio" value="all"> [% 'All' | $T8 %]
+     <input name="obsolete" class="radio" type="radio" value="Y"> [% 'Obsolete' | $T8 %]
+     <input name="obsolete" class="radio" type="radio" value="N" checked> [% 'Not obsolete' | $T8 %]
     </td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>In Bericht aufnehmen</th>
+    <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th>
     <td>
      <table border="0">
       <tr>
        <td>
         <input name="l_id" id="l_id" type="checkbox" class="checkbox" value="Y">
-        <label for="l_id">Buchungsnummer</label>
+        <label for="l_id">[% 'ID' | $T8 %]</label>
        </td>
        <td>
         <input name="l_[% db %]number" id="l_[% db %]number" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_[% db %]number">[% IF IS_CUSTOMER %]Kundennummer[% ELSE %]Lieferantennummer[% END %]</label>
+        <label for="l_[% db %]number">[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</label>
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</label>
+        <label for="l_name">[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_street">Straße</label>
+        <label for="l_street">[% 'Street' | $T8 %]</label>
        </td>
       </tr>
 
       <tr>
        <td>
         <input name="l_contact" id="l_contact" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_contact">Kontakt</label>
+        <label for="l_contact">[% 'Contact' | $T8 %]</label>
        </td>
        <td>
         <input name="l_phone" id="l_phone" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_phone">Telefon</label>
+        <label for="l_phone">[% 'Phone' | $T8 %]</label>
        </td>
        <td>
         <input name="l_fax" id="l_fax" type="checkbox" class="checkbox" value="Y">
-        <label for="l_fax">Fax</label>
+        <label for="l_fax">[% 'Fax' | $T8 %]</label>
        </td>
        <td>
         <input name="l_zipcode" id="l_zipcode" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_zipcode">PLZ</label>
+        <label for="l_zipcode">[% 'Zipcode' | $T8 %]</label>
        </td>
       </tr>
 
       <tr>
        <td>
         <input name="l_taxnumber" id="l_taxnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_taxnumber">Steuernummer</label>
+        <label for="l_taxnumber">[% 'Tax Number' | $T8 %]</label>
        </td>
        <td>
         <input name="l_email" id="l_email" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_email">eMail</label>
+        <label for="l_email">[% 'E-mail' | $T8 %]</label>
        </td>
        <td>
         <input name="l_business" id="l_business" type="checkbox" class="checkbox" value="Y">
-        <label for="l_business">[% IF IS_CUSTOMER %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</label>
+        <label for="l_business">[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</label>
        </td>
        <td>
         <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_city">Stadt</label>
+        <label for="l_city">[% 'City' | $T8 %]</label>
       </td>
       </tr>
 
       <tr>
        <td>
         <input name="l_invnumber" id="l_invnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_invnumber">Rechnungen</label>
+        <label for="l_invnumber">[% 'Invoices' | $T8 %]</label>
        </td>
        <td>
         <input name="l_ordnumber" id="l_ordnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_ordnumber">[% IF IS_CUSTOMER %]Aufträge[% ELSE %]Lieferantenaufträge[% END %]</label>
+        <label for="l_ordnumber">[% IF IS_CUSTOMER %][% 'Sales Orders' | $T8 %][% ELSE %][% 'Purchase Orders' | $T8 %][% END %]</label>
        </td>
        <td>
         <input name="l_quonumber" id="l_quonumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_quonumber">[% IF IS_CUSTOMER %]Angebote[% ELSE %]Preisanfragen[% END %]</label>
+        <label for="l_quonumber">[% IF IS_CUSTOMER %][% 'Quotations' | $T8 %][% ELSE %][% 'RFQs' | $T8 %][% END %]</label>
        </td>
        <td>
        </td>
@@ -158,7 +159,7 @@
 
   <input type="hidden" name="nextsub" value="list_names">
 
-  <input type="submit" class="submit" name="action" value="Weiter">
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 
 </body>
diff --git a/templates/webpages/ct/search_master.html b/templates/webpages/ct/search_master.html
index b54a864c7..74697749a 100644
--- a/templates/webpages/ct/search_master.html
+++ b/templates/webpages/ct/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="fokus()">
 
  <form method="post" action="ct.pl" name="Form">
@@ -8,43 +9,43 @@
 
   <table>
    <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer Number</translate>[% ELSE %]<translate>Vendor Number</translate>[% END %]</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</th>
     <td><input name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" size="35"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Contact</translate></th>
+    <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
     <td><input name="contact" size="35"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>E-mail</translate></th>
+    <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
     <td><input name="email" size="35"></td>
    </tr>
    <tr>
-    <th align="right" nowrap><translate>Contact person (surname)</translate></th>
+    <th align="right" nowrap>[% 'Contact person (surname)' | $T8 %]</th>
     <td><input name="cp_name" size="35"></td>
    </tr>
    </tr>
-    <th align="right" nowrap><translate>Billing/shipping address (street)</translate></th>
+    <th align="right" nowrap>[% 'Billing/shipping address (street)' | $T8 %]</th>
     <td><input name="addr_street" size="35"></td>
    </tr>
  <tr>
-    <th align="right" nowrap><translate>Billing/shipping address (zipcode)</translate></th>
+    <th align="right" nowrap>[% 'Billing/shipping address (zipcode)' | $T8 %]</th>
     <td><input name="addr_zipcode" size="35"></td>
  </tr>
    <tr>
-    <th align="right" nowrap><translate>Billing/shipping address (city)</translate></th>
+    <th align="right" nowrap>[% 'Billing/shipping address (city)' | $T8 %]</th>
     <td><input name="addr_city" size="35"></td>
    </tr>
    [% IF SHOW_BUSINESS_TYPES %]
    <tr>
-    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
     <td>
      <select name="business_id"><option value=""></option>
       [% FOREACH bt = ALL_BUSINESS_TYPES %]<option value="[% HTML.escape(bt.id) %]">[% HTML.escape(bt.description) %]</option>[% END %]
@@ -58,92 +59,92 @@
    <tr>
     <td></td>
     <td>
-     <input name="status" class="radio" type="radio" value="all" checked> <translate>All</translate>
-     <input name="status" class="radio" type="radio" value="orphaned"> <translate>Orphaned</translate>
+     <input name="status" class="radio" type="radio" value="all" checked> [% 'All' | $T8 %]
+     <input name="status" class="radio" type="radio" value="orphaned"> [% 'Orphaned' | $T8 %]
     </td>
    </tr>
 
    <tr>
     <td></td>
-    <td><input name="obsolete" class="radio" type="radio" value="all"> <translate>All</translate>
-     <input name="obsolete" class="radio" type="radio" value="Y"> <translate>Obsolete</translate>
-     <input name="obsolete" class="radio" type="radio" value="N" checked> <translate>Not obsolete</translate>
+    <td><input name="obsolete" class="radio" type="radio" value="all"> [% 'All' | $T8 %]
+     <input name="obsolete" class="radio" type="radio" value="Y"> [% 'Obsolete' | $T8 %]
+     <input name="obsolete" class="radio" type="radio" value="N" checked> [% 'Not obsolete' | $T8 %]
     </td>
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Include in Report</translate></th>
+    <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th>
     <td>
      <table border="0">
       <tr>
        <td>
         <input name="l_id" id="l_id" type="checkbox" class="checkbox" value="Y">
-        <label for="l_id"><translate>ID</translate></label>
+        <label for="l_id">[% 'ID' | $T8 %]</label>
        </td>
        <td>
         <input name="l_[% db %]number" id="l_[% db %]number" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_[% db %]number">[% IF IS_CUSTOMER %]<translate>Customer Number</translate>[% ELSE %]<translate>Vendor Number</translate>[% END %]</label>
+        <label for="l_[% db %]number">[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</label>
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</label>
+        <label for="l_name">[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_street"><translate>Street</translate></label>
+        <label for="l_street">[% 'Street' | $T8 %]</label>
        </td>
       </tr>
 
       <tr>
        <td>
         <input name="l_contact" id="l_contact" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_contact"><translate>Contact</translate></label>
+        <label for="l_contact">[% 'Contact' | $T8 %]</label>
        </td>
        <td>
         <input name="l_phone" id="l_phone" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_phone"><translate>Phone</translate></label>
+        <label for="l_phone">[% 'Phone' | $T8 %]</label>
        </td>
        <td>
         <input name="l_fax" id="l_fax" type="checkbox" class="checkbox" value="Y">
-        <label for="l_fax"><translate>Fax</translate></label>
+        <label for="l_fax">[% 'Fax' | $T8 %]</label>
        </td>
        <td>
         <input name="l_zipcode" id="l_zipcode" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_zipcode"><translate>Zipcode</translate></label>
+        <label for="l_zipcode">[% 'Zipcode' | $T8 %]</label>
        </td>
       </tr>
 
       <tr>
        <td>
         <input name="l_taxnumber" id="l_taxnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_taxnumber"><translate>Tax Number</translate></label>
+        <label for="l_taxnumber">[% 'Tax Number' | $T8 %]</label>
        </td>
        <td>
         <input name="l_email" id="l_email" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_email"><translate>E-mail</translate></label>
+        <label for="l_email">[% 'E-mail' | $T8 %]</label>
        </td>
        <td>
         <input name="l_business" id="l_business" type="checkbox" class="checkbox" value="Y">
-        <label for="l_business">[% IF IS_CUSTOMER %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</label>
+        <label for="l_business">[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</label>
        </td>
        <td>
         <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_city"><translate>City</translate></label>
+        <label for="l_city">[% 'City' | $T8 %]</label>
       </td>
       </tr>
 
       <tr>
        <td>
         <input name="l_invnumber" id="l_invnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_invnumber"><translate>Invoices</translate></label>
+        <label for="l_invnumber">[% 'Invoices' | $T8 %]</label>
        </td>
        <td>
         <input name="l_ordnumber" id="l_ordnumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_ordnumber">[% IF IS_CUSTOMER %]<translate>Sales Orders</translate>[% ELSE %]<translate>Purchase Orders</translate>[% END %]</label>
+        <label for="l_ordnumber">[% IF IS_CUSTOMER %][% 'Sales Orders' | $T8 %][% ELSE %][% 'Purchase Orders' | $T8 %][% END %]</label>
        </td>
        <td>
         <input name="l_quonumber" id="l_quonumber" type="checkbox" class="checkbox" value="Y">
-        <label for="l_quonumber">[% IF IS_CUSTOMER %]<translate>Quotations</translate>[% ELSE %]<translate>RFQs</translate>[% END %]</label>
+        <label for="l_quonumber">[% IF IS_CUSTOMER %][% 'Quotations' | $T8 %][% ELSE %][% 'RFQs' | $T8 %][% END %]</label>
        </td>
        <td>
        </td>
@@ -158,7 +159,7 @@
 
   <input type="hidden" name="nextsub" value="list_names">
 
-  <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 
 </body>
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html
index 7c2ecd04c..c4a3dc6a3 100644
--- a/templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html
+++ b/templates/webpages/dbupgrade/SKR04_3804_already_exists_de.html
@@ -1,11 +1,12 @@
-[% USE HTML %]<div class="listtop">Update SKR04: neues Steuerkonto 3804 (19%) für innergemeinschaftlichen Erwerb</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
 
 <form action="[% script %]" method="POST">
 
-<p>Das Konto 3804 existiert schon, das Update wird übersprungen.</p>
-<p>Bitte lesen Sie die Dateidoc/skr04-update-3804/skr04_3804_hinzufuegen.html.
+<p>[% 'The account 3804 already exists, the update will be skipped.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
 
 <input type="hidden" name="account_exists" value="1">
-<input type="submit" value="Weiter">
+<input type="submit" value="[% 'Continue' | $T8 %]">
 
 
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
index ba36b3ea6..c4a3dc6a3 100644
--- a/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
+++ b/templates/webpages/dbupgrade/SKR04_3804_already_exists_master.html
@@ -1,11 +1,12 @@
-[% USE HTML %]<div class="listtop"><translate>Update SKR04: new tax account 3804 (19%)</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
 
 <form action="[% script %]" method="POST">
 
-<p><translate>The account 3804 already exists, the update will be skipped.</translate></p>
-<p><translate>Please read the file</translate>doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
+<p>[% 'The account 3804 already exists, the update will be skipped.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html.
 
 <input type="hidden" name="account_exists" value="1">
-<input type="submit" value="<translate>Continue</translate>">
+<input type="submit" value="[% 'Continue' | $T8 %]">
 
 
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_de.html b/templates/webpages/dbupgrade/SKR04_3804_update_de.html
index 264102297..38500275a 100644
--- a/templates/webpages/dbupgrade/SKR04_3804_update_de.html
+++ b/templates/webpages/dbupgrade/SKR04_3804_update_de.html
@@ -1,12 +1,13 @@
-[% USE HTML %]<div class="listtop">Update SKR04: neues Steuerkonto 3804 (19%) für innergemeinschaftlichen Erwerb</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
 
 <form action="[% script %]" method="POST">
 
-<p>Das Konto 3803 wurde nach dem 01.01.2007 bebucht. Falls Sie dieses Konto nicht manuell auf 19% gestellt haben sind die Buchungen wahrscheinlich mit falscher Umsatzsteuer gebucht worden.</p>
-<p>Das Konto 3804 wird nicht automatisch hinzugefügt.</p>
-<p>Bitte lesen Sie die Dateidoc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
+<p>[% 'There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.' | $T8 %]</p>
+<p>[% 'The account 3804 will not be added automatically.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
 
 <input type="hidden" name="bookings_exist" value="1">
-<input type="submit" value="Weiter">
+<input type="submit" value="[% 'Continue' | $T8 %]">
 
 
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update_master.html b/templates/webpages/dbupgrade/SKR04_3804_update_master.html
index b706a83b3..38500275a 100644
--- a/templates/webpages/dbupgrade/SKR04_3804_update_master.html
+++ b/templates/webpages/dbupgrade/SKR04_3804_update_master.html
@@ -1,12 +1,13 @@
-[% USE HTML %]<div class="listtop"><translate>Update SKR04: new tax account 3804 (19%)</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
 
 <form action="[% script %]" method="POST">
 
-<p><translate>There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.</translate></p>
-<p><translate>The account 3804 will not be added automatically.</translate></p>
-<p><translate>Please read the file</translate>doc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
+<p>[% 'There are bookings to the account 3803 after 01.01.2007. If you didn't change this account manually to 19% the bookings are probably incorrect.' | $T8 %]</p>
+<p>[% 'The account 3804 will not be added automatically.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/skr04-update-3804/skr04_3804_hinzufuegen.html</p>
 
 <input type="hidden" name="bookings_exist" value="1">
-<input type="submit" value="<translate>Continue</translate>">
+<input type="submit" value="[% 'Continue' | $T8 %]">
 
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
index bb3f4cc19..68abd3b33 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Schritt 3 von 3: Erzeugnisse</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 3 of 3: Assemblies' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,39 +11,39 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading">Existierende Buchungsgruppen</div>
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
 
  <p>
-  Die folgenden Buchungsgruppen wurden bereits angelegt:
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
   <br>
   <ul>
    [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
      [% HTML.escape(row.description) %]:
-     Inventar: [% row.inventory_accno %];
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
    [% END %]
   </ul>
  </p>
 
  [% FOREACH row = LIST %]
-  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
+  <div class="subsubheading">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</div>
 
   <table>
    <tr>
-    <td>Beschreibung:</td>
+    <td>[% 'Description' | $T8 %]:</td>
     <td><input name="description_[% loop.count %]"></td>
    </tr>
 
@@ -50,7 +51,7 @@
     <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
     [% ELSE %]
     <tr>
-     <td>Inventar:</td>
+     <td>[% 'Inventory' | $T8 %]:</td>
      <td>
       <select name="inventory_accno_id_[% loop.count %]">
        [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -60,7 +61,7 @@
    [% END %]
 
    <tr>
-    <td>Erl&ouml;skonto Inand:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
      [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
@@ -68,7 +69,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_0_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -77,7 +78,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -86,7 +87,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -95,7 +96,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -104,7 +105,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU ohne UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -113,7 +114,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto Ausland:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -122,7 +123,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto Ausland:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -138,7 +139,7 @@
   <hr>
  [% END %]
 
- <input type="submit" name="dummy" value="Buchungsgruppe erfassen">
+ <input type="submit" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html
index 088d233ae..226d64558 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_de.html
@@ -1,3 +1,4 @@
-<div class="listtop">Schritt 3 von 3: Erzeugnisse</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 3 of 3: Assemblies' | $T8 %]</div>
 
-<p>In diesem Schritt gibt es nichts mehr zu tun.</p>
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
index 26af74eff..226d64558 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_done_master.html
@@ -1,3 +1,4 @@
-<div class="listtop"><translate>Step 3 of 3: Assemblies</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 3 of 3: Assemblies' | $T8 %]</div>
 
-<p><translate>There is nothing to do in this step.</translate></p>
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
index f9c6329ea..68abd3b33 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Step 3 of 3: Assemblies</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 3 of 3: Assemblies' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,39 +11,39 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
 
  <p>
-  <translate>The following Buchungsgruppen have already been created:</translate>
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
   <br>
   <ul>
    [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
      [% HTML.escape(row.description) %]:
-     <translate>Inventory</translate>: [% row.inventory_accno %];
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
    [% END %]
   </ul>
  </p>
 
  [% FOREACH row = LIST %]
-  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
+  <div class="subsubheading">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</div>
 
   <table>
    <tr>
-    <td><translate>Description</translate>:</td>
+    <td>[% 'Description' | $T8 %]:</td>
     <td><input name="description_[% loop.count %]"></td>
    </tr>
 
@@ -50,7 +51,7 @@
     <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
     [% ELSE %]
     <tr>
-     <td><translate>Inventory</translate>:</td>
+     <td>[% 'Inventory' | $T8 %]:</td>
      <td>
       <select name="inventory_accno_id_[% loop.count %]">
        [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -60,7 +61,7 @@
    [% END %]
 
    <tr>
-    <td><translate>Income accno</translate> <translate>National</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
      [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
@@ -68,7 +69,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_0_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -77,7 +78,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -86,7 +87,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -95,7 +96,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -104,7 +105,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -113,7 +114,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>International</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -122,7 +123,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>International</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -138,7 +139,7 @@
   <hr>
  [% END %]
 
- <input type="submit" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
+ <input type="submit" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer_de.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_de.html
index 750582917..0e5f94f43 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_footer_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_footer_de.html
@@ -1,5 +1,6 @@
-<div class="listtop">Update beendet.</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Update complete' | $T8 %]</div>
 
-<p>Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.</p>
+<p>[% 'The database upgrade for the introduction of Buchungsgruppen is now complete.' | $T8 %]</p>
 
 <hr>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html b/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
index 2393a3c8b..0e5f94f43 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_footer_master.html
@@ -1,5 +1,6 @@
-<div class="listtop"><translate>Update complete</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Update complete' | $T8 %]</div>
 
-<p><translate>The database upgrade for the introduction of Buchungsgruppen is now complete.</translate></p>
+<p>[% 'The database upgrade for the introduction of Buchungsgruppen is now complete.' | $T8 %]</p>
 
 <hr>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header_de.html b/templates/webpages/dbupgrade/buchungsgruppen_header_de.html
index 65bc428c6..77b0c2cbb 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_header_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_header_de.html
@@ -1,18 +1,19 @@
+[%- USE T8 %]
 <hr>
 
-<div class="listtop">Einf&uuml;hrung von Buchungsgruppen</div>
+<div class="listtop">[% 'Introduction of Buchungsgruppen' | $T8 %]</div>
 
 <p>
- Vor Lx-Office 2.4.0 musste der Benutzer die Konten bei jeder Ware und jeder Dienstleistung einzeln ausw&auml;hlen.
- Lx-Office 2.4.0 f&uuml;hrt zwei neue Konzepte ein: Steuerzonen und Buchungsgruppen.
- Es gibt vier Steuerzonen.
- Eine Buchungsgruppe besteht aus einem deskriptiven Namen, den Erl&ouml;s- und Aufwandskonten f&uuml;r diese vier Steuerzonen sowie aus einem Inventarkonto.
- Der Benutzer muss nun f&uuml;r jeden Artikel nur noch die Buchungsgruppe anstelle der drei einzelnen Konten ausw&auml;hlen.
- Deswegen muss man den gleichen Artikel nicht mehr mehrmals anlegen, wenn er in verschiedenen Steuerzonen gehandelt werden soll.
+ [% 'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %]
+ [% 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' | $T8 %]
+ [% 'There are four tax zones.' | $T8 %]
+ [% 'A Buchungsgruppe consists of a descriptive name and the account numbers for the income and expense accounts for those four tax zones as well as the inventory account number.' | $T8 %]
+ [% 'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' | $T8 %]
+ [% 'Therefore there's no need to create the same article more than once if it is sold or bought in/from another tax zone.' | $T8 %]
 </p>
 
 <p>
- Dieses Upgradescript versucht, bei allen bestehenden Artikeln neu erstellte Buchungsgruppen zuzuordnen.
- Es ist m&ouml;glich, dies f&uuml;r einige, aber nicht f&uuml;r alle Buchungsgruppen automatisch zu erledigen.
- Sie m&uuml;ssen neue Buchungsgruppen f&uuml;r alle Kombinationen aus Inventar-, Erl&ouml;s- und Aufwandskonto, die bereits benutzt wurden.
+ [% 'This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.' | $T8 %]
+ [% 'It is possible to do this automatically for some Buchungsgruppen, but not for all.' | $T8 %]
+ [% 'You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.' | $T8 %]
 </p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header_master.html b/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
index abb90156c..77b0c2cbb 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_header_master.html
@@ -1,29 +1,19 @@
+[%- USE T8 %]
 <hr>
 
-<div class="listtop"><translate>Introduction of Buchungsgruppen</translate></div>
+<div class="listtop">[% 'Introduction of Buchungsgruppen' | $T8 %]</div>
 
 <p>
- <translate>Prior to Lx-Office v2.4.0 the user had to chose the accounts
-  for each part and service.</translate>
- <translate>Lx-Office 2.4.0 introduces two new concepts: tax zones and
-  Buchungsgruppen.</translate>
- <translate>There are four tax zones.</translate>
- <translate>A Buchungsgruppe consists of a descriptive name and the
-  account numbers for the income and expense accounts for those four
-  tax zones as well as the inventory account number.</translate>
- <translate>Now the user must select a single Buchungsgruppe for each
-  part instead of three distinct accounts.</translate>
- <translate>Therefore there's no need to create the same article more
-  than once if it is sold or bought in/from another tax
-  zone.</translate>
+ [% 'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %]
+ [% 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' | $T8 %]
+ [% 'There are four tax zones.' | $T8 %]
+ [% 'A Buchungsgruppe consists of a descriptive name and the account numbers for the income and expense accounts for those four tax zones as well as the inventory account number.' | $T8 %]
+ [% 'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' | $T8 %]
+ [% 'Therefore there's no need to create the same article more than once if it is sold or bought in/from another tax zone.' | $T8 %]
 </p>
 
 <p>
- <translate>This upgrade script tries to map all existing parts in the
-  database to the newly created Buchungsgruppen.</translate>
- <translate>It is possible to do this automatically for some
-  Buchungsgruppen, but not for all.</translate>
- <translate>You have to create new Buchungsgruppen for all the
-  combinations of inventory, income and expense accounts that have
-  been used already.</translate>
+ [% 'This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.' | $T8 %]
+ [% 'It is possible to do this automatically for some Buchungsgruppen, but not for all.' | $T8 %]
+ [% 'You have to create new Buchungsgruppen for all the combinations of inventory, income and expense accounts that have been used already.' | $T8 %]
 </p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
index 9401f61fb..36ffd37bd 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Schritt 1 von 3: Waren</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,39 +11,39 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading">Existierende Buchungsgruppen</div>
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
 
  <p>
-  Die folgenden Buchungsgruppen wurden bereits angelegt:
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
   <br>
   <ul>
    [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
      [% HTML.escape(row.description) %]:
-     Inventar: [% row.inventory_accno %];
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
    [% END %]
   </ul>
  </p>
 
  [% FOREACH row = LIST %]
-  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
+  <div class="subsubheading">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</div>
 
   <table>
    <tr>
-    <td>Beschreibung:</td>
+    <td>[% 'Description' | $T8 %]:</td>
     <td><input name="description_[% loop.count %]"></td>
    </tr>
 
@@ -50,7 +51,7 @@
     <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
     [% ELSE %]
     <tr>
-     <td>Inventar:</td>
+     <td>[% 'Inventory' | $T8 %]:</td>
      <td>
       <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
       [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
@@ -59,7 +60,7 @@
    [% END %]
 
    <tr>
-    <td>Erl&ouml;skonto Inand:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
      [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
@@ -67,7 +68,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto Inand:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
      [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
@@ -75,7 +76,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -84,7 +85,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -93,7 +94,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -102,7 +103,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU ohne UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -111,7 +112,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto Ausland:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -120,7 +121,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto Ausland:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -136,7 +137,7 @@
   <hr>
  [% END %]
 
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Buchungsgruppe erfassen">
+ <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html
index e2f26c86c..d93cb064e 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_de.html
@@ -1,3 +1,4 @@
-<div class="listtop">Schritt 1 von 3: Waren</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
-<p>In diesem Schritt gibt es nichts mehr zu tun.</p>
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
index 0c4b178c6..d93cb064e 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_done_master.html
@@ -1,3 +1,4 @@
-<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
-<p><translate>There is nothing to do in this step.</translate></p>
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
index 3f954b916..36ffd37bd 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,39 +11,39 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
 
  <p>
-  <translate>The following Buchungsgruppen have already been created:</translate>
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
   <br>
   <ul>
    [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
      [% HTML.escape(row.description) %]:
-     <translate>Inventory</translate>: [% row.inventory_accno %];
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
    [% END %]
   </ul>
  </p>
 
  [% FOREACH row = LIST %]
-  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
+  <div class="subsubheading">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</div>
 
   <table>
    <tr>
-    <td><translate>Description</translate>:</td>
+    <td>[% 'Description' | $T8 %]:</td>
     <td><input name="description_[% loop.count %]"></td>
    </tr>
 
@@ -50,7 +51,7 @@
     <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
     [% ELSE %]
     <tr>
-     <td><translate>Inventory</translate>:</td>
+     <td>[% 'Inventory' | $T8 %]:</td>
      <td>
       <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
       [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
@@ -59,7 +60,7 @@
    [% END %]
 
    <tr>
-    <td><translate>Income accno</translate> <translate>National</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
      [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
@@ -67,7 +68,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>National</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
      [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
@@ -75,7 +76,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -84,7 +85,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -93,7 +94,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -102,7 +103,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -111,7 +112,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>International</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -120,7 +121,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>International</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -136,7 +137,7 @@
   <hr>
  [% END %]
 
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
index e6493f3e8..dd060bfc8 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,39 +11,39 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading">Existierende Buchungsgruppen</div>
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
 
  <p>
-  Die folgenden Buchungsgruppen wurden bereits angelegt:
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
   <br>
   <ul>
    [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
      [% HTML.escape(row.description) %]:
-     Inventar: [% row.inventory_accno %];
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
-     Erl&ouml;skonto/Aufwandskonto
-     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
    [% END %]
   </ul>
  </p>
 
  [% FOREACH row = LIST %]
-  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
+  <div class="subsubheading">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</div>
 
   <table>
    <tr>
-    <td>Beschreibung:</td>
+    <td>[% 'Description' | $T8 %]:</td>
     <td><input name="description_[% loop.count %]"></td>
    </tr>
 
@@ -50,7 +51,7 @@
     <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
     [% ELSE %]
     <tr>
-     <td>Inventar:</td>
+     <td>[% 'Inventory' | $T8 %]:</td>
      <td>
       <select name="inventory_accno_id_[% loop.count %]">
        [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -60,7 +61,7 @@
    [% END %]
 
    <tr>
-    <td>Erl&ouml;skonto Inand:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
      [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
@@ -68,7 +69,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto Inand:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
      [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
@@ -76,7 +77,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -85,7 +86,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU mit UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -94,7 +95,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -103,7 +104,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto EU ohne UstId-Nummer:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -112,7 +113,7 @@
    </tr>
 
    <tr>
-    <td>Erl&ouml;skonto Ausland:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -121,7 +122,7 @@
    </tr>
 
    <tr>
-    <td>Aufwandskonto Ausland:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -137,7 +138,7 @@
   <hr>
  [% END %]
 
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Buchungsgruppe erfassen">
+ <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html
index b2df9bdbd..a3d4f4fc6 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_done_de.html
@@ -1,3 +1,4 @@
-<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
-<p>In diesem Schritt gibt es nichts mehr zu tun.</p>
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
index c55db138b..a3d4f4fc6 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_done_master.html
@@ -1,3 +1,4 @@
-<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
-<p><translate>There is nothing to do in this step.</translate></p>
+<p>[% 'There is nothing to do in this step.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
index bdf2180dc..dd060bfc8 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,39 +11,39 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
+ <div class="subsubheading">[% 'Existing Buchungsgruppen' | $T8 %]</div>
 
  <p>
-  <translate>The following Buchungsgruppen have already been created:</translate>
+  [% 'The following Buchungsgruppen have already been created:' | $T8 %]
   <br>
   <ul>
    [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
      [% HTML.escape(row.description) %]:
-     <translate>Inventory</translate>: [% row.inventory_accno %];
+     [% 'Inventory' | $T8 %]: [% row.inventory_accno %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'National' | $T8 %]: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU with VAT ID' | $T8 %]: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'EU without VAT ID' | $T8 %]: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
-     <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
+     [% 'Income accno' | $T8 %]/[% 'Expense accno' | $T8 %]
+     [% 'International' | $T8 %]: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
    [% END %]
   </ul>
  </p>
 
  [% FOREACH row = LIST %]
-  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
+  <div class="subsubheading">[% 'New Buchungsgruppe [% loop.count %]' | $T8 %]</div>
 
   <table>
    <tr>
-    <td><translate>Description</translate>:</td>
+    <td>[% 'Description' | $T8 %]:</td>
     <td><input name="description_[% loop.count %]"></td>
    </tr>
 
@@ -50,7 +51,7 @@
     <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
     [% ELSE %]
     <tr>
-     <td><translate>Inventory</translate>:</td>
+     <td>[% 'Inventory' | $T8 %]:</td>
      <td>
       <select name="inventory_accno_id_[% loop.count %]">
        [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
@@ -60,7 +61,7 @@
    [% END %]
 
    <tr>
-    <td><translate>Income accno</translate> <translate>National</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
      [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
@@ -68,7 +69,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>National</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'National' | $T8 %]:</td>
     <td>
      <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
      [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
@@ -76,7 +77,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -85,7 +86,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU with VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_1_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -94,7 +95,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -103,7 +104,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'EU without VAT ID' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_2_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -112,7 +113,7 @@
    </tr>
 
    <tr>
-    <td><translate>Income accno</translate> <translate>International</translate>:</td>
+    <td>[% 'Income accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="income_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -121,7 +122,7 @@
    </tr>
 
    <tr>
-    <td><translate>Expense accno</translate> <translate>International</translate>:</td>
+    <td>[% 'Expense accno' | $T8 %] [% 'International' | $T8 %]:</td>
     <td>
      <select name="expense_accno_id_3_[% loop.count %]">
       [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
@@ -137,7 +138,7 @@
   <hr>
  [% END %]
 
- <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="[% 'Create Buchungsgruppen' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/coa_guess_de.html b/templates/webpages/dbupgrade/coa_guess_de.html
index 0e53064e3..cec2c574c 100644
--- a/templates/webpages/dbupgrade/coa_guess_de.html
+++ b/templates/webpages/dbupgrade/coa_guess_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Benutzten Kontenrahmen ausw&auml;hlen</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Select the chart of accounts in use' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,15 +11,15 @@
  [% END %]
 
  <p>
-  Bitte w&auml;hlen Sie den Kontenrahmen aus, der bei dieser Installation verwendet wird.
+  [% 'Please select the chart of accounts this installation is using from the list below.' | $T8 %]
  </p>
 
  <p>
-  Kontenrahmen:
+  [% 'Chart of accounts' | $T8 %]:
   <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
  </p>
 
- <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="Weiter">
+ <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="[% 'Continue' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/coa_guess_master.html b/templates/webpages/dbupgrade/coa_guess_master.html
index f310c0c11..cec2c574c 100644
--- a/templates/webpages/dbupgrade/coa_guess_master.html
+++ b/templates/webpages/dbupgrade/coa_guess_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Select the chart of accounts in use</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Select the chart of accounts in use' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,16 +11,15 @@
  [% END %]
 
  <p>
-  <translate>Please select the chart of accounts this installation
-   is using from the list below.</translate>
+  [% 'Please select the chart of accounts this installation is using from the list below.' | $T8 %]
  </p>
 
  <p>
-  <translate>Chart of accounts</translate>:
+  [% 'Chart of accounts' | $T8 %]:
   <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
  </p>
 
- <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="<translate>Continue</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="[% 'Continue' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form_de.html b/templates/webpages/dbupgrade/cp_greeting_update_form_de.html
index 6cdc23d05..b4cb3345b 100644
--- a/templates/webpages/dbupgrade/cp_greeting_update_form_de.html
+++ b/templates/webpages/dbupgrade/cp_greeting_update_form_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Datenumwandlung von Titel nach Geschlecht (cp_greeting to cp_gender)</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'cp_greeting to cp_gender migration' | $T8 %]</div>
 
 
 <form action="[% script %]" method="POST">
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form_master.html b/templates/webpages/dbupgrade/cp_greeting_update_form_master.html
index 42db00987..b4cb3345b 100644
--- a/templates/webpages/dbupgrade/cp_greeting_update_form_master.html
+++ b/templates/webpages/dbupgrade/cp_greeting_update_form_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>cp_greeting to cp_gender migration</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'cp_greeting to cp_gender migration' | $T8 %]</div>
 
 
 <form action="[% script %]" method="POST">
diff --git a/templates/webpages/dbupgrade/error_de.html b/templates/webpages/dbupgrade/error_de.html
index ee37ea538..4bcd9b0ac 100644
--- a/templates/webpages/dbupgrade/error_de.html
+++ b/templates/webpages/dbupgrade/error_de.html
@@ -1,6 +1,9 @@
-[% USE HTML %]<p>Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<p>[% LxERP.t8('The database update/creation did not succeed. The file #1 contained the following error:', file) | html %]
  <br>
  [% error %]
  <br>
- Alle &Auml;nderungen in dieser Datei wurden r&uuml;ckg&auml;ngig gemacht.
+ [% 'All changes in that file have been reverted.' | $T8 %]
 </p>
diff --git a/templates/webpages/dbupgrade/error_master.html b/templates/webpages/dbupgrade/error_master.html
index ca99d400a..4bcd9b0ac 100644
--- a/templates/webpages/dbupgrade/error_master.html
+++ b/templates/webpages/dbupgrade/error_master.html
@@ -1,6 +1,9 @@
-[% USE HTML %]<p><translate>The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:</translate>
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<p>[% LxERP.t8('The database update/creation did not succeed. The file #1 contained the following error:', file) | html %]
  <br>
  [% error %]
  <br>
- <translate>All changes in that file have been reverted.</translate>
+ [% 'All changes in that file have been reverted.' | $T8 %]
 </p>
diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html
index a92d48617..e4c312ab4 100644
--- a/templates/webpages/dbupgrade/footer_de.html
+++ b/templates/webpages/dbupgrade/footer_de.html
@@ -1,10 +1,11 @@
-[% USE HTML %]<p>...fertig</p>
+[%- USE T8 %]
+[% USE HTML %]<p>[% '...done' | $T8 %]</p>
 
 <form action="[% menufile %]">
 
  <input type="hidden" name="action" value="display">
 
- <p><input type="submit" value="Weiter"></p>
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
 </form>
 
 </body>
diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html
index dda72ddce..e4c312ab4 100644
--- a/templates/webpages/dbupgrade/footer_master.html
+++ b/templates/webpages/dbupgrade/footer_master.html
@@ -1,10 +1,11 @@
-[% USE HTML %]<p><translate>...done</translate></p>
+[%- USE T8 %]
+[% USE HTML %]<p>[% '...done' | $T8 %]</p>
 
 <form action="[% menufile %]">
 
  <input type="hidden" name="action" value="display">
 
- <p><input type="submit" value="<translate>Continue</translate>"></p>
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
 </form>
 
 </body>
diff --git a/templates/webpages/dbupgrade/header_de.html b/templates/webpages/dbupgrade/header_de.html
index 112eea4cd..09d840b6e 100644
--- a/templates/webpages/dbupgrade/header_de.html
+++ b/templates/webpages/dbupgrade/header_de.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <table width="100%">
   <tr>
-   <td class="listtop">Datenbankaktualisierung ([% HTML.escape(dbname) %])</td>
+   <td class="listtop">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</td>
   </tr>
  </table>
diff --git a/templates/webpages/dbupgrade/header_master.html b/templates/webpages/dbupgrade/header_master.html
index 77dc972b9..09d840b6e 100644
--- a/templates/webpages/dbupgrade/header_master.html
+++ b/templates/webpages/dbupgrade/header_master.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <table width="100%">
   <tr>
-   <td class="listtop"><translate>Dataset upgrade</translate> ([% HTML.escape(dbname) %])</td>
+   <td class="listtop">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</td>
   </tr>
  </table>
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
index dcea40e03..0a31cbc3e 100644
--- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
+++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
@@ -1,4 +1,6 @@
-[% USE HTML %]<div class="listtop">Unbekannter Kontenrahmen</div>
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<div class="listtop">[% 'Unknown chart of accounts' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,8 +12,8 @@
  [% END %]
 
  <p>
-  Hinweis:
-  Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;[% HTML.escape(coa) %]&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.
+  [% 'Note' | $T8 %]:
+  [% LxERP.t8('This installation uses an unknown chart of accounts (&quot;#1&quot;). This database upgrade cannot create standard buchungsgruppen automatically.', coa) | html %]
  </p>
 
  <hr>
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
index 7e29a03ff..0a31cbc3e 100644
--- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
+++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
@@ -1,4 +1,6 @@
-[% USE HTML %]<div class="listtop"><translate>Unknown chart of accounts</translate></div>
+[%- USE T8 %]
+[%- USE LxERP %]
+[% USE HTML %]<div class="listtop">[% 'Unknown chart of accounts' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,10 +12,8 @@
  [% END %]
 
  <p>
-  <translate>Note</translate>:
-  <translate>This installation uses an unknown chart of accounts
-   (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade
-   cannot create standard buchungsgruppen automatically.</translate>
+  [% 'Note' | $T8 %]:
+  [% LxERP.t8('This installation uses an unknown chart of accounts (&quot;#1&quot;). This database upgrade cannot create standard buchungsgruppen automatically.', coa) | html %]
  </p>
 
  <hr>
diff --git a/templates/webpages/dbupgrade/units_error_de.html b/templates/webpages/dbupgrade/units_error_de.html
index aa3f94618..d7019cb7d 100644
--- a/templates/webpages/dbupgrade/units_error_de.html
+++ b/templates/webpages/dbupgrade/units_error_de.html
@@ -1,5 +1,6 @@
-[% USE HTML %]<p><b>Fehler:</b> [% message %]</p>
+[%- USE T8 %]
+[% USE HTML %]<p><b>[% 'Error' | $T8 %]:</b> [% message %]</p>
 
 <form>
-<input type="button" onclick="history.back()" value="Zurück">
+<input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
 </form>
diff --git a/templates/webpages/dbupgrade/units_error_master.html b/templates/webpages/dbupgrade/units_error_master.html
index 53578e2f6..d7019cb7d 100644
--- a/templates/webpages/dbupgrade/units_error_master.html
+++ b/templates/webpages/dbupgrade/units_error_master.html
@@ -1,5 +1,6 @@
-[% USE HTML %]<p><b><translate>Error</translate>:</b> [% message %]</p>
+[%- USE T8 %]
+[% USE HTML %]<p><b>[% 'Error' | $T8 %]:</b> [% message %]</p>
 
 <form>
-<input type="button" onclick="history.back()" value="<translate>Back</translate>">
+<input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
 </form>
diff --git a/templates/webpages/dbupgrade/units_header_de.html b/templates/webpages/dbupgrade/units_header_de.html
index 7c7dacc38..ef977a15f 100644
--- a/templates/webpages/dbupgrade/units_header_de.html
+++ b/templates/webpages/dbupgrade/units_header_de.html
@@ -1,16 +1,17 @@
+[%- USE T8 %]
 <hr>
 
-<div class="listtop">Einf&uuml;hrung von Einheiten</div>
+<div class="listtop">[% 'Introduction of units' | $T8 %]</div>
 
 <p>
- Vor Lx-Office 2.4.0 konnte der Benutzer bei Artikeln, Dienstleistungen und Rechnungen, Angeboten etc beliebige Einheiten angeben.
- In Lx-Office 2.4.0 muss der Administrator in den Systemeinstellungen eine Liste von verwendbaren Einheiten angeben.
- Diese Einheiten k&ouml;nnen auf anderen Einheiten basieren, sodass Lx-Office Preise umrechnen kann, wenn der Benutzer von einer Einheit zu einer anderen Wechselt.
+ [% 'Prior to Lx-Office v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.' | $T8 %]
+ [% 'In Lx-Office 2.4.0 the administrator has to enter a list of units in the administrative section.' | $T8 %]
+ [% 'These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.' | $T8 %]
 </p>
 
 <p>
- Dieses Update-Script versucht, alle bestehenden Einheiten automatisch in die neuen Einheiten umzuwandeln.
- Das ist f&uuml;r einige Einheiten automatisch m&ouml;glich, aber bei anderen muss der Benutzer die neue Einheit ausw&auml;hlen.
- Sie k&ouml;nnen nicht fortfahren, bis alle unbekannten Einheiten in neue Einheiten umgewandelt wurden.
- Sie k&ouml;nnen jetzt auch neue Einheiten anlegen.
+ [% 'This upgrade script tries to map all existing units in the database to the newly created units.' | $T8 %]
+ [% 'It is possible to do this automatically for some units, but for others the user has to chose the new unit.' | $T8 %]
+ [% 'You cannot continue until all unknown units have been mapped to known ones.' | $T8 %]
+ [% 'You can also create new units now.' | $T8 %]
 </p>
diff --git a/templates/webpages/dbupgrade/units_header_master.html b/templates/webpages/dbupgrade/units_header_master.html
index 72ffd6d55..ef977a15f 100644
--- a/templates/webpages/dbupgrade/units_header_master.html
+++ b/templates/webpages/dbupgrade/units_header_master.html
@@ -1,24 +1,17 @@
+[%- USE T8 %]
 <hr>
 
-<div class="listtop"><translate>Introduction of units</translate></div>
+<div class="listtop">[% 'Introduction of units' | $T8 %]</div>
 
 <p>
- <translate>Prior to Lx-Office v2.4.0 the user could enter arbitrary
-  strings as units for parts, services and in invoices, sales quotations
-  etc.</translate>
- <translate>In Lx-Office 2.4.0 the administrator has to enter a list
-  of units in the administrative section.</translate>
- <translate>These units can be based on other units so that Lx-Office
-  can convert prices when the user switches from one unit to
-  another.</translate>
+ [% 'Prior to Lx-Office v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.' | $T8 %]
+ [% 'In Lx-Office 2.4.0 the administrator has to enter a list of units in the administrative section.' | $T8 %]
+ [% 'These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.' | $T8 %]
 </p>
 
 <p>
- <translate>This upgrade script tries to map all existing units in the
-  database to the newly created units.</translate>
- <translate>It is possible to do this automatically for some units,
-  but for others the user has to chose the new unit.</translate>
- <translate>You cannot continue until all unknown units have been
-  mapped to known ones.</translate>
- <translate>You can also create new units now.</translate>
+ [% 'This upgrade script tries to map all existing units in the database to the newly created units.' | $T8 %]
+ [% 'It is possible to do this automatically for some units, but for others the user has to chose the new unit.' | $T8 %]
+ [% 'You cannot continue until all unknown units have been mapped to known ones.' | $T8 %]
+ [% 'You can also create new units now.' | $T8 %]
 </p>
diff --git a/templates/webpages/dbupgrade/units_parts_de.html b/templates/webpages/dbupgrade/units_parts_de.html
index 04d5d8edf..8cb2aa71f 100644
--- a/templates/webpages/dbupgrade/units_parts_de.html
+++ b/templates/webpages/dbupgrade/units_parts_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Schritt 1 von 3: Waren</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,14 +11,14 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading">Einheit hinzuf&uuml;gen</div>
+ <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
 
  <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
+  [% 'For each unit there's either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
  </p>
 
  <p>
-  Die folgenden Einheiten existieren bereits:
+  [% 'The following units exist already:' | $T8 %]
   [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
@@ -25,11 +26,11 @@
 
  <table>
   <tr>
-   <th align="right">Einheit</th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
    <td><input name="new_name" size="20" maxlength="20"></td>
   </tr>
   <tr>
-   <th align="right">Basiseinheit</th>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
    <td>
     <select name="new_base_unit">
      [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
@@ -37,26 +38,26 @@
    </td>
   </tr>
   <tr>
-   <th align="right">Faktor</th>
+   <th align="right">[% 'Factor' | $T8 %]</th>
    <td><input name="new_factor"></td>
   </tr>
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="Einheit hinzuf&uuml;gen">
+ <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="[% 'Add unit' | $T8 %]">
 
  <hr>
 
- <div class="subsubheading">Neue Einheiten zuweisen</div>
+ <div class="subsubheading">[% 'Assign new units' | $T8 %]</div>
 
  <p>
-  Die folgenden Einheiten sind unbekannt.
-  Sie m&uuml;ssen f&uuml;r jeden Artikel die neue Einheit ausw&auml;hlen.
+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <th class="listheading">Aktuelle Einheit</th>
-   <th class="listheading">Neue Einheit</th>
+   <th class="listheading">[% 'Current unit' | $T8 %]</th>
+   <th class="listheading">[% 'New unit' | $T8 %]</th>
   </tr>
 
   [% FOREACH row = UNKNOWN_PART_UNITS %]
@@ -74,7 +75,7 @@
   [% END %]
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Einheiten zuweisen">
+ <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/units_parts_done_de.html b/templates/webpages/dbupgrade/units_parts_done_de.html
index 3fb2784fe..fcbf90609 100644
--- a/templates/webpages/dbupgrade/units_parts_done_de.html
+++ b/templates/webpages/dbupgrade/units_parts_done_de.html
@@ -1,3 +1,4 @@
-<div class="listtop">Schritt 1 von 3: Waren</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
-<p>Es wurden keine unbekannten Einheiten gefunden.</p>
+<p>[% 'No unknown units where found.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/units_parts_done_master.html b/templates/webpages/dbupgrade/units_parts_done_master.html
index 908a7a70f..fcbf90609 100644
--- a/templates/webpages/dbupgrade/units_parts_done_master.html
+++ b/templates/webpages/dbupgrade/units_parts_done_master.html
@@ -1,3 +1,4 @@
-<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
-<p><translate>No unknown units where found.</translate></p>
+<p>[% 'No unknown units where found.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/units_parts_master.html b/templates/webpages/dbupgrade/units_parts_master.html
index ad0645082..8cb2aa71f 100644
--- a/templates/webpages/dbupgrade/units_parts_master.html
+++ b/templates/webpages/dbupgrade/units_parts_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 1 of 3: Parts' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,20 +11,14 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading"><translate>Add unit</translate></div>
+ <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
 
  <p>
-  <translate>For each unit there's either no or exactly one base
-   unit. If you chose a base unit then you also have to chose a
-   factor. That way the new unit will be defined as a multiple of the
-   base unit. The base unit must be the &quot;smaller&quot; one. A
-   factor may not be less than 1. Therefore you may define
-   &quot;kg&quot; with the base unit &quot;g&quot; and a factor of
-   &quot;1&quot;, but not the other way round.</translate>
+  [% 'For each unit there's either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
  </p>
 
  <p>
-  <translate>The following units exist already:</translate>
+  [% 'The following units exist already:' | $T8 %]
   [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
@@ -31,11 +26,11 @@
 
  <table>
   <tr>
-   <th align="right"><translate>Unit</translate></th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
    <td><input name="new_name" size="20" maxlength="20"></td>
   </tr>
   <tr>
-   <th align="right"><translate>Base unit</translate></th>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
    <td>
     <select name="new_base_unit">
      [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
@@ -43,26 +38,26 @@
    </td>
   </tr>
   <tr>
-   <th align="right"><translate>Factor</translate></th>
+   <th align="right">[% 'Factor' | $T8 %]</th>
    <td><input name="new_factor"></td>
   </tr>
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="<translate>Add unit</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="[% 'Add unit' | $T8 %]">
 
  <hr>
 
- <div class="subsubheading"><translate>Assign new units</translate></div>
+ <div class="subsubheading">[% 'Assign new units' | $T8 %]</div>
 
  <p>
-  <translate>The following units are unknown.</translate>
-  <translate>You have to chose which unit to save for each of them.</translate>
+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <th class="listheading"><translate>Current unit</translate></th>
-   <th class="listheading"><translate>New unit</translate></th>
+   <th class="listheading">[% 'Current unit' | $T8 %]</th>
+   <th class="listheading">[% 'New unit' | $T8 %]</th>
   </tr>
 
   [% FOREACH row = UNKNOWN_PART_UNITS %]
@@ -80,7 +75,7 @@
   [% END %]
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/units_services_de.html b/templates/webpages/dbupgrade/units_services_de.html
index 0304c3807..ba4ba277e 100644
--- a/templates/webpages/dbupgrade/units_services_de.html
+++ b/templates/webpages/dbupgrade/units_services_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,14 +11,14 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading">Einheit hinzuf&uuml;gen</div>
+ <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
 
  <p>
-  Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.
+  [% 'For each unit there's either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
  </p>
 
  <p>
-  Die folgenden Einheiten existieren bereits:
+  [% 'The following units exist already:' | $T8 %]
   [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
@@ -25,11 +26,11 @@
 
  <table>
   <tr>
-   <th align="right">Einheit</th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
    <td><input name="new_name" size="20" maxlength="20"></td>
   </tr>
   <tr>
-   <th align="right">Basiseinheit</th>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
    <td>
     <select name="new_base_unit">
      [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
@@ -37,26 +38,26 @@
    </td>
   </tr>
   <tr>
-   <th align="right">Faktor</th>
+   <th align="right">[% 'Factor' | $T8 %]</th>
    <td><input name="new_factor"></td>
   </tr>
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="Einheit hinzuf&uuml;gen">
+ <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="[% 'Add unit' | $T8 %]">
 
  <hr>
 
- <div class="subsubheading">Neue Einheiten zuweisen</div>
+ <div class="subsubheading">[% 'Assign new units' | $T8 %]</div>
 
  <p>
-  Die folgenden Einheiten sind unbekannt.
-  Sie m&uuml;ssen f&uuml;r jeden Artikel die neue Einheit ausw&auml;hlen.
+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <th class="listheading">Aktuelle Einheit</th>
-   <th class="listheading">Neue Einheit</th>
+   <th class="listheading">[% 'Current unit' | $T8 %]</th>
+   <th class="listheading">[% 'New unit' | $T8 %]</th>
   </tr>
 
   [% FOREACH row = UNKNOWN_PART_UNITS %]
@@ -74,7 +75,7 @@
   [% END %]
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Einheiten zuweisen">
+ <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/units_services_done_de.html b/templates/webpages/dbupgrade/units_services_done_de.html
index fd671a03b..7de3335f3 100644
--- a/templates/webpages/dbupgrade/units_services_done_de.html
+++ b/templates/webpages/dbupgrade/units_services_done_de.html
@@ -1,3 +1,4 @@
-<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
-<p>Es wurden keine unbekannten Einheiten gefunden.</p>
+<p>[% 'No unknown units where found.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/units_services_done_master.html b/templates/webpages/dbupgrade/units_services_done_master.html
index 21aef1410..7de3335f3 100644
--- a/templates/webpages/dbupgrade/units_services_done_master.html
+++ b/templates/webpages/dbupgrade/units_services_done_master.html
@@ -1,3 +1,4 @@
-<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
-<p><translate>No unknown units where found.</translate></p>
+<p>[% 'No unknown units where found.' | $T8 %]</p>
diff --git a/templates/webpages/dbupgrade/units_services_master.html b/templates/webpages/dbupgrade/units_services_master.html
index 32ba81c46..ba4ba277e 100644
--- a/templates/webpages/dbupgrade/units_services_master.html
+++ b/templates/webpages/dbupgrade/units_services_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 2 of 3: Services' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -10,20 +11,14 @@
   <p>[% saved_message %]</p>
  [% END %]
 
- <div class="subsubheading"><translate>Add unit</translate></div>
+ <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
 
  <p>
-  <translate>For each unit there's either no or exactly one base
-   unit. If you chose a base unit then you also have to chose a
-   factor. That way the new unit will be defined as a multiple of the
-   base unit. The base unit must be the &quot;smaller&quot; one. A
-   factor may not be less than 1. Therefore you may define
-   &quot;kg&quot; with the base unit &quot;g&quot; and a factor of
-   &quot;1&quot;, but not the other way round.</translate>
+  [% 'For each unit there's either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
  </p>
 
  <p>
-  <translate>The following units exist already:</translate>
+  [% 'The following units exist already:' | $T8 %]
   [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
@@ -31,11 +26,11 @@
 
  <table>
   <tr>
-   <th align="right"><translate>Unit</translate></th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
    <td><input name="new_name" size="20" maxlength="20"></td>
   </tr>
   <tr>
-   <th align="right"><translate>Base unit</translate></th>
+   <th align="right">[% 'Base unit' | $T8 %]</th>
    <td>
     <select name="new_base_unit">
      [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
@@ -43,26 +38,26 @@
    </td>
   </tr>
   <tr>
-   <th align="right"><translate>Factor</translate></th>
+   <th align="right">[% 'Factor' | $T8 %]</th>
    <td><input name="new_factor"></td>
   </tr>
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="<translate>Add unit</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'add_unit'; document.Form.submit();" name="dummy" value="[% 'Add unit' | $T8 %]">
 
  <hr>
 
- <div class="subsubheading"><translate>Assign new units</translate></div>
+ <div class="subsubheading">[% 'Assign new units' | $T8 %]</div>
 
  <p>
-  <translate>The following units are unknown.</translate>
-  <translate>You have to chose which unit to save for each of them.</translate>
+  [% 'The following units are unknown.' | $T8 %]
+  [% 'You have to chose which unit to save for each of them.' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <th class="listheading"><translate>Current unit</translate></th>
-   <th class="listheading"><translate>New unit</translate></th>
+   <th class="listheading">[% 'Current unit' | $T8 %]</th>
+   <th class="listheading">[% 'New unit' | $T8 %]</th>
   </tr>
 
   [% FOREACH row = UNKNOWN_PART_UNITS %]
@@ -80,7 +75,7 @@
   [% END %]
  </table>
 
- <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>">
+ <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/dbupgrade/units_set_default_de.html b/templates/webpages/dbupgrade/units_set_default_de.html
index 1377c6fe4..285f11bc7 100644
--- a/templates/webpages/dbupgrade/units_set_default_de.html
+++ b/templates/webpages/dbupgrade/units_set_default_de.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop">Schritt 3 von 3: Standardeinheiten</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 3 of 3: Default units' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -7,13 +8,13 @@
  <input type="hidden" name="action2" value="">
 
  <p>
-  Es gibt noch Eintr&auml;ge in der Datenbank, f&uuml;r die keine Einheit zugeordnet ist.
-  Sie m&uuml;ssen eine Ma&szlig;- und eine Dienstleistungseinheit ausw&auml;hlen, die diesen Waren und Dienstleistungen, denen noch keine Einheit zugeordnet ist, zugeordnet wird.
+  [% 'There are still entries in the database for which no unit has been assigned.' | $T8 %]
+  [% 'You have to chose a dimension unit and a service unit which will then be assigned to those entries.' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <td>Ma&szlig;einheit:</td>
+   <td>[% 'Dimension unit' | $T8 %]:</td>
    <td>
     <select name="default_dimension_unit">
      [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
@@ -22,7 +23,7 @@
   </tr>
   <tr>
 
-   <td>Dienstleistungseinheit:</td>
+   <td>[% 'Service unit' | $T8 %]:</td>
    <td>
     <select name="default_service_unit">
      [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
@@ -31,6 +32,6 @@
   </tr>
  </table>
 
- <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="Einheiten zuweisen"></p>
+ <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]"></p>
 
 </form>
diff --git a/templates/webpages/dbupgrade/units_set_default_done_de.html b/templates/webpages/dbupgrade/units_set_default_done_de.html
index 799ba6fc1..4dbf5c2c2 100644
--- a/templates/webpages/dbupgrade/units_set_default_done_de.html
+++ b/templates/webpages/dbupgrade/units_set_default_done_de.html
@@ -1,7 +1,8 @@
-<div class="listtop">Schritt 3 von 3: Standardeinheiten</div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 3 of 3: Default units' | $T8 %]</div>
 
-<p>Es wurden keine Eintr&auml;ge gefunden, denen keine Einheit zugeordnet war.</p>
+<p>[% 'No entries were found which had no unit assigned to them.' | $T8 %]</p>
 
-<p>Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.</p>
+<p>[% 'The database upgrade for the introduction of units is now complete.' | $T8 %]</p>
 
 <hr>
diff --git a/templates/webpages/dbupgrade/units_set_default_done_master.html b/templates/webpages/dbupgrade/units_set_default_done_master.html
index 0a6801dcb..4dbf5c2c2 100644
--- a/templates/webpages/dbupgrade/units_set_default_done_master.html
+++ b/templates/webpages/dbupgrade/units_set_default_done_master.html
@@ -1,7 +1,8 @@
-<div class="listtop"><translate>Step 3 of 3: Default units</translate></div>
+[%- USE T8 %]
+<div class="listtop">[% 'Step 3 of 3: Default units' | $T8 %]</div>
 
-<p><translate>No entries were found which had no unit assigned to them.</translate></p>
+<p>[% 'No entries were found which had no unit assigned to them.' | $T8 %]</p>
 
-<p><translate>The database upgrade for the introduction of units is now complete.</translate></p>
+<p>[% 'The database upgrade for the introduction of units is now complete.' | $T8 %]</p>
 
 <hr>
diff --git a/templates/webpages/dbupgrade/units_set_default_master.html b/templates/webpages/dbupgrade/units_set_default_master.html
index e2779d91a..285f11bc7 100644
--- a/templates/webpages/dbupgrade/units_set_default_master.html
+++ b/templates/webpages/dbupgrade/units_set_default_master.html
@@ -1,4 +1,5 @@
-[% USE HTML %]<div class="listtop"><translate>Step 3 of 3: Default units</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Step 3 of 3: Default units' | $T8 %]</div>
 
 <form name="Form" method="post" action="login.pl">
 
@@ -7,15 +8,13 @@
  <input type="hidden" name="action2" value="">
 
  <p>
-  <translate>There are still entries in the database for which no unit
-   has been assigned.</translate>
-  <translate>You have to chose a dimension unit and a service unit
-   which will then be assigned to those entries.</translate>
+  [% 'There are still entries in the database for which no unit has been assigned.' | $T8 %]
+  [% 'You have to chose a dimension unit and a service unit which will then be assigned to those entries.' | $T8 %]
  </p>
 
  <table>
   <tr>
-   <td><translate>Dimension unit</translate>:</td>
+   <td>[% 'Dimension unit' | $T8 %]:</td>
    <td>
     <select name="default_dimension_unit">
      [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
@@ -24,7 +23,7 @@
   </tr>
   <tr>
 
-   <td><translate>Service unit</translate>:</td>
+   <td>[% 'Service unit' | $T8 %]:</td>
    <td>
     <select name="default_service_unit">
      [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
@@ -33,6 +32,6 @@
   </tr>
  </table>
 
- <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>"></p>
+ <p><input type="submit" onclick="document.Form.action2.value = 'set_default'; document.Form.submit();" name="dummy" value="[% 'Assign units' | $T8 %]"></p>
 
 </form>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_de.html b/templates/webpages/dbupgrade/update_templates_warnings_de.html
index 4b8f00ba5..81bf7b804 100644
--- a/templates/webpages/dbupgrade/update_templates_warnings_de.html
+++ b/templates/webpages/dbupgrade/update_templates_warnings_de.html
@@ -1,6 +1,7 @@
-[% USE HTML %]<div class="listtop">Warnungen bei Aktualisierung der Dokumentenvorlagen</div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Warnings during template upgrade' | $T8 %]</div>
 
-<p>Die folgenden Warnungen traten w&auml;hrend einer Aktualisierung der Dokumentenvorlagen auf:</p>
+<p>[% 'The following warnings occured during an upgrade to the document templates:' | $T8 %]</p>
 
 <p>
  <ul>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_master.html b/templates/webpages/dbupgrade/update_templates_warnings_master.html
index 69e20ef60..81bf7b804 100644
--- a/templates/webpages/dbupgrade/update_templates_warnings_master.html
+++ b/templates/webpages/dbupgrade/update_templates_warnings_master.html
@@ -1,7 +1,7 @@
-[% USE HTML %]<div class="listtop"><translate>Warnings during template upgrade</translate></div>
+[%- USE T8 %]
+[% USE HTML %]<div class="listtop">[% 'Warnings during template upgrade' | $T8 %]</div>
 
-<p><translate>The following warnings occured during an upgrade to the
-  document templates:</translate></p>
+<p>[% 'The following warnings occured during an upgrade to the document templates:' | $T8 %]</p>
 
 <p>
  <ul>
diff --git a/templates/webpages/dbupgrade/upgrade_message2_de.html b/templates/webpages/dbupgrade/upgrade_message2_de.html
index 2c2f57f6c..f7047102d 100644
--- a/templates/webpages/dbupgrade/upgrade_message2_de.html
+++ b/templates/webpages/dbupgrade/upgrade_message2_de.html
@@ -1,4 +1,6 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<ul>
- <li>F&uuml;hre [% HTML.escape(file) %] aus: [% description %]</li>
+ <li>[% LxERP.t8('Applying #1:', file) | html %] [% description %]</li>
 </ul>
 
diff --git a/templates/webpages/dbupgrade/upgrade_message2_master.html b/templates/webpages/dbupgrade/upgrade_message2_master.html
index f7aedd185..f7047102d 100644
--- a/templates/webpages/dbupgrade/upgrade_message2_master.html
+++ b/templates/webpages/dbupgrade/upgrade_message2_master.html
@@ -1,4 +1,6 @@
+[%- USE T8 %]
+[%- USE LxERP %]
 [% USE HTML %]<ul>
- <li><translate>Applying [% HTML.escape(file) %]:</translate> [% description %]</li>
+ <li>[% LxERP.t8('Applying #1:', file) | html %] [% description %]</li>
 </ul>
 
diff --git a/templates/webpages/dbupgrade/warehouse_form_de.html b/templates/webpages/dbupgrade/warehouse_form_de.html
index 77972fc25..5edff88f7 100644
--- a/templates/webpages/dbupgrade/warehouse_form_de.html
+++ b/templates/webpages/dbupgrade/warehouse_form_de.html
@@ -1,24 +1,25 @@
+[%- USE T8 %]
 [% USE HTML %]
-<div class="listtop">Lagermigration</div>
+<div class="listtop">[% 'Warehouse Migration' | $T8 %]</div>
 
 <form action="[% script %]" method="POST">
  <p>
-  Lx-Office enth&auml;lt jetzt auch echte Lagerverwaultung anstatt reiner Mengenz&auml;hlung.
-  Dieses update &auml;ndert die Art und Weise wie Lagermengen gez&auml;lt werden.
-  Als Konsequenz k&ouml;nnen die gespeicherten Mengen entweder in ein Lager &uuml;berf&uuml;hrt werden, oder f&uuml;r eine frische Lagerverwaltung resettet werden.
+  [% 'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
+  [% 'This update will change the nature the onhand of goods is tracked.' | $T8 %]
+  [% 'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' | $T8 %]
  </p>
 
- <p>M&ouml;chten Sie die vorhandenen Mengendaten in ein Lager &uuml;bertragen?</p>
+ <p>[% 'Do you want to store the existing onhand values into a new warehouse?' | $T8 %]</p>
 
- <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">Ja</label>
- <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">Nein</label>
+ <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">[% 'Yes' | $T8 %]</label>
+ <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">[% 'No' | $T8 %]</label>
 
- <p>Bitte geben Sie den Namen des Ziellagers f&uuml;r die &uuml;bernommenen Daten ein.</p>
+ <p>[% 'Please specify a description for the warehouse designated for these goods.' | $T8 %]</p>
  <input name="import_warehouse" size="50">
 
- <p>Da Lagerpl&auml;tze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.<p>
+ <p>[% 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' | $T8 %]<p>
 
   <input name="bin_default" size="50">
 
- <p><input type="submit" value="Weiter"></p>
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
 </form>
diff --git a/templates/webpages/dbupgrade/warehouse_form_master.html b/templates/webpages/dbupgrade/warehouse_form_master.html
index 3ad1adb5e..5edff88f7 100644
--- a/templates/webpages/dbupgrade/warehouse_form_master.html
+++ b/templates/webpages/dbupgrade/warehouse_form_master.html
@@ -1,24 +1,25 @@
+[%- USE T8 %]
 [% USE HTML %]
-<div class="listtop"><translate>Warehouse Migration</translate></div>
+<div class="listtop">[% 'Warehouse Migration' | $T8 %]</div>
 
 <form action="[% script %]" method="POST">
  <p>
-  <translate>Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.</translate>
-  <translate>This update will change the nature the onhand of goods is tracked.</translate>
-  <translate>As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking</translate>
+  [% 'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
+  [% 'This update will change the nature the onhand of goods is tracked.' | $T8 %]
+  [% 'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' | $T8 %]
  </p>
 
- <p><translate>Do you want to store the existing onhand values into a new warehouse?</translate></p>
+ <p>[% 'Do you want to store the existing onhand values into a new warehouse?' | $T8 %]</p>
 
- <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y"><translate>Yes</translate></label>
- <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N"><translate>No</translate></label>
+ <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">[% 'Yes' | $T8 %]</label>
+ <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">[% 'No' | $T8 %]</label>
 
- <p><translate>Please specify a description for the warehouse designated for these goods.</translate></p>
+ <p>[% 'Please specify a description for the warehouse designated for these goods.' | $T8 %]</p>
  <input name="import_warehouse" size="50">
 
- <p><translate>Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.</translate><p>
+ <p>[% 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' | $T8 %]<p>
 
   <input name="bin_default" size="50">
 
- <p><input type="submit" value="<translate>Continue</translate>"></p>
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
 </form>
diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html
index 3be95a20d..6fd0d5e1d 100644
--- a/templates/webpages/dbupgrade/warning_de.html
+++ b/templates/webpages/dbupgrade/warning_de.html
@@ -1,10 +1,13 @@
-[% USE HTML %]<form name="Form" method="post" action="login.pl">
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<form name="Form" method="post" action="login.pl">
 
  <input type="hidden" name="action" value="login">
 
  <p>
-  Lx-Office wird gleich die Datenbank <b>[% HTML.escape(dbname) %]</b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.
+  [% LxERP.t8('Lx-Office is about to update the database <b>#1</b>. You should create a backup of the database before proceeding because the backup might not be reversible.', dbname) | html %]
  </p>
 
- <input type="submit" name="dummy" value="Weiter">
+ <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]">
 </form>
diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
index 10f70a41c..6fd0d5e1d 100644
--- a/templates/webpages/dbupgrade/warning_master.html
+++ b/templates/webpages/dbupgrade/warning_master.html
@@ -1,13 +1,13 @@
-[% USE HTML %]<form name="Form" method="post" action="login.pl">
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+<form name="Form" method="post" action="login.pl">
 
  <input type="hidden" name="action" value="login">
 
  <p>
-  <translate>Lx-Office is about to update the
-   database <b>[% HTML.escape(dbname) %]</b>. You should create a
-   backup of the database before proceeding because the backup might not
-   be reversible.</translate>
+  [% LxERP.t8('Lx-Office is about to update the database <b>#1</b>. You should create a backup of the database before proceeding because the backup might not be reversible.', dbname) | html %]
  </p>
 
- <input type="submit" name="dummy" value="<translate>Continue</translate>">
+ <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]">
 </form>
diff --git a/templates/webpages/do/delete_de.html b/templates/webpages/do/delete_de.html
index afb8e3e8d..9cd35923c 100644
--- a/templates/webpages/do/delete_de.html
+++ b/templates/webpages/do/delete_de.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
- <div class="listtop">Lieferschein l&ouml;schen</div>
+ <div class="listtop">[% 'Delete delivery order' | $T8 %]</div>
 
  <form method="post" action="do.pl">
 
-  <h2 class="confirm">Best&auml;tigen</h2>
+  <h2 class="confirm">[% 'Confirm' | $T8 %]</h2>
 
-  <p>[% LxERP.format_string('Sind Sie sicher, dass Sie Lieferschein #1 l&ouml;schen wollen?', donumber) %]</p>
+  <p>[% LxERP.t8('Are you sure you want to delete Delivery Order Number #1?', donumber) %]</p>
 
   [%- FOREACH row = VARIABLES %]
   <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
@@ -14,8 +15,8 @@
 
   <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
   <input type="hidden" name="no_nextsub" value="update">
-  <input name="action" class="submit" type="submit" value="Ja">
-  <input name="action" class="submit" type="submit" value="Nein">
+  <input name="action" class="submit" type="submit" value="[% 'Yes' | $T8 %]">
+  <input name="action" class="submit" type="submit" value="[% 'No' | $T8 %]">
  </form>
 
 </body>
diff --git a/templates/webpages/do/delete_master.html b/templates/webpages/do/delete_master.html
index cf550d346..9cd35923c 100644
--- a/templates/webpages/do/delete_master.html
+++ b/templates/webpages/do/delete_master.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
- <div class="listtop"><translate>Delete delivery order</translate></div>
+ <div class="listtop">[% 'Delete delivery order' | $T8 %]</div>
 
  <form method="post" action="do.pl">
 
-  <h2 class="confirm"><translate>Confirm</translate></h2>
+  <h2 class="confirm">[% 'Confirm' | $T8 %]</h2>
 
-  <p>[% LxERP.format_string('<translate>Are you sure you want to delete Delivery Order Number #1?</translate>', donumber) %]</p>
+  <p>[% LxERP.t8('Are you sure you want to delete Delivery Order Number #1?', donumber) %]</p>
 
   [%- FOREACH row = VARIABLES %]
   <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
@@ -14,8 +15,8 @@
 
   <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
   <input type="hidden" name="no_nextsub" value="update">
-  <input name="action" class="submit" type="submit" value="<translate>Yes</translate>">
-  <input name="action" class="submit" type="submit" value="<translate>No</translate>">
+  <input name="action" class="submit" type="submit" value="[% 'Yes' | $T8 %]">
+  <input name="action" class="submit" type="submit" value="[% 'No' | $T8 %]">
  </form>
 
 </body>
diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html
index 693d03297..b81ce8cfe 100644
--- a/templates/webpages/do/form_footer_de.html
+++ b/templates/webpages/do/form_footer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<!-- <body> -->
 <!--  <form> -->
 <!--   <p> -->
@@ -11,8 +12,8 @@
      <td>
       <table>
        <tr valign="bottom">
-        <th align="left">Bemerkungen</th>
-        <th align="left">interne Bemerkungen</th>
+        <th align="left">[% 'Notes' | $T8 %]</th>
+        <th align="left">[% 'Internal Notes' | $T8 %]</th>
        </tr>
 
        <tr valign="top">
@@ -29,13 +30,13 @@
   <hr size="3" noshade>
 
   [%- IF conf_webdav %]
-  <div class="listtop" align="left">Dokumente im WebDAV-Repository</div>
+  <div class="listtop" align="left">[% 'Documents in the WebDAV repository' | $T8 %]</div>
 
   <p>
    <table width="100%">
     <tr>
-     <td align="left" width="30%"><b>Dateiname</b></td>
-     <td align="left" width="70%"><b>WebDAV-Link</b></td>
+     <td align="left" width="30%"><b>[% 'File name' | $T8 %]</b></td>
+     <td align="left" width="70%"><b>[% 'WebDAV link' | $T8 %]</b></td>
     </tr>
 
     [%- FOREACH file = WEBDAV %]
@@ -54,40 +55,40 @@
   <p>[% PRINT_OPTIONS %]</p>
 
   <p>
-   Lieferschein bearbeiten<br>
+   [% 'Edit the Delivery Order' | $T8 %]<br>
    <input type="hidden" name="action" value="dispatcher">
-   <input class="submit" type="submit" name="action_update" id="update_button" value="Erneuern">
+   <input class="submit" type="submit" name="action_update" id="update_button" value="[% 'Update' | $T8 %]">
    [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_ship_to" value="Lieferadresse">
+   <input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
    [%- END %]
    [%- END %]
-   <input class="submit" type="submit" name="action_print" value="Drucken">
-   <input class="submit" type="submit" name="action_e_mail" value="eMail">
+   <input class="submit" type="submit" name="action_print" value="[% 'Print' | $T8 %]">
+   <input class="submit" type="submit" name="action_e_mail" value="[% 'E-mail' | $T8 %]">
    [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action_save" value="Speichern">
+   <input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_transfer_out" value="Auslagern">
+   <input class="submit" type="submit" name="action_transfer_out" value="[% 'Transfer out' | $T8 %]">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action_transfer_in" value="Einlagern">
+   <input class="submit" type="submit" name="action_transfer_in" value="[% 'Transfer in' | $T8 %]">
    [%- END %]
    [%- END %]
    [%- IF id %]
    [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action_mark_closed" value="Als geschlossen markieren">
+   <input class="submit" type="submit" name="action_mark_closed" value="[% 'Mark closed' | $T8 %]">
    [%- END %]
-   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
+   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
    [%- END %]
   </p>
 
   [%- IF id %]
   <p>
-   Workflow Lieferschein<br>
-   <input class="submit" type="submit" name="action_save_as_new" value="als neu speichern">
+   [% 'Workflow Delivery Order' | $T8 %]<br>
+   <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
    [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="Löschen">
+   <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
    [% END %]
-   <input class="submit" type="submit" name="action_invoice" value="Rechnung">
+   <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
   </p>
   [%- END %]
 
diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
index cb040030a..b81ce8cfe 100644
--- a/templates/webpages/do/form_footer_master.html
+++ b/templates/webpages/do/form_footer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<!-- <body> -->
 <!--  <form> -->
 <!--   <p> -->
@@ -11,8 +12,8 @@
      <td>
       <table>
        <tr valign="bottom">
-        <th align="left"><translate>Notes</translate></th>
-        <th align="left"><translate>Internal Notes</translate></th>
+        <th align="left">[% 'Notes' | $T8 %]</th>
+        <th align="left">[% 'Internal Notes' | $T8 %]</th>
        </tr>
 
        <tr valign="top">
@@ -29,13 +30,13 @@
   <hr size="3" noshade>
 
   [%- IF conf_webdav %]
-  <div class="listtop" align="left"><translate>Documents in the WebDAV repository</translate></div>
+  <div class="listtop" align="left">[% 'Documents in the WebDAV repository' | $T8 %]</div>
 
   <p>
    <table width="100%">
     <tr>
-     <td align="left" width="30%"><b><translate>File name</translate></b></td>
-     <td align="left" width="70%"><b><translate>WebDAV link</translate></b></td>
+     <td align="left" width="30%"><b>[% 'File name' | $T8 %]</b></td>
+     <td align="left" width="70%"><b>[% 'WebDAV link' | $T8 %]</b></td>
     </tr>
 
     [%- FOREACH file = WEBDAV %]
@@ -54,40 +55,40 @@
   <p>[% PRINT_OPTIONS %]</p>
 
   <p>
-   <translate>Edit the Delivery Order</translate><br>
+   [% 'Edit the Delivery Order' | $T8 %]<br>
    <input type="hidden" name="action" value="dispatcher">
-   <input class="submit" type="submit" name="action_update" id="update_button" value="<translate>Update</translate>">
+   <input class="submit" type="submit" name="action_update" id="update_button" value="[% 'Update' | $T8 %]">
    [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_ship_to" value="<translate>Ship to</translate>">
+   <input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
    [%- END %]
    [%- END %]
-   <input class="submit" type="submit" name="action_print" value="<translate>Print</translate>">
-   <input class="submit" type="submit" name="action_e_mail" value="<translate>E-mail</translate>">
+   <input class="submit" type="submit" name="action_print" value="[% 'Print' | $T8 %]">
+   <input class="submit" type="submit" name="action_e_mail" value="[% 'E-mail' | $T8 %]">
    [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action_save" value="<translate>Save</translate>">
+   <input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action_transfer_out" value="<translate>Transfer out</translate>">
+   <input class="submit" type="submit" name="action_transfer_out" value="[% 'Transfer out' | $T8 %]">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action_transfer_in" value="<translate>Transfer in</translate>">
+   <input class="submit" type="submit" name="action_transfer_in" value="[% 'Transfer in' | $T8 %]">
    [%- END %]
    [%- END %]
    [%- IF id %]
    [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action_mark_closed" value="<translate>Mark closed</translate>">
+   <input class="submit" type="submit" name="action_mark_closed" value="[% 'Mark closed' | $T8 %]">
    [%- END %]
-   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
+   <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
    [%- END %]
   </p>
 
   [%- IF id %]
   <p>
-   <translate>Workflow Delivery Order</translate><br>
-   <input class="submit" type="submit" name="action_save_as_new" value="<translate>Save as new</translate>">
+   [% 'Workflow Delivery Order' | $T8 %]<br>
+   <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
    [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="<translate>Delete</translate>">
+   <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
    [% END %]
-   <input class="submit" type="submit" name="action_invoice" value="<translate>Invoice</translate>">
+   <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
   </p>
   [%- END %]
 
diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html
index 372227855..2f98575f0 100644
--- a/templates/webpages/do/form_header_de.html
+++ b/templates/webpages/do/form_header_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body onload="on_load()">
 
  <script type="text/javascript" src="js/show_form_details.js"></script>
@@ -13,8 +14,8 @@
   <!--
       function on_load() {
         [% IF onload %][% onload %];[% END %]
-        setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
-        setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
+        setupDateFormat('[% myconfig_dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+        setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
 
         [%- UNLESS delivered %]
         Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
@@ -104,7 +105,7 @@
        <tr>
         <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
-        <th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
+        <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
         <td>
          [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
          <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
@@ -116,12 +117,12 @@
          </select>
          <input type="hidden" name="select[% vc %]" value="1">
          [%- END %]
-         <input type="button" value="D" onclick="show_vc_details('[% vc %]')">
+         <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% vc %]')">
         </td>
 
         [%- IF ALL_CONTACTS.size %]
         <tr>
-         <th align="right">Ansprechpartner</th>
+         <th align="right">[% 'Contact Person' | $T8 %]</th>
          <td>
           [%- IF delivered %]
           <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
@@ -144,7 +145,7 @@
 
         [%- IF ALL_SHIPTO.size %]
         <tr>
-         <th align="right">Lieferadresse</th>
+         <th align="right">[% 'Shipping Address' | $T8 %]</th>
          <td>
           [%- IF delivered %]
           <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
@@ -176,16 +177,16 @@
 
         [%- IF business %]
         <tr>
-         <th align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</th>
+         <th align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
          <td>[% HTML.escape(business) %]</td>
         </tr>
         [%- END %]
 
         [%- IF max_dunning_level %]
         <tr>
-         <th align="right">höchste Mahnstufe</th>
+         <th align="right">[% 'Max. Dunning Level' | $T8 %]</th>
          <td>
-          <b>[% HTML.escape(max_dunning_level) %]</b>; gemahnter Betrag:
+          <b>[% HTML.escape(max_dunning_level) %]</b>; [% 'Dunning Amount' | $T8 %]:
           <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
          </td>
         </tr>
@@ -194,7 +195,7 @@
 
        [%- IF ALL_DEPARTMENTS.size %]
        <tr>
-        <th align="right" nowrap>Abteilung</th>
+        <th align="right" nowrap>[% 'Department' | $T8 %]</th>
         <td colspan="3">
          [%- IF delivered %]
          <input type="hidden" name="department" value="[% HTML.escape(department) %]">
@@ -214,17 +215,17 @@
        [%- END %]
 
        <tr>
-        <th align="right">Versandort</th>
+        <th align="right">[% 'Shipping Point' | $T8 %]</th>
         <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th align="right">Transportmittel</th>
+        <th align="right">[% 'Ship via' | $T8 %]</th>
         <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th align="right">Vorgangsbezeichnung</th>
+        <th align="right">[% 'Transaction description' | $T8 %]</th>
         <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
        </tr>
 
@@ -238,22 +239,22 @@
         <td colspan="2" align="center">
          [%- IF delivered %]
           [%- IF is_customer %]
-          ausgelagert
+          [% 'transferred out' | $T8 %]
           [%- ELSE %]
-          eingelagert
+          [% 'transferred in' | $T8 %]
           [%- END %]
          [%- ELSE %]
           [%- IF is_customer %]
-          noch nicht ausgelagert
+          [% 'not transferred out yet' | $T8 %]
           [%- ELSE %]
-          noch nicht eingelagert
+          [% 'not transferred in yet' | $T8 %]
           [%- END %]
          [%- END %]
          ;
          [%- IF closed %]
-          Geschlossen
+          [% 'Closed' | $T8 %]
          [%- ELSE %]
-          Offen
+          [% 'Open' | $T8 %]
          [%- END %]
         </td>
        </tr>
@@ -261,7 +262,7 @@
        <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
 
        <tr>
-        <th align="right">Bearbeiter</th>
+        <th align="right">[% 'Employee' | $T8 %]</th>
         <td>
          [%- IF delivered %]
          <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
@@ -287,7 +288,7 @@
        [%- SET the_salesman_id = employee_id %]
        [%- END %]
        <tr>
-        <th align="right">Verkäufer/in</th>
+        <th align="right">[% 'Salesman' | $T8 %]</th>
         <td>
          [%- IF delivered %]
          <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
@@ -308,22 +309,22 @@
        [%- END %]
 
        <tr>
-        <th width="70%" align="right" nowrap>Lieferscheinnummer</th>
+        <th width="70%" align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
         <td><input name="donumber" size="11" value="[% HTML.escape(donumber) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>Auftragsnummer</th>
+        <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
         <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>[% IF is_customer %]Bestellnummer des Kunden[% ELSE %]Bestellnummer beim Lieferanten[% END %]</th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th align="right" nowrap>Lieferscheindatum</th>
+        <th align="right" nowrap>[% 'Delivery Order Date' | $T8 %]</th>
         <td nowrap>
          <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
                 onBlur="check_right_date_format(this)"[% RO %]>
@@ -332,7 +333,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>Projektnummer</th>
+        <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
         <td>
          [%- IF delivered %]
          <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
index 44dd902cb..2f98575f0 100644
--- a/templates/webpages/do/form_header_master.html
+++ b/templates/webpages/do/form_header_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body onload="on_load()">
 
  <script type="text/javascript" src="js/show_form_details.js"></script>
@@ -13,8 +14,8 @@
   <!--
       function on_load() {
         [% IF onload %][% onload %];[% END %]
-        setupDateFormat('[% myconfig_dateformat %]', '<translate>Falsches Datumsformat!</translate>');
-        setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
+        setupDateFormat('[% myconfig_dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+        setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
 
         [%- UNLESS delivered %]
         Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
@@ -104,7 +105,7 @@
        <tr>
         <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
-        <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
+        <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
         <td>
          [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
          <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
@@ -116,12 +117,12 @@
          </select>
          <input type="hidden" name="select[% vc %]" value="1">
          [%- END %]
-         <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% vc %]')">
+         <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% vc %]')">
         </td>
 
         [%- IF ALL_CONTACTS.size %]
         <tr>
-         <th align="right"><translate>Contact Person</translate></th>
+         <th align="right">[% 'Contact Person' | $T8 %]</th>
          <td>
           [%- IF delivered %]
           <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
@@ -144,7 +145,7 @@
 
         [%- IF ALL_SHIPTO.size %]
         <tr>
-         <th align="right"><translate>Shipping Address</translate></th>
+         <th align="right">[% 'Shipping Address' | $T8 %]</th>
          <td>
           [%- IF delivered %]
           <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
@@ -176,16 +177,16 @@
 
         [%- IF business %]
         <tr>
-         <th align="right">[% IF is_customer %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</th>
+         <th align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
          <td>[% HTML.escape(business) %]</td>
         </tr>
         [%- END %]
 
         [%- IF max_dunning_level %]
         <tr>
-         <th align="right"><translate>Max. Dunning Level</translate></th>
+         <th align="right">[% 'Max. Dunning Level' | $T8 %]</th>
          <td>
-          <b>[% HTML.escape(max_dunning_level) %]</b>; <translate>Dunning Amount</translate>:
+          <b>[% HTML.escape(max_dunning_level) %]</b>; [% 'Dunning Amount' | $T8 %]:
           <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
          </td>
         </tr>
@@ -194,7 +195,7 @@
 
        [%- IF ALL_DEPARTMENTS.size %]
        <tr>
-        <th align="right" nowrap><translate>Department</translate></th>
+        <th align="right" nowrap>[% 'Department' | $T8 %]</th>
         <td colspan="3">
          [%- IF delivered %]
          <input type="hidden" name="department" value="[% HTML.escape(department) %]">
@@ -214,17 +215,17 @@
        [%- END %]
 
        <tr>
-        <th align="right"><translate>Shipping Point</translate></th>
+        <th align="right">[% 'Shipping Point' | $T8 %]</th>
         <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th align="right"><translate>Ship via</translate></th>
+        <th align="right">[% 'Ship via' | $T8 %]</th>
         <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th align="right"><translate>Transaction description</translate></th>
+        <th align="right">[% 'Transaction description' | $T8 %]</th>
         <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
        </tr>
 
@@ -238,22 +239,22 @@
         <td colspan="2" align="center">
          [%- IF delivered %]
           [%- IF is_customer %]
-          <translate>transferred out</translate>
+          [% 'transferred out' | $T8 %]
           [%- ELSE %]
-          <translate>transferred in</translate>
+          [% 'transferred in' | $T8 %]
           [%- END %]
          [%- ELSE %]
           [%- IF is_customer %]
-          <translate>not transferred out yet</translate>
+          [% 'not transferred out yet' | $T8 %]
           [%- ELSE %]
-          <translate>not transferred in yet</translate>
+          [% 'not transferred in yet' | $T8 %]
           [%- END %]
          [%- END %]
          ;
          [%- IF closed %]
-          <translate>Closed</translate>
+          [% 'Closed' | $T8 %]
          [%- ELSE %]
-          <translate>Open</translate>
+          [% 'Open' | $T8 %]
          [%- END %]
         </td>
        </tr>
@@ -261,7 +262,7 @@
        <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
 
        <tr>
-        <th align="right"><translate>Employee</translate></th>
+        <th align="right">[% 'Employee' | $T8 %]</th>
         <td>
          [%- IF delivered %]
          <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
@@ -287,7 +288,7 @@
        [%- SET the_salesman_id = employee_id %]
        [%- END %]
        <tr>
-        <th align="right"><translate>Salesman</translate></th>
+        <th align="right">[% 'Salesman' | $T8 %]</th>
         <td>
          [%- IF delivered %]
          <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
@@ -308,22 +309,22 @@
        [%- END %]
 
        <tr>
-        <th width="70%" align="right" nowrap><translate>Delivery Order Number</translate></th>
+        <th width="70%" align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
         <td><input name="donumber" size="11" value="[% HTML.escape(donumber) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
+        <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
         <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Order Number</translate>[% END %]</th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>
 
        <tr>
-        <th align="right" nowrap><translate>Delivery Order Date</translate></th>
+        <th align="right" nowrap>[% 'Delivery Order Date' | $T8 %]</th>
         <td nowrap>
          <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
                 onBlur="check_right_date_format(this)"[% RO %]>
@@ -332,7 +333,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
+        <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
         <td>
          [%- IF delivered %]
          <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
diff --git a/templates/webpages/do/orders_bottom_de.html b/templates/webpages/do/orders_bottom_de.html
index 8026e427b..4138ca40e 100644
--- a/templates/webpages/do/orders_bottom_de.html
+++ b/templates/webpages/do/orders_bottom_de.html
@@ -1,6 +1,7 @@
+[%- USE T8 %]
 [% USE HTML %]
- Neue Rechnung<br>
- <input class="submit" type="submit" name="action" value="Weiter">
+ [% 'New invoice' | $T8 %]<br>
+ <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
  <input type="hidden" name="nextsub" value="invoice_multi">
  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
diff --git a/templates/webpages/do/orders_bottom_master.html b/templates/webpages/do/orders_bottom_master.html
index 24988d791..4138ca40e 100644
--- a/templates/webpages/do/orders_bottom_master.html
+++ b/templates/webpages/do/orders_bottom_master.html
@@ -1,6 +1,7 @@
+[%- USE T8 %]
 [% USE HTML %]
- <translate>New invoice</translate><br>
- <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+ [% 'New invoice' | $T8 %]<br>
+ <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
  <input type="hidden" name="nextsub" value="invoice_multi">
  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
  <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
diff --git a/templates/webpages/do/search_de.html b/templates/webpages/do/search_de.html
index 0ad75a0be..811384c6f 100644
--- a/templates/webpages/do/search_de.html
+++ b/templates/webpages/do/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body onload="on_load();">
 
  [%- IF vc == 'customer' %]
@@ -29,7 +30,7 @@
   <p>
    <table>
     <tr>
-     <th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
+     <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
      <td colspan="3">
       [%- UNLESS SHOW_VC_DROP_DOWN %]
       <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
@@ -46,18 +47,18 @@
     </tr>
 
     <tr>
-     <th align="right">Lieferscheinnummer</th>
+     <th align="right">[% 'Delivery Order Number' | $T8 %]</th>
      <td colspan="3"><input name="donumber" class="fixed_width"></td>
     </tr>
 
     <tr>
-     <th align="right">Auftragsnummer</th>
+     <th align="right">[% 'Order Number' | $T8 %]</th>
      <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
     </tr>
 
     [%- IF ALL_DEPARTMENTS.size %]
     <tr>
-     <th align="right" nowrap>Abteilung</th>
+     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
      <td colspan="3">
       <select name="department" class="fixed_width">
        <option></option>
@@ -70,7 +71,7 @@
     [%- END %]
 
     <tr>
-     <th align="right">Bearbeiter</th>
+     <th align="right">[% 'Employee' | $T8 %]</th>
      <td>
       <select name="employee_id" class="fixed_width">
        <option></option>
@@ -83,7 +84,7 @@
 
     [%- IF is_customer %]
     <tr>
-     <th align="right">Verkäufer/in</th>
+     <th align="right">[% 'Salesman' | $T8 %]</th>
      <td>
       <select name="salesman_id" class="fixed_width">
        <option></option>
@@ -96,17 +97,17 @@
     [%- END %]
 
     <tr>
-     <th align="right">Vorgangsbezeichnung</th>
+     <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td colspan="3"><input name="transaction_description" class="fixed_width"></td>
     </tr>
 
     <tr>
-     <th align="right">Bestellnummer des Kunden</th>
+     <th align="right">[% 'Customer Order Number' | $T8 %]</th>
      <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
     </tr>
 
     <tr>
-     <th align="right">Projektnummer</th>
+     <th align="right">[% 'Project Number' | $T8 %]</th>
      <td colspan="3">
       <select name="project_id" class="fixed_width">
        <option></option>
@@ -118,12 +119,12 @@
     </tr>
 
     <tr>
-     <th align="right">Von</th>
+     <th align="right">[% 'From' | $T8 %]</th>
      <td>
       <input name="transdatefrom" id="transdatefrom" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom_button" id="transdatefrom_trigger" value="?">
      </td>
-     <th align="right">bis</th>
+     <th align="right">[% 'Bis' | $T8 %]</th>
      <td>
       <input name="transdateto" id="transdateto" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdateto_button" id="transdateto_trigger" value="?">
@@ -131,92 +132,92 @@
     </tr>
 
     <tr>
-     <th align="right">In Bericht aufnehmen</th>
+     <th align="right">[% 'Include in Report' | $T8 %]</th>
      <td colspan="5">
       <table>
        <tr>
         <td>
          <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open">Offen</label>
+         <label for="open">[% 'Open' | $T8 %]</label>
         </td>
         <td>
          <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed">Geschlossen</label>
+         <label for="closed">[% 'Closed' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered">Nicht geliefert</label>
+         <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
         </td>
         <td>
          <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">Geliefert</label></td>
+         <label for="delivered">[% 'Delivered' | $T8 %]</label></td>
        </tr>
 
        <tr>
         <td>
          <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id">Buchungsnummer</label>
+         <label for="l_id">[% 'ID' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_donumber" id="l_donumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_donumber">Lieferscheinnummer</label>
+         <label for="l_donumber">[% 'Delivery Order Number' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_ordnumber" id="l_ordnumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_ordnumber">Auftragsnummer</label>
+         <label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_cusordnumber">Bestellnummer des Kunden</label>
+         <label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate">Datum</label>
+         <label for="l_transdate">[% 'Date' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</label>
+         <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee">Bearbeiter</label>
+         <label for="l_employee">[% 'Employee' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman">Verkäufer/in</label>
+         <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia">Transportmittel</label>
+         <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber">Projektnummer</label>
+         <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description">Vorgangsbezeichnung</label>
+         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
         </td>
        </tr>
 
@@ -233,7 +234,7 @@
    <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
    <input type="hidden" name="type" value="[% HTML.escape(type) %]">
 
-   <input class="submit" type="submit" name="action" value="Weiter">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/do/search_master.html b/templates/webpages/do/search_master.html
index 18759111a..811384c6f 100644
--- a/templates/webpages/do/search_master.html
+++ b/templates/webpages/do/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body onload="on_load();">
 
  [%- IF vc == 'customer' %]
@@ -29,7 +30,7 @@
   <p>
    <table>
     <tr>
-     <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
+     <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
      <td colspan="3">
       [%- UNLESS SHOW_VC_DROP_DOWN %]
       <input type="text" name="[% HTML.escape(vc) %]" class="fixed_width">
@@ -46,18 +47,18 @@
     </tr>
 
     <tr>
-     <th align="right"><translate>Delivery Order Number</translate></th>
+     <th align="right">[% 'Delivery Order Number' | $T8 %]</th>
      <td colspan="3"><input name="donumber" class="fixed_width"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Order Number</translate></th>
+     <th align="right">[% 'Order Number' | $T8 %]</th>
      <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
     </tr>
 
     [%- IF ALL_DEPARTMENTS.size %]
     <tr>
-     <th align="right" nowrap><translate>Department</translate></th>
+     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
      <td colspan="3">
       <select name="department" class="fixed_width">
        <option></option>
@@ -70,7 +71,7 @@
     [%- END %]
 
     <tr>
-     <th align="right"><translate>Employee</translate></th>
+     <th align="right">[% 'Employee' | $T8 %]</th>
      <td>
       <select name="employee_id" class="fixed_width">
        <option></option>
@@ -83,7 +84,7 @@
 
     [%- IF is_customer %]
     <tr>
-     <th align="right"><translate>Salesman</translate></th>
+     <th align="right">[% 'Salesman' | $T8 %]</th>
      <td>
       <select name="salesman_id" class="fixed_width">
        <option></option>
@@ -96,17 +97,17 @@
     [%- END %]
 
     <tr>
-     <th align="right"><translate>Transaction description</translate></th>
+     <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td colspan="3"><input name="transaction_description" class="fixed_width"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Customer Order Number</translate></th>
+     <th align="right">[% 'Customer Order Number' | $T8 %]</th>
      <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Project Number</translate></th>
+     <th align="right">[% 'Project Number' | $T8 %]</th>
      <td colspan="3">
       <select name="project_id" class="fixed_width">
        <option></option>
@@ -118,12 +119,12 @@
     </tr>
 
     <tr>
-     <th align="right"><translate>From</translate></th>
+     <th align="right">[% 'From' | $T8 %]</th>
      <td>
       <input name="transdatefrom" id="transdatefrom" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom_button" id="transdatefrom_trigger" value="?">
      </td>
-     <th align="right"><translate>Bis</translate></th>
+     <th align="right">[% 'Bis' | $T8 %]</th>
      <td>
       <input name="transdateto" id="transdateto" size="11" title="[% myconfig_dateformat %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdateto_button" id="transdateto_trigger" value="?">
@@ -131,92 +132,92 @@
     </tr>
 
     <tr>
-     <th align="right"><translate>Include in Report</translate></th>
+     <th align="right">[% 'Include in Report' | $T8 %]</th>
      <td colspan="5">
       <table>
        <tr>
         <td>
          <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open"><translate>Open</translate></label>
+         <label for="open">[% 'Open' | $T8 %]</label>
         </td>
         <td>
          <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed"><translate>Closed</translate></label>
+         <label for="closed">[% 'Closed' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered"><translate>Not delivered</translate></label>
+         <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
         </td>
         <td>
          <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered"><translate>Delivered</translate></label></td>
+         <label for="delivered">[% 'Delivered' | $T8 %]</label></td>
        </tr>
 
        <tr>
         <td>
          <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id"><translate>ID</translate></label>
+         <label for="l_id">[% 'ID' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_donumber" id="l_donumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_donumber"><translate>Delivery Order Number</translate></label>
+         <label for="l_donumber">[% 'Delivery Order Number' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_ordnumber" id="l_ordnumber" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_ordnumber"><translate>Order Number</translate></label>
+         <label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_cusordnumber"><translate>Customer Order Number</translate></label>
+         <label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate"><translate>Date</translate></label>
+         <label for="l_transdate">[% 'Date' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</label>
+         <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee"><translate>Employee</translate></label>
+         <label for="l_employee">[% 'Employee' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman"><translate>Salesman</translate></label>
+         <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia"><translate>Ship via</translate></label>
+         <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber"><translate>Project Number</translate></label>
+         <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
         </td>
 
         <td>
          <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description"><translate>Transaction description</translate></label>
+         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
         </td>
        </tr>
 
@@ -233,7 +234,7 @@
    <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
    <input type="hidden" name="type" value="[% HTML.escape(type) %]">
 
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/do/stock_in_form_de.html b/templates/webpages/do/stock_in_form_de.html
index 1db223ddb..238747ef6 100644
--- a/templates/webpages/do/stock_in_form_de.html
+++ b/templates/webpages/do/stock_in_form_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
 
  [%- UNLESS delivered %]
@@ -61,15 +62,15 @@
   <p>
    <table>
     <tr>
-     <td>Artikelnummer</td>
+     <td>[% 'Part Number' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
     </tr>
     <tr>
-     <td>Beschreibung</td>
+     <td>[% 'Description' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.description) %]</td>
     </tr>
     <tr>
-     <td>Menge laut Lieferschein</td>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
      <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
     </tr>
    </table>
@@ -89,14 +90,14 @@
    <table>
     <tr class="listheading">
      <th class="listheading">&nbsp;</th>
-     <th class="listheading">Lager</th>
-     <th class="listheading">Lagerplatz</th>
-     <th class="listheading">Chargennummer</th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
-     <th align="right" class="listheading">Menge</th>
-     <th align="right" class="listheading">Einheit</th>
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = STOCK_INFO %]
@@ -153,10 +154,10 @@
 
   <p>
    [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Erneuern">
-   <input class="submit" type="submit" name="action" value="Weiter">
+   <input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/do/stock_in_form_master.html b/templates/webpages/do/stock_in_form_master.html
index e8c411b3a..238747ef6 100644
--- a/templates/webpages/do/stock_in_form_master.html
+++ b/templates/webpages/do/stock_in_form_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
 
  [%- UNLESS delivered %]
@@ -61,15 +62,15 @@
   <p>
    <table>
     <tr>
-     <td><translate>Part Number</translate></td>
+     <td>[% 'Part Number' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
     </tr>
     <tr>
-     <td><translate>Description</translate></td>
+     <td>[% 'Description' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.description) %]</td>
     </tr>
     <tr>
-     <td><translate>Qty according to delivery order</translate></td>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
      <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
     </tr>
    </table>
@@ -89,14 +90,14 @@
    <table>
     <tr class="listheading">
      <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Warehouse</translate></th>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
-     <th align="right" class="listheading"><translate>Qty</translate></th>
-     <th align="right" class="listheading"><translate>Unit</translate></th>
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = STOCK_INFO %]
@@ -153,10 +154,10 @@
 
   <p>
    [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Update</translate>">
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/do/stock_out_form_de.html b/templates/webpages/do/stock_out_form_de.html
index a182da5ff..f9ffbba10 100644
--- a/templates/webpages/do/stock_out_form_de.html
+++ b/templates/webpages/do/stock_out_form_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
  [%- IF delivered %]
@@ -21,24 +22,24 @@
   <p>
    <table>
     <tr>
-     <td>Artikelnummer</td>
+     <td>[% 'Part Number' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
     </tr>
     <tr>
-     <td>Beschreibung</td>
+     <td>[% 'Description' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.description) %]</td>
     </tr>
     <tr>
-     <td>Menge laut Lieferschein</td>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
      <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
     </tr>
    </table>
   </p>
 
   [%- UNLESS WHCONTENTS.size %]
-  <p>Dieser Artikel ist nicht eingelagert.</p>
+  <p>[% 'There are no items in stock.' | $T8 %]</p>
 
-  <p><button type="button" onclick="window.close()">Fenster Schlie&szlig;en</button></p>
+  <p><button type="button" onclick="window.close()">[% 'Close Window' | $T8 %]</button></p>
 
   [%- ELSE %]
 
@@ -57,17 +58,17 @@
    <table>
     <tr class="listheading">
      <th class="listheading">&nbsp;</th>
-     <th class="listheading">Lager</th>
-     <th class="listheading">Lagerplatz</th>
-     <th class="listheading">Chargennummer</th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
      [%- UNLESS delivered %]
-     <th align="right" class="listheading">Lagerbestand</th>
+     <th align="right" class="listheading">[% 'Available qty' | $T8 %]</th>
      [%- END %]
-     <th align="right" class="listheading">Menge</th>
-     <th align="right" class="listheading">Einheit</th>
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = WHCONTENTS %]
@@ -119,9 +120,9 @@
 
   <p>
    [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Weiter">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
    [%- END %]
   </p>
 
diff --git a/templates/webpages/do/stock_out_form_master.html b/templates/webpages/do/stock_out_form_master.html
index e8f7a13a6..f9ffbba10 100644
--- a/templates/webpages/do/stock_out_form_master.html
+++ b/templates/webpages/do/stock_out_form_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
  [%- IF delivered %]
@@ -21,24 +22,24 @@
   <p>
    <table>
     <tr>
-     <td><translate>Part Number</translate></td>
+     <td>[% 'Part Number' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
     </tr>
     <tr>
-     <td><translate>Description</translate></td>
+     <td>[% 'Description' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.description) %]</td>
     </tr>
     <tr>
-     <td><translate>Qty according to delivery order</translate></td>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
      <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
     </tr>
    </table>
   </p>
 
   [%- UNLESS WHCONTENTS.size %]
-  <p><translate>There are no items in stock.</translate></p>
+  <p>[% 'There are no items in stock.' | $T8 %]</p>
 
-  <p><button type="button" onclick="window.close()"><translate>Close Window</translate></button></p>
+  <p><button type="button" onclick="window.close()">[% 'Close Window' | $T8 %]</button></p>
 
   [%- ELSE %]
 
@@ -57,17 +58,17 @@
    <table>
     <tr class="listheading">
      <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Warehouse</translate></th>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
      [%- UNLESS delivered %]
-     <th align="right" class="listheading"><translate>Available qty</translate></th>
+     <th align="right" class="listheading">[% 'Available qty' | $T8 %]</th>
      [%- END %]
-     <th align="right" class="listheading"><translate>Qty</translate></th>
-     <th align="right" class="listheading"><translate>Unit</translate></th>
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = WHCONTENTS %]
@@ -119,9 +120,9 @@
 
   <p>
    [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
    [%- END %]
   </p>
 
diff --git a/templates/webpages/drafts/load_de.html b/templates/webpages/drafts/load_de.html
index 49e22cf12..13aae21f3 100644
--- a/templates/webpages/drafts/load_de.html
+++ b/templates/webpages/drafts/load_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <form action="[% HTML.escape(script) %]" method="post">
@@ -6,13 +7,13 @@
 
   <table width="100%">
    <tr>
-    <th class="listtop">Entwurf laden</th>
+    <th class="listtop">[% 'Load draft' | $T8 %]</th>
    </tr>
    <tr height="5"></tr>
 
    <tr>
     <td>
-     Die folgenden Entw&uuml;rfe wurden gespeichert und k&ouml;nnen geladen werden.
+     [% 'The following drafts have been saved and can be loaded.' | $T8 %]
     </td>
    </tr>
 
@@ -21,9 +22,9 @@
      <table>
       <tr>
        <th class="listheading">&nbsp;</th>
-       <th class="listheading">Datum</th>
-       <th class="listheading">Beschreibung</th>
-       <th class="listheading">Bearbeiter</th>
+       <th class="listheading">[% 'Date' | $T8 %]</th>
+       <th class="listheading">[% 'Description' | $T8 %]</th>
+       <th class="listheading">[% 'Employee' | $T8 %]</th>
       </tr>
 
       [% FOREACH row = DRAFTS %]
@@ -41,8 +42,8 @@
    <tr>
     <td>
      <input type="hidden" name="action" value="draft_action_dispatcher">
-     <input type="submit" class="submit" name="draft_action" value="Überspringen">
-     <input type="submit" class="submit" name="draft_action" value="Entwürfe löschen">
+     <input type="submit" class="submit" name="draft_action" value="[% 'Skip' | $T8 %]">
+     <input type="submit" class="submit" name="draft_action" value="[% 'Delete drafts' | $T8 %]">
     </td>
    </tr>
   </table>
diff --git a/templates/webpages/drafts/load_master.html b/templates/webpages/drafts/load_master.html
index cc80110fe..13aae21f3 100644
--- a/templates/webpages/drafts/load_master.html
+++ b/templates/webpages/drafts/load_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <form action="[% HTML.escape(script) %]" method="post">
@@ -6,13 +7,13 @@
 
   <table width="100%">
    <tr>
-    <th class="listtop"><translate>Load draft</translate></th>
+    <th class="listtop">[% 'Load draft' | $T8 %]</th>
    </tr>
    <tr height="5"></tr>
 
    <tr>
     <td>
-     <translate>The following drafts have been saved and can be loaded.</translate>
+     [% 'The following drafts have been saved and can be loaded.' | $T8 %]
     </td>
    </tr>
 
@@ -21,9 +22,9 @@
      <table>
       <tr>
        <th class="listheading">&nbsp;</th>
-       <th class="listheading"><translate>Date</translate></th>
-       <th class="listheading"><translate>Description</translate></th>
-       <th class="listheading"><translate>Employee</translate></th>
+       <th class="listheading">[% 'Date' | $T8 %]</th>
+       <th class="listheading">[% 'Description' | $T8 %]</th>
+       <th class="listheading">[% 'Employee' | $T8 %]</th>
       </tr>
 
       [% FOREACH row = DRAFTS %]
@@ -41,8 +42,8 @@
    <tr>
     <td>
      <input type="hidden" name="action" value="draft_action_dispatcher">
-     <input type="submit" class="submit" name="draft_action" value="<translate>Skip</translate>">
-     <input type="submit" class="submit" name="draft_action" value="<translate>Delete drafts</translate>">
+     <input type="submit" class="submit" name="draft_action" value="[% 'Skip' | $T8 %]">
+     <input type="submit" class="submit" name="draft_action" value="[% 'Delete drafts' | $T8 %]">
     </td>
    </tr>
   </table>
diff --git a/templates/webpages/drafts/save_new_de.html b/templates/webpages/drafts/save_new_de.html
index 01c46c157..aaf04ac4e 100644
--- a/templates/webpages/drafts/save_new_de.html
+++ b/templates/webpages/drafts/save_new_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <form action="[% HTML.escape(script) %]" method="post">
@@ -6,24 +7,24 @@
 
   <table width="100%">
    <tr>
-    <th class="listtop">Entwurf speichern</th>
+    <th class="listtop">[% 'Save draft' | $T8 %]</th>
    </tr>
    <tr height="5"></tr>
 
    <tr>
-    <td>Geben Sie eine Beschreibung f&uuml;r diesen Entwurf ein.</td>
+    <td>[% 'Enter a description for this new draft.' | $T8 %]</td>
    </tr>
 
    <tr>
     <td>
-    Beschreibung:
+    [% 'Description' | $T8 %]:
     <input name="draft_description">
     </td>
    </tr>
 
    <tr>
     <td>
-     <input type="submit" class="submit" name="action" value="Entwurf speichern">
+     <input type="submit" class="submit" name="action" value="[% 'Save draft' | $T8 %]">
     </td>
    </tr>
   </table>
diff --git a/templates/webpages/drafts/save_new_master.html b/templates/webpages/drafts/save_new_master.html
index 3f773a17e..aaf04ac4e 100644
--- a/templates/webpages/drafts/save_new_master.html
+++ b/templates/webpages/drafts/save_new_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <form action="[% HTML.escape(script) %]" method="post">
@@ -6,24 +7,24 @@
 
   <table width="100%">
    <tr>
-    <th class="listtop"><translate>Save draft</translate></th>
+    <th class="listtop">[% 'Save draft' | $T8 %]</th>
    </tr>
    <tr height="5"></tr>
 
    <tr>
-    <td><translate>Enter a description for this new draft.</translate></td>
+    <td>[% 'Enter a description for this new draft.' | $T8 %]</td>
    </tr>
 
    <tr>
     <td>
-    <translate>Description</translate>:
+    [% 'Description' | $T8 %]:
     <input name="draft_description">
     </td>
    </tr>
 
    <tr>
     <td>
-     <input type="submit" class="submit" name="action" value="<translate>Save draft</translate>">
+     <input type="submit" class="submit" name="action" value="[% 'Save draft' | $T8 %]">
     </td>
    </tr>
   </table>
diff --git a/templates/webpages/dunning/add_de.html b/templates/webpages/dunning/add_de.html
index 6a1c193af..9b6d4e287 100644
--- a/templates/webpages/dunning/add_de.html
+++ b/templates/webpages/dunning/add_de.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript">
  <!--
      function setup_controls() {
        fokus();
-       setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
+       setupDateFormat('[% myconfig_dateformat %]', '[% 'Wrong date format!' | $T8 %]');
+       setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
      }
    -->
 </script>
@@ -17,7 +18,7 @@
 
   <table>
    <tr>
-    <th align="right">Kunde</th>
+    <th align="right">[% 'Customer' | $T8 %]</th>
     <td colspan="3">
      [% IF SHOW_CUSTOMER_SELECTION %]
       <select name="customer">
@@ -32,7 +33,7 @@
 
    [% IF SHOW_DUNNING_LEVEL_SELECTION %]
     <tr>
-     <th align="right">Nächste Mahnstufe</th>
+     <th align="right">[% 'Next Dunning Level' | $T8 %]</th>
      <td colspan="3">
       <select name="dunning_level">
        <option></option>
@@ -44,7 +45,7 @@
 
    [% IF SHOW_DEPARTMENT_SELECTION %]
     <tr>
-     <th align="right">Abteilung</th>
+     <th align="right">[% 'Department' | $T8 %]</th>
      <td colspan="3">
       <select name="department">
        <option></option>
@@ -55,29 +56,29 @@
    [% END %]
 
    <tr>
-    <th align="right" nowrap>Rechnungsnummer</th>
+    <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
     <td colspan="3"><input name="invnumber" size="20"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>Auftragsnummer</th>
+    <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
     <td colspan="3"><input name="ordnumber" size="20"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>Bemerkungen</th>
+    <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
     <td colspan="3"><input name="notes" size="40"></td>
    </tr>
 
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
    <tr>
-    <th align="right" nowrap>Mindestbetrag</th>
+    <th align="right" nowrap>[% 'Minimum Amount' | $T8 %]</th>
     <td><input name="minamount" size="6"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap>Rechnungen zusammenfassen</th>
+    <th align="right" nowrap>[% 'Group Invoices' | $T8 %]</th>
     <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
    </tr>
   </table>
@@ -85,7 +86,7 @@
   <input type="hidden" name="nextsub" value="show_invoices">
 
   <br>
-  <input class="submit" type="submit" name="action" value="Weiter">
+  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/dunning/add_master.html b/templates/webpages/dunning/add_master.html
index 3c29092bd..9b6d4e287 100644
--- a/templates/webpages/dunning/add_master.html
+++ b/templates/webpages/dunning/add_master.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript">
  <!--
      function setup_controls() {
        fokus();
-       setupDateFormat('[% myconfig_dateformat %]', '<translate>Wrong date format!</translate>');
-       setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
+       setupDateFormat('[% myconfig_dateformat %]', '[% 'Wrong date format!' | $T8 %]');
+       setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
      }
    -->
 </script>
@@ -17,7 +18,7 @@
 
   <table>
    <tr>
-    <th align="right"><translate>Customer</translate></th>
+    <th align="right">[% 'Customer' | $T8 %]</th>
     <td colspan="3">
      [% IF SHOW_CUSTOMER_SELECTION %]
       <select name="customer">
@@ -32,7 +33,7 @@
 
    [% IF SHOW_DUNNING_LEVEL_SELECTION %]
     <tr>
-     <th align="right"><translate>Next Dunning Level</translate></th>
+     <th align="right">[% 'Next Dunning Level' | $T8 %]</th>
      <td colspan="3">
       <select name="dunning_level">
        <option></option>
@@ -44,7 +45,7 @@
 
    [% IF SHOW_DEPARTMENT_SELECTION %]
     <tr>
-     <th align="right"><translate>Department</translate></th>
+     <th align="right">[% 'Department' | $T8 %]</th>
      <td colspan="3">
       <select name="department">
        <option></option>
@@ -55,29 +56,29 @@
    [% END %]
 
    <tr>
-    <th align="right" nowrap><translate>Invoice Number</translate></th>
+    <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
     <td colspan="3"><input name="invnumber" size="20"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Order Number</translate></th>
+    <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
     <td colspan="3"><input name="ordnumber" size="20"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Notes</translate></th>
+    <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
     <td colspan="3"><input name="notes" size="40"></td>
    </tr>
 
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
    <tr>
-    <th align="right" nowrap><translate>Minimum Amount</translate></th>
+    <th align="right" nowrap>[% 'Minimum Amount' | $T8 %]</th>
     <td><input name="minamount" size="6"></td>
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Group Invoices</translate></th>
+    <th align="right" nowrap>[% 'Group Invoices' | $T8 %]</th>
     <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
    </tr>
   </table>
@@ -85,7 +86,7 @@
   <input type="hidden" name="nextsub" value="show_invoices">
 
   <br>
-  <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/dunning/edit_config_de.html b/templates/webpages/dunning/edit_config_de.html
index d829d3b8f..b539ad938 100644
--- a/templates/webpages/dunning/edit_config_de.html
+++ b/templates/webpages/dunning/edit_config_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/dunning.js"></script>
@@ -9,17 +10,17 @@
    <tr height="5"></tr>
 
    <tr>
-    <th class="listheading">Mahnlevel</th>
-    <th class="listheading">Mahnstufenbeschreibung</th>
-    <th class="listheading">Aktiviert?</th>
-    <th class="listheading">eMail-Versand?</th>
-<!--     <th class="listheading">Auto. Versand?</th>  -->
-    <th class="listheading">Rechnung erstellen?</th>
-    <th class="listheading">Fristsetzung</th>
-    <th class="listheading">Fällikeitsdatum +Tage</th>
-    <th class="listheading">Gebühr</th>
-    <th class="listheading">Zinssatz</th>
-    <th class="listheading">Druckvorlage</th>
+    <th class="listheading">[% 'Dunning Level' | $T8 %]</th>
+    <th class="listheading">[% 'Dunning Description' | $T8 %]</th>
+    <th class="listheading">[% 'Active?' | $T8 %]</th>
+    <th class="listheading">[% 'eMail Send?' | $T8 %]</th>
+<!--     <th class="listheading">[% 'Auto Send?' | $T8 %]</th>  -->
+    <th class="listheading">[% 'Create invoice?' | $T8 %]</th>
+    <th class="listheading">[% 'Fristsetzung' | $T8 %]</th>
+    <th class="listheading">[% 'Duedate +Days' | $T8 %]</th>
+    <th class="listheading">[% 'Fee' | $T8 %]</th>
+    <th class="listheading">[% 'Interest Rate' | $T8 %]</th>
+    <th class="listheading">[% 'Template' | $T8 %]</th>
    </tr>
 
    [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
@@ -36,7 +37,7 @@
      <td>
       <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
       <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')">
-       L</button>
+       [% 'L' | $T8 %]</button>
       <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
       <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
       <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
@@ -67,7 +68,7 @@
     <td>
      <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
      <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')">
-      L</button>
+      [% 'L' | $T8 %]</button>
      <input type="hidden" name="email_body_[% rowcount %]">
      <input type="hidden" name="email_subject_[% rowcount %]">
      <input type="hidden" name="email_attachment_[% rowcount %]">
@@ -87,11 +88,11 @@
 
   <hr size="3" noshade>
 
-  <p>Wenn das automatische Erstellen einer Rechnung &uuml;ber Mahngeb&uuml;hren und Zinsen f&uuml;r ein Mahnlevel aktiviert ist, so werden die folgenden Konten f&uuml;r die Rechnung benutzt.</p>
+  <p>[% 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' | $T8 %]</p>
 
   <table>
    <tr>
-    <th align="right">Konto f&uuml;r Geb&uuml;hren</th>
+    <th align="right">[% 'Account for fees' | $T8 %]</th>
     <td>
      <select name="AR_amount_fee">
       [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
@@ -101,7 +102,7 @@
    </tr>
 
    <tr>
-    <th align="right">Konto f&uuml;r Zinsen</th>
+    <th align="right">[% 'Account for interest' | $T8 %]</th>
     <td>
      <select name="AR_amount_interest">
       [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
@@ -111,7 +112,7 @@
    </tr>
 
    <tr>
-    <th align="right">Buchen auf</th>
+    <th align="right">[% 'Record in' | $T8 %]</th>
     <td>
      <select name="AR">
       [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
@@ -125,7 +126,7 @@
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <input class="submit" type="submit" name="action" value="Speichern">
+  <input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
 
  </form>
 </body>
diff --git a/templates/webpages/dunning/edit_config_master.html b/templates/webpages/dunning/edit_config_master.html
index 3d8cb6095..b539ad938 100644
--- a/templates/webpages/dunning/edit_config_master.html
+++ b/templates/webpages/dunning/edit_config_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/dunning.js"></script>
@@ -9,17 +10,17 @@
    <tr height="5"></tr>
 
    <tr>
-    <th class="listheading"><translate>Dunning Level</translate></th>
-    <th class="listheading"><translate>Dunning Description</translate></th>
-    <th class="listheading"><translate>Active?</translate></th>
-    <th class="listheading"><translate>eMail Send?</translate></th>
-<!--     <th class="listheading"><translate>Auto Send?</translate></th>  -->
-    <th class="listheading"><translate>Create invoice?</translate></th>
-    <th class="listheading"><translate>Fristsetzung</translate></th>
-    <th class="listheading"><translate>Duedate +Days</translate></th>
-    <th class="listheading"><translate>Fee</translate></th>
-    <th class="listheading"><translate>Interest Rate</translate></th>
-    <th class="listheading"><translate>Template</translate></th>
+    <th class="listheading">[% 'Dunning Level' | $T8 %]</th>
+    <th class="listheading">[% 'Dunning Description' | $T8 %]</th>
+    <th class="listheading">[% 'Active?' | $T8 %]</th>
+    <th class="listheading">[% 'eMail Send?' | $T8 %]</th>
+<!--     <th class="listheading">[% 'Auto Send?' | $T8 %]</th>  -->
+    <th class="listheading">[% 'Create invoice?' | $T8 %]</th>
+    <th class="listheading">[% 'Fristsetzung' | $T8 %]</th>
+    <th class="listheading">[% 'Duedate +Days' | $T8 %]</th>
+    <th class="listheading">[% 'Fee' | $T8 %]</th>
+    <th class="listheading">[% 'Interest Rate' | $T8 %]</th>
+    <th class="listheading">[% 'Template' | $T8 %]</th>
    </tr>
 
    [% SET odd = '1' %][% USE DUNNING_it = Iterator(DUNNING) %][% FOREACH row = DUNNING_it %]
@@ -36,7 +37,7 @@
      <td>
       <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
       <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')">
-       <translate>L</translate></button>
+       [% 'L' | $T8 %]</button>
       <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
       <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
       <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
@@ -67,7 +68,7 @@
     <td>
      <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
      <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')">
-      <translate>L</translate></button>
+      [% 'L' | $T8 %]</button>
      <input type="hidden" name="email_body_[% rowcount %]">
      <input type="hidden" name="email_subject_[% rowcount %]">
      <input type="hidden" name="email_attachment_[% rowcount %]">
@@ -87,13 +88,11 @@
 
   <hr size="3" noshade>
 
-  <p><translate>If the automatic creation of invoices for fees and
-    interest is switched on for a dunning level then the following
-    accounts will be used for the invoice.</translate></p>
+  <p>[% 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' | $T8 %]</p>
 
   <table>
    <tr>
-    <th align="right"><translate>Account for fees</translate></th>
+    <th align="right">[% 'Account for fees' | $T8 %]</th>
     <td>
      <select name="AR_amount_fee">
       [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
@@ -103,7 +102,7 @@
    </tr>
 
    <tr>
-    <th align="right"><translate>Account for interest</translate></th>
+    <th align="right">[% 'Account for interest' | $T8 %]</th>
     <td>
      <select name="AR_amount_interest">
       [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
@@ -113,7 +112,7 @@
    </tr>
 
    <tr>
-    <th align="right"><translate>Record in</translate></th>
+    <th align="right">[% 'Record in' | $T8 %]</th>
     <td>
      <select name="AR">
       [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
@@ -127,7 +126,7 @@
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
 
  </form>
 </body>
diff --git a/templates/webpages/dunning/search_de.html b/templates/webpages/dunning/search_de.html
index d715c15b1..6611df216 100644
--- a/templates/webpages/dunning/search_de.html
+++ b/templates/webpages/dunning/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onLoad="[% onload %]">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -12,7 +13,7 @@
     <td>
      <table>
       <tr>
-       <th align="right">Kunde</th>
+       <th align="right">[% 'Customer' | $T8 %]</th>
        <td colspan="3">
         [% IF SHOW_CUSTOMER_DDBOX %]
          <select name="customer_id">
@@ -28,7 +29,7 @@
 
       [% IF SHOW_DUNNING_LEVELS %]
        <tr>
-        <th align="right" nowrap>Mahnlevel</th>
+        <th align="right" nowrap>[% 'Dunning Level' | $T8 %]</th>
         <td colspan="3">
          <select name="dunning_level">
           <option value=""></option>
@@ -41,7 +42,7 @@
 
       [% IF SHOW_DEPARTMENT_DDBOX %]
        <tr>
-        <th align="right" nowrap>Abteilung</th>
+        <th align="right" nowrap>[% 'Department' | $T8 %]</th>
         <td colspan="3">
          <select name="department_id">
           <option value=""></option>
@@ -53,27 +54,27 @@
       [% END %]
 
       <tr>
-       <th align="right" nowrap>Rechnungsnummer</th>
+       <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
        <td colspan="3"><input name="invnumber" size="20"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap>Auftragsnummer</th>
+       <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
        <td colspan="3"><input name="ordnumber" size="20"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap>Bemerkungen</th>
+       <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
        <td colspan="3"><input name="notes" size="40"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap>Rechnungen von</th>
+       <th align="right" nowrap>[% 'Invdate from' | $T8 %]</th>
        <td>
         <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="transdatefrom" id="trigger1" value="?">
        </td>
-       <th align="right" nowrap>Bis</th>
+       <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
        <td>
         <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="transdateto" id="trigger2" value="?">
@@ -81,19 +82,19 @@
       </tr>
 
       <tr>
-       <th align="right" nowrap>Mahnungen von</th>
+       <th align="right" nowrap>[% 'Dunning Date from' | $T8 %]</th>
        <td>
         <input name="dunningfrom" id="dunningfrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="dunningfrom" id="trigger3" value="?">
        </td>
-       <th align="right" nowrap>Bis</th>
+       <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
        <td>
         <input name="dunningto" id="dunningto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="dunningto" id="trigger4" value="?">
        </td>
       </tr>
       <tr>
-       <th align="right">Verkäufer/in</th>
+       <th align="right">[% 'Salesman' | $T8 %]</th>
        <td>
         [%- INCLUDE 'generic/multibox.html'
             name          = 'salesman_id',
@@ -117,9 +118,9 @@
     <td>
      <table>
       <tr>
-       <th align="right" nowrap>Alte Mahnungen anzeigen</th>
+       <th align="right" nowrap>[% 'Show old dunnings' | $T8 %]</th>
        <td><input type="checkbox" value="1" name="showold"></td>
-       <th align="right" nowrap>Verkäufer anzeigen</th>
+       <th align="right" nowrap>[% 'Show Salesman' | $T8 %]</th>
        <td><input type="checkbox" value="1" name="l_salesman"></td>
       </tr>
      </table>
@@ -131,7 +132,7 @@
 
   <br>
 
-  <input class="submit" type="submit" name="action" value="Weiter">
+  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/dunning/search_master.html b/templates/webpages/dunning/search_master.html
index c2b1b3a39..6611df216 100644
--- a/templates/webpages/dunning/search_master.html
+++ b/templates/webpages/dunning/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onLoad="[% onload %]">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -12,7 +13,7 @@
     <td>
      <table>
       <tr>
-       <th align="right"><translate>Customer</translate></th>
+       <th align="right">[% 'Customer' | $T8 %]</th>
        <td colspan="3">
         [% IF SHOW_CUSTOMER_DDBOX %]
          <select name="customer_id">
@@ -28,7 +29,7 @@
 
       [% IF SHOW_DUNNING_LEVELS %]
        <tr>
-        <th align="right" nowrap><translate>Dunning Level</translate></th>
+        <th align="right" nowrap>[% 'Dunning Level' | $T8 %]</th>
         <td colspan="3">
          <select name="dunning_level">
           <option value=""></option>
@@ -41,7 +42,7 @@
 
       [% IF SHOW_DEPARTMENT_DDBOX %]
        <tr>
-        <th align="right" nowrap><translate>Department</translate></th>
+        <th align="right" nowrap>[% 'Department' | $T8 %]</th>
         <td colspan="3">
          <select name="department_id">
           <option value=""></option>
@@ -53,27 +54,27 @@
       [% END %]
 
       <tr>
-       <th align="right" nowrap><translate>Invoice Number</translate></th>
+       <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
        <td colspan="3"><input name="invnumber" size="20"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Order Number</translate></th>
+       <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
        <td colspan="3"><input name="ordnumber" size="20"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Notes</translate></th>
+       <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
        <td colspan="3"><input name="notes" size="40"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Invdate from</translate></th>
+       <th align="right" nowrap>[% 'Invdate from' | $T8 %]</th>
        <td>
         <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="transdatefrom" id="trigger1" value="?">
        </td>
-       <th align="right" nowrap><translate>To (time)</translate></th>
+       <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
        <td>
         <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="transdateto" id="trigger2" value="?">
@@ -81,19 +82,19 @@
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Dunning Date from</translate></th>
+       <th align="right" nowrap>[% 'Dunning Date from' | $T8 %]</th>
        <td>
         <input name="dunningfrom" id="dunningfrom" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="dunningfrom" id="trigger3" value="?">
        </td>
-       <th align="right" nowrap><translate>To (time)</translate></th>
+       <th align="right" nowrap>[% 'To (time)' | $T8 %]</th>
        <td>
         <input name="dunningto" id="dunningto" size="11" title="[% HTML.escape(myconfig_dateformat) %]" onBlur="check_right_date_format(this)">
         <input type="button" name="dunningto" id="trigger4" value="?">
        </td>
       </tr>
       <tr>
-       <th align="right"><translate>Salesman</translate></th>
+       <th align="right">[% 'Salesman' | $T8 %]</th>
        <td>
         [%- INCLUDE 'generic/multibox.html'
             name          = 'salesman_id',
@@ -117,9 +118,9 @@
     <td>
      <table>
       <tr>
-       <th align="right" nowrap><translate>Show old dunnings</translate></th>
+       <th align="right" nowrap>[% 'Show old dunnings' | $T8 %]</th>
        <td><input type="checkbox" value="1" name="showold"></td>
-       <th align="right" nowrap><translate>Show Salesman</translate></th>
+       <th align="right" nowrap>[% 'Show Salesman' | $T8 %]</th>
        <td><input type="checkbox" value="1" name="l_salesman"></td>
       </tr>
      </table>
@@ -131,7 +132,7 @@
 
   <br>
 
-  <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/dunning/set_email_de.html b/templates/webpages/dunning/set_email_de.html
index af313dade..1b96ed91e 100644
--- a/templates/webpages/dunning/set_email_de.html
+++ b/templates/webpages/dunning/set_email_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <script type="text/javascript">
@@ -20,22 +21,22 @@
 
   <table width="100%">
    <tr>
-    <td valign="top">Betreff:</td>
+    <td valign="top">[% 'Subject:' | $T8 %]</td>
     <td valign="top"><input id="email_subject" name="email_subject" size="40" value="[% HTML.escape(email_subject) %]"></td>
    </tr>
 
    <tr>
-    <td valign="top">Text:</td>
+    <td valign="top">[% 'Body:' | $T8 %]</td>
     <td valign="top"><textarea id="email_body" name="email_body" rows="20" cols="70" wrap="soft">[% HTML.escape(email_body) %]</textarea></td>
    </tr>
 
    <tr>
-    <td valign="top">PDF anhängen</td>
+    <td valign="top">[% 'Attach PDF:' | $T8 %]</td>
     <td valign="top"><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
    </tr>
   </table>
 
-  <button type="button" onclick="email_updated()">Speichern und schlie&szlig;en</button>
+  <button type="button" onclick="email_updated()">[% 'Save and close' | $T8 %]</button>
 
  </form>
 </body>
diff --git a/templates/webpages/dunning/set_email_master.html b/templates/webpages/dunning/set_email_master.html
index ef5f256cd..1b96ed91e 100644
--- a/templates/webpages/dunning/set_email_master.html
+++ b/templates/webpages/dunning/set_email_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <script type="text/javascript">
@@ -20,22 +21,22 @@
 
   <table width="100%">
    <tr>
-    <td valign="top"><translate>Subject:</translate></td>
+    <td valign="top">[% 'Subject:' | $T8 %]</td>
     <td valign="top"><input id="email_subject" name="email_subject" size="40" value="[% HTML.escape(email_subject) %]"></td>
    </tr>
 
    <tr>
-    <td valign="top"><translate>Body:</translate></td>
+    <td valign="top">[% 'Body:' | $T8 %]</td>
     <td valign="top"><textarea id="email_body" name="email_body" rows="20" cols="70" wrap="soft">[% HTML.escape(email_body) %]</textarea></td>
    </tr>
 
    <tr>
-    <td valign="top"><translate>Attach PDF:</translate></td>
+    <td valign="top">[% 'Attach PDF:' | $T8 %]</td>
     <td valign="top"><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
    </tr>
   </table>
 
-  <button type="button" onclick="email_updated()"><translate>Save and close</translate></button>
+  <button type="button" onclick="email_updated()">[% 'Save and close' | $T8 %]</button>
 
  </form>
 </body>
diff --git a/templates/webpages/dunning/show_dunning_bottom_de.html b/templates/webpages/dunning/show_dunning_bottom_de.html
index 54f632531..8230082bc 100644
--- a/templates/webpages/dunning/show_dunning_bottom_de.html
+++ b/templates/webpages/dunning/show_dunning_bottom_de.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %]  <input type="hidden" name="rowcount" value="[% rowcount %]">
 
   <p>[% PRINT_OPTIONS %]</p>
 
   <p>
-   Mahnungen<br>
+   [% 'Dunnings' | $T8 %]<br>
    <input type="hidden" name="print_nextsub" value="print_multiple">
-   <input type="submit" class="submit" name="action" value="Drucken">
+   <input type="submit" class="submit" name="action" value="[% 'Print' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/dunning/show_dunning_bottom_master.html b/templates/webpages/dunning/show_dunning_bottom_master.html
index 8a2d33bca..8230082bc 100644
--- a/templates/webpages/dunning/show_dunning_bottom_master.html
+++ b/templates/webpages/dunning/show_dunning_bottom_master.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %]  <input type="hidden" name="rowcount" value="[% rowcount %]">
 
   <p>[% PRINT_OPTIONS %]</p>
 
   <p>
-   <translate>Dunnings</translate><br>
+   [% 'Dunnings' | $T8 %]<br>
    <input type="hidden" name="print_nextsub" value="print_multiple">
-   <input type="submit" class="submit" name="action" value="<translate>Print</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Print' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/dunning/show_invoices_de.html b/templates/webpages/dunning/show_invoices_de.html
index 5dbb0d517..db6b1adfd 100644
--- a/templates/webpages/dunning/show_invoices_de.html
+++ b/templates/webpages/dunning/show_invoices_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <script type="text/javascript" src="js/checkbox_utils.js"></script>
  <script type="text/javascript" src="js/common.js"></script>
@@ -5,32 +6,32 @@
 
  <div class="listtop" width="100%">[% title %]</div>
 
- <p>Die Spalten &quot;Zahlbar bis&quot;, &quot;Kumulierte Geb&uuml;hren&quot; und &quot;Zinsen&quot; zeigen Daten der letzten f&uuml;r diese Rechnung erzeugten Mahnung.</p>
+ <p>[% 'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' | $T8 %]</p>
 
  <form name="Form" method="post" action="dn.pl">
 
   <table width="100%">
-   <th class="listheading" colspan="2">Aktuelles / Nächstes Mahnlevel</th>
+   <th class="listheading" colspan="2">[% 'Current / Next Level' | $T8 %]</th>
 
    <th class="listheading">
     <input type="checkbox" name="selectall_active" id="selectall_active" onclick="checkbox_check_all('selectall_active', 'active_', 1, [% rowcount %]);">
-    <label for="selectall_active">Aktiviert?</label>
+    <label for="selectall_active">[% 'Active?' | $T8 %]</label>
    </th>
 
    <th class="listheading">
     <input type="checkbox" name="selectall_email" id="selectall_email" onclick="checkbox_check_all('selectall_email', 'email_', 1, [% rowcount %]);">
-    <label for="selectall_email">eMail?</label>
+    <label for="selectall_email">[% 'eMail?' | $T8 %]</label>
    </th>
 
-   <th class="listheading">Kundenname</th>
-   <th class="listheading">Rg. Nr.</th>
-   <th class="listheading">Rechnungsdatum</th>
-   <th class="listheading">Rg. Fälligkeit</th>
-   <th class="listheading">Betrag</th>
-   <th class="listheading">Offener Betrag</th>
-   <th class="listheading">Zahlbar bis</th>
-   <th class="listheading">Kumulierte Gebühren</th>
-   <th class="listheading">Zinsen</th>
+   <th class="listheading">[% 'Customername' | $T8 %]</th>
+   <th class="listheading">[% 'Invno.' | $T8 %]</th>
+   <th class="listheading">[% 'Invdate' | $T8 %]</th>
+   <th class="listheading">[% 'Inv. Duedate' | $T8 %]</th>
+   <th class="listheading">[% 'Amount' | $T8 %]</th>
+   <th class="listheading">[% 'Open Amount' | $T8 %]</th>
+   <th class="listheading">[% 'Dunning Duedate' | $T8 %]</th>
+   <th class="listheading">[% 'Total Fees' | $T8 %]</th>
+   <th class="listheading">[% 'Interest' | $T8 %]</th>
 
    <!-- Ausgabe der einzelnen Zeilen -->
 
@@ -79,10 +80,10 @@
   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
   <input name="nextsub" type="hidden" value="save_dunning">
 
-  <input type="hidden" name="action" value="Weiter">
+  <input type="hidden" name="action" value="[% 'Continue' | $T8 %]">
 
-  <input type="submit" name="dummy" value="Weiter"
-         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='Der Mahnprozess ist gestartet.'; document.Form.submit()"[% END %]>
+  <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]"
+         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='[% 'The dunning process started' | $T8 %]'; document.Form.submit()"[% END %]>
 
  </form>
 </body>
diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html
index cdb8c2d46..db6b1adfd 100644
--- a/templates/webpages/dunning/show_invoices_master.html
+++ b/templates/webpages/dunning/show_invoices_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <script type="text/javascript" src="js/checkbox_utils.js"></script>
  <script type="text/javascript" src="js/common.js"></script>
@@ -5,34 +6,32 @@
 
  <div class="listtop" width="100%">[% title %]</div>
 
- <p><translate>The columns &quot;Dunning Duedate&quot;, &quot;Total
-   Fees&quot; and &quot;Interest&quot; show data for the previous
-   dunning created for this invoice.</translate></p>
+ <p>[% 'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' | $T8 %]</p>
 
  <form name="Form" method="post" action="dn.pl">
 
   <table width="100%">
-   <th class="listheading" colspan="2"><translate>Current / Next Level</translate></th>
+   <th class="listheading" colspan="2">[% 'Current / Next Level' | $T8 %]</th>
 
    <th class="listheading">
     <input type="checkbox" name="selectall_active" id="selectall_active" onclick="checkbox_check_all('selectall_active', 'active_', 1, [% rowcount %]);">
-    <label for="selectall_active"><translate>Active?</translate></label>
+    <label for="selectall_active">[% 'Active?' | $T8 %]</label>
    </th>
 
    <th class="listheading">
     <input type="checkbox" name="selectall_email" id="selectall_email" onclick="checkbox_check_all('selectall_email', 'email_', 1, [% rowcount %]);">
-    <label for="selectall_email"><translate>eMail?</translate></label>
+    <label for="selectall_email">[% 'eMail?' | $T8 %]</label>
    </th>
 
-   <th class="listheading"><translate>Customername</translate></th>
-   <th class="listheading"><translate>Invno.</translate></th>
-   <th class="listheading"><translate>Invdate</translate></th>
-   <th class="listheading"><translate>Inv. Duedate</translate></th>
-   <th class="listheading"><translate>Amount</translate></th>
-   <th class="listheading"><translate>Open Amount</translate></th>
-   <th class="listheading"><translate>Dunning Duedate</translate></th>
-   <th class="listheading"><translate>Total Fees</translate></th>
-   <th class="listheading"><translate>Interest</translate></th>
+   <th class="listheading">[% 'Customername' | $T8 %]</th>
+   <th class="listheading">[% 'Invno.' | $T8 %]</th>
+   <th class="listheading">[% 'Invdate' | $T8 %]</th>
+   <th class="listheading">[% 'Inv. Duedate' | $T8 %]</th>
+   <th class="listheading">[% 'Amount' | $T8 %]</th>
+   <th class="listheading">[% 'Open Amount' | $T8 %]</th>
+   <th class="listheading">[% 'Dunning Duedate' | $T8 %]</th>
+   <th class="listheading">[% 'Total Fees' | $T8 %]</th>
+   <th class="listheading">[% 'Interest' | $T8 %]</th>
 
    <!-- Ausgabe der einzelnen Zeilen -->
 
@@ -81,10 +80,10 @@
   <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
   <input name="nextsub" type="hidden" value="save_dunning">
 
-  <input type="hidden" name="action" value="<translate>Continue</translate>">
+  <input type="hidden" name="action" value="[% 'Continue' | $T8 %]">
 
-  <input type="submit" name="dummy" value="<translate>Continue</translate>"
-         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='<translate>The dunning process started</translate>'; document.Form.submit()"[% END %]>
+  <input type="submit" name="dummy" value="[% 'Continue' | $T8 %]"
+         [% UNLESS DEBUG_DUNNING %]onclick="this.disabled=true; this.value='[% 'The dunning process started' | $T8 %]'; document.Form.submit()"[% END %]>
 
  </form>
 </body>
diff --git a/templates/webpages/fu/add_edit_de.html b/templates/webpages/fu/add_edit_de.html
index 0cc71db97..d32f3fcb0 100644
--- a/templates/webpages/fu/add_edit_de.html
+++ b/templates/webpages/fu/add_edit_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -25,7 +26,7 @@
   <p>
    <table>
     <tr>
-     <td valign="top">Wiedervorlage f&uuml;r Benutzer</td>
+     <td valign="top">[% 'Follow-Up for user' | $T8 %]</td>
      <td valign="top">
       <select name="created_for_user">
        [%- FOREACH row = EMPLOYEES %]
@@ -38,19 +39,19 @@
     </tr>
 
     <tr>
-     <td valign="right">Wiedervorlagedatum</td>
+     <td valign="right">[% 'Follow-Up Date' | $T8 %]</td>
      <td>
       <input name="follow_up_date" id="follow_up_date" value="[% HTML.escape(follow_up_date) %]" size="12">
       <input type="button" name="follow_up_date_button" id="follow_up_date_trigger" value="?">
     </tr>
 
     <tr>
-     <td valign="right">Betreff</td>
+     <td valign="right">[% 'Subject' | $T8 %]</td>
      <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
     </tr>
 
     <tr>
-     <td valign="right" align="top">Text</td>
+     <td valign="right" align="top">[% 'Body' | $T8 %]</td>
      <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
     </tr>
    </table>
@@ -58,13 +59,13 @@
 
   <p>
    <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_save" value="Speichern">
+   <input type="submit" class="submit" name="action_save" value="[% 'Save' | $T8 %]">
    [%- IF id %]
-   <input type="submit" class="submit" name="action_finish" value="Abschlie&szlig;en">
-   <input type="submit" class="submit" name="action_delete" value="Löschen">
+   <input type="submit" class="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+   <input type="submit" class="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
    [%- END %]
    [%- IF POPUP_MODE %]
-   <input type="submit" class="submit" onclick="window.close()" value="Abbrechen">
+   <input type="submit" class="submit" onclick="window.close()" value="[% 'Cancel' | $T8 %]">
    [%- END %]
   </p>
 
@@ -72,15 +73,15 @@
   [%- IF FOLLOW_UPS.size %]
   <hr height="3" noshade>
 
-  <div class="listtop">Noch nicht erledigte Wiedervorlagen f&uuml;r dieses Dokument</div>
+  <div class="listtop">[% 'Existing pending follow-ups for this item' | $T8 %]</div>
 
   <p>
    <table>
     <tr>
-     <th class="listheading">Wiedervorlagedatum</th>
-     <th class="listheading">Betreff</th>
-     <th class="listheading">Erstellt von</th>
-     <th class="listheading">Wiedervorlage für</th>
+     <th class="listheading">[% 'Follow-Up Date' | $T8 %]</th>
+     <th class="listheading">[% 'Subject' | $T8 %]</th>
+     <th class="listheading">[% 'Created by' | $T8 %]</th>
+     <th class="listheading">[% 'Follow-up for' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = FOLLOW_UPS %]
diff --git a/templates/webpages/fu/add_edit_master.html b/templates/webpages/fu/add_edit_master.html
index bcacbf24d..d32f3fcb0 100644
--- a/templates/webpages/fu/add_edit_master.html
+++ b/templates/webpages/fu/add_edit_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -25,7 +26,7 @@
   <p>
    <table>
     <tr>
-     <td valign="top"><translate>Follow-Up for user</translate></td>
+     <td valign="top">[% 'Follow-Up for user' | $T8 %]</td>
      <td valign="top">
       <select name="created_for_user">
        [%- FOREACH row = EMPLOYEES %]
@@ -38,19 +39,19 @@
     </tr>
 
     <tr>
-     <td valign="right"><translate>Follow-Up Date</translate></td>
+     <td valign="right">[% 'Follow-Up Date' | $T8 %]</td>
      <td>
       <input name="follow_up_date" id="follow_up_date" value="[% HTML.escape(follow_up_date) %]" size="12">
       <input type="button" name="follow_up_date_button" id="follow_up_date_trigger" value="?">
     </tr>
 
     <tr>
-     <td valign="right"><translate>Subject</translate></td>
+     <td valign="right">[% 'Subject' | $T8 %]</td>
      <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
     </tr>
 
     <tr>
-     <td valign="right" align="top"><translate>Body</translate></td>
+     <td valign="right" align="top">[% 'Body' | $T8 %]</td>
      <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
     </tr>
    </table>
@@ -58,13 +59,13 @@
 
   <p>
    <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_save" value="<translate>Save</translate>">
+   <input type="submit" class="submit" name="action_save" value="[% 'Save' | $T8 %]">
    [%- IF id %]
-   <input type="submit" class="submit" name="action_finish" value="<translate>Finish</translate>">
-   <input type="submit" class="submit" name="action_delete" value="<translate>Delete</translate>">
+   <input type="submit" class="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+   <input type="submit" class="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
    [%- END %]
    [%- IF POPUP_MODE %]
-   <input type="submit" class="submit" onclick="window.close()" value="<translate>Cancel</translate>">
+   <input type="submit" class="submit" onclick="window.close()" value="[% 'Cancel' | $T8 %]">
    [%- END %]
   </p>
 
@@ -72,15 +73,15 @@
   [%- IF FOLLOW_UPS.size %]
   <hr height="3" noshade>
 
-  <div class="listtop"><translate>Existing pending follow-ups for this item</translate></div>
+  <div class="listtop">[% 'Existing pending follow-ups for this item' | $T8 %]</div>
 
   <p>
    <table>
     <tr>
-     <th class="listheading"><translate>Follow-Up Date</translate></th>
-     <th class="listheading"><translate>Subject</translate></th>
-     <th class="listheading"><translate>Created by</translate></th>
-     <th class="listheading"><translate>Follow-up for</translate></th>
+     <th class="listheading">[% 'Follow-Up Date' | $T8 %]</th>
+     <th class="listheading">[% 'Subject' | $T8 %]</th>
+     <th class="listheading">[% 'Created by' | $T8 %]</th>
+     <th class="listheading">[% 'Follow-up for' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = FOLLOW_UPS %]
diff --git a/templates/webpages/fu/edit_access_rights_de.html b/templates/webpages/fu/edit_access_rights_de.html
index 3f1c28efb..2c807150e 100644
--- a/templates/webpages/fu/edit_access_rights_de.html
+++ b/templates/webpages/fu/edit_access_rights_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -7,14 +8,14 @@
 
  <div class="listtop">[% title %]</div>
 
- <p>Erlaube den folgenden Benutzern Zugriff auf meine Wiedervorlagen:</p>
+ <p>[% 'Allow the following users access to my follow-ups:' | $T8 %]</p>
 
  <form action="fu.pl" method="post" name="Form">
   <p>
    <table>
     <tr>
-     <td class="listheading">Benutzer</td>
-     <td class="listheading">Zugriff erlauben</td>
+     <td class="listheading">[% 'User' | $T8 %]</td>
+     <td class="listheading">[% 'Allow access' | $T8 %]</td>
     </tr>
 
     [%- FOREACH row = EMPLOYEES %]
@@ -25,9 +26,9 @@
      <td>[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]</td>
      <td>
       <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_yes">Ja</label>
+      <label for="access_[% HTML.escape(row.id) %]_yes">[% 'Yes' | $T8 %]</label>
       <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_no">Nein</label>
+      <label for="access_[% HTML.escape(row.id) %]_no">[% 'No' | $T8 %]</label>
      </td>
     </tr>
     [%- END %]
@@ -39,7 +40,7 @@
   <input type="hidden" name="save_nextsub" value="save_access_rights">
 
   <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/fu/edit_access_rights_master.html b/templates/webpages/fu/edit_access_rights_master.html
index 4f11a1796..2c807150e 100644
--- a/templates/webpages/fu/edit_access_rights_master.html
+++ b/templates/webpages/fu/edit_access_rights_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -7,14 +8,14 @@
 
  <div class="listtop">[% title %]</div>
 
- <p><translate>Allow the following users access to my follow-ups:</translate></p>
+ <p>[% 'Allow the following users access to my follow-ups:' | $T8 %]</p>
 
  <form action="fu.pl" method="post" name="Form">
   <p>
    <table>
     <tr>
-     <td class="listheading"><translate>User</translate></td>
-     <td class="listheading"><translate>Allow access</translate></td>
+     <td class="listheading">[% 'User' | $T8 %]</td>
+     <td class="listheading">[% 'Allow access' | $T8 %]</td>
     </tr>
 
     [%- FOREACH row = EMPLOYEES %]
@@ -25,9 +26,9 @@
      <td>[% IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]</td>
      <td>
       <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_yes"><translate>Yes</translate></label>
+      <label for="access_[% HTML.escape(row.id) %]_yes">[% 'Yes' | $T8 %]</label>
       <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
-      <label for="access_[% HTML.escape(row.id) %]_no"><translate>No</translate></label>
+      <label for="access_[% HTML.escape(row.id) %]_no">[% 'No' | $T8 %]</label>
      </td>
     </tr>
     [%- END %]
@@ -39,7 +40,7 @@
   <input type="hidden" name="save_nextsub" value="save_access_rights">
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/fu/report_bottom_de.html b/templates/webpages/fu/report_bottom_de.html
index 3cae2a8af..54927a759 100644
--- a/templates/webpages/fu/report_bottom_de.html
+++ b/templates/webpages/fu/report_bottom_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML%]
  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
  [%- FOREACH item = HIDDEN %]
@@ -5,9 +6,9 @@
  [%- END %]
 
  <p>
-  Wiedervorlagen<br>
+  [% 'Follow-Ups' | $T8 %]<br>
   <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" name="action_finish" value="Abschlie&szlig;en">
-  <input type="submit" name="action_delete" value="Löschen">
+  <input type="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+  <input type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
  </p>
 </form>
diff --git a/templates/webpages/fu/report_bottom_master.html b/templates/webpages/fu/report_bottom_master.html
index 5f2b8444d..54927a759 100644
--- a/templates/webpages/fu/report_bottom_master.html
+++ b/templates/webpages/fu/report_bottom_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML%]
  <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
  [%- FOREACH item = HIDDEN %]
@@ -5,9 +6,9 @@
  [%- END %]
 
  <p>
-  <translate>Follow-Ups</translate><br>
+  [% 'Follow-Ups' | $T8 %]<br>
   <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" name="action_finish" value="<translate>Finish</translate>">
-  <input type="submit" name="action_delete" value="<translate>Delete</translate>">
+  <input type="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+  <input type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
  </p>
 </form>
diff --git a/templates/webpages/fu/report_for_todo_list_de.html b/templates/webpages/fu/report_for_todo_list_de.html
index 1fe653160..e8186333b 100644
--- a/templates/webpages/fu/report_for_todo_list_de.html
+++ b/templates/webpages/fu/report_for_todo_list_de.html
@@ -1,6 +1,7 @@
+[%- USE T8 %]
 [% USE HTML %]
 
-<div class="listtop">Nicht erledigte Wiedervorlagen</div>
+<div class="listtop">[% 'Unfinished follow-ups' | $T8 %]</div>
 
 <form action="fu.pl" method="post" name="TODOFollowUpsForm">
  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
@@ -10,11 +11,11 @@
   <table width="100%">
    <tr>
     <td class="listheading">&nbsp;</td>
-    <td class="listheading">Wiedervorlagedatum</td>
-    <td class="listheading">Erstellt am</td>
-    <td class="listheading">Betreff</td>
-    <td class="listheading">Referenz</td>
-    <td class="listheading">Erstellt von</td>
+    <td class="listheading">[% 'Follow-Up Date' | $T8 %]</td>
+    <td class="listheading">[% 'Created on' | $T8 %]</td>
+    <td class="listheading">[% 'Subject' | $T8 %]</td>
+    <td class="listheading">[% 'Reference' | $T8 %]</td>
+    <td class="listheading">[% 'Created by' | $T8 %]</td>
    </tr>
 
    [%- FOREACH row = FOLLOW_UPS %]
@@ -35,7 +36,7 @@
 
  <p>
   <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_finish" value="Abschlie&szlig;en">
-  <input type="submit" class="submit" name="action_delete" value="Löschen">
+  <input type="submit" class="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+  <input type="submit" class="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
  </p>
 </form>
diff --git a/templates/webpages/fu/report_for_todo_list_master.html b/templates/webpages/fu/report_for_todo_list_master.html
index 585556b80..e8186333b 100644
--- a/templates/webpages/fu/report_for_todo_list_master.html
+++ b/templates/webpages/fu/report_for_todo_list_master.html
@@ -1,6 +1,7 @@
+[%- USE T8 %]
 [% USE HTML %]
 
-<div class="listtop"><translate>Unfinished follow-ups</translate></div>
+<div class="listtop">[% 'Unfinished follow-ups' | $T8 %]</div>
 
 <form action="fu.pl" method="post" name="TODOFollowUpsForm">
  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
@@ -10,11 +11,11 @@
   <table width="100%">
    <tr>
     <td class="listheading">&nbsp;</td>
-    <td class="listheading"><translate>Follow-Up Date</translate></td>
-    <td class="listheading"><translate>Created on</translate></td>
-    <td class="listheading"><translate>Subject</translate></td>
-    <td class="listheading"><translate>Reference</translate></td>
-    <td class="listheading"><translate>Created by</translate></td>
+    <td class="listheading">[% 'Follow-Up Date' | $T8 %]</td>
+    <td class="listheading">[% 'Created on' | $T8 %]</td>
+    <td class="listheading">[% 'Subject' | $T8 %]</td>
+    <td class="listheading">[% 'Reference' | $T8 %]</td>
+    <td class="listheading">[% 'Created by' | $T8 %]</td>
    </tr>
 
    [%- FOREACH row = FOLLOW_UPS %]
@@ -35,7 +36,7 @@
 
  <p>
   <input type="hidden" name="action" value="dispatcher">
-  <input type="submit" class="submit" name="action_finish" value="<translate>Finish</translate>">
-  <input type="submit" class="submit" name="action_delete" value="<translate>Delete</translate>">
+  <input type="submit" class="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+  <input type="submit" class="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
  </p>
 </form>
diff --git a/templates/webpages/fu/search_de.html b/templates/webpages/fu/search_de.html
index cff47abc9..a8d03de73 100644
--- a/templates/webpages/fu/search_de.html
+++ b/templates/webpages/fu/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body onload="on_load()">
 
@@ -21,7 +22,7 @@
   <p>
    <table>
     <tr>
-     <td align="right">Erstellt f&uuml;r</td>
+     <td align="right">[% 'Created for' | $T8 %]</td>
      <td>
       <select name="created_for">
        <option></option>
@@ -39,70 +40,70 @@
     </tr>
 
     <tr>
-     <td align="right">Betreff</td>
+     <td align="right">[% 'Subject' | $T8 %]</td>
      <td><input name="subject" size="20"></td>
     </tr>
 
     <tr>
-     <td align="right">Text</td>
+     <td align="right">[% 'Body' | $T8 %]</td>
      <td><input name="body" size="20"></td>
     </tr>
 
     <tr>
-     <td align="right">Referenz</td>
+     <td align="right">[% 'Reference' | $T8 %]</td>
      <td><input name="reference" size="20"></td>
     </tr>
 
     <tr>
-     <td align="right">Wiedervorlagedatum</td>
+     <td align="right">[% 'Follow-Up Date' | $T8 %]</td>
      <td>
-      Von
+      [% 'From' | $T8 %]
       <input name="follow_up_date_from" id="follow_up_date_from" size="12">
       <input type="button" name="follow_up_date_from_button" id="follow_up_date_from_trigger" value="?">
-      Bis
+      [% 'To (time)' | $T8 %]
       <input name="follow_up_date_to" id="follow_up_date_to" size="12">
       <input type="button" name="follow_up_date_to_button" id="follow_up_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right">Erstellt am</td>
+     <td align="right">[% 'Created on' | $T8 %]</td>
      <td>
-      Von
+      [% 'From' | $T8 %]
       <input name="itime_from" id="itime_from" size="12">
       <input type="button" name="itime_from_button" id="itime_from_trigger" value="?">
-      Bis
+      [% 'To (time)' | $T8 %]
       <input name="itime_to" id="itime_to" size="12">
       <input type="button" name="itime_to_button" id="itime_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right">In Bericht aufnehmen</td>
+     <td align="right">[% 'Include in Report' | $T8 %]</td>
      <td>
 
       <table>
        <tr>
         <td>
          <input type="checkbox" name="due_only" id="due_only" value="1" checked>
-         <label for="due_only">Nur f&auml;llige Wiedervorlagen</label>
+         <label for="due_only">[% 'Only due follow-ups' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="all_users" id="all_users" value="1" checked>
-         <label for="all_users">Wiedervorlagen anderer Benutzer</label>
+         <label for="all_users">[% 'Other users' follow-ups' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input type="checkbox" name="not_done" id="not_done" value="1" checked>
-         <label for="not_done">Noch nicht fertig</label>
+         <label for="not_done">[% 'Not done yet' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="done" id="done" value="1">
-         <label for="done">Fertig</label>
+         <label for="done">[% 'Done' | $T8 %]</label>
         </td>
        </tr>
       </table>
@@ -114,7 +115,7 @@
   </p>
 
   <p>
-   <input type="submit" name="action" value="Weiter">
+   <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/fu/search_master.html b/templates/webpages/fu/search_master.html
index 94309f16f..a8d03de73 100644
--- a/templates/webpages/fu/search_master.html
+++ b/templates/webpages/fu/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body onload="on_load()">
 
@@ -21,7 +22,7 @@
   <p>
    <table>
     <tr>
-     <td align="right"><translate>Created for</translate></td>
+     <td align="right">[% 'Created for' | $T8 %]</td>
      <td>
       <select name="created_for">
        <option></option>
@@ -39,70 +40,70 @@
     </tr>
 
     <tr>
-     <td align="right"><translate>Subject</translate></td>
+     <td align="right">[% 'Subject' | $T8 %]</td>
      <td><input name="subject" size="20"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Body</translate></td>
+     <td align="right">[% 'Body' | $T8 %]</td>
      <td><input name="body" size="20"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Reference</translate></td>
+     <td align="right">[% 'Reference' | $T8 %]</td>
      <td><input name="reference" size="20"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Follow-Up Date</translate></td>
+     <td align="right">[% 'Follow-Up Date' | $T8 %]</td>
      <td>
-      <translate>From</translate>
+      [% 'From' | $T8 %]
       <input name="follow_up_date_from" id="follow_up_date_from" size="12">
       <input type="button" name="follow_up_date_from_button" id="follow_up_date_from_trigger" value="?">
-      <translate>To (time)</translate>
+      [% 'To (time)' | $T8 %]
       <input name="follow_up_date_to" id="follow_up_date_to" size="12">
       <input type="button" name="follow_up_date_to_button" id="follow_up_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Created on</translate></td>
+     <td align="right">[% 'Created on' | $T8 %]</td>
      <td>
-      <translate>From</translate>
+      [% 'From' | $T8 %]
       <input name="itime_from" id="itime_from" size="12">
       <input type="button" name="itime_from_button" id="itime_from_trigger" value="?">
-      <translate>To (time)</translate>
+      [% 'To (time)' | $T8 %]
       <input name="itime_to" id="itime_to" size="12">
       <input type="button" name="itime_to_button" id="itime_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Include in Report</translate></td>
+     <td align="right">[% 'Include in Report' | $T8 %]</td>
      <td>
 
       <table>
        <tr>
         <td>
          <input type="checkbox" name="due_only" id="due_only" value="1" checked>
-         <label for="due_only"><translate>Only due follow-ups</translate></label>
+         <label for="due_only">[% 'Only due follow-ups' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="all_users" id="all_users" value="1" checked>
-         <label for="all_users"><translate>Other users' follow-ups</translate></label>
+         <label for="all_users">[% 'Other users' follow-ups' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input type="checkbox" name="not_done" id="not_done" value="1" checked>
-         <label for="not_done"><translate>Not done yet</translate></label>
+         <label for="not_done">[% 'Not done yet' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="done" id="done" value="1">
-         <label for="done"><translate>Done</translate></label>
+         <label for="done">[% 'Done' | $T8 %]</label>
         </td>
        </tr>
       </table>
@@ -114,7 +115,7 @@
   </p>
 
   <p>
-   <input type="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/generic/calculate_qty_de.html b/templates/webpages/generic/calculate_qty_de.html
index 068f1cb5d..974c78c43 100644
--- a/templates/webpages/generic/calculate_qty_de.html
+++ b/templates/webpages/generic/calculate_qty_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -11,7 +12,7 @@
    </tr>
    <tr height="5"></tr>
 
-   <tr><td>Bitte geben Sie die Abmessungen unten ein</td></tr>
+   <tr><td>[% 'Please insert object dimensions below.' | $T8 %]</td></tr>
 
    <tr>
     <td>
@@ -34,7 +35,7 @@
     </td>
    </tr>
   </table>
- <button type="button" onclick="calculate_qty()">Berechnen</button>
+ <button type="button" onclick="calculate_qty()">[% 'Calculate' | $T8 %]</button>
  </form>
 
  <script type="text/javascript">
diff --git a/templates/webpages/generic/calculate_qty_master.html b/templates/webpages/generic/calculate_qty_master.html
index 63c7823fb..974c78c43 100644
--- a/templates/webpages/generic/calculate_qty_master.html
+++ b/templates/webpages/generic/calculate_qty_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -11,7 +12,7 @@
    </tr>
    <tr height="5"></tr>
 
-   <tr><td><translate>Please insert object dimensions below.</translate></td></tr>
+   <tr><td>[% 'Please insert object dimensions below.' | $T8 %]</td></tr>
 
    <tr>
     <td>
@@ -34,7 +35,7 @@
     </td>
    </tr>
   </table>
- <button type="button" onclick="calculate_qty()"><translate>Calculate</translate></button>
+ <button type="button" onclick="calculate_qty()">[% 'Calculate' | $T8 %]</button>
  </form>
 
  <script type="text/javascript">
diff --git a/templates/webpages/generic/cov_selection_de.html b/templates/webpages/generic/cov_selection_de.html
index 0be4e1a3c..f3cdbcdb4 100644
--- a/templates/webpages/generic/cov_selection_de.html
+++ b/templates/webpages/generic/cov_selection_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 <body[% IF onload %] onload="[% onload %]"[% END %]>
 
@@ -18,9 +19,9 @@
    <tr>
     <td>
      [%- IF !is_vendor %]
-      Bitte einen Endkunden aus der Liste auswählen
+      [% 'Please select a customer from the list below.' | $T8 %]
      [%- ELSE %]
-      Bitte einen Händler aus der Liste auswählen
+      [% 'Please select a vendor from the list below.' | $T8 %]
      [%- END %]
     </td>
    </tr>
diff --git a/templates/webpages/generic/cov_selection_master.html b/templates/webpages/generic/cov_selection_master.html
index 336587e0e..f3cdbcdb4 100644
--- a/templates/webpages/generic/cov_selection_master.html
+++ b/templates/webpages/generic/cov_selection_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 <body[% IF onload %] onload="[% onload %]"[% END %]>
 
@@ -18,9 +19,9 @@
    <tr>
     <td>
      [%- IF !is_vendor %]
-      <translate>Please select a customer from the list below.</translate>
+      [% 'Please select a customer from the list below.' | $T8 %]
      [%- ELSE %]
-      <translate>Please select a vendor from the list below.</translate>
+      [% 'Please select a vendor from the list below.' | $T8 %]
      [%- END %]
     </td>
    </tr>
diff --git a/templates/webpages/generic/edit_email_de.html b/templates/webpages/generic/edit_email_de.html
index 3640be1b2..9aec0ca97 100644
--- a/templates/webpages/generic/edit_email_de.html
+++ b/templates/webpages/generic/edit_email_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="fokus()">
 
 <form name="Form" method="post" action="[% script %]">
@@ -12,26 +13,26 @@
     <td>
       <table>
         <tr>
-          <th align="right" nowrap>An</th>
+          <th align="right" nowrap>[% 'To' | $T8 %]</th>
 
           <td><input name="email" size="30" value="[% HTML.escape(email) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Cc</th>
+          <th align="right" nowrap>[% 'Cc' | $T8 %]</th>
           <td><input name="cc" size="30" value="[% HTML.escape(cc) %]"></td>
         </tr>
 [% IF SHOW_BCC %]
         <tr>
-          <th align="right" nowrap>Bcc</th>
+          <th align="right" nowrap>[% 'Bcc' | $T8 %]</th>
           <td><input name="bcc" size="30" value="[% HTML.escape(bcc) %]"></td>
         </tr>[% END %]
         <tr>
-          <th align="right" nowrap>Betreff</th>
+          <th align="right" nowrap>[% 'Subject' | $T8 %]</th>
 
           <td><input name="subject" size="30" value="[% HTML.escape(subject) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Name des Anhangs</th>
+          <th align="right" nowrap>[% 'Attachment name' | $T8 %]</th>
           <td><input name="attachment_filename" size="30" value="[% HTML.escape(a_filename) %]"></td>
       </table>
     </td>
@@ -41,7 +42,7 @@
     <td>
       <table>
         <tr>
-          <th align="left" nowrap>Nachricht</th>
+          <th align="left" nowrap>[% 'Message' | $T8 %]</th>
         </tr>
         <tr>
           <td><textarea name="message" rows="15" cols="60" wrap="soft">[% HTML.escape(message) %]</textarea></td>
@@ -68,7 +69,7 @@
 <input type="hidden" name="nextsub" value="send_email">
 
 <br>
-<input name="action" class="submit" type="submit" value="Weiter">
+<input name="action" class="submit" type="submit" value="[% 'Continue' | $T8 %]">
 </form>
 
 </body>
diff --git a/templates/webpages/generic/edit_email_master.html b/templates/webpages/generic/edit_email_master.html
index cf1cc4c38..9aec0ca97 100644
--- a/templates/webpages/generic/edit_email_master.html
+++ b/templates/webpages/generic/edit_email_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="fokus()">
 
 <form name="Form" method="post" action="[% script %]">
@@ -12,26 +13,26 @@
     <td>
       <table>
         <tr>
-          <th align="right" nowrap><translate>To</translate></th>
+          <th align="right" nowrap>[% 'To' | $T8 %]</th>
 
           <td><input name="email" size="30" value="[% HTML.escape(email) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Cc</translate></th>
+          <th align="right" nowrap>[% 'Cc' | $T8 %]</th>
           <td><input name="cc" size="30" value="[% HTML.escape(cc) %]"></td>
         </tr>
 [% IF SHOW_BCC %]
         <tr>
-          <th align="right" nowrap><translate>Bcc</translate></th>
+          <th align="right" nowrap>[% 'Bcc' | $T8 %]</th>
           <td><input name="bcc" size="30" value="[% HTML.escape(bcc) %]"></td>
         </tr>[% END %]
         <tr>
-          <th align="right" nowrap><translate>Subject</translate></th>
+          <th align="right" nowrap>[% 'Subject' | $T8 %]</th>
 
           <td><input name="subject" size="30" value="[% HTML.escape(subject) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Attachment name</translate></th>
+          <th align="right" nowrap>[% 'Attachment name' | $T8 %]</th>
           <td><input name="attachment_filename" size="30" value="[% HTML.escape(a_filename) %]"></td>
       </table>
     </td>
@@ -41,7 +42,7 @@
     <td>
       <table>
         <tr>
-          <th align="left" nowrap><translate>Message</translate></th>
+          <th align="left" nowrap>[% 'Message' | $T8 %]</th>
         </tr>
         <tr>
           <td><textarea name="message" rows="15" cols="60" wrap="soft">[% HTML.escape(message) %]</textarea></td>
@@ -68,7 +69,7 @@
 <input type="hidden" name="nextsub" value="send_email">
 
 <br>
-<input name="action" class="submit" type="submit" value="<translate>Continue</translate>">
+<input name="action" class="submit" type="submit" value="[% 'Continue' | $T8 %]">
 </form>
 
 </body>
diff --git a/templates/webpages/generic/error_de.html b/templates/webpages/generic/error_de.html
index f95bb3a13..628208522 100644
--- a/templates/webpages/generic/error_de.html
+++ b/templates/webpages/generic/error_de.html
@@ -1,13 +1,14 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]Fehler![% END %]</div>
+ <div class="listtop">[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]</div>
 
  <p>[% label_error %]</p>
 
  [%- IF SHOW_BACK_BUTTON %]
  <form>
   <p>
-   <input type="button" onclick="history.back()" value="Zurück">
+   <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/generic/error_master.html b/templates/webpages/generic/error_master.html
index 5ca71e28b..628208522 100644
--- a/templates/webpages/generic/error_master.html
+++ b/templates/webpages/generic/error_master.html
@@ -1,13 +1,14 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]<translate>Error!</translate>[% END %]</div>
+ <div class="listtop">[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]</div>
 
  <p>[% label_error %]</p>
 
  [%- IF SHOW_BACK_BUTTON %]
  <form>
   <p>
-   <input type="button" onclick="history.back()" value="<translate>Back</translate>">
+   <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/generic/information_de.html b/templates/webpages/generic/information_de.html
index ad01854d2..29e417169 100644
--- a/templates/webpages/generic/information_de.html
+++ b/templates/webpages/generic/information_de.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <table width="100%">
   <tr>
-   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %]Information[% END %]</th>
+   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]</th>
   </tr>
   <tr height="5"></tr>
 
diff --git a/templates/webpages/generic/information_master.html b/templates/webpages/generic/information_master.html
index 91c0e963d..29e417169 100644
--- a/templates/webpages/generic/information_master.html
+++ b/templates/webpages/generic/information_master.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
  <table width="100%">
   <tr>
-   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %]<translate>Information</translate>[% END %]</th>
+   <th class="listtop">[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]</th>
   </tr>
   <tr height="5"></tr>
 
diff --git a/templates/webpages/generic/new_item_de.html b/templates/webpages/generic/new_item_de.html
index dc395803f..1d3104a6d 100644
--- a/templates/webpages/generic/new_item_de.html
+++ b/templates/webpages/generic/new_item_de.html
@@ -1,16 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %]  <body>
 
-    <h4 class="error">Dieser Artikel ist nicht in der Datenbank!
+    <h4 class="error">[% 'Item not on file!' | $T8 %]
 
 
-    <p>Was ist dieser Artikel?</h4>
+    <p>[% 'What type of item is this?' | $T8 %]</h4>
 
     <form method="post" action="ic.pl">
 
       <p>
 
-      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;Ware<br>
-      <input class="radio" type="radio" name="item" value="service">&nbsp;Dienstleistung
+      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;[% 'Part' | $T8 %]<br>
+      <input class="radio" type="radio" name="item" value="service">&nbsp;[% 'Service' | $T8 %]
       <p>
 
       [%- FOREACH var = HIDDENS %]
@@ -18,7 +19,7 @@
       [%- END %]
 
       <input type="hidden" name="nextsub" value="add">
-      <input class="submit" type="submit" name="action" value="Weiter">
+      <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
     </form>
 
   </body>
diff --git a/templates/webpages/generic/new_item_master.html b/templates/webpages/generic/new_item_master.html
index 45235ec23..1d3104a6d 100644
--- a/templates/webpages/generic/new_item_master.html
+++ b/templates/webpages/generic/new_item_master.html
@@ -1,16 +1,17 @@
+[%- USE T8 %]
 [% USE HTML %]  <body>
 
-    <h4 class="error"><translate>Item not on file!</translate>
+    <h4 class="error">[% 'Item not on file!' | $T8 %]
 
 
-    <p><translate>What type of item is this?</translate></h4>
+    <p>[% 'What type of item is this?' | $T8 %]</h4>
 
     <form method="post" action="ic.pl">
 
       <p>
 
-      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;<translate>Part</translate><br>
-      <input class="radio" type="radio" name="item" value="service">&nbsp;<translate>Service</translate>
+      <input class="radio" type="radio" name="item" value="part" checked>&nbsp;[% 'Part' | $T8 %]<br>
+      <input class="radio" type="radio" name="item" value="service">&nbsp;[% 'Service' | $T8 %]
       <p>
 
       [%- FOREACH var = HIDDENS %]
@@ -18,7 +19,7 @@
       [%- END %]
 
       <input type="hidden" name="nextsub" value="add">
-      <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+      <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
     </form>
 
   </body>
diff --git a/templates/webpages/generic/part_selection_de.html b/templates/webpages/generic/part_selection_de.html
index 4569befd8..ac4aa4a21 100644
--- a/templates/webpages/generic/part_selection_de.html
+++ b/templates/webpages/generic/part_selection_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
 
  <form action="[% HTML.escape(script) %]" method="post" name="Form">
@@ -18,14 +19,14 @@
    <tr>
     <td>
      [% IF no_parts_found %]
-     Es wurde kein Artikel gefunden, auf den die Suchparameter zutreffen.
+     [% 'No part was found matching the search parameters.' | $T8 %]
      [% IF allow_creation %]
-     Sie k&ouml;nnen jedoch einen neuen Artikel anlegen, der dann automatisch ausgew&auml;hlt wird.
+     [% 'However, you can create a new part which will then be selected.' | $T8 %]
      [% END %]
      [% ELSE %]
-     Bitte w&auml;hlen Sie einen Artikel aus der Liste aus.
+     [% 'Please select a part from the list below.' | $T8 %]
      [% IF allow_creation %]
-     Sie k&ouml;nnen auch einen neuen Artikel anlegen, der dann automatisch ausgew&auml;hlt wird.
+     [% 'Alternatively you can create a new part which will then be selected.' | $T8 %]
      [% END %]
      [% END %]
     </td>
@@ -44,7 +45,7 @@
 
       [% FOREACH part = PARTS %]
       <tr class="listrow[% IF loop.count % 2 %]1[% ELSE %]0[% END %]">
-       <td><button type="button" onclick="part_selected('[% loop.count %]')">auswählen</button></td>
+       <td><button type="button" onclick="part_selected('[% loop.count %]')">[% 'Select' | $T8 %]</button></td>
        <td>
         <input type="hidden" id="partsid_[% loop.count %]" name="partsid_[% loop.count %]" value="[% HTML.escape(part.id) %]">
         <input type="hidden" id="partnumber_[% loop.count %]" name="partnumber_[% loop.count %]" value="[% HTML.escape(part.partnumber) %]">
@@ -68,7 +69,7 @@
   </table>
 
   [% IF allow_creation %]
-  <p><input type="submit" name="action" value="Neue Ware"></p>
+  <p><input type="submit" name="action" value="[% 'New part' | $T8 %]"></p>
   [% END %]
 
  </form>
diff --git a/templates/webpages/generic/part_selection_master.html b/templates/webpages/generic/part_selection_master.html
index 7eb7ef6b2..ac4aa4a21 100644
--- a/templates/webpages/generic/part_selection_master.html
+++ b/templates/webpages/generic/part_selection_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
 
  <form action="[% HTML.escape(script) %]" method="post" name="Form">
@@ -18,14 +19,14 @@
    <tr>
     <td>
      [% IF no_parts_found %]
-     <translate>No part was found matching the search parameters.</translate>
+     [% 'No part was found matching the search parameters.' | $T8 %]
      [% IF allow_creation %]
-     <translate>However, you can create a new part which will then be selected.</translate>
+     [% 'However, you can create a new part which will then be selected.' | $T8 %]
      [% END %]
      [% ELSE %]
-     <translate>Please select a part from the list below.</translate>
+     [% 'Please select a part from the list below.' | $T8 %]
      [% IF allow_creation %]
-     <translate>Alternatively you can create a new part which will then be selected.</translate>
+     [% 'Alternatively you can create a new part which will then be selected.' | $T8 %]
      [% END %]
      [% END %]
     </td>
@@ -44,7 +45,7 @@
 
       [% FOREACH part = PARTS %]
       <tr class="listrow[% IF loop.count % 2 %]1[% ELSE %]0[% END %]">
-       <td><button type="button" onclick="part_selected('[% loop.count %]')"><translate>Select</translate></button></td>
+       <td><button type="button" onclick="part_selected('[% loop.count %]')">[% 'Select' | $T8 %]</button></td>
        <td>
         <input type="hidden" id="partsid_[% loop.count %]" name="partsid_[% loop.count %]" value="[% HTML.escape(part.id) %]">
         <input type="hidden" id="partnumber_[% loop.count %]" name="partnumber_[% loop.count %]" value="[% HTML.escape(part.partnumber) %]">
@@ -68,7 +69,7 @@
   </table>
 
   [% IF allow_creation %]
-  <p><input type="submit" name="action" value="<translate>New part</translate>"></p>
+  <p><input type="submit" name="action" value="[% 'New part' | $T8 %]"></p>
   [% END %]
 
  </form>
diff --git a/templates/webpages/generic/print_options_de.html b/templates/webpages/generic/print_options_de.html
index b1906f50c..f8ee3efd3 100644
--- a/templates/webpages/generic/print_options_de.html
+++ b/templates/webpages/generic/print_options_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 <table width="100%" cellspacing="0" cellpadding="0">
@@ -17,14 +18,14 @@
       [%- END %]
      </td>
      [%- IF display_copies %]
-     <td>Kopien <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     <td>[% 'Copies' | $T8 %] <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
      [%- END %]
      [%- IF display_groupitems %]
-     <td>Waren gruppieren</td>
+     <td>[% 'Group Items' | $T8 %]</td>
      <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
      [%- END %]
      [%- IF display_remove_draft %]
-     <td>Entwurf l&ouml;schen</td>
+     <td>[% 'Remove Draft' | $T8 %]</td>
      <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
      [%- END %]
     </tr>
diff --git a/templates/webpages/generic/print_options_master.html b/templates/webpages/generic/print_options_master.html
index 94a44b895..f8ee3efd3 100644
--- a/templates/webpages/generic/print_options_master.html
+++ b/templates/webpages/generic/print_options_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 <table width="100%" cellspacing="0" cellpadding="0">
@@ -17,14 +18,14 @@
       [%- END %]
      </td>
      [%- IF display_copies %]
-     <td><translate>Copies</translate> <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     <td>[% 'Copies' | $T8 %] <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
      [%- END %]
      [%- IF display_groupitems %]
-     <td><translate>Group Items</translate></td>
+     <td>[% 'Group Items' | $T8 %]</td>
      <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
      [%- END %]
      [%- IF display_remove_draft %]
-     <td><translate>Remove Draft</translate></td>
+     <td>[% 'Remove Draft' | $T8 %]</td>
      <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
      [%- END %]
     </tr>
diff --git a/templates/webpages/generic/select_delivery_customer_de.html b/templates/webpages/generic/select_delivery_customer_de.html
index e269df8e4..20858c1ad 100644
--- a/templates/webpages/generic/select_delivery_customer_de.html
+++ b/templates/webpages/generic/select_delivery_customer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -10,7 +11,7 @@
   <table width="100%">
    <tr height="5"></tr>
 
-   <tr><td>Bitte einen Endkunden aus der Liste auswählen</td></tr>
+   <tr><td>[% 'Please select a customer from the list below.' | $T8 %]</td></tr>
 
    <tr>
     <td>
diff --git a/templates/webpages/generic/select_delivery_customer_master.html b/templates/webpages/generic/select_delivery_customer_master.html
index 272934d87..20858c1ad 100644
--- a/templates/webpages/generic/select_delivery_customer_master.html
+++ b/templates/webpages/generic/select_delivery_customer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -10,7 +11,7 @@
   <table width="100%">
    <tr height="5"></tr>
 
-   <tr><td><translate>Please select a customer from the list below.</translate></td></tr>
+   <tr><td>[% 'Please select a customer from the list below.' | $T8 %]</td></tr>
 
    <tr>
     <td>
diff --git a/templates/webpages/generic/select_part_de.html b/templates/webpages/generic/select_part_de.html
index e49e806d0..324c4738a 100644
--- a/templates/webpages/generic/select_part_de.html
+++ b/templates/webpages/generic/select_part_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
 
  <form method="post" action="[% HTML.escape(script) %]">
@@ -9,24 +10,24 @@
   <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
   <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
 
-  <div class="listtop">Artikel oder Erzeugnis ausw&auml;hlen</div>
+  <div class="listtop">[% 'Select a part or assembly' | $T8 %]</div>
 
   <p>
    <table>
     <tr>
      <th class="listheading">&nbsp;</th>
-     <th class="listheading">Nummer</th>
-     <th class="listheading">Beschreibung</th>
+     <th class="listheading">[% 'Number' | $T8 %]</th>
+     <th class="listheading">[% 'Description' | $T8 %]</th>
      [% IF has_charge %]
-     <th class="listheading">Chargennummer</th>
+     <th class="listheading">[% 'Charge number' | $T8 %]</th>
      [% END %]
      [% IF has_bestbefore %]
      [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
      [% END %]
      [% IF has_ean %]
-     <th class="listheading">EAN</th>
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
      [% END %]
     </tr>
 
@@ -75,7 +76,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/generic/select_part_master.html b/templates/webpages/generic/select_part_master.html
index 433bceb11..324c4738a 100644
--- a/templates/webpages/generic/select_part_master.html
+++ b/templates/webpages/generic/select_part_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body [% IF onload %]onload="[% onload %]"[% END %]>
 
  <form method="post" action="[% HTML.escape(script) %]">
@@ -9,24 +10,24 @@
   <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
   <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
 
-  <div class="listtop"><translate>Select a part or assembly</translate></div>
+  <div class="listtop">[% 'Select a part or assembly' | $T8 %]</div>
 
   <p>
    <table>
     <tr>
      <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Number</translate></th>
-     <th class="listheading"><translate>Description</translate></th>
+     <th class="listheading">[% 'Number' | $T8 %]</th>
+     <th class="listheading">[% 'Description' | $T8 %]</th>
      [% IF has_charge %]
-     <th class="listheading"><translate>Charge number</translate></th>
+     <th class="listheading">[% 'Charge number' | $T8 %]</th>
      [% END %]
      [% IF has_bestbefore %]
      [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
      [% END %]
      [% IF has_ean %]
-     <th class="listheading"><translate>EAN</translate></th>
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
      [% END %]
     </tr>
 
@@ -75,7 +76,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/generic/select_vendor_de.html b/templates/webpages/generic/select_vendor_de.html
index 3fc4d31ed..35258df75 100644
--- a/templates/webpages/generic/select_vendor_de.html
+++ b/templates/webpages/generic/select_vendor_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -10,7 +11,7 @@
   <table width="100%">
    <tr height="5"></tr>
 
-   <tr><td>Bitte einen Händler aus der Liste auswählen</td></tr>
+   <tr><td>[% 'Please select a vendor from the list below.' | $T8 %]</td></tr>
 
    <tr>
     <td>
diff --git a/templates/webpages/generic/select_vendor_master.html b/templates/webpages/generic/select_vendor_master.html
index 51b30b614..35258df75 100644
--- a/templates/webpages/generic/select_vendor_master.html
+++ b/templates/webpages/generic/select_vendor_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -10,7 +11,7 @@
   <table width="100%">
    <tr height="5"></tr>
 
-   <tr><td><translate>Please select a vendor from the list below.</translate></td></tr>
+   <tr><td>[% 'Please select a vendor from the list below.' | $T8 %]</td></tr>
 
    <tr>
     <td>
diff --git a/templates/webpages/generic/set_longdescription_de.html b/templates/webpages/generic/set_longdescription_de.html
index 318d31b87..72b50cde1 100644
--- a/templates/webpages/generic/set_longdescription_de.html
+++ b/templates/webpages/generic/set_longdescription_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -6,11 +7,11 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p>Bitte den Langtext eingeben</p>
+  <p>[% 'Please insert your longdescription below' | $T8 %]</p>
 
   <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
 
-  <p><input type="submit" onclick="longdescription_updated()" value="Übernehmen"></p>
+  <p><input type="submit" onclick="longdescription_updated()" value="[% 'Close' | $T8 %]"></p>
  </form>
 
  <script type="text/javascript">
diff --git a/templates/webpages/generic/set_longdescription_master.html b/templates/webpages/generic/set_longdescription_master.html
index 9e2e6eaf1..72b50cde1 100644
--- a/templates/webpages/generic/set_longdescription_master.html
+++ b/templates/webpages/generic/set_longdescription_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -6,11 +7,11 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p><translate>Please insert your longdescription below</translate></p>
+  <p>[% 'Please insert your longdescription below' | $T8 %]</p>
 
   <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
 
-  <p><input type="submit" onclick="longdescription_updated()" value="<translate>Close</translate>"></p>
+  <p><input type="submit" onclick="longdescription_updated()" value="[% 'Close' | $T8 %]"></p>
  </form>
 
  <script type="text/javascript">
diff --git a/templates/webpages/generictranslations/edit_greetings_de.html b/templates/webpages/generictranslations/edit_greetings_de.html
index b5f318e2f..345886acb 100644
--- a/templates/webpages/generictranslations/edit_greetings_de.html
+++ b/templates/webpages/generictranslations/edit_greetings_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <p>
@@ -16,15 +17,15 @@
 
    <tr>
     <th class="listheading">&nbsp;</th>
-    <th class="listheading">männlich</th>
-    <th class="listheading">weiblich</th>
+    <th class="listheading">[% 'male' | $T8 %]</th>
+    <th class="listheading">[% 'female' | $T8 %]</th>
    </tr>
 
    [%- FOREACH language = LANGUAGES %]
    <tr>
     <td>
      [%- IF language.id == 'default' %]
-     Standard (keine Sprache ausgewählt)
+     [% 'Default (no language selected)' | $T8 %]
      [%- ELSE %]
      [%- HTML.escape(language.description) %]
      [%- END %]
@@ -38,7 +39,7 @@
 
   <p>
    <input type="hidden" name="action" value="save_greetings">
-   <input type="submit" class="submit" value="Speichern">
+   <input type="submit" class="submit" value="[% 'Save' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/generictranslations/edit_greetings_master.html b/templates/webpages/generictranslations/edit_greetings_master.html
index 897ea64f9..345886acb 100644
--- a/templates/webpages/generictranslations/edit_greetings_master.html
+++ b/templates/webpages/generictranslations/edit_greetings_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <p>
@@ -16,15 +17,15 @@
 
    <tr>
     <th class="listheading">&nbsp;</th>
-    <th class="listheading"><translate>male</translate></th>
-    <th class="listheading"><translate>female</translate></th>
+    <th class="listheading">[% 'male' | $T8 %]</th>
+    <th class="listheading">[% 'female' | $T8 %]</th>
    </tr>
 
    [%- FOREACH language = LANGUAGES %]
    <tr>
     <td>
      [%- IF language.id == 'default' %]
-     <translate>Default (no language selected)</translate>
+     [% 'Default (no language selected)' | $T8 %]
      [%- ELSE %]
      [%- HTML.escape(language.description) %]
      [%- END %]
@@ -38,7 +39,7 @@
 
   <p>
    <input type="hidden" name="action" value="save_greetings">
-   <input type="submit" class="submit" value="<translate>Save</translate>">
+   <input type="submit" class="submit" value="[% 'Save' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/gl/generate_report_bottom_de.html b/templates/webpages/gl/generate_report_bottom_de.html
index 3798ab020..eb093a004 100644
--- a/templates/webpages/gl/generate_report_bottom_de.html
+++ b/templates/webpages/gl/generate_report_bottom_de.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %]<form method="post" action="gl.pl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
 
- <input class="submit" type="submit" name="action" value="Dialogbuchung">
- <input class="submit" type="submit" name="action" value="Debitorenbuchung">
- <input class="submit" type="submit" name="action" value="Kreditorenbuchung">
- <input class="submit" type="submit" name="action" value="Rechnung">
- <input class="submit" type="submit" name="action" value="Einkaufsrechnung">
+ <input class="submit" type="submit" name="action" value="[% 'GL Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/gl/generate_report_bottom_master.html b/templates/webpages/gl/generate_report_bottom_master.html
index a5c41ff5e..eb093a004 100644
--- a/templates/webpages/gl/generate_report_bottom_master.html
+++ b/templates/webpages/gl/generate_report_bottom_master.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [% USE HTML %]<form method="post" action="gl.pl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
 
- <input class="submit" type="submit" name="action" value="<translate>GL Transaction</translate>">
- <input class="submit" type="submit" name="action" value="<translate>AR Transaction</translate>">
- <input class="submit" type="submit" name="action" value="<translate>AP Transaction</translate>">
- <input class="submit" type="submit" name="action" value="<translate>Sales Invoice</translate>">
- <input class="submit" type="submit" name="action" value="<translate>Vendor Invoice</translate>">
+ <input class="submit" type="submit" name="action" value="[% 'GL Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'AR Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'AP Transaction' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Sales Invoice' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Vendor Invoice' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/ic/assembly_row_de.html b/templates/webpages/ic/assembly_row_de.html
index 56bac71a8..c7f8d83d5 100644
--- a/templates/webpages/ic/assembly_row_de.html
+++ b/templates/webpages/ic/assembly_row_de.html
@@ -1,6 +1,7 @@
+[%- USE T8 %]
 [%- USE LxERP %]
   <tr class=listheading>
-   <th class=listheading>Einzelteile</th>
+   <th class=listheading>[% 'Individual Items' | $T8 %]</th>
   </tr>
   <tr>
    <td>
@@ -24,7 +25,7 @@
 [%- END %]
      <tr>
       <td colspan="6"></td>
-      <td>Summen</td>
+      <td>[% 'Totals' | $T8 %]</td>
       <td align="right">[%- LxERP.format_amount(assembly_purchase_price_total, 2) %]</td>
       <td align="right">[%- LxERP.format_amount(assemblytotal, 2) %]</td>
      </tr>
diff --git a/templates/webpages/ic/assembly_row_master.html b/templates/webpages/ic/assembly_row_master.html
index c95fe0796..c7f8d83d5 100644
--- a/templates/webpages/ic/assembly_row_master.html
+++ b/templates/webpages/ic/assembly_row_master.html
@@ -1,6 +1,7 @@
+[%- USE T8 %]
 [%- USE LxERP %]
   <tr class=listheading>
-   <th class=listheading><translate>Individual Items</translate></th>
+   <th class=listheading>[% 'Individual Items' | $T8 %]</th>
   </tr>
   <tr>
    <td>
@@ -24,7 +25,7 @@
 [%- END %]
      <tr>
       <td colspan="6"></td>
-      <td><translate>Totals</translate></td>
+      <td>[% 'Totals' | $T8 %]</td>
       <td align="right">[%- LxERP.format_amount(assembly_purchase_price_total, 2) %]</td>
       <td align="right">[%- LxERP.format_amount(assemblytotal, 2) %]</td>
      </tr>
diff --git a/templates/webpages/ic/choice_de.html b/templates/webpages/ic/choice_de.html
index ecb465726..eb625257c 100644
--- a/templates/webpages/ic/choice_de.html
+++ b/templates/webpages/ic/choice_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
@@ -11,8 +12,8 @@
   <p>
    <table>
     <tr class="listheading">
-     <th class="listheading" nowrap>Artikelnummer</th>
-     <th class="listheading" nowrap>Artikelbeschreibung</th>
+     <th class="listheading" nowrap>[% 'Part Number' | $T8 %]</th>
+     <th class="listheading" nowrap>[% 'Part Description' | $T8 %]</th>
     </tr>
     <tr valign="top">
      <td><input type="text" name="partnumber" size="20"></td>
@@ -30,7 +31,7 @@
   [%- END %]
 
   <p>
-   <input class="submit" type="submit" name="action" value="auflisten">
+   <input class="submit" type="submit" name="action" value="[% 'list' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/ic/choice_master.html b/templates/webpages/ic/choice_master.html
index 434d6976d..eb625257c 100644
--- a/templates/webpages/ic/choice_master.html
+++ b/templates/webpages/ic/choice_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
@@ -11,8 +12,8 @@
   <p>
    <table>
     <tr class="listheading">
-     <th class="listheading" nowrap><translate>Part Number</translate></th>
-     <th class="listheading" nowrap><translate>Part Description</translate></th>
+     <th class="listheading" nowrap>[% 'Part Number' | $T8 %]</th>
+     <th class="listheading" nowrap>[% 'Part Description' | $T8 %]</th>
     </tr>
     <tr valign="top">
      <td><input type="text" name="partnumber" size="20"></td>
@@ -30,7 +31,7 @@
   [%- END %]
 
   <p>
-   <input class="submit" type="submit" name="action" value="<translate>list</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'list' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/ic/confirm_price_update_de.html b/templates/webpages/ic/confirm_price_update_de.html
index 106cf4f59..cc28548fd 100644
--- a/templates/webpages/ic/confirm_price_update_de.html
+++ b/templates/webpages/ic/confirm_price_update_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
@@ -5,20 +6,20 @@
  <form method="post" action="ic.pl">
 
   [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
+  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
   [%- END %]
 
-  <h2 class="confirm">Bestätigen Sie!</h2>
+  <h2 class="confirm">[% 'Confirm!' | $T8 %]</h2>
 
   <p>
-   [% LxERP.format_string('Ungefähr #1 Preise werden aktualisiert.', num_matches) %]
+   [% LxERP.t8('Approximately #1 prices will be updated.', num_matches) %]
   </p>
 
-  <p>Sind Sie sicher, dass Sie die Preise aktualisieren wollen??</p>
+  <p>[% 'Are you sure you want to update the prices' | $T8 %]?</p>
 
   <p>
-   <input name="action" class="submit" type="submit" value="Weiter">
-   <input type="button" class="submit" onclick="history.back()" value="Zurück">
+   <input name="action" class="submit" type="submit" value="[% 'Continue' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 </body>
diff --git a/templates/webpages/ic/confirm_price_update_master.html b/templates/webpages/ic/confirm_price_update_master.html
index 03f814d59..cc28548fd 100644
--- a/templates/webpages/ic/confirm_price_update_master.html
+++ b/templates/webpages/ic/confirm_price_update_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
@@ -5,20 +6,20 @@
  <form method="post" action="ic.pl">
 
   [%- FOREACH row = HIDDENS %]
-  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
+  <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
   [%- END %]
 
-  <h2 class="confirm"><translate>Confirm!</translate></h2>
+  <h2 class="confirm">[% 'Confirm!' | $T8 %]</h2>
 
   <p>
-   [% LxERP.format_string('<translate>Approximately #1 prices will be updated.</translate>', num_matches) %]
+   [% LxERP.t8('Approximately #1 prices will be updated.', num_matches) %]
   </p>
 
-  <p><translate>Are you sure you want to update the prices</translate>?</p>
+  <p>[% 'Are you sure you want to update the prices' | $T8 %]?</p>
 
   <p>
-   <input name="action" class="submit" type="submit" value="<translate>Continue</translate>">
-   <input type="button" class="submit" onclick="history.back()" value="<translate>Back</translate>">
+   <input name="action" class="submit" type="submit" value="[% 'Continue' | $T8 %]">
+   <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 </body>
diff --git a/templates/webpages/ic/form_footer_de.html b/templates/webpages/ic/form_footer_de.html
index 755902e15..b91601148 100644
--- a/templates/webpages/ic/form_footer_de.html
+++ b/templates/webpages/ic/form_footer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   [%- IF item == 'assembly' %]
@@ -6,8 +7,8 @@
     <td>
       <table border="0" width="100%">
         <tr>
-          <th colspan="2" align=right>Summe&nbsp;</th>
-          <th align=right>Einkaufspreis:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  Verkaufspreis: [% LxERP.format_amount(assemblytotal, 2) %]</th>
+          <th colspan="2" align=right>[% 'Total' | $T8 %]&nbsp;</th>
+          <th align=right>[% 'Purchase Price' | $T8 %]:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  [% 'Sell Price' | $T8 %]: [% LxERP.format_amount(assemblytotal, 2) %]</th>
         </tr>
       </table>
     </td>
@@ -30,7 +31,7 @@
 [%- IF CUSTOM_VARIABLES.size %]
 <div id="custom_variables" class="tabcontent">
 
- <p>Unmarkierte Variablen werden für diesen Artikel nicht in Aufträgen und Rechnungen angezeigt.</p>
+ <p>[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]</p>
 
  <p>
   <table>
@@ -50,30 +51,30 @@
 
 </div>
 
-<input class="submit" type="submit" name="action" value="Erneuern">
+<input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
 <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-<input class="submit" type="submit" name="action" value="Speichern">
+<input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
 
   [%- IF id %]
     [%- UNLESS previousform %]
-<input class="submit" type="submit" name="action" value="als neu speichern">
+<input class="submit" type="submit" name="action" value="[% 'Save as new' | $T8 %]">
     [%- END %]
 
     [%- IF orphaned %]
       [%- UNLESS previousform %]
         [%- IF item == 'assembly' %]
           [%- UNLESS onhand %]
-<input class="submit" type="submit" name="action" value="Löschen">
+<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
           [%- END %]
         [%- ELSE %]
-<input class="submit" type="submit" name="action" value="Löschen">
+<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
         [%- END %]
       [%- END %]
     [%- END %]
   [%- END %]
 
   [%- IF id != "" %]
-<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
+<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
   [%- END %]
 
 </form>
diff --git a/templates/webpages/ic/form_footer_master.html b/templates/webpages/ic/form_footer_master.html
index ed08335c9..b91601148 100644
--- a/templates/webpages/ic/form_footer_master.html
+++ b/templates/webpages/ic/form_footer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   [%- IF item == 'assembly' %]
@@ -6,8 +7,8 @@
     <td>
       <table border="0" width="100%">
         <tr>
-          <th colspan="2" align=right><translate>Total</translate>&nbsp;</th>
-          <th align=right><translate>Purchase Price</translate>:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  <translate>Sell Price</translate>: [% LxERP.format_amount(assemblytotal, 2) %]</th>
+          <th colspan="2" align=right>[% 'Total' | $T8 %]&nbsp;</th>
+          <th align=right>[% 'Purchase Price' | $T8 %]:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  [% 'Sell Price' | $T8 %]: [% LxERP.format_amount(assemblytotal, 2) %]</th>
         </tr>
       </table>
     </td>
@@ -30,7 +31,7 @@
 [%- IF CUSTOM_VARIABLES.size %]
 <div id="custom_variables" class="tabcontent">
 
- <p><translate>Unchecked custom variables will not appear in orders and invoices.</translate></p>
+ <p>[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]</p>
 
  <p>
   <table>
@@ -50,30 +51,30 @@
 
 </div>
 
-<input class="submit" type="submit" name="action" value="<translate>Update</translate>">
+<input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
 <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
-<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+<input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
 
   [%- IF id %]
     [%- UNLESS previousform %]
-<input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
+<input class="submit" type="submit" name="action" value="[% 'Save as new' | $T8 %]">
     [%- END %]
 
     [%- IF orphaned %]
       [%- UNLESS previousform %]
         [%- IF item == 'assembly' %]
           [%- UNLESS onhand %]
-<input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
           [%- END %]
         [%- ELSE %]
-<input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
         [%- END %]
       [%- END %]
     [%- END %]
   [%- END %]
 
   [%- IF id != "" %]
-<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
+<input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
   [%- END %]
 
 </form>
diff --git a/templates/webpages/ic/form_header_de.html b/templates/webpages/ic/form_header_de.html
index d78717dc7..1063fa50b 100644
--- a/templates/webpages/ic/form_header_de.html
+++ b/templates/webpages/ic/form_header_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body onLoad="fokus()">
@@ -23,9 +24,9 @@
   <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="master_data">Stammdaten</a></li>
+   <li class="selected"><a href="#" rel="master_data">[% 'Master Data' | $T8 %]</a></li>
    [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
    [%- END %]
   </ul>
 
@@ -43,11 +44,11 @@
            <td colspan="2">
             <table>
              <tr>
-              <th align="right">Artikelnummer</th>
+              <th align="right">[% 'Part Number' | $T8 %]</th>
               <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
              </tr>
              <tr>
-              <th align="right">Artikelbeschreibung</th>
+              <th align="right">[% 'Part Description' | $T8 %]</th>
               <td>
                [%- IF description_area %]
                <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
@@ -57,12 +58,12 @@
               </td>
              </tr>
              <tr>
-               <th align="right">EAN-Code</th>
+               <th align="right">[% 'EAN-Code' | $T8 %]</th>
                <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
              </tr>
              <tr>
               [%- IF all_partsgroup.size %]
-              <th align="right">Warengruppe</th>
+              <th align="right">[% 'Group' | $T8 %]</th>
               <td>
                [%- INCLUDE generic/multibox.html
                      name       = 'partsgroup',
@@ -80,7 +81,7 @@
 
              [%- IF BUCHUNGSGRUPPEN.size %]
              <tr>
-              <th align="right">Buchungsgruppe</th>
+              <th align="right">[% 'Buchungsgruppe' | $T8 %]</th>
               <td>
                [%- INCLUDE generic/multibox.html
                      name       = 'buchungsgruppen_id',
@@ -99,7 +100,7 @@
              <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
              [%- END %]
              <tr>
-              <th align="right">Zahlungskonditionen</th>
+              <th align="right">[% 'Payment Terms' | $T8 %]</th>
               <td>
                [%- INCLUDE generic/multibox.html
                      name       = 'payment_id',
@@ -117,7 +118,7 @@
 
           <tr>
            <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')">Spracheinstellungen</button>
+            <button type="button" onclick="parts_language_selection_window('language_values')">[% 'Set Language Values' | $T8 %]</button>
            </td>
           </tr>
 
@@ -127,9 +128,9 @@
            <td>
             <table>
              <tr>
-              <th align="left">Bemerkungen</th>
+              <th align="left">[% 'Notes' | $T8 %]</th>
               [%- UNLESS is_service %]
-              <th align="left">Formel</th>
+              <th align="left">[% 'Formula' | $T8 %]</th>
               [%- END %]
              </tr>
              <tr>
@@ -139,7 +140,7 @@
               [%- UNLESS is_service %]
               <td>
                <ilayer>
-                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname = Variable Einheit;<br>Variablenname2 = Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Variablennamen und Einheiten dürfen nur aus alphanumerischen Zeichen bestehen.<br>Es muss jeweils die Gesamte Zeile eingegeben werden')">
+                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('[% 'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' | $T8 %]')">
                  <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
                </td>
               [%- END %]
@@ -153,32 +154,32 @@
         <td>
          <table>
           <tr>
-           <th align="right" nowrap="true">Erneuert am</th>
+           <th align="right" nowrap="true">[% 'Updated' | $T8 %]</th>
            <td>
             <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
            </td>
           </tr>
 
           <tr>
-           <th align="right" nowrap="true">Listenpreis</th>
+           <th align="right" nowrap="true">[% 'List Price' | $T8 %]</th>
            <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
           </tr>
 
           <tr>
-           <th align="right" nowrap="true">Verkaufspreis</th>
+           <th align="right" nowrap="true">[% 'Sell Price' | $T8 %]</th>
            <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
           </tr>
 
           [%- UNLESS is_assembly %]
           <tr>
-           <th align="right" nowrap="true">Einkaufspreis</th>
+           <th align="right" nowrap="true">[% 'Last Cost' | $T8 %]</th>
            <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
           </tr>
           [%- END %]
 
           [%- IF ALL_PRICE_FACTORS.size %]
           <tr>
-           <th align="right">Preisfaktor</th>
+           <th align="right">[% 'Price Factor' | $T8 %]</th>
            <td>
             [%- INCLUDE generic/multibox.html
                   name       = 'price_factor_id',
@@ -193,7 +194,7 @@
           [%- END %]
 
           <tr>
-           <th align="right" nowrap="true">Einheit</th>
+           <th align="right" nowrap="true">[% 'Unit' | $T8 %]</th>
            <td>
             <input type="hidden" name="unit_changeable" value="[% HTML.escape(unit_changeable) %]">
             [%- UNLESS unit_changeable %]
@@ -212,7 +213,7 @@
 
         [%- UNLESS is_service %]
           <tr>
-           <th align="right" nowrap="true">Gewicht</th>
+           <th align="right" nowrap="true">[% 'Weight' | $T8 %]</th>
            <td>
             [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
             <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
@@ -222,42 +223,42 @@
         [%- END %]
         [%- UNLESS is_service %]
           <tr>
-           <th align="right" nowrap>Auf Lager</th>
+           <th align="right" nowrap>[% 'On Hand' | $T8 %]</th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
           </tr>
           <tr>
-           <th align="right" nowrap="true">Mindestlagerbestand</th>
+           <th align="right" nowrap="true">[% 'ROP' | $T8 %]</th>
            <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true">Lagerplatz</th>
+           <th align="right" nowrap="true">[% 'Bin' | $T8 %]</th>
            <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true">Verrechnungseinheit</th>
+           <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true">Geschäftsvolumen</th>
+           <th align="right" nowrap="true">[% 'Business Volume' | $T8 %]</th>
            <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap><label for="not_discountable">Nicht rabattierfähig</label></th>
+           <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
           </tr>
         [%- END %]
         [%- IF id %]
           <tr>
-           <th align="right" nowrap="true"><label for="obsolete">Ungültig</label></th>
+           <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>
            <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
           </tr>
         [%- END %]
           <tr>
-           <th align="right" nowrap><label for="shop">Hat eine Serienummer</label></th>
+           <th align="right" nowrap><label for="shop">[% 'Has serial number' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
           </tr>
           <tr>
-           <th align="right" nowrap><label for="shop">Shopartikel</label></th>
+           <th align="right" nowrap><label for="shop">[% 'Shopartikel' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
           </tr>
          </table>
@@ -273,13 +274,13 @@
      <td>
       <table>
        <tr>
-        <th align="right" nowrap>Grafik</th>
+        <th align="right" nowrap>[% 'Image' | $T8 %]</th>
         <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
-        <th align="right" nowrap>Mikrofilm</th>
+        <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
         <td><input name="microfiche" size="20" value="[% HTML.escape(microfiche) %]"></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Zeichnung</th>
+        <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
         <td><input name="drawing" size="40" value="[% HTML.escape(drawing) %]"></td>
        </tr>
       </table>
diff --git a/templates/webpages/ic/form_header_master.html b/templates/webpages/ic/form_header_master.html
index 8635b4168..1063fa50b 100644
--- a/templates/webpages/ic/form_header_master.html
+++ b/templates/webpages/ic/form_header_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body onLoad="fokus()">
@@ -23,9 +24,9 @@
   <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="master_data"><translate>Master Data</translate></a></li>
+   <li class="selected"><a href="#" rel="master_data">[% 'Master Data' | $T8 %]</a></li>
    [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
    [%- END %]
   </ul>
 
@@ -43,11 +44,11 @@
            <td colspan="2">
             <table>
              <tr>
-              <th align="right"><translate>Part Number</translate></th>
+              <th align="right">[% 'Part Number' | $T8 %]</th>
               <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
              </tr>
              <tr>
-              <th align="right"><translate>Part Description</translate></th>
+              <th align="right">[% 'Part Description' | $T8 %]</th>
               <td>
                [%- IF description_area %]
                <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
@@ -57,12 +58,12 @@
               </td>
              </tr>
              <tr>
-               <th align="right"><translate>EAN-Code</translate></th>
+               <th align="right">[% 'EAN-Code' | $T8 %]</th>
                <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
              </tr>
              <tr>
               [%- IF all_partsgroup.size %]
-              <th align="right"><translate>Group</translate></th>
+              <th align="right">[% 'Group' | $T8 %]</th>
               <td>
                [%- INCLUDE generic/multibox.html
                      name       = 'partsgroup',
@@ -80,7 +81,7 @@
 
              [%- IF BUCHUNGSGRUPPEN.size %]
              <tr>
-              <th align="right"><translate>Buchungsgruppe</translate></th>
+              <th align="right">[% 'Buchungsgruppe' | $T8 %]</th>
               <td>
                [%- INCLUDE generic/multibox.html
                      name       = 'buchungsgruppen_id',
@@ -99,7 +100,7 @@
              <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
              [%- END %]
              <tr>
-              <th align="right"><translate>Payment Terms</translate></th>
+              <th align="right">[% 'Payment Terms' | $T8 %]</th>
               <td>
                [%- INCLUDE generic/multibox.html
                      name       = 'payment_id',
@@ -117,7 +118,7 @@
 
           <tr>
            <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')"><translate>Set Language Values</translate></button>
+            <button type="button" onclick="parts_language_selection_window('language_values')">[% 'Set Language Values' | $T8 %]</button>
            </td>
           </tr>
 
@@ -127,9 +128,9 @@
            <td>
             <table>
              <tr>
-              <th align="left"><translate>Notes</translate></th>
+              <th align="left">[% 'Notes' | $T8 %]</th>
               [%- UNLESS is_service %]
-              <th align="left"><translate>Formula</translate></th>
+              <th align="left">[% 'Formula' | $T8 %]</th>
               [%- END %]
              </tr>
              <tr>
@@ -139,7 +140,7 @@
               [%- UNLESS is_service %]
               <td>
                <ilayer>
-                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('<translate>The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br></translate>')">
+                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('[% 'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' | $T8 %]')">
                  <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
                </td>
               [%- END %]
@@ -153,32 +154,32 @@
         <td>
          <table>
           <tr>
-           <th align="right" nowrap="true"><translate>Updated</translate></th>
+           <th align="right" nowrap="true">[% 'Updated' | $T8 %]</th>
            <td>
             <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
            </td>
           </tr>
 
           <tr>
-           <th align="right" nowrap="true"><translate>List Price</translate></th>
+           <th align="right" nowrap="true">[% 'List Price' | $T8 %]</th>
            <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
           </tr>
 
           <tr>
-           <th align="right" nowrap="true"><translate>Sell Price</translate></th>
+           <th align="right" nowrap="true">[% 'Sell Price' | $T8 %]</th>
            <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
           </tr>
 
           [%- UNLESS is_assembly %]
           <tr>
-           <th align="right" nowrap="true"><translate>Last Cost</translate></th>
+           <th align="right" nowrap="true">[% 'Last Cost' | $T8 %]</th>
            <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
           </tr>
           [%- END %]
 
           [%- IF ALL_PRICE_FACTORS.size %]
           <tr>
-           <th align="right"><translate>Price Factor</translate></th>
+           <th align="right">[% 'Price Factor' | $T8 %]</th>
            <td>
             [%- INCLUDE generic/multibox.html
                   name       = 'price_factor_id',
@@ -193,7 +194,7 @@
           [%- END %]
 
           <tr>
-           <th align="right" nowrap="true"><translate>Unit</translate></th>
+           <th align="right" nowrap="true">[% 'Unit' | $T8 %]</th>
            <td>
             <input type="hidden" name="unit_changeable" value="[% HTML.escape(unit_changeable) %]">
             [%- UNLESS unit_changeable %]
@@ -212,7 +213,7 @@
 
         [%- UNLESS is_service %]
           <tr>
-           <th align="right" nowrap="true"><translate>Weight</translate></th>
+           <th align="right" nowrap="true">[% 'Weight' | $T8 %]</th>
            <td>
             [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
             <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
@@ -222,42 +223,42 @@
         [%- END %]
         [%- UNLESS is_service %]
           <tr>
-           <th align="right" nowrap><translate>On Hand</translate></th>
+           <th align="right" nowrap>[% 'On Hand' | $T8 %]</th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
           </tr>
           <tr>
-           <th align="right" nowrap="true"><translate>ROP</translate></th>
+           <th align="right" nowrap="true">[% 'ROP' | $T8 %]</th>
            <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true"><translate>Bin</translate></th>
+           <th align="right" nowrap="true">[% 'Bin' | $T8 %]</th>
            <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true"><translate>Verrechnungseinheit</translate></th>
+           <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true"><translate>Business Volume</translate></th>
+           <th align="right" nowrap="true">[% 'Business Volume' | $T8 %]</th>
            <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap><label for="not_discountable"><translate>Not Discountable</translate></label></th>
+           <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
           </tr>
         [%- END %]
         [%- IF id %]
           <tr>
-           <th align="right" nowrap="true"><label for="obsolete"><translate>Obsolete</translate></label></th>
+           <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>
            <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
           </tr>
         [%- END %]
           <tr>
-           <th align="right" nowrap><label for="shop"><translate>Has serial number</translate></label></th>
+           <th align="right" nowrap><label for="shop">[% 'Has serial number' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
           </tr>
           <tr>
-           <th align="right" nowrap><label for="shop"><translate>Shopartikel</translate></label></th>
+           <th align="right" nowrap><label for="shop">[% 'Shopartikel' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
           </tr>
          </table>
@@ -273,13 +274,13 @@
      <td>
       <table>
        <tr>
-        <th align="right" nowrap><translate>Image</translate></th>
+        <th align="right" nowrap>[% 'Image' | $T8 %]</th>
         <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
-        <th align="right" nowrap><translate>Microfiche</translate></th>
+        <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
         <td><input name="microfiche" size="20" value="[% HTML.escape(microfiche) %]"></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Drawing</translate></th>
+        <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
         <td><input name="drawing" size="40" value="[% HTML.escape(drawing) %]"></td>
        </tr>
       </table>
diff --git a/templates/webpages/ic/generate_report_bottom_de.html b/templates/webpages/ic/generate_report_bottom_de.html
index b6c6767f5..17d42afc4 100644
--- a/templates/webpages/ic/generate_report_bottom_de.html
+++ b/templates/webpages/ic/generate_report_bottom_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<form method="post" action="ic.pl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
@@ -5,11 +6,11 @@
  <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
 
  [% SWITCH searchitems %]
-   [% CASE 'part' %]Neue Ware
-   [% CASE 'service' %]Neue Dienstleistung
-   [% CASE 'assembly' %]Neues Erzeugnis
+   [% CASE 'part' %][% 'New part' | $T8 %]
+   [% CASE 'service' %][% 'New service' | $T8 %]
+   [% CASE 'assembly' %][% 'New assembly' | $T8 %]
  [% END %]
  <br>
- <input class="submit" type="submit" name="action" value="Erfassen">
+ <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/ic/generate_report_bottom_master.html b/templates/webpages/ic/generate_report_bottom_master.html
index ede375cd2..17d42afc4 100644
--- a/templates/webpages/ic/generate_report_bottom_master.html
+++ b/templates/webpages/ic/generate_report_bottom_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<form method="post" action="ic.pl">
 
  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
@@ -5,11 +6,11 @@
  <input type="hidden" name="item" value="[% HTML.escape(searchitems) %]">
 
  [% SWITCH searchitems %]
-   [% CASE 'part' %]<translate>New part</translate>
-   [% CASE 'service' %]<translate>New service</translate>
-   [% CASE 'assembly' %]<translate>New assembly</translate>
+   [% CASE 'part' %][% 'New part' | $T8 %]
+   [% CASE 'service' %][% 'New service' | $T8 %]
+   [% CASE 'assembly' %][% 'New assembly' | $T8 %]
  [% END %]
  <br>
- <input class="submit" type="submit" name="action" value="<translate>Add</translate>">
+ <input class="submit" type="submit" name="action" value="[% 'Add' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/ic/makemodel_de.html b/templates/webpages/ic/makemodel_de.html
index dd4d03842..641212417 100644
--- a/templates/webpages/ic/makemodel_de.html
+++ b/templates/webpages/ic/makemodel_de.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
     <td>
       <table>
         <tr>
-          <th class="listheading">Lieferant</th>
-          <th class="listheading">Lieferanten-Art-Nr.</th>
+          <th class="listheading">[% 'Make' | $T8 %]</th>
+          <th class="listheading">[% 'Model' | $T8 %]</th>
         </tr>
       [%- FOREACH row = MM_DATA %]
         <tr>
diff --git a/templates/webpages/ic/makemodel_master.html b/templates/webpages/ic/makemodel_master.html
index 696080ebf..641212417 100644
--- a/templates/webpages/ic/makemodel_master.html
+++ b/templates/webpages/ic/makemodel_master.html
@@ -1,11 +1,12 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
     <td>
       <table>
         <tr>
-          <th class="listheading"><translate>Make</translate></th>
-          <th class="listheading"><translate>Model</translate></th>
+          <th class="listheading">[% 'Make' | $T8 %]</th>
+          <th class="listheading">[% 'Model' | $T8 %]</th>
         </tr>
       [%- FOREACH row = MM_DATA %]
         <tr>
diff --git a/templates/webpages/ic/parts_language_selection_de.html b/templates/webpages/ic/parts_language_selection_de.html
index 26d08fb1a..95ed20d85 100644
--- a/templates/webpages/ic/parts_language_selection_de.html
+++ b/templates/webpages/ic/parts_language_selection_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -6,7 +7,7 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p>Bitte die Übersetzungen unten eintragen</p>
+  <p>[% 'Please insert your language values below' | $T8 %]</p>
 
   <p>
    <table>
@@ -32,7 +33,7 @@
   </p>
 
   <p>
-   <button type="button" onclick="languages_updated()">Übernehmen</button>
+   <button type="button" onclick="languages_updated()">[% 'Close' | $T8 %]</button>
   </p>
 
  </form>
diff --git a/templates/webpages/ic/parts_language_selection_master.html b/templates/webpages/ic/parts_language_selection_master.html
index 9a8060ec4..95ed20d85 100644
--- a/templates/webpages/ic/parts_language_selection_master.html
+++ b/templates/webpages/ic/parts_language_selection_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
@@ -6,7 +7,7 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p><translate>Please insert your language values below</translate></p>
+  <p>[% 'Please insert your language values below' | $T8 %]</p>
 
   <p>
    <table>
@@ -32,7 +33,7 @@
   </p>
 
   <p>
-   <button type="button" onclick="languages_updated()"><translate>Close</translate></button>
+   <button type="button" onclick="languages_updated()">[% 'Close' | $T8 %]</button>
   </p>
 
  </form>
diff --git a/templates/webpages/ic/price_row_de.html b/templates/webpages/ic/price_row_de.html
index 421256fa5..09a7b6e61 100644
--- a/templates/webpages/ic/price_row_de.html
+++ b/templates/webpages/ic/price_row_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- IF PRICES.size %]
@@ -5,8 +6,8 @@
     <td>
       <table width=100%>
         <tr>
-          <th class="listheading">Preisgruppe</th>
-          <th class="listheading">Preis</th>
+          <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+          <th class="listheading">[% 'Preis' | $T8 %]</th>
         </tr>
 [%- FOREACH row = PRICES %]
         <tr>
diff --git a/templates/webpages/ic/price_row_master.html b/templates/webpages/ic/price_row_master.html
index 56bae692b..09a7b6e61 100644
--- a/templates/webpages/ic/price_row_master.html
+++ b/templates/webpages/ic/price_row_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- IF PRICES.size %]
@@ -5,8 +6,8 @@
     <td>
       <table width=100%>
         <tr>
-          <th class="listheading"><translate>Preisklasse</translate></th>
-          <th class="listheading"><translate>Preis</translate></th>
+          <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+          <th class="listheading">[% 'Preis' | $T8 %]</th>
         </tr>
 [%- FOREACH row = PRICES %]
         <tr>
diff --git a/templates/webpages/ic/search_de.html b/templates/webpages/ic/search_de.html
index 475163808..25625a5ec 100644
--- a/templates/webpages/ic/search_de.html
+++ b/templates/webpages/ic/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
@@ -23,36 +24,36 @@
     <td>
      <table>
       <tr>
-       <th align="right" nowrap>Artikelnummer</th>
+       <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
        <td><input name="partnumber" size="20"></td>
-       <th align="right" nowrap>EAN</th>
+       <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
        <td><input name="ean" size="20"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap>Artikelbeschreibung</th>
+       <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
        <td colspan="3"><input name="description" size="40"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap>Warengruppe</th>
+       <th align="right" nowrap>[% 'Group' | $T8 %]</th>
        <td><input name="partsgroup" size="20"></td>
        [%- UNLESS is_service %]
-       <th align="right" nowrap>Seriennummer</th> <td><input name="serialnumber" size="20"></td>
+       <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
        [%- END %]
       </tr>
 
       [%- UNLESS is_service %]
       <tr>
-       <th align="right" nowrap>Lieferant</th> <td><input name="make" size="20"></td>
-       <th align="right" nowrap>Lieferanten-Art-Nr.</th> <td><input name="model" size="20"></td>
+       <th align="right" nowrap>[% 'Make' | $T8 %]</th> <td><input name="make" size="20"></td>
+       <th align="right" nowrap>[% 'Model' | $T8 %]</th> <td><input name="model" size="20"></td>
       </tr>
       [%- END %]
 
       <tr>
-       <th align="right" nowrap>Zeichnung</th>
+       <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
        <td><input name="drawing" size="20"></td>
-       <th align="right" nowrap>Mikrofilm</th>
+       <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
        <td><input name="microfiche" size="20"></td>
       </tr>
 
@@ -62,8 +63,8 @@
       <tr>
        <td></td>
        <td colspan="3">
-        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">Hauptartikelbezeichnung</label>
-        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">Einzelteile</label>
+        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">[% 'Top Level' | $T8 %]</label>
+        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">[% 'Individual Items' | $T8 %]</label>
        </td>
       </tr>
       [%- END %]
@@ -72,17 +73,17 @@
        <td></td>
        <td colspan="3">
         <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-        <label for="itemstatus_active">Aktiv</label>
+        <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
         [%- UNLESS is_service %]
         <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-        <label for="itemstatus_onhand">Auf Lager</label>
+        <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
         <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-        <label for="itemstatus_short">Knapp</label>
+        <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
         [%- END %]
         <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-        <label for="itemstatus_obsolete">Ungültig</label>
+        <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
         <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-        <label for="itemstatus_orphaned">Nie benutzt</label>
+        <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
        </td>
       </tr>
 
@@ -96,10 +97,10 @@
             <tr>
              [%- UNLESS is_assembly %]
              <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="bought">Gekauft</label></td>
+             <td nowrap><label for="bought">[% 'Bought' | $T8 %]</label></td>
              [%- END %]
              <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="sold">Verkauft</label></td>
+             <td nowrap><label for="sold">[% 'Sold' | $T8 %]</label></td>
             </tr>
 
             <tr>
@@ -109,10 +110,10 @@
             <tr>
              [%- UNLESS is_assembly %]
              <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="onorder">Ist bestellt</label></td>
+             <td nowrap><label for="onorder">[% 'On Order' | $T8 %]</label></td>
              [%- END %]
              <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="ordered">Vom Kunde bestellt</label></td>
+             <td nowrap><label for="ordered">[% 'Ordered' | $T8 %]</label></td>
             </tr>
 
             <tr>
@@ -122,10 +123,10 @@
             <tr>
              [%- UNLESS is_assembly %]
              <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="rfq">Anfrage</label></td>
+             <td nowrap><label for="rfq">[% 'RFQ' | $T8 %]</label></td>
              [%- END %]
              <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="quoted">Angeboten</label></td>
+             <td nowrap><label for="quoted">[% 'Quoted' | $T8 %]</label></td>
             </tr>
            </table>
           </td>
@@ -135,12 +136,12 @@
           <td>
            <table>
             <tr>
-             <th>Von</th>
+             <th>[% 'From' | $T8 %]</th>
              <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdatefrom" id="trigger1" value="?"></td>
-             <th>Bis</th>
+             <td><input type="button" name="transdatefrom" id="trigger1" value="[% 'button' | $T8 %]"></td>
+             <th>[% 'To (time)' | $T8 %]</th>
              <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="?"></td>
+             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="[% 'button' | $T8 %]"></td>
             </tr>
            </table>
           </td>
@@ -157,105 +158,105 @@
       </tr>
 
       <tr>
-       <th align="right" nowrap>In Bericht aufnehmen</th> <td colspan="3">
+       <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th> <td colspan="3">
         <table>
          <tr>
           <td>
            <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_partnumber">Artikelnummer</label>
+           <label for="l_partnumber">[% 'Part Number' | $T8 %]</label>
           </td>
           <td>
            <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_description">Artikelbeschreibung</label>
+           <label for="l_description">[% 'Part Description' | $T8 %]</label>
           </td>
           [%- UNLESS is_service %]
           <td>
            <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
-           <label for="l_serialnumber">Seriennummer</label>
+           <label for="l_serialnumber">[% 'Serial Number' | $T8 %]</label>
           </td>
           [%- END %]
           <td>
            <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_unit">Maßeinheit</label>
+           <label for="l_unit">[% 'Unit of measure' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
-           <label for="l_listprice">Listenpreis</label>
+           <label for="l_listprice">[% 'List Price' | $T8 %]</label>
           </td>
           <td>
            <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_sellprice">Verkaufspreis</label>
+           <label for="l_sellprice">[% 'Sell Price' | $T8 %]</label>
           </td>
           <td>
            <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_lastcost">Einkaufspreis</label>
+           <label for="l_lastcost">[% 'Last Cost' | $T8 %]</label>
           </td>
           <td>
            <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_linetotal">Zeilensumme</label>
+           <label for="l_linetotal">[% 'Line Total' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_priceupdate">Erneuert am</label>
+           <label for="l_priceupdate">[% 'Updated' | $T8 %]</label>
           </td>
           <td>
           <!-- auskommentiert fuer bug nummer 852 - ggf. fuer einen standardlagerplatz verwertet jb 18.5.09-->
            <!--input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
-           <label for="l_bin">Lagerplatz</label -->
+           <label for="l_bin">[% 'Bin' | $T8 %]</label -->
            <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_deliverydate">Lieferdatum</label>
+           <label for="l_deliverydate">[% 'deliverydate' | $T8 %]</label>
           </td>
           <td>
            <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
-           <label for="l_rop">Mindestlagerbestand</label>
+           <label for="l_rop">[% 'ROP' | $T8 %]</label>
           </td>
           <td>
            <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
-           <label for="l_weight">Gewicht</label>
+           <label for="l_weight">[% 'Weight' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
-           <label for="l_image">Grafik</label>
+           <label for="l_image">[% 'Image' | $T8 %]</label>
           </td>
           <td>
            <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
-           <label for="l_drawing">Zeichnung</label>
+           <label for="l_drawing">[% 'Drawing' | $T8 %]</label>
           </td>
           <td>
            <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
-           <label for="l_microfiche">Mikrofilm</label>
+           <label for="l_microfiche">[% 'Microfiche' | $T8 %]</label>
           </td>
           <td>
            <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
-           <label for="l_partsgroup">Warengruppe</label>
+           <label for="l_partsgroup">[% 'Group' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_transdate">Belegdatum</label>
+           <label for="l_transdate">[% 'Transdate' | $T8 %]</label>
           </td>
           <td>
            <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_subtotal">Zwischensumme</label>
+           <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
           </td>
           <td>
            <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_soldtotal">Verkaufte Anzahl</label>
+           <label for="l_soldtotal">[% 'soldtotal' | $T8 %]</label>
           </td>
           <td>
            <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
-           <label for="l_ean">EAN</label>
+           <label for="l_ean">[% 'EAN' | $T8 %]</label>
           </td>
          </tr>
 
@@ -277,8 +278,8 @@
   </script>
 
   <p>
-   <input class="submit" type="submit" name="action" value="Weiter">
-   <input class="submit" type="submit" name="action" value="Top 100">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'TOP100' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/ic/search_master.html b/templates/webpages/ic/search_master.html
index 52d3a7b13..25625a5ec 100644
--- a/templates/webpages/ic/search_master.html
+++ b/templates/webpages/ic/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
@@ -23,36 +24,36 @@
     <td>
      <table>
       <tr>
-       <th align="right" nowrap><translate>Part Number</translate></th>
+       <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
        <td><input name="partnumber" size="20"></td>
-       <th align="right" nowrap><translate>EAN</translate></th>
+       <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
        <td><input name="ean" size="20"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Part Description</translate></th>
+       <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
        <td colspan="3"><input name="description" size="40"></td>
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Group</translate></th>
+       <th align="right" nowrap>[% 'Group' | $T8 %]</th>
        <td><input name="partsgroup" size="20"></td>
        [%- UNLESS is_service %]
-       <th align="right" nowrap><translate>Serial Number</translate></th> <td><input name="serialnumber" size="20"></td>
+       <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
        [%- END %]
       </tr>
 
       [%- UNLESS is_service %]
       <tr>
-       <th align="right" nowrap><translate>Make</translate></th> <td><input name="make" size="20"></td>
-       <th align="right" nowrap><translate>Model</translate></th> <td><input name="model" size="20"></td>
+       <th align="right" nowrap>[% 'Make' | $T8 %]</th> <td><input name="make" size="20"></td>
+       <th align="right" nowrap>[% 'Model' | $T8 %]</th> <td><input name="model" size="20"></td>
       </tr>
       [%- END %]
 
       <tr>
-       <th align="right" nowrap><translate>Drawing</translate></th>
+       <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
        <td><input name="drawing" size="20"></td>
-       <th align="right" nowrap><translate>Microfiche</translate></th>
+       <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
        <td><input name="microfiche" size="20"></td>
       </tr>
 
@@ -62,8 +63,8 @@
       <tr>
        <td></td>
        <td colspan="3">
-        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1"><translate>Top Level</translate></label>
-        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom"><translate>Individual Items</translate></label>
+        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">[% 'Top Level' | $T8 %]</label>
+        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">[% 'Individual Items' | $T8 %]</label>
        </td>
       </tr>
       [%- END %]
@@ -72,17 +73,17 @@
        <td></td>
        <td colspan="3">
         <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-        <label for="itemstatus_active"><translate>Active</translate></label>
+        <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
         [%- UNLESS is_service %]
         <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-        <label for="itemstatus_onhand"><translate>On Hand</translate></label>
+        <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
         <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-        <label for="itemstatus_short"><translate>Short</translate></label>
+        <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
         [%- END %]
         <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-        <label for="itemstatus_obsolete"><translate>Obsolete</translate></label>
+        <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
         <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-        <label for="itemstatus_orphaned"><translate>Orphaned</translate></label>
+        <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
        </td>
       </tr>
 
@@ -96,10 +97,10 @@
             <tr>
              [%- UNLESS is_assembly %]
              <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="bought"><translate>Bought</translate></label></td>
+             <td nowrap><label for="bought">[% 'Bought' | $T8 %]</label></td>
              [%- END %]
              <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="sold"><translate>Sold</translate></label></td>
+             <td nowrap><label for="sold">[% 'Sold' | $T8 %]</label></td>
             </tr>
 
             <tr>
@@ -109,10 +110,10 @@
             <tr>
              [%- UNLESS is_assembly %]
              <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="onorder"><translate>On Order</translate></label></td>
+             <td nowrap><label for="onorder">[% 'On Order' | $T8 %]</label></td>
              [%- END %]
              <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="ordered"><translate>Ordered</translate></label></td>
+             <td nowrap><label for="ordered">[% 'Ordered' | $T8 %]</label></td>
             </tr>
 
             <tr>
@@ -122,10 +123,10 @@
             <tr>
              [%- UNLESS is_assembly %]
              <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="rfq"><translate>RFQ</translate></label></td>
+             <td nowrap><label for="rfq">[% 'RFQ' | $T8 %]</label></td>
              [%- END %]
              <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
-             <td nowrap><label for="quoted"><translate>Quoted</translate></label></td>
+             <td nowrap><label for="quoted">[% 'Quoted' | $T8 %]</label></td>
             </tr>
            </table>
           </td>
@@ -135,12 +136,12 @@
           <td>
            <table>
             <tr>
-             <th><translate>From</translate></th>
+             <th>[% 'From' | $T8 %]</th>
              <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdatefrom" id="trigger1" value="<translate>button</translate>"></td>
-             <th><translate>To (time)</translate></th>
+             <td><input type="button" name="transdatefrom" id="trigger1" value="[% 'button' | $T8 %]"></td>
+             <th>[% 'To (time)' | $T8 %]</th>
              <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="<translate>button</translate>"></td>
+             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="[% 'button' | $T8 %]"></td>
             </tr>
            </table>
           </td>
@@ -157,105 +158,105 @@
       </tr>
 
       <tr>
-       <th align="right" nowrap><translate>Include in Report</translate></th> <td colspan="3">
+       <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th> <td colspan="3">
         <table>
          <tr>
           <td>
            <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_partnumber"><translate>Part Number</translate></label>
+           <label for="l_partnumber">[% 'Part Number' | $T8 %]</label>
           </td>
           <td>
            <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_description"><translate>Part Description</translate></label>
+           <label for="l_description">[% 'Part Description' | $T8 %]</label>
           </td>
           [%- UNLESS is_service %]
           <td>
            <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
-           <label for="l_serialnumber"><translate>Serial Number</translate></label>
+           <label for="l_serialnumber">[% 'Serial Number' | $T8 %]</label>
           </td>
           [%- END %]
           <td>
            <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_unit"><translate>Unit of measure</translate></label>
+           <label for="l_unit">[% 'Unit of measure' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
-           <label for="l_listprice"><translate>List Price</translate></label>
+           <label for="l_listprice">[% 'List Price' | $T8 %]</label>
           </td>
           <td>
            <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_sellprice"><translate>Sell Price</translate></label>
+           <label for="l_sellprice">[% 'Sell Price' | $T8 %]</label>
           </td>
           <td>
            <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_lastcost"><translate>Last Cost</translate></label>
+           <label for="l_lastcost">[% 'Last Cost' | $T8 %]</label>
           </td>
           <td>
            <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
-           <label for="l_linetotal"><translate>Line Total</translate></label>
+           <label for="l_linetotal">[% 'Line Total' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_priceupdate"><translate>Updated</translate></label>
+           <label for="l_priceupdate">[% 'Updated' | $T8 %]</label>
           </td>
           <td>
           <!-- auskommentiert fuer bug nummer 852 - ggf. fuer einen standardlagerplatz verwertet jb 18.5.09-->
            <!--input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
-           <label for="l_bin"><translate>Bin</translate></label -->
+           <label for="l_bin">[% 'Bin' | $T8 %]</label -->
            <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_deliverydate"><translate>deliverydate</translate></label>
+           <label for="l_deliverydate">[% 'deliverydate' | $T8 %]</label>
           </td>
           <td>
            <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
-           <label for="l_rop"><translate>ROP</translate></label>
+           <label for="l_rop">[% 'ROP' | $T8 %]</label>
           </td>
           <td>
            <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
-           <label for="l_weight"><translate>Weight</translate></label>
+           <label for="l_weight">[% 'Weight' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
-           <label for="l_image"><translate>Image</translate></label>
+           <label for="l_image">[% 'Image' | $T8 %]</label>
           </td>
           <td>
            <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
-           <label for="l_drawing"><translate>Drawing</translate></label>
+           <label for="l_drawing">[% 'Drawing' | $T8 %]</label>
           </td>
           <td>
            <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
-           <label for="l_microfiche"><translate>Microfiche</translate></label>
+           <label for="l_microfiche">[% 'Microfiche' | $T8 %]</label>
           </td>
           <td>
            <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
-           <label for="l_partsgroup"><translate>Group</translate></label>
+           <label for="l_partsgroup">[% 'Group' | $T8 %]</label>
           </td>
          </tr>
 
          <tr>
           <td>
            <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
-           <label for="l_transdate"><translate>Transdate</translate></label>
+           <label for="l_transdate">[% 'Transdate' | $T8 %]</label>
           </td>
           <td>
            <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_subtotal"><translate>Subtotal</translate></label>
+           <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
           </td>
           <td>
            <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
-           <label for="l_soldtotal"><translate>soldtotal</translate></label>
+           <label for="l_soldtotal">[% 'soldtotal' | $T8 %]</label>
           </td>
           <td>
            <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
-           <label for="l_ean"><translate>EAN</translate></label>
+           <label for="l_ean">[% 'EAN' | $T8 %]</label>
           </td>
          </tr>
 
@@ -277,8 +278,8 @@
   </script>
 
   <p>
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
-   <input class="submit" type="submit" name="action" value="<translate>TOP100</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'TOP100' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/ic/search_update_prices_de.html b/templates/webpages/ic/search_update_prices_de.html
index 71251e1be..a8ce6481d 100644
--- a/templates/webpages/ic/search_update_prices_de.html
+++ b/templates/webpages/ic/search_update_prices_de.html
@@ -1,43 +1,44 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
 
  <form method="post" action="ic.pl">
 
-  <input type="hidden" name="title" value="Preise aktualisieren">
+  <input type="hidden" name="title" value="[% 'Update prices' | $T8 %]">
 
-  <div class="listtop">Preise aktualisieren</div>
+  <div class="listtop">[% 'Update prices' | $T8 %]</div>
 
   <p>
    <table>
     <tr>
-     <th align="right" nowrap>Artikelnummer</th>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
      <td><input name="partnumber" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Artikelbeschreibung</th>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td colspan="3"><input name="description" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Warengruppe</th>
+     <th align="right" nowrap>[% 'Group' | $T8 %]</th>
      <td><input name="partsgroup" size="20"></td>
-     <th align="right" nowrap>Seriennummer</th>
+     <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th>
      <td><input name="serialnumber" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Lieferant</th>
+     <th align="right" nowrap>[% 'Make' | $T8 %]</th>
      <td><input name="make" size="20"></td>
-     <th align="right" nowrap>Lieferanten-Art-Nr.</th>
+     <th align="right" nowrap>[% 'Model' | $T8 %]</th>
      <td><input name="model" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Zeichnung</th>
+     <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
      <td><input name="drawing" size="20"></td>
-     <th align="right" nowrap>Mikrofilm</th>
+     <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
      <td><input name="microfiche" size="20"></td>
     </tr>
 
@@ -45,15 +46,15 @@
      <td></td>
      <td colspan="3">
       <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-      <label for="itemstatus_active">Aktiv</label>
+      <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-      <label for="itemstatus_onhand">Auf Lager</label>
+      <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-      <label for="itemstatus_short">Knapp</label>
+      <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-      <label for="itemstatus_obsolete">Ungültig</label>
+      <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-      <label for="itemstatus_orphaned">Nie benutzt</label>
+      <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
      </td>
     </tr>
    </table>
@@ -64,13 +65,13 @@
   <p>
    <table>
     <tr>
-     <th class="listheading">Preisgruppe</th>
-     <th class="listheading">Preis</th>
-     <th class="listheading">Prozentual/Absolut</th>
+     <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+     <th class="listheading">[% 'Preis' | $T8 %]</th>
+     <th class="listheading">[% 'Prozentual/Absolut' | $T8 %]</th>
     </tr>
 
     <tr>
-     <td>Verkaufspreis</td>
+     <td>[% 'Sell Price' | $T8 %]</td>
      <td><input name="sellprice" size="11" value="[% HTML.escape(sellprice) %]"></td>
      <td align="center">
       <input name="sellprice_type" class="radio" type="radio" value="percent" checked> /
@@ -79,7 +80,7 @@
     </tr>
 
     <tr>
-     <td>Listenpreis</td>
+     <td>[% 'List Price' | $T8 %]</td>
      <td><input name="listprice" size="11" value="[% HTML.escape(listprice) %]"></td>
      <td align="center">
       <input name="listprice_type" class="radio" type="radio" value="percent" checked> /
@@ -109,7 +110,7 @@
   <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
 
   <p>
-   <input class="submit" type="submit" name="action" value="Weiter">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/ic/search_update_prices_master.html b/templates/webpages/ic/search_update_prices_master.html
index a64c4dd6a..a8ce6481d 100644
--- a/templates/webpages/ic/search_update_prices_master.html
+++ b/templates/webpages/ic/search_update_prices_master.html
@@ -1,43 +1,44 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body>
 
  <form method="post" action="ic.pl">
 
-  <input type="hidden" name="title" value="<translate>Update prices</translate>">
+  <input type="hidden" name="title" value="[% 'Update prices' | $T8 %]">
 
-  <div class="listtop"><translate>Update prices</translate></div>
+  <div class="listtop">[% 'Update prices' | $T8 %]</div>
 
   <p>
    <table>
     <tr>
-     <th align="right" nowrap><translate>Part Number</translate></th>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
      <td><input name="partnumber" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Part Description</translate></th>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td colspan="3"><input name="description" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Group</translate></th>
+     <th align="right" nowrap>[% 'Group' | $T8 %]</th>
      <td><input name="partsgroup" size="20"></td>
-     <th align="right" nowrap><translate>Serial Number</translate></th>
+     <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th>
      <td><input name="serialnumber" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Make</translate></th>
+     <th align="right" nowrap>[% 'Make' | $T8 %]</th>
      <td><input name="make" size="20"></td>
-     <th align="right" nowrap><translate>Model</translate></th>
+     <th align="right" nowrap>[% 'Model' | $T8 %]</th>
      <td><input name="model" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Drawing</translate></th>
+     <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
      <td><input name="drawing" size="20"></td>
-     <th align="right" nowrap><translate>Microfiche</translate></th>
+     <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
      <td><input name="microfiche" size="20"></td>
     </tr>
 
@@ -45,15 +46,15 @@
      <td></td>
      <td colspan="3">
       <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
-      <label for="itemstatus_active"><translate>Active</translate></label>
+      <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
-      <label for="itemstatus_onhand"><translate>On Hand</translate></label>
+      <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
-      <label for="itemstatus_short"><translate>Short</translate></label>
+      <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
-      <label for="itemstatus_obsolete"><translate>Obsolete</translate></label>
+      <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
       <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
-      <label for="itemstatus_orphaned"><translate>Orphaned</translate></label>
+      <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
      </td>
     </tr>
    </table>
@@ -64,13 +65,13 @@
   <p>
    <table>
     <tr>
-     <th class="listheading"><translate>Preisklasse</translate></th>
-     <th class="listheading"><translate>Preis</translate></th>
-     <th class="listheading"><translate>Prozentual/Absolut</translate></th>
+     <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+     <th class="listheading">[% 'Preis' | $T8 %]</th>
+     <th class="listheading">[% 'Prozentual/Absolut' | $T8 %]</th>
     </tr>
 
     <tr>
-     <td><translate>Sell Price</translate></td>
+     <td>[% 'Sell Price' | $T8 %]</td>
      <td><input name="sellprice" size="11" value="[% HTML.escape(sellprice) %]"></td>
      <td align="center">
       <input name="sellprice_type" class="radio" type="radio" value="percent" checked> /
@@ -79,7 +80,7 @@
     </tr>
 
     <tr>
-     <td><translate>List Price</translate></td>
+     <td>[% 'List Price' | $T8 %]</td>
      <td><input name="listprice" size="11" value="[% HTML.escape(listprice) %]"></td>
      <td align="center">
       <input name="listprice_type" class="radio" type="radio" value="percent" checked> /
@@ -109,7 +110,7 @@
   <input type="hidden" name="price_rows" value="[% HTML.escape(price_rows) %]">
 
   <p>
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/ir/_payments_de.html b/templates/webpages/ir/_payments_de.html
index 4b5119fe3..179e65d5e 100644
--- a/templates/webpages/ir/_payments_de.html
+++ b/templates/webpages/ir/_payments_de.html
@@ -1,25 +1,26 @@
+[%- USE T8 %]
 [%- USE LxERP %]
   <tr>
    <td>
     <table width="100%">
      <tr class="listheading">
 [% IF is_type_credit_note %]
-      <th colspan="6" class="listheading">Zahlungsausgänge</th>
+      <th colspan="6" class="listheading">[% 'Payments' | $T8 %]</th>
 [% ELSE %]
-      <th colspan="6" class="listheading">Zahlungseingänge</th>
+      <th colspan="6" class="listheading">[% 'Incoming Payments' | $T8 %]</th>
 [%- END %]
      </tr>
 
 
      <tr>
-      <th>Datum</th>
-      <th>Beleg</th>
-      <th>Memo</th>
-      <th>Betrag</th>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Memo' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
 [% IF show_exchangerate %]
-      <th>Wechselkurs.</th>
+      <th>[% 'Exch' | $T8 %]</th>
 [% END %]
-      <th>Konto</th>
+      <th>[% 'Account' | $T8 %]</th>
      </tr>
 
 
@@ -66,13 +67,13 @@
     <tr>
       <td></td>
       <td></td>
-      <td align="center">Summe</td>
+      <td align="center">[% 'Total' | $T8 %]</td>
       <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
     </tr>
     <tr>
       <td></td>
       <td></td>
-      <td align="center">Fehlbetrag</td>
+      <td align="center">[% 'Missing amount' | $T8 %]</td>
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
diff --git a/templates/webpages/ir/_payments_master.html b/templates/webpages/ir/_payments_master.html
index d2e6bf88c..179e65d5e 100644
--- a/templates/webpages/ir/_payments_master.html
+++ b/templates/webpages/ir/_payments_master.html
@@ -1,25 +1,26 @@
+[%- USE T8 %]
 [%- USE LxERP %]
   <tr>
    <td>
     <table width="100%">
      <tr class="listheading">
 [% IF is_type_credit_note %]
-      <th colspan="6" class="listheading"><translate>Payments</translate></th>
+      <th colspan="6" class="listheading">[% 'Payments' | $T8 %]</th>
 [% ELSE %]
-      <th colspan="6" class="listheading"><translate>Incoming Payments</translate></th>
+      <th colspan="6" class="listheading">[% 'Incoming Payments' | $T8 %]</th>
 [%- END %]
      </tr>
 
 
      <tr>
-      <th><translate>Date</translate></th>
-      <th><translate>Source</translate></th>
-      <th><translate>Memo</translate></th>
-      <th><translate>Amount</translate></th>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Memo' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
 [% IF show_exchangerate %]
-      <th><translate>Exch</translate></th>
+      <th>[% 'Exch' | $T8 %]</th>
 [% END %]
-      <th><translate>Account</translate></th>
+      <th>[% 'Account' | $T8 %]</th>
      </tr>
 
 
@@ -66,13 +67,13 @@
     <tr>
       <td></td>
       <td></td>
-      <td align="center"><translate>Total</translate></td>
+      <td align="center">[% 'Total' | $T8 %]</td>
       <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
     </tr>
     <tr>
       <td></td>
       <td></td>
-      <td align="center"><translate>Missing amount</translate></td>
+      <td align="center">[% 'Missing amount' | $T8 %]</td>
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
 
diff --git a/templates/webpages/ir/form_footer_de.html b/templates/webpages/ir/form_footer_de.html
index 9208ab41c..751b2d73c 100644
--- a/templates/webpages/ir/form_footer_de.html
+++ b/templates/webpages/ir/form_footer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
@@ -7,8 +8,8 @@
       <td>
        <table>
         <tr>
-         <th align="left">Bemerkungen</th>
-         <th align="left">interne Bemerkungen</th>
+         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Internal Notes' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
@@ -21,9 +22,7 @@
 [%- IF id && follow_ups.size %]
         <tr>
           <td colspan="2">
-            [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
           <td>
         </tr>
 [%- END %]
@@ -32,7 +31,7 @@
       <td align="right">
   [%- IF taxaccounts %]
        <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b>Steuer im Preis inbegriffen</b>
+       <b>[% 'Tax Included' | $T8 %]</b>
        <br>
        <br>
   [%- END %]
@@ -40,7 +39,7 @@
 
 [%- UNLESS taxincluded %]
         <tr>
-         <th align="right">Zwischensumme</th>
+         <th align="right">[% 'Subtotal' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
        </tr>
 [%- END %]
@@ -64,7 +63,7 @@
 [%- END %]
 
         <tr>
-         <th align="right">Summe</th>
+         <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
@@ -74,9 +73,11 @@
    </td>
   </tr>
 
-[% PROCESS 'webdav/_list_de.html' %]
+[% SET webdav_template = 'webdav/_list_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $webdav_template %]
 
-[% PROCESS 'ir/_payments_de.html' %]
+[% SET payments_template = 'ir/_payments_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $payments_template %]
 
   <tr>
     <td><hr size="3" noshade></td>
@@ -92,32 +93,32 @@
 
   [% IF id %]
 
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Erneuern">
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
 [% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="Storno">
+    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
 [% END %]
-    <input class="submit" type="submit" name="action" value="Zahlung buchen">
-    <input class="submit" type="submit" name="action" value="Als Vorlage verwenden">
+    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
 
 [% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="Löschen">
+    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
 [% END %]
 
-    <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
+    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
  [% ELSE # no id %]
    [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-      <input class="submit" type="submit" name="action" value="Buchen">
-      <input class="submit" type="submit" name="action" value="Entwurf speichern">
+      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
    [%- END %]
  [% END # id %]
 
   [% IF id %]
       [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="Historie">
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
 
-      <input type="submit" class="submit" name="action" value="als bezahlt markieren">
+      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
   [% END %]
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
diff --git a/templates/webpages/ir/form_footer_master.html b/templates/webpages/ir/form_footer_master.html
index 2b4793aa4..751b2d73c 100644
--- a/templates/webpages/ir/form_footer_master.html
+++ b/templates/webpages/ir/form_footer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
@@ -7,8 +8,8 @@
       <td>
        <table>
         <tr>
-         <th align="left"><translate>Notes</translate></th>
-         <th align="left"><translate>Internal Notes</translate></th>
+         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Internal Notes' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
@@ -21,9 +22,7 @@
 [%- IF id && follow_ups.size %]
         <tr>
           <td colspan="2">
-            [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
           <td>
         </tr>
 [%- END %]
@@ -32,7 +31,7 @@
       <td align="right">
   [%- IF taxaccounts %]
        <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b><translate>Tax Included</translate></b>
+       <b>[% 'Tax Included' | $T8 %]</b>
        <br>
        <br>
   [%- END %]
@@ -40,7 +39,7 @@
 
 [%- UNLESS taxincluded %]
         <tr>
-         <th align="right"><translate>Subtotal</translate></th>
+         <th align="right">[% 'Subtotal' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
        </tr>
 [%- END %]
@@ -64,7 +63,7 @@
 [%- END %]
 
         <tr>
-         <th align="right"><translate>Total</translate></th>
+         <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
@@ -74,9 +73,11 @@
    </td>
   </tr>
 
-[% PROCESS 'webdav/_list_<translate>master</translate>.html' %]
+[% SET webdav_template = 'webdav/_list_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $webdav_template %]
 
-[% PROCESS 'ir/_payments_<translate>master</translate>.html' %]
+[% SET payments_template = 'ir/_payments_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $payments_template %]
 
   <tr>
     <td><hr size="3" noshade></td>
@@ -92,32 +93,32 @@
 
   [% IF id %]
 
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="<translate>Update</translate>">
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
 [% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="<translate>Storno</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
 [% END %]
-    <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
 
 [% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
 [% END %]
 
-    <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
+    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
  [% ELSE # no id %]
    [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Save Draft</translate>">
+      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
    [%- END %]
  [% END # id %]
 
   [% IF id %]
       [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="<translate>history</translate>">
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
 
-      <input type="submit" class="submit" name="action" value="<translate>mark as paid</translate>">
+      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
   [% END %]
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
diff --git a/templates/webpages/ir/form_header_de.html b/templates/webpages/ir/form_header_de.html
index 47560d5b3..c0260e861 100644
--- a/templates/webpages/ir/form_header_de.html
+++ b/templates/webpages/ir/form_header_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
@@ -30,7 +31,7 @@
     <td valign="top">
       <table>
         <tr>
-          <th align="right">Lieferant</th>
+          <th align="right">[% 'Vendor' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'vendor',
@@ -42,7 +43,7 @@
                  limit         = vclimit,
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
-            <input type="button" value="D" onclick="show_vc_details('[% vc | html %]')">
+            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% vc | html %]')">
           </td>
           <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
           <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
@@ -51,7 +52,7 @@
         </tr>
 [%- IF ALL_CONTACTS.size %]
         <tr>
-          <th align="right">Ansprechpartner</th>
+          <th align="right">[% 'Contact Person' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'cp_id',
@@ -64,19 +65,19 @@
         </tr>
 [%- END %]
         <tr>
-          <td align="right">Kreditlimit</td>
+          <td align="right">[% 'Credit Limit' | $T8 %]</td>
           <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; Rest
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
             <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
           </td>
         </tr>
         <tr>
-          <th align="right" nowrap>Buchen auf</th>
+          <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
           <input type="hidden" name="selectAP" value="[% selectAP %]">
         </tr>
         <tr>
-          <th align="right">Steuersatz</th>
+          <th align="right">[% 'Steuersatz' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'taxzone_id'
@@ -92,7 +93,7 @@
         </tr>
 [%- IF all_departments %]
         <tr>
-          <th align="right" nowrap>Abteilung</th>
+          <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'department_id',
@@ -106,7 +107,7 @@
 [%- END %]
 [%- IF currencies %]
         <tr>
-          <th align="right">Währung</th>
+          <th align="right">[% 'Currency' | $T8 %]</th>
           <td>[% currencies %]</td>
         </tr>
 [%- END %]
@@ -114,7 +115,7 @@
         <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
 [%- IF show_exchangerate %]
         <tr>
-          <th align="right">Wechselkurs</th>
+          <th align="right">[% 'Exchangerate' | $T8 %]</th>
           <td>
            [%- IF forex %]
             [% LxERP.format_amount(exchangerate, 2) %]
@@ -129,7 +130,7 @@
     <td align="right" valign="top">
       <table>
         <tr>
-          <th align="right">Bearbeiter</th>
+          <th align="right">[% 'Employee' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'employee_id',
@@ -141,53 +142,53 @@
 
 [%- IF is_type_credit_note %]
         <tr>
-          <th align="right" nowrap>Gutschriftnummer</th>
+          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right">Gutschriftdatum</th>
+          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
 [%- ELSE %]
         <tr>
-          <th align="right" nowrap>Rechnungsnummer</th>
+          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right">Rechnungsdatum</th>
+          <th align="right">[% 'Invoice Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
         <tr>
-          <th align="right">Fälligkeitsdatum</th>
+          <th align="right">[% 'Due Date' | $T8 %]</th>
           <td width="13">
             <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="?">
+            <input type="button" name="duedate_button" id="trigger2" value="[% 'button' | $T8 %]">
           </td>
         </tr>
 [%- END %]
 
         <tr>
-          <th align="right" nowrap>Auftragsnummer</th>
+          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Auftragsdatum</th>
+          <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
           <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Angebotsdatum</th>
+          <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
           <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
            <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Projektnummer</th>
+          <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'globalproject_id',
@@ -219,12 +220,12 @@
      Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
      $('document').ready(function(){
 [% IF creditwarning != '' %]
-       alert('Kreditlimit überschritten!');
+       alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
 [% ELSE %]
        focus();
 [% END %]
-       setupDateFormat('[% dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% numberformat %]', 'Falsches Format');
+       setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+       setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
      });
    //-->
   </script>
diff --git a/templates/webpages/ir/form_header_master.html b/templates/webpages/ir/form_header_master.html
index 770fcaf71..c0260e861 100644
--- a/templates/webpages/ir/form_header_master.html
+++ b/templates/webpages/ir/form_header_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
@@ -30,7 +31,7 @@
     <td valign="top">
       <table>
         <tr>
-          <th align="right"><translate>Vendor</translate></th>
+          <th align="right">[% 'Vendor' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'vendor',
@@ -42,7 +43,7 @@
                  limit         = vclimit,
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
-            <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% vc | html %]')">
+            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% vc | html %]')">
           </td>
           <input type="hidden" name="vendor_klass" value="[% HTML.escape(vendor_klass) %]">
           <input type="hidden" name="vendor_id" value="[% HTML.escape(vendor_id) %]">
@@ -51,7 +52,7 @@
         </tr>
 [%- IF ALL_CONTACTS.size %]
         <tr>
-          <th align="right"><translate>Contact Person</translate></th>
+          <th align="right">[% 'Contact Person' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'cp_id',
@@ -64,19 +65,19 @@
         </tr>
 [%- END %]
         <tr>
-          <td align="right"><translate>Credit Limit</translate></td>
+          <td align="right">[% 'Credit Limit' | $T8 %]</td>
           <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; <translate>Remaining</translate>
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
             <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
           </td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Record in</translate></th>
+          <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
           <input type="hidden" name="selectAP" value="[% selectAP %]">
         </tr>
         <tr>
-          <th align="right"><translate>Steuersatz</translate></th>
+          <th align="right">[% 'Steuersatz' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'taxzone_id'
@@ -92,7 +93,7 @@
         </tr>
 [%- IF all_departments %]
         <tr>
-          <th align="right" nowrap><translate>Department</translate></th>
+          <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'department_id',
@@ -106,7 +107,7 @@
 [%- END %]
 [%- IF currencies %]
         <tr>
-          <th align="right"><translate>Currency</translate></th>
+          <th align="right">[% 'Currency' | $T8 %]</th>
           <td>[% currencies %]</td>
         </tr>
 [%- END %]
@@ -114,7 +115,7 @@
         <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
 [%- IF show_exchangerate %]
         <tr>
-          <th align="right"><translate>Exchangerate</translate></th>
+          <th align="right">[% 'Exchangerate' | $T8 %]</th>
           <td>
            [%- IF forex %]
             [% LxERP.format_amount(exchangerate, 2) %]
@@ -129,7 +130,7 @@
     <td align="right" valign="top">
       <table>
         <tr>
-          <th align="right"><translate>Employee</translate></th>
+          <th align="right">[% 'Employee' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'employee_id',
@@ -141,53 +142,53 @@
 
 [%- IF is_type_credit_note %]
         <tr>
-          <th align="right" nowrap><translate>Credit Note Number</translate></th>
+          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right"><translate>Credit Note Date</translate></th>
+          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
 [%- ELSE %]
         <tr>
-          <th align="right" nowrap><translate>Invoice Number</translate></th>
+          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right"><translate>Invoice Date</translate></th>
+          <th align="right">[% 'Invoice Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
         <tr>
-          <th align="right"><translate>Due Date</translate></th>
+          <th align="right">[% 'Due Date' | $T8 %]</th>
           <td width="13">
             <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="<translate>button</translate>">
+            <input type="button" name="duedate_button" id="trigger2" value="[% 'button' | $T8 %]">
           </td>
         </tr>
 [%- END %]
 
         <tr>
-          <th align="right" nowrap><translate>Order Number</translate></th>
+          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Order Date</translate></th>
+          <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
           <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Quotation Date</translate></th>
+          <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
           <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
            <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Project Number</translate></th>
+          <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'globalproject_id',
@@ -219,12 +220,12 @@
      Calendar.setup({ inputField : "quodate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger_quodate" });
      $('document').ready(function(){
 [% IF creditwarning != '' %]
-       alert('<translate>Credit Limit exceeded!!!</translate>');
+       alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
 [% ELSE %]
        focus();
 [% END %]
-       setupDateFormat('[% dateformat %]', '<translate>Falsches Datumsformat!</translate>');
-       setupPoints('[% numberformat %]', '<translate>wrongformat</translate>');
+       setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+       setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
      });
    //-->
   </script>
diff --git a/templates/webpages/is/form_footer_de.html b/templates/webpages/is/form_footer_de.html
index a6c9cd06b..36133a297 100644
--- a/templates/webpages/is/form_footer_de.html
+++ b/templates/webpages/is/form_footer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
@@ -7,9 +8,9 @@
       <td>
        <table>
         <tr>
-         <th align="left">Bemerkungen</th>
-         <th align="left">interne Bemerkungen</th>
-         <th align="right">Zahlungskonditionen</th>
+         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Internal Notes' | $T8 %]</th>
+         <th align="right">[% 'Payment Terms' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
@@ -35,9 +36,7 @@
 [%- IF id && follow_ups.size %]
         <tr>
           <td colspan="2">
-            [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
           <td>
         </tr>
 [%- END %]
@@ -46,11 +45,11 @@
       <td>
        <table>
         <tr>
-         <th  align=left>Ertrag</th>
+         <th  align=left>[% 'Ertrag' | $T8 %]</th>
          <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
         </tr>
         <tr>
-         <th  align=left>Ertrag prozentual</th>
+         <th  align=left>[% 'Ertrag prozentual' | $T8 %]</th>
          <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
         </tr>
         <input type=hidden name="marge_total" value="[% marge_total %]">
@@ -60,7 +59,7 @@
       <td align="right">
   [%- IF taxaccounts %]
        <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b>Steuer im Preis inbegriffen</b>
+       <b>[% 'Tax Included' | $T8 %]</b>
        <br>
        <br>
   [%- END %]
@@ -68,7 +67,7 @@
 
 [%- UNLESS taxincluded %]
         <tr>
-         <th align="right">Zwischensumme</th>
+         <th align="right">[% 'Subtotal' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
        </tr>
 [%- END %]
@@ -92,7 +91,7 @@
 [%- END %]
 
         <tr>
-         <th align="right">Summe</th>
+         <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
@@ -102,9 +101,11 @@
    </td>
   </tr>
 
-[% PROCESS 'webdav/_list_de.html' %]
+[% SET webdav_template = 'webdav/_list_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $webdav_template %]
 
-[% PROCESS 'is/_payments_de.html' %]
+[% SET payments_template = 'is/_payments_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $payments_template %]
 
   <tr>
     <td><hr size="3" noshade></td>
@@ -120,47 +121,47 @@
 
   [% IF id %]
 
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Erneuern">
-    <input class="submit" type="submit" name="action" value="Lieferadresse">
-    <input class="submit" type="submit" name="action" value="Drucken">
-    <input class="submit" type="submit" name="action" value="eMail">
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
 [% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="Storno">
+    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
 [% END %]
-    <input class="submit" type="submit" name="action" value="Zahlung buchen">
-    <input class="submit" type="submit" name="action" value="Als Vorlage verwenden">
+    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
 
 [% IF id && !is_type_credit_note %]
-    <input class="submit" type="submit" name="action" value="Gutschrift">
+    <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
 [% END %]
 [% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="Löschen">
-    <input class="submit" type="submit" name="action" value="Buchen">
+    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]
 
   [%- UNLESS locked %]
-       <input class="submit" type="submit" name="action" value="Auftrag">
+       <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
   [%- END %]
 
-    <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
+    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
  [% ELSE # no id %]
    [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-      <input class="submit" type="submit" name="action" value="Lieferadresse">
-      <input class="submit" type="submit" name="action" value="Druckvorschau">
-      <input class="submit" type="submit" name="action" value="eMail">
-      <input class="submit" type="submit" name="action" value="Drucken und Buchen">
-      <input class="submit" type="submit" name="action" value="Buchen">
-      <input class="submit" type="submit" name="action" value="Entwurf speichern">
+      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Preview' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Print and Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
    [%- END %]
  [% END # id %]
 
   [% IF id %]
       [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="Historie">
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
 
-      <input type="submit" class="submit" name="action" value="als bezahlt markieren">
+      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
   [% END %]
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index 128618d1e..36133a297 100644
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
@@ -7,9 +8,9 @@
       <td>
        <table>
         <tr>
-         <th align="left"><translate>Notes</translate></th>
-         <th align="left"><translate>Internal Notes</translate></th>
-         <th align="right"><translate>Payment Terms</translate></th>
+         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Internal Notes' | $T8 %]</th>
+         <th align="right">[% 'Payment Terms' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
@@ -35,9 +36,7 @@
 [%- IF id && follow_ups.size %]
         <tr>
           <td colspan="2">
-            [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
-                                     follow_ups.size, follow_ups_unfinished) | html
-            %]
+            [%- LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
           <td>
         </tr>
 [%- END %]
@@ -46,11 +45,11 @@
       <td>
        <table>
         <tr>
-         <th  align=left><translate>Ertrag</translate></th>
+         <th  align=left>[% 'Ertrag' | $T8 %]</th>
          <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
         </tr>
         <tr>
-         <th  align=left><translate>Ertrag prozentual</translate></th>
+         <th  align=left>[% 'Ertrag prozentual' | $T8 %]</th>
          <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
         </tr>
         <input type=hidden name="marge_total" value="[% marge_total %]">
@@ -60,7 +59,7 @@
       <td align="right">
   [%- IF taxaccounts %]
        <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
-       <b><translate>Tax Included</translate></b>
+       <b>[% 'Tax Included' | $T8 %]</b>
        <br>
        <br>
   [%- END %]
@@ -68,7 +67,7 @@
 
 [%- UNLESS taxincluded %]
         <tr>
-         <th align="right"><translate>Subtotal</translate></th>
+         <th align="right">[% 'Subtotal' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
        </tr>
 [%- END %]
@@ -92,7 +91,7 @@
 [%- END %]
 
         <tr>
-         <th align="right"><translate>Total</translate></th>
+         <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
@@ -102,9 +101,11 @@
    </td>
   </tr>
 
-[% PROCESS 'webdav/_list_<translate>master</translate>.html' %]
+[% SET webdav_template = 'webdav/_list_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $webdav_template %]
 
-[% PROCESS 'is/_payments_<translate>master</translate>.html' %]
+[% SET payments_template = 'is/_payments_' _ LxERP.t8('master') _ '.html' %]
+[% PROCESS $payments_template %]
 
   <tr>
     <td><hr size="3" noshade></td>
@@ -120,47 +121,47 @@
 
   [% IF id %]
 
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="<translate>Update</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
 [% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="<translate>Storno</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
 [% END %]
-    <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
 
 [% IF id && !is_type_credit_note %]
-    <input class="submit" type="submit" name="action" value="<translate>Credit Note</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
 [% END %]
 [% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]
 
   [%- UNLESS locked %]
-       <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
+       <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
   [%- END %]
 
-    <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
+    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
  [% ELSE # no id %]
    [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Preview</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Print and Post</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
-      <input class="submit" type="submit" name="action" value="<translate>Save Draft</translate>">
+      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Preview' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Print and Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
    [%- END %]
  [% END # id %]
 
   [% IF id %]
       [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="<translate>history</translate>">
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
 
-      <input type="submit" class="submit" name="action" value="<translate>mark as paid</translate>">
+      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
   [% END %]
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
diff --git a/templates/webpages/is/form_header_de.html b/templates/webpages/is/form_header_de.html
index 9a1af4a28..059541339 100644
--- a/templates/webpages/is/form_header_de.html
+++ b/templates/webpages/is/form_header_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
@@ -30,7 +31,7 @@
     <td valign="top">
       <table>
         <tr>
-          <th align="right">Kunde</th>
+          <th align="right">[% 'Customer' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'customer',
@@ -42,7 +43,7 @@
                  limit         = vclimit,
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
-            <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
           </td>
           <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
           <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
@@ -51,7 +52,7 @@
         </tr>
 [%- IF ALL_CONTACTS.size %]
         <tr>
-          <th align="right">Ansprechpartner</th>
+          <th align="right">[% 'Contact Person' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'cp_id',
@@ -65,7 +66,7 @@
 [%- END %]
 [%- IF ALL_SHIPTO.size %]
         <tr>
-          <th align="right">Lieferadresse</th>
+          <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'shipto_id',
@@ -79,33 +80,33 @@
         </tr>
 [%- END %]
         <tr>
-          <td align="right">Kreditlimit</td>
+          <td align="right">[% 'Credit Limit' | $T8 %]</td>
           <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; Rest
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
             <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
           </td>
         </tr>
 [%- IF max_dunning_level %]
         <tr>
-          <th align="right">höchste Mahnstufe:</th>
+          <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
           <td>
-            <b>[% max_dunning_level %]</b>; gemahnter Betrag: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
+            <b>[% max_dunning_level %]</b>; [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
           </td>
         </tr>
 [%- END %]
 [%- IF business %]
         <tr>
-          <th align="right">Kundentyp</th>
-          <td>[% business %]; Rabatt [% LxERP.format_amount(tradediscount * 100) %] %</td>
+          <th align="right">[% 'Customer type' | $T8 %]</th>
+          <td>[% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %</td>
         </tr>
 [%- END %]
         <tr>
-          <th align="right" nowrap>Buchen auf</th>
+          <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
           <input type="hidden" name="selectAR" value="[% selectAR %]">
         </tr>
         <tr>
-          <th align="right">Steuersatz</th>
+          <th align="right">[% 'Steuersatz' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'taxzone_id'
@@ -121,7 +122,7 @@
         </tr>
 [%- IF all_departments %]
         <tr>
-          <th align="right" nowrap>Abteilung</th>
+          <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'department_id',
@@ -135,7 +136,7 @@
 [%- END %]
 [%- IF currencies %]
         <tr>
-          <th align="right">Währung</th>
+          <th align="right">[% 'Currency' | $T8 %]</th>
           <td>[% currencies %]</td>
         </tr>
 [%- END %]
@@ -143,7 +144,7 @@
         <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
 [%- IF show_exchangerate %]
         <tr>
-          <th align="right">Wechselkurs</th>
+          <th align="right">[% 'Exchangerate' | $T8 %]</th>
           <td>
            [%- IF forex %]
             [% LxERP.format_amount(exchangerate, 2) %]
@@ -154,15 +155,15 @@
         </tr>
 [%- END %]
         <tr>
-          <th align="right" nowrap>Versandort</th>
+          <th align="right" nowrap>[% 'Shipping Point' | $T8 %]</th>
           <td colspan="3"><input size='35' name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Transportmittel</th>
+          <th align="right" nowrap>[% 'Ship via' | $T8 %]</th>
           <td colspan="3"><input size='35' name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
         </tr>
         <tr>
-          <th align="right">Vorgangsbezeichnung</th>
+          <th align="right">[% 'Transaction description' | $T8 %]</th>
           <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
         </tr>
       </table>
@@ -170,7 +171,7 @@
     <td align="right" valign="top">
       <table>
         <tr>
-          <th align="right">Bearbeiter</th>
+          <th align="right">[% 'Employee' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'employee_id',
@@ -181,7 +182,7 @@
         </tr>
 [%- IF ALL_SALESMEN.size %]
         <tr>
-          <th align="right">Verkäufer/in</th>
+          <th align="right">[% 'Salesman' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'salesman_id',
@@ -195,72 +196,72 @@
 
 [%- IF is_type_credit_note %]
         <tr>
-          <th align="right" nowrap>Gutschriftnummer</th>
+          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right">Gutschriftdatum</th>
+          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
 [%- ELSE %]
         <tr>
-          <th align="right" nowrap>Rechnungsnummer</th>
+          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right">Rechnungsdatum</th>
+          <th align="right">[% 'Invoice Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="?">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
         <tr>
-          <th align="right">Fälligkeitsdatum</th>
+          <th align="right">[% 'Due Date' | $T8 %]</th>
           <td width="13">
             <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="?">
+            <input type="button" name="duedate_button" id="trigger2" value="[% 'button' | $T8 %]">
           </td>
         </tr>
         <tr>
-        <th align="right" nowrap>Lieferscheinnummer</th>
+        <th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
         </tr>
         <tr>
-          <th align="right">Lieferdatum</th>
+          <th align="right">[% 'Delivery Date' | $T8 %]</th>
             <td width="13">
               <input name="deliverydate" id="deliverydate" size="11" title="[% dateformat %]" value="[% deliverydate %]" onBlur="check_right_date_format(this)">
-              <input type="button" name="deliverydate_button" id="trigger3" value="?">
+              <input type="button" name="deliverydate_button" id="trigger3" value="[% 'button' | $T8 %]">
             </td>
         </tr>
 [%- END %]
 
         <tr>
-          <th align="right" nowrap>Auftragsnummer</th>
+          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Auftragsdatum</th>
+          <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
           <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Angebotsnummer</th>
+          <th align="right" nowrap>[% 'Quotation Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="quonumber" value="[% HTML.escape(quonumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Angebotsdatum</th>
+          <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
           <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
            <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Bestellnummer des Kunden</th>
+          <th align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="cusordnumber" value="[% HTML.escape(cusordnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap>Projektnummer</th>
+          <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'globalproject_id',
@@ -301,12 +302,12 @@
 [% ELSIF resubmit %]
        document.invoice.submit();
 [% ELSIF creditwarning != '' %]
-       alert('Kreditlimit überschritten!');
+       alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
 [% ELSE %]
        focus();
 [% END %]
-       setupDateFormat('[% dateformat %]', 'Falsches Datumsformat!');
-       setupPoints('[% numberformat %]', 'Falsches Format');
+       setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+       setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
      });
    //-->
   </script>
diff --git a/templates/webpages/is/form_header_master.html b/templates/webpages/is/form_header_master.html
index eb2be4e07..059541339 100644
--- a/templates/webpages/is/form_header_master.html
+++ b/templates/webpages/is/form_header_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- SET follow_up_trans_info = invnumber _ ' (' _ customer_name _ ')' %]
@@ -30,7 +31,7 @@
     <td valign="top">
       <table>
         <tr>
-          <th align="right"><translate>Customer</translate></th>
+          <th align="right">[% 'Customer' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'customer',
@@ -42,7 +43,7 @@
                  limit         = vclimit,
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
-            <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+            <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
           </td>
           <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
           <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
@@ -51,7 +52,7 @@
         </tr>
 [%- IF ALL_CONTACTS.size %]
         <tr>
-          <th align="right"><translate>Contact Person</translate></th>
+          <th align="right">[% 'Contact Person' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'cp_id',
@@ -65,7 +66,7 @@
 [%- END %]
 [%- IF ALL_SHIPTO.size %]
         <tr>
-          <th align="right"><translate>Shipping Address</translate></th>
+          <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'shipto_id',
@@ -79,33 +80,33 @@
         </tr>
 [%- END %]
         <tr>
-          <td align="right"><translate>Credit Limit</translate></td>
+          <td align="right">[% 'Credit Limit' | $T8 %]</td>
           <td>
-            [% LxERP.format_amount(creditlimit, 0, '0') %]; <translate>Remaining</translate>
+            [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
             <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
           </td>
         </tr>
 [%- IF max_dunning_level %]
         <tr>
-          <th align="right"><translate>Max. Dunning Level</translate>:</th>
+          <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
           <td>
-            <b>[% max_dunning_level %]</b>; <translate>Dunning Amount</translate>: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
+            <b>[% max_dunning_level %]</b>; [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount,2) %]</b>
           </td>
         </tr>
 [%- END %]
 [%- IF business %]
         <tr>
-          <th align="right"><translate>Customer type</translate></th>
-          <td>[% business %]; <translate>Trade Discount</translate> [% LxERP.format_amount(tradediscount * 100) %] %</td>
+          <th align="right">[% 'Customer type' | $T8 %]</th>
+          <td>[% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %</td>
         </tr>
 [%- END %]
         <tr>
-          <th align="right" nowrap><translate>Record in</translate></th>
+          <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
           <input type="hidden" name="selectAR" value="[% selectAR %]">
         </tr>
         <tr>
-          <th align="right"><translate>Steuersatz</translate></th>
+          <th align="right">[% 'Steuersatz' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'taxzone_id'
@@ -121,7 +122,7 @@
         </tr>
 [%- IF all_departments %]
         <tr>
-          <th align="right" nowrap><translate>Department</translate></th>
+          <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'department_id',
@@ -135,7 +136,7 @@
 [%- END %]
 [%- IF currencies %]
         <tr>
-          <th align="right"><translate>Currency</translate></th>
+          <th align="right">[% 'Currency' | $T8 %]</th>
           <td>[% currencies %]</td>
         </tr>
 [%- END %]
@@ -143,7 +144,7 @@
         <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
 [%- IF show_exchangerate %]
         <tr>
-          <th align="right"><translate>Exchangerate</translate></th>
+          <th align="right">[% 'Exchangerate' | $T8 %]</th>
           <td>
            [%- IF forex %]
             [% LxERP.format_amount(exchangerate, 2) %]
@@ -154,15 +155,15 @@
         </tr>
 [%- END %]
         <tr>
-          <th align="right" nowrap><translate>Shipping Point</translate></th>
+          <th align="right" nowrap>[% 'Shipping Point' | $T8 %]</th>
           <td colspan="3"><input size='35' name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Ship via</translate></th>
+          <th align="right" nowrap>[% 'Ship via' | $T8 %]</th>
           <td colspan="3"><input size='35' name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
         </tr>
         <tr>
-          <th align="right"><translate>Transaction description</translate></th>
+          <th align="right">[% 'Transaction description' | $T8 %]</th>
           <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
         </tr>
       </table>
@@ -170,7 +171,7 @@
     <td align="right" valign="top">
       <table>
         <tr>
-          <th align="right"><translate>Employee</translate></th>
+          <th align="right">[% 'Employee' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'employee_id',
@@ -181,7 +182,7 @@
         </tr>
 [%- IF ALL_SALESMEN.size %]
         <tr>
-          <th align="right"><translate>Salesman</translate></th>
+          <th align="right">[% 'Salesman' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'salesman_id',
@@ -195,72 +196,72 @@
 
 [%- IF is_type_credit_note %]
         <tr>
-          <th align="right" nowrap><translate>Credit Note Number</translate></th>
+          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right"><translate>Credit Note Date</translate></th>
+          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
 [%- ELSE %]
         <tr>
-          <th align="right" nowrap><translate>Invoice Number</translate></th>
+          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right"><translate>Invoice Date</translate></th>
+          <th align="right">[% 'Invoice Date' | $T8 %]</th>
           <td nowrap>
             <input name="invdate" id="invdate" size="11" title="[% dateformat %]" value="[% invdate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="invdate_button" id="trigger1" value="<translate>button</translate>">
+            <input type="button" name="invdate_button" id="trigger1" value="[% 'button' | $T8 %]">
           </td>
         </tr>
         <tr>
-          <th align="right"><translate>Due Date</translate></th>
+          <th align="right">[% 'Due Date' | $T8 %]</th>
           <td width="13">
             <input name="duedate" id="duedate" size="11" title="[% dateformat %]" value="[% duedate %]" onBlur="check_right_date_format(this)">
-            <input type="button" name="duedate_button" id="trigger2" value="<translate>button</translate>">
+            <input type="button" name="duedate_button" id="trigger2" value="[% 'button' | $T8 %]">
           </td>
         </tr>
         <tr>
-        <th align="right" nowrap><translate>Delivery Order Number</translate></th>
+        <th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
         </tr>
         <tr>
-          <th align="right"><translate>Delivery Date</translate></th>
+          <th align="right">[% 'Delivery Date' | $T8 %]</th>
             <td width="13">
               <input name="deliverydate" id="deliverydate" size="11" title="[% dateformat %]" value="[% deliverydate %]" onBlur="check_right_date_format(this)">
-              <input type="button" name="deliverydate_button" id="trigger3" value="<translate>button</translate>">
+              <input type="button" name="deliverydate_button" id="trigger3" value="[% 'button' | $T8 %]">
             </td>
         </tr>
 [%- END %]
 
         <tr>
-          <th align="right" nowrap><translate>Order Number</translate></th>
+          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Order Date</translate></th>
+          <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
           <td><input name="orddate" id="orddate" size="11" title="[% dateformat %]" value="[% orddate %]" onBlur="check_right_date_format(this)">
           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Quotation Number</translate></th>
+          <th align="right" nowrap>[% 'Quotation Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="quonumber" value="[% HTML.escape(quonumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Quotation Date</translate></th>
+          <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
           <td><input name="quodate" id="quodate" size="11" title="[% dateformat %]" value="[% quodate %]" onBlur="check_right_date_format(this)">
            <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Customer Order Number</translate></th>
+          <th align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="cusordnumber" value="[% HTML.escape(cusordnumber) %]"></td>
         </tr>
         <tr>
-          <th align="right" nowrap><translate>Project Number</translate></th>
+          <th align="right" nowrap>[% 'Project Number' | $T8 %]</th>
           <td>
             [%- INCLUDE 'generic/multibox.html'
                  name       = 'globalproject_id',
@@ -301,12 +302,12 @@
 [% ELSIF resubmit %]
        document.invoice.submit();
 [% ELSIF creditwarning != '' %]
-       alert('<translate>Credit Limit exceeded!!!</translate>');
+       alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
 [% ELSE %]
        focus();
 [% END %]
-       setupDateFormat('[% dateformat %]', '<translate>Falsches Datumsformat!</translate>');
-       setupPoints('[% numberformat %]', '<translate>wrongformat</translate>');
+       setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+       setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
      });
    //-->
   </script>
diff --git a/templates/webpages/login/auth_db_unreachable_de.html b/templates/webpages/login/auth_db_unreachable_de.html
index a30e4c9dc..bb2da92c0 100644
--- a/templates/webpages/login/auth_db_unreachable_de.html
+++ b/templates/webpages/login/auth_db_unreachable_de.html
@@ -1,14 +1,15 @@
+[%- USE T8 %]
 <body>
 
- <p><b>Fehler!</b></p>
+ <p><b>[% 'Error!' | $T8 %]</b></p>
 
- <p>Die Authentifizierungsdatenbank kann momentan nicht erreicht werden. Entweder wurde sie noch nicht eingerichtet, oder der Datenbankserver antwortet nicht. Bitte wenden Sie sich an Ihren Administrator.</p>
+ <p>[% 'The authentication database is not reachable at the moment. Either it hasn't been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]</p>
 
- <p>Wenn Sie die Authentifizierungsdatenbank selber einrichten wollen, so melden Sie sich an der Administrationsoberfl&auml;che an. Lx-Office wird dann die Datenbank und die Tabellen f&uuml;r Sie anlegen.</p>
+ <p>[% 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' | $T8 %]</p>
 
  <p>
-  <a href="login.pl" target="_top">Anmeldung</a> |
-  <a href="admin.pl" target="_top">Administration</a>
+  <a href="login.pl" target="_top">[% 'Login' | $T8 %]</a> |
+  <a href="admin.pl" target="_top">[% 'Administration' | $T8 %]</a>
  </p>
 
 </body>
diff --git a/templates/webpages/login/auth_db_unreachable_master.html b/templates/webpages/login/auth_db_unreachable_master.html
index c2cbb8216..bb2da92c0 100644
--- a/templates/webpages/login/auth_db_unreachable_master.html
+++ b/templates/webpages/login/auth_db_unreachable_master.html
@@ -1,18 +1,15 @@
+[%- USE T8 %]
 <body>
 
- <p><b><translate>Error!</translate></b></p>
+ <p><b>[% 'Error!' | $T8 %]</b></p>
 
- <p><translate>The authentication database is not reachable at the
-   moment. Either it hasn't been set up yet or the database server might
-   be down. Please contact your administrator.</translate></p>
+ <p>[% 'The authentication database is not reachable at the moment. Either it hasn't been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]</p>
 
- <p><translate>If you want to set up the authentication database
-   yourself then log in to the administration panel. Lx-Office will
-   then create the database and tables for you.</translate></p>
+ <p>[% 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' | $T8 %]</p>
 
  <p>
-  <a href="login.pl" target="_top"><translate>Login</translate></a> |
-  <a href="admin.pl" target="_top"><translate>Administration</translate></a>
+  <a href="login.pl" target="_top">[% 'Login' | $T8 %]</a> |
+  <a href="admin.pl" target="_top">[% 'Administration' | $T8 %]</a>
  </p>
 
 </body>
diff --git a/templates/webpages/login/authentication_pl_missing_de.html b/templates/webpages/login/authentication_pl_missing_de.html
index 08ee7792c..e9530b09f 100644
--- a/templates/webpages/login/authentication_pl_missing_de.html
+++ b/templates/webpages/login/authentication_pl_missing_de.html
@@ -1,14 +1,15 @@
+[%- USE T8 %]
 <body>
 
- <p><b>Fehler!</b></p>
+ <p><b>[% 'Error!' | $T8 %]</b></p>
 
- <p>Die Konfigurationsdatei f&uuml;r die Authentifizierung &quot;config/authentication.pl&quot; wurde nicht gefunden. Diese Lx-Office-Installation wurde vermutlich noch nicht vollst&auml;ndig aktualisiert oder eingerichtet. Bitte wenden Sie sich an Ihren Administrator.</p>
+ <p>[% 'The authentication configuration file &quot;config/authentication.pl&quot; does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]</p>
 
- <p>Wenn Sie selber die Aktualisierung bzw. Einrichtung &uuml;bernehmen wollen, so lesen Sie bitte die Datei &quot;doc/UPGRADE&quot; und folgen Sie den dort beschriebenen Schritten.</p>
+ <p>[% 'If you yourself want to upgrade the installation then please read the file &quot;doc/UPGRADE&quot; and follow the steps outlined in this file.' | $T8 %]</p>
 
  <p>
-  <a href="login.pl" target="_top">Anmeldung</a> |
-  <a href="admin.pl" target="_top">Administration</a>
+  <a href="login.pl" target="_top">[% 'Login' | $T8 %]</a> |
+  <a href="admin.pl" target="_top">[% 'Administration' | $T8 %]</a>
  </p>
 
 </body>
diff --git a/templates/webpages/login/authentication_pl_missing_master.html b/templates/webpages/login/authentication_pl_missing_master.html
index 30f87f3c6..e9530b09f 100644
--- a/templates/webpages/login/authentication_pl_missing_master.html
+++ b/templates/webpages/login/authentication_pl_missing_master.html
@@ -1,19 +1,15 @@
+[%- USE T8 %]
 <body>
 
- <p><b><translate>Error!</translate></b></p>
+ <p><b>[% 'Error!' | $T8 %]</b></p>
 
- <p><translate>The authentication configuration file
-   &quot;config/authentication.pl&quot; does not exist. This Lx-Office
-   installation has probably not been updated correctly yet. Please
-   contact your administrator.</translate></p>
+ <p>[% 'The authentication configuration file &quot;config/authentication.pl&quot; does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]</p>
 
- <p><translate>If you yourself want to upgrade the installation then
-   please read the file &quot;doc/UPGRADE&quot; and follow the steps
-   outlined in this file.</translate></p>
+ <p>[% 'If you yourself want to upgrade the installation then please read the file &quot;doc/UPGRADE&quot; and follow the steps outlined in this file.' | $T8 %]</p>
 
  <p>
-  <a href="login.pl" target="_top"><translate>Login</translate></a> |
-  <a href="admin.pl" target="_top"><translate>Administration</translate></a>
+  <a href="login.pl" target="_top">[% 'Login' | $T8 %]</a> |
+  <a href="admin.pl" target="_top">[% 'Administration' | $T8 %]</a>
  </p>
 
 </body>
diff --git a/templates/webpages/login/company_logo_de.html b/templates/webpages/login/company_logo_de.html
index d02189617..4dbcde37a 100644
--- a/templates/webpages/login/company_logo_de.html
+++ b/templates/webpages/login/company_logo_de.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
  [%- DEFAULT myconfig_dbhost = 'localhost' %]
 
  <center>
   <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
 
-  <h2 class="login">Version [% version %]</h2>
+  <h2 class="login">[% 'Version' | $T8 %] [% version %]</h2>
 
-  <p>Lizenziert für</p>
+  <p>[% 'Licensed to' | $T8 %]</p>
 
   <p>
    <b>
@@ -19,15 +20,15 @@
 
    <table border="0">
     <tr>
-     <th align="left">Benutzer</th>
+     <th align="left">[% 'User' | $T8 %]</th>
      <td>[% HTML.escape(myconfig_name) %]</td>
     </tr>
     <tr>
-     <th align="left">Datenbank</th>
+     <th align="left">[% 'Dataset' | $T8 %]</th>
      <td>[% HTML.escape(myconfig_dbname) %]</td>
     </tr>
     <tr>
-     <th align="left">Datenbankcomputer</th>
+     <th align="left">[% 'Database Host' | $T8 %]</th>
      <td>[% HTML.escape(myconfig_dbhost) %]</td>
     </tr>
     <tr>
@@ -40,9 +41,10 @@
    </table>
 
    <noscript>
-   [% INCLUDE  'generic/information_de.html'
-     title_information = 'Ihr Browser unterstützt im Moment kein Javascript!',
-     label_information = 'Die Bedienung von Lx-Office wurde an vielen Stellen mit Javascript verbessert. Obwohl es derzeit möglich ist, jeden Aspekt von Lx-Office auch ohne Javascript zu benutzen, empfehlen wir es. In einer zukünftigen Version wird Javascript eventuell notwendig sein um weitergehende Features zu benutzen.',
+   [%- SET information_template = 'generic/information_' _ LxERP.t8('master') _ '.html' %]
+   [% INCLUDE $information_template
+     title_information = LxERP.t8('Your browser does not currently support Javascript.'),
+     label_information = LxERP.t8('A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
    %]
    </noscript>
  </center>
diff --git a/templates/webpages/login/company_logo_master.html b/templates/webpages/login/company_logo_master.html
index e3cdf6c7e..4dbcde37a 100644
--- a/templates/webpages/login/company_logo_master.html
+++ b/templates/webpages/login/company_logo_master.html
@@ -1,12 +1,13 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
  [%- DEFAULT myconfig_dbhost = 'localhost' %]
 
  <center>
   <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
 
-  <h2 class="login"><translate>Version</translate> [% version %]</h2>
+  <h2 class="login">[% 'Version' | $T8 %] [% version %]</h2>
 
-  <p><translate>Licensed to</translate></p>
+  <p>[% 'Licensed to' | $T8 %]</p>
 
   <p>
    <b>
@@ -19,15 +20,15 @@
 
    <table border="0">
     <tr>
-     <th align="left"><translate>User</translate></th>
+     <th align="left">[% 'User' | $T8 %]</th>
      <td>[% HTML.escape(myconfig_name) %]</td>
     </tr>
     <tr>
-     <th align="left"><translate>Dataset</translate></th>
+     <th align="left">[% 'Dataset' | $T8 %]</th>
      <td>[% HTML.escape(myconfig_dbname) %]</td>
     </tr>
     <tr>
-     <th align="left"><translate>Database Host</translate></th>
+     <th align="left">[% 'Database Host' | $T8 %]</th>
      <td>[% HTML.escape(myconfig_dbhost) %]</td>
     </tr>
     <tr>
@@ -40,9 +41,10 @@
    </table>
 
    <noscript>
-   [% INCLUDE  'generic/information_<translate>master</translate>.html'
-     title_information = '<translate>Your browser does not currently support Javascript.</translate>',
-     label_information = '<translate>A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.</translate>',
+   [%- SET information_template = 'generic/information_' _ LxERP.t8('master') _ '.html' %]
+   [% INCLUDE $information_template
+     title_information = LxERP.t8('Your browser does not currently support Javascript.'),
+     label_information = LxERP.t8('A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
    %]
    </noscript>
  </center>
diff --git a/templates/webpages/login/login_screen_de.html b/templates/webpages/login/login_screen_de.html
index 8a3dd7c27..1c421fb96 100644
--- a/templates/webpages/login/login_screen_de.html
+++ b/templates/webpages/login/login_screen_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="login" onLoad="document.loginscreen.login.focus()">
 
  <center>
@@ -5,7 +6,7 @@
    <tr>
     <td class="login" align="center">
      <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-     <h1 class="login" align="center">Version [% version %]</h1>
+     <h1 class="login" align="center">[% 'Version' | $T8 %] [% version %]</h1>
 
      [% IF error_message %]
      <p><span class="error_message">[% error_message %]</span></p>
@@ -22,17 +23,17 @@
          <td align="center">
           <table>
            <tr>
-            <th align="right">Benutzername</th>
+            <th align="right">[% 'Login Name' | $T8 %]</th>
             <td><input class="login" name="login" size="30" tabindex="1"></td>
            </tr>
            <tr>
-            <th align="right">Passwort</th>
+            <th align="right">[% 'Password' | $T8 %]</th>
             <td><input class="login" type="password" name="password" size="30" tabindex="2"></td>
            </tr>
           </table>
 
           <br>
-          <input type="submit" name="action" value="Anmeldung" tabindex="3">
+          <input type="submit" name="action" value="[% 'Login' | $T8 %]" tabindex="3">
 
          </td>
         </tr>
diff --git a/templates/webpages/login/login_screen_master.html b/templates/webpages/login/login_screen_master.html
index 341d89485..1c421fb96 100644
--- a/templates/webpages/login/login_screen_master.html
+++ b/templates/webpages/login/login_screen_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body class="login" onLoad="document.loginscreen.login.focus()">
 
  <center>
@@ -5,7 +6,7 @@
    <tr>
     <td class="login" align="center">
      <a href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
-     <h1 class="login" align="center"><translate>Version</translate> [% version %]</h1>
+     <h1 class="login" align="center">[% 'Version' | $T8 %] [% version %]</h1>
 
      [% IF error_message %]
      <p><span class="error_message">[% error_message %]</span></p>
@@ -22,17 +23,17 @@
          <td align="center">
           <table>
            <tr>
-            <th align="right"><translate>Login Name</translate></th>
+            <th align="right">[% 'Login Name' | $T8 %]</th>
             <td><input class="login" name="login" size="30" tabindex="1"></td>
            </tr>
            <tr>
-            <th align="right"><translate>Password</translate></th>
+            <th align="right">[% 'Password' | $T8 %]</th>
             <td><input class="login" type="password" name="password" size="30" tabindex="2"></td>
            </tr>
           </table>
 
           <br>
-          <input type="submit" name="action" value="<translate>Login</translate>" tabindex="3">
+          <input type="submit" name="action" value="[% 'Login' | $T8 %]" tabindex="3">
 
          </td>
         </tr>
diff --git a/templates/webpages/login/password_error_de.html b/templates/webpages/login/password_error_de.html
index 06f5058e1..e1060a015 100644
--- a/templates/webpages/login/password_error_de.html
+++ b/templates/webpages/login/password_error_de.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 <body>
 
- <p><b>Fehler!</b></p>
+ <p><b>[% 'Error!' | $T8 %]</b></p>
 
  <p>[% error %]</p>
 
- <p><a href="login.pl" target="_top">Anmeldung</a></p>
+ <p><a href="login.pl" target="_top">[% 'Login' | $T8 %]</a></p>
 
 </body>
 </html>
diff --git a/templates/webpages/login/password_error_master.html b/templates/webpages/login/password_error_master.html
index e7b30c12f..e1060a015 100644
--- a/templates/webpages/login/password_error_master.html
+++ b/templates/webpages/login/password_error_master.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 <body>
 
- <p><b><translate>Error!</translate></b></p>
+ <p><b>[% 'Error!' | $T8 %]</b></p>
 
  <p>[% error %]</p>
 
- <p><a href="login.pl" target="_top"><translate>Login</translate></a></p>
+ <p><a href="login.pl" target="_top">[% 'Login' | $T8 %]</a></p>
 
 </body>
 </html>
diff --git a/templates/webpages/menu/menunew_de.html b/templates/webpages/menu/menunew_de.html
index df69700f5..89a897eee 100644
--- a/templates/webpages/menu/menunew_de.html
+++ b/templates/webpages/menu/menunew_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
@@ -19,13 +20,13 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">neues Fenster</a>]
+    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()">drucken</a>]
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">abmelden</a>]
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
@@ -96,7 +97,7 @@ function open_url(url, target) {
  </script>
 
  <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
  </iframe>
 </body>
 </html>
diff --git a/templates/webpages/menu/menunew_master.html b/templates/webpages/menu/menunew_master.html
index 48572163d..89a897eee 100644
--- a/templates/webpages/menu/menunew_master.html
+++ b/templates/webpages/menu/menunew_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
@@ -19,13 +20,13 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank"><translate>new Window</translate></a>]
+    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top"><translate>logout</translate></a>]
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
@@ -96,7 +97,7 @@ function open_url(url, target) {
  </script>
 
  <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
  </iframe>
 </body>
 </html>
diff --git a/templates/webpages/menu/menuv3_de.html b/templates/webpages/menu/menuv3_de.html
index 4687de29e..9da62367c 100644
--- a/templates/webpages/menu/menuv3_de.html
+++ b/templates/webpages/menu/menuv3_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
@@ -17,13 +18,13 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">neues Fenster</a>]
+    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()">drucken</a>]
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">abmelden</a>]
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
@@ -39,7 +40,7 @@ window.onload=clockon
  <div style="clear: both;"></div>
 
  <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
  </iframe>
 </body>
 </html>
diff --git a/templates/webpages/menu/menuv3_master.html b/templates/webpages/menu/menuv3_master.html
index 00f76d88a..9da62367c 100644
--- a/templates/webpages/menu/menuv3_master.html
+++ b/templates/webpages/menu/menuv3_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
@@ -17,13 +18,13 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank"><translate>new Window</translate></a>]
+    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top"><translate>logout</translate></a>]
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
@@ -39,7 +40,7 @@ window.onload=clockon
  <div style="clear: both;"></div>
 
  <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
  </iframe>
 </body>
 </html>
diff --git a/templates/webpages/menu/menuv4_de.html b/templates/webpages/menu/menuv4_de.html
index 7176a7d01..4ae7d19a9 100644
--- a/templates/webpages/menu/menuv4_de.html
+++ b/templates/webpages/menu/menuv4_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
@@ -17,13 +18,13 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv4.pl?action=display" target="_blank">neues Fenster</a>]
+    [<a href="menuv4.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()">drucken</a>]
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top">abmelden</a>]
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
@@ -39,7 +40,7 @@ window.onload=clockon
  <div style="clear: both;"></div>
 
  <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
  </iframe>
 </body>
 </html>
diff --git a/templates/webpages/menu/menuv4_master.html b/templates/webpages/menu/menuv4_master.html
index 43d244be1..4ae7d19a9 100644
--- a/templates/webpages/menu/menuv4_master.html
+++ b/templates/webpages/menu/menuv4_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
@@ -17,13 +18,13 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv4.pl?action=display" target="_blank"><translate>new Window</translate></a>]
+    [<a href="menuv4.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
-    [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
+    [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: [% HTML.escape(login) %] -
-    <a href="login.pl?action=logout" target="_top"><translate>logout</translate></a>]
+    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
@@ -39,7 +40,7 @@ window.onload=clockon
  <div style="clear: both;"></div>
 
  <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
  </iframe>
 </body>
 </html>
diff --git a/templates/webpages/oe/check_for_direct_delivery_de.html b/templates/webpages/oe/check_for_direct_delivery_de.html
index 7ab223bc2..35a5135ff 100644
--- a/templates/webpages/oe/check_for_direct_delivery_de.html
+++ b/templates/webpages/oe/check_for_direct_delivery_de.html
@@ -1,18 +1,19 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="listtop" width="100%">Lieferadresse &uuml;bernehmen</div>
+ <div class="listtop" width="100%">[% 'Carry over shipping address' | $T8 %]</div>
 
- <p>Sie haben die folgende Lieferadresse eingegeben oder ausgew&auml;hlt:</p>
+ <p>[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]</p>
 
  <p>
   <table>
    <tr>
-    <th align="right" valign="top">Name:</th>
+    <th align="right" valign="top">[% 'Name' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">Abteilung:</th>
+    <th align="right" valign="top">[% 'Department' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
    </tr>
 
@@ -22,55 +23,55 @@
    </tr>
 
    <tr>
-    <th align="right" valign="top">Straße:</th>
+    <th align="right" valign="top">[% 'Street' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">PLZ:</th>
+    <th align="right" valign="top">[% 'Zipcode' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">Stadt:</th>
+    <th align="right" valign="top">[% 'City' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">Land:</th>
+    <th align="right" valign="top">[% 'Country' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">Kontakt:</th>
+    <th align="right" valign="top">[% 'Contact' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">Telefon:</th>
+    <th align="right" valign="top">[% 'Phone' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">Fax:</th>
+    <th align="right" valign="top">[% 'Fax' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top">eMail:</th>
+    <th align="right" valign="top">[% 'E-mail' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
    </tr>
   </table>
  </p>
 
-  Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag &uuml;bernehmen, damit der H&auml;ndler die Waren direkt an Ihren Kunden liefern kann?
+  [% 'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' | $T8 %]
  </p>
 
  <form method="post" action="oe.pl">
 
   <p>
-   <input type="submit" name="action" value="Ja">&nbsp;
-   <input type="submit" name="action" value="Nein">
+   <input type="submit" name="action" value="[% 'Yes' | $T8 %]">&nbsp;
+   <input type="submit" name="action" value="[% 'No' | $T8 %]">
   </p>
 
   <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
diff --git a/templates/webpages/oe/check_for_direct_delivery_master.html b/templates/webpages/oe/check_for_direct_delivery_master.html
index d434fc2a5..35a5135ff 100644
--- a/templates/webpages/oe/check_for_direct_delivery_master.html
+++ b/templates/webpages/oe/check_for_direct_delivery_master.html
@@ -1,18 +1,19 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="listtop" width="100%"><translate>Carry over shipping address</translate></div>
+ <div class="listtop" width="100%">[% 'Carry over shipping address' | $T8 %]</div>
 
- <p><translate>You have entered or selected the following shipping address for this customer:</translate></p>
+ <p>[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]</p>
 
  <p>
   <table>
    <tr>
-    <th align="right" valign="top"><translate>Name</translate>:</th>
+    <th align="right" valign="top">[% 'Name' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Department</translate>:</th>
+    <th align="right" valign="top">[% 'Department' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
    </tr>
 
@@ -22,55 +23,55 @@
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Street</translate>:</th>
+    <th align="right" valign="top">[% 'Street' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Zipcode</translate>:</th>
+    <th align="right" valign="top">[% 'Zipcode' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>City</translate>:</th>
+    <th align="right" valign="top">[% 'City' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Country</translate>:</th>
+    <th align="right" valign="top">[% 'Country' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Contact</translate>:</th>
+    <th align="right" valign="top">[% 'Contact' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Phone</translate>:</th>
+    <th align="right" valign="top">[% 'Phone' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>Fax</translate>:</th>
+    <th align="right" valign="top">[% 'Fax' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
    </tr>
 
    <tr>
-    <th align="right" valign="top"><translate>E-mail</translate>:</th>
+    <th align="right" valign="top">[% 'E-mail' | $T8 %]:</th>
     <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
    </tr>
   </table>
  </p>
 
-  <translate>Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?</translate>
+  [% 'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' | $T8 %]
  </p>
 
  <form method="post" action="oe.pl">
 
   <p>
-   <input type="submit" name="action" value="<translate>Yes</translate>">&nbsp;
-   <input type="submit" name="action" value="<translate>No</translate>">
+   <input type="submit" name="action" value="[% 'Yes' | $T8 %]">&nbsp;
+   <input type="submit" name="action" value="[% 'No' | $T8 %]">
   </p>
 
   <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
diff --git a/templates/webpages/oe/form_footer_de.html b/templates/webpages/oe/form_footer_de.html
index e2c2e96cc..de6d7b9bb 100644
--- a/templates/webpages/oe/form_footer_de.html
+++ b/templates/webpages/oe/form_footer_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
@@ -7,15 +8,15 @@
           <td>
             <table>
               <tr>
-                <th align="left">Bemerkungen</th>
-                <th align="left">interne Bemerkungen</th>
+                <th align="left">[% 'Notes' | $T8 %]</th>
+                <th align="left">[% 'Internal Notes' | $T8 %]</th>
               </tr>
               <tr valign="top">
                 <td>[% notes %]</td>
                 <td>[% intnotes %]</td>
               </tr>
               <tr>
-                <th align="right">Zahlungskonditionen</th>
+                <th align="right">[% 'Payment Terms' | $T8 %]</th>
                 <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'payment_id',
@@ -28,7 +29,7 @@
             </tr>
       [%- IF id && num_follow_ups %]
       <tr>
-       <td colspan="2">[% LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.', num_follow_ups, num_due_follow_ups) %]</td>
+       <td colspan="2">[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]</td>
       </tr>
       [%- END %]
       </table>
@@ -38,11 +39,11 @@
             <table>
 
             <tr>
-              <th  align="left">Ertrag</th>
+              <th  align="left">[% 'Ertrag' | $T8 %]</th>
               <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
             </tr>
             <tr>
-              <th  align="left">Ertrag prozentual</th>
+              <th  align="left">[% 'Ertrag prozentual' | $T8 %]</th>
               <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
               <td>%</td>
             </tr>
@@ -54,18 +55,18 @@
 [%- END %]
           <td align="right">
 [%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
 [%- END %]
             <table>
 [%- IF NOT taxincluded %]
               <tr>
-                <th align='right'>Zwischensumme</th>
+                <th align='right'>[% 'Subtotal' | $T8 %]</th>
                 <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
               </tr>
 [%- END %]
               [% tax %]
               <tr>
-                <th align="right">Summe</th>
+                <th align="right">[% 'Total' | $T8 %]</th>
                 <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
               </tr>
             </table>
@@ -113,44 +114,44 @@
 </table>
 
 [% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-<input class="submit" type="submit" name="action" value="Lieferadresse">
-<input class="submit" type="submit" name="action" value="Drucken">
-<input class="submit" type="submit" name="action" value="eMail">
-<input class="submit" type="submit" name="action" value="Speichern">
-<input class="submit" type="submit" name="action" value="Speichern und schließen">
+<input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Save and Close' | $T8 %]">
 
 [%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="Historie">
+  <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="[% 'history' | $T8 %]">
 
   <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="als neu speichern">
-  <input class="submit" type="submit" name="action" value="Löschen">
+  <input class="submit" type="submit" name="action" value="[% 'Save as new' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
 
   [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="Kundenauftrag">
+    <input class="submit" type="submit" name="action" value="[% 'Sales Order' | $T8 %]">
   [%- END %]
 
   [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
+    <input class="submit" type="submit" name="action" value="[% 'Purchase Order' | $T8 %]">
   [%- END %]
 
   [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="Lieferschein">
+    <input class="submit" type="submit" name="action" value="[% 'Delivery Order' | $T8 %]">
   [%- END %]
 
-  <input class="submit" type="submit" name="action" value="Rechnung">
+  <input class="submit" type="submit" name="action" value="[% 'Invoice' | $T8 %]">
 
   [%- IF is_sales_ord || is_pur_ord %]
     <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
     [%- IF is_sales_ord %]
-      <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
-     <input class="submit" type="submit" name="action" value="Angebot">
+      <input class="submit" type="submit" name="action" value="[% 'Purchase Order' | $T8 %]">
+     <input class="submit" type="submit" name="action" value="[% 'Quotation' | $T8 %]">
     [%- ELSE %]
     [%- IF is_pur_ord %]
-      <input class="submit" type="submit" name="action" value="Kundenauftrag">
-     <input class="submit" type="submit" name="action" value="Anfrage">
+      <input class="submit" type="submit" name="action" value="[% 'Sales Order' | $T8 %]">
+     <input class="submit" type="submit" name="action" value="[% 'Request for Quotation' | $T8 %]">
     [%- END %]
     [%- END %]
   [%- END %]
diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
index 9de093919..de6d7b9bb 100644
--- a/templates/webpages/oe/form_footer_master.html
+++ b/templates/webpages/oe/form_footer_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
   <tr>
@@ -7,15 +8,15 @@
           <td>
             <table>
               <tr>
-                <th align="left"><translate>Notes</translate></th>
-                <th align="left"><translate>Internal Notes</translate></th>
+                <th align="left">[% 'Notes' | $T8 %]</th>
+                <th align="left">[% 'Internal Notes' | $T8 %]</th>
               </tr>
               <tr valign="top">
                 <td>[% notes %]</td>
                 <td>[% intnotes %]</td>
               </tr>
               <tr>
-                <th align="right"><translate>Payment Terms</translate></th>
+                <th align="right">[% 'Payment Terms' | $T8 %]</th>
                 <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'payment_id',
@@ -28,7 +29,7 @@
             </tr>
       [%- IF id && num_follow_ups %]
       <tr>
-       <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
+       <td colspan="2">[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]</td>
       </tr>
       [%- END %]
       </table>
@@ -38,11 +39,11 @@
             <table>
 
             <tr>
-              <th  align="left"><translate>Ertrag</translate></th>
+              <th  align="left">[% 'Ertrag' | $T8 %]</th>
               <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
             </tr>
             <tr>
-              <th  align="left"><translate>Ertrag prozentual</translate></th>
+              <th  align="left">[% 'Ertrag prozentual' | $T8 %]</th>
               <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
               <td>%</td>
             </tr>
@@ -54,18 +55,18 @@
 [%- END %]
           <td align="right">
 [%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
 [%- END %]
             <table>
 [%- IF NOT taxincluded %]
               <tr>
-                <th align='right'><translate>Subtotal</translate></th>
+                <th align='right'>[% 'Subtotal' | $T8 %]</th>
                 <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
               </tr>
 [%- END %]
               [% tax %]
               <tr>
-                <th align="right"><translate>Total</translate></th>
+                <th align="right">[% 'Total' | $T8 %]</th>
                 <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
               </tr>
             </table>
@@ -113,44 +114,44 @@
 </table>
 
 [% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Print</translate>">
-<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Save and Close</translate>">
+<input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Ship to' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Save' | $T8 %]">
+<input class="submit" type="submit" name="action" value="[% 'Save and Close' | $T8 %]">
 
 [%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
+  <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="[% 'history' | $T8 %]">
 
   <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Save as new' | $T8 %]">
+  <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
 
   [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Sales Order' | $T8 %]">
   [%- END %]
 
   [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Purchase Order' | $T8 %]">
   [%- END %]
 
   [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Delivery Order</translate>">
+    <input class="submit" type="submit" name="action" value="[% 'Delivery Order' | $T8 %]">
   [%- END %]
 
-  <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
+  <input class="submit" type="submit" name="action" value="[% 'Invoice' | $T8 %]">
 
   [%- IF is_sales_ord || is_pur_ord %]
     <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
     [%- IF is_sales_ord %]
-      <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
-     <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
+      <input class="submit" type="submit" name="action" value="[% 'Purchase Order' | $T8 %]">
+     <input class="submit" type="submit" name="action" value="[% 'Quotation' | $T8 %]">
     [%- ELSE %]
     [%- IF is_pur_ord %]
-      <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
-     <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
+      <input class="submit" type="submit" name="action" value="[% 'Sales Order' | $T8 %]">
+     <input class="submit" type="submit" name="action" value="[% 'Request for Quotation' | $T8 %]">
     [%- END %]
     [%- END %]
   [%- END %]
diff --git a/templates/webpages/oe/form_header_de.html b/templates/webpages/oe/form_header_de.html
index ba4bd1b0a..ba6c9cca9 100644
--- a/templates/webpages/oe/form_header_de.html
+++ b/templates/webpages/oe/form_header_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body onLoad="[% onload %]">
@@ -33,7 +34,7 @@
               <td width="50%">
                 <table width="100%">
                   <tr>
-                    <th align="right">[% IF vc == 'customer' %]Kunde[% ELSE %]Lieferant[% END %]</th>
+                    <th align="right">[% IF vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name          = vc,
@@ -45,12 +46,12 @@
                            limit         = vclimit,
                            allow_textbox = 1,
                            onChange      = "document.getElementById('update_button').click();" -%]
-                      <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+                      <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
                     </td>
                   </tr>
 [%- IF ALL_CONTACTS.size %]
                   <tr>
-                    <th align="right">Ansprechpartner</th>
+                    <th align="right">[% 'Contact Person' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'cp_id',
@@ -64,7 +65,7 @@
 [%- END %]
 [%- IF ALL_SHIPTO.size %]
                   <tr>
-                    <th align="right">Lieferadresse</th>
+                    <th align="right">[% 'Shipping Address' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'shipto_id',
@@ -79,27 +80,27 @@
 [%- END %]
 [%- IF is_order %]
                   <tr>
-                    <td align="right">Kreditlimit</td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; Rest <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
+                    <td align="right">[% 'Credit Limit' | $T8 %]</td>
+                    <td>[% LxERP.format_amount(creditlimit, 0) %]; [% 'Remaining' | $T8 %] <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
                   </tr>
 [%- END %]
 [%- IF business %]
                   <tr>
                     <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; Rabatt [% LxERP.format_percent(tradediscount) %] %</td>
+                    <td>[% HTML.escape(business) %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_percent(tradediscount) %] %</td>
                   </tr>
 [%- END %]
 [%- IF max_dunning_level %]
                   <tr>
-                    <th align="right">höchste Mahnstufe:</th>
+                    <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
                     <td>
                       <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      gemahnter Betrag: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
+                      [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
                     </td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th align="right">Steuersatz</th>
+                    <th align="right">[% 'Steuersatz' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'taxzone_id',
@@ -111,7 +112,7 @@
                   </tr>
 [%- IF ALL_DEPARTMENTS %]
                   <tr>
-                    <th align="right" nowrap>Abteilung</th>
+                    <th align="right" nowrap>[% 'Department' | $T8 %]</th>
                     <td colspan="3">
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'department_id',
@@ -126,13 +127,13 @@
                   <tr>
 [%- IF currencies %]
                   <tr>
-                    <th align="right">Währung</th>
+                    <th align="right">[% 'Currency' | $T8 %]</th>
                     <td>[% currencies %]</td>
                   </tr>
 [%- END %]
 [%- IF show_exchangerate %]
                   <tr>
-                    <th align="right">Wechselkurs</th>
+                    <th align="right">[% 'Exchangerate' | $T8 %]</th>
                     <td>
                      [%- IF forex %]
                       [% LxERP.format_amount(exchangerate, 2) %]
@@ -143,15 +144,15 @@
                   </tr>
 [%- END %]
                   <tr>
-                    <th align="right">Versandort</th>
+                    <th align="right">[% 'Shipping Point' | $T8 %]</th>
                     <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
                   </tr>
                   <tr>
-                    <th align="right">Transportmittel</th>
+                    <th align="right">[% 'Ship via' | $T8 %]</th>
                     <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
                   </tr>
                   <tr>
-                    <th align="right">Vorgangsbezeichnung</th>
+                    <th align="right">[% 'Transaction description' | $T8 %]</th>
                     <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
                   </tr>
 [%- IF show_delivery_customer %]
@@ -160,14 +161,14 @@
                       <table>
                         <tr>
                           <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">Endkunde wählen:</button>
+                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">[% 'Choose Customer' | $T8 %]</button>
                         </td>
                           <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
                           <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
                         </tr>
                         <tr>
                           <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">Händler wählen</button>
+                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">[% 'Choose Vendor' | $T8 %]</button>
                           </td>
                           <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
                           <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
@@ -182,7 +183,7 @@
                 <table>
               [% openclosed %]
                   <tr>
-                    <th align="right">Bearbeiter</th>
+                    <th align="right">[% 'Employee' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'employee_id',
@@ -193,7 +194,7 @@
                   </tr>
 [%- IF is_sales and ALL_SALESMEN.size %]
                   <tr>
-                    <th align="right">Verkäufer/in</th>
+                    <th align="right">[% 'Salesman' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'salesman_id',
@@ -206,48 +207,48 @@
 [%- END %]
 [%- IF is_order %]
                   <tr>
-                    <th width="70%" align="right" nowrap>Auftragsnummer</th>
+                    <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
                     <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %][% 'RFQ Number' | $T8 %][% ELSE %][% 'Quotation Number' | $T8 %][% END %]</th>
                     <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
                   </tr>
 [%- IF is_order %]
                   <tr>
-                    <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
+                    <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
                     <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
                     <th align="right" nowrap>
                      [%- IF is_order %]
-                      Auftragsdatum
+                      [% 'Order Date' | $T8 %]
                      [%- ELSE %]
-                      Angebotsdatum
+                      [% 'Quotation Date' | $T8 %]
                      [%- END %]
                     </th>
                     <td nowrap>
                       <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=transdate id="trigger1" value="?">
+                      <input type=button name=transdate id="trigger1" value="[% 'button' | $T8 %]">
                     </td>
                   </tr>
                   <tr>
                     <th align="right" nowrap>
                      [%- IF is_sales_quo %]
-                      gültig bis
+                      [% 'Valid until' | $T8 %]
                      [%- ELSE %]
-                      Lieferdatum
+                      [% 'Required by' | $T8 %]
                      [%- END %]
                     </th>
                     <td nowrap>
                       <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=reqdate id="trigger2" value="?">
+                      <input type=button name=reqdate id="trigger2" value="[% 'button' | $T8 %]">
                     </td>
                   </tr>
                   <tr>
-                    <th width="70%" align="right" nowrap>Projektnummer</th>
+                    <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'globalproject_id',
diff --git a/templates/webpages/oe/form_header_master.html b/templates/webpages/oe/form_header_master.html
index 27ae25031..ba6c9cca9 100644
--- a/templates/webpages/oe/form_header_master.html
+++ b/templates/webpages/oe/form_header_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body onLoad="[% onload %]">
@@ -33,7 +34,7 @@
               <td width="50%">
                 <table width="100%">
                   <tr>
-                    <th align="right">[% IF vc == 'customer' %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
+                    <th align="right">[% IF vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name          = vc,
@@ -45,12 +46,12 @@
                            limit         = vclimit,
                            allow_textbox = 1,
                            onChange      = "document.getElementById('update_button').click();" -%]
-                      <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+                      <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
                     </td>
                   </tr>
 [%- IF ALL_CONTACTS.size %]
                   <tr>
-                    <th align="right"><translate>Contact Person</translate></th>
+                    <th align="right">[% 'Contact Person' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'cp_id',
@@ -64,7 +65,7 @@
 [%- END %]
 [%- IF ALL_SHIPTO.size %]
                   <tr>
-                    <th align="right"><translate>Shipping Address</translate></th>
+                    <th align="right">[% 'Shipping Address' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'shipto_id',
@@ -79,27 +80,27 @@
 [%- END %]
 [%- IF is_order %]
                   <tr>
-                    <td align="right"><translate>Credit Limit</translate></td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; <translate>Remaining</translate> <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
+                    <td align="right">[% 'Credit Limit' | $T8 %]</td>
+                    <td>[% LxERP.format_amount(creditlimit, 0) %]; [% 'Remaining' | $T8 %] <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
                   </tr>
 [%- END %]
 [%- IF business %]
                   <tr>
                     <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; <translate>Trade Discount</translate> [% LxERP.format_percent(tradediscount) %] %</td>
+                    <td>[% HTML.escape(business) %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_percent(tradediscount) %] %</td>
                   </tr>
 [%- END %]
 [%- IF max_dunning_level %]
                   <tr>
-                    <th align="right"><translate>Max. Dunning Level</translate>:</th>
+                    <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
                     <td>
                       <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      <translate>Dunning Amount</translate>: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
+                      [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
                     </td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th align="right"><translate>Steuersatz</translate></th>
+                    <th align="right">[% 'Steuersatz' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'taxzone_id',
@@ -111,7 +112,7 @@
                   </tr>
 [%- IF ALL_DEPARTMENTS %]
                   <tr>
-                    <th align="right" nowrap><translate>Department</translate></th>
+                    <th align="right" nowrap>[% 'Department' | $T8 %]</th>
                     <td colspan="3">
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'department_id',
@@ -126,13 +127,13 @@
                   <tr>
 [%- IF currencies %]
                   <tr>
-                    <th align="right"><translate>Currency</translate></th>
+                    <th align="right">[% 'Currency' | $T8 %]</th>
                     <td>[% currencies %]</td>
                   </tr>
 [%- END %]
 [%- IF show_exchangerate %]
                   <tr>
-                    <th align="right"><translate>Exchangerate</translate></th>
+                    <th align="right">[% 'Exchangerate' | $T8 %]</th>
                     <td>
                      [%- IF forex %]
                       [% LxERP.format_amount(exchangerate, 2) %]
@@ -143,15 +144,15 @@
                   </tr>
 [%- END %]
                   <tr>
-                    <th align="right"><translate>Shipping Point</translate></th>
+                    <th align="right">[% 'Shipping Point' | $T8 %]</th>
                     <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
                   </tr>
                   <tr>
-                    <th align="right"><translate>Ship via</translate></th>
+                    <th align="right">[% 'Ship via' | $T8 %]</th>
                     <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
                   </tr>
                   <tr>
-                    <th align="right"><translate>Transaction description</translate></th>
+                    <th align="right">[% 'Transaction description' | $T8 %]</th>
                     <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
                   </tr>
 [%- IF show_delivery_customer %]
@@ -160,14 +161,14 @@
                       <table>
                         <tr>
                           <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')"><translate>Choose Customer</translate></button>
+                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">[% 'Choose Customer' | $T8 %]</button>
                         </td>
                           <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
                           <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
                         </tr>
                         <tr>
                           <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')"><translate>Choose Vendor</translate></button>
+                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">[% 'Choose Vendor' | $T8 %]</button>
                           </td>
                           <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
                           <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
@@ -182,7 +183,7 @@
                 <table>
               [% openclosed %]
                   <tr>
-                    <th align="right"><translate>Employee</translate></th>
+                    <th align="right">[% 'Employee' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'employee_id',
@@ -193,7 +194,7 @@
                   </tr>
 [%- IF is_sales and ALL_SALESMEN.size %]
                   <tr>
-                    <th align="right"><translate>Salesman</translate></th>
+                    <th align="right">[% 'Salesman' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'salesman_id',
@@ -206,48 +207,48 @@
 [%- END %]
 [%- IF is_order %]
                   <tr>
-                    <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
+                    <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
                     <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %][% 'RFQ Number' | $T8 %][% ELSE %][% 'Quotation Number' | $T8 %][% END %]</th>
                     <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
                   </tr>
 [%- IF is_order %]
                   <tr>
-                    <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
+                    <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
                     <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
                     <th align="right" nowrap>
                      [%- IF is_order %]
-                      <translate>Order Date</translate>
+                      [% 'Order Date' | $T8 %]
                      [%- ELSE %]
-                      <translate>Quotation Date</translate>
+                      [% 'Quotation Date' | $T8 %]
                      [%- END %]
                     </th>
                     <td nowrap>
                       <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=transdate id="trigger1" value="<translate>button</translate>">
+                      <input type=button name=transdate id="trigger1" value="[% 'button' | $T8 %]">
                     </td>
                   </tr>
                   <tr>
                     <th align="right" nowrap>
                      [%- IF is_sales_quo %]
-                      <translate>Valid until</translate>
+                      [% 'Valid until' | $T8 %]
                      [%- ELSE %]
-                      <translate>Required by</translate>
+                      [% 'Required by' | $T8 %]
                      [%- END %]
                     </th>
                     <td nowrap>
                       <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
-                      <input type=button name=reqdate id="trigger2" value="<translate>button</translate>">
+                      <input type=button name=reqdate id="trigger2" value="[% 'button' | $T8 %]">
                     </td>
                   </tr>
                   <tr>
-                    <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
+                    <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
                            name       = 'globalproject_id',
diff --git a/templates/webpages/oe/orders_bottom_de.html b/templates/webpages/oe/orders_bottom_de.html
index fbe82b314..5ceb69c47 100644
--- a/templates/webpages/oe/orders_bottom_de.html
+++ b/templates/webpages/oe/orders_bottom_de.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]
  [%- IF SHOW_CONTINUE_BUTTON %]
- Neuer Auftrag<br>
- <input class="submit" type="submit" name="action" value="Weiter">
+ [% 'New sales order' | $T8 %]<br>
+ <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
  [%- END %]
  <input type="hidden" name="nextsub" value="edit">
  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
diff --git a/templates/webpages/oe/orders_bottom_master.html b/templates/webpages/oe/orders_bottom_master.html
index d1a9d90e2..5ceb69c47 100644
--- a/templates/webpages/oe/orders_bottom_master.html
+++ b/templates/webpages/oe/orders_bottom_master.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]
  [%- IF SHOW_CONTINUE_BUTTON %]
- <translate>New sales order</translate><br>
- <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+ [% 'New sales order' | $T8 %]<br>
+ <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
  [%- END %]
  <input type="hidden" name="nextsub" value="edit">
  <input type="hidden" name="type" value="[% HTML.escape(type) %]">
diff --git a/templates/webpages/oe/report_for_todo_list_de.html b/templates/webpages/oe/report_for_todo_list_de.html
index 6ecfbcd11..6b8a18464 100644
--- a/templates/webpages/oe/report_for_todo_list_de.html
+++ b/templates/webpages/oe/report_for_todo_list_de.html
@@ -1,17 +1,18 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 
-<div class="listtop">Überfällige Angebote und Preisanfragen</div>
+<div class="listtop">[% 'Overdue sales quotations and requests for quotations' | $T8 %]</div>
 
 <p>
  <table width="100%">
   <tr>
-   <td class="listheading">Datum</td>
-   <td class="listheading">gültig bis</td>
-   <td class="listheading">Angebot / Preisanfrage</td>
-   <td class="listheading">Kunde / Lieferant</td>
-   <td class="listheading">Vorgangsbezeichnung</td>
-   <td class="listheading">Betrag</td>
-   <td class="listheading">Bearbeiter</td>
+   <td class="listheading">[% 'Date' | $T8 %]</td>
+   <td class="listheading">[% 'Valid until' | $T8 %]</td>
+   <td class="listheading">[% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %]</td>
+   <td class="listheading">[% 'Customer' | $T8 %] / [% 'Vendor' | $T8 %]</td>
+   <td class="listheading">[% 'Transaction description' | $T8 %]</td>
+   <td class="listheading">[% 'Amount' | $T8 %]</td>
+   <td class="listheading">[% 'Employee' | $T8 %]</td>
   </tr>
 
   [%- FOREACH row = QUOTATIONS %]
@@ -21,9 +22,9 @@
    <td>
     <a href="[% edit_url %]&vc=[% HTML.url(row.vc) %]&type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.url(row.id) %]">
      [% IF row.vc == 'customer' %]
-     Angebot
+     [% 'Sales quotation' | $T8 %]
      [% ELSE %]
-     Preisanfrage
+     [% 'Request quotation' | $T8 %]
      [% END %]
      [% HTML.escape(row.quonumber) %]
     </a>
diff --git a/templates/webpages/oe/report_for_todo_list_master.html b/templates/webpages/oe/report_for_todo_list_master.html
index aba808ba3..6b8a18464 100644
--- a/templates/webpages/oe/report_for_todo_list_master.html
+++ b/templates/webpages/oe/report_for_todo_list_master.html
@@ -1,17 +1,18 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 
-<div class="listtop"><translate>Overdue sales quotations and requests for quotations</translate></div>
+<div class="listtop">[% 'Overdue sales quotations and requests for quotations' | $T8 %]</div>
 
 <p>
  <table width="100%">
   <tr>
-   <td class="listheading"><translate>Date</translate></td>
-   <td class="listheading"><translate>Valid until</translate></td>
-   <td class="listheading"><translate>Sales quotation</translate> / <translate>Request quotation</translate></td>
-   <td class="listheading"><translate>Customer</translate> / <translate>Vendor</translate></td>
-   <td class="listheading"><translate>Transaction description</translate></td>
-   <td class="listheading"><translate>Amount</translate></td>
-   <td class="listheading"><translate>Employee</translate></td>
+   <td class="listheading">[% 'Date' | $T8 %]</td>
+   <td class="listheading">[% 'Valid until' | $T8 %]</td>
+   <td class="listheading">[% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %]</td>
+   <td class="listheading">[% 'Customer' | $T8 %] / [% 'Vendor' | $T8 %]</td>
+   <td class="listheading">[% 'Transaction description' | $T8 %]</td>
+   <td class="listheading">[% 'Amount' | $T8 %]</td>
+   <td class="listheading">[% 'Employee' | $T8 %]</td>
   </tr>
 
   [%- FOREACH row = QUOTATIONS %]
@@ -21,9 +22,9 @@
    <td>
     <a href="[% edit_url %]&vc=[% HTML.url(row.vc) %]&type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.url(row.id) %]">
      [% IF row.vc == 'customer' %]
-     <translate>Sales quotation</translate>
+     [% 'Sales quotation' | $T8 %]
      [% ELSE %]
-     <translate>Request quotation</translate>
+     [% 'Request quotation' | $T8 %]
      [% END %]
      [% HTML.escape(row.quonumber) %]
     </a>
diff --git a/templates/webpages/oe/sales_order_de.html b/templates/webpages/oe/sales_order_de.html
index 1cd3a425a..dcde83af6 100644
--- a/templates/webpages/oe/sales_order_de.html
+++ b/templates/webpages/oe/sales_order_de.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]
 <tr>
  <td>
-  <input type="button" id="cb_show_details" name="show_details" value='Detailsanzeige'>
+  <input type="button" id="cb_show_details" name="show_details" value='[% 'Show details' | $T8 %]'>
   <script type="text/javascript">
    $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
   </script>
diff --git a/templates/webpages/oe/sales_order_master.html b/templates/webpages/oe/sales_order_master.html
index 607256459..dcde83af6 100644
--- a/templates/webpages/oe/sales_order_master.html
+++ b/templates/webpages/oe/sales_order_master.html
@@ -1,7 +1,8 @@
+[%- USE T8 %]
 [% USE HTML %]
 <tr>
  <td>
-  <input type="button" id="cb_show_details" name="show_details" value='<translate>Show details</translate>'>
+  <input type="button" id="cb_show_details" name="show_details" value='[% 'Show details' | $T8 %]'>
   <script type="text/javascript">
    $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
   </script>
diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
index 20b38eb2d..90cb60252 100644
--- a/templates/webpages/oe/search_de.html
+++ b/templates/webpages/oe/search_de.html
@@ -1,7 +1,8 @@
 [%- USE HTML %]
 [%- USE T8 %]
-[%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %]
-[%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %]
+[%- USE LxERP %]
+[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
+[%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
 <body>
 
 <form method="post" action="oe.pl">
@@ -31,7 +32,7 @@
     </tr>
 [%- IF ALL_DEPARTMENTS.size %]
     <tr>
-     <th align="right" nowrap>Abteilung</th>
+     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'department_id',
@@ -51,7 +52,7 @@
      <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
     </tr>
     <tr>
-     <th align="right">Bearbeiter</th>
+     <th align="right">[% 'Employee' | $T8 %]</th>
      <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'employee_id',
@@ -67,7 +68,7 @@
      </td>
     </tr>
     <tr>
-     <th align="right">Verkäufer/in</th>
+     <th align="right">[% 'Salesman' | $T8 %]</th>
      <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'salesman_id',
@@ -82,11 +83,11 @@
      </td>
     </tr>
     <tr>
-     <th align="right">Vorgangsbezeichnung</th>
+     <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td colspan="3"><input name="transaction_description" style="width: 250px"></td>
     </tr>
     <tr>
-     <th align="right">Projektnummer</th>
+     <th align="right">[% 'Project Number' | $T8 %]</th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
@@ -106,7 +107,7 @@
       <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom" id="trigger3" value="?">
      </td>
-     <th align="right">bis</th>
+     <th align="right">[% 'Bis' | $T8 %]</th>
      <td>
       <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
@@ -118,42 +119,42 @@
       <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdatefrom id="trigger5" value=?>
      </td>
-     <th align="right">bis</th>
+     <th align="right">[% 'Bis' | $T8 %]</th>
      <td>
       <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
      </td>
     </tr>
     <tr>
-     <th align="right">In Bericht aufnehmen</th>
+     <th align="right">[% 'Include in Report' | $T8 %]</th>
      <td colspan="5">
       <table>
        <tr>
         <td>
          <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open">Offen</label>
+         <label for="open">[% 'Open' | $T8 %]</label>
         </td>
         <td>
          <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed">Geschlossen</label>
+         <label for="closed">[% 'Closed' | $T8 %]</label>
         </td>
        </tr>
 [%- IF type == 'sales_order' OR type == 'purchase_order' %]
        <tr>
         <td>
          <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered">Nicht geliefert</label>
+         <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
         </td>
         <td>
          <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">Geliefert</label>
+         <label for="delivered">[% 'Delivered' | $T8 %]</label>
         </td>
        </tr>
 [%- END %]
        <tr>
         <td>
          <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id">Buchungsnummer</label>
+         <label for="l_id">[% 'ID' | $T8 %]</label>
         </td>
         <td>
          <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
@@ -163,7 +164,7 @@
        <tr>
         <td>
          <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate">Datum</label>
+         <label for="l_transdate">[% 'Date' | $T8 %]</label>
         </td>
         <td>
          <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
@@ -177,55 +178,55 @@
         </td>
         <td>
          <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee">Bearbeiter</label>
+         <label for="l_employee">[% 'Employee' | $T8 %]</label>
         </td>
         <td>
          <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia">Transportmittel</label>
+         <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">
-         <label for="l_netamount">Betrag</label>
+         <label for="l_netamount">[% 'Amount' | $T8 %]</label>
         </td>
         <td>
          <input name="l_tax" id="l_tax" class="checkbox" type="checkbox" value="Y">
-         <label for="l_tax">Steuer</label>
+         <label for="l_tax">[% 'Tax' | $T8 %]</label>
         </td>
         <td>
          <input name="l_amount" id="l_amount" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_amount">Summe</label>
+         <label for="l_amount">[% 'Total' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_marge_total" id="l_marge_total" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_total">Ertrag</label>
+         <label for="l_marge_total">[% 'Ertrag' | $T8 %]</label>
         </td>
         <td>
          <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_percent">Ertrag prozentual</label>
+         <label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber">Projektnummer</label>
+         <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
         </td>
         <td>
          <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description">Vorgangsbezeichnung</label>
+         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-         <label for="l_subtotal">Zwischensumme</label>
+         <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
         </td>
         <td>
          <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman">Verkäufer/in</label>
+         <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
         </td>
        </tr>
        <tr>
@@ -238,11 +239,11 @@
         </td>
         <td>
          <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
-         <label for="l_country">Land</label>
+         <label for="l_country">[% 'Country' | $T8 %]</label>
         </td>
         <td>
          <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
-         <label for="l_ustid">USt-IdNr.</label>
+         <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
         </td>
        </tr>
 [%- IF type == 'sales_order' %]
@@ -269,7 +270,7 @@
 <input type="hidden" name="nextsub" value="orders">
 <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="Weiter">
+<input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 </form>
 
 </body>
diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index a21ddcb3a..90cb60252 100644
--- a/templates/webpages/oe/search_master.html
+++ b/templates/webpages/oe/search_master.html
@@ -1,7 +1,8 @@
 [%- USE HTML %]
 [%- USE T8 %]
-[%- SET vclabel = vc == 'customer' ? '<translate>Customer</translate>' : '<translate>Vendor</translate>' %]
-[%- SET vcnumberlabel = vc == 'customer' ? '<translate>Customer Number</translate>' : '<translate>Vendor Number</translate>' %]
+[%- USE LxERP %]
+[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
+[%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
 <body>
 
 <form method="post" action="oe.pl">
@@ -31,7 +32,7 @@
     </tr>
 [%- IF ALL_DEPARTMENTS.size %]
     <tr>
-     <th align="right" nowrap><translate>Department</translate></th>
+     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'department_id',
@@ -51,7 +52,7 @@
      <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
     </tr>
     <tr>
-     <th align="right"><translate>Employee</translate></th>
+     <th align="right">[% 'Employee' | $T8 %]</th>
      <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'employee_id',
@@ -67,7 +68,7 @@
      </td>
     </tr>
     <tr>
-     <th align="right"><translate>Salesman</translate></th>
+     <th align="right">[% 'Salesman' | $T8 %]</th>
      <td>
             [%- INCLUDE 'generic/multibox.html'
                  name          = 'salesman_id',
@@ -82,11 +83,11 @@
      </td>
     </tr>
     <tr>
-     <th align="right"><translate>Transaction description</translate></th>
+     <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td colspan="3"><input name="transaction_description" style="width: 250px"></td>
     </tr>
     <tr>
-     <th align="right"><translate>Project Number</translate></th>
+     <th align="right">[% 'Project Number' | $T8 %]</th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
                  name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
@@ -106,7 +107,7 @@
       <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom" id="trigger3" value="?">
      </td>
-     <th align="right"><translate>Bis</translate></th>
+     <th align="right">[% 'Bis' | $T8 %]</th>
      <td>
       <input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
@@ -118,42 +119,42 @@
       <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdatefrom id="trigger5" value=?>
      </td>
-     <th align="right"><translate>Bis</translate></th>
+     <th align="right">[% 'Bis' | $T8 %]</th>
      <td>
       <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
      </td>
     </tr>
     <tr>
-     <th align="right"><translate>Include in Report</translate></th>
+     <th align="right">[% 'Include in Report' | $T8 %]</th>
      <td colspan="5">
       <table>
        <tr>
         <td>
          <input type="checkbox" name="open" value="1" id="open" checked>
-         <label for="open"><translate>Open</translate></label>
+         <label for="open">[% 'Open' | $T8 %]</label>
         </td>
         <td>
          <input type="checkbox" name="closed" value="1" id="closed">
-         <label for="closed"><translate>Closed</translate></label>
+         <label for="closed">[% 'Closed' | $T8 %]</label>
         </td>
        </tr>
 [%- IF type == 'sales_order' OR type == 'purchase_order' %]
        <tr>
         <td>
          <input name="notdelivered" id="notdelivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="notdelivered"><translate>Not delivered</translate></label>
+         <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
         </td>
         <td>
          <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered"><translate>Delivered</translate></label>
+         <label for="delivered">[% 'Delivered' | $T8 %]</label>
         </td>
        </tr>
 [%- END %]
        <tr>
         <td>
          <input name="l_id" id="l_id" class="checkbox" type="checkbox" value="Y">
-         <label for="l_id"><translate>ID</translate></label>
+         <label for="l_id">[% 'ID' | $T8 %]</label>
         </td>
         <td>
          <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
@@ -163,7 +164,7 @@
        <tr>
         <td>
          <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_transdate"><translate>Date</translate></label>
+         <label for="l_transdate">[% 'Date' | $T8 %]</label>
         </td>
         <td>
          <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
@@ -177,55 +178,55 @@
         </td>
         <td>
          <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_employee"><translate>Employee</translate></label>
+         <label for="l_employee">[% 'Employee' | $T8 %]</label>
         </td>
         <td>
          <input name="l_shipvia" id="l_shipvia" class="checkbox" type="checkbox" value="Y">
-         <label for="l_shipvia"><translate>Ship via</translate></label>
+         <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">
-         <label for="l_netamount"><translate>Amount</translate></label>
+         <label for="l_netamount">[% 'Amount' | $T8 %]</label>
         </td>
         <td>
          <input name="l_tax" id="l_tax" class="checkbox" type="checkbox" value="Y">
-         <label for="l_tax"><translate>Tax</translate></label>
+         <label for="l_tax">[% 'Tax' | $T8 %]</label>
         </td>
         <td>
          <input name="l_amount" id="l_amount" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_amount"><translate>Total</translate></label>
+         <label for="l_amount">[% 'Total' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_marge_total" id="l_marge_total" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_total"><translate>Ertrag</translate></label>
+         <label for="l_marge_total">[% 'Ertrag' | $T8 %]</label>
         </td>
         <td>
          <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
-         <label for="l_marge_percent"><translate>Ertrag prozentual</translate></label>
+         <label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_globalprojectnumber" id="l_globalprojectnumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_globalprojectnumber"><translate>Project Number</translate></label>
+         <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
         </td>
         <td>
          <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
-         <label for="l_transaction_description"><translate>Transaction description</translate></label>
+         <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
         </td>
        </tr>
        <tr>
         <td>
          <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
-         <label for="l_subtotal"><translate>Subtotal</translate></label>
+         <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
         </td>
         <td>
          <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
-         <label for="l_salesman"><translate>Salesman</translate></label>
+         <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
         </td>
        </tr>
        <tr>
@@ -238,11 +239,11 @@
         </td>
         <td>
          <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
-         <label for="l_country"><translate>Country</translate></label>
+         <label for="l_country">[% 'Country' | $T8 %]</label>
         </td>
         <td>
          <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
-         <label for="l_ustid"><translate>USt-IdNr.</translate></label>
+         <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
         </td>
        </tr>
 [%- IF type == 'sales_order' %]
@@ -269,7 +270,7 @@
 <input type="hidden" name="nextsub" value="orders">
 <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+<input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 </form>
 
 </body>
diff --git a/templates/webpages/projects/project_form_de.html b/templates/webpages/projects/project_form_de.html
index 7409d1186..c27a2547b 100644
--- a/templates/webpages/projects/project_form_de.html
+++ b/templates/webpages/projects/project_form_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
  [%- IF message %]
@@ -14,9 +15,9 @@
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="basic_data">Basisdaten</a></li>
+   <li class="selected"><a href="#" rel="basic_data">[% 'Basic data' | $T8 %]</a></li>
    [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">Benutzerdefinierte Variablen</a></li>
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
    [%- END %]
   </ul>
 
@@ -26,12 +27,12 @@
 
     <table>
      <tr>
-      <th align="right">Nummer</th>
+      <th align="right">[% 'Number' | $T8 %]</th>
       <td><input name="project.projectnumber" size="20" value="[% HTML.escape(project.projectnumber) %]"></td>
      </tr>
 
      <tr>
-      <th align="right">Beschreibung</th>
+      <th align="right">[% 'Description' | $T8 %]</th>
       <td>
        [%- SET rows = LxERP.numtextrows(project.description, 60) %]
        [%- IF rows > 1 %]
@@ -46,8 +47,8 @@
      <tr>
       <th align="right">&nbsp;</th>
       <td>
-       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1">Aktiv</label>
-       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0">Inaktiv</label>
+       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1">[% 'Active' | $T8 %]</label>
+       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0">[% 'Inactive' | $T8 %]</label>
       </td>
      </tr>
      [%- END %]
@@ -77,13 +78,13 @@
   </div>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Speichern">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
    [%- IF project.id %]
-   <input type="submit" class="submit" name="action" value="als neu speichern">
+   <input type="submit" class="submit" name="action" value="[% 'Save as new' | $T8 %]">
    [%- IF project.orphaned %]
-   <input type="submit" class="submit" name="action" value="Löschen">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [%- END %]
-   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="Historie">
+   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="[% 'history' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/projects/project_form_master.html b/templates/webpages/projects/project_form_master.html
index c9d51b753..c27a2547b 100644
--- a/templates/webpages/projects/project_form_master.html
+++ b/templates/webpages/projects/project_form_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
  [%- IF message %]
@@ -14,9 +15,9 @@
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
   <ul id="maintab" class="shadetabs">
-   <li class="selected"><a href="#" rel="basic_data"><translate>Basic data</translate></a></li>
+   <li class="selected"><a href="#" rel="basic_data">[% 'Basic data' | $T8 %]</a></li>
    [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
+   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
    [%- END %]
   </ul>
 
@@ -26,12 +27,12 @@
 
     <table>
      <tr>
-      <th align="right"><translate>Number</translate></th>
+      <th align="right">[% 'Number' | $T8 %]</th>
       <td><input name="project.projectnumber" size="20" value="[% HTML.escape(project.projectnumber) %]"></td>
      </tr>
 
      <tr>
-      <th align="right"><translate>Description</translate></th>
+      <th align="right">[% 'Description' | $T8 %]</th>
       <td>
        [%- SET rows = LxERP.numtextrows(project.description, 60) %]
        [%- IF rows > 1 %]
@@ -46,8 +47,8 @@
      <tr>
       <th align="right">&nbsp;</th>
       <td>
-       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1"><translate>Active</translate></label>
-       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0"><translate>Inactive</translate></label>
+       <input type="radio" name="project.active" id="active_1" value="1"[% IF project.active %] checked[% END %]><label for="active_1">[% 'Active' | $T8 %]</label>
+       <input type="radio" name="project.active" id="active_0" value="0"[% IF !project.active %] checked[% END %]><label for="active_0">[% 'Inactive' | $T8 %]</label>
       </td>
      </tr>
      [%- END %]
@@ -77,13 +78,13 @@
   </div>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
    [%- IF project.id %]
-   <input type="submit" class="submit" name="action" value="<translate>Save as new</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Save as new' | $T8 %]">
    [%- IF project.orphaned %]
-   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [%- END %]
-   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="<translate>history</translate>">
+   <input type="button" onclick="set_history_window([% HTML.escape(project.id) %]);" name="history" id="history" value="[% 'history' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/projects/search_de.html b/templates/webpages/projects/search_de.html
index 40ed6eff0..e7b030c44 100644
--- a/templates/webpages/projects/search_de.html
+++ b/templates/webpages/projects/search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <form method="post" action="projects.pl">
@@ -7,44 +8,44 @@
   <p>
    <table>
     <tr>
-     <th align="right">Nummer</th>
+     <th align="right">[% 'Number' | $T8 %]</th>
      <td><input name="filter.projectnumber" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right">Beschreibung</th>
+     <th align="right">[% 'Description' | $T8 %]</th>
      <td><input name="filter.description" size="60"></td>
     </tr>
 
     [% CUSTOM_VARIABLES_FILTER_CODE %]
 
     <tr>
-     <th>In Bericht aufnehmen</th>
+     <th>[% 'Include in Report' | $T8 %]</th>
      <td>
       <table>
        <tr>
         <td>
          <input type="radio" name="filter.active" id="active_active" value="active" checked>
-         <label for="active_active">Aktiv</label>
+         <label for="active_active">[% 'Active' | $T8 %]</label>
         </td>
         <td>
          <input type="radio" name="filter.active" id="active_inactive" value="inactive">
-         <label for="active_inactive">Inaktiv</label>
+         <label for="active_inactive">[% 'Inactive' | $T8 %]</label>
         </td>
         <td>
          <input type="radio" name="filter.active" id="active_both" value="both">
-         <label for="active_both">Beide</label>
+         <label for="active_both">[% 'Both' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input type="radio" name="filter.status" id="status_all" value="all" checked>
-         <label for="status_all">Alle</label>
+         <label for="status_all">[% 'All' | $T8 %]</label>
         </td>
         <td>
          <input type="radio" name="filter.status" id="status_orphaned" value="orphaned">
-         <label for="status_orphaned">Nie benutzt</label>
+         <label for="status_orphaned">[% 'Orphaned' | $T8 %]</label>
         </td>
        </tr>
 
@@ -61,7 +62,7 @@
   <input type="hidden" name="nextsub" value="project_report">
 
   <p>
-   <input class="submit" type="submit" name="action" value="Weiter">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/projects/search_master.html b/templates/webpages/projects/search_master.html
index c5925b91f..e7b030c44 100644
--- a/templates/webpages/projects/search_master.html
+++ b/templates/webpages/projects/search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <form method="post" action="projects.pl">
@@ -7,44 +8,44 @@
   <p>
    <table>
     <tr>
-     <th align="right"><translate>Number</translate></th>
+     <th align="right">[% 'Number' | $T8 %]</th>
      <td><input name="filter.projectnumber" size="20"></td>
     </tr>
 
     <tr>
-     <th align="right"><translate>Description</translate></th>
+     <th align="right">[% 'Description' | $T8 %]</th>
      <td><input name="filter.description" size="60"></td>
     </tr>
 
     [% CUSTOM_VARIABLES_FILTER_CODE %]
 
     <tr>
-     <th><translate>Include in Report</translate></th>
+     <th>[% 'Include in Report' | $T8 %]</th>
      <td>
       <table>
        <tr>
         <td>
          <input type="radio" name="filter.active" id="active_active" value="active" checked>
-         <label for="active_active"><translate>Active</translate></label>
+         <label for="active_active">[% 'Active' | $T8 %]</label>
         </td>
         <td>
          <input type="radio" name="filter.active" id="active_inactive" value="inactive">
-         <label for="active_inactive"><translate>Inactive</translate></label>
+         <label for="active_inactive">[% 'Inactive' | $T8 %]</label>
         </td>
         <td>
          <input type="radio" name="filter.active" id="active_both" value="both">
-         <label for="active_both"><translate>Both</translate></label>
+         <label for="active_both">[% 'Both' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input type="radio" name="filter.status" id="status_all" value="all" checked>
-         <label for="status_all"><translate>All</translate></label>
+         <label for="status_all">[% 'All' | $T8 %]</label>
         </td>
         <td>
          <input type="radio" name="filter.status" id="status_orphaned" value="orphaned">
-         <label for="status_orphaned"><translate>Orphaned</translate></label>
+         <label for="status_orphaned">[% 'Orphaned' | $T8 %]</label>
         </td>
        </tr>
 
@@ -61,7 +62,7 @@
   <input type="hidden" name="nextsub" value="project_report">
 
   <p>
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/report_generator/csv_export_options_de.html b/templates/webpages/report_generator/csv_export_options_de.html
index d0d51b19c..ee7f442f7 100644
--- a/templates/webpages/report_generator/csv_export_options_de.html
+++ b/templates/webpages/report_generator/csv_export_options_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <script type="text/javascript">
@@ -24,7 +25,7 @@
 
   <table>
    <tr>
-    <td align="right">Anf&uuml;hrungszeichen</td>
+    <td align="right">[% 'Quote chararacter' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_quote_char" style="width: 300px">
       <option value="&quot;" selected>&quot;</option>
@@ -34,10 +35,10 @@
    </tr>
 
    <tr>
-    <td align="right">Escape-Zeichen</td>
+    <td align="right">[% 'Escape character' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_escape_char" style="width: 300px">
-      <option value="QUOTE_CHAR" selected>Wie Anf&uuml;hrungszeichen</option>
+      <option value="QUOTE_CHAR" selected>[% 'Same as the quote character' | $T8 %]</option>
       <option value="&quot;">&quot;</option>
       <option value="'">'</option>
      </select>
@@ -45,19 +46,19 @@
    </tr>
 
    <tr>
-    <td align="right">Feldtrennzeichen</td>
+    <td align="right">[% 'Separator chararacter' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_sep_char" style="width: 300px">
       <option value=";" selected>;</option>
       <option value=",">,</option>
       <option value=":">:</option>
-      <option value="TAB">TAB (Das Tabulator-Symbol)</option>
+      <option value="TAB">TAB ([% 'The tabulator character' | $T8 %])</option>
      </select>
     </td>
    </tr>
 
    <tr>
-    <td align="right">Zeilenumbr&uuml;che</td>
+    <td align="right">[% 'Line endings' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_eol_style" style="width: 300px">
       <option value="DOS">DOS/Windows (CR/LF)</option>
@@ -67,18 +68,18 @@
    </tr>
 
    <tr>
-    <td align="right" valign="top">Optionen:</td>
+    <td align="right" valign="top">[% 'Options' | $T8 %]:</td>
     <td valign="top">
      <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
-     <label for="report_generator_csv_options_headers">Spalten&uuml;berschriften erzeugen</label>
+     <label for="report_generator_csv_options_headers">[% 'Include column headings' | $T8 %]</label>
     </td>
    </tr>
 
   </table>
 
   <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Als CSV exportieren">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="Zurück">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/report_generator/csv_export_options_master.html b/templates/webpages/report_generator/csv_export_options_master.html
index a2f56ef9d..ee7f442f7 100644
--- a/templates/webpages/report_generator/csv_export_options_master.html
+++ b/templates/webpages/report_generator/csv_export_options_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <script type="text/javascript">
@@ -24,7 +25,7 @@
 
   <table>
    <tr>
-    <td align="right"><translate>Quote chararacter</translate></td>
+    <td align="right">[% 'Quote chararacter' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_quote_char" style="width: 300px">
       <option value="&quot;" selected>&quot;</option>
@@ -34,10 +35,10 @@
    </tr>
 
    <tr>
-    <td align="right"><translate>Escape character</translate></td>
+    <td align="right">[% 'Escape character' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_escape_char" style="width: 300px">
-      <option value="QUOTE_CHAR" selected><translate>Same as the quote character</translate></option>
+      <option value="QUOTE_CHAR" selected>[% 'Same as the quote character' | $T8 %]</option>
       <option value="&quot;">&quot;</option>
       <option value="'">'</option>
      </select>
@@ -45,19 +46,19 @@
    </tr>
 
    <tr>
-    <td align="right"><translate>Separator chararacter</translate></td>
+    <td align="right">[% 'Separator chararacter' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_sep_char" style="width: 300px">
       <option value=";" selected>;</option>
       <option value=",">,</option>
       <option value=":">:</option>
-      <option value="TAB">TAB (<translate>The tabulator character</translate>)</option>
+      <option value="TAB">TAB ([% 'The tabulator character' | $T8 %])</option>
      </select>
     </td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Line endings</translate></td>
+    <td align="right">[% 'Line endings' | $T8 %]</td>
     <td>
      <select name="report_generator_csv_options_eol_style" style="width: 300px">
       <option value="DOS">DOS/Windows (CR/LF)</option>
@@ -67,18 +68,18 @@
    </tr>
 
    <tr>
-    <td align="right" valign="top"><translate>Options</translate>:</td>
+    <td align="right" valign="top">[% 'Options' | $T8 %]:</td>
     <td valign="top">
      <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
-     <label for="report_generator_csv_options_headers"><translate>Include column headings</translate></label>
+     <label for="report_generator_csv_options_headers">[% 'Include column headings' | $T8 %]</label>
     </td>
    </tr>
 
   </table>
 
   <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="<translate>Export as CSV</translate>">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="<translate>Back</translate>">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
index 8547b2812..fa8874c5b 100644
--- a/templates/webpages/report_generator/html_report_de.html
+++ b/templates/webpages/report_generator/html_report_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <script type="text/javascript">
@@ -91,7 +92,7 @@
   </table>
  </p>
  [% ELSE %]
-  <p>Es wurden keine Daten gefunden.</p>
+  <p>[% 'No data was found.' | $T8 %]</p>
  [% END %]
 
  [% RAW_BOTTOM_INFO_TEXT %]
@@ -111,9 +112,9 @@
    <input type="hidden" name="action" value="report_generator_dispatcher">
 
    <p>
-    Export anzeigen<br>
-    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Als PDF exportieren">[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Als CSV exportieren">[% END %]
+    [% 'List export' | $T8 %]<br>
+    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">[% END %]
+    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">[% END %]
    </p>
   </form>
  [% END %]
diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
index 707657c56..fa8874c5b 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <script type="text/javascript">
@@ -91,7 +92,7 @@
   </table>
  </p>
  [% ELSE %]
-  <p><translate>No data was found.</translate></p>
+  <p>[% 'No data was found.' | $T8 %]</p>
  [% END %]
 
  [% RAW_BOTTOM_INFO_TEXT %]
@@ -111,9 +112,9 @@
    <input type="hidden" name="action" value="report_generator_dispatcher">
 
    <p>
-    <translate>List export</translate><br>
-    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="<translate>Export as PDF</translate>">[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="<translate>Export as CSV</translate>">[% END %]
+    [% 'List export' | $T8 %]<br>
+    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">[% END %]
+    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">[% END %]
    </p>
   </form>
  [% END %]
diff --git a/templates/webpages/report_generator/pdf_export_options_de.html b/templates/webpages/report_generator/pdf_export_options_de.html
index ea22d1a23..41eb6c019 100644
--- a/templates/webpages/report_generator/pdf_export_options_de.html
+++ b/templates/webpages/report_generator/pdf_export_options_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
  [%- SET default_margin = LxERP.format_amount(1.5) %]
@@ -26,7 +27,7 @@
 
   <table>
    <tr>
-    <td align="right">Seitenformat</td>
+    <td align="right">[% 'Orientation' | $T8 %]</td>
     <td>
      <select name="report_generator_pdf_options_paper_size">
       <option value="A3">A3</option>
@@ -36,15 +37,15 @@
       <option value="legal">Legal</option>
      </select>
      <select name="report_generator_pdf_options_orientation">
-      <option value="portrait">Hochformat</option>
-      <option value="landscape" selected>Querformat</option>
+      <option value="portrait">[% 'Portrait' | $T8 %]</option>
+      <option value="landscape" selected>[% 'Landscape' | $T8 %]</option>
      </select>
     </td>
    </tr>
 
    [%- IF ALLOW_FONT_SELECTION %]
    <tr>
-    <td align="right">Schriftart</td>
+    <td align="right">[% 'Font' | $T8 %]</td>
     <td>
      <select name="report_generator_pdf_options_font_name">
       <option>Courier</option>
@@ -58,7 +59,7 @@
    [%- END %]
 
    <tr>
-    <td align="right">Schriftgr&ouml;&szlig;e</td>
+    <td align="right">[% 'Font size' | $T8 %]</td>
     <td>
      <select name="report_generator_pdf_options_font_size">
       <option>6</option>
@@ -78,45 +79,45 @@
    </tr>
 
    <tr>
-    <td align="right">Seitenr&auml;nder:</td>
+    <td align="right">[% 'Margins' | $T8 %]:</td>
    </tr>
 
    <tr>
-    <td align="right">Oben</td>
+    <td align="right">[% 'Top' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right">Links</td>
+    <td align="right">[% 'Left' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right">Unten</td>
+    <td align="right">[% 'Bottom' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right">Rechts</td>
+    <td align="right">[% 'Right' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right" valign="top">Optionen:</td>
+    <td align="right" valign="top">[% 'Options' | $T8 %]:</td>
     <td valign="top">
      <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
-     <label for="report_generator_pdf_options_number">Seiten nummerieren</label>
+     <label for="report_generator_pdf_options_number">[% 'Number pages' | $T8 %]</label>
      [% IF ALL_PRINTERS.size %]
       <br>
       <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
-      <label for="report_generator_pdf_options_print">Liste ausdrucken</label>
+      <label for="report_generator_pdf_options_print">[% 'Print list' | $T8 %]</label>
      [% END %]
     </td>
    </tr>
 
    [% IF ALL_PRINTERS.size %]
     <tr>
-     <td align="right">Drucker</td>
+     <td align="right">[% 'Printer' | $T8 %]</td>
      <td>
       <select name="report_generator_pdf_options_printer_id">
        [%- FOREACH printer = ALL_PRINTERS %]
@@ -127,15 +128,15 @@
     </tr>
 
     <tr>
-     <td align="right">Kopien</td>
+     <td align="right">[% 'Copies' | $T8 %]</td>
      <td><input name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
     </tr>
    [% END %]
   </table>
 
   <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Als PDF exportieren">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="Zurück">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/report_generator/pdf_export_options_master.html b/templates/webpages/report_generator/pdf_export_options_master.html
index b77169837..41eb6c019 100644
--- a/templates/webpages/report_generator/pdf_export_options_master.html
+++ b/templates/webpages/report_generator/pdf_export_options_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
 
  [%- SET default_margin = LxERP.format_amount(1.5) %]
@@ -26,7 +27,7 @@
 
   <table>
    <tr>
-    <td align="right"><translate>Orientation</translate></td>
+    <td align="right">[% 'Orientation' | $T8 %]</td>
     <td>
      <select name="report_generator_pdf_options_paper_size">
       <option value="A3">A3</option>
@@ -36,15 +37,15 @@
       <option value="legal">Legal</option>
      </select>
      <select name="report_generator_pdf_options_orientation">
-      <option value="portrait"><translate>Portrait</translate></option>
-      <option value="landscape" selected><translate>Landscape</translate></option>
+      <option value="portrait">[% 'Portrait' | $T8 %]</option>
+      <option value="landscape" selected>[% 'Landscape' | $T8 %]</option>
      </select>
     </td>
    </tr>
 
    [%- IF ALLOW_FONT_SELECTION %]
    <tr>
-    <td align="right"><translate>Font</translate></td>
+    <td align="right">[% 'Font' | $T8 %]</td>
     <td>
      <select name="report_generator_pdf_options_font_name">
       <option>Courier</option>
@@ -58,7 +59,7 @@
    [%- END %]
 
    <tr>
-    <td align="right"><translate>Font size</translate></td>
+    <td align="right">[% 'Font size' | $T8 %]</td>
     <td>
      <select name="report_generator_pdf_options_font_size">
       <option>6</option>
@@ -78,45 +79,45 @@
    </tr>
 
    <tr>
-    <td align="right"><translate>Margins</translate>:</td>
+    <td align="right">[% 'Margins' | $T8 %]:</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Top</translate></td>
+    <td align="right">[% 'Top' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Left</translate></td>
+    <td align="right">[% 'Left' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Bottom</translate></td>
+    <td align="right">[% 'Bottom' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right"><translate>Right</translate></td>
+    <td align="right">[% 'Right' | $T8 %]</td>
     <td><input name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_margin) %]"> cm</td>
    </tr>
 
    <tr>
-    <td align="right" valign="top"><translate>Options</translate>:</td>
+    <td align="right" valign="top">[% 'Options' | $T8 %]:</td>
     <td valign="top">
      <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
-     <label for="report_generator_pdf_options_number"><translate>Number pages</translate></label>
+     <label for="report_generator_pdf_options_number">[% 'Number pages' | $T8 %]</label>
      [% IF ALL_PRINTERS.size %]
       <br>
       <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
-      <label for="report_generator_pdf_options_print"><translate>Print list</translate></label>
+      <label for="report_generator_pdf_options_print">[% 'Print list' | $T8 %]</label>
      [% END %]
     </td>
    </tr>
 
    [% IF ALL_PRINTERS.size %]
     <tr>
-     <td align="right"><translate>Printer</translate></td>
+     <td align="right">[% 'Printer' | $T8 %]</td>
      <td>
       <select name="report_generator_pdf_options_printer_id">
        [%- FOREACH printer = ALL_PRINTERS %]
@@ -127,15 +128,15 @@
     </tr>
 
     <tr>
-     <td align="right"><translate>Copies</translate></td>
+     <td align="right">[% 'Copies' | $T8 %]</td>
      <td><input name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
     </tr>
    [% END %]
   </table>
 
   <p>
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="<translate>Export as PDF</translate>">
-   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="<translate>Back</translate>">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">
+   <input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_back')" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/rp/aging_ar_bottom_de.html b/templates/webpages/rp/aging_ar_bottom_de.html
index 57c9c8c86..d148e2225 100644
--- a/templates/webpages/rp/aging_ar_bottom_de.html
+++ b/templates/webpages/rp/aging_ar_bottom_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %] <input type="hidden" name="rowcount" value="[% HTML.escape(row_idx) %]">
 
  [% PRINT_OPTIONS %]
@@ -10,10 +11,10 @@
  <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
  <input type="hidden" name="department" value="[% HTML.escape(department) %]">
 
- Sammelrechnung
+ [% 'Statement' | $T8 %]
  <br>
- <input class="submit" type="submit" name="action" value="Alle auswählen">
- <input class="submit" type="submit" name="action" value="Drucken">
- <input class="submit" type="submit" name="action" value="eMail">
+ <input class="submit" type="submit" name="action" value="[% 'Select all' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/rp/aging_ar_bottom_master.html b/templates/webpages/rp/aging_ar_bottom_master.html
index 94b2f581c..d148e2225 100644
--- a/templates/webpages/rp/aging_ar_bottom_master.html
+++ b/templates/webpages/rp/aging_ar_bottom_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %] <input type="hidden" name="rowcount" value="[% HTML.escape(row_idx) %]">
 
  [% PRINT_OPTIONS %]
@@ -10,10 +11,10 @@
  <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
  <input type="hidden" name="department" value="[% HTML.escape(department) %]">
 
- <translate>Statement</translate>
+ [% 'Statement' | $T8 %]
  <br>
- <input class="submit" type="submit" name="action" value="<translate>Select all</translate>">
- <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
- <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+ <input class="submit" type="submit" name="action" value="[% 'Select all' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Print' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'E-mail' | $T8 %]">
 
 </form>
diff --git a/templates/webpages/rp/balance_sheet_de.html b/templates/webpages/rp/balance_sheet_de.html
index 04ad4412a..1fd8d45b3 100644
--- a/templates/webpages/rp/balance_sheet_de.html
+++ b/templates/webpages/rp/balance_sheet_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body bgcolor="#ffffff">
@@ -5,13 +6,13 @@
 <h2 align="center">
 [% company %]
 <br>[% address %]
-<p>BILANZ
+<p>[% 'BALANCE SHEET' | $T8 %]
 <br>[% period %]
 </h2>
 
 <table border="0">
   <tr>
-    <th align="left" width="400" colspan="2">AKTIVA<br><hr align="left" width="250" size="5" noshade></th>
+    <th align="left" width="400" colspan="2">[% 'ASSETS' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
     <th>[% this_period %]</th>
     <th>[% last_period %]</th>
   </tr>
@@ -35,7 +36,7 @@
   </tr>
 
   <tr valign="top">
-    <th align="left" colspan="2">TOTAL</th>
+    <th align="left" colspan="2">[% 'TOTAL' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
@@ -44,7 +45,7 @@
 [% END %]
 
   <tr>
-    <th align="left" colspan="4">PASSIVA<b><hr align="left" width="250" size="5" noshade></th>
+    <th align="left" colspan="4">[% 'LIABILITIES' | $T8 %]<b><hr align="left" width="250" size="5" noshade></th>
   </tr>
 
   [% FOREACH row = L %]
@@ -67,7 +68,7 @@
 
   <tr valign="top">
     <td></td>
-    <th align="left">TOTAL</th>
+    <th align="left">[% 'TOTAL' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<br><hr noshade size="2"</td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
@@ -76,7 +77,7 @@
 [% END %]
 
   <tr>
-    <th align="left" colspan="4">EIGENTUM<br><hr align="left" width="250" size="5" noshade></th>
+    <th align="left" colspan="4">[% 'EQUITY' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
   </tr>
 
   [% FOREACH row = Q %]
@@ -99,7 +100,7 @@
 
   <tr valign="top">
     <td></td>
-    <th align="left">TOTAL</th>
+    <th align="left">[% 'TOTAL' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<br><hr noshade size="2"</td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<br><hr noshade size="2"</td>
@@ -108,7 +109,7 @@
 [% END %]
 
   <tr valign="top">
-    <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
+    <th align="left" colspan="2">[% 'TOTAL' | $T8 %] [% 'LIABILITIES' | $T8 %] &amp; [% 'EQUITY' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
diff --git a/templates/webpages/rp/balance_sheet_master.html b/templates/webpages/rp/balance_sheet_master.html
index fc3b8eedd..1fd8d45b3 100644
--- a/templates/webpages/rp/balance_sheet_master.html
+++ b/templates/webpages/rp/balance_sheet_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
 <body bgcolor="#ffffff">
@@ -5,13 +6,13 @@
 <h2 align="center">
 [% company %]
 <br>[% address %]
-<p><translate>BALANCE SHEET</translate>
+<p>[% 'BALANCE SHEET' | $T8 %]
 <br>[% period %]
 </h2>
 
 <table border="0">
   <tr>
-    <th align="left" width="400" colspan="2"><translate>ASSETS</translate><br><hr align="left" width="250" size="5" noshade></th>
+    <th align="left" width="400" colspan="2">[% 'ASSETS' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
     <th>[% this_period %]</th>
     <th>[% last_period %]</th>
   </tr>
@@ -35,7 +36,7 @@
   </tr>
 
   <tr valign="top">
-    <th align="left" colspan="2"><translate>TOTAL</translate></th>
+    <th align="left" colspan="2">[% 'TOTAL' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.A.this, decimalplaces) %]<hr noshade size="2"></td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.A.last, decimalplaces) %]<hr noshade size="2"></td>
@@ -44,7 +45,7 @@
 [% END %]
 
   <tr>
-    <th align="left" colspan="4"><translate>LIABILITIES</translate><b><hr align="left" width="250" size="5" noshade></th>
+    <th align="left" colspan="4">[% 'LIABILITIES' | $T8 %]<b><hr align="left" width="250" size="5" noshade></th>
   </tr>
 
   [% FOREACH row = L %]
@@ -67,7 +68,7 @@
 
   <tr valign="top">
     <td></td>
-    <th align="left"><translate>TOTAL</translate></th>
+    <th align="left">[% 'TOTAL' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.L.this, decimalplaces) %]<br><hr noshade size="2"</td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.L.last, decimalplaces) %]<br><hr noshade size="2"</td>
@@ -76,7 +77,7 @@
 [% END %]
 
   <tr>
-    <th align="left" colspan="4"><translate>EQUITY</translate><br><hr align="left" width="250" size="5" noshade></th>
+    <th align="left" colspan="4">[% 'EQUITY' | $T8 %]<br><hr align="left" width="250" size="5" noshade></th>
   </tr>
 
   [% FOREACH row = Q %]
@@ -99,7 +100,7 @@
 
   <tr valign="top">
     <td></td>
-    <th align="left"><translate>TOTAL</translate></th>
+    <th align="left">[% 'TOTAL' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.Q.this, decimalplaces) %]<br><hr noshade size="2"</td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.Q.last, decimalplaces) %]<br><hr noshade size="2"</td>
@@ -108,7 +109,7 @@
 [% END %]
 
   <tr valign="top">
-    <th align="left" colspan="2"><translate>TOTAL</translate> <translate>LIABILITIES</translate> &amp; <translate>EQUITY</translate></th>
+    <th align="left" colspan="2">[% 'TOTAL' | $T8 %] [% 'LIABILITIES' | $T8 %] &amp; [% 'EQUITY' | $T8 %]</th>
     <td align="right">[% LxERP.format_amount(total.this, decimalplaces) %]<br><hr noshade size="2"></td>
     [%- IF last_period %]
     <td align="right">[% LxERP.format_amount(total.last, decimalplaces) %]<br><hr noshade size="2"></td>
diff --git a/templates/webpages/rp/html_report_susa_de.html b/templates/webpages/rp/html_report_susa_de.html
index 386bc8717..c9b010a78 100644
--- a/templates/webpages/rp/html_report_susa_de.html
+++ b/templates/webpages/rp/html_report_susa_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <script type="text/javascript">
@@ -27,7 +28,7 @@
   <p>[% MESSAGE %]</p>
  [% END %]
 
- <div class="listtop" width="100%">Summen- und Saldenliste [% template_fromto %]</div>
+ <div class="listtop" width="100%">[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]</div>
 
  [% IF TOP_INFO_TEXT %]
   <p>[% TOP_INFO_TEXT %]</p>
@@ -39,23 +40,23 @@
  <p>
   <table width="100%">
    <tr>
-     <th class="listheading" rowspan=2>Konto</th>
-     <th class="listheading" rowspan=2>Beschreibung</th>
-     <th class="listheading" rowspan=2>Letzte Buchung</th>
-     <th class="listheading" colspan=2>Eröffnungsbilanzwerte</th>
-     <th class="listheading" colspan=2>Summe für [% template_fromto %]</th>
-     <th class="listheading" colspan=2>Summe per [% template_to %]</th>
-     <th class="listheading" colspan=2>Saldo per [% template_to %]</th>
+     <th class="listheading" rowspan=2>[% 'Account' | $T8 %]</th>
+     <th class="listheading" rowspan=2>[% 'Description' | $T8 %]</th>
+     <th class="listheading" rowspan=2>[% 'Last Transaction' | $T8 %]</th>
+     <th class="listheading" colspan=2>[% 'Starting Balance' | $T8 %]</th>
+     <th class="listheading" colspan=2>[% 'Sum for' | $T8 %] [% template_fromto %]</th>
+     <th class="listheading" colspan=2>[% 'Sum per' | $T8 %] [% template_to %]</th>
+     <th class="listheading" colspan=2>[% 'Saldo per' | $T8 %] [% template_to %]</th>
    </tr>
    <tr>
-    <th class="listheading">Aktiva</th>
-    <th class="listheading">Passiva</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
-    <th class="listheading">Soll</th>
-    <th class="listheading">Haben</th>
+    <th class="listheading">[% 'Assets' | $T8 %]</th>
+    <th class="listheading">[% 'Equity' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
    </tr>
    [% FOREACH row = ROWS %]
     [% IF row.IS_CONTROL %]
@@ -90,7 +91,7 @@
   </table>
  </p>
  [% ELSE %]
-  <p>Es wurden keine Daten gefunden.</p>
+  <p>[% 'No data was found.' | $T8 %]</p>
  [% END %]
 
  [% RAW_BOTTOM_INFO_TEXT %]
diff --git a/templates/webpages/rp/html_report_susa_master.html b/templates/webpages/rp/html_report_susa_master.html
index 2671a8272..c9b010a78 100644
--- a/templates/webpages/rp/html_report_susa_master.html
+++ b/templates/webpages/rp/html_report_susa_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
  <script type="text/javascript">
@@ -27,7 +28,7 @@
   <p>[% MESSAGE %]</p>
  [% END %]
 
- <div class="listtop" width="100%"><translate>Summen- und Saldenliste</translate> [% template_fromto %]</div>
+ <div class="listtop" width="100%">[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]</div>
 
  [% IF TOP_INFO_TEXT %]
   <p>[% TOP_INFO_TEXT %]</p>
@@ -39,23 +40,23 @@
  <p>
   <table width="100%">
    <tr>
-     <th class="listheading" rowspan=2><translate>Account</translate></th>
-     <th class="listheading" rowspan=2><translate>Description</translate></th>
-     <th class="listheading" rowspan=2><translate>Last Transaction</translate></th>
-     <th class="listheading" colspan=2><translate>Starting Balance</translate></th>
-     <th class="listheading" colspan=2><translate>Sum for</translate> [% template_fromto %]</th>
-     <th class="listheading" colspan=2><translate>Sum per</translate> [% template_to %]</th>
-     <th class="listheading" colspan=2><translate>Saldo per</translate> [% template_to %]</th>
+     <th class="listheading" rowspan=2>[% 'Account' | $T8 %]</th>
+     <th class="listheading" rowspan=2>[% 'Description' | $T8 %]</th>
+     <th class="listheading" rowspan=2>[% 'Last Transaction' | $T8 %]</th>
+     <th class="listheading" colspan=2>[% 'Starting Balance' | $T8 %]</th>
+     <th class="listheading" colspan=2>[% 'Sum for' | $T8 %] [% template_fromto %]</th>
+     <th class="listheading" colspan=2>[% 'Sum per' | $T8 %] [% template_to %]</th>
+     <th class="listheading" colspan=2>[% 'Saldo per' | $T8 %] [% template_to %]</th>
    </tr>
    <tr>
-    <th class="listheading"><translate>Assets</translate></th>
-    <th class="listheading"><translate>Equity</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
-    <th class="listheading"><translate>Debit</translate></th>
-    <th class="listheading"><translate>Credit</translate></th>
+    <th class="listheading">[% 'Assets' | $T8 %]</th>
+    <th class="listheading">[% 'Equity' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
+    <th class="listheading">[% 'Debit' | $T8 %]</th>
+    <th class="listheading">[% 'Credit' | $T8 %]</th>
    </tr>
    [% FOREACH row = ROWS %]
     [% IF row.IS_CONTROL %]
@@ -90,7 +91,7 @@
   </table>
  </p>
  [% ELSE %]
-  <p><translate>No data was found.</translate></p>
+  <p>[% 'No data was found.' | $T8 %]</p>
  [% END %]
 
  [% RAW_BOTTOM_INFO_TEXT %]
diff --git a/templates/webpages/sepa/bank_transfer_add_de.html b/templates/webpages/sepa/bank_transfer_add_de.html
index d8257f502..172d97303 100644
--- a/templates/webpages/sepa/bank_transfer_add_de.html
+++ b/templates/webpages/sepa/bank_transfer_add_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
@@ -5,7 +6,7 @@
 
  <form action="sepa.pl" method="post">
   <p>
-   Bitte wählen Sie das Bankkonto als Quelle für die Überweisungen aus:
+   [% 'Please select the source bank account for the transfers:' | $T8 %]
    <br>
    [%- INCLUDE generic/multibox.html
          name      = 'bank_account.id',
@@ -19,12 +20,12 @@
    <table>
     <tr>
      <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading">Rechnung</th>
-     <th class="listheading" align="right">Betrag</th>
-     <th class="listheading" align="right">offener Betrag</th>
-     <th class="listheading">Verwendungszweck</th>
-     <th class="listheading" align="right">Überweisungssumme</th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
+     <th class="listheading">[% 'Purpose' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
     </tr>
 
     [%- FOREACH invoice = INVOICES %]
@@ -68,12 +69,12 @@
 
   [%- IF show_vendor_bank_info_footnote %]
    <p>
-    <sup>(1)</sup> Für diesen Lieferanten wurden in seinen Stammdaten keine Kontodaten hinterlegt. Solange dies nicht geschehen ist, können Sie keine Überweisungen für den Lieferanten anlegen.
+    <sup>(1)</sup> [% 'No bank information has been entered in this vendor's master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
    </p>
   [%- END %]
 
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="Schritt 2">
+   <input type="submit" class="submit" name="action_bank_transfer_create" value="[% 'Step 2' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_add_master.html b/templates/webpages/sepa/bank_transfer_add_master.html
index 30cc8555f..172d97303 100644
--- a/templates/webpages/sepa/bank_transfer_add_master.html
+++ b/templates/webpages/sepa/bank_transfer_add_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
@@ -5,7 +6,7 @@
 
  <form action="sepa.pl" method="post">
   <p>
-   <translate>Please select the source bank account for the transfers:</translate>
+   [% 'Please select the source bank account for the transfers:' | $T8 %]
    <br>
    [%- INCLUDE generic/multibox.html
          name      = 'bank_account.id',
@@ -19,12 +20,12 @@
    <table>
     <tr>
      <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading"><translate>Invoice</translate></th>
-     <th class="listheading" align="right"><translate>Amount</translate></th>
-     <th class="listheading" align="right"><translate>Open amount</translate></th>
-     <th class="listheading"><translate>Purpose</translate></th>
-     <th class="listheading" align="right"><translate>Bank transfer amount</translate></th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
+     <th class="listheading">[% 'Purpose' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
     </tr>
 
     [%- FOREACH invoice = INVOICES %]
@@ -68,14 +69,12 @@
 
   [%- IF show_vendor_bank_info_footnote %]
    <p>
-    <sup>(1)</sup> <translate>No bank information has been entered in
-     this vendor's master data entry. You cannot create bank transfers
-     unless you enter bank information.</translate>
+    <sup>(1)</sup> [% 'No bank information has been entered in this vendor's master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
    </p>
   [%- END %]
 
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="<translate>Step 2</translate>">
+   <input type="submit" class="submit" name="action_bank_transfer_create" value="[% 'Step 2' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_create_de.html b/templates/webpages/sepa/bank_transfer_create_de.html
index 18b4ae827..318639e2e 100644
--- a/templates/webpages/sepa/bank_transfer_create_de.html
+++ b/templates/webpages/sepa/bank_transfer_create_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
@@ -8,7 +9,7 @@
  <p><div class="listtop">[% title %]</div></p>
 
  <form action="sepa.pl" method="post">
-  <p>1. Bitte wählen Sie das Bankkonto als Quelle für die Überweisungen aus:
+  <p>1. [% 'Please select the source bank account for the transfers:' | $T8 %]
    <br>
    [%- INCLUDE generic/multibox.html
          name      = 'bank_account.id',
@@ -19,14 +20,14 @@
   </p>
 
   <p>
-   2. Bitte überprüfen Sie die Kontoinformationen der Lieferanten:
+   2. [% 'Please Check the bank information for each vendor:' | $T8 %]
    <br>
    <table>
     <tr>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     <th class="listheading">Bank</th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     <th class="listheading">[% 'Bank' | $T8 %]</th>
     </tr>
 
     [%- FOREACH vbi = VENDOR_BANK_INFO %]
@@ -45,17 +46,17 @@
   </p>
 
   <p>
-   3. Geben Sie das jeweils gewünschte Ausführungsdatum an, oder lassen Sie das Feld leer für die schnellstmögliche Ausführung:
+   3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]
    <br>
    <table>
     <tr>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading">Rechnung</th>
-     <th class="listheading" align="right">Betrag</th>
-     <th class="listheading" align="right">offener Betrag</th>
-     <th class="listheading">Verwendungszweck</th>
-     <th class="listheading" align="right">Überweisungssumme</th>
-     <th class="listheading">Ausführungsdatum</th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
+     <th class="listheading">[% 'Purpose' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
+     <th class="listheading">[% 'Execution date' | $T8 %]</th>
     </tr>
 
     [%- FOREACH bank_transfer = BANK_TRANSFERS %]
@@ -96,7 +97,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="Überweisung erstellen">
+   <input type="submit" class="submit" name="action_bank_transfer_create" value="[% 'Create bank transfer' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_create_master.html b/templates/webpages/sepa/bank_transfer_create_master.html
index bfbaa2ae4..318639e2e 100644
--- a/templates/webpages/sepa/bank_transfer_create_master.html
+++ b/templates/webpages/sepa/bank_transfer_create_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
 <body>
 
@@ -8,7 +9,7 @@
  <p><div class="listtop">[% title %]</div></p>
 
  <form action="sepa.pl" method="post">
-  <p>1. <translate>Please select the source bank account for the transfers:</translate>
+  <p>1. [% 'Please select the source bank account for the transfers:' | $T8 %]
    <br>
    [%- INCLUDE generic/multibox.html
          name      = 'bank_account.id',
@@ -19,14 +20,14 @@
   </p>
 
   <p>
-   2. <translate>Please Check the bank information for each vendor:</translate>
+   2. [% 'Please Check the bank information for each vendor:' | $T8 %]
    <br>
    <table>
     <tr>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading"><translate>IBAN</translate></th>
-     <th class="listheading"><translate>BIC</translate></th>
-     <th class="listheading"><translate>Bank</translate></th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     <th class="listheading">[% 'Bank' | $T8 %]</th>
     </tr>
 
     [%- FOREACH vbi = VENDOR_BANK_INFO %]
@@ -45,17 +46,17 @@
   </p>
 
   <p>
-   3. <translate>Enter the requested execution date or leave empty for the quickest possible execution:</translate>
+   3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]
    <br>
    <table>
     <tr>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading"><translate>Invoice</translate></th>
-     <th class="listheading" align="right"><translate>Amount</translate></th>
-     <th class="listheading" align="right"><translate>Open amount</translate></th>
-     <th class="listheading"><translate>Purpose</translate></th>
-     <th class="listheading" align="right"><translate>Bank transfer amount</translate></th>
-     <th class="listheading"><translate>Execution date</translate></th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
+     <th class="listheading">[% 'Purpose' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
+     <th class="listheading">[% 'Execution date' | $T8 %]</th>
     </tr>
 
     [%- FOREACH bank_transfer = BANK_TRANSFERS %]
@@ -96,7 +97,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_create" value="<translate>Create bank transfer</translate>">
+   <input type="submit" class="submit" name="action_bank_transfer_create" value="[% 'Create bank transfer' | $T8 %]">
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_created_de.html b/templates/webpages/sepa/bank_transfer_created_de.html
index 1e8bcc474..d71ae55b8 100644
--- a/templates/webpages/sepa/bank_transfer_created_de.html
+++ b/templates/webpages/sepa/bank_transfer_created_de.html
@@ -1,23 +1,24 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  Der SEPA-Export wurde erstellt
+  [% 'The SEPA export has been created.' | $T8 %]
  </p>
 
  <p>
   <ul>
    <li>
     <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]">
-     SEPA-XML-Exportdatei herunterladen
+     [% 'Download SEPA XML export file' | $T8 %]
     </a>
    </li>
 
    <li>
     <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1">
-     Noch nicht ausgeführte SEPA-Exporte anzeigen
+     [% 'List open SEPA exports' | $T8 %]
     </a>
    </li>
   </ul>
diff --git a/templates/webpages/sepa/bank_transfer_created_master.html b/templates/webpages/sepa/bank_transfer_created_master.html
index a782ada92..d71ae55b8 100644
--- a/templates/webpages/sepa/bank_transfer_created_master.html
+++ b/templates/webpages/sepa/bank_transfer_created_master.html
@@ -1,23 +1,24 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
  <p><div class="listtop">[% title %]</div></p>
 
  <p>
-  <translate>The SEPA export has been created.</translate>
+  [% 'The SEPA export has been created.' | $T8 %]
  </p>
 
  <p>
   <ul>
    <li>
     <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]">
-     <translate>Download SEPA XML export file</translate>
+     [% 'Download SEPA XML export file' | $T8 %]
     </a>
    </li>
 
    <li>
     <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1">
-     <translate>List open SEPA exports</translate>
+     [% 'List open SEPA exports' | $T8 %]
     </a>
    </li>
   </ul>
diff --git a/templates/webpages/sepa/bank_transfer_edit_de.html b/templates/webpages/sepa/bank_transfer_edit_de.html
index ee43bd5e7..28b17edf5 100644
--- a/templates/webpages/sepa/bank_transfer_edit_de.html
+++ b/templates/webpages/sepa/bank_transfer_edit_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
 <body>
@@ -13,21 +14,21 @@
      [%- IF show_post_payments_button %]
       <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
      [%- END %]
-     <th class="listheading">Rechnung</th>
-     <th class="listheading">Lieferant</th>
-     <th class="listheading" colspan="2">Quellkonto</th>
-     <th class="listheading" colspan="2">Zielkonto</th>
-     <th class="listheading" align="right">Betrag</th>
-     <th class="listheading">Referenz</th>
-     <th class="listheading" align="right">Gewünschtes Ausführungsdatum</th>
-     <th class="listheading" align="right">Ausführungsdatum</th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Target bank account' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading">[% 'Reference' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
     </tr>
     <tr>
      <th class="listheading" colspan="[% IF show_post_payments_button %]3[% ELSE %]2[% END %]">&nbsp;</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
-     <th class="listheading">IBAN</th>
-     <th class="listheading">BIC</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
      [%- IF show_post_payments_button %]
       <th class="listheading" colspan="3">&nbsp;</th>
       <th class="listheading">
@@ -65,7 +66,7 @@
        [%- IF item.executed %]
         [% HTML.escape(item.execution_date) %]
        [%- ELSIF item.export_closed %]
-        nicht ausgeführt
+        [% 'not executed' | $T8 %]
        [%- ELSE %]
         <input name="items[].execution_date" id="execution_date_[% loop.count %]" size="11"
                value="[% IF item.requested_execution_date %][% HTML.escape(item.requested_execution_date) %][% ELSE %][% HTML.escape(current_date) %][% END %]">
@@ -81,7 +82,7 @@
 
   [%- IF show_post_payments_button %]
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="Zahlungen buchen">
+   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="[% 'Post payments' | $T8 %]">
   </p>
 
   <script type="text/javascript" src="js/jquery.js"></script>
@@ -124,7 +125,7 @@
 
   [%- ELSE %]
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="Zahlungsliste als PDF">
+   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="[% 'Payment list as PDF' | $T8 %]">
   </p>
 
    [%- FOREACH item = export.items %]
diff --git a/templates/webpages/sepa/bank_transfer_edit_master.html b/templates/webpages/sepa/bank_transfer_edit_master.html
index 5cfe88cd9..28b17edf5 100644
--- a/templates/webpages/sepa/bank_transfer_edit_master.html
+++ b/templates/webpages/sepa/bank_transfer_edit_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
 <body>
@@ -13,21 +14,21 @@
      [%- IF show_post_payments_button %]
       <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
      [%- END %]
-     <th class="listheading"><translate>Invoice</translate></th>
-     <th class="listheading"><translate>Vendor</translate></th>
-     <th class="listheading" colspan="2"><translate>Source bank account</translate></th>
-     <th class="listheading" colspan="2"><translate>Target bank account</translate></th>
-     <th class="listheading" align="right"><translate>Amount</translate></th>
-     <th class="listheading"><translate>Reference</translate></th>
-     <th class="listheading" align="right"><translate>Requested execution date</translate></th>
-     <th class="listheading" align="right"><translate>Execution date</translate></th>
+     <th class="listheading">[% 'Invoice' | $T8 %]</th>
+     <th class="listheading">[% 'Vendor' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Target bank account' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading">[% 'Reference' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
     </tr>
     <tr>
      <th class="listheading" colspan="[% IF show_post_payments_button %]3[% ELSE %]2[% END %]">&nbsp;</th>
-     <th class="listheading"><translate>IBAN</translate></th>
-     <th class="listheading"><translate>BIC</translate></th>
-     <th class="listheading"><translate>IBAN</translate></th>
-     <th class="listheading"><translate>BIC</translate></th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
+     <th class="listheading">[% 'IBAN' | $T8 %]</th>
+     <th class="listheading">[% 'BIC' | $T8 %]</th>
      [%- IF show_post_payments_button %]
       <th class="listheading" colspan="3">&nbsp;</th>
       <th class="listheading">
@@ -65,7 +66,7 @@
        [%- IF item.executed %]
         [% HTML.escape(item.execution_date) %]
        [%- ELSIF item.export_closed %]
-        <translate>not executed</translate>
+        [% 'not executed' | $T8 %]
        [%- ELSE %]
         <input name="items[].execution_date" id="execution_date_[% loop.count %]" size="11"
                value="[% IF item.requested_execution_date %][% HTML.escape(item.requested_execution_date) %][% ELSE %][% HTML.escape(current_date) %][% END %]">
@@ -81,7 +82,7 @@
 
   [%- IF show_post_payments_button %]
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="<translate>Post payments</translate>">
+   <input type="submit" class="submit" name="action_bank_transfer_post_payments" value="[% 'Post payments' | $T8 %]">
   </p>
 
   <script type="text/javascript" src="js/jquery.js"></script>
@@ -124,7 +125,7 @@
 
   [%- ELSE %]
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="<translate>Payment list as PDF</translate>">
+   <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="[% 'Payment list as PDF' | $T8 %]">
   </p>
 
    [%- FOREACH item = export.items %]
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom_de.html b/templates/webpages/sepa/bank_transfer_list_bottom_de.html
index c3c429811..79f373f2c 100644
--- a/templates/webpages/sepa/bank_transfer_list_bottom_de.html
+++ b/templates/webpages/sepa/bank_transfer_list_bottom_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 [%- IF show_buttons %]
@@ -5,9 +6,9 @@
  <input type="hidden" name="mode" value="multi">
 
  <p>
-  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="SEPA-XML-Download">
-  <input type="submit" class="submit" name="action_bank_transfer_edit" value="Zahlungen buchen">
-  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="Abschließen">
+  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="[% 'SEPA XML download' | $T8 %]">
+  <input type="submit" class="submit" name="action_bank_transfer_edit" value="[% 'Post payments' | $T8 %]">
+  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="[% 'Mark as closed' | $T8 %]">
  </p>
 
  <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom_master.html b/templates/webpages/sepa/bank_transfer_list_bottom_master.html
index 2ddba09f3..79f373f2c 100644
--- a/templates/webpages/sepa/bank_transfer_list_bottom_master.html
+++ b/templates/webpages/sepa/bank_transfer_list_bottom_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 
 [%- IF show_buttons %]
@@ -5,9 +6,9 @@
  <input type="hidden" name="mode" value="multi">
 
  <p>
-  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="<translate>SEPA XML download</translate>">
-  <input type="submit" class="submit" name="action_bank_transfer_edit" value="<translate>Post payments</translate>">
-  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="<translate>Mark as closed</translate>">
+  <input type="submit" class="submit" name="action_bank_transfer_download_sepa_xml" value="[% 'SEPA XML download' | $T8 %]">
+  <input type="submit" class="submit" name="action_bank_transfer_edit" value="[% 'Post payments' | $T8 %]">
+  <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step1" value="[% 'Mark as closed' | $T8 %]">
  </p>
 
  <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html
index d18c53a89..eac1a5508 100644
--- a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html
+++ b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -5,11 +6,11 @@
 
  <form action="sepa.pl" method="post">
   <p>
-   Wollen Sie wirklich die folgenden SEPA-Exporte abschließen? Für Überweisungen, die noch nicht gebucht wurden, werden dann keine Zahlungen verbucht.
+   [% 'Do you really want to close the following SEPA exports? No payment will be recorded for bank transfers that haven't been marked as executed yet.' | $T8 %]
   </p>
 
   <p>
-   SEPA-Exporte:
+   [% 'SEPA exports:' | $T8 %]
    [%- FOREACH id = OPEN_EXPORT_IDS %]
     [%- UNLESS loop.first %], [%- END %]
     <input type="hidden" name="open_export_ids[]" value="[% HTML.escape(id) %]">
@@ -18,8 +19,8 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="Abschließen">
-   <input type="button" class="submit" value="Zurück" onclick="history.back()">
+   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="[% 'Mark as closed' | $T8 %]">
+   <input type="button" class="submit" value="[% 'Back' | $T8 %]" onclick="history.back()">
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
index f2c98a9f0..eac1a5508 100644
--- a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
+++ b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -5,13 +6,11 @@
 
  <form action="sepa.pl" method="post">
   <p>
-   <translate>Do you really want to close the following SEPA exports?
-    No payment will be recorded for bank transfers that haven't been
-    marked as executed yet.</translate>
+   [% 'Do you really want to close the following SEPA exports? No payment will be recorded for bank transfers that haven't been marked as executed yet.' | $T8 %]
   </p>
 
   <p>
-   <translate>SEPA exports:</translate>
+   [% 'SEPA exports:' | $T8 %]
    [%- FOREACH id = OPEN_EXPORT_IDS %]
     [%- UNLESS loop.first %], [%- END %]
     <input type="hidden" name="open_export_ids[]" value="[% HTML.escape(id) %]">
@@ -20,8 +19,8 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="<translate>Mark as closed</translate>">
-   <input type="button" class="submit" value="<translate>Back</translate>" onclick="history.back()">
+   <input type="submit" class="submit" name="action_bank_transfer_mark_as_closed_step2" value="[% 'Mark as closed' | $T8 %]">
+   <input type="button" class="submit" value="[% 'Back' | $T8 %]" onclick="history.back()">
   </p>
 
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_search_de.html b/templates/webpages/sepa/bank_transfer_search_de.html
index b53ddcb29..306179fe5 100644
--- a/templates/webpages/sepa/bank_transfer_search_de.html
+++ b/templates/webpages/sepa/bank_transfer_search_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -7,73 +8,73 @@
   <p>
    <table>
     <tr>
-     <td align="right">Lieferant</td>
+     <td align="right">[% 'Vendor' | $T8 %]</td>
      <td><input name="f_vendor"></td>
     </tr>
 
     <tr>
-     <td align="right">Rechnungsnummer</td>
+     <td align="right">[% 'Invoice number' | $T8 %]</td>
      <td><input name="f_invnumber"></td>
     </tr>
 
     <tr>
-     <td align="right">Exportdatum von</td>
+     <td align="right">[% 'Export date from' | $T8 %]</td>
      <td>
       <input name="f_export_date_from" id="f_export_date_from" size="11">
       <input type="button" name="f_export_date_from_trigger" id="f_export_date_from_trigger" value="?">
-      bis
+      [% 'to (time)' | $T8 %]
       <input name="f_export_date_to" id="f_export_date_to" size="11">
       <input type="button" name="f_export_date_to_trigger" id="f_export_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right">Gewünschtes Ausführungsdatum von</td>
+     <td align="right">[% 'Requested execution date from' | $T8 %]</td>
      <td>
       <input name="f_requested_execution_date_from" id="f_requested_execution_date_from" size="11">
       <input type="button" name="f_requested_execution_date_from_trigger" id="f_requested_execution_date_from_trigger" value="?">
-      bis
+      [% 'to (time)' | $T8 %]
       <input name="f_requested_execution_date_to" id="f_requested_execution_date_to" size="11">
       <input type="button" name="f_requested_execution_date_to_trigger" id="f_requested_execution_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right">Ausführungsdatum von</td>
+     <td align="right">[% 'Execution date from' | $T8 %]</td>
      <td>
       <input name="f_execution_date_from" id="f_execution_date_from" size="11">
       <input type="button" name="f_execution_date_from_trigger" id="f_execution_date_from_trigger" value="?">
-      bis
+      [% 'to (time)' | $T8 %]
       <input name="f_execution_date_to" id="f_execution_date_to" size="11">
       <input type="button" name="f_execution_date_to_trigger" id="f_execution_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right" valign="top">In Bericht aufnehmen</td>
+     <td align="right" valign="top">[% 'Include in Report' | $T8 %]</td>
      <td valign="top">
       <table>
        <tr>
         <td>
          <input type="checkbox" name="l_open" id="l_open" value="1" checked>
-         <label for="l_open">Offen</label>
+         <label for="l_open">[% 'open' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="l_closed" id="l_closed" value="1">
-         <label for="l_closed">geschlossen</label>
+         <label for="l_closed">[% 'closed' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
-         <label for="l_not_executed">Noch nicht ausgeführt</label>
+         <label for="l_not_executed">[% 'not yet executed' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
-         <label for="l_executed">ausgeführt</label>
+         <label for="l_executed">[% 'executed' | $T8 %]</label>
         </td>
        </tr>
       </table>
@@ -85,7 +86,7 @@
 
   <p>
    <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_bank_transfer_list" value="Weiter">
+   <input type="submit" class="submit" name="action_bank_transfer_list" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/sepa/bank_transfer_search_master.html b/templates/webpages/sepa/bank_transfer_search_master.html
index 8a4beb507..306179fe5 100644
--- a/templates/webpages/sepa/bank_transfer_search_master.html
+++ b/templates/webpages/sepa/bank_transfer_search_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]
 <body>
 
@@ -7,73 +8,73 @@
   <p>
    <table>
     <tr>
-     <td align="right"><translate>Vendor</translate></td>
+     <td align="right">[% 'Vendor' | $T8 %]</td>
      <td><input name="f_vendor"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Invoice number</translate></td>
+     <td align="right">[% 'Invoice number' | $T8 %]</td>
      <td><input name="f_invnumber"></td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Export date from</translate></td>
+     <td align="right">[% 'Export date from' | $T8 %]</td>
      <td>
       <input name="f_export_date_from" id="f_export_date_from" size="11">
       <input type="button" name="f_export_date_from_trigger" id="f_export_date_from_trigger" value="?">
-      <translate>to (time)</translate>
+      [% 'to (time)' | $T8 %]
       <input name="f_export_date_to" id="f_export_date_to" size="11">
       <input type="button" name="f_export_date_to_trigger" id="f_export_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Requested execution date from</translate></td>
+     <td align="right">[% 'Requested execution date from' | $T8 %]</td>
      <td>
       <input name="f_requested_execution_date_from" id="f_requested_execution_date_from" size="11">
       <input type="button" name="f_requested_execution_date_from_trigger" id="f_requested_execution_date_from_trigger" value="?">
-      <translate>to (time)</translate>
+      [% 'to (time)' | $T8 %]
       <input name="f_requested_execution_date_to" id="f_requested_execution_date_to" size="11">
       <input type="button" name="f_requested_execution_date_to_trigger" id="f_requested_execution_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right"><translate>Execution date from</translate></td>
+     <td align="right">[% 'Execution date from' | $T8 %]</td>
      <td>
       <input name="f_execution_date_from" id="f_execution_date_from" size="11">
       <input type="button" name="f_execution_date_from_trigger" id="f_execution_date_from_trigger" value="?">
-      <translate>to (time)</translate>
+      [% 'to (time)' | $T8 %]
       <input name="f_execution_date_to" id="f_execution_date_to" size="11">
       <input type="button" name="f_execution_date_to_trigger" id="f_execution_date_to_trigger" value="?">
      </td>
     </tr>
 
     <tr>
-     <td align="right" valign="top"><translate>Include in Report</translate></td>
+     <td align="right" valign="top">[% 'Include in Report' | $T8 %]</td>
      <td valign="top">
       <table>
        <tr>
         <td>
          <input type="checkbox" name="l_open" id="l_open" value="1" checked>
-         <label for="l_open"><translate>open</translate></label>
+         <label for="l_open">[% 'open' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="l_closed" id="l_closed" value="1">
-         <label for="l_closed"><translate>closed</translate></label>
+         <label for="l_closed">[% 'closed' | $T8 %]</label>
         </td>
        </tr>
 
        <tr>
         <td>
          <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
-         <label for="l_not_executed"><translate>not yet executed</translate></label>
+         <label for="l_not_executed">[% 'not yet executed' | $T8 %]</label>
         </td>
 
         <td>
          <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
-         <label for="l_executed"><translate>executed</translate></label>
+         <label for="l_executed">[% 'executed' | $T8 %]</label>
         </td>
        </tr>
       </table>
@@ -85,7 +86,7 @@
 
   <p>
    <input type="hidden" name="action" value="dispatcher">
-   <input type="submit" class="submit" name="action_bank_transfer_list" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action_bank_transfer_list" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/todo/show_todo_list_de.html b/templates/webpages/todo/show_todo_list_de.html
index 8768e9129..8d6a137df 100644
--- a/templates/webpages/todo/show_todo_list_de.html
+++ b/templates/webpages/todo/show_todo_list_de.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="listtop" style="margin-bottom: 10px">Ihre Aufgabenliste</div>
+ <div class="listtop" style="margin-bottom: 10px">[% 'Your TODO list' | $T8 %]</div>
 
  [%- IF !todo_list %]
  <p>
-  Ihre Aufgabenliste enth&auml;lt momentan keine Eintr&auml;ge.
+  [% 'There are no items on your TODO list at the moment.' | $T8 %]
  </p>
 
  [%- ELSE %]
diff --git a/templates/webpages/todo/show_todo_list_master.html b/templates/webpages/todo/show_todo_list_master.html
index ebf036357..8d6a137df 100644
--- a/templates/webpages/todo/show_todo_list_master.html
+++ b/templates/webpages/todo/show_todo_list_master.html
@@ -1,10 +1,11 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="listtop" style="margin-bottom: 10px"><translate>Your TODO list</translate></div>
+ <div class="listtop" style="margin-bottom: 10px">[% 'Your TODO list' | $T8 %]</div>
 
  [%- IF !todo_list %]
  <p>
-  <translate>There are no items on your TODO list at the moment.</translate>
+  [% 'There are no items on your TODO list at the moment.' | $T8 %]
  </p>
 
  [%- ELSE %]
diff --git a/templates/webpages/ustva/config_step1_de.html b/templates/webpages/ustva/config_step1_de.html
index aa14665d7..0d1a74ac3 100644
--- a/templates/webpages/ustva/config_step1_de.html
+++ b/templates/webpages/ustva/config_step1_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step1_master.html
  and run locale/<cc>/locales.pl -->
@@ -6,72 +7,72 @@
 <form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
 <table width="100%">
    <tr>
-      <th class="listtop">Finanzamt - Einstellungen</th>
+      <th class="listtop">[% 'Tax Office Preferences' | $T8 %]</th>
     </tr>
     <tr>
      <td>
        <br />
 [%- IF COA_Germany %]
        <fieldset>
-       <legend><b>Angaben zum Finanzamt</b></legend>
+       <legend><b>[% 'Local Tax Office Preferences' | $T8 %]</b></legend>
        <br />
        [% select_tax_office %]
        </fieldset>
        <br />
 [%- END %]
        <fieldset>
-       <legend><b>Versteuerungs Verfahren</b>
+       <legend><b>[% 'Taxation' | $T8 %]</b>
        </legend>
        <input name="method" id="accrual" class="radio" type="radio" value="accrual"
          [% checked_accrual %]>
-       <label for="accrual">Bilanzierung (Soll-Versteuerung)</label>
+       <label for="accrual">[% 'accrual' | $T8 %]</label>
        <br>
        <input name="method" id="cash" class="radio" type="radio" value="cash"
          [% checked_cash %]>
-       <label for="cash">E/Ü-Rechnung (Ist-Versteuerung)</label>
+       <label for="cash">[% 'cash' | $T8 %]</label>
        </fieldset>
        <br>
        <fieldset>
-       <legend><b>Voranmeldungszeitraum</b>
+       <legend><b>[% 'Tax Period' | $T8 %]</b>
        </legend>
 
 
            <input name=FA_voranmeld id=month class=radio type=radio value="month"
              [% checked_monthly %]>
-           <label for="month">Monatliche Abgabe</label>
+           <label for="month">[% 'month' | $T8 %]</label>
            <br>
            <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
              [% checked_quarterly %]>
-           <label for="quarter">Vierteljährliche (quartalsweise) Abgabe</label>
+           <label for="quarter">[% 'quarter' | $T8 %]</label>
            <br>
            <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
              [% checked_dauerfristverlaengerung %]>
-           <label for="">Dauerfristverlängerung</label>
+           <label for="">[% 'Extension Of Time' | $T8 %]</label>
 
            </fieldset>
            <br>
            <fieldset>
-           <legend><b>Steuerberater/-in</b>
+           <legend><b>[% 'Tax Consultant' | $T8 %]</b>
            </legend>
           <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
              [% checked_kz_71 %]>
-           <label for="FA_71">Verrechnung des Erstattungsbetrages erwünscht (Zeile 71)
+           <label for="FA_71">[% 'Clearing Tax Received (No 71)' | $T8 %]
     .      </label>
            <br>
            <br>-->
            <table>
            <tr>
            <td>
-           Name
+           [% 'Name' | $T8 %]
            </td>
            <td>
-           Straße
+           [% 'Street' | $T8 %]
            </td>
            <td>
-           PLZ, Ort
+           [% 'Zip, City' | $T8 %]
            </td>
            <td>
-           Telefon
+           [% 'Telephone' | $T8 %]
            </td>
            </tr>
            <tr>
@@ -99,9 +100,9 @@
            <br>
            <hr>
            <!--<input type=submit class=submit name=action value="
-           Debug">-->
+           [% 'debug' | $T8 %]">-->
            <input type=submit class=submit name=action
-             value="weiter">
+             value="[% 'continue' | $T8 %]">
          </td>
        </tr>
      </table>
diff --git a/templates/webpages/ustva/config_step1_master.html b/templates/webpages/ustva/config_step1_master.html
index 6b827b4fc..0d1a74ac3 100644
--- a/templates/webpages/ustva/config_step1_master.html
+++ b/templates/webpages/ustva/config_step1_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step1_master.html
  and run locale/<cc>/locales.pl -->
@@ -6,72 +7,72 @@
 <form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
 <table width="100%">
    <tr>
-      <th class="listtop"><translate>Tax Office Preferences</translate></th>
+      <th class="listtop">[% 'Tax Office Preferences' | $T8 %]</th>
     </tr>
     <tr>
      <td>
        <br />
 [%- IF COA_Germany %]
        <fieldset>
-       <legend><b><translate>Local Tax Office Preferences</translate></b></legend>
+       <legend><b>[% 'Local Tax Office Preferences' | $T8 %]</b></legend>
        <br />
        [% select_tax_office %]
        </fieldset>
        <br />
 [%- END %]
        <fieldset>
-       <legend><b><translate>Taxation</translate></b>
+       <legend><b>[% 'Taxation' | $T8 %]</b>
        </legend>
        <input name="method" id="accrual" class="radio" type="radio" value="accrual"
          [% checked_accrual %]>
-       <label for="accrual"><translate>accrual</translate></label>
+       <label for="accrual">[% 'accrual' | $T8 %]</label>
        <br>
        <input name="method" id="cash" class="radio" type="radio" value="cash"
          [% checked_cash %]>
-       <label for="cash"><translate>cash</translate></label>
+       <label for="cash">[% 'cash' | $T8 %]</label>
        </fieldset>
        <br>
        <fieldset>
-       <legend><b><translate>Tax Period</translate></b>
+       <legend><b>[% 'Tax Period' | $T8 %]</b>
        </legend>
 
 
            <input name=FA_voranmeld id=month class=radio type=radio value="month"
              [% checked_monthly %]>
-           <label for="month"><translate>month</translate></label>
+           <label for="month">[% 'month' | $T8 %]</label>
            <br>
            <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
              [% checked_quarterly %]>
-           <label for="quarter"><translate>quarter</translate></label>
+           <label for="quarter">[% 'quarter' | $T8 %]</label>
            <br>
            <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
              [% checked_dauerfristverlaengerung %]>
-           <label for=""><translate>Extension Of Time</translate></label>
+           <label for="">[% 'Extension Of Time' | $T8 %]</label>
 
            </fieldset>
            <br>
            <fieldset>
-           <legend><b><translate>Tax Consultant</translate></b>
+           <legend><b>[% 'Tax Consultant' | $T8 %]</b>
            </legend>
           <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
              [% checked_kz_71 %]>
-           <label for="FA_71"><translate>Clearing Tax Received (No 71)</translate>
+           <label for="FA_71">[% 'Clearing Tax Received (No 71)' | $T8 %]
     .      </label>
            <br>
            <br>-->
            <table>
            <tr>
            <td>
-           <translate>Name</translate>
+           [% 'Name' | $T8 %]
            </td>
            <td>
-           <translate>Street</translate>
+           [% 'Street' | $T8 %]
            </td>
            <td>
-           <translate>Zip, City</translate>
+           [% 'Zip, City' | $T8 %]
            </td>
            <td>
-           <translate>Telephone</translate>
+           [% 'Telephone' | $T8 %]
            </td>
            </tr>
            <tr>
@@ -99,9 +100,9 @@
            <br>
            <hr>
            <!--<input type=submit class=submit name=action value="
-           <translate>debug</translate>">-->
+           [% 'debug' | $T8 %]">-->
            <input type=submit class=submit name=action
-             value="<translate>continue</translate>">
+             value="[% 'continue' | $T8 %]">
          </td>
        </tr>
      </table>
diff --git a/templates/webpages/ustva/config_step2_de.html b/templates/webpages/ustva/config_step2_de.html
index d6c5d1f96..c8a5a8e56 100644
--- a/templates/webpages/ustva/config_step2_de.html
+++ b/templates/webpages/ustva/config_step2_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step2_master.html
  and run locale/<cc>/locales.pl -->
@@ -8,7 +9,7 @@
     <table width="100%">
        <tr>
          <th colspan="2" class="listtop">
-           Finanzamt - Einstellungen</th>
+           [% 'Tax Office Preferences' | $T8 %]</th>
        </tr>
        <tr>
          <td colspan=2>
@@ -17,7 +18,7 @@
            <br>
            <fieldset>
              <legend>
-               <font size="+1">Finanzamt
+               <font size="+1">[% 'Tax Office' | $T8 %]
                [% HTML.escape(FA_Name) %]</font>
              </legend>
              <table width="100%" valign="top">
@@ -26,12 +27,12 @@
                     <br>
                     <fieldset>
                       <legend>
-                      <b>Adresse</b>
+                      <b>[% 'Address' | $T8 %]</b>
                       </legend>
                       <table width="100%">
                         <tr>
                           <td>
-                            Finanzamt
+                            [% 'Tax Office' | $T8 %]
                           </td>
                         </tr>
                         <tr>
@@ -61,19 +62,19 @@
                     <br>
                     <fieldset>
                       <legend>
-                        <b>Kontakt</b>
+                        <b>[% 'Contact' | $T8 %]</b>
                       </legend>
-                        Telefon<br>
+                        [% 'Telephone' | $T8 %]<br>
                         <input name="FA_Telefon" size="40" title="FA_Telefon"
                           value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
                         <br>
                         <br>
-                        Fax<br>
+                        [% 'Fax' | $T8 %]<br>
                         <input name="FA_Fax" size="40" title="FA_Fax"
                           value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
                         <br>
                         <br>
-                        Internet<br>
+                        [% 'Internet' | $T8 %]<br>
                         <input name="FA_Email" size="40" title="FA_Email"
                           value="[% HTML.escape(FA_Email) %]" [% readonly %]>
                         <br>
@@ -87,7 +88,7 @@
                     <br>
                     <fieldset>
                     <legend>
-                    <b>Öffnungszeiten</b>
+                    <b>[% 'Openings' | $T8 %]</b>
                     </legend>
                     <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
                       [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
@@ -95,42 +96,42 @@
                     <br>
                       <fieldset>
                       <legend>
-                        <b>Bankverbindung des Finanzamts</b>
+                        <b>[% 'Bank Connection Tax Office' | $T8 %]</b>
                       <legend>
                       <table>
                       <tr>
                         <td width="40%">
-                          Bank
+                          [% 'Bank' | $T8 %]
                           <br>
                           <input name="FA_Bankbezeichnung_1" size="30"
                             value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
                           <br>
                           <br>
-                          Kontonummer
+                          [% 'Account Nummer' | $T8 %]
                           <br>
                           <input name="FA_Kontonummer_1" size="15"
                             value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
                           <br>
                           <br>
-                          Bankleitzahl (BLZ)
+                          [% 'Bank Code (long)' | $T8 %]
                           <br>
                           <input name="FA_BLZ_1" size="15"
                             value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
                         </td>
                         <td width="40%">
-                          Bank
+                          [% 'Bank' | $T8 %]
                           <br>
                           <input name="FA_Bankbezeichnung_oertlich" size="30"
                             value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
                           <br>
                           <br>
-                          Kontonummer
+                          [% 'Account Nummer' | $T8 %]
                           <br>
                           <input name="FA_Kontonummer_2" size="15"
                             value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
                           <br>
                           <br>
-                          Bankleitzahl (BLZ)
+                          [% 'Bank Code (long)' | $T8 %]
                           <br>
                           <input name="FA_BLZ_2" size="15"
                             value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
@@ -152,15 +153,14 @@
            <br>
            <fieldset>
            <legend>
-           <font size="+1">Steuernummer</font>
+           <font size="+1">[% 'Tax Number' | $T8 %]</font>
            </legend>
            <br>
 [%- IF COA_Germany %]
            [% input_steuernummer %]
 [%- ELSE %]
-Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul
-  angeben.
-Aktueller Wert: [% HTML.escape(myconfig_taxnumber) %]
+[% 'Please enter the taxnumber in the administration menu userpreferences' | $T8 %]
+[% 'Current value:' | $T8 %] [% HTML.escape(myconfig_taxnumber) %]
 [%- END %]
 
 
@@ -175,25 +175,26 @@ Aktueller Wert: [% HTML.escape(myconfig_taxnumber) %]
          <td align="left">
 
           [%- IF callback %]
-           <input type="button" name="Verweis" value="Benutzereinstellungen"
+           <input type="button" name="Verweis" value="[% 'User Config' | $T8 %]"
             onClick="self.location.href='[% callback %]">
           [%- ELSE %]
-            <input type="submit" class="submit" name="action" value="zurück">
+            <input type="submit" class="submit" name="action" value="[% 'back' | $T8 %]">
           [%- END %]
 
           [%- IF warnung %]
 
             <input type="hidden" name="nextsub" value="config_step2">
             <input type="submit" class="submit" name="action"
-              value="weiter">
+              value="[% 'continue' | $T8 %]">
 
-            <input type="hidden" name="saved" value="Bitte Angaben überprüfen">
+            <input type="hidden" name="saved" value="[% 'Check
+              Details' | $T8 %]">
 
           [%- ELSE %]
 
             <input type="hidden" name="nextsub" value="save">
             <input type="hidden" name="filename" value="finanzamt.ini">
-            <input type="submit" class="submit" name="action" value="Speichern">
+            <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
 
           [%- END %]
 
diff --git a/templates/webpages/ustva/config_step2_master.html b/templates/webpages/ustva/config_step2_master.html
index d0536f634..c8a5a8e56 100644
--- a/templates/webpages/ustva/config_step2_master.html
+++ b/templates/webpages/ustva/config_step2_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step2_master.html
  and run locale/<cc>/locales.pl -->
@@ -8,7 +9,7 @@
     <table width="100%">
        <tr>
          <th colspan="2" class="listtop">
-           <translate>Tax Office Preferences</translate></th>
+           [% 'Tax Office Preferences' | $T8 %]</th>
        </tr>
        <tr>
          <td colspan=2>
@@ -17,7 +18,7 @@
            <br>
            <fieldset>
              <legend>
-               <font size="+1"><translate>Tax Office</translate>
+               <font size="+1">[% 'Tax Office' | $T8 %]
                [% HTML.escape(FA_Name) %]</font>
              </legend>
              <table width="100%" valign="top">
@@ -26,12 +27,12 @@
                     <br>
                     <fieldset>
                       <legend>
-                      <b><translate>Address</translate></b>
+                      <b>[% 'Address' | $T8 %]</b>
                       </legend>
                       <table width="100%">
                         <tr>
                           <td>
-                            <translate>Tax Office</translate>
+                            [% 'Tax Office' | $T8 %]
                           </td>
                         </tr>
                         <tr>
@@ -61,19 +62,19 @@
                     <br>
                     <fieldset>
                       <legend>
-                        <b><translate>Contact</translate></b>
+                        <b>[% 'Contact' | $T8 %]</b>
                       </legend>
-                        <translate>Telephone</translate><br>
+                        [% 'Telephone' | $T8 %]<br>
                         <input name="FA_Telefon" size="40" title="FA_Telefon"
                           value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
                         <br>
                         <br>
-                        <translate>Fax</translate><br>
+                        [% 'Fax' | $T8 %]<br>
                         <input name="FA_Fax" size="40" title="FA_Fax"
                           value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
                         <br>
                         <br>
-                        <translate>Internet</translate><br>
+                        [% 'Internet' | $T8 %]<br>
                         <input name="FA_Email" size="40" title="FA_Email"
                           value="[% HTML.escape(FA_Email) %]" [% readonly %]>
                         <br>
@@ -87,7 +88,7 @@
                     <br>
                     <fieldset>
                     <legend>
-                    <b><translate>Openings</translate></b>
+                    <b>[% 'Openings' | $T8 %]</b>
                     </legend>
                     <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
                       [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
@@ -95,42 +96,42 @@
                     <br>
                       <fieldset>
                       <legend>
-                        <b><translate>Bank Connection Tax Office</translate></b>
+                        <b>[% 'Bank Connection Tax Office' | $T8 %]</b>
                       <legend>
                       <table>
                       <tr>
                         <td width="40%">
-                          <translate>Bank</translate>
+                          [% 'Bank' | $T8 %]
                           <br>
                           <input name="FA_Bankbezeichnung_1" size="30"
                             value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
                           <br>
                           <br>
-                          <translate>Account Nummer</translate>
+                          [% 'Account Nummer' | $T8 %]
                           <br>
                           <input name="FA_Kontonummer_1" size="15"
                             value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
                           <br>
                           <br>
-                          <translate>Bank Code (long)</translate>
+                          [% 'Bank Code (long)' | $T8 %]
                           <br>
                           <input name="FA_BLZ_1" size="15"
                             value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
                         </td>
                         <td width="40%">
-                          <translate>Bank</translate>
+                          [% 'Bank' | $T8 %]
                           <br>
                           <input name="FA_Bankbezeichnung_oertlich" size="30"
                             value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
                           <br>
                           <br>
-                          <translate>Account Nummer</translate>
+                          [% 'Account Nummer' | $T8 %]
                           <br>
                           <input name="FA_Kontonummer_2" size="15"
                             value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
                           <br>
                           <br>
-                          <translate>Bank Code (long)</translate>
+                          [% 'Bank Code (long)' | $T8 %]
                           <br>
                           <input name="FA_BLZ_2" size="15"
                             value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
@@ -152,15 +153,14 @@
            <br>
            <fieldset>
            <legend>
-           <font size="+1"><translate>Tax Number</translate></font>
+           <font size="+1">[% 'Tax Number' | $T8 %]</font>
            </legend>
            <br>
 [%- IF COA_Germany %]
            [% input_steuernummer %]
 [%- ELSE %]
-<translate>Please enter the taxnumber in the administration menu user
-preferences</translate>
-<translate>Current value:</translate> [% HTML.escape(myconfig_taxnumber) %]
+[% 'Please enter the taxnumber in the administration menu userpreferences' | $T8 %]
+[% 'Current value:' | $T8 %] [% HTML.escape(myconfig_taxnumber) %]
 [%- END %]
 
 
@@ -175,26 +175,26 @@ preferences</translate>
          <td align="left">
 
           [%- IF callback %]
-           <input type="button" name="Verweis" value="<translate>User Config</translate>"
+           <input type="button" name="Verweis" value="[% 'User Config' | $T8 %]"
             onClick="self.location.href='[% callback %]">
           [%- ELSE %]
-            <input type="submit" class="submit" name="action" value="<translate>back</translate>">
+            <input type="submit" class="submit" name="action" value="[% 'back' | $T8 %]">
           [%- END %]
 
           [%- IF warnung %]
 
             <input type="hidden" name="nextsub" value="config_step2">
             <input type="submit" class="submit" name="action"
-              value="<translate>continue</translate>">
+              value="[% 'continue' | $T8 %]">
 
-            <input type="hidden" name="saved" value="<translate>Check
-              Details</translate>">
+            <input type="hidden" name="saved" value="[% 'Check
+              Details' | $T8 %]">
 
           [%- ELSE %]
 
             <input type="hidden" name="nextsub" value="save">
             <input type="hidden" name="filename" value="finanzamt.ini">
-            <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+            <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
 
           [%- END %]
 
diff --git a/templates/webpages/ustva/generic_taxreport_de.html b/templates/webpages/ustva/generic_taxreport_de.html
index bac661098..e5ee4900c 100644
--- a/templates/webpages/ustva/generic_taxreport_de.html
+++ b/templates/webpages/ustva/generic_taxreport_de.html
@@ -1,14 +1,15 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
-<h1>USTVA Bericht</h1>
-<p>Steuernummer: [% taxnumber %]</p>
-<p>Jahr: [% year %]</p>
-<p>Zeitraum: [% period %]</p>
+<h1>[% 'Generic Tax Report' | $T8 %]</h1>
+<p>[% 'Taxnumber' | $T8 %]: [% taxnumber %]</p>
+<p>[% 'Year' | $T8 %]: [% year %]</p>
+<p>[% 'Period' | $T8 %]: [% period %]</p>
 <br />
 <table width="33%">
   <tr>
-    <th>Position</th>
-    <th>Betrag</th>
+    <th>[% 'Tax Position' | $T8 %]</th>
+    <th>[% 'Amount' | $T8 %]</th>
   </tr>
 [% FOREACH row = USTVA %]
   <tr class="listrow[% loop.count % 2 %]">
diff --git a/templates/webpages/ustva/generic_taxreport_master.html b/templates/webpages/ustva/generic_taxreport_master.html
index faf3d96c8..e5ee4900c 100644
--- a/templates/webpages/ustva/generic_taxreport_master.html
+++ b/templates/webpages/ustva/generic_taxreport_master.html
@@ -1,14 +1,15 @@
+[%- USE T8 %]
 [% USE HTML %]<body>
 
-<h1><translate>Generic Tax Report</translate></h1>
-<p><translate>Taxnumber</translate>: [% taxnumber %]</p>
-<p><translate>Year</translate>: [% year %]</p>
-<p><translate>Period</translate>: [% period %]</p>
+<h1>[% 'Generic Tax Report' | $T8 %]</h1>
+<p>[% 'Taxnumber' | $T8 %]: [% taxnumber %]</p>
+<p>[% 'Year' | $T8 %]: [% year %]</p>
+<p>[% 'Period' | $T8 %]: [% period %]</p>
 <br />
 <table width="33%">
   <tr>
-    <th><translate>Tax Position</translate></th>
-    <th><translate>Amount</translate></th>
+    <th>[% 'Tax Position' | $T8 %]</th>
+    <th>[% 'Amount' | $T8 %]</th>
   </tr>
 [% FOREACH row = USTVA %]
   <tr class="listrow[% loop.count % 2 %]">
diff --git a/templates/webpages/ustva/report_de.html b/templates/webpages/ustva/report_de.html
index 624d292aa..a397e13fe 100644
--- a/templates/webpages/ustva/report_de.html
+++ b/templates/webpages/ustva/report_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/report_master.html
  and run locale/<cc>/locales.pl -->
@@ -19,7 +20,7 @@
           <td width="50%" align="left" valign="top">
             <fieldset>
             <legend>
-            <b>Firma</b>
+            <b>[% 'Company' | $T8 %]</b>
             </legend>
 
             [% company_given %]
@@ -27,10 +28,10 @@
 
             <br />
             <br />
-            Tel.:&nbsp;
+            [% 'Tel' | $T8 %].:&nbsp;
             [% HTML.escape(co_tel) %]
             <br />
-            Fax.:&nbsp;
+            [% 'Fax' | $T8 %].:&nbsp;
             [% HTML.escape(co_fax) %]
             <br />
             <br />
@@ -38,11 +39,11 @@
             <br />
             <br />
 
-            Steuernummer:&nbsp;
+            [% 'Tax Number' | $T8 %]:&nbsp;
 [%- IF COA_Germany %]
             [% taxnumber_given %]
             <br />
-            ELSTER-Steuernummer:&nbsp;
+            [% 'ELSTER Tax Number' | $T8 %]:&nbsp;
             [% HTML.escape(elstersteuernummer) %]
             <br />
             <br />
@@ -56,26 +57,26 @@
               <fieldset>
               <legend>
                 <input checked="checked"
-                 title="Beraterdaten in UStVA übernehmen?"
+                 title="[% 'Assume Tax Consultant Data in Tax Computation?' | $T8 %]"
                  name="FA_steuerberater"
                  id="steuerberater"
                  class="checkbox"
                  type="checkbox"
                  value="1" >
-                 &nbsp;<b>Steuerberater/-in</b>
+                 &nbsp;<b>[% 'Tax Consultant' | $T8 %]</b>
                 </legend>
 
                 [% HTML.escape(FA_steuerberater_name) %]<br />
                 [% HTML.escape(FA_steuerberater_street) %]<br />
                 [% HTML.escape(FA_steuerberater_city) %]<br />
-                Telefon [% HTML.escape(FA_steuerberater_tel) %]<br />
+                [% 'Tel.' | $T8 %] [% HTML.escape(FA_steuerberater_tel) %]<br />
               </fieldset>
               <br />
             [%- END %]
 
             <fieldset>
             <legend>
-            <b>Voranmeldungszeitraum</b>
+            <b>[% 'Tax Period' | $T8 %]</b>
             </legend>
             [% select_year %] [% ustva_vorauswahl %]
             [% checkbox_kz_10 %]
@@ -84,20 +85,20 @@
               <br />
               [% period_local %]
               [%- IF FA_dauerfrist %]
-                mit Dauerfristverlängerung
+                [% 'With Extension Of Time' | $T8 %]
               [%- END %]
               <br />
             [%- END %]
 
             [%- IF method_local %]
-              Verfahren: [% method_local %]
+              [% 'Method' | $T8 %]: [% method_local %]
             [%- END %]
             </fieldset>
           </td>
           <td width="50%" valign="top">
               <fieldset>
               <legend>
-                 <b>Finanzamt</b>
+                 <b>[% 'Tax Office' | $T8 %]</b>
               </legend>
               <h3>[% HTML.escape(FA_Name) %]</h3>
 
@@ -106,10 +107,10 @@
               [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
               <br>
               <br>
-              Tel.:&nbsp;
+              [% 'Tel' | $T8 %].:&nbsp;
               [% HTML.escape(FA_Telefon) %]
               <br>
-              Fax.:&nbsp;
+              [% 'Fax' | $T8 %].:&nbsp;
               [% HTML.escape(FA_Fax) %]
               <br>
               <br>
@@ -128,12 +129,12 @@
               </a>
               <br>
               <br>
-              Öffnungszeiten
+              [% 'Openings' | $T8 %]
               <br>
               [% openings %]
               <br>
               <br>
-              Bankverbindungen
+              [% 'Bank Connections' | $T8 %]
               <table>
               <tr>
 
@@ -141,10 +142,10 @@
                   <td width="40%">
                   [% HTML.escape(row.Bankbezeichnung) %]
                   <br>
-                  Konto:&nbsp;
+                  [% 'Account' | $T8 %]:&nbsp;
                   [% HTML.escape(row.Kontonummer) %]
                   <br>
-                  BLZ:&nbsp;
+                  [% 'Bank Code' | $T8 %]:&nbsp;
                   [% HTML.escape(row.BLZ) %]
                   </td>
               [%- END %]
@@ -158,13 +159,13 @@
 
               <fieldset>
               <legend>
-              <b>Ausgabeformat</b>
+              <b>[% 'Outputformat' | $T8 %]</b>
               </legend>
 [%- IF COA_Germany %]
               [% select_options %]
 [%- ELSE %]
               <SELECT name="format">
-                <option value="generic">Druckvorschau</option>
+                <option value="generic">[% 'Preview' | $T8 %]</option>
               </SELECT>
 [%- END %]
 
@@ -188,7 +189,7 @@
   <tr>
    <td align="left">
      <input type=hidden name=nextsub value=generate_ustva>
-     <input type=submit class=submit name=action value="Zeigen">
+     <input type=submit class=submit name=action value="[% 'Show' | $T8 %]">
    </td>
    <td align="right">
 
@@ -196,7 +197,7 @@
     <!--
       <form action="doc/ustva.html" method="get">
        <input type=submit class=submit name=action
-       value="Hilfe">
+       value="[% 'Help' | $T8 %]">
    </form>
     -->
    </td>
diff --git a/templates/webpages/ustva/report_master.html b/templates/webpages/ustva/report_master.html
index 0aab4a89f..a397e13fe 100644
--- a/templates/webpages/ustva/report_master.html
+++ b/templates/webpages/ustva/report_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/report_master.html
  and run locale/<cc>/locales.pl -->
@@ -19,7 +20,7 @@
           <td width="50%" align="left" valign="top">
             <fieldset>
             <legend>
-            <b><translate>Company</translate></b>
+            <b>[% 'Company' | $T8 %]</b>
             </legend>
 
             [% company_given %]
@@ -27,10 +28,10 @@
 
             <br />
             <br />
-            <translate>Tel</translate>.:&nbsp;
+            [% 'Tel' | $T8 %].:&nbsp;
             [% HTML.escape(co_tel) %]
             <br />
-            <translate>Fax</translate>.:&nbsp;
+            [% 'Fax' | $T8 %].:&nbsp;
             [% HTML.escape(co_fax) %]
             <br />
             <br />
@@ -38,11 +39,11 @@
             <br />
             <br />
 
-            <translate>Tax Number</translate>:&nbsp;
+            [% 'Tax Number' | $T8 %]:&nbsp;
 [%- IF COA_Germany %]
             [% taxnumber_given %]
             <br />
-            <translate>ELSTER Tax Number</translate>:&nbsp;
+            [% 'ELSTER Tax Number' | $T8 %]:&nbsp;
             [% HTML.escape(elstersteuernummer) %]
             <br />
             <br />
@@ -56,26 +57,26 @@
               <fieldset>
               <legend>
                 <input checked="checked"
-                 title="<translate>Assume Tax Consultant Data in Tax Computation?</translate>"
+                 title="[% 'Assume Tax Consultant Data in Tax Computation?' | $T8 %]"
                  name="FA_steuerberater"
                  id="steuerberater"
                  class="checkbox"
                  type="checkbox"
                  value="1" >
-                 &nbsp;<b><translate>Tax Consultant</translate></b>
+                 &nbsp;<b>[% 'Tax Consultant' | $T8 %]</b>
                 </legend>
 
                 [% HTML.escape(FA_steuerberater_name) %]<br />
                 [% HTML.escape(FA_steuerberater_street) %]<br />
                 [% HTML.escape(FA_steuerberater_city) %]<br />
-                <translate>Tel.</translate> [% HTML.escape(FA_steuerberater_tel) %]<br />
+                [% 'Tel.' | $T8 %] [% HTML.escape(FA_steuerberater_tel) %]<br />
               </fieldset>
               <br />
             [%- END %]
 
             <fieldset>
             <legend>
-            <b><translate>Tax Period</translate></b>
+            <b>[% 'Tax Period' | $T8 %]</b>
             </legend>
             [% select_year %] [% ustva_vorauswahl %]
             [% checkbox_kz_10 %]
@@ -84,20 +85,20 @@
               <br />
               [% period_local %]
               [%- IF FA_dauerfrist %]
-                <translate>With Extension Of Time</translate>
+                [% 'With Extension Of Time' | $T8 %]
               [%- END %]
               <br />
             [%- END %]
 
             [%- IF method_local %]
-              <translate>Method</translate>: [% method_local %]
+              [% 'Method' | $T8 %]: [% method_local %]
             [%- END %]
             </fieldset>
           </td>
           <td width="50%" valign="top">
               <fieldset>
               <legend>
-                 <b><translate>Tax Office</translate></b>
+                 <b>[% 'Tax Office' | $T8 %]</b>
               </legend>
               <h3>[% HTML.escape(FA_Name) %]</h3>
 
@@ -106,10 +107,10 @@
               [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
               <br>
               <br>
-              <translate>Tel</translate>.:&nbsp;
+              [% 'Tel' | $T8 %].:&nbsp;
               [% HTML.escape(FA_Telefon) %]
               <br>
-              <translate>Fax</translate>.:&nbsp;
+              [% 'Fax' | $T8 %].:&nbsp;
               [% HTML.escape(FA_Fax) %]
               <br>
               <br>
@@ -128,12 +129,12 @@
               </a>
               <br>
               <br>
-              <translate>Openings</translate>
+              [% 'Openings' | $T8 %]
               <br>
               [% openings %]
               <br>
               <br>
-              <translate>Bank Connections</translate>
+              [% 'Bank Connections' | $T8 %]
               <table>
               <tr>
 
@@ -141,10 +142,10 @@
                   <td width="40%">
                   [% HTML.escape(row.Bankbezeichnung) %]
                   <br>
-                  <translate>Account</translate>:&nbsp;
+                  [% 'Account' | $T8 %]:&nbsp;
                   [% HTML.escape(row.Kontonummer) %]
                   <br>
-                  <translate>Bank Code</translate>:&nbsp;
+                  [% 'Bank Code' | $T8 %]:&nbsp;
                   [% HTML.escape(row.BLZ) %]
                   </td>
               [%- END %]
@@ -158,13 +159,13 @@
 
               <fieldset>
               <legend>
-              <b><translate>Outputformat</translate></b>
+              <b>[% 'Outputformat' | $T8 %]</b>
               </legend>
 [%- IF COA_Germany %]
               [% select_options %]
 [%- ELSE %]
               <SELECT name="format">
-                <option value="generic"><translate>Preview</translate></option>
+                <option value="generic">[% 'Preview' | $T8 %]</option>
               </SELECT>
 [%- END %]
 
@@ -188,7 +189,7 @@
   <tr>
    <td align="left">
      <input type=hidden name=nextsub value=generate_ustva>
-     <input type=submit class=submit name=action value="<translate>Show</translate>">
+     <input type=submit class=submit name=action value="[% 'Show' | $T8 %]">
    </td>
    <td align="right">
 
@@ -196,7 +197,7 @@
     <!--
       <form action="doc/ustva.html" method="get">
        <input type=submit class=submit name=action
-       value="<translate>Help</translate>">
+       value="[% 'Help' | $T8 %]">
    </form>
     -->
    </td>
diff --git a/templates/webpages/wh/journal_filter_de.html b/templates/webpages/wh/journal_filter_de.html
index 725e7485b..83ba78b50 100644
--- a/templates/webpages/wh/journal_filter_de.html
+++ b/templates/webpages/wh/journal_filter_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -62,7 +63,7 @@
      -->
  </script>
 
- <div class="listtop">Bericht &uuml;ber Lagerbewegungen</div>
+ <div class="listtop">[% 'Report about wareouse transactions' | $T8 %]</div>
 
  <form method="post" name="Form" action="wh.pl">
 
@@ -71,14 +72,14 @@
   <p>
    <table>
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Filter</th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
     </tr>
 
     <tr>
      <td>
       <table>
        <tr>
-        <th align="right" nowrap>Lager:</th>
+        <th align="right" nowrap>[% 'Warehouse' | $T8 %]:</th>
         <td>
          <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
           <option value="">---</option>
@@ -89,24 +90,24 @@
         </td>
        </tr>
        <tr>
-        <th align="right" nowrap>Lagerplatz:</th>
+        <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
         <td><select name="bin_id" id="bin_id"></select></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Artikelnummer:</th>
+        <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
         <td><input name="partnumber" id="partnumber" size=20></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Artikelbeschreibung:</th>
+        <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
         <td><input name="description" size=40></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Chargennummer:</th>
+        <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
        [% IF conf_show_best_before %]
        <tr>
-        <th align="right" nowrap>Mindesthaltbarkeit:</th>
+        <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
         <td>
          <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -114,13 +115,13 @@
        </tr>
        [% END %]
        <tr>
-        <th align="right" nowrap>Umlagermenge:</th>
+        <th align="right" nowrap>[% 'Transfer Quantity' | $T8 %]:</th>
         <td>
          <select name="qty_op">
           <option value="dontcare">---</option>
-          <option value="atleast">Mindestens</option>
-          <option value="atmost">H&ouml;chstens</option>
-          <option value="exact">Genau</option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
          </select>
          <input name="qty">
          <select name="qty_unit">
@@ -129,14 +130,14 @@
         </td>
        </tr>
        <tr>
-        <th align="right" nowrap>Von</th>
+        <th align="right" nowrap>[% 'From Date' | $T8 %]</th>
         <td>
          <input name="fromdate" id="fromdate" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_fromdate" id="fromdate_trigger" value="?">
         </td>
        </tr>
        <tr>
-        <th align="right">Bis</th>
+        <th align="right">[% 'To Date' | $T8 %]</th>
         <td>
          <input name="todate" id="todate" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_todate" id="todate_trigger" value="?">
@@ -149,7 +150,7 @@
     <tr height="5"><td>&nbsp;</td></tr>
 
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>In Bericht aufnehmen</th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Include in Report' | $T8 %]</th>
     </tr>
 
     <tr>
@@ -157,47 +158,47 @@
       <table>
        <tr>
         <td><input name="l_partdescription" id="l_partdescription" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_partdescription">Artikelbeschreibung</label></td>
+        <td nowrap><label for="l_partdescription">[% 'Part Description' | $T8 %]</label></td>
         <td><input name="l_qty" id="l_qty" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_qty">Menge</label></td>
+        <td nowrap><label for="l_qty">[% 'Quantity' | $T8 %]</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_date" id="l_date" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_date">Datum</label></td>
+        <td nowrap><label for="l_date">[% 'Date' | $T8 %]</label></td>
         <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber">Artikelnummer</label></td>
+        <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber">Chargennummer</label></td>
+        <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
         [% IF conf_show_best_before %]
         <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore">Mindesthaltbarkeit</label></td>
+        <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
         [% END %]
        </tr>
        <tr>
         <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_trans_id">Trans-ID</label></td>
+        <td nowrap><label for="l_trans_id">[% 'Trans Id' | $T8 %]</label></td>
         <td align="right"><input name="l_trans_type" id="l_trans_type" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_trans_type">Transfertyp</label></td>
+        <td nowrap><label for="l_trans_type">[% 'Trans Type' | $T8 %]</label></td>
         <td align="right"><input name="l_comment" id="l_comment" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_comment">Kommentar</label></td>
+        <td nowrap><label for="l_comment">[% 'Comment' | $T8 %]</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_warehouse_from" id="l_warehouse_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_from">Quelllager</label></td>
+        <td nowrap><label for="l_warehouse_from">[% 'Warehouse From' | $T8 %]</label></td>
         <td align="right"><input name="l_bin_from" id="l_bin_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_from">Quelllagerplatz</label></td>
+        <td nowrap><label for="l_bin_from">[% 'Bin From' | $T8 %]</label></td>
         <td align="right"><input name="l_warehouse_to" id="l_warehouse_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_to">Ziellager</label></td>
+        <td nowrap><label for="l_warehouse_to">[% 'Warehouse To' | $T8 %]</label></td>
         <td align="right"><input name="l_bin_to" id="l_bin_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_to">Ziellagerplatz</label></td>
+        <td nowrap><label for="l_bin_to">[% 'Bin To' | $T8 %]</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_employee">Bearbeiter</label></td>
+        <td nowrap><label for="l_employee">[% 'Employee' | $T8 %]</label></td>
         <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_oe_id">Dokument</label></td>
+        <td nowrap><label for="l_oe_id">[% 'Document' | $T8 %]</label></td>
         <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_projectnumber">Projektnummer</label></td>
+        <td nowrap><label for="l_projectnumber">[% 'Project Number' | $T8 %]</label></td>
        </tr>
       </table>
      </td>
@@ -206,7 +207,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/journal_filter_master.html b/templates/webpages/wh/journal_filter_master.html
index 550604505..83ba78b50 100644
--- a/templates/webpages/wh/journal_filter_master.html
+++ b/templates/webpages/wh/journal_filter_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -62,7 +63,7 @@
      -->
  </script>
 
- <div class="listtop"><translate>Report about wareouse transactions</translate></div>
+ <div class="listtop">[% 'Report about wareouse transactions' | $T8 %]</div>
 
  <form method="post" name="Form" action="wh.pl">
 
@@ -71,14 +72,14 @@
   <p>
    <table>
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Filter</translate></th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
     </tr>
 
     <tr>
      <td>
       <table>
        <tr>
-        <th align="right" nowrap><translate>Warehouse</translate>:</th>
+        <th align="right" nowrap>[% 'Warehouse' | $T8 %]:</th>
         <td>
          <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
           <option value="">---</option>
@@ -89,24 +90,24 @@
         </td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Bin</translate>:</th>
+        <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
         <td><select name="bin_id" id="bin_id"></select></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Part Number</translate>:</th>
+        <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
         <td><input name="partnumber" id="partnumber" size=20></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Part Description</translate>:</th>
+        <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
         <td><input name="description" size=40></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Charge Number</translate>:</th>
+        <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
        [% IF conf_show_best_before %]
        <tr>
-        <th align="right" nowrap><translate>Best Before</translate>:</th>
+        <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
         <td>
          <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -114,13 +115,13 @@
        </tr>
        [% END %]
        <tr>
-        <th align="right" nowrap><translate>Transfer Quantity</translate>:</th>
+        <th align="right" nowrap>[% 'Transfer Quantity' | $T8 %]:</th>
         <td>
          <select name="qty_op">
           <option value="dontcare">---</option>
-          <option value="atleast"><translate>At least</translate></option>
-          <option value="atmost"><translate>At most</translate></option>
-          <option value="exact"><translate>Exact</translate></option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
          </select>
          <input name="qty">
          <select name="qty_unit">
@@ -129,14 +130,14 @@
         </td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>From Date</translate></th>
+        <th align="right" nowrap>[% 'From Date' | $T8 %]</th>
         <td>
          <input name="fromdate" id="fromdate" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_fromdate" id="fromdate_trigger" value="?">
         </td>
        </tr>
        <tr>
-        <th align="right"><translate>To Date</translate></th>
+        <th align="right">[% 'To Date' | $T8 %]</th>
         <td>
          <input name="todate" id="todate" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_todate" id="todate_trigger" value="?">
@@ -149,7 +150,7 @@
     <tr height="5"><td>&nbsp;</td></tr>
 
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Include in Report</translate></th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Include in Report' | $T8 %]</th>
     </tr>
 
     <tr>
@@ -157,47 +158,47 @@
       <table>
        <tr>
         <td><input name="l_partdescription" id="l_partdescription" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_partdescription"><translate>Part Description</translate></label></td>
+        <td nowrap><label for="l_partdescription">[% 'Part Description' | $T8 %]</label></td>
         <td><input name="l_qty" id="l_qty" class="checkbox" type="hidden" value="Y" checked></td>
-        <td nowrap><label for="l_qty"><translate>Quantity</translate></label></td>
+        <td nowrap><label for="l_qty">[% 'Quantity' | $T8 %]</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_date" id="l_date" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_date"><translate>Date</translate></label></td>
+        <td nowrap><label for="l_date">[% 'Date' | $T8 %]</label></td>
         <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber"><translate>Part Number</translate></label></td>
+        <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber"><translate>Charge Number</translate></label></td>
+        <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
         [% IF conf_show_best_before %]
         <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore"><translate>Best Before</translate></label></td>
+        <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
         [% END %]
        </tr>
        <tr>
         <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_trans_id"><translate>Trans Id</translate></label></td>
+        <td nowrap><label for="l_trans_id">[% 'Trans Id' | $T8 %]</label></td>
         <td align="right"><input name="l_trans_type" id="l_trans_type" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_trans_type"><translate>Trans Type</translate></label></td>
+        <td nowrap><label for="l_trans_type">[% 'Trans Type' | $T8 %]</label></td>
         <td align="right"><input name="l_comment" id="l_comment" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_comment"><translate>Comment</translate></label></td>
+        <td nowrap><label for="l_comment">[% 'Comment' | $T8 %]</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_warehouse_from" id="l_warehouse_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_from"><translate>Warehouse From</translate></label></td>
+        <td nowrap><label for="l_warehouse_from">[% 'Warehouse From' | $T8 %]</label></td>
         <td align="right"><input name="l_bin_from" id="l_bin_from" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_from"><translate>Bin From</translate></label></td>
+        <td nowrap><label for="l_bin_from">[% 'Bin From' | $T8 %]</label></td>
         <td align="right"><input name="l_warehouse_to" id="l_warehouse_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehouse_to"><translate>Warehouse To</translate></label></td>
+        <td nowrap><label for="l_warehouse_to">[% 'Warehouse To' | $T8 %]</label></td>
         <td align="right"><input name="l_bin_to" id="l_bin_to" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bin_to"><translate>Bin To</translate></label></td>
+        <td nowrap><label for="l_bin_to">[% 'Bin To' | $T8 %]</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_employee"><translate>Employee</translate></label></td>
+        <td nowrap><label for="l_employee">[% 'Employee' | $T8 %]</label></td>
         <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_oe_id"><translate>Document</translate></label></td>
+        <td nowrap><label for="l_oe_id">[% 'Document' | $T8 %]</label></td>
         <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_projectnumber"><translate>Project Number</translate></label></td>
+        <td nowrap><label for="l_projectnumber">[% 'Project Number' | $T8 %]</label></td>
        </tr>
       </table>
      </td>
@@ -206,7 +207,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/removal_parts_selection_de.html b/templates/webpages/wh/removal_parts_selection_de.html
index 3ff1612d5..f156cb7e4 100644
--- a/templates/webpages/wh/removal_parts_selection_de.html
+++ b/templates/webpages/wh/removal_parts_selection_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body>
 
  <form method="post" action="wh.pl">
@@ -7,12 +8,12 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p>Entnahme aus Lager: [% warehouse_description %]</p>
+  <p>[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]</p>
 
   <p>
    <table>
     <tr>
-     <td>Grund der Entnahme ausw&auml;hlen:</td>
+     <td>[% 'Select type of removal' | $T8 %]:</td>
      <td>
       <select name="transfer_type_id">
        [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
@@ -21,7 +22,7 @@
     </tr>
 
     <tr>
-     <td>Optionaler Kommentar:</td>
+     <td>[% 'Optional comment' | $T8 %]:</td>
      <td><input name="comment" size="60"></td>
     </tr>
    </table>
@@ -30,16 +31,16 @@
   <p>
    <table>
     <tr>
-     <th class="listheading">Lagerplatz</th>
-     <th class="listheading">Artikelnummer</th>
-     <th class="listheading">Artikelbeschreibung</th>
-     <th class="listheading">Chargennummer</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Part Number' | $T8 %]</th>
+     <th class="listheading">[% 'Part Description' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
-     <th class="listheading">EAN</th>
-     <th class="listheading">Lagerbestand</th>
-     <th class="listheading">Entnahmemenge</th>
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     <th class="listheading">[% 'Available qty' | $T8 %]</th>
+     <th class="listheading">[% 'Removal qty' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = CONTENTS %]
@@ -80,7 +81,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/removal_parts_selection_master.html b/templates/webpages/wh/removal_parts_selection_master.html
index ec48a7840..f156cb7e4 100644
--- a/templates/webpages/wh/removal_parts_selection_master.html
+++ b/templates/webpages/wh/removal_parts_selection_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body>
 
  <form method="post" action="wh.pl">
@@ -7,12 +8,12 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p><translate>Removal from warehouse</translate>: [% warehouse_description %]</p>
+  <p>[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]</p>
 
   <p>
    <table>
     <tr>
-     <td><translate>Select type of removal</translate>:</td>
+     <td>[% 'Select type of removal' | $T8 %]:</td>
      <td>
       <select name="transfer_type_id">
        [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
@@ -21,7 +22,7 @@
     </tr>
 
     <tr>
-     <td><translate>Optional comment</translate>:</td>
+     <td>[% 'Optional comment' | $T8 %]:</td>
      <td><input name="comment" size="60"></td>
     </tr>
    </table>
@@ -30,16 +31,16 @@
   <p>
    <table>
     <tr>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Part Number</translate></th>
-     <th class="listheading"><translate>Part Description</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Part Number' | $T8 %]</th>
+     <th class="listheading">[% 'Part Description' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
-     <th class="listheading"><translate>EAN</translate></th>
-     <th class="listheading"><translate>Available qty</translate></th>
-     <th class="listheading"><translate>Removal qty</translate></th>
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     <th class="listheading">[% 'Available qty' | $T8 %]</th>
+     <th class="listheading">[% 'Removal qty' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = CONTENTS %]
@@ -80,7 +81,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/report_filter_de.html b/templates/webpages/wh/report_filter_de.html
index 80091c282..e0ef8872a 100644
--- a/templates/webpages/wh/report_filter_de.html
+++ b/templates/webpages/wh/report_filter_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -62,7 +63,7 @@
      -->
  </script>
 
- <div class="listtop">Bericht &uuml;ber eingelagerte Waren</div>
+ <div class="listtop">[% 'Report about wareouse contents' | $T8 %]</div>
 
  <form method="post" name="Form" action="wh.pl">
 
@@ -71,14 +72,14 @@
   <p>
    <table>
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>Filter</th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
     </tr>
 
     <tr>
      <td>
       <table>
        <tr>
-        <th align="right" nowrap>Lager:</th>
+        <th align="right" nowrap>[% 'Warehouse' | $T8 %]:</th>
         <td>
          <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
           <option value="">---</option>
@@ -89,24 +90,24 @@
         </td>
        </tr>
        <tr>
-        <th align="right" nowrap>Lagerplatz:</th>
+        <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
         <td><select name="bin_id" id="bin_id"></select></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Artikelnummer:</th>
+        <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
         <td><input name="partnumber" size=20></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Artikelbeschreibung:</th>
+        <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
         <td><input name="description" size=40></td>
        </tr>
        <tr>
-        <th align="right" nowrap>Chargennummer:</th>
+        <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
        [% IF conf_show_best_before %]
        <tr>
-        <th align="right" nowrap>Mindesthaltbarkeit:</th>
+        <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
         <td>
          <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -114,13 +115,13 @@
        </tr>
        [% END %]
        <tr>
-        <th align="right" nowrap>Lagerbestand:</th>
+        <th align="right" nowrap>[% 'Qty in stock' | $T8 %]:</th>
         <td>
          <select name="qty_op">
           <option value="dontcare">---</option>
-          <option value="atleast">Mindestens</option>
-          <option value="atmost">H&ouml;chstens</option>
-          <option value="exact">Genau</option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
          </select>
          <input name="qty">
          <select name="qty_unit">
@@ -135,7 +136,7 @@
     <tr height="5"><td>&nbsp;</td></tr>
 
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap>In Bericht aufnehmen</th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Include in Report' | $T8 %]</th>
     </tr>
 
     <tr>
@@ -146,19 +147,19 @@
       <table>
        <tr>
         <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehousedescription">Lager</label></td>
+        <td nowrap><label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label></td>
         <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bindescription">Lagerplatz</label></td>
+        <td nowrap><label for="l_bindescription">[% 'Bin' | $T8 %]</label></td>
        </tr>
 
        <tr>
         <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber">Artikelnummer</label></td>
+        <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber">Chargennummer</label></td>
+        <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
         [% IF conf_show_best_before %]
         <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore">Mindesthaltbarkeit</label></td>
+        <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
         [% END %]
        </tr>
 
@@ -166,14 +167,14 @@
 
        <tr>
         <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="subtotal">Zwischensumme</label></td>
+        <td nowrap><label for="subtotal">[% 'Subtotal' | $T8 %]</label></td>
         <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="include_empty_bins">Leere Lagerpl&auml;tze anzeigen</label></td>
+        <td nowrap><label for="include_empty_bins">[% 'Include empty bins' | $T8 %]</label></td>
        </tr>
 
        <tr>
         <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_stock_value">Bestandswert</label></td>
+        <td nowrap><label for="l_stock_value">[% 'Stock value' | $T8 %]</label></td>
        </tr>
 
       </table>
@@ -183,7 +184,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/report_filter_master.html b/templates/webpages/wh/report_filter_master.html
index 4a65f66e3..e0ef8872a 100644
--- a/templates/webpages/wh/report_filter_master.html
+++ b/templates/webpages/wh/report_filter_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -62,7 +63,7 @@
      -->
  </script>
 
- <div class="listtop"><translate>Report about wareouse contents</translate></div>
+ <div class="listtop">[% 'Report about wareouse contents' | $T8 %]</div>
 
  <form method="post" name="Form" action="wh.pl">
 
@@ -71,14 +72,14 @@
   <p>
    <table>
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Filter</translate></th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
     </tr>
 
     <tr>
      <td>
       <table>
        <tr>
-        <th align="right" nowrap><translate>Warehouse</translate>:</th>
+        <th align="right" nowrap>[% 'Warehouse' | $T8 %]:</th>
         <td>
          <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
           <option value="">---</option>
@@ -89,24 +90,24 @@
         </td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Bin</translate>:</th>
+        <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
         <td><select name="bin_id" id="bin_id"></select></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Part Number</translate>:</th>
+        <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
         <td><input name="partnumber" size=20></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Part Description</translate>:</th>
+        <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
         <td><input name="description" size=40></td>
        </tr>
        <tr>
-        <th align="right" nowrap><translate>Charge Number</translate>:</th>
+        <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
        [% IF conf_show_best_before %]
        <tr>
-        <th align="right" nowrap><translate>Best Before</translate>:</th>
+        <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
         <td>
          <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -114,13 +115,13 @@
        </tr>
        [% END %]
        <tr>
-        <th align="right" nowrap><translate>Qty in stock</translate>:</th>
+        <th align="right" nowrap>[% 'Qty in stock' | $T8 %]:</th>
         <td>
          <select name="qty_op">
           <option value="dontcare">---</option>
-          <option value="atleast"><translate>At least</translate></option>
-          <option value="atmost"><translate>At most</translate></option>
-          <option value="exact"><translate>Exact</translate></option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
          </select>
          <input name="qty">
          <select name="qty_unit">
@@ -135,7 +136,7 @@
     <tr height="5"><td>&nbsp;</td></tr>
 
     <tr>
-     <th class="listheading" align="left" valign="top" colspan="6" nowrap><translate>Include in Report</translate></th>
+     <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Include in Report' | $T8 %]</th>
     </tr>
 
     <tr>
@@ -146,19 +147,19 @@
       <table>
        <tr>
         <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehousedescription"><translate>Warehouse</translate></label></td>
+        <td nowrap><label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label></td>
         <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bindescription"><translate>Bin</translate></label></td>
+        <td nowrap><label for="l_bindescription">[% 'Bin' | $T8 %]</label></td>
        </tr>
 
        <tr>
         <td align="right"><input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_partnumber"><translate>Part Number</translate></label></td>
+        <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_chargenumber"><translate>Charge Number</translate></label></td>
+        <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
         [% IF conf_show_best_before %]
         <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bestbefore"><translate>Best Before</translate></label></td>
+        <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
         [% END %]
        </tr>
 
@@ -166,14 +167,14 @@
 
        <tr>
         <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="subtotal"><translate>Subtotal</translate></label></td>
+        <td nowrap><label for="subtotal">[% 'Subtotal' | $T8 %]</label></td>
         <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="include_empty_bins"><translate>Include empty bins</translate></label></td>
+        <td nowrap><label for="include_empty_bins">[% 'Include empty bins' | $T8 %]</label></td>
        </tr>
 
        <tr>
         <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
-        <td nowrap><label for="l_stock_value"><translate>Stock value</translate></label></td>
+        <td nowrap><label for="l_stock_value">[% 'Stock value' | $T8 %]</label></td>
        </tr>
 
       </table>
@@ -183,7 +184,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/transfer_parts_selection_de.html b/templates/webpages/wh/transfer_parts_selection_de.html
index 704a2050a..6ef7eda85 100644
--- a/templates/webpages/wh/transfer_parts_selection_de.html
+++ b/templates/webpages/wh/transfer_parts_selection_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -39,12 +40,12 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p>Quelllager: [% warehouse_description %]</p>
+  <p>[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]</p>
 
   <p>
    <table>
     <tr>
-     <td>Grund der Umlagerung ausw&auml;hlen:</td>
+     <td>[% 'Select type of transfer' | $T8 %]:</td>
      <td>
       <select name="transfer_type_id">
        [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% type.description %]</option>[% END %]
@@ -53,7 +54,7 @@
     </tr>
 
     <tr>
-     <td>Optionaler Kommentar:</td>
+     <td>[% 'Optional comment' | $T8 %]:</td>
      <td><input name="comment" size="20"></td>
     </tr>
    </table>
@@ -62,17 +63,17 @@
   <p>
    <table>
     <tr>
-     <th class="listheading">Quelllagerplatz</th>
-     <th class="listheading">Artikelnummer</th>
-     <th class="listheading">Artikelbeschreibung</th>
-     <th class="listheading">Chargennummer</th>
+     <th class="listheading">[% 'Source bin' | $T8 %]</th>
+     <th class="listheading">[% 'Part Number' | $T8 %]</th>
+     <th class="listheading">[% 'Part Description' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading">Mindesthaltbarkeit</th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
-     <th class="listheading">EAN</th>
-     <th class="listheading">Lagerbestand</th>
-     <th class="listheading" colspan="2">Umlagermenge</th>
-     <th class="listheading" colspan="2">Ziellager und -lagerplatz</th>
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     <th class="listheading">[% 'Available qty' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Transfer qty' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Destination warehouse and bin' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = CONTENTS %]
@@ -120,7 +121,7 @@
   <hr size="3" noshade>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/transfer_parts_selection_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
index cbe242914..6ef7eda85 100644
--- a/templates/webpages/wh/transfer_parts_selection_master.html
+++ b/templates/webpages/wh/transfer_parts_selection_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -39,12 +40,12 @@
 
   <div class="listtop">[% title %]</div>
 
-  <p><translate>Transfer from warehouse</translate>: [% warehouse_description %]</p>
+  <p>[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]</p>
 
   <p>
    <table>
     <tr>
-     <td><translate>Select type of transfer</translate>:</td>
+     <td>[% 'Select type of transfer' | $T8 %]:</td>
      <td>
       <select name="transfer_type_id">
        [%- FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% type.description %]</option>[% END %]
@@ -53,7 +54,7 @@
     </tr>
 
     <tr>
-     <td><translate>Optional comment</translate>:</td>
+     <td>[% 'Optional comment' | $T8 %]:</td>
      <td><input name="comment" size="20"></td>
     </tr>
    </table>
@@ -62,17 +63,17 @@
   <p>
    <table>
     <tr>
-     <th class="listheading"><translate>Source bin</translate></th>
-     <th class="listheading"><translate>Part Number</translate></th>
-     <th class="listheading"><translate>Part Description</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
+     <th class="listheading">[% 'Source bin' | $T8 %]</th>
+     <th class="listheading">[% 'Part Number' | $T8 %]</th>
+     <th class="listheading">[% 'Part Description' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
      [% IF conf_show_best_before %]
-     <th class="listheading"><translate>Best Before</translate></th>
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
-     <th class="listheading"><translate>EAN</translate></th>
-     <th class="listheading"><translate>Available qty</translate></th>
-     <th class="listheading" colspan="2"><translate>Transfer qty</translate></th>
-     <th class="listheading" colspan="2"><translate>Destination warehouse and bin</translate></th>
+     <th class="listheading">[% 'EAN' | $T8 %]</th>
+     <th class="listheading">[% 'Available qty' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Transfer qty' | $T8 %]</th>
+     <th class="listheading" colspan="2">[% 'Destination warehouse and bin' | $T8 %]</th>
     </tr>
 
     [% FOREACH row = CONTENTS %]
@@ -120,7 +121,7 @@
   <hr size="3" noshade>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/warehouse_selection_assembly_de.html b/templates/webpages/wh/warehouse_selection_assembly_de.html
index 5f85a3e39..74da21aa3 100644
--- a/templates/webpages/wh/warehouse_selection_assembly_de.html
+++ b/templates/webpages/wh/warehouse_selection_assembly_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -68,7 +69,7 @@
   <p>
    <table>
     <tr>
-     <th align="right" nowrap>Ziellager</th>
+     <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
      <td>
       <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
        [%- FOREACH warehouse = WAREHOUSES %]
@@ -79,12 +80,12 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Ziellagerplatz:</th>
+     <th align="right" nowrap>[% 'Destination bin' | $T8 %]:</th>
      <td><select id="bin_id" name="bin_id"></select></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Erzeugnis-Nummer</th>
+     <th align="right" nowrap>[% 'Assembly Number' | $T8 %]</th>
      <td>
       <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
       <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
@@ -93,7 +94,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Erzeugnis-Beschreibung</th>
+     <th align="right" nowrap>[% 'Assembly Description' | $T8 %]</th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
       <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'assemblies:click_button=update_button')" value="?">
@@ -101,13 +102,13 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Chargennummer</th>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
     [% IF conf_show_best_before %]
     <tr>
-     <th align="right" nowrap>Mindesthaltbarkeit</th>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -116,7 +117,7 @@
     [% END %]
 
     <tr>
-     <th align="right" nowrap>Menge</th>
+     <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
      <td>
       <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
       <select name="unit">
@@ -126,7 +127,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Optionaler Kommentar</th>
+     <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
      <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
@@ -134,9 +135,9 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="Erneuern">
+   <input type="submit" class="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
    [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="Erzeugnis fertigen">
+   <input type="submit" class="submit" name="action" value="[% 'Create Assembly' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/wh/warehouse_selection_assembly_master.html b/templates/webpages/wh/warehouse_selection_assembly_master.html
index 7272fe808..74da21aa3 100644
--- a/templates/webpages/wh/warehouse_selection_assembly_master.html
+++ b/templates/webpages/wh/warehouse_selection_assembly_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -68,7 +69,7 @@
   <p>
    <table>
     <tr>
-     <th align="right" nowrap><translate>Destination warehouse</translate></th>
+     <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
      <td>
       <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
        [%- FOREACH warehouse = WAREHOUSES %]
@@ -79,12 +80,12 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Destination bin</translate>:</th>
+     <th align="right" nowrap>[% 'Destination bin' | $T8 %]:</th>
      <td><select id="bin_id" name="bin_id"></select></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Assembly Number</translate></th>
+     <th align="right" nowrap>[% 'Assembly Number' | $T8 %]</th>
      <td>
       <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
       <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
@@ -93,7 +94,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Assembly Description</translate></th>
+     <th align="right" nowrap>[% 'Assembly Description' | $T8 %]</th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
       <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'assemblies:click_button=update_button')" value="?">
@@ -101,13 +102,13 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Charge number</translate></th>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
     [% IF conf_show_best_before %]
     <tr>
-     <th align="right" nowrap><translate>Best Before</translate></th>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -116,7 +117,7 @@
     [% END %]
 
     <tr>
-     <th align="right" nowrap><translate>Quantity</translate></th>
+     <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
      <td>
       <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
       <select name="unit">
@@ -126,7 +127,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Optional comment</translate></th>
+     <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
      <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
@@ -134,9 +135,9 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="<translate>Update</translate>">
+   <input type="submit" class="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
    [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="<translate>Create Assembly</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Create Assembly' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/wh/warehouse_selection_de.html b/templates/webpages/wh/warehouse_selection_de.html
index fc61a5e19..afdc7a4ea 100644
--- a/templates/webpages/wh/warehouse_selection_de.html
+++ b/templates/webpages/wh/warehouse_selection_de.html
@@ -1,4 +1,6 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
+[%- USE T8 %]
+[%- USE HTML %]
+[% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/part_selection.js"></script>
@@ -69,13 +71,13 @@
   <div class="listtop">[% title %]</div>
 
   <p>
-   Wenn Sie f&uuml;r die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerpl&auml;tze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.
+   [% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]
   </p>
 
   <p>
    <table>
     <tr>
-     <th align="right" nowrap>Quelllager:</th>
+     <th align="right" nowrap>[% 'Transfer from warehouse' | $T8 %]:</th>
      <td>
       <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
        [%- FOREACH warehouse = WAREHOUSES %]
@@ -86,17 +88,17 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Lagerplatz:</th>
+     <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
      <td><select id="bin_id" name="bin_id"></select></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Artikelauswahl eingrenzen:</th>
+     <th align="right" nowrap>[% 'Limit part selection' | $T8 %]:</th>
      <td></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Artikelnummer</th>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
      <td>
       <input type="hidden" name="parts_id" id="parts_id">
       <input name="partnumber" id="partnumber" size="30">
@@ -104,7 +106,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Artikelbeschreibung</th>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td>
       <input name="description" size="30">
       <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
@@ -112,13 +114,13 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Chargennummer</th>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
      <td><input name="chargenumber" size="30"></td>
     </tr>
 
     [% IF conf_show_best_before %]
     <tr>
-     <th align="right" nowrap>Mindesthaltbarkeit</th>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -127,14 +129,14 @@
     [% END %]
 
     <tr>
-     <th align="right" nowrap>EAN</th>
+     <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
      <td><input name="ean" size="30"></td>
     </tr>
    </table>
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/warehouse_selection_master.html b/templates/webpages/wh/warehouse_selection_master.html
index e070a464b..afdc7a4ea 100644
--- a/templates/webpages/wh/warehouse_selection_master.html
+++ b/templates/webpages/wh/warehouse_selection_master.html
@@ -1,4 +1,6 @@
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
+[%- USE T8 %]
+[%- USE HTML %]
+[% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/part_selection.js"></script>
@@ -69,16 +71,13 @@
   <div class="listtop">[% title %]</div>
 
   <p>
-   <translate>If you enter values for the part number and / or part
-    description then only those bins containing parts whose part
-    number or part description match your input will be
-    shown.</translate>
+   [% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]
   </p>
 
   <p>
    <table>
     <tr>
-     <th align="right" nowrap><translate>Transfer from warehouse</translate>:</th>
+     <th align="right" nowrap>[% 'Transfer from warehouse' | $T8 %]:</th>
      <td>
       <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
        [%- FOREACH warehouse = WAREHOUSES %]
@@ -89,17 +88,17 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Bin</translate>:</th>
+     <th align="right" nowrap>[% 'Bin' | $T8 %]:</th>
      <td><select id="bin_id" name="bin_id"></select></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Limit part selection</translate>:</th>
+     <th align="right" nowrap>[% 'Limit part selection' | $T8 %]:</th>
      <td></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Part Number</translate></th>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
      <td>
       <input type="hidden" name="parts_id" id="parts_id">
       <input name="partnumber" id="partnumber" size="30">
@@ -107,7 +106,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Part Description</translate></th>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td>
       <input name="description" size="30">
       <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
@@ -115,13 +114,13 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Charge number</translate></th>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
      <td><input name="chargenumber" size="30"></td>
     </tr>
 
     [% IF conf_show_best_before %]
     <tr>
-     <th align="right" nowrap><translate>Best Before</translate></th>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -130,14 +129,14 @@
     [% END %]
 
     <tr>
-     <th align="right" nowrap><translate>EAN</translate></th>
+     <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
      <td><input name="ean" size="30"></td>
     </tr>
    </table>
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
   </p>
  </form>
 
diff --git a/templates/webpages/wh/warehouse_selection_stock_de.html b/templates/webpages/wh/warehouse_selection_stock_de.html
index 8ca133e76..ca164a53b 100644
--- a/templates/webpages/wh/warehouse_selection_stock_de.html
+++ b/templates/webpages/wh/warehouse_selection_stock_de.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -68,7 +69,7 @@
   <p>
    <table>
     <tr>
-     <th align="right" nowrap>Ziellager</th>
+     <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
      <td>
       <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
        [%- FOREACH warehouse = WAREHOUSES %]
@@ -79,12 +80,12 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Ziellagerplatz:</th>
+     <th align="right" nowrap>[% 'Destination bin' | $T8 %]:</th>
      <td><select id="bin_id" name="bin_id"></select></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Artikelnummer</th>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
      <td>
       <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
       <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
@@ -93,7 +94,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Artikelbeschreibung</th>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
       <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
@@ -101,13 +102,13 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Chargennummer</th>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
     [% IF conf_show_best_before %]
     <tr>
-     <th align="right" nowrap>Mindesthaltbarkeit</th>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -116,12 +117,12 @@
     [% END %]
 
     <tr>
-     <th align="right" nowrap>EAN</th>
+     <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
      <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap>Menge</th>
+     <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
      <td>
       <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
       <select name="unit">
@@ -131,7 +132,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap>Optionaler Kommentar</th>
+     <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
      <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
@@ -139,9 +140,9 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="Erneuern">
+   <input type="submit" class="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
    [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="Einlagern">
+   <input type="submit" class="submit" name="action" value="[% 'Stock' | $T8 %]">
    [%- END %]
   </p>
  </form>
diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
index e8b072c80..ca164a53b 100644
--- a/templates/webpages/wh/warehouse_selection_stock_master.html
+++ b/templates/webpages/wh/warehouse_selection_stock_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE JavaScript %][% USE LxERP %]<body onload="on_load(); [% onload %]">
 
  <script type="text/javascript" src="js/common.js"></script>
@@ -68,7 +69,7 @@
   <p>
    <table>
     <tr>
-     <th align="right" nowrap><translate>Destination warehouse</translate></th>
+     <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
      <td>
       <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
        [%- FOREACH warehouse = WAREHOUSES %]
@@ -79,12 +80,12 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Destination bin</translate>:</th>
+     <th align="right" nowrap>[% 'Destination bin' | $T8 %]:</th>
      <td><select id="bin_id" name="bin_id"></select></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Part Number</translate></th>
+     <th align="right" nowrap>[% 'Part Number' | $T8 %]</th>
      <td>
       <input type="hidden" name="parts_id" id="parts_id" value="[% HTML.escape(parts_id) %]">
       <input type="hidden" name="old_partnumber" id="old_partnumber" value="[% HTML.escape(partnumber) %]">
@@ -93,7 +94,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Part Description</translate></th>
+     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
       <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
@@ -101,13 +102,13 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Charge number</translate></th>
+     <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
     [% IF conf_show_best_before %]
     <tr>
-     <th align="right" nowrap><translate>Best Before</translate></th>
+     <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
@@ -116,12 +117,12 @@
     [% END %]
 
     <tr>
-     <th align="right" nowrap><translate>EAN</translate></th>
+     <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
      <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Quantity</translate></th>
+     <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
      <td>
       <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
       <select name="unit">
@@ -131,7 +132,7 @@
     </tr>
 
     <tr>
-     <th align="right" nowrap><translate>Optional comment</translate></th>
+     <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
      <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
@@ -139,9 +140,9 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" id="update_button" value="<translate>Update</translate>">
+   <input type="submit" class="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
    [%- IF parts_id %]
-   <input type="submit" class="submit" name="action" value="<translate>Stock</translate>">
+   <input type="submit" class="submit" name="action" value="[% 'Stock' | $T8 %]">
    [%- END %]
   </p>
  </form>
-- 
2.20.1