mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 02:58:43 +02:00
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
# Conflicts: # datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php # datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php # datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php # datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php # datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php # datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php # datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php # datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php # datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php # datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php # datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php # datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php # datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php # datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php # datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php # datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php # dictionaries/cs.dictionary.itop.ui.php # dictionaries/da.dictionary.itop.core.php # dictionaries/da.dictionary.itop.ui.php # dictionaries/de.dictionary.itop.ui.php # dictionaries/en.dictionary.itop.ui.php # dictionaries/es_cr.dictionary.itop.ui.php # dictionaries/fr.dictionary.itop.ui.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/it.dictionary.itop.core.php # dictionaries/it.dictionary.itop.ui.php # dictionaries/ja.dictionary.itop.core.php # dictionaries/ja.dictionary.itop.ui.php # dictionaries/nl.dictionary.itop.ui.php # dictionaries/pl.dictionary.itop.core.php # dictionaries/pl.dictionary.itop.ui.php # dictionaries/pt_br.dictionary.itop.core.php # dictionaries/pt_br.dictionary.itop.ui.php # dictionaries/ru.dictionary.itop.core.php # dictionaries/ru.dictionary.itop.ui.php # dictionaries/sk.dictionary.itop.core.php # dictionaries/sk.dictionary.itop.ui.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.ui.php # dictionaries/zh_cn.dictionary.itop.core.php # dictionaries/zh_cn.dictionary.itop.ui.php # tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
This commit is contained in:
Pierre Goiffon
@@ -475,20 +475,24 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
|
||||
Dict::Add('DA DA', 'Danish', 'Dansk', array(
|
||||
'Class:ActionEmail' => 'Email besked',
|
||||
'Class:ActionEmail+' => '',
|
||||
'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
|
||||
'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified:
|
||||
- Being tested: just the Test recipient,
|
||||
- In production: all (To, cc and Bcc)
|
||||
- Inactive: no-one~~',
|
||||
'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified~~',
|
||||
'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified~~',
|
||||
'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent~~',
|
||||
'Class:ActionEmail/Attribute:test_recipient' => 'Test modtager',
|
||||
'Class:ActionEmail/Attribute:test_recipient+' => '',
|
||||
'Class:ActionEmail/Attribute:from' => 'Fra~~',
|
||||
'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen~~',
|
||||
'Class:ActionEmail/Attribute:from' => 'Fra',
|
||||
'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen',
|
||||
'Class:ActionEmail/Attribute:from_label' => 'From (label)~~',
|
||||
'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header~~',
|
||||
'Class:ActionEmail/Attribute:reply_to' => 'Svar til~~',
|
||||
'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til~~',
|
||||
'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
|
||||
'Class:ActionEmail/Attribute:reply_to' => 'Svar til',
|
||||
'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til',
|
||||
'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)~~',
|
||||
'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header~~',
|
||||
'Class:ActionEmail/Attribute:reply_to_label+' => 'Either a static label or a placeholder like $this->team_id->friendlyname$.
|
||||
If omitted the From (label) is used.~~',
|
||||
'Class:ActionEmail/Attribute:to' => 'Til',
|
||||
'Class:ActionEmail/Attribute:to+' => 'Modtager af emailen',
|
||||
'Class:ActionEmail/Attribute:cc' => 'Cc',
|
||||
@@ -555,9 +559,9 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
|
||||
'Class:TriggerOnObject/Attribute:target_class' => 'Target klasse',
|
||||
'Class:TriggerOnObject/Attribute:target_class+' => '',
|
||||
'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
|
||||
'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~~',
|
||||
'Class:TriggerOnObject/Attribute:filter+' => 'Limit the object list (of the target class) which will activate the trigger~~',
|
||||
'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
|
||||
'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \\"%1$s\\"~~',
|
||||
'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"~~',
|
||||
));
|
||||
|
||||
//
|
||||
@@ -905,12 +909,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
|
||||
'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
|
||||
'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
|
||||
// Explain working time computing
|
||||
'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \\"%1$s\\")~~',
|
||||
'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \\"%1$s\\"~~',
|
||||
'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \\"%1$s\\" at %2$d%%~~',
|
||||
'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")~~',
|
||||
'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"~~',
|
||||
'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%~~',
|
||||
// Bulk export
|
||||
'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \\"%1$s\\"~~',
|
||||
'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \\"query\\". There is no Query Phrasebook corresponding to the id: \\"%1$s\\".~~',
|
||||
'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"~~',
|
||||
'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".~~',
|
||||
'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
|
||||
'Core:BulkExportOf_Class' => '%1$s Export~~',
|
||||
'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
|
||||
@@ -1011,7 +1015,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
|
||||
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code~~',
|
||||
'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Used tags cannot be deleted~~',
|
||||
'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Tags codes or labels must be unique~~',
|
||||
'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters~~',
|
||||
'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'Tags code must contain between 3 and %1$d alphanumeric characters, starting with a letter.~~',
|
||||
'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'The chosen tag code is a reserved word~~',
|
||||
'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'Tags label must not contain \'%1$s\' nor be empty~~',
|
||||
'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Tags Code cannot be changed when used~~',
|
||||
|
||||
Reference in New Issue
Block a user