".
- "Their is two important user-function for the Info Log:
".
+ "Their is two important user-function for the InfoLog:
".
"@addr_id(${CPre}NFamily$CPos,${CPre}NGiven$CPos,${CPre}Company$CPos) ".
"searches the addressbook for an address and returns the id if it founds an exact match of at least ".
"NFamily AND (NGiven OR Company). This is necessary to link your imported InfoLog-entrys ".
diff --git a/infolog/inc/class.uiinfolog.inc.php b/infolog/inc/class.uiinfolog.inc.php
index b96152c737..4477b51270 100644
--- a/infolog/inc/class.uiinfolog.inc.php
+++ b/infolog/inc/class.uiinfolog.inc.php
@@ -304,20 +304,20 @@
{
case 'sp': // Sub-List
$action_vars = array('action'=>'sp','info_id'=>$info_id);
- $t->set_var(lang_info_action,lang('Info Log - Subprojects from'));
+ $t->set_var(lang_info_action,lang('InfoLog - Subprojects from'));
break;
case 'proj':
$action_vars += array( 'id_project' => $proj_id,
'proj_id' => $proj_id);
$proj = $this->bo->readProj($proj_id);
- $t->set_var(lang_info_action,lang('Info Log').' - '.
+ $t->set_var(lang_info_action,lang('InfoLog').' - '.
$proj['title']);
break;
case 'addr':
$action_vars += array( 'id_addr' => $addr_id,
'addr_id' => $addr_id );
$addr = $this->bo->readAddr($addr_id);
- $t->set_var(lang_info_action,lang('Info Log').' - '.
+ $t->set_var(lang_info_action,lang('InfoLog').' - '.
$this->bo->addr2name($addr));
break;
default:
@@ -325,7 +325,7 @@
{
$filter_name = ': '.$this->filters[ $filter ];
}
- $t->set_var(lang_info_action,lang('Info Log').$filter_name);
+ $t->set_var(lang_info_action,lang('InfoLog').$filter_name);
break;
}
$t->set_var($this->setStyleSheet( ));
@@ -587,7 +587,7 @@
if (!checkdate($emonth,$eday,$eyear))
{
- $error[] = lang('You have entered an invalid ending date');
+ $error[] = lang('You have entered an invalid enddate');
}
else
{
@@ -612,7 +612,7 @@
if ($enddate < $startdate && $enddate && $startdate)
{
- $error[] = lang('Ending date can not be before start date');
+ $error[] = lang('Enddate can not be before startdate');
}
$access = $access ? 'private' : 'public';
@@ -706,15 +706,15 @@
switch ($action)
{
case 'sp':
- $info_action = 'Info Log - New Subproject';
+ $info_action = 'InfoLog - New Subproject';
break;
case 'new': case 'addr': case 'proj':
- $info_action = 'Info Log - New';
+ $info_action = 'InfoLog - New';
if ($info_type && isset($this->enums['type'][$info_type]))
$this->data['info_type'] = $info_type;
break;
default:
- $info_action = 'Info Log - Edit'; break;
+ $info_action = 'InfoLog - Edit'; break;
}
$t->set_var('lang_info_action',lang($info_action) .
($query_addr ? ' - '.lang('Search for:')." '$query_addr'" : ''));
@@ -764,12 +764,12 @@
if (!isset($des)) $des = $phpgw->strip_html($this->data['info_des']);
$t->set_var('descval', $des);
- $t->set_var('lang_start_date',lang('Start Date'));
+ $t->set_var('lang_start_date',lang('Startdate'));
if (!isset($startdate)) $startdate = $this->data['info_startdate'];
$t->set_var('start_select_date',
$sb->getDate('syear','smonth','sday',$startdate));
- $t->set_var('lang_end_date',lang('End Date'));
+ $t->set_var('lang_end_date',lang('Enddate'));
if (!isset($enddate)) $enddate = $this->data['info_enddate'];
$t->set_var('end_select_date',
$sb->getDate('eyear','emonth','eday',$enddate));
@@ -852,7 +852,7 @@
$t->set_var( $this->setStyleSheet( ));
$t->set_var( $this->infoHeaders( ));
$t->set_var( $this->formatInfo( $info_id ));
- $t->set_var('lang_info_action',lang('Info Log - Delete'));
+ $t->set_var('lang_info_action',lang('InfoLog - Delete'));
$t->set_var('deleteheader',
lang('Are you sure you want to delete this entry'));
diff --git a/infolog/setup/phpgw_de.lang b/infolog/setup/phpgw_de.lang
index 536716a817..5908c4cd22 100644
--- a/infolog/setup/phpgw_de.lang
+++ b/infolog/setup/phpgw_de.lang
@@ -1,54 +1,52 @@
%1 records imported infolog de %1 Datensätze importiert
%1 records read (not yet imported, you may go back and uncheck test import) infolog de %1 Datensätze gelesen (noch nicht importiert, sie können %2zurück%3 gehen und Test Import ausschalten)
-Default Filter for InfoLog infolog de Standard-Filter für InfoLog
-Description can not exceed 8000 characters in length infolog de Beschreibung darf nicht länger als 8000 Zeichen sein
-Ending date can not be before start date infolog de Das Enddatum kann nicht vor dem Startdatum liegen
-List no Subs/Childs infolog de Teilprojekte/Antwortdokumente nicht anzeigen
-Show full usernames infolog de Kompletten Benutzernamen anzeigen
-Show open Events: Tasks/Calls/Notes on main screen infolog de Nicht erledigte Einträge: Aufgaben/Anrufe/Notizen auf Startseite anzeigen
-You have entered an invalid ending date infolog de Sie haben ein ungültiges Enddatum eingegeben
-You have entered an invalid starting date infolog de Sie haben ein ungültiges Startdatum eingegeben
-You must enter a subject or a description infolog de Sie müssen einen Titel oder eine Beschreibung eingeben
accept infolog de bei Annahme
action infolog de Befehle
+add infolog de Hinzufügen
add sub infolog de neues Teilprojekt anlegen
+all infolog de alle
are you sure you want to delete this entry infolog de Sind Sie sicher, dass Sie diesen Eintrag löschen wollen?
back to projectlist infolog de Zurück zur Gesamtliste
billed infolog de abgerechnet
both infolog de Annahme+erledigt
call infolog de anrufen
+category infolog de Kategorie
confirm infolog de Bestätigung
csv-fieldname infolog de CSV-Feldname
csv-filename infolog de CSV-Dateiname
csv-import common de CSV-Import
datecreated infolog de erstellt am
days infolog de Tage
+default Filter for InfoLog infolog de Standard-Filter für InfoLog
+description infolog de Beschreibung
+description can not exceed 8000 characters in length infolog de Beschreibung darf nicht länger als 8000 Zeichen sein
done infolog de erledigt
download infolog de Datei laden
duration infolog de Dauer
enddate infolog de Enddatum
+enddate can not be before startdate infolog de Das Enddatum kann nicht vor dem Startdatum liegen
fax infolog de Fax
fieldseparator infolog de Feldbegrenzer
finish infolog de wenn erledigt
from infolog de Von
import infolog de Import
-import csv-file into info log infolog de Import CSV-Datei ins Info Log
-info log infolog de Info Log
-info log - delete infolog de Info Log - Löschen
-info log - edit infolog de Info Log - Bearbeiten
-info log - new infolog de Info Log - Anlegen
-info log - new subproject infolog de Info Log - Anlegen Teilprojekt
-info log - subprojects from infolog de Info Log - Teilprojekte von
-info log-fieldname infolog de Info Log-Feldname
+infolog - import csv-file infolog de InfoLog - Import CSV-Datei
+infolog - delete infolog de InfoLog - Löschen
+infolog - edit infolog de InfoLog - Bearbeiten
+infolog - new infolog de InfoLog - Anlegen
+infolog - new subproject infolog de InfoLog - Anlegen Teilprojekt
+infolog - subprojects from infolog de InfoLog - Teilprojekte von
+infolog-fieldname infolog de InfoLog-Feldname
infolog common de InfoLog
infolog preferences common de InfoLog Einstellungen
last changed infolog de letzte Änderung
+list no Subs/Childs infolog de Teilprojekte/Antwortdokumente nicht anzeigen
no - cancel infolog de Nein - Abbruch
-no Filter infolog de kein Filter
+no filter infolog de kein Filter
no entries found, try again ... infolog de Kein Einträge gefunden, nochmal versuchen ...
-not infolog de keine
+none infolog de keine
+not infolog de nicht
not assigned infolog de nicht zugewiesen
-not set, use button to search for infolog de nicht gesetzt, Button zum Suchen verwenden
note infolog de Notiz
number of records to read (<=200) infolog de Anzahl Datensätze lesen (<=200)
offer infolog de Angebot
@@ -60,20 +58,29 @@ own open infolog de eigene offen
own overdue infolog de eigene überfällig
own upcoming infolog de eigene zukünftig
owner infolog de Erstellt von
+phone/email infolog de Telefon/Email
pattern for search in addressbook infolog de Muster für Suche im Adressbuch
pattern for search in projects infolog de Muster für Suche des Projekts
phone infolog de Anruf
phone/email infolog de Telefon/Email
phonecall infolog de Telefonanruf
project infolog de Projekt
+priority infolog de Priorität
+private infolog de Privat
re: infolog de Re:
reject infolog de Absage
responsible infolog de Auftrag an
search for: infolog de Suchen nach:
+select infolog de Auswählen
+show full usernames infolog de Kompletten Benutzernamen anzeigen
+show open Events: Tasks/Calls/Notes on main screen infolog de Nicht erledigte Einträge: Aufgaben/Anrufe/Notizen auf Startseite anzeigen
+showing x infolog de %1 Einträge
showing x - x of x infolog de Einträge %1 - %2 von %3
startdate infolog de Startdatum
startrecord infolog de Startdatensatz
+status infolog de Status
sub infolog de Teil-
projekte
+subject infolog de Beschreibung
task infolog de Auftrag
test import (show importable records only in browser) infolog de Test Import (zeige importierbare Datensätze nur im Browser)
today infolog de Heute
@@ -88,5 +95,6 @@ view other subs infolog de andere Teileprojekte anzeigen
view subs infolog de Teilprojekte anzeigen
will-call infolog de ruft zurück
yes - delete infolog de Ja - Löschen
-you have entered an invalid ending date infolog de Sie haben ein ungültiges Enddatum angegeben
+you have entered an invalid ending date infolog de Sie haben ein ungültiges Enddatum eingegeben
you have entered an invalid starting date infolog de Sie haben ein ungültiges Startdatum eingegeben
+you must enter a subject or a description infolog de Sie müssen einen Titel oder eine Beschreibung eingeben
diff --git a/infolog/setup/phpgw_en.lang b/infolog/setup/phpgw_en.lang
index 8b819ff24a..4a3bb6b58a 100644
--- a/infolog/setup/phpgw_en.lang
+++ b/infolog/setup/phpgw_en.lang
@@ -1,75 +1,100 @@
%1 records imported infolog en %1 records imported
-%1 records read (not yet imported, you may go back and uncheck Test Import) infolog en %1 records read (not yet imported, you may go back and uncheck Test Import)
%1 records read (not yet imported, you may go back and uncheck test import) infolog en %1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)
-Action infolog en Action
-Add infolog en Add
-All infolog en All
-Are you sure you want to delete this entry infolog en Are you sure you want to delete this entry
-Back to Projectlist infolog en Back to Projectlist
-CSV-Fieldname infolog en CSV-Fieldname
-CSV-Filename infolog en CSV-Filename
-Category infolog en Category
-Confirm infolog en Confirm
-Default Filter for InfoLog infolog en Default Filter for InfoLog
-Description infolog en Description
-Description can not exceed 8000 characters in length infolog en Description can not exceed 8000 characters in length
-Download infolog en Download
-Duration infolog en Duration
-End Date infolog en End Date
-Ending date can not be before start date infolog en Ending date can not be before start date
-Fieldseparator infolog en Fieldseparator
-From infolog en From
-Import infolog en Import
-Import CSV-File into Info Log infolog en Import CSV-File into Info Log
-Info Log infolog en Info Log
-Info Log - Delete infolog en Info Log - Delete
-Info Log - Subprojects from infolog en Info Log - Subprojects from
-Info Log-Fieldname infolog en Info Log-Fieldname
-List no Subs/Childs infolog en List no Subs/Childs
-None infolog en None
-Number of records to read (<=200) infolog en Number of records to read (<=200)
-Owner infolog en Owner
-Phone/Email infolog en Phone/Email
-Priority infolog en Priority
-Private infolog en Private
-Re: infolog en Re:
-Responsible infolog en Responsible
-Search for: infolog en Search for:
-Select infolog en Select
-Show full usernames infolog en Show full usernames
-Show open Events: Tasks/Calls/Notes on main screen infolog de Show open Events: Tasks/Calls/Notes on main screen
-Show open Events: Tasks/Calls/Notes on main screen infolog en Show open Events: Tasks/Calls/Notes on main screen
-Start Date infolog en Start Date
-Startrecord infolog en Startrecord
-Status infolog en Status
-Sub infolog en Sub
-Subject infolog en Subject
-Test Import (show importable records only in browser) infolog en Test Import (show importable records only in browser)
-Today infolog en Today
-Type infolog en Type
-View Matrix of actual Month infolog en View Matrix of actual Month
-You have entered an invalid ending date infolog en You have entered an invalid ending date
-You have entered an invalid starting date infolog en You have entered an invalid starting date
-You must enter a subject or a description infolog en You must enter a subject or a description
+accept infolog en accept
+action infolog en Action
+add infolog en Add
+add sub infolog en add Sub
+all infolog en All
+are you sure you want to delete this entry infolog en Are you sure you want to delete this entry
+back to Projectlist infolog en Back to Projectlist
+billed infolog en billed
+both infolog en both
+call infolog en call
+category infolog en Category
+confirm infolog en confirm
+csv-fieldname infolog en CSV-Fieldname
+csv-filename infolog en CSV-Filename
+csv-import common en CSV-Import
datecreated infolog en date created
days infolog en days
+default Filter for InfoLog infolog en Default Filter for InfoLog
+description infolog en Description
+description can not exceed 8000 characters in length infolog en Description can not exceed 8000 characters in length
+done infolog en done
+download infolog en Download
+duration infolog en Duration
enddate infolog en Enddate
-help infolog en help
+enddate can not be before startdate infolog en Enddate can not be before startdate
+fax infolog en Fax
+fieldseparator infolog en Fieldseparator
+finish infolog en finish
+from infolog en From
+import infolog en Import
+infolog - import CSV-File infolog en InfoLog - Import CSV-File
+infolog - delete infolog en Info Log - Delete
+infolog - edit infolog en InfoLog - Edit
+infolog - new infolog en InfoLog - New
+infolog - new subproject infolog en InfoLog - New Subproject
+infolog - subprojects from infolog en InfoLog - Subprojects from
+infolog-fieldname infolog en Info Log-Fieldname
infolog common en InfoLog
infolog preferences common en InfoLog preferences
last changed infolog en last changed
+list no Subs/Childs infolog en List no Subs/Childs
no - cancel infolog en No - Cancel
-no Filter infolog en no Filter
+no filter infolog en no Filter
no entries found, try again ... infolog en no entries found, try again ...
+none infolog en None
+not infolog en not
+not assigned infolog en not assigned
+note infolog en Note
+number of records to read (<=200) infolog en Number of records to read (<=200)
+offer infolog en offer
+ongoing infolog en ongoing
open infolog en open
overdue infolog en overdue
own infolog en own
own open infolog en own open
own overdue infolog en own overdue
own upcoming infolog en own upcoming
+owner infolog en Owner
+phone/email infolog en Phone/Email
+pattern for search in addressbook infolog en pattern for search in Addressbook
+pattern for search in projects infolog en pattern for search in Projects
+phone infolog en Phonecall
+phone/email infolog en Phone/Email
+phonecall infolog en Phonecall
+project infolog en Project
+priority infolog en Priority
+private infolog en Private
+re: infolog en Re:
+reject infolog en reject
+responsible infolog en Responsible
+search for: infolog en Search for:
+select infolog en Select
+show full usernames infolog en Show full usernames
+show open Events: Tasks/Calls/Notes on main screen infolog en Show open Events: Tasks/Calls/Notes on main screen
showing x infolog en showing %1
showing x - x of x infolog en showing %1 - %2 of %3
startdate infolog en Startdate
-startdate infolog en Startdate
+startrecord infolog en Startrecord
+status infolog en Status
+sub infolog en Sub
+subject infolog en Subject
+task infolog en ToDo
+test Import (show importable records only in browser) infolog en Test Import (show importable records only in browser)
+today infolog en Today
+translation infolog en Translation
+type infolog en Type
upcoming infolog en upcoming
+urgency infolog en urgency
+urgent infolog en urgent
+use Button to search for Address infolog en use Button to search for Address
+use Button to search for Project infolog en use Button to search for Project
+view other subs infolog en view other Subs
+view subs infolog en view Subs
+will-call infolog en will call
yes - delete infolog en Yes - Delete
+you have entered an invalid ending date infolog en You have entered an invalid ending date
+you have entered an invalid starting date infolog en You have entered an invalid starting date
+you must enter a subject or a description infolog en You must enter a subject or a description