composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
acognet
2022-08-10 17:51:35 +02:00
parent 7a9e16766f 931bafe380
commit 26b779cd0e
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/ui.extkeywidget.class.inc.php
View File

@@ -823,7 +823,7 @@ JS
elseif (!in_array($sContains, $aValues))
{
$aValuesEquals = $oValuesSet->GetValuesForAutocomplete(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'equals');
$aValues = array_merge($aValuesEquals, $aValues);
$aValues = array_replace($aValuesEquals, $aValues);
}
switch($sOutputFormat)

52
dictionaries/ui/layouts/activity-panel/en.dictionary.itop.activity-panel.php
View File

@@ -18,42 +18,42 @@
*/
// Activity panel
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'UI:Layout:ActivityPanel:SizeToggler:Expand:Tooltip' => 'Expandir',
'UI:Layout:ActivityPanel:SizeToggler:Reduce:Tooltip' => 'Reducir',
'UI:Layout:ActivityPanel:DisplayToggler:Close:Tooltip' => 'Cerrar',
'UI:Layout:ActivityPanel:LoadMoreEntries:Tooltip' => 'Cargar más entradas',
'UI:Layout:ActivityPanel:LoadAllEntries:Tooltip' => 'Cargar tooas las entradas previas',
Dict::Add('EN US', 'English', 'English', array(
'UI:Layout:ActivityPanel:SizeToggler:Expand:Tooltip' => 'Expand',
'UI:Layout:ActivityPanel:SizeToggler:Reduce:Tooltip' => 'Reduce',
'UI:Layout:ActivityPanel:DisplayToggler:Close:Tooltip' => 'Close',
'UI:Layout:ActivityPanel:LoadMoreEntries:Tooltip' => 'Load more entries',
'UI:Layout:ActivityPanel:LoadAllEntries:Tooltip' => 'Load all previous entries',
// Tabs
'UI:Layout:ActivityPanel:Tab:Activity:Title' => 'Actividad',
'UI:Layout:ActivityPanel:Tab:Log:DraftIndicator:Tooltip' => 'Borrador de entrada',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Title' => 'Bitácoras',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Tooltip' => 'Mostrar/ocultar entradas en bitácora en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Menu:Hint' => 'Elija qué bitácora mostrar en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Title' => 'Cambios de estado',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Tooltip' => 'Mostrar/ocultar cambios de estado en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Title' => 'Ediciones',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Tooltip' => 'Mostrar/ocultar ediciones de campos en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:OpenAll:Tooltip' => 'Abrir todas las entradas',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:CloseAll:Tooltip' => 'Cerrar todas las entradas',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:AuthorsCount:Tooltip' => 'Número de personas interactuando en las entradas visibles',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:MessagesCount:Tooltip' => 'Número de mensajes visibles en las bitácoras',
'UI:Layout:ActivityPanel:Tab:Activity:Title' => 'Activity',
'UI:Layout:ActivityPanel:Tab:Log:DraftIndicator:Tooltip' => 'Draft entry',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Title' => 'Logs',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Tooltip' => 'Show / hide logs entries on this tab',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Menu:Hint' => 'Choose which logs to display on this tab',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Title' => 'State changes',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Tooltip' => 'Show / hide state changes on this tab',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Title' => 'Edits',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Tooltip' => 'Show / hide fields edits on this tab',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:OpenAll:Tooltip' => 'Open all entries',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:CloseAll:Tooltip' => 'Close all entries',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:AuthorsCount:Tooltip' => 'Number of persons interacting in the visible entries',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:MessagesCount:Tooltip' => 'Number of messages in the visible log(s)',
// Compose button
'UI:Layout:ActivityPanel:ComposeButton:Tooltip' => 'Redactar una nueva entrada de registro',
'UI:Layout:ActivityPanel:ComposeButton:Tooltip' => 'Compose a new log entry',
// Case log entry
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Title' => 'Guardar varias bitácoras',
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Explanation' => 'Al presionar el botón "Guardar", enviará entradas para todos las bitácoras editadas a la vez.',
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Title' => 'Multiple logs save',
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Explanation' => 'By pressing the "save" button, you will submit entries for all the edited logs at once.',
// Notification entry
'UI:Layout:ActivityPanel:NotificationEntry:MessageLink:Tooltip' => 'Haga click para abrir la pestaña de notificaciones y obtener más información',
'UI:Layout:ActivityPanel:NotificationEntry:MessageLink:Tooltip' => 'Click to open the notifications tab and get more information',
// Placeholder
'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'Está tranquilo aquí, aún no hay actividad.',
'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'It\'s calm up here, no activity yet',
// Closed cover
'UI:Layout:ActivityPanel:ClosedCover:Title' => 'Panel de actividad',
'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => 'Dar click para abrir el panel de actividades.',
'UI:Layout:ActivityPanel:ClosedCover:Title' => 'Activity panel',
'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => 'Click to open the activity panel',
));

