mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 11:08:45 +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
@@ -120,7 +120,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Core:AttributeDateTime?SmartSearch' => '
|
||||
<p>
|
||||
Date format:<br/>
|
||||
<b>%1$ss</b><br/>
|
||||
<b>%1$s</b><br/>
|
||||
Example: %2$s
|
||||
</p>
|
||||
<p>
|
||||
@@ -483,20 +483,24 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:ActionEmail' => 'E-posta bildirimi',
|
||||
'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 alıcısı',
|
||||
'Class:ActionEmail/Attribute:test_recipient+' => 'Durumu "Test" olması durumundaki alıcı',
|
||||
'Class:ActionEmail/Attribute:from' => 'Kimden~~',
|
||||
'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek~~',
|
||||
'Class:ActionEmail/Attribute:from' => 'Kimden',
|
||||
'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek',
|
||||
'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' => 'Yanıtla~~',
|
||||
'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek~~',
|
||||
'Class:ActionEmail/Attribute:from_label+' => 'Either a static label or a placeholder like $this->agent_id->friendlyname$~~',
|
||||
'Class:ActionEmail/Attribute:reply_to' => 'Yanıtla',
|
||||
'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek',
|
||||
'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' => 'Kime',
|
||||
'Class:ActionEmail/Attribute:to+' => 'E-posta alıcısı',
|
||||
'Class:ActionEmail/Attribute:cc' => 'Kopya',
|
||||
@@ -810,7 +814,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Core:SynchroReplica:PrivateDetails' => 'Özel detaylar',
|
||||
'Core:SynchroReplica:BackToDataSource' => 'Synchro veri kaynağına geri dön: %1$s',
|
||||
'Core:SynchroReplica:ListOfReplicas' => 'Replika listesi',
|
||||
'Core:SynchroAttExtKey:ReconciliationById' => 'id (birincil anahtar)~~',
|
||||
'Core:SynchroAttExtKey:ReconciliationById' => 'id (birincil anahtar)',
|
||||
'Core:SynchroAtt:attcode' => 'Öznitelik',
|
||||
'Core:SynchroAtt:attcode+' => 'Nesnenin alanı',
|
||||
'Core:SynchroAtt:reconciliation' => 'Uzlaşma ?',
|
||||
@@ -835,7 +839,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Core:SyncTooManyMissingReplicas' => 'Tüm kayıtlar bir süredir dokunulmamıştır (tüm nesneler silinebilir). Lütfen senkronizasyon tablosuna yazan işlemin hala çalıştığını kontrol edin. İşlem iptal edildi.',
|
||||
'Core:SyncSplitModeCLIOnly' => 'Senkronizasyon parçalı olarak, yalnızca Mode CLI \'de çalıştırıldığında yapılabilir',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s Replika,%2$s Hata (lar),%3$s Uyarı (lar).',
|
||||
'Core:SynchroReplica:TargetObject' => 'Senkronize Nesne: %1$s~~',
|
||||
'Core:SynchroReplica:TargetObject' => 'Senkronize Nesne: %1$s',
|
||||
'Class:AsyncSendEmail' => 'E-posta (Asenkron)',
|
||||
'Class:AsyncSendEmail/Attribute:to' => 'Kime',
|
||||
'Class:AsyncSendEmail/Attribute:subject' => 'Konu',
|
||||
@@ -1019,7 +1023,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', 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