Index: openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml 4 Jan 2006 08:06:42 -0000 1.24
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml 24 Jan 2006 16:58:14 -0000 1.25
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="invoices" package_version="0.01d22" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="invoices" package_version="1.0d1" locale="en_US" charset="ISO-8859-1">
- <msg key="accepted">Accepted Offers</msg>
+ <msg key="accepted">Order confirmation</msg>
<msg key="Accepted_date">Accepted on</msg>
<msg key="Add_offer_project">Add offer project</msg>
<msg key="admin">Admin</msg>
@@ -35,6 +35,7 @@
<msg key="Cost_number">Cost number</msg>
<msg key="Costs">Costs</msg>
<msg key="count">Count</msg>
+ <msg key="Create_new_pricelist_for_customer">New price list for the client</msg>
<msg key="Creation_Date">Creation Date</msg>
<msg key="credit_offer_desc">Credit awarded by projects</msg>
<msg key="credit_offer_title">Credit</msg>
@@ -47,21 +48,22 @@
<msg key="Date_Range">Date Range:</msg>
<msg key="day">Day</msg>
<msg key="Delete">Delete</msg>
+ <msg key="Due">Due</msg>
<msg key="Due_date">Due date</msg>
<msg key="Edit">Edit</msg>
<msg key="email_pdf_template">Template</msg>
<msg key="File_count">Number of files</msg>
<msg key="file_invoice">Invoice</msg>
<msg key="file_invoice_cancel">Cancellation</msg>
- <msg key="file_invoice_copy">Invoice_Copy</msg>
+ <msg key="file_invoice_copy">Invoice copy</msg>
<msg key="file_invoice_credit">Credit</msg>
- <msg key="file_invoice_opening">Invoice_Opening</msg>
+ <msg key="file_invoice_opening">Covering letter for invoice</msg>
<msg key="file_offer">Offer</msg>
- <msg key="file_offer_accepted">Accepted_Offer</msg>
- <msg key="Final_Amount">Final Amount</msg>
- <msg key="Finish_date">Finish date</msg>
+ <msg key="file_offer_accepted">Order confirmation</msg>
+ <msg key="Final_Amount">Gross amount</msg>
+ <msg key="Finish_date">Deadline</msg>
<msg key="Fixed_cost">Fixed cost?</msg>
- <msg key="folder_iv_accepted">Accepted Offers</msg>
+ <msg key="folder_iv_accepted">Order confirmation</msg>
<msg key="folder_iv_invoice">Invoices</msg>
<msg key="folder_iv_offer">Offers</msg>
<msg key="Group_by">Group By</msg>
@@ -77,6 +79,9 @@
<msg key="Invoice_Title">Invoice Title</msg>
<msg key="Invoices">Invoices</msg>
<msg key="invoices">Invoices</msg>
+ <msg key="invoices.iv_offer_accepted_date_help">When was this offer accepted</msg>
+ <msg key="invoices.iv_offer_creation_date_help">When was this offer created</msg>
+ <msg key="invoices.iv_offer_vat_help">What is the VAT in percent</msg>
<msg key="Invoices_items">Invoices Items</msg>
<msg key="Item_Id">Item ID</msg>
<msg key="iv_cost_1">Cost</msg>
@@ -148,7 +153,7 @@
<msg key="iv_invoice_item_New">New Invoice Item</msg>
<msg key="iv_invoice_item_New2">Create New Invoice Item</msg>
<msg key="iv_invoice_item_parent_id">Parent Item</msg>
- <msg key="iv_invoice_item_price_per_unit">Price per unit</msg>
+ <msg key="iv_invoice_item_price_per_unit">Hourly rate</msg>
<msg key="iv_invoice_item_rebate">Rebate</msg>
<msg key="iv_invoice_item_sort_order">Sort order</msg>
<msg key="iv_invoice_item_Title">Title</msg>
@@ -199,8 +204,8 @@
<msg key="iv_offer_2">Cost Sheets</msg>
<msg key="iv_offer_accept">Accept Offer</msg>
<msg key="iv_offer_accepted_date">Accepted on</msg>
- <msg key="iv_offer_accepted_email"><html><body><h3>Accepted Offer</h3>%data.contact_salutation%, <p>thank you for your order. We will contact you as soon as possible.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body></msg>
- <msg key="iv_offer_accepted_email_subject">Offer acceptance # %offer_nr%</msg>
+ <msg key="iv_offer_accepted_email"><html><body>%data.contact_salutation%, <p>thank you for your order! You'll find the details in the attached PDF file.<p>With best regards<p>@am_name@<br>Customer service</html></body></msg>
+ <msg key="iv_offer_accepted_email_subject">Order confirmation # %offer_nr%</msg>
<msg key="iv_offer_accepted_thanks">Thank you for accepting our offer. We will contact you as soon as possible.</msg>
<msg key="iv_offer_Add">Cost Sheet for "%organization_name%"</msg>
<msg key="iv_offer_Add2">Add Cost Sheet</msg>
@@ -214,17 +219,19 @@
<msg key="iv_offer_count_total">Total items</msg>
<msg key="iv_offer_creation_date">Created on</msg>
<msg key="iv_offer_creation_user">Created by</msg>
+ <msg key="iv_offer_creation_user_help">Creation user</msg>
<msg key="iv_offer_credit_percent">Credit percent</msg>
<msg key="iv_offer_credit_sum">Credit sum</msg>
<msg key="iv_offer_currency">Currency</msg>
+ <msg key="iv_offer_currency_help">What is the currency used</msg>
<msg key="iv_offer_date_comment">Date Comment:</msg>
<msg key="iv_offer_date_comment_help">Internal Notes explaining the deadline communicated to the client</msg>
<msg key="iv_offer_Delete">Delete Cost Sheet</msg>
<msg key="iv_offer_Description">Description</msg>
<msg key="iv_offer_Description_help">Description of the cost sheet</msg>
<msg key="iv_offer_Edit">Edit Cost Sheet</msg>
<msg key="iv_offer_edit_error">You are not allowed to edit an accepted or invoiced cost sheet</msg>
- <msg key="iv_offer_email"><html><body><h3>Offer</h3>%data.contact_salutation%, <p>see our attached offer.<p>To accept this offer, click <a href="%accept_link%">here</a>.<p>Best wishes,<br>WIENERS + WIENERS GmbH<br></html></body></msg>
+ <msg key="iv_offer_email"><html><body>%data.contact_salutation%,<p>you'll find the requested offer in the attached PDF file.<p>To accept this offer, please klick <a href="%accept_link%">here</a>.<p>With best regards<p>%am_name%<br>Kundenberatung</html></body></msg>
<msg key="iv_offer_email_subject">Offer # %offer_nr%</msg>
<msg key="iv_offer_file">File upload</msg>
<msg key="iv_offer_file_delete">Delete Files</msg>
@@ -285,6 +292,8 @@
<msg key="iv_offer_payment_days_help">How many days has the customer until the invoice has to be paid</msg>
<msg key="iv_offer_project">Project</msg>
<msg key="iv_offer_project_contact">Contact</msg>
+ <msg key="iv_offer_project_date">Project deadline</msg>
+ <msg key="iv_offer_project_date_help">Deadline to finish the project</msg>
<msg key="iv_offer_project_descr">Description</msg>
<msg key="iv_offer_project_help">Project Name</msg>
<msg key="iv_offer_project_id">Project ID</msg>
@@ -381,7 +390,7 @@
<msg key="template_invoice_cancel">Invoice cancellation</msg>
<msg key="template_invoice_credit">Credit</msg>
<msg key="template_offer">Offer</msg>
- <msg key="template_offer_accepted">Accepted Offer</msg>
+ <msg key="template_offer_accepted">Order confirmation</msg>
<msg key="Total">Total</msg>
<msg key="Total_amount">Total amount</msg>
<msg key="Total_offers">Total Offers</msg>
Index: openacs-4/packages/logger/catalog/logger.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/catalog/logger.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/logger/catalog/logger.de_DE.ISO-8859-1.xml 15 Dec 2005 22:55:41 -0000 1.8
+++ openacs-4/packages/logger/catalog/logger.de_DE.ISO-8859-1.xml 24 Jan 2006 16:55:15 -0000 1.9
@@ -2,9 +2,9 @@
<message_catalog package_key="logger" package_version="1.1b4" locale="de_DE" charset="ISO-8859-1">
<msg key="A">A</msg>
- <msg key="Add_Entry">Eintrag hinzuf�gen</msg>
+ <msg key="Add_Entry">Zeiten erfassen</msg>
<msg key="Add_Log_Entry">Log Eintrag hinzuf�gen</msg>
- <msg key="Add_new_log_entry">Einen Eintrag in die Zeiterfassung hinzuf�gen</msg>
+ <msg key="Add_new_log_entry">Zeit erfassen</msg>
<msg key="additive">zus�tzlich</msg>
<msg key="Cancel_do_not_delete">Abbrechen, nicht l�schen</msg>
<msg key="Closed">Geschlossen</msg>
@@ -84,6 +84,5 @@
<msg key="variables">Variablen</msg>
<msg key="Variables_are">Variablen sind</msg>
<msg key="Week">Woche</msg>
- <msg key="Yesterday">Gestern</msg>
<msg key="You_can_either">Sie k�nnen entweder die "Standard Beschreibung" nutzen oder die "Freie Beschreibung" aber nicht beide zusammen.</msg>
</message_catalog>
Index: openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml 15 Dec 2005 22:55:41 -0000 1.10
+++ openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml 24 Jan 2006 16:55:15 -0000 1.11
@@ -6,22 +6,33 @@
<msg key="Add_Log_Entry">Add Log Entry</msg>
<msg key="Add_new_log_entry">Add new log entry</msg>
<msg key="additive">additive</msg>
+ <msg key="Always">Always</msg>
+ <msg key="Average">Average</msg>
<msg key="Cancel_do_not_delete">Cancel, do not delete</msg>
<msg key="Closed">Closed</msg>
+ <msg key="CSV">CSV</msg>
+ <msg key="Custom">Custom</msg>
<msg key="Custom_description">Custom Description</msg>
<msg key="Date">Date</msg>
<msg key="Day">Day</msg>
<msg key="Default_description">Default Description</msg>
<msg key="Delete">Delete</msg>
<msg key="Description">Description</msg>
+ <msg key="Detailed_table">Detailed table</msg>
<msg key="Edit_Log_Entry">Edit Log Entry</msg>
+ <msg key="Edit_this_log_entry">Edit this log entry</msg>
<msg key="entries">entries</msg>
<msg key="Euro">Euro</msg>
<msg key="Expense">Expense</msg>
+ <msg key="Group_Average">Group Average</msg>
+ <msg key="Group_by">Group by</msg>
+ <msg key="Group_total">Group total</msg>
<msg key="Help">Help</msg>
<msg key="hours">hours</msg>
<msg key="in_different">in different</msg>
<msg key="Last_month">Last month</msg>
+ <msg key="Last_week">Last week</msg>
+ <msg key="List">List</msg>
<msg key="Log_entry_modified">Log entry modified</msg>
<msg key="Logger_Application">Logger Application</msg>
<msg key="Logger_entries">Logger Entries</msg>
@@ -59,6 +70,7 @@
given client.</msg>
<msg key="lt_Are_you_sure_you_want">Are you sure you want to delete</msg>
<msg key="lt_Before_anyone_can_sta">Before anyone can start working with the Logger application an administrator needs to setup a project.</msg>
+ <msg key="lt_Delete_checked_entrie">Delete checked entries</msg>
<msg key="lt_Expenses_currency_USD">Expenses (currency, USD, EUR, whatever)</msg>
<msg key="lt_If_you_change_this_pl">If you change this please reload the page</msg>
<msg key="lt_instances_of_the_logg">instances of the logger
@@ -87,26 +99,37 @@
<msg key="name_Time">Time</msg>
<msg key="non-additive">non-additive</msg>
<msg key="Open">Open</msg>
+ <msg key="Past_7_days">Past 7 days</msg>
+ <msg key="Past_30_days">Past 30 days</msg>
<msg key="Project">Project</msg>
+ <msg key="Project_status">Project status</msg>
<msg key="Projection">Projection:</msg>
+ <msg key="Projections">Projections</msg>
<msg key="Projects">Projects</msg>
<msg key="projects">projects</msg>
<msg key="Recent_Entries">Recent Entries</msg>
+ <msg key="Table">Table</msg>
<msg key="Task">Task</msg>
+ <msg key="Tasks">Tasks</msg>
<msg key="this_log_entry">this log entry</msg>
+ <msg key="This_month">This month</msg>
+ <msg key="This_week">This week</msg>
<msg key="Time">Time</msg>
<msg key="Time_spent_hours">Time spent (hours)</msg>
<msg key="to_do_so_now">to do so now.</msg>
+ <msg key="Today">Today</msg>
<msg key="Total">Total:</msg>
<msg key="unit_Euro">Euro</msg>
<msg key="unit_hours">hours</msg>
<msg key="User">User</msg>
+ <msg key="Users">Users</msg>
<msg key="Value">Value</msg>
<msg key="Variable">Variable</msg>
<msg key="variable">variable</msg>
<msg key="Variables">Variables</msg>
<msg key="variables">variables</msg>
<msg key="Variables_are">Variables are</msg>
+ <msg key="View_this_entry">View this entry</msg>
<msg key="Week">Week</msg>
<msg key="Yesterday">Yesterday</msg>
<msg key="You_can_either">You can either use "Default Description" or "Custom Description", but not both</msg>