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 @@ - + - Accepted Offers + Order confirmation Accepted on Add offer project Admin @@ -35,6 +35,7 @@ Cost number Costs Count + New price list for the client Creation Date Credit awarded by projects Credit @@ -47,21 +48,22 @@ Date Range: Day Delete + Due Due date Edit Template Number of files Invoice Cancellation - Invoice_Copy + Invoice copy Credit - Invoice_Opening + Covering letter for invoice Offer - Accepted_Offer - Final Amount - Finish date + Order confirmation + Gross amount + Deadline Fixed cost? - Accepted Offers + Order confirmation Invoices Offers Group By @@ -77,6 +79,9 @@ Invoice Title Invoices Invoices + When was this offer accepted + When was this offer created + What is the VAT in percent Invoices Items Item ID Cost @@ -148,7 +153,7 @@ New Invoice Item Create New Invoice Item Parent Item - Price per unit + Hourly rate Rebate Sort order Title @@ -199,8 +204,8 @@ Cost Sheets Accept Offer Accepted on - <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> - Offer acceptance # %offer_nr% + <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> + Order confirmation # %offer_nr% Thank you for accepting our offer. We will contact you as soon as possible. Cost Sheet for "%organization_name%" Add Cost Sheet @@ -214,17 +219,19 @@ Total items Created on Created by + Creation user Credit percent Credit sum Currency + What is the currency used Date Comment: Internal Notes explaining the deadline communicated to the client Delete Cost Sheet Description Description of the cost sheet Edit Cost Sheet You are not allowed to edit an accepted or invoiced cost sheet - <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> + <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> Offer # %offer_nr% File upload Delete Files @@ -285,6 +292,8 @@ How many days has the customer until the invoice has to be paid Project Contact + Project deadline + Deadline to finish the project Description Project Name Project ID @@ -381,7 +390,7 @@ Invoice cancellation Credit Offer - Accepted Offer + Order confirmation Total Total amount Total Offers 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 @@ A - Eintrag hinzuf�gen + Zeiten erfassen Log Eintrag hinzuf�gen - Einen Eintrag in die Zeiterfassung hinzuf�gen + Zeit erfassen zus�tzlich Abbrechen, nicht l�schen Geschlossen @@ -84,6 +84,5 @@ Variablen Variablen sind Woche - Gestern Sie k�nnen entweder die "Standard Beschreibung" nutzen oder die "Freie Beschreibung" aber nicht beide zusammen. 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 @@ Add Log Entry Add new log entry additive + Always + Average Cancel, do not delete Closed + CSV + Custom Custom Description Date Day Default Description Delete Description + Detailed table Edit Log Entry + Edit this log entry entries Euro Expense + Group Average + Group by + Group total Help hours in different Last month + Last week + List Log entry modified Logger Application Logger Entries @@ -59,6 +70,7 @@ given client. Are you sure you want to delete Before anyone can start working with the Logger application an administrator needs to setup a project. + Delete checked entries Expenses (currency, USD, EUR, whatever) If you change this please reload the page instances of the logger @@ -87,26 +99,37 @@ Time non-additive Open + Past 7 days + Past 30 days Project + Project status Projection: + Projections Projects projects Recent Entries + Table Task + Tasks this log entry + This month + This week Time Time spent (hours) to do so now. + Today Total: Euro hours User + Users Value Variable variable Variables variables Variables are + View this entry Week Yesterday You can either use "Default Description" or "Custom Description", but not both