extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:32:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed not working switching legacy actions columns on again

Browse Source 
- moved some translations to common
This commit is contained in:
Ralf Becker 2011-05-03 06:26:56 +00:00
parent e92173afdd
commit 30b922f30e
7 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/lang/egw_de.lang
View File

@ -37,6 +37,7 @@ all exceptions are converted into single events. calendar de Alle Ausnahmen wurd
all future calendar de Alle zukünftigen
all incl. rejected calendar de Alle einschl. abgesagte
all participants calendar de Alle Teilnehmer
allow users to prevent change notifications ('do not notify') calendar de Erlaube Benutzern Benachrichtigungen über Änderungen zu unterdrücken ('Nicht benachrichtigen')
allows to edit the event again calendar de Erlaubt den Termin erneut zu bearbeiten
always calendar de Immer
apply the action on the whole query, not only the shown events calendar de Befehl auf die gesamte Abfrage anwenden, NICHT nur auf die angezeigten Termine
@ -137,8 +138,6 @@ display status of events calendar de Status von Terminen anzeigen
displayed view calendar de Ansicht
displays this calendar view on the home page (page you get when you enter egroupware or click on the home page icon)? calendar de Zeigt diese Ansicht auf der Startseite (Seite die Sie bekommen wenn Sie EGroupware starten oder das Home Icon anklicken)?
do not include events of group members calendar de Zeige nicht die Termine der Gruppenmitglieder
do not notify calendar de Nicht benachrichtigen
do not notify of these changes calendar de Nicht über diese Änderungen benachrichtigen
do you really want to change the start of this series? if you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created. calendar de Wollen Sie wirklich den Beginn dieses Serientermins ändern? Wenn Sie das tun, so wird die bestehende Serie heute beendet und für die Zukunft ein neuer Wiederholungstermin mit Ihren Änderungen erzeugt.
do you want a weekview with or without weekend? calendar de Möchten Sie eine Wochenansicht mit oder ohne Wochenende?
do you want to be notified about changes of appointments you modified? calendar de Wollen Sie auch über eigene Änderungen Benachrichtigt werden?

2
calendar/lang/egw_en.lang
View File

@ -138,8 +138,6 @@ display status of events calendar en Display status of events
displayed view calendar en Displayed view
displays this calendar view on the home page (page you get when you enter egroupware or click on the home page icon)? calendar en Displays this calendar view on the home page (page you get when you enter EGroupware or click on the home page icon)?
do not include events of group members calendar en Do not include events of group members
do not notify calendar en Do not notify
do not notify of these changes calendar en Do not notify of these changes
do you really want to change the start of this series? if you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created. calendar en Do you really want to change the start of this series? If you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.
do you want a weekview with or without weekend? calendar en Do you want a weekview with or without weekend?
do you want to be notified about changes of appointments you modified? calendar en Do you want to be notified about changes of appointments you modified?