50
dictionaries/ui/layouts/activity-panel/es_cr.dictionary.itop.activity-panel.php
View File

@@ -18,41 +18,41 @@
*/
// Activity panel
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'UI:Layout:ActivityPanel:SizeToggler:Expand:Tooltip' => 'Expand~~',
'UI:Layout:ActivityPanel:SizeToggler:Reduce:Tooltip' => 'Reduce~~',
'UI:Layout:ActivityPanel:DisplayToggler:Close:Tooltip' => 'Close~~',
'UI:Layout:ActivityPanel:LoadMoreEntries:Tooltip' => 'Load more entries~~',
'UI:Layout:ActivityPanel:LoadAllEntries:Tooltip' => 'Load all previous entries~~',
'UI:Layout:ActivityPanel:SizeToggler:Expand:Tooltip' => 'Expandir',
'UI:Layout:ActivityPanel:SizeToggler:Reduce:Tooltip' => 'Reducir',
'UI:Layout:ActivityPanel:DisplayToggler:Close:Tooltip' => 'Cerrar',
'UI:Layout:ActivityPanel:LoadMoreEntries:Tooltip' => 'Cargar más entradas',
'UI:Layout:ActivityPanel:LoadAllEntries:Tooltip' => 'Cargar tooas las entradas previas',
// Tabs
'UI:Layout:ActivityPanel:Tab:Activity:Title' => 'Activity~~',
'UI:Layout:ActivityPanel:Tab:Log:DraftIndicator:Tooltip' => 'Draft entry~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Title' => 'Logs~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Tooltip' => 'Show / hide logs entries on this tab~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Menu:Hint' => 'Choose which logs to display on this tab~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Title' => 'State changes~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Tooltip' => 'Show / hide state changes on this tab~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Title' => 'Edits~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Tooltip' => 'Show / hide fields edits on this tab~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:OpenAll:Tooltip' => 'Open all entries~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:CloseAll:Tooltip' => 'Close all entries~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:AuthorsCount:Tooltip' => 'Number of persons interacting in the visible entries~~',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:MessagesCount:Tooltip' => 'Number of messages in the visible log(s)~~',
'UI:Layout:ActivityPanel:Tab:Activity:Title' => 'Actividad',
'UI:Layout:ActivityPanel:Tab:Log:DraftIndicator:Tooltip' => 'Borrador de entrada',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Title' => 'Bitácoras',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Tooltip' => 'Mostrar/ocultar entradas en bitácora en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Logs:Menu:Hint' => 'Elija qué bitácora mostrar en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Title' => 'Cambios de estado',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Transitions:Tooltip' => 'Mostrar/ocultar cambios de estado en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Title' => 'Ediciones',
'UI:Layout:ActivityPanel:Tab:Toolbar:Filter:Edits:Tooltip' => 'Mostrar/ocultar ediciones de campos en esta pestaña',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:OpenAll:Tooltip' => 'Abrir todas las entradas',
'UI:Layout:ActivityPanel:Tab:Toolbar:Action:CloseAll:Tooltip' => 'Cerrar todas las entradas',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:AuthorsCount:Tooltip' => 'Número de personas interactuando en las entradas visibles',
'UI:Layout:ActivityPanel:Tab:Toolbar:Info:MessagesCount:Tooltip' => 'Número de mensajes visibles en las bitácoras',
// Compose button
'UI:Layout:ActivityPanel:ComposeButton:Tooltip' => 'Compose a new log entry~~',
'UI:Layout:ActivityPanel:ComposeButton:Tooltip' => 'Redactar una nueva entrada de registro',
// Case log entry
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Title' => 'Multiple logs save~~',
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Explanation' => 'By pressing the "save" button, you will submit entries for all the edited logs at once.~~',
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Title' => 'Guardar varias bitácoras',
'UI:Layout:ActivityPanel:MultipleEntriesSaveConfirmation:Explanation' => 'Al presionar el botón "Guardar", enviará entradas para todos las bitácoras editadas a la vez.',
// Notification entry
'UI:Layout:ActivityPanel:NotificationEntry:MessageLink:Tooltip' => 'Click to open the notifications tab and get more information~~',
'UI:Layout:ActivityPanel:NotificationEntry:MessageLink:Tooltip' => 'Haga click para abrir la pestaña de notificaciones y obtener más información',
// Placeholder
'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'It\'s calm up here, no activity yet~~',
'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => 'Está tranquilo aquí, aún no hay actividad.',
// Closed cover
'UI:Layout:ActivityPanel:ClosedCover:Title' => 'Activity panel~~',
'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => 'Click to open the activity panel~~',
'UI:Layout:ActivityPanel:ClosedCover:Title' => 'Panel de actividad',
'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => 'Dar click para abrir el panel de actividades.',
));