From fe8f7c08e7c9e002f2501cb5afb3ff372d6dd535 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Mon, 5 Mar 2012 12:14:02 +0100 Subject: [PATCH] mehr kivitendo rebranding --- .../webpages/acctranscorrections/analyze_filter.html | 2 +- .../webpages/acctranscorrections/analyze_overview.html | 2 +- .../assistant_for_ap_ar_wrong_taxkeys.html | 2 +- .../assistant_for_invoice_inventory_with_taxkeys.html | 4 ++-- .../assistant_for_wrong_taxkeys.html | 4 ++-- templates/webpages/admin/adminlogin.html | 2 +- templates/webpages/admin/check_auth_database.html | 2 +- .../webpages/admin/create_standard_group_ask.html | 10 +++++----- templates/webpages/admin/restore_dataset.html | 2 +- templates/webpages/datev/net_gross_difference.html | 6 +++--- .../webpages/dbupgrade/buchungsgruppen_header.html | 4 ++-- templates/webpages/dbupgrade/units_header.html | 6 +++--- templates/webpages/dbupgrade/warehouse_form.html | 2 +- templates/webpages/dbupgrade/warning.html | 2 +- templates/webpages/login/auth_db_needs_update.html | 8 ++++---- templates/webpages/login/auth_db_unreachable.html | 6 +++--- .../webpages/login/authentication_pl_missing.html | 2 +- templates/webpages/login/login_screen.html | 2 +- templates/webpages/login/old_configuration_files.html | 6 +++--- templates/webpages/menu/header.html | 2 +- templates/webpages/payment_term/form.html | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/templates/webpages/acctranscorrections/analyze_filter.html b/templates/webpages/acctranscorrections/analyze_filter.html index 867bbadfd..1d81d0fe9 100644 --- a/templates/webpages/acctranscorrections/analyze_filter.html +++ b/templates/webpages/acctranscorrections/analyze_filter.html @@ -4,7 +4,7 @@

[% title %]