11
infolog/inc/class.infolog_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package infolog
* @copyright (c) 2003-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2003-11 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/
@ -258,6 +258,7 @@ class infolog_ui
{
if (!$query['csv_export'])
{
unset($query['no_actions']);
egw_cache::setSession('infolog', $query['session_for'].'session_data', $query);
$query['actions'] = $this->get_actions($query);
}
@ -373,7 +374,7 @@ class infolog_ui
}
if ($query['action'] == 'sp')
{
if ($query['action_id'] &&
if ($query['action_id'] &&
(is_array($query['action_id']) && in_array($info['info_id_parent'], $query['action_id'])) ||
((!is_array($query['action_id']) && $query['action_id'] === $info['info_id_parent']))
)
@ -943,8 +944,8 @@ class infolog_ui
$actions['delete'] = array(
'caption' => 'Delete',
'confirm' => 'Delete this entry',
'confirm_multiple' => 'Delete these entries',
'confirm' => 'Are you sure you want to delete this entry ?',
'confirm_multiple' => 'Are you sure you want to delete these entries ?',
'group' => ++$group,
'disableClass' => 'rowNoDelete',
);
@ -1049,7 +1050,7 @@ class infolog_ui
}
$checked = array_unique($parents);
// Fall through
case 'view':
// todo: implement or better move code from index to here
return $this->index(array(),'sp',$checked,0);

3
infolog/lang/egw_de.lang
View File

@ -53,7 +53,6 @@ apply the action on the whole query, not only the shown entries!!! infolog de We
apply the changes infolog de Übernimmt die Änderungen
archive infolog de Archiviert
are you shure you want to close this entry ? infolog de Wollen Sie wirklich den Infolog schliessen?
are you shure you want to delete this entry ? infolog de Sind Sie sicher, dass Sie diesen Eintrag löschen wollen?
at the moment the following document-types are supported: infolog de Zur Zeit werden die folgenden Dokument Typen unterstützt:
attach a file infolog de Datei anhängen
attach file infolog de Datei anhängen
@ -136,8 +135,6 @@ delegation infolog de Delegation
delete infolog de Löschen
delete one record by passing its id. infolog de Einen Datensatz spezifiziert durch seine id löschen.
delete selected entries? infolog de Sollen die ausgewählen Datensätze gelöscht werden?
delete the entry infolog de Eintrag löschen
delete this entry infolog de diesen Eintrag löschen
delete this entry and all listed sub-entries infolog de Diesen Eintrag und all aufgelisteten Untereinträge löschen
deleted infolog de gelöscht
deletes the selected typ infolog de löscht den ausgewählten Typ

5
infolog/lang/egw_en.lang
View File

@ -53,7 +53,6 @@ apply the action on the whole query, not only the shown entries!!! infolog en Ap
apply the changes infolog en Apply the changes
archive infolog en archive
are you shure you want to close this entry ? infolog en Are you shure you want to close this entry ?
are you shure you want to delete this entry ? infolog en Are you sure you want to delete this entry ?
at the moment the following document-types are supported: infolog en At the moment the following document-types are supported:
attach a file infolog en Attach a file
attach file infolog en Attach file
@ -136,8 +135,6 @@ delegation infolog en Delegation
delete infolog en Delete
delete one record by passing its id. infolog en Delete one record by passing its id.
delete selected entries? infolog en Delete selected entries?
delete the entry infolog en Delete the entry
delete this entry infolog en delete this entry
delete this entry and all listed sub-entries infolog en Delete this entry and all listed sub-entries
deleted infolog en deleted
deletes the selected typ infolog en deletes the selected type
@ -345,7 +342,6 @@ receive notifications about own items infolog en Receive notifications about own
receive notifications about starting entries you are responsible for infolog en Receive notifications about starting entries you are responsible for
receive notifications about starting entries you delegated infolog en Receive notifications about starting entries you delegated
receive notifications as html-mails infolog en Receive notifications as html-mails
reg. expr. for local ip's<br>eg. ^192\.168\.1\. infolog en reg. expr. for local IP's<br>eg. ^192\.168\.1\.
regular expression infolog en Regular expression
remark infolog en Remark
remove this link (not the entry itself) infolog en Remove this link (not the entry itself)
@ -454,7 +450,6 @@ use field from csv if possible infolog en Use field from CSV if possible
use search results infolog en Use search results
use this tag for addresslabels. put the content, you want to repeat, between two tags. infolog en Use this tag for addresslabels. Put the content, you want to repeat, between two tags.
used time infolog en used time
valid path on clientside<br>eg. \\server\share or e:\ infolog en valid path on clientside<br>eg. \\Server\Share or e:\
values for selectbox infolog en Values for selectbox
view all subs of this entry infolog en View all subs of this entry
view other subs infolog en view other Subs

3
phpgwapi/lang/egw_de.lang
View File

@ -66,6 +66,7 @@ antarctica common de ANTARKTIS
antigua and barbuda common de ANTIGUA UND BARBUDA
application common de Anwendung
apply common de Übernehmen
apply the action on the whole query, not only the shown entries common de Befehl auf die gesamte Abfrage anwenden, NICHT nur auf die angezeigten Einträge
april common de April
are you sure you want to delete these entries ? common de Sind Sie sicher, daß Sie diese Einträge löschen möchten?
are you sure you want to delete this entry ? common de Sind Sie sicher, daß Sie diesen Eintrag löschen möchten?
@ -214,6 +215,8 @@ disable the execution a bugfixscript for internet explorer 5.5 and higher to sho
disabled common de Deaktiviert
display %s first jscalendar de %s zuerst anzeigen
djibouti common de DSCHIBUTI
do not notify common de Nicht benachrichtigen
do not notify of these changes common de Nicht über diese Änderungen benachrichtigen
do you also want to delete all subcategories ? common de Sollen alle Unterkategorien gelöscht werden ?
doctype: common de DOCTYPE:
document properties common de Dokument Eigentschaften

3
phpgwapi/lang/egw_en.lang
View File

@ -66,6 +66,7 @@ antarctica common en ANTARCTICA
antigua and barbuda common en ANTIGUA AND BARBUDA
application common en Application
apply common en Apply
apply the action on the whole query, not only the shown entries common en Apply the action on the whole query, NOT only the shown entries
april common en April
are you sure you want to delete these entries ? common en Are you sure you want to delete these entries ?
are you sure you want to delete this entry ? common en Are you sure you want to delete this entry ?
@ -214,6 +215,8 @@ disable the execution a bugfixscript for internet explorer 5.5 and higher to sho
disabled common en Disabled
display %s first jscalendar en Display %s first
djibouti common en DJIBOUTI
do not notify common en Do not notify
do not notify of these changes common en Do not notify of these changes
do you also want to delete all subcategories ? common en Do you also want to delete all subcategories ?
doctype: common en DOCTYPE:
document properties common en Document properties