- [% 'Earlier versions of Lx-Office contained bugs which might have led to wrong entries in the general ledger.' | $T8 %] + [% 'Earlier versions of kivitendo 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 %]

diff --git a/templates/webpages/acctranscorrections/analyze_overview.html b/templates/webpages/acctranscorrections/analyze_overview.html index 883c4e707..f75b1b756 100644 --- a/templates/webpages/acctranscorrections/analyze_overview.html +++ b/templates/webpages/acctranscorrections/analyze_overview.html @@ -4,7 +4,7 @@

[% title %]

-

[% 'Lx-Office has found one or more problems in the general ledger.' | $T8 %]

+

[% 'kivitendo has found one or more problems in the general ledger.' | $T8 %]

[% 'Period' | $T8 %]: diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html index 6115d92cb..1041b1291 100644 --- a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html +++ b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html @@ -11,7 +11,7 @@

- [% 'Lx-Office can fix these problems automatically.' | $T8 %] + [% 'kivitendo can fix these problems automatically.' | $T8 %] [% 'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' | $T8 %] diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html index a0fa6586c..35ecb01ce 100644 --- a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html +++ b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html @@ -5,11 +5,11 @@

[% title %]

- [% '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 %] + [% 'There is at least one sales or purchase invoice for which kivitendo recorded an inventory transaction with taxkeys even though no tax was recorded.' | $T8 %]

- [% 'Lx-Office can fix these problems automatically.' | $T8 %] + [% 'kivitendo can fix these problems automatically.' | $T8 %] [% 'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' | $T8 %]

diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html index 430f0fc8a..db56f8229 100644 --- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html +++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html @@ -21,9 +21,9 @@

[% 'This could have happened for two reasons:' | $T8 %] - [% '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 %] + [% 'The first reason is that kivitendo 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 %] - [% 'The second reason is that Lx-Office allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %] + [% 'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %] [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %]

diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html index 50f64b7c7..22e07fcf9 100644 --- a/templates/webpages/admin/adminlogin.html +++ b/templates/webpages/admin/adminlogin.html @@ -6,7 +6,7 @@ -

[% 'Lx-Office' | $T8 %] [% HTML.escape(version) %]

+

[% 'kivitendo' | $T8 %] [% HTML.escape(version) %]

[% 'Administration' | $T8 %]

diff --git a/templates/webpages/admin/check_auth_database.html b/templates/webpages/admin/check_auth_database.html index 4c554130e..7005759df 100644 --- a/templates/webpages/admin/check_auth_database.html +++ b/templates/webpages/admin/check_auth_database.html @@ -6,7 +6,7 @@

- [% 'The database for user management and authentication does not exist. You can create let Lx-Office create it with the following parameters:' | $T8 %] + [% 'The database for user management and authentication does not exist. You can create let kivitendo create it with the following parameters:' | $T8 %]

diff --git a/templates/webpages/admin/create_standard_group_ask.html b/templates/webpages/admin/create_standard_group_ask.html index d5f680f6e..00f048918 100644 --- a/templates/webpages/admin/create_standard_group_ask.html +++ b/templates/webpages/admin/create_standard_group_ask.html @@ -7,9 +7,9 @@

- [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %] + [% 'kivitendo has been switched to group-based access restrictions.' | $T8 %] - [%- 'You have to create at least one group, grant it access to Lx-Office\'s functions and assign users to it.' | $T8 %] + [%- 'You have to create at least one group, grant it access to kivitendo\'s functions and assign users to it.' | $T8 %] [% 'Otherwise all users will only have access to their own settings.' | $T8 %] @@ -17,9 +17,9 @@

- [%- '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 %] + [%- 'During this user migration kivitendo can create such a group for you and grant all users access to all of kivitendo\'s functions.' | $T8 %] - [%- 'This corresponds to Lx-Office\'s behavior prior to version 2.4.4.' | $T8 %] + [%- 'This corresponds to kivitendo\'s behavior prior to version 2.4.4.' | $T8 %]

@@ -31,7 +31,7 @@

- [% 'Do you want Lx-Office to create a group for access to all functions?' | $T8 %] + [% 'Do you want kivitendo to create a group for access to all functions?' | $T8 %] [% 'This group will be called "Full Access".' | $T8 %] diff --git a/templates/webpages/admin/restore_dataset.html b/templates/webpages/admin/restore_dataset.html index ab7a94bca..281731514 100644 --- a/templates/webpages/admin/restore_dataset.html +++ b/templates/webpages/admin/restore_dataset.html @@ -20,7 +20,7 @@

[%- 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' | $T8 %] [%- 'It may optionally be compressed with "gzip".' | $T8 %] - [%- 'Files created by Lx-Office\'s "Backup Dataset" function are such files.' | $T8 %] + [%- 'Files created by kivitendo\'s "Backup Dataset" function are such files.' | $T8 %]

diff --git a/templates/webpages/datev/net_gross_difference.html b/templates/webpages/datev/net_gross_difference.html index 98e963e74..95ecd3d06 100644 --- a/templates/webpages/datev/net_gross_difference.html +++ b/templates/webpages/datev/net_gross_difference.html @@ -5,18 +5,18 @@

- Lx-Office speichert Buchungsdaten als aggregierte Nettowerte. + kivitendo speichert Buchungsdaten als aggregierte Nettowerte. Das DATEV-Dateiformat hingegen erwartet aufgeteilte Buchungssätze mit Bruttowerten. Es ist deshalb technisch nicht immer möglich, aus den vorhandenen aggregierten Nettowerten solche Bruttowerte zu errechnen, sodass für - einen Beleg betrachtet die von Lx-Office angezeigten und die in den + einen Beleg betrachtet die von kivitendo angezeigten und die in den DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen. Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto - Lx-Office ist größer als Brutto DATEV und umgekehrt), werden aber von + kivitendo ist größer als Brutto DATEV und umgekehrt), werden aber von den Steuerbehörden anstandslos akzeptiert.

diff --git a/templates/webpages/dbupgrade/buchungsgruppen_header.html b/templates/webpages/dbupgrade/buchungsgruppen_header.html index 5e962c99d..239baae58 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_header.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_header.html @@ -4,8 +4,8 @@
[% 'Introduction of Buchungsgruppen' | $T8 %]

- [%- '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 %] + [%- 'Prior to version v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %] + [%- 'Version 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 %] diff --git a/templates/webpages/dbupgrade/units_header.html b/templates/webpages/dbupgrade/units_header.html index ef977a15f..db07f7ad3 100644 --- a/templates/webpages/dbupgrade/units_header.html +++ b/templates/webpages/dbupgrade/units_header.html @@ -4,9 +4,9 @@

[% 'Introduction of units' | $T8 %]

- [% '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 %] + [% 'Prior to version v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.' | $T8 %] + [% 'In version 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 kivitendo can convert prices when the user switches from one unit to another.' | $T8 %]

diff --git a/templates/webpages/dbupgrade/warehouse_form.html b/templates/webpages/dbupgrade/warehouse_form.html index 5edff88f7..e56daab28 100644 --- a/templates/webpages/dbupgrade/warehouse_form.html +++ b/templates/webpages/dbupgrade/warehouse_form.html @@ -4,7 +4,7 @@

- [% 'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %] + [% 'kivitendo 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 %]

diff --git a/templates/webpages/dbupgrade/warning.html b/templates/webpages/dbupgrade/warning.html index f54c68754..9de5e9e4d 100644 --- a/templates/webpages/dbupgrade/warning.html +++ b/templates/webpages/dbupgrade/warning.html @@ -6,7 +6,7 @@

- [% LxERP.t8('Lx-Office is about to update the database [ #1 ].', dbname) | html %] + [% LxERP.t8('kivitendo is about to update the database [ #1 ].', dbname) | html %]

[% 'You should create a backup of the database before proceeding because the backup might not be reversible.' | $T8 %] diff --git a/templates/webpages/login/auth_db_needs_update.html b/templates/webpages/login/auth_db_needs_update.html index 9a16f2156..fb01cbf88 100644 --- a/templates/webpages/login/auth_db_needs_update.html +++ b/templates/webpages/login/auth_db_needs_update.html @@ -4,15 +4,15 @@

[% LxERP.t8('Error!') %]

- [% LxERP.t8('Lx-Office needs to update the authentication database before you can proceed.') %] + [% LxERP.t8('Kivitendo needs to update the authentication database before you can proceed.') %] [% LxERP.t8('Please log in to the administration panel.') %] - [% LxERP.t8('Lx-Office will then update the database automatically.') %] + [% LxERP.t8('Kivitendo will then update the database automatically.') %]

- [% LxERP.t8('For further information read this: ') %] Lx-Office Installation
- [% LxERP.t8('Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ') %] Lx-Office-Dokumentation.pdf + [% LxERP.t8('For further information read this: ') %] Kivitendo Installation
+ [% LxERP.t8('Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ') %] Kivitendo-Dokumentation.pdf

diff --git a/templates/webpages/login/auth_db_unreachable.html b/templates/webpages/login/auth_db_unreachable.html index 092fe95f0..5ca592bb1 100644 --- a/templates/webpages/login/auth_db_unreachable.html +++ b/templates/webpages/login/auth_db_unreachable.html @@ -5,10 +5,10 @@

[%- '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 %]

-

[% '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 %]

+

[% 'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' | $T8 %]

-

[% 'For further information read this: ' | $T8 %] Lx-Office Installation
- [% 'Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ' | $T8 %] Lx-Office-Dokumentation.pdf

+

[% 'For further information read this: ' | $T8 %] kivitendo Installation
+ [% 'Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ' | $T8 %] Kivitendo-Dokumentation.pdf

diff --git a/templates/webpages/login/authentication_pl_missing.html b/templates/webpages/login/authentication_pl_missing.html index 0f65e36b4..8f158cf71 100644 --- a/templates/webpages/login/authentication_pl_missing.html +++ b/templates/webpages/login/authentication_pl_missing.html @@ -3,7 +3,7 @@

[% 'Error!' | $T8 %]

-

[% 'The authentication configuration file "config/lx_office.conf" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]

+

[% 'The authentication configuration file "config/lx_office.conf" does not exist. This kivitendo installation has probably not been updated correctly yet. Please contact your administrator.' | $T8 %]

[% 'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' | $T8 %]

diff --git a/templates/webpages/login/login_screen.html b/templates/webpages/login/login_screen.html index 9ec5733a8..e0bdb870b 100644 --- a/templates/webpages/login/login_screen.html +++ b/templates/webpages/login/login_screen.html @@ -6,7 +6,7 @@