diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index ddfe4a816..1b57e6a7a 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2861,7 +2861,7 @@ EOF
* @throws \MySQLException
* @throws \MySQLHasGoneAwayException
*/
- public function DisplayStimulusForm(WebPage $oPage, $sStimulus, $aPrefillFormParam = null)
+ public function DisplayStimulusForm(WebPage $oPage, $sStimulus, $aPrefillFormParam = null, $bDisplayBareProperties = true)
{
$sClass = get_class($this);
$iKey = $this->GetKey();
@@ -2922,7 +2922,7 @@ HTML
$aExpectedAttributes = $aPrefillFormParam['expected_attributes'];
}
$sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
- if ($sButtonsPosition == 'bottom')
+ if ($sButtonsPosition == 'bottom' && $bDisplayBareProperties)
{
// bottom: Displays the ticket details BEFORE the actions
$oPage->add('
');
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index c18bd5d70..60faaa77b 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -9683,11 +9683,21 @@ abstract class AttributeSet extends AttributeDBFieldVoid
{
const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
const EDITABLE_INPUT_ID_SUFFIX = '-setwidget-values'; // used client side, see js/jquery.itop-set-widget.js
+ protected $bDisplayLink; // Display search link in readonly mode
public function __construct($sCode, array $aParams)
{
parent::__construct($sCode, $aParams);
$this->aCSSClasses[] = 'attribute-set';
+ $this->bDisplayLink = true;
+ }
+
+ /**
+ * @param bool $bDisplayLink
+ */
+ public function setDisplayLink($bDisplayLink)
+ {
+ $this->bDisplayLink = $bDisplayLink;
}
public static function ListExpectedParams()
@@ -10024,7 +10034,8 @@ abstract class AttributeSet extends AttributeDBFieldVoid
{
if ($value instanceof ormSet)
{
- $value = $value->GetValues();
+ $aValues = $value->GetValues();
+ return $this->GenerateViewHtmlForValues($aValues);
}
if (is_array($value))
{
@@ -10033,6 +10044,47 @@ abstract class AttributeSet extends AttributeDBFieldVoid
return $value;
}
+ /**
+ * HTML representation of a list of values (read-only)
+ * accept a list of strings
+ *
+ * @param array $aValues
+ * @param string $sCssClass
+ * @param bool $bWithLink if true will generate a link, otherwise just a "a" tag without href
+ *
+ * @return string
+ * @throws \CoreException
+ * @throws \OQLException
+ */
+ public function GenerateViewHtmlForValues($aValues, $sCssClass = '', $bWithLink = true)
+ {
+ if (empty($aValues)) {return '';}
+ $sHtml = '
';
+ foreach($aValues as $sValue)
+ {
+ $sClass = MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode());
+ $sAttCode = $this->GetCode();
+ $sLabel = utils::HtmlEntities($this->GetValueLabel($sValue));
+ $sDescription = utils::HtmlEntities($this->GetValueDescription($sValue));
+ $oFilter = DBSearch::FromOQL("SELECT $sClass WHERE $sAttCode MATCHES '$sValue'");
+ $oAppContext = new ApplicationContext();
+ $sContext = $oAppContext->GetForLink();
+ $sUIPage = cmdbAbstractObject::ComputeStandardUIPage($oFilter->GetClass());
+ $sFilter = rawurlencode($oFilter->serialize());
+ $sLink = '';
+ if ($bWithLink && $this->bDisplayLink)
+ {
+ $sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+ $sLink = ' href="'.$sUrl.'"';
+ }
+ $sHtml .= ''.$sLabel.'';
+ }
+ $sHtml .= '';
+
+ return $sHtml;
+ }
+
/**
* @param $value
* @param string $sSeparator
@@ -10083,14 +10135,14 @@ abstract class AttributeSet extends AttributeDBFieldVoid
class AttributeEnumSet extends AttributeSet
{
- const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+ const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_TAG_SET;
public static function ListExpectedParams()
{
return array_merge(parent::ListExpectedParams(), array('possible_values', 'is_null_allowed', 'max_items'));
}
- private function GetRawValues($aArgs = array(), $sContains = '')
+ private function GetRawPossibleValues($aArgs = array(), $sContains = '')
{
$oValSetDef = $this->Get('possible_values');
if (!$oValSetDef)
@@ -10103,7 +10155,7 @@ class AttributeEnumSet extends AttributeSet
public function GetPossibleValues($aArgs = array(), $sContains = '')
{
- $aRawValues = $this->GetRawValues($aArgs, $sContains);
+ $aRawValues = $this->GetRawPossibleValues($aArgs, $sContains);
$aLocalizedValues = array();
foreach($aRawValues as $sKey => $sValue)
{
@@ -10115,7 +10167,7 @@ class AttributeEnumSet extends AttributeSet
public function GetValueLabel($sValue)
{
- $aValues = $this->GetRawValues();
+ $aValues = $this->GetRawPossibleValues();
if (isset($aValues[$sValue]))
{
$sValue = $aValues[$sValue];
@@ -10170,33 +10222,24 @@ class AttributeEnumSet extends AttributeSet
return $sDescription;
}
- public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+ public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
{
if ($bLocalize)
{
- if ($sValue instanceof ormSet)
+ if ($value instanceof ormSet)
{
- /** @var ormSet $oOrmSet */
- $oOrmSet = $sValue;
- $aRes = array();
- foreach ($oOrmSet->GetValues() as $sValue)
- {
- $sLabel = $this->GetValueLabel($sValue);
- $sDescription = $this->GetValueDescription($sValue);
- $aRes[] = "
".parent::GetAsHtml($sLabel)."";
- }
- $sRes = implode(', ', $aRes);
+ $sRes = $this->GenerateViewHtmlForValues($value->GetValues());
}
else
{
- $sLabel = $this->GetValueLabel($sValue);
- $sDescription = $this->GetValueDescription($sValue);
+ $sLabel = $this->GetValueLabel($value);
+ $sDescription = $this->GetValueDescription($value);
$sRes = "
".parent::GetAsHtml($sLabel)."";
}
}
else
{
- $sRes = parent::GetAsHtml($sValue, $oHostObject, $bLocalize);
+ $sRes = parent::GetAsHtml($value, $oHostObject, $bLocalize);
}
return $sRes;
@@ -10204,36 +10247,6 @@ class AttributeEnumSet extends AttributeSet
}
-class AttributeContextSet extends AttributeEnumSet
-{
-
- public function GetPossibleValues($aArgs = array(), $sContains = '')
- {
- $oValSetDef = $this->Get('possible_values');
- if (!$oValSetDef)
- {
- return null;
- }
-
- return $oValSetDef->GetValues($aArgs, $sContains);
- }
-
- public function GetValueLabel($sValue)
- {
- $aValues = $this->GetPossibleValues();
- if (in_array($sValue, $aValues))
- {
- return $aValues[$sValue];
- }
- return Dict::S('Enum:Undefined');
- }
-
- public function GetValueDescription($sValue)
- {
- return '';
- }
-
-}
class AttributeClassAttCodeSet extends AttributeSet
{
@@ -10393,8 +10406,9 @@ class AttributeClassAttCodeSet extends AttributeSet
if (is_null($aJsonFromWidget))
{
$proposedValue = trim($proposedValue);
+ $aProposedValues = $this->FromStringToArray($proposedValue);
$aValues = array();
- foreach(explode(',', $proposedValue) as $sValue)
+ foreach($aProposedValues as $sValue)
{
$sAttCode = trim($sValue);
if (empty($aAllowedAttributes) || isset($aAllowedAttributes[$sAttCode]))
@@ -10601,8 +10615,9 @@ class AttributeQueryAttCodeSet extends AttributeSet
if (is_string($proposedValue) && !empty($proposedValue))
{
$proposedValue = trim($proposedValue);
+ $aProposedValues = $this->FromStringToArray($proposedValue);
$aValues = array();
- foreach(explode(',', $proposedValue) as $sValue)
+ foreach($aProposedValues as $sValue)
{
$sAttCode = trim($sValue);
if (empty($aAllowedAttributes) || isset($aAllowedAttributes[$sAttCode]))
@@ -11193,7 +11208,7 @@ class AttributeTagSet extends AttributeSet
$sFilter = rawurlencode($oFilter->serialize());
$sLink = '';
- if ($bWithLink)
+ if ($bWithLink && $this->bDisplayLink)
{
$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
$sLink = ' href="'.$sUrl.'"';
diff --git a/core/counter.class.inc.php b/core/counter.class.inc.php
index 013e658cc..eeddc4249 100644
--- a/core/counter.class.inc.php
+++ b/core/counter.class.inc.php
@@ -117,7 +117,6 @@ final class ItopCounter
}
$hResult = mysqli_query($hDBLink, $sSql);
- mysqli_free_result($hResult);
}
catch(Exception $e)
diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index 46f92416d..ddee5b9f4 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -1136,21 +1136,22 @@ abstract class DBSearch
*/
protected abstract function SetDataFiltered();
- /**
- * @internal
- *
- * @param $aOrderBy
- * @param $aArgs
- * @param $aAttToLoad
- * @param $aExtendedDataSpec
- * @param $iLimitCount
- * @param $iLimitStart
- * @param $bGetCount
- * @param null $aGroupByExpr
- * @param null $aSelectExpr
- *
- * @return mixed
- */
+ /**
+ * @param $aOrderBy
+ * @param $aArgs
+ * @param $aAttToLoad
+ * @param $aExtendedDataSpec
+ * @param $iLimitCount
+ * @param $iLimitStart
+ * @param $bGetCount
+ * @param null $aGroupByExpr
+ * @param null $aSelectExpr
+ *
+ * @return SQLObjectQuery
+ * @throws \CoreException
+ * @internal
+ *
+ */
protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
{
$oSearch = $this;
diff --git a/css/css-variables.scss b/css/css-variables.scss
index fc88e4855..6de823c81 100644
--- a/css/css-variables.scss
+++ b/css/css-variables.scss
@@ -1,3 +1,21 @@
+/*!
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
$version: "v2.7.0-beta2";
$approot-relative: "../../../../../"; // relative to env-***/branding/themes/***/main.css
@@ -21,8 +39,26 @@ $combodo-orange-darker: darken($combodo-orange, 18%) !default;
$combodo-dark-gray-dark: darken($combodo-dark-gray, 13.5%) !default;
$combodo-dark-gray-darker: darken($combodo-dark-gray, 18%) !default;
+// Brand colors
+// - Bases
+$brand-primary: $combodo-orange !default;
+$brand-secondary: $combodo-dark-gray !default;
+// - Shades
+$brand-primary-lightest: lighten($brand-primary, 15%) !default;
+$brand-primary-lighter: lighten($brand-primary, 10%) !default;
+$brand-primary-light: lighten($brand-primary, 6%) !default;
+$brand-primary-dark: darken($brand-primary, 6%) !default;
+$brand-primary-darker: darken($brand-primary, 10%) !default;
+$brand-primary-darkest: darken($brand-primary, 15%) !default;
+$brand-secondary-lightest: lighten($brand-secondary, 15%) !default;
+$brand-secondary-lighter: lighten($brand-secondary, 10%) !default;
+$brand-secondary-light: lighten($brand-secondary, 6%) !default;
+$brand-secondary-dark: darken($brand-secondary, 6%) !default;
+$brand-secondary-darker: darken($brand-secondary, 10%) !default;
+$brand-secondary-darkest: darken($brand-secondary, 15%) !default;
+
// Vars
-$highlight-color: $combodo-orange !default;
+$highlight-color: $brand-primary !default;
$grey-color: #555555 !default;
$complement-color: #1c94c4 !default;
$complement-light: #d6e8ef !default;
@@ -36,8 +72,11 @@ $hyperlink-text-decoration: none !default;
////////////
// Search //
+$search-form-container-color: $white !default;
+$search-form-container-bg-color: $complement-color !default;
+//
$search-criteria-box-color: #2D2D2D !default;
-$search-criteria-box-picto-color: #E87C1E !default;
+$search-criteria-box-picto-color: $brand-primary !default;
$search-criteria-box-bg-color: #EEEEEE !default;
$search-criteria-box-hover-color: $white !default;
$search-criteria-box-border-color: #CCCCCC !default;
@@ -48,7 +87,7 @@ $search-add-criteria-box-color: $search-criteria-box-color !default;
$search-add-criteria-box-bg-color: $white !default;
$search-add-criteria-box-hover-color: $gray-extra-light !default;
//
-$search-button-box-color: $combodo-orange !default;
+$search-button-box-color: $brand-primary !default;
$search-button-box-bg-color: $white !default;
$search-button-box-bg-hover-color: $gray-extra-light !default;
@@ -65,13 +104,13 @@ $breadcrumb-text-color: #fff !default;
$breadcrumb-highlight-color: $highlight-color !default;
$breadcrumb-text-highlight-color: #fff !default;
-// JQuery UI widgets vars
+// jQuery UI widgets vars
$primary-text-color: #333333 !default;
$secondary-text-color: $grey-color !default;
$error-text-color: $white !default;
$highlight-text-color: #363636 !default;
$hover-background-color: #fde17c !default;
-$border-highlight-color: #f26522 !default;
+$border-highlight-color: $brand-primary-dark !default;
$highlight-item-color: $white !default;
$content-color: #eeeeee !default;
$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 67c348225..dea7a3fbb 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -900,7 +900,7 @@ input.dp-applied {
margin-right: auto;
font-size: 12px;
text-align: left; /* To compensate .search_box:text-align */
- border: 1px solid $complement-color;
+ border: 1px solid $search-form-container-bg-color;
//transition: width 0.3s ease-in-out;
/* Sizing reset */
@@ -1001,8 +1001,8 @@ input.dp-applied {
transition: opacity 0.3s, background-color 0.3s, color 0.3s linear;
padding: 8px 10px;
margin: 0;
- color: $white;
- background-color: $complement-color;
+ color: $search-form-container-color;
+ background-color: $search-form-container-bg-color;
cursor: pointer;
.sft_hint,
.sfobs_hint{
@@ -3512,10 +3512,6 @@ table.listResults .originColor{
.attribute {
&.attribute-set {
.attribute-set-item{
- &::after{
- content: ",";
- margin-right: 0.5em;
- }
&:last-of-type::after{
content: "";
margin-right: 0;
@@ -3563,9 +3559,9 @@ table.listResults .originColor{
@extend %attribute-set-item-edition;
}
//////////////////////
-// TagSet attribute //
+// Set attribute //
// Always styled like the selectize items, see below.
-.attribute-tag-set.attribute-set{
+.attribute-set{
.attribute-set-item{
@extend %attribute-set-item-edition;
}
diff --git a/datamodels/2.x/authent-cas/nl.dict.authent-cas.php b/datamodels/2.x/authent-cas/nl.dict.authent-cas.php
index f33af7274..2d63a86fd 100644
--- a/datamodels/2.x/authent-cas/nl.dict.authent-cas.php
+++ b/datamodels/2.x/authent-cas/nl.dict.authent-cas.php
@@ -4,10 +4,11 @@
*
* @copyright Copyright (C) 2013 XXXXX
* @license http://opensource.org/licenses/AGPL-3.0
+ * @author Jeffrey Bostoen -
(2018 - 2020)
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'CAS:Error:UserNotAllowed' => 'User not allowed~~',
- 'CAS:Login:SignIn' => 'Sign in with CAS~~',
- 'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
+ 'CAS:Error:UserNotAllowed' => 'Gebruiker heeft onvoldoende rechten.',
+ 'CAS:Login:SignIn' => 'Inloggen met CAS',
+ 'CAS:Login:SignInTooltip' => 'Klik hier om aan te melden via de CAS-server',
));
diff --git a/datamodels/2.x/authent-external/nl.dict.authent-external.php b/datamodels/2.x/authent-external/nl.dict.authent-external.php
index 3504e1db2..ad6c6b05d 100644
--- a/datamodels/2.x/authent-external/nl.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/nl.dict.authent-external.php
@@ -2,9 +2,9 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
diff --git a/datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php
index c70f82dbb..1aee3d9e9 100644
--- a/datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php
@@ -2,9 +2,10 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
- * @author jbostoen (2018)
+ * @author Hipska (2019)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
@@ -35,7 +36,7 @@
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:UserLDAP' => 'LDAP-gebruiker',
- 'Class:UserLDAP+' => 'Gebruiker aangemeld via LDAP',
- 'Class:UserLDAP/Attribute:password' => 'Password~~',
- 'Class:UserLDAP/Attribute:password+' => 'user authentication string~~',
+ 'Class:UserLDAP+' => 'Gebruiker die aanmeldt via LDAP',
+ 'Class:UserLDAP/Attribute:password' => 'Wachtwoord',
+ 'Class:UserLDAP/Attribute:password+' => 'Wachtwoord waarmee de gebruiker zich identificeert',
));
diff --git a/datamodels/2.x/authent-local/cs.dict.authent-local.php b/datamodels/2.x/authent-local/cs.dict.authent-local.php
index 3b4968fa4..1c90bc0a2 100755
--- a/datamodels/2.x/authent-local/cs.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/cs.dict.authent-local.php
@@ -53,4 +53,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/da.dict.authent-local.php b/datamodels/2.x/authent-local/da.dict.authent-local.php
index 211f6645c..b1d0064a9 100644
--- a/datamodels/2.x/authent-local/da.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/da.dict.authent-local.php
@@ -38,4 +38,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/de.dict.authent-local.php b/datamodels/2.x/authent-local/de.dict.authent-local.php
index 552b036b1..7f22197a9 100755
--- a/datamodels/2.x/authent-local/de.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/de.dict.authent-local.php
@@ -40,4 +40,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/es_cr.dict.authent-local.php b/datamodels/2.x/authent-local/es_cr.dict.authent-local.php
index 1d91156da..bdc7d9402 100644
--- a/datamodels/2.x/authent-local/es_cr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/es_cr.dict.authent-local.php
@@ -52,4 +52,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/fr.dict.authent-local.php b/datamodels/2.x/authent-local/fr.dict.authent-local.php
index 4b7da9ca3..d4edfea6d 100755
--- a/datamodels/2.x/authent-local/fr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/fr.dict.authent-local.php
@@ -37,4 +37,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'Dernière date à laquelle le mot de passe a été changé',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Le mot de passe doit contenir au moins 8 caractères, avec minuscule, majuscule, nombre et caractère spécial.',
+
+ 'UserLocal:password:expiration' => 'Le champ requiert une extension'
));
diff --git a/datamodels/2.x/authent-local/hu.dict.authent-local.php b/datamodels/2.x/authent-local/hu.dict.authent-local.php
index ef82f027c..9b49ba014 100755
--- a/datamodels/2.x/authent-local/hu.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/hu.dict.authent-local.php
@@ -37,4 +37,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/it.dict.authent-local.php b/datamodels/2.x/authent-local/it.dict.authent-local.php
index c5ec1776b..2fbcb53ee 100755
--- a/datamodels/2.x/authent-local/it.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/it.dict.authent-local.php
@@ -51,4 +51,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/ja.dict.authent-local.php b/datamodels/2.x/authent-local/ja.dict.authent-local.php
index bbb0a3e43..62a0fb32f 100755
--- a/datamodels/2.x/authent-local/ja.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/ja.dict.authent-local.php
@@ -38,4 +38,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/nl.dict.authent-local.php b/datamodels/2.x/authent-local/nl.dict.authent-local.php
index bd16fef2e..3a248d739 100644
--- a/datamodels/2.x/authent-local/nl.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/nl.dict.authent-local.php
@@ -2,9 +2,9 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
@@ -21,34 +21,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-// Dictionnay conventions
-// Class:
-// Class:+
-// Class:/Attribute:
-// Class:/Attribute:+
-// Class:/Attribute:/Value:
-// Class:/Attribute:/Value:+
-// Class:/Stimulus:
-// Class:/Stimulus:+
+
//
// Class: UserLocal
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:UserLocal' => 'iTop-gebruiker',
- 'Class:UserLocal+' => 'Gebruiker aangemeld via iTop',
+ 'Class:UserLocal+' => 'Gebruiker die aanmeldt met gegevens aangemaakt in het gebruikersbeheer van iTop',
'Class:UserLocal/Attribute:password' => 'Wachtwoord',
- 'Class:UserLocal/Attribute:password+' => 'String voor authenticatie',
+ 'Class:UserLocal/Attribute:password+' => 'Het wachtwoord waarmee de gebruiker zich aanmeldt bij iTop',
- 'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
- 'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
- 'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
- 'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
- 'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Never expire~~',
- 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
- 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~',
- 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
- 'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
- 'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+ 'Class:UserLocal/Attribute:expiration' => 'Wachtwoord verloopt',
+ 'Class:UserLocal/Attribute:expiration+' => 'Of het wachtwoord al dan niet verlopen is (vereist een extensie vooraleer dit werkt)',
+ 'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Kan verlopen',
+ 'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+ 'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Verloopt nooit',
+ 'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+ 'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Moet veranderd worden',
+ 'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+ 'Class:UserLocal/Attribute:password_renewed_date' => 'Wachtwoord laatst aangepast',
+ 'Class:UserLocal/Attribute:password_renewed_date+' => 'Tijdstip waarop het wachtwoord het laatst aangepast werd.',
- 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+ 'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Het wachtwoord bestaat uit minstens 8 tekens en bestaat uit een mix van minstens 1 hoofdletter, kleine letter, cijfer en speciaal teken.',
+
+ 'UserLocal:password:expiration' => 'De velden hieronder vereisen een extensie.',
+
));
diff --git a/datamodels/2.x/authent-local/pt_br.dict.authent-local.php b/datamodels/2.x/authent-local/pt_br.dict.authent-local.php
index b92b96495..40af3700a 100755
--- a/datamodels/2.x/authent-local/pt_br.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/pt_br.dict.authent-local.php
@@ -37,4 +37,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/ru.dict.authent-local.php b/datamodels/2.x/authent-local/ru.dict.authent-local.php
index 6833dfcd4..d06536ec9 100755
--- a/datamodels/2.x/authent-local/ru.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/ru.dict.authent-local.php
@@ -29,4 +29,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'Когда пароль был изменен в последний раз',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 8 символов и включать прописные, строчные, числовые и специальные символы.',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/sk.dict.authent-local.php b/datamodels/2.x/authent-local/sk.dict.authent-local.php
index 55f163874..4f76b7de0 100644
--- a/datamodels/2.x/authent-local/sk.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/sk.dict.authent-local.php
@@ -50,4 +50,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/tr.dict.authent-local.php b/datamodels/2.x/authent-local/tr.dict.authent-local.php
index 0aff94a55..84e6451d3 100755
--- a/datamodels/2.x/authent-local/tr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/tr.dict.authent-local.php
@@ -52,4 +52,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php b/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
index fef462411..565e57b2c 100755
--- a/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
@@ -30,11 +30,9 @@
// Class:/Attribute:/Value:+
// Class:/Stimulus:
// Class:/Stimulus:+
-
//
// Class: UserLocal
//
-
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:UserLocal' => 'iTop 用户',
'Class:UserLocal+' => '用户由 iTop 验证身份',
@@ -53,4 +51,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8 个字符,包含大小写、数字和特殊字符.',
+
+ 'UserLocal:password:expiration' => 'The fields below require an extension~~'
));
diff --git a/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
index dae102a31..23d98235a 100644
--- a/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
@@ -19,69 +19,71 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
+ *
+ * @author Jeffrey Bostoen - (2018 - 2020)
*/
// Database inconsistencies
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
// Dictionary entries go here
- 'Menu:DBToolsMenu' => 'DB Tools~~',
- 'DBTools:Class' => 'Class~~',
- 'DBTools:Title' => 'Database Maintenance Tools~~',
- 'DBTools:ErrorsFound' => 'Errors Found~~',
- 'DBTools:Error' => 'Error~~',
- 'DBTools:Count' => 'Count~~',
- 'DBTools:SQLquery' => 'SQL query~~',
- 'DBTools:FixitSQLquery' => 'SQL query To Fix it (indication)~~',
- 'DBTools:SQLresult' => 'SQL result~~',
- 'DBTools:NoError' => 'The database is OK~~',
- 'DBTools:HideIds' => 'Error List~~',
- 'DBTools:ShowIds' => 'Detailed view~~',
- 'DBTools:ShowReport' => 'Report~~',
- 'DBTools:IntegrityCheck' => 'Integrity check~~',
- 'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+ 'Menu:DBToolsMenu' => 'Databasetools',
+ 'DBTools:Class' => 'Klasse',
+ 'DBTools:Title' => 'Onderhoudstools voor de database',
+ 'DBTools:ErrorsFound' => 'Fouten gevonden',
+ 'DBTools:Error' => 'Fout',
+ 'DBTools:Count' => 'Aantal',
+ 'DBTools:SQLquery' => 'SQL-query',
+ 'DBTools:FixitSQLquery' => 'SQL-query die mogelijk het probleem verhelpt',
+ 'DBTools:SQLresult' => 'Resultaat SQL-query',
+ 'DBTools:NoError' => 'De database is OK',
+ 'DBTools:HideIds' => 'Overzicht fouten',
+ 'DBTools:ShowIds' => 'Gedetailleerde weergave',
+ 'DBTools:ShowReport' => 'Rapport',
+ 'DBTools:IntegrityCheck' => 'Integriteitscheck',
+ 'DBTools:FetchCheck' => 'Opvraag-check (fetch) (long)',
- 'DBTools:Analyze' => 'Analyze~~',
- 'DBTools:Details' => 'Show Details~~',
- 'DBTools:ShowAll' => 'Show All Errors~~',
+ 'DBTools:Analyze' => 'Analyseer',
+ 'DBTools:Details' => 'Toon details',
+ 'DBTools:ShowAll' => 'Toon alle fouten',
- 'DBTools:Inconsistencies' => 'Database inconsistencies~~',
+ 'DBTools:Inconsistencies' => 'Inconsistenties in database',
- 'DBAnalyzer-Integrity-OrphanRecord' => 'Orphan record in `%1$s`, it should have its counterpart in table `%2$s`~~',
- 'DBAnalyzer-Integrity-InvalidExtKey' => 'Invalid external key %1$s (column: `%2$s.%3$s`)~~',
- 'DBAnalyzer-Integrity-MissingExtKey' => 'Missing external key %1$s (column: `%2$s.%3$s`)~~',
- 'DBAnalyzer-Integrity-InvalidValue' => 'Invalid value for %1$s (column: `%2$s.%3$s`)~~',
- 'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Some user accounts have no profile at all~~',
- 'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
+ 'DBAnalyzer-Integrity-OrphanRecord' => 'Wees-record in "%1$s", het zou een verwant record moeten hebben in de tabel "%2$s"',
+ 'DBAnalyzer-Integrity-InvalidExtKey' => 'Ongeldige externe sleutel %1$s (kolom: "%2$s.%3$s")',
+ 'DBAnalyzer-Integrity-MissingExtKey' => 'Ontbrekende externe sleutel %1$s (kolom: "%2$s.%3$s")',
+ 'DBAnalyzer-Integrity-InvalidValue' => 'Ongeldige waarde voor %1$s (kolom: "%2$s.%3$s")',
+ 'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Sommige gebruikersaccounts hebben geen profiel',
+ 'DBAnalyzer-Fetch-Count-Error' => 'Opvraag-fout in "%1$s", %2$d records opgevraagd / %3$d geteld',
));
// Database Info
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'DBTools:DatabaseInfo' => 'Database Information~~',
- 'DBTools:Base' => 'Base~~',
- 'DBTools:Size' => 'Size~~',
+ 'DBTools:DatabaseInfo' => 'Database-informatie',
+ 'DBTools:Base' => 'Base',
+ 'DBTools:Size' => 'Grootte',
));
// Lost attachments
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'DBTools:LostAttachments' => 'Lost attachments~~',
- 'DBTools:LostAttachments:Disclaimer' => 'Here you can search your database for lost or misplaced attachments. This is NOT a data recovery tool, is does not retrieve deleted data.~~',
+ 'DBTools:LostAttachments' => 'Verloren bijlages',
+ 'DBTools:LostAttachments:Disclaimer' => 'Zoek hier verloren or verkeerd geplaatste bijlages. Dit is geen recovery-tool, het kan geen gewiste data herstellen.',
- 'DBTools:LostAttachments:Button:Analyze' => 'Analyze~~',
- 'DBTools:LostAttachments:Button:Restore' => 'Restore~~',
- 'DBTools:LostAttachments:Button:Restore:Confirm' => 'This action cannot be undone, please confirm that you want to restore the selected files.~~',
- 'DBTools:LostAttachments:Button:Busy' => 'Please wait...~~',
+ 'DBTools:LostAttachments:Button:Analyze' => 'Analyseer',
+ 'DBTools:LostAttachments:Button:Restore' => 'Herstel',
+ 'DBTools:LostAttachments:Button:Restore:Confirm' => 'Deze actie kan niet ongedaan worden gemaakt. Bevestig dat je de bijlages wil herstellen.',
+ 'DBTools:LostAttachments:Button:Busy' => 'Even geduld...',
- 'DBTools:LostAttachments:Step:Analyze' => 'First, search for lost/misplaced attachments by analyzing the database.~~',
+ 'DBTools:LostAttachments:Step:Analyze' => 'Zoek eerst verloren/verkeerd geplaatste bijlages door de database te analyseren.',
- 'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analyze results:~~',
- 'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Great! Every thing seems to be at the right place.~~',
- 'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Some attachments (%1$d) seem to be misplaced. Take a look at the following list and check the ones you would like to move.~~',
- 'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Filename~~',
- 'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Current location~~',
- 'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Move to...~~',
+ 'DBTools:LostAttachments:Step:AnalyzeResults' => 'Resultaten analyse:',
+ 'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Perfect, alles lijkt op de juiste plaats te staan!',
+ 'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Somme bijlages (%1$d) lijken verkeerd te staan. Overloop de lijst en duid aan welke je wil verplaatsen.',
+ 'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Bestandsnaam',
+ 'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Huidige locatie',
+ 'DBTools:LostAttachments:Step:AnalyzeResults:Item:TargetLocation' => 'Verplaats naar ...',
- 'DBTools:LostAttachments:Step:RestoreResults' => 'Restore results:~~',
- 'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d attachments were restored.~~',
+ 'DBTools:LostAttachments:Step:RestoreResults' => 'Resultaten herstel:',
+ 'DBTools:LostAttachments:Step:RestoreResults:Results' => '%1$d/%2$d bijlages werden hersteld.',
- 'DBTools:LostAttachments:StoredAsInlineImage' => 'Stored as inline image~~',
- 'DBTools:LostAttachments:History' => 'Attachment "%1$s" restored with DB tools~~'
+ 'DBTools:LostAttachments:StoredAsInlineImage' => 'Opgeslagen als afbeelding in tekst',
+ 'DBTools:LostAttachments:History' => 'Bijlage "%1$s" werd hersteld met de databasetools'
));
diff --git a/datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php
index 4c43359fd..8535c53c0 100755
--- a/datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php
@@ -38,6 +38,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Attachments:NoAttachment' => 'Žádná příloha. ',
'Attachments:PreviewNotAvailable' => 'Pro tento typ přílohy není náhled k dispozici.',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -60,3 +62,25 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/da.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/da.dict.itop-attachments.php
index 61065cbeb..d6fbe5833 100644
--- a/datamodels/2.x/itop-attachments/da.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/da.dict.itop-attachments.php
@@ -35,6 +35,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Attachments:NoAttachment' => 'Intet vedhæftet. ',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -57,3 +59,25 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/de.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/de.dict.itop-attachments.php
index 3c1adde81..900c8d868 100644
--- a/datamodels/2.x/itop-attachments/de.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/de.dict.itop-attachments.php
@@ -61,3 +61,25 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
index e8a41e0a7..1067abcf5 100755
--- a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
@@ -65,4 +65,16 @@ Dict::Add('EN US', 'English', 'English', array(
'Attachments:File:Uploader' => 'Uploaded by',
'Attachments:File:Size' => 'Size',
'Attachments:File:MimeType' => 'Type',
-));
\ No newline at end of file
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date',
+ 'Class:Attachment/Attribute:creation_date+' => '',
+ 'Class:Attachment/Attribute:user_id' => 'User id',
+ 'Class:Attachment/Attribute:user_id+' => '',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id',
+ 'Class:Attachment/Attribute:contact_id+' => '',
+));
diff --git a/datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php
index df285066d..8855cff8d 100755
--- a/datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php
@@ -37,6 +37,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Attachments:NoAttachment' => 'No hay Anexo. ',
'Attachments:PreviewNotAvailable' => 'Vista preliminar no disponible para este tipo de Anexo.',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -59,3 +61,25 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
index 4b9ad416d..bf101df0a 100755
--- a/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
@@ -16,7 +16,6 @@
*
* You should have received a copy of the GNU Affero General Public License
*/
-
Dict::Add('FR FR', 'French', 'Français', array(
'Attachments:TabTitle_Count' => 'Pièces jointes (%1$d)',
'Attachments:EmptyTabTitle' => 'Pièces jointes',
@@ -65,4 +64,16 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Attachments:File:Uploader' => 'Chargé par',
'Attachments:File:Size' => 'Taille',
'Attachments:File:MimeType' => 'Type',
-));
\ No newline at end of file
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Date de création',
+ 'Class:Attachment/Attribute:creation_date+' => '',
+ 'Class:Attachment/Attribute:user_id' => 'Utilisateur',
+ 'Class:Attachment/Attribute:user_id+' => '',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact',
+ 'Class:Attachment/Attribute:contact_id+' => '',
+));
diff --git a/datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php
index 52946c4c4..106e8e126 100644
--- a/datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php
@@ -35,6 +35,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Attachments:NoAttachment' => 'No attachment. ~~',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -57,3 +59,25 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/it.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/it.dict.itop-attachments.php
index 70210b34f..b6e0c350e 100644
--- a/datamodels/2.x/itop-attachments/it.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/it.dict.itop-attachments.php
@@ -35,6 +35,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Attachments:NoAttachment' => 'No attachment. ~~',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -57,3 +59,25 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php
index 8a9657b43..68cf0fd1a 100644
--- a/datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php
@@ -34,6 +34,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Attachments:NoAttachment' => '添付はありません。',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -56,3 +58,25 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
index 1ec6ab17f..78be5fe67 100644
--- a/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
@@ -1,5 +1,5 @@
(2018 - 2020)
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
@@ -38,8 +38,10 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Attachment:Max_Mo' => '(Maximale bestandsgrootte: %1$s MB)',
'Attachment:Max_Ko' => '(Maximale bestandsgrootte: %1$s kB)',
'Attachments:NoAttachment' => 'Geen bijlage. ',
- 'Attachments:PreviewNotAvailable' => 'Een voorbeeld is niet beschikbaar voor dit type bijlage.',
- 'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:PreviewNotAvailable' => 'Er is geen voorbeeld beschikbaar voor dit type bijlage.',
+ 'Attachments:Error:FileTooLarge' => 'Het bestand is te groot om geüpload te worden: %1$s',
+ 'Attachments:Render:Icons' => 'Toon als pictogram',
+ 'Attachments:Render:Table' => 'Toon als lijst',
));
//
@@ -49,16 +51,38 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Attachment' => 'Bijlage',
'Class:Attachment+' => '',
- 'Class:Attachment/Attribute:expire' => 'Expire~~',
- 'Class:Attachment/Attribute:expire+' => '~~',
- 'Class:Attachment/Attribute:temp_id' => 'Temporary id~~',
- 'Class:Attachment/Attribute:temp_id+' => '~~',
- 'Class:Attachment/Attribute:item_class' => 'Item class~~',
- 'Class:Attachment/Attribute:item_class+' => '~~',
- 'Class:Attachment/Attribute:item_id' => 'Item~~',
- 'Class:Attachment/Attribute:item_id+' => '~~',
- 'Class:Attachment/Attribute:item_org_id' => 'Item organization~~',
- 'Class:Attachment/Attribute:item_org_id+' => '~~',
- 'Class:Attachment/Attribute:contents' => 'Contents~~',
- 'Class:Attachment/Attribute:contents+' => '~~',
+ 'Class:Attachment/Attribute:expire' => 'Vervalt',
+ 'Class:Attachment/Attribute:expire+' => '',
+ 'Class:Attachment/Attribute:temp_id' => 'Tijdelijke ID',
+ 'Class:Attachment/Attribute:temp_id+' => '',
+ 'Class:Attachment/Attribute:item_class' => 'Klasse item',
+ 'Class:Attachment/Attribute:item_class+' => '',
+ 'Class:Attachment/Attribute:item_id' => 'Item',
+ 'Class:Attachment/Attribute:item_id+' => '',
+ 'Class:Attachment/Attribute:item_org_id' => 'Organisatie item',
+ 'Class:Attachment/Attribute:item_org_id+' => '',
+ 'Class:Attachment/Attribute:contents' => 'Inhoud',
+ 'Class:Attachment/Attribute:contents+' => '',
+));
+
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+ 'Attachments:File:Thumbnail' => 'Pictogram',
+ 'Attachments:File:Name' => 'Bestandsnaam',
+ 'Attachments:File:Date' => 'Geüpload op',
+ 'Attachments:File:Uploader' => 'Geüpload door',
+ 'Attachments:File:Size' => 'Grootte',
+ 'Attachments:File:MimeType' => 'Type',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Datum creatie',
+ 'Class:Attachment/Attribute:creation_date+' => '',
+ 'Class:Attachment/Attribute:user_id' => 'ID Gebruiker',
+ 'Class:Attachment/Attribute:user_id+' => '',
+ 'Class:Attachment/Attribute:contact_id' => 'ID Contact',
+ 'Class:Attachment/Attribute:contact_id+' => '',
));
diff --git a/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
index a3cb04351..3118abcb8 100644
--- a/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
@@ -36,6 +36,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Attachments:NoAttachment' => 'Nenhum anexo. ',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -58,3 +60,25 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php
index f7f0c092a..3d9e74e25 100755
--- a/datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php
@@ -23,6 +23,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Attachments:NoAttachment' => 'Нет вложений.',
'Attachments:PreviewNotAvailable' => 'Предварительный просмотр не доступен для этого типа вложений.',
'Attachments:Error:FileTooLarge' => 'Файл слишком велик для загрузки. %1$s',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -45,3 +47,25 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:Attachment/Attribute:contents' => 'Содержимое',
'Class:Attachment/Attribute:contents+' => '',
));
+
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/sk.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/sk.dict.itop-attachments.php
index e9b3b4158..d226685d3 100644
--- a/datamodels/2.x/itop-attachments/sk.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/sk.dict.itop-attachments.php
@@ -35,6 +35,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Attachments:NoAttachment' => 'Bez prílohy. ',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -57,3 +59,25 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php
index bf0260641..c6f62a915 100644
--- a/datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php
@@ -35,6 +35,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Attachments:NoAttachment' => 'No attachment. ~~',
'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
+ 'Attachments:Render:Icons' => 'Display as icons~~',
+ 'Attachments:Render:Table' => 'Display as list~~',
));
//
@@ -57,3 +59,25 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Attachment/Attribute:contents' => 'Contents~~',
'Class:Attachment/Attribute:contents+' => '~~',
));
+
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+ 'Attachments:File:Thumbnail' => 'Icon~~',
+ 'Attachments:File:Name' => 'File name~~',
+ 'Attachments:File:Date' => 'Upload date~~',
+ 'Attachments:File:Uploader' => 'Uploaded by~~',
+ 'Attachments:File:Size' => 'Size~~',
+ 'Attachments:File:MimeType' => 'Type~~',
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
index bbd4d95f9..ac05938d8 100644
--- a/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
@@ -16,7 +16,6 @@
*
* You should have received a copy of the GNU Affero General Public License
*/
-
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Attachments:TabTitle_Count' => '附件 (%1$d)',
'Attachments:EmptyTabTitle' => '附件',
@@ -65,4 +64,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Attachments:File:Uploader' => '上传者',
'Attachments:File:Size' => '大小',
'Attachments:File:MimeType' => '类型',
-));
\ No newline at end of file
+));
+//
+// Class: Attachment
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+ 'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
+ 'Class:Attachment/Attribute:creation_date+' => '~~',
+ 'Class:Attachment/Attribute:user_id' => 'User id~~',
+ 'Class:Attachment/Attribute:user_id+' => '~~',
+ 'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
+ 'Class:Attachment/Attribute:contact_id+' => '~~',
+));
diff --git a/datamodels/2.x/itop-backup/nl.dict.itop-backup.php b/datamodels/2.x/itop-backup/nl.dict.itop-backup.php
index 7cc50ddc9..fac8cec28 100644
--- a/datamodels/2.x/itop-backup/nl.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/nl.dict.itop-backup.php
@@ -2,9 +2,11 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
- * @author jbostoen (2018)
+ *
+ * @author Hipska (2019)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
@@ -23,25 +25,25 @@
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'bkp-backup-running' => 'Er wordt momenteel een backup genomen. Even geduld...',
- 'bkp-restore-running' => 'Er wordt momenteel een herstel uitgevoerd. Even geduld...',
+ 'bkp-backup-running' => 'Er wordt een backup gemaakt. Even geduld...',
+ 'bkp-restore-running' => 'Er wordt een herstel uitgevoerd. Even geduld...',
'Menu:BackupStatus' => 'Geplande backups',
'bkp-status-title' => 'Geplande backups',
'bkp-status-checks' => 'Instellingen en controles',
'bkp-mysqldump-ok' => 'mysqldump is geïnstalleerd: %1$s',
- 'bkp-mysqldump-notfound' => 'mysqldump kon niet gevonden worden: %1$s - Zorg dat dit geïnstalleerd is in het juiste pad of pas de iTop-configuratie aan ("mysql_bindir")',
- 'bkp-mysqldump-issue' => 'mysqldump kon niet worden uitgevoerd (retcode=%1$d): Zorg dat dit geïnstalleerd is in het juiste pad of pas de iTop-configuratie aan ("mysql_bindir")',
+ 'bkp-mysqldump-notfound' => 'mysqldump is onvindbaar: %1$s - Zorg dat dit geïnstalleerd is in het juiste pad of pas de configuratie aan ("mysql_bindir")',
+ 'bkp-mysqldump-issue' => 'mysqldump kon niet worden uitgevoerd (retcode=%1$d): Zorg dat dit geïnstalleerd is in het juiste pad of pas de configuratie aan ("mysql_bindir")',
'bkp-missing-dir' => 'De doelmap %1$s is niet toegankelijk.',
'bkp-free-disk-space' => '%1$s vrij in %2$s',
'bkp-dir-not-writeable' => 'Geen schrijfrechten op %1$s',
'bkp-wrong-format-spec' => 'Het huidige formaat voor bestandsnamen is ongeldig (%1$s). Een standaardformaat wordt toegepast: %2$s',
- 'bkp-name-sample' => 'Backupbestanden krijgen een naam gebaseerd op de naam van het databaseschema, datum en tijd. Voorbeeld: %1$s',
+ 'bkp-name-sample' => 'Backupbestanden krijgen een naam gebaseerd op de identificatiegegevens van het databaseschema, datum en tijd. Voorbeeld: %1$s',
'bkp-week-days' => 'Backups gebeuren elke %1$s om %2$s',
'bkp-retention' => 'Maximaal %1$d backup-bestanden blijven bewaard in de doelmap.',
'bkp-next-to-delete' => 'Zal verwijderd worden bij de volgende backuptaak (volgens de instelling "retention_count")',
'bkp-table-file' => 'Bestand',
- 'bkp-table-file+' => 'Enkel .ZIP-bestanden worden beschouwd als backupbestanden.',
+ 'bkp-table-file+' => 'Enkel .ZIP-bestanden worden herkend als backupbestanden.',
'bkp-table-size' => 'Grootte',
'bkp-table-size+' => '',
'bkp-table-actions' => 'Acties',
@@ -49,12 +51,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'bkp-status-backups-auto' => 'Geplande backups',
'bkp-status-backups-manual' => 'Manuele backups',
'bkp-status-backups-none' => 'Nog geen backups beschikbaar',
- 'bkp-next-backup' => 'De volgende backup wordt genomen op %1$s (%2$s) om %3$s',
+ 'bkp-next-backup' => 'De volgende backup wordt gemaakt op %1$s (%2$s) om %3$s',
'bkp-button-backup-now' => 'Maak nu een backup',
'bkp-button-restore-now' => 'Herstel',
- 'bkp-confirm-backup' => 'Bevestig dat de backup nu genomen mag worden.',
+ 'bkp-confirm-backup' => 'Bevestig dat de backup nu gemaakt mag worden.',
'bkp-confirm-restore' => 'Bevestig dat je deze backup wil herstellen: %1$s.',
- 'bkp-wait-backup' => 'Wacht tot de backup genomen is...',
+ 'bkp-wait-backup' => 'Wacht tot de backup gemaakt is...',
'bkp-wait-restore' => 'Wacht tot de backup hersteld is...',
- 'bkp-success-restore' => 'Herstel is geslaagd.',
+ 'bkp-success-restore' => 'Herstel is succesvol voltooid.',
));
diff --git a/datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php
index 4ce3410ea..dfbd35482 100644
--- a/datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php
@@ -2,11 +2,11 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*
* @author Hipska (2018)
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
@@ -136,7 +136,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Change/Attribute:related_incident_list+' => 'Alle incidenten gerelateerd aan deze change',
'Class:Change/Attribute:child_changes_list' => 'Subchanges',
'Class:Change/Attribute:child_changes_list+' => 'Alle subchanges gerelateerd aan deze change',
- 'Class:Change/Attribute:parent_id_friendlyname' => 'Hoofdchange friendly name',
+ 'Class:Change/Attribute:parent_id_friendlyname' => 'Hoofdchange herkenbare naam',
'Class:Change/Attribute:parent_id_friendlyname+' => '',
'Class:Change/Attribute:parent_id_finalclass_recall' => 'Changetype',
'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
diff --git a/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
index ecac33bfd..7ba34c06c 100644
--- a/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
@@ -1,5 +1,5 @@
(2018 - 2020)
*
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
@@ -122,7 +122,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Change/Attribute:related_problems_list+' => 'Alle problemen gerelateerd aan deze change',
'Class:Change/Attribute:child_changes_list' => 'Subchanges',
'Class:Change/Attribute:child_changes_list+' => 'Alle subchanges gerelateerd aan deze change',
- 'Class:Change/Attribute:parent_id_friendlyname' => 'Hoofdchange friendly name',
+ 'Class:Change/Attribute:parent_id_friendlyname' => 'Hoofdchange herkenbare naam',
'Class:Change/Attribute:parent_id_friendlyname+' => '',
'Class:Change/Stimulus:ev_assign' => 'Wijs toe',
'Class:Change/Stimulus:ev_assign+' => '',
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index df0926ff0..d17ce2aae 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -8529,7 +8529,37 @@
../css/ui-lightness/jqueryui.scss
../css/light-grey.scss
-
+
+
+
+ #C53030
+ #F6F6F6
+ grayscale(1)
+ #4A5568
+
+
+ ../css/css-variables.scss
+
+
+ ../css/ui-lightness/jqueryui.scss
+ ../css/light-grey.scss
+
+
+
+
+ #2B6CB0
+ #F6F6F6
+ hue-rotate(-139deg)
+ #2C5282
+
+
+ ../css/css-variables.scss
+
+
+ ../css/ui-lightness/jqueryui.scss
+ ../css/light-grey.scss
+
+
diff --git a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
index be937b0bd..cf18fe297 100644
--- a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
@@ -1,5 +1,5 @@
(2018 - 2020)
*
* @copyright Copyright (C) 2010-2018 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
@@ -36,9 +36,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Relation:impacts/DownStream' => 'Impact op...',
'Relation:impacts/DownStream+' => 'Elementen hebben impact op',
'Relation:impacts/UpStream' => 'Is afhankelijk van...',
- 'Relation:impacts/UpStream+' => 'Elementen waarvan dit element afhankelijk van is',
+ 'Relation:impacts/UpStream+' => 'Elementen waar dit object impact op heeft',
// Legacy entries
- 'Relation:depends on/Description' => 'Elementen waarvan dit element afhankelijk van is',
+ 'Relation:depends on/Description' => 'Elementen waarvan dit object afhankelijk van is',
'Relation:depends on/DownStream' => 'Is afhankelijk van...',
'Relation:depends on/UpStream' => 'Impact op...',
));
@@ -112,7 +112,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Organization/Attribute:overview' => 'Overzicht',
'Organization:Overview:FunctionalCIs' => 'Configuratie-items van deze organisatie',
'Organization:Overview:FunctionalCIs:subtitle' => 'per type',
- 'Organization:Overview:Users' => 'iTop Users in deze organisatie',
+ 'Organization:Overview:Users' => 'iTop-gebruikers in deze organisatie',
));
//
@@ -121,7 +121,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Location' => 'Locatie',
- 'Class:Location+' => 'Een type locatie zoals: regio, land, gemeente/stad, gebouw, verdieping, kamer, ...',
+ 'Class:Location+' => 'Een locatie zoals: land, regio, gemeente/stad, gebouw, verdieping, kamer, ...',
'Class:Location/Attribute:name' => 'Naam',
'Class:Location/Attribute:name+' => '',
'Class:Location/Attribute:status' => 'Status',
@@ -143,9 +143,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Location/Attribute:country' => 'Land',
'Class:Location/Attribute:country+' => '',
'Class:Location/Attribute:physicaldevice_list' => 'Apparaten',
- 'Class:Location/Attribute:physicaldevice_list+' => 'Alle apparaten die zich bevinden op deze locatie',
+ 'Class:Location/Attribute:physicaldevice_list+' => 'Alle apparaten die zich op deze locatie bevinden',
'Class:Location/Attribute:person_list' => 'Contacten',
- 'Class:Location/Attribute:person_list+' => 'Alle contacten die zich bevinden op deze locatie',
+ 'Class:Location/Attribute:person_list+' => 'Alle contacten die zich op deze locatie bevinden',
));
//
@@ -171,7 +171,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Contact/Attribute:email+' => '',
'Class:Contact/Attribute:phone' => 'Telefoon',
'Class:Contact/Attribute:phone+' => '',
- 'Class:Contact/Attribute:notify' => 'Notificatie',
+ 'Class:Contact/Attribute:notify' => 'Melding',
'Class:Contact/Attribute:notify+' => '',
'Class:Contact/Attribute:notify/Value:no' => 'Nee',
'Class:Contact/Attribute:notify/Value:no+' => 'Nee',
@@ -179,7 +179,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Contact/Attribute:notify/Value:yes+' => 'Ja',
'Class:Contact/Attribute:function' => 'Functie',
'Class:Contact/Attribute:function+' => '',
- 'Class:Contact/Attribute:cis_list' => 'CIs',
+ 'Class:Contact/Attribute:cis_list' => 'CI\'s',
'Class:Contact/Attribute:cis_list+' => 'Alle configuratie-items die gerelateerd zijn aan dit team',
'Class:Contact/Attribute:finalclass' => 'Subklasse contact',
'Class:Contact/Attribute:finalclass+' => '',
@@ -201,8 +201,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Person/Attribute:mobile_phone' => 'Mobiele telefoon',
'Class:Person/Attribute:mobile_phone+' => '',
'Class:Person/Attribute:location_id' => 'Locatie',
- 'Class:Person/Attribute:location_id+' => '',
- 'Class:Person/Attribute:location_name' => 'Locatie waar de persoon gecontacteerd kan worden',
+ 'Class:Person/Attribute:location_id+' => 'Locatie waar de persoon gecontacteerd kan worden',
+ 'Class:Person/Attribute:location_name' => 'Naam locatie',
'Class:Person/Attribute:location_name+' => '',
'Class:Person/Attribute:manager_id' => 'Manager',
'Class:Person/Attribute:manager_id+' => '',
@@ -212,7 +212,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Person/Attribute:team_list+' => 'Alle teams waarvan deze persoon lid is',
'Class:Person/Attribute:tickets_list' => 'Tickets',
'Class:Person/Attribute:tickets_list+' => 'Alle tickets waarvan deze persoon de aanvrager is',
- 'Class:Person/Attribute:manager_id_friendlyname' => 'Volledige naam manager',
+ 'Class:Person/Attribute:manager_id_friendlyname' => 'Herkenbare naam manager',
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Foto',
'Class:Person/Attribute:picture+' => 'Foto van de contactpersoon',
@@ -232,7 +232,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Team/Attribute:persons_list' => 'Leden',
'Class:Team/Attribute:persons_list+' => 'Alle personen die lid zijn van dit team',
'Class:Team/Attribute:tickets_list' => 'Tickets',
- 'Class:Team/Attribute:tickets_list+' => 'Alle tickets die gelinkt zijn aan dit team',
+ 'Class:Team/Attribute:tickets_list+' => 'Alle tickets die toegewezen zijn aan dit team',
));
//
@@ -264,7 +264,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Document/Attribute:status/Value:obsolete+' => '',
'Class:Document/Attribute:status/Value:published' => 'Gepubliceerd',
'Class:Document/Attribute:status/Value:published+' => '',
- 'Class:Document/Attribute:cis_list' => 'CIs',
+ 'Class:Document/Attribute:cis_list' => 'CI\'s',
'Class:Document/Attribute:cis_list+' => 'Alle configuratie-items gerelateerd aan dit document',
'Class:Document/Attribute:contracts_list' => 'Contracten',
'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
@@ -333,7 +333,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:FunctionalCI/Attribute:move2production' => 'Datum ingebruikname',
'Class:FunctionalCI/Attribute:move2production+' => '',
'Class:FunctionalCI/Attribute:contacts_list' => 'Contacten',
- 'Class:FunctionalCI/Attribute:contacts_list+' => 'Alle contacten voor dit configuratie-item',
+ 'Class:FunctionalCI/Attribute:contacts_list+' => 'Alle contacten gelinkt aan dit configuratie-item',
'Class:FunctionalCI/Attribute:documents_list' => 'Documenten',
'Class:FunctionalCI/Attribute:documents_list+' => 'Alle documenten gelinkt aan dit configuratie-item.',
'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applicatieoplossingen',
@@ -430,7 +430,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:MobilePhone' => 'Mobiele Telefoon',
+ 'Class:MobilePhone' => 'Mobiele telefoon',
'Class:MobilePhone+' => '',
'Class:MobilePhone/Attribute:imei' => 'IMEI',
'Class:MobilePhone/Attribute:imei+' => '',
@@ -443,7 +443,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:IPPhone' => 'IP-Telefoon',
+ 'Class:IPPhone' => 'IP-telefoon',
'Class:IPPhone+' => '',
));
@@ -462,7 +462,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:ConnectableCI' => 'Aansluitbaar CI',
- 'Class:ConnectableCI+' => 'Fysieke CI',
+ 'Class:ConnectableCI+' => 'Fysiek CI',
'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netwerkapparaten',
'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Alle netwerkapparaten die verbonden zijn met dit apparaat',
'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netwerkinterfaces',
@@ -474,7 +474,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:DatacenterDevice' => 'Datacenter Apparaat',
+ 'Class:DatacenterDevice' => 'Datacenterapparaat',
'Class:DatacenterDevice+' => '',
'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
'Class:DatacenterDevice/Attribute:rack_id+' => '',
@@ -705,7 +705,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:ApplicationSolution' => 'Applicatie-oplossing',
'Class:ApplicationSolution+' => '',
- 'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
+ 'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CI\'s',
'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle configuratie-items die deze applicatie-oplossing tot stand brengen',
'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Bedrijfsprocessen',
'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle bedrijfsprocessen die afhankelijk zijn van deze applicatie-oplossing',
@@ -717,7 +717,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'Inactief',
'Class:ApplicationSolution/Attribute:redundancy' => 'Impactanalyse: configuratie van de redundantie',
'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'De oplossing werkt als alle configuratie-items actief zijn',
- 'Class:ApplicationSolution/Attribute:redundancy/count' => 'De oplossing werkt als minstens %1$s CI(s) actief is/zijn',
+ 'Class:ApplicationSolution/Attribute:redundancy/count' => 'De oplossing werkt als minstens %1$s configuratie-item(s) actief is/zijn',
'Class:ApplicationSolution/Attribute:redundancy/percent' => 'De oplossing werkt als minstens %1$s %% van de configuratie-items actief zijn',
));
@@ -786,7 +786,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:DBServer' => 'Databaseserver',
'Class:DBServer+' => '',
'Class:DBServer/Attribute:dbschema_list' => 'Databaseschema\'s',
- 'Class:DBServer/Attribute:dbschema_list+' => 'Alle databaseschemas voor deze databaseserver',
+ 'Class:DBServer/Attribute:dbschema_list+' => 'Alle databaseschema\'s voor deze databaseserver',
));
//
@@ -814,7 +814,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:OtherSoftware' => 'Overige Software',
+ 'Class:OtherSoftware' => 'Overige software',
'Class:OtherSoftware+' => '',
));
@@ -865,7 +865,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:VirtualDevice' => 'Virtueel Apparaat',
+ 'Class:VirtualDevice' => 'Virtueel apparaat',
'Class:VirtualDevice+' => '',
'Class:VirtualDevice/Attribute:status' => 'Status',
'Class:VirtualDevice/Attribute:status+' => '',
@@ -886,7 +886,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:VirtualHost' => 'Virtuele Host',
+ 'Class:VirtualHost' => 'Virtuele host',
'Class:VirtualHost+' => '',
'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtuele machines',
'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Alle virtuele machines die op deze host draaien',
@@ -929,7 +929,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:VirtualMachine' => 'Virtuele Machine',
+ 'Class:VirtualMachine' => 'Virtuele machine',
'Class:VirtualMachine+' => '',
'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuele host',
'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
@@ -962,7 +962,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:LogicalVolume' => 'Logisch Volume',
+ 'Class:LogicalVolume' => 'Logisch volume',
'Class:LogicalVolume+' => '',
'Class:LogicalVolume/Attribute:name' => 'Naam',
'Class:LogicalVolume/Attribute:name+' => '',
@@ -1008,7 +1008,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
+ 'Class:lnkVirtualDeviceToVolume' => 'Link Virtueel apparaat / Volume',
'Class:lnkVirtualDeviceToVolume+' => '',
'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
@@ -1027,7 +1027,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter-apparaat',
+ 'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenterapparaat',
'Class:lnkSanToDatacenterDevice+' => '',
'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN-switch',
'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
@@ -1100,17 +1100,17 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Software/Attribute:documents_list+' => 'Alle documenten gelinkt aan deze software',
'Class:Software/Attribute:type' => 'Type',
'Class:Software/Attribute:type+' => '',
- 'Class:Software/Attribute:type/Value:DBServer' => 'DatabaseServer',
- 'Class:Software/Attribute:type/Value:DBServer+' => 'DB DatabaseServer',
+ 'Class:Software/Attribute:type/Value:DBServer' => 'Databaseserver',
+ 'Class:Software/Attribute:type/Value:DBServer+' => 'Databaseserver',
'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
- 'Class:Software/Attribute:type/Value:OtherSoftware' => 'Overige Software',
- 'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Overige Software',
+ 'Class:Software/Attribute:type/Value:OtherSoftware' => 'Overige software',
+ 'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Overige software',
'Class:Software/Attribute:type/Value:PCSoftware' => 'PC-software',
'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC-software',
'Class:Software/Attribute:type/Value:WebServer' => 'Webserver',
'Class:Software/Attribute:type/Value:WebServer+' => 'Webserver',
- 'Class:Software/Attribute:softwareinstance_list' => 'Software Instanties',
+ 'Class:Software/Attribute:softwareinstance_list' => 'Software-instanties',
'Class:Software/Attribute:softwareinstance_list+' => 'Alle software-instanties van deze software',
'Class:Software/Attribute:softwarepatch_list' => 'Softwarepatches',
'Class:Software/Attribute:softwarepatch_list+' => 'Alle patches voor deze software',
@@ -1205,7 +1205,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:OSLicence' => 'Licentie Besturingssysteem',
+ 'Class:OSLicence' => 'Besturingssysteemlicentie',
'Class:OSLicence+' => '',
'Class:OSLicence/Attribute:osversion_id' => 'Versie besturingssysteem',
'Class:OSLicence/Attribute:osversion_id+' => '',
@@ -1222,7 +1222,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:SoftwareLicence' => 'Licentie Software',
+ 'Class:SoftwareLicence' => 'Softwarelicentie',
'Class:SoftwareLicence+' => '',
'Class:SoftwareLicence/Attribute:software_id' => 'Software',
'Class:SoftwareLicence/Attribute:software_id+' => '',
@@ -1336,8 +1336,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
'Class:Model/Attribute:type/Value:IPPhone' => 'IP-telefoon',
'Class:Model/Attribute:type/Value:IPPhone+' => 'IP-telefoon',
- 'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiele Telefoon',
- 'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobiele Telefoon',
+ 'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiele telefoon',
+ 'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobiele telefoon',
'Class:Model/Attribute:type/Value:NAS' => 'NAS',
'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netwerkapparaat',
@@ -1378,7 +1378,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:NetworkDeviceType' => 'Soort netwerkapparaat',
'Class:NetworkDeviceType+' => '',
'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netwerkapparaten',
- 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Alle netwerkapparaten van dit type',
+ 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Alle netwerkapparaten van deze soort',
));
//
@@ -1600,13 +1600,13 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:PhysicalInterface' => 'Fysieke Interface',
+ 'Class:PhysicalInterface' => 'Fysieke interface',
'Class:PhysicalInterface+' => '',
'Class:PhysicalInterface/Attribute:connectableci_id' => 'Apparaat',
'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
'Class:PhysicalInterface/Attribute:connectableci_name' => 'Naam apparaat',
'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
- 'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
+ 'Class:PhysicalInterface/Attribute:vlans_list' => 'VLAN\'s',
'Class:PhysicalInterface/Attribute:vlans_list+' => '',
));
@@ -1615,7 +1615,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
+ 'Class:lnkPhysicalInterfaceToVLAN' => 'Link Fysieke interface / VLAN',
'Class:lnkPhysicalInterfaceToVLAN+' => '',
'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fysieke interface',
'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
@@ -1637,7 +1637,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:LogicalInterface' => 'Logische Interface',
+ 'Class:LogicalInterface' => 'Logische interface',
'Class:LogicalInterface+' => '',
'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuele machine',
'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
@@ -1700,11 +1700,11 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:lnkApplicationSolutionToFunctionalCI+' => '',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applicatie-oplossing',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Naam pplicatie-oplossing',
+ 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Naam applicatie-oplossing',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
- 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Naam functionele CI',
+ 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
));
@@ -1776,7 +1776,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Group/Attribute:parent_id+' => '',
'Class:Group/Attribute:parent_name' => 'Naam',
'Class:Group/Attribute:parent_name+' => '',
- 'Class:Group/Attribute:ci_list' => 'Gelinkte CIs',
+ 'Class:Group/Attribute:ci_list' => 'Gelinkte CI\'s',
'Class:Group/Attribute:ci_list+' => 'Alle configuratie-items gelinkt aan deze groep',
'Class:Group/Attribute:parent_id_friendlyname' => 'Hoofdgroep',
'Class:Group/Attribute:parent_id_friendlyname+' => '',
@@ -1818,7 +1818,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Menu:Organization' => 'Organisaties',
'Menu:Organization+' => 'Alle organisaties',
'Menu:Application' => 'Applicaties',
- 'Menu:Application+' => 'Alle Applicaties',
+ 'Menu:Application+' => 'Alle applicaties',
'Menu:DBServer' => 'Databaseservers',
'Menu:DBServer+' => 'Databaseservers',
'Menu:ConfigManagement' => 'Configuratiebeheer',
@@ -1877,8 +1877,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Menu:ConfigManagement:EndUsers' => 'Apparaten van eindgebruikers',
'Menu:ConfigManagement:SWAndApps' => 'Software en applicaties',
'Menu:ConfigManagement:Misc' => 'Diversen',
- 'Menu:Group' => 'Groepen van CIs',
- 'Menu:Group+' => 'Groepen van CIs',
+ 'Menu:Group' => 'Groepen van CI\'s',
+ 'Menu:Group+' => 'Groepen van CI\'s',
'Menu:ConfigManagement:Shortcuts' => 'Snelkoppelingen',
'Menu:ConfigManagement:AllContacts' => 'Alle contacten: %1$d',
'Menu:Typology' => 'Configuratie typologie',
@@ -1903,7 +1903,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Server:power' => 'Stroomtoevoer',
'Person:info' => 'Globale informatie',
'Person:personal_info' => 'Persoonlijke informatie',
- 'Person:notifiy' => 'Notificatie',
+ 'Person:notifiy' => 'Notificeer',
'Class:Subnet/Tab:IPUsage' => 'IP-gebruik',
'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces met een IP-adres in de reeks: %1$s tot en met %2$s',
'Class:Subnet/Tab:FreeIPs' => 'Beschikbare IP-adressen',
diff --git a/datamodels/2.x/itop-config/nl.dict.itop-config.php b/datamodels/2.x/itop-config/nl.dict.itop-config.php
index 0d0020f44..6eec5f1b8 100644
--- a/datamodels/2.x/itop-config/nl.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/nl.dict.itop-config.php
@@ -2,9 +2,9 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
@@ -24,16 +24,16 @@
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Menu:ConfigEditor' => 'Configuratie',
- 'config-edit-title' => 'Configuratie-editor',
+ 'config-edit-title' => 'Aanpassen configuratie',
'config-edit-intro' => 'Wees uiterst voorzichtig bij het aanpassen van de configuratie.',
'config-apply' => 'Opslaan',
'config-apply-title' => 'Opslaan (Ctrl+S)',
- 'config-cancel' => 'Herbeginnen',
- 'config-saved' => 'Wijzigingen opgeslagen',
- 'config-confirm-cancel' => 'Je wijzigingen zullen verloren gaan',
+ 'config-cancel' => 'Herbegin',
+ 'config-saved' => 'Wijzigingen zijn opgeslagen.',
+ 'config-confirm-cancel' => 'Je wijzigingen zullen verloren gaan.',
'config-no-change' => 'Er zijn geen wijzigingen vastgesteld.',
'config-reverted' => 'De wijzigingen zijn ongedaan gemaakt.',
'config-parse-error' => 'Regel %2$d: %1$s.
Het bestand werd NIET opgeslagen.',
'config-current-line' => 'Huidige regel: %1$s',
- 'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+ 'config-saved-warning-db-password' => 'Wijzigingen zijn opgeslagen, maar de backup zal niet werken doordat het databasewachtwoord karakters bevat die niet ondersteund zijn.',
));
diff --git a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
index 222b978ae..db1cef907 100644
--- a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
index 77ad26411..f5609070d 100644
--- a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
index 0e1932dc8..51fd11848 100644
--- a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('DE DE', 'German', 'Deutsch', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
index d9e4534a6..2d56da7cd 100644
--- a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
index 52dac7d0e..bb1f926c9 100644
--- a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
@@ -26,7 +26,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'itop-core-update:UI:ConfirmUpdate' => 'Confirmation de la mise à jour',
'itop-core-update:UI:UpdateCoreFiles' => 'Mise à jour en cours',
'iTopUpdate:UI:MaintenanceModeActive' => 'L\'application est actuellement en maintenance en mode lecture seule. Vous pouvez lancer un Setup pour retourner dans un mode normal.',
- 'itop-core-update:UI:UpdateDone' => 'Mise à jour effectuée',
+ 'itop-core-update:UI:UpdateDone' => 'Mise à jour effectuée',
'itop-core-update/Operation:SelectUpdateFile/Title' => 'Mise à jour',
'itop-core-update/Operation:ConfirmUpdate/Title' => 'Mise à jour',
@@ -43,7 +43,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'iTopUpdate:UI:Cancel' => 'Annuler',
'iTopUpdate:UI:Continue' => 'Continuer',
'iTopUpdate:UI:RunSetup' => 'Lancer le Setup',
- 'iTopUpdate:UI:WithDBBackup' => 'Sauvegarde de la base de données',
+ 'iTopUpdate:UI:WithDBBackup' => 'Sauvegarde de la base de données',
'iTopUpdate:UI:WithFilesBackup' => 'Archive des fichiers de l\'application',
'iTopUpdate:UI:WithoutBackup' => 'Pas de sauvegarde',
'iTopUpdate:UI:Backup' => 'Sauvegarde effectuée avant la mise à jour',
diff --git a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
index cc83cc867..b81aced19 100644
--- a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
index f7b64c168..e3aa5d0de 100644
--- a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
index cfaa10f56..a82b9cef5 100644
--- a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
index 888db9326..56d9dc926 100644
--- a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
@@ -19,90 +19,100 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
+ *
+ * @author Jeffrey Bostoen - (2018 - 2020)
*/
-
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
- 'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
- 'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
- 'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
- 'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
- 'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
- 'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
- 'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
- 'iTopUpdate:UI:Back' => 'Back~~',
- 'iTopUpdate:UI:Cancel' => 'Cancel~~',
- 'iTopUpdate:UI:Continue' => 'Continue~~',
- 'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
- 'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
- 'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
- 'iTopUpdate:UI:Backup' => 'Backup generated before update~~',
- 'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
- 'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
- 'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:PageTitle' => 'Upgraden toepassing',
+ 'itop-core-update:UI:SelectUpdateFile' => 'Upgrade',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Upgrade',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Upgrade',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'De onderhoudsmode van deze toepassing is actief. Geen enkele gebruiker heeft momenteel toegang. Voer een setup of herstel uit om de onderhoudsmode te deactiveren.',
+ 'itop-core-update:UI:UpdateDone' => 'Upgrade voltooid',
- 'iTopUpdate:UI:Status' => 'Status~~',
- 'iTopUpdate:UI:Action' => 'Update~~',
- 'iTopUpdate:UI:History' => 'Versions History~~',
- 'iTopUpdate:UI:Progress' => 'Progress of the upgrade~~',
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Upgrade',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Upgrade',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Upgrade',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Upgrade voltooid',
+
+ 'iTopUpdate:UI:SelectUpdateFile' => 'Selecteer een upgrade-bestand om te uploaden',
+ 'iTopUpdate:UI:CheckUpdate' => 'Verifieer upgrade-bestand',
+ 'iTopUpdate:UI:ConfirmInstallFile' => 'Er zal een upgrade uitgevoerd worden met %1$s',
+ 'iTopUpdate:UI:DoUpdate' => 'Upgrade',
+ 'iTopUpdate:UI:CurrentVersion' => 'Versienummer huidige installatie',
+ 'iTopUpdate:UI:Back' => 'Vorige',
+ 'iTopUpdate:UI:Cancel' => 'Annuleer',
+ 'iTopUpdate:UI:Continue' => 'Volgende',
+ 'iTopUpdate:UI:RunSetup' => 'Setup uitvoeren',
+ 'iTopUpdate:UI:WithDBBackup' => 'Backup database',
+ 'iTopUpdate:UI:WithFilesBackup' => 'Backup toepassingsbestanden',
+ 'iTopUpdate:UI:WithoutBackup' => 'Er is geen backup gepland',
+ 'iTopUpdate:UI:Backup' => 'Er is een backup gegenereerd voorafgaand aan de installatie',
+ 'iTopUpdate:UI:DoFilesArchive' => 'Archiveer toepassingsbestanden',
+ 'iTopUpdate:UI:UploadArchive' => 'Selecteer een archief om te uploaden',
+ 'iTopUpdate:UI:ServerFile' => 'Het pad van dit archief bestaat al op de server',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'Tijdens de upgrade zal de applicatie enkel toegankelijk zijn als "alleen lezen".',
- 'iTopUpdate:UI:DoBackup:Label' => 'Backup files and database~~',
- 'iTopUpdate:UI:DoBackup:Warning' => 'Backup is not recommended due to limited available disk space~~',
+ 'iTopUpdate:UI:Status' => 'Status',
+ 'iTopUpdate:UI:Action' => 'Update',
+ 'iTopUpdate:UI:History' => 'Versiegeschiedenis',
+ 'iTopUpdate:UI:Progress' => 'Voortgang van de upgrade',
- 'iTopUpdate:UI:DiskFreeSpace' => 'Disk free space~~',
- 'iTopUpdate:UI:ItopDiskSpace' => 'iTop disk space~~',
- 'iTopUpdate:UI:DBDiskSpace' => 'Database disk space~~',
- 'iTopUpdate:UI:FileUploadMaxSize' => 'File upload max size~~',
+ 'iTopUpdate:UI:DoBackup:Label' => 'Maak een backup van de bestanden en database',
+ 'iTopUpdate:UI:DoBackup:Warning' => 'Een backup maken wordt afgeraden doordat er weinig schijfruimte is',
- 'iTopUpdate:UI:PostMaxSize' => 'PHP ini value post_max_size: %1$s~~',
- 'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini value upload_max_filesize: %1$s~~',
+ 'iTopUpdate:UI:DiskFreeSpace' => 'Vrije schijfruimte',
+ 'iTopUpdate:UI:ItopDiskSpace' => 'iTop schijfgebruik',
+ 'iTopUpdate:UI:DBDiskSpace' => 'Database schijfgebruik',
+ 'iTopUpdate:UI:FileUploadMaxSize' => 'Maximale bestandsgrootte (upload)',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Checking filesystem~~',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Checking filesystem failed (%1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Checking filesystem failed (File not exist %1$s)~~',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Checking filesystem failed~~',
- 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~',
- 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
+ 'iTopUpdate:UI:PostMaxSize' => 'PHP ini-waarde post_max_size: %1$s',
+ 'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini-waarde upload_max_filesize: %1$s',
+
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Controle van het bestandssysteem',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Controle van het bestandssysteem is mislukt (%1$s)',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Controle van het bestandssysteem mislukt (Bestand bestaat niet: %1$s)',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Controle van het bestandssysteem is mislukt',
+ 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Updaten van toepassing is mogelijk',
+ 'iTopUpdate:UI:CanCoreUpdate:No' => 'Updaten van de toepassing is niet mogelijk: %1$s',
// Setup Messages
- 'iTopUpdate:UI:SetupMessage:Ready' => 'Ready to start~~',
- 'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Entering maintenance mode~~',
- 'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
- 'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
- 'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
- 'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
- 'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
+ 'iTopUpdate:UI:SetupMessage:Ready' => 'Klaar om verder te gaan',
+ 'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Activeren van onderhoudsmode',
+ 'iTopUpdate:UI:SetupMessage:Backup' => 'Maken van backup database',
+ 'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archiveren van de toepassingsbestanden',
+ 'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Kopiëren van nieuwe versies van bestanden',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgraden van toepassing en database',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgraden van database',
+ 'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Deactiveren van onderhoudsmode',
+ 'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade voltooid',
// Errors
- 'iTopUpdate:Error:MissingFunction' => 'Impossible to start upgrade, missing function~~',
- 'iTopUpdate:Error:MissingFile' => 'Missing file: %1$s~~',
- 'iTopUpdate:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'iTopUpdate:Error:BadFileFormat' => 'Upgrade file is not a zip file~~',
- 'iTopUpdate:Error:BadFileContent' => 'Upgrade file is not an application archive~~',
- 'iTopUpdate:Error:BadItopProduct' => 'Upgrade file is not compatible with your application~~',
- 'iTopUpdate:Error:Copy' => 'Error, cannot copy \'%1$s\' to \'%2$s\'~~',
- 'iTopUpdate:Error:FileNotFound' => 'File not found~~',
- 'iTopUpdate:Error:NoFile' => 'No file provided~~',
- 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~',
- 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~',
- 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~',
+ 'iTopUpdate:Error:MissingFunction' => 'Onmogelijk om de upgrade te starten, een functie ontbreekt',
+ 'iTopUpdate:Error:MissingFile' => 'Bestand ontbreekt: %1$s',
+ 'iTopUpdate:Error:CorruptedFile' => 'Bestand %1$s is corrupt',
+ 'iTopUpdate:Error:BadFileFormat' => 'Upgradebestand is geen ZIP-bestand',
+ 'iTopUpdate:Error:BadFileContent' => 'Upgradebestand is geen toepassingsarchief',
+ 'iTopUpdate:Error:BadItopProduct' => 'Upgradebestand is niet compatibel met jouw toepassing',
+ 'iTopUpdate:Error:Copy' => 'Fout: kan niet kopiëren van "%1$s" naar "%2$s"',
+ 'iTopUpdate:Error:FileNotFound' => 'Bestand niet gevonden',
+ 'iTopUpdate:Error:NoFile' => 'Geen bestand opgegeven',
+ 'iTopUpdate:Error:InvalidToken' => 'Token ongeldig',
+ 'iTopUpdate:Error:UpdateFailed' => 'Upgrade mislukt',
+ 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'De maximale bestandsgrootte voor uploads lijkt te klein voor deze update. Controleer de PHP-configuratie.',
- 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
- 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
- 'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
- 'Menu:iTopUpdate' => 'Application Upgrade~~',
- 'Menu:iTopUpdate+' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:RestoreArchive' => 'Je kan de toepassing herstellen via het archief "%1$s"',
+ 'iTopUpdate:UI:RestoreBackup' => 'Je kan de database herstellen via het archief "%1$s"',
+ 'iTopUpdate:UI:UpdateDone' => 'Upgrade geslaagd',
+ 'Menu:iTopUpdate' => 'Upgrade toepassing',
+ 'Menu:iTopUpdate+' => 'Upgrade toepassing',
// Missing itop entries
- 'Class:ModuleInstallation/Attribute:installed' => 'Installed on~~',
- 'Class:ModuleInstallation/Attribute:name' => 'Name~~',
- 'Class:ModuleInstallation/Attribute:version' => 'Version~~',
- 'Class:ModuleInstallation/Attribute:comment' => 'Comment~~',
+ 'Class:ModuleInstallation/Attribute:installed' => 'Geïnstalleerd op',
+ 'Class:ModuleInstallation/Attribute:name' => 'Naam',
+ 'Class:ModuleInstallation/Attribute:version' => 'Versie',
+ 'Class:ModuleInstallation/Attribute:comment' => 'Opmerkingen',
));
diff --git a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
index 5a7af7fb2..61f8f7a3e 100644
--- a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
index a36708f5b..c183fc1bd 100644
--- a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
@@ -8,89 +8,98 @@
* @license http://opensource.org/licenses/AGPL-3.0
*
*/
-
Dict::Add('RU RU', 'Russian', 'Русский', array(
'iTopUpdate:UI:PageTitle' => 'Обновление приложения',
- 'itop-core-update:UI:SelectUpdateFile' => 'Обновление',
- 'itop-core-update:UI:ConfirmUpdate' => 'Обновление',
- 'itop-core-update:UI:UpdateCoreFiles' => 'Обновление',
+ 'itop-core-update:UI:SelectUpdateFile' => 'Обновление',
+ 'itop-core-update:UI:ConfirmUpdate' => 'Обновление',
+ 'itop-core-update:UI:UpdateCoreFiles' => 'Обновление',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'В настоящее время приложение находится в режиме технического обслуживания, пользователи не могут получить доступ к приложению. Вы должны запустить программу установки или восстановить архив приложения, чтобы вернуться к нормальному режиму.',
'itop-core-update:UI:UpdateDone' => 'Обновление завершено',
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
+
'iTopUpdate:UI:SelectUpdateFile' => 'Выбор файла обновления',
'iTopUpdate:UI:CheckUpdate' => 'Проверить файл обновления',
'iTopUpdate:UI:ConfirmInstallFile' => 'Вы собираетесь установить %1$s',
'iTopUpdate:UI:DoUpdate' => 'Начать обновление',
'iTopUpdate:UI:CurrentVersion' => 'Текущая версия',
- 'iTopUpdate:UI:Back' => 'Назад',
- 'iTopUpdate:UI:Cancel' => 'Отменть',
- 'iTopUpdate:UI:Continue' => 'Продолжить',
- 'iTopUpdate:UI:WithDBBackup' => 'Резервная копия базы данных',
- 'iTopUpdate:UI:WithFilesBackup' => 'Архив файлов приложения',
- 'iTopUpdate:UI:WithoutBackup' => 'Без резервного копирования',
- 'iTopUpdate:UI:Backup' => 'Резервное копирование перед обновлением',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
+ 'iTopUpdate:UI:Back' => 'Назад',
+ 'iTopUpdate:UI:Cancel' => 'Отменть',
+ 'iTopUpdate:UI:Continue' => 'Продолжить',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
+ 'iTopUpdate:UI:WithDBBackup' => 'Резервная копия базы данных',
+ 'iTopUpdate:UI:WithFilesBackup' => 'Архив файлов приложения',
+ 'iTopUpdate:UI:WithoutBackup' => 'Без резервного копирования',
+ 'iTopUpdate:UI:Backup' => 'Резервное копирование перед обновлением',
'iTopUpdate:UI:DoFilesArchive' => 'Создать архив файлов приложения',
'iTopUpdate:UI:UploadArchive' => 'Выбор пакета для загрузки',
'iTopUpdate:UI:ServerFile' => 'Путь к пакету на сервере',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
- 'iTopUpdate:UI:Status' => 'Статус',
- 'iTopUpdate:UI:Action' => 'Обновление',
- 'iTopUpdate:UI:History' => 'История версий',
- 'iTopUpdate:UI:Progress' => 'Ход обновления',
+ 'iTopUpdate:UI:Status' => 'Статус',
+ 'iTopUpdate:UI:Action' => 'Обновление',
+ 'iTopUpdate:UI:History' => 'История версий',
+ 'iTopUpdate:UI:Progress' => 'Ход обновления',
- 'iTopUpdate:UI:DoBackup:Label' => 'Создать резервную копию базы данных',
- 'iTopUpdate:UI:DoBackup:Warning' => 'Резервное копирование не рекомендуется из-за ограниченного свободного места на диске',
+ 'iTopUpdate:UI:DoBackup:Label' => 'Создать резервную копию базы данных',
+ 'iTopUpdate:UI:DoBackup:Warning' => 'Резервное копирование не рекомендуется из-за ограниченного свободного места на диске',
- 'iTopUpdate:UI:DiskFreeSpace' => 'Доступное дисковое пространство',
- 'iTopUpdate:UI:ItopDiskSpace' => 'Размер приложения',
- 'iTopUpdate:UI:DBDiskSpace' => 'Размер базы данных',
+ 'iTopUpdate:UI:DiskFreeSpace' => 'Доступное дисковое пространство',
+ 'iTopUpdate:UI:ItopDiskSpace' => 'Размер приложения',
+ 'iTopUpdate:UI:DBDiskSpace' => 'Размер базы данных',
'iTopUpdate:UI:FileUploadMaxSize' => 'Максимальный размер загружаемого файла',
'iTopUpdate:UI:PostMaxSize' => 'Значение PHP ini post_max_size: %1$s~~',
'iTopUpdate:UI:UploadMaxFileSize' => 'Значение PHP ini upload_max_filesize: %1$s~~',
- 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Проверка файловой системы',
- 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Ошибка проверки файловой системы (%1$s)',
- 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Ошибка проверки файловой системы (файл не существует %1$s)',
- 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Ошибка проверки файловой системы',
- 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Приложение может быть обновлено',
- 'iTopUpdate:UI:CanCoreUpdate:No' => 'Приложение не может быть обновлено: %1$s',
+ 'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Проверка файловой системы',
+ 'iTopUpdate:UI:CanCoreUpdate:Error' => 'Ошибка проверки файловой системы (%1$s)',
+ 'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'Ошибка проверки файловой системы (файл не существует %1$s)',
+ 'iTopUpdate:UI:CanCoreUpdate:Failed' => 'Ошибка проверки файловой системы',
+ 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Приложение может быть обновлено',
+ 'iTopUpdate:UI:CanCoreUpdate:No' => 'Приложение не может быть обновлено: %1$s',
// Setup Messages
- 'iTopUpdate:UI:SetupMessage:Ready' => 'Всё готово к началу',
+ 'iTopUpdate:UI:SetupMessage:Ready' => 'Всё готово к началу',
'iTopUpdate:UI:SetupMessage:EnterMaintenance' => 'Переход в режим технического обслуживания',
'iTopUpdate:UI:SetupMessage:Backup' => 'Резервное копирование базы данных',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Архивирование файлов приложения',
- 'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Копирование файлов обновления',
+ 'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Копирование файлов обновления',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
'iTopUpdate:UI:SetupMessage:Compile' => 'Обновление приложения и базы данных',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Выход из режима технического обслуживания',
- 'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Обновление завершено',
+ 'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Обновление завершено',
// Errors
'iTopUpdate:Error:MissingFunction' => 'Невозможно запустить обновление, функция отсутствует',
'iTopUpdate:Error:MissingFile' => 'Отсутствует файл: %1$s',
'iTopUpdate:Error:CorruptedFile' => 'Файл %1$s поврежден',
- 'iTopUpdate:Error:BadFileFormat' => 'Файл обновления не является zip-файлом',
- 'iTopUpdate:Error:BadFileContent' => 'Файл обновления не является архивом приложения',
- 'iTopUpdate:Error:BadItopProduct' => 'Файл обновления не совместим с вашим приложением',
+ 'iTopUpdate:Error:BadFileFormat' => 'Файл обновления не является zip-файлом',
+ 'iTopUpdate:Error:BadFileContent' => 'Файл обновления не является архивом приложения',
+ 'iTopUpdate:Error:BadItopProduct' => 'Файл обновления не совместим с вашим приложением',
'iTopUpdate:Error:Copy' => 'Ошибка, не удаётся скопировать \'%1$s\' в \'%2$s\'',
- 'iTopUpdate:Error:FileNotFound' => 'Файл не найден',
- 'iTopUpdate:Error:NoFile' => 'Нет архива',
+ 'iTopUpdate:Error:FileNotFound' => 'Файл не найден',
+ 'iTopUpdate:Error:NoFile' => 'Нет архива',
'iTopUpdate:Error:InvalidToken' => 'Недопустимый токен',
'iTopUpdate:Error:UpdateFailed' => 'Ошибка обновления',
'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'Максимальный размер загрузки недостаточный для обновления. Пожалуйста, измените конфигурацию PHP.',
'iTopUpdate:UI:RestoreArchive' => 'Вы можете восстановить приложение из архива \'%1$s\'',
'iTopUpdate:UI:RestoreBackup' => 'Вы можете восстановить базу данных из резервной копии \'%1$s\'',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'В настоящее время приложение находится в режиме технического обслуживания, пользователи не могут получить доступ к приложению. Вы должны запустить программу установки или восстановить архив приложения, чтобы вернуться к нормальному режиму.',
'iTopUpdate:UI:UpdateDone' => 'Обновление выполнено успешно',
'Menu:iTopUpdate' => 'Обновление приложения',
'Menu:iTopUpdate+' => 'Обновление приложения',
- // Missing itop entries
- 'Class:ModuleInstallation/Attribute:installed' => 'Дата установки',
- 'Class:ModuleInstallation/Attribute:name' => 'Название',
- 'Class:ModuleInstallation/Attribute:version' => 'Версия',
- 'Class:ModuleInstallation/Attribute:comment' => 'Комментарий',
+ // Missing itop entries
+ 'Class:ModuleInstallation/Attribute:installed' => 'Дата установки',
+ 'Class:ModuleInstallation/Attribute:name' => 'Название',
+ 'Class:ModuleInstallation/Attribute:version' => 'Версия',
+ 'Class:ModuleInstallation/Attribute:comment' => 'Комментарий',
));
diff --git a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
index ffc3a5e11..55101d8f2 100644
--- a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
index b55733392..7d8a5878d 100644
--- a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:PageTitle' => 'Application Upgrade~~',
'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => 'Select an upgrade file to upload~~',
'iTopUpdate:UI:CheckUpdate' => 'Verify upgrade file~~',
'iTopUpdate:UI:ConfirmInstallFile' => 'You are about to install %1$s~~',
'iTopUpdate:UI:DoUpdate' => 'Upgrade~~',
'iTopUpdate:UI:CurrentVersion' => 'Current installed version~~',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => 'Back~~',
'iTopUpdate:UI:Cancel' => 'Cancel~~',
'iTopUpdate:UI:Continue' => 'Continue~~',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => 'Database backup~~',
'iTopUpdate:UI:WithFilesBackup' => 'Application files backup~~',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:DoFilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => 'Status~~',
'iTopUpdate:UI:Action' => 'Update~~',
@@ -73,7 +81,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:SetupMessage:Backup' => 'Database backup~~',
'iTopUpdate:UI:SetupMessage:FilesArchive' => 'Archive application files~~',
'iTopUpdate:UI:SetupMessage:CopyFiles' => 'Copy new version files~~',
- 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => 'Upgrade application and database~~',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => 'Exiting maintenance mode~~',
'iTopUpdate:UI:SetupMessage:UpdateDone' => 'Upgrade completed~~',
@@ -93,7 +103,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~',
'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => 'Upgrade successful~~',
'Menu:iTopUpdate' => 'Application Upgrade~~',
'Menu:iTopUpdate+' => 'Application Upgrade~~',
diff --git a/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
index c3ea0518f..3a5ef6400 100644
--- a/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
@@ -20,22 +20,29 @@
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
*/
-
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'iTopUpdate:UI:PageTitle' => '应用升级',
'itop-core-update:UI:SelectUpdateFile' => '应用升级',
'itop-core-update:UI:ConfirmUpdate' => ' 升级',
'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
- 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+ 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
+ 'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+
+ 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+ 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirm Application Upgrade~~',
+ 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Application Upgrading~~',
+ 'itop-core-update/Operation:UpdateDone/Title' => 'Application Upgrade Done~~',
'iTopUpdate:UI:SelectUpdateFile' => '请选择要上传的升级文件',
'iTopUpdate:UI:CheckUpdate' => '校验升级文件',
'iTopUpdate:UI:ConfirmInstallFile' => '即将安装 %1$s',
'iTopUpdate:UI:DoUpdate' => '升级',
'iTopUpdate:UI:CurrentVersion' => '当前已安装的版本',
+ 'iTopUpdate:UI:NewVersion' => 'Newly installed version~~',
'iTopUpdate:UI:Back' => '返回',
'iTopUpdate:UI:Cancel' => '取消',
'iTopUpdate:UI:Continue' => '继续',
+ 'iTopUpdate:UI:RunSetup' => 'Run Setup~~',
'iTopUpdate:UI:WithDBBackup' => '数据库备份',
'iTopUpdate:UI:WithFilesBackup' => '应用文件备份',
'iTopUpdate:UI:WithoutBackup' => 'No backup is planned~~',
@@ -43,6 +50,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'iTopUpdate:UI:DoFilesArchive' => '打包应用文件',
'iTopUpdate:UI:UploadArchive' => 'Select a package to upload~~',
'iTopUpdate:UI:ServerFile' => 'Path of a package already on the server~~',
+ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => 'During the upgrade, the application will be read-only.~~',
'iTopUpdate:UI:Status' => '状态',
'iTopUpdate:UI:Action' => '升级',
@@ -73,7 +81,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'iTopUpdate:UI:SetupMessage:Backup' => '数据库备份',
'iTopUpdate:UI:SetupMessage:FilesArchive' => '打包应用文件',
'iTopUpdate:UI:SetupMessage:CopyFiles' => '复制新文件',
- 'iTopUpdate:UI:SetupMessage:Compile' => '升级应用程序和数据库',
+ 'iTopUpdate:UI:SetupMessage:CheckCompile' => 'Check application upgrade~~',
+ 'iTopUpdate:UI:SetupMessage:Compile' => '升级应用程序和数据库',
+ 'iTopUpdate:UI:SetupMessage:UpdateDatabase' => 'Upgrade database~~',
'iTopUpdate:UI:SetupMessage:ExitMaintenance' => '正在退出维护模式',
'iTopUpdate:UI:SetupMessage:UpdateDone' => '升级完成',
@@ -93,7 +103,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'iTopUpdate:UI:RestoreArchive' => '您可以从归档文件 \'%1$s\' 还原应用程序',
'iTopUpdate:UI:RestoreBackup' => '您可以从 \'%1$s\' 还原数据库',
- 'iTopUpdate:UI:MaintenanceModeActive' => 'The application is currently under maintenance, no user can access the application. You have to run a setup or restore the application archive to return in normal mode.~~',
'iTopUpdate:UI:UpdateDone' => '升级成功',
'Menu:iTopUpdate' => '应用升级',
'Menu:iTopUpdate+' => '应用升级',
diff --git a/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php
index 5db913e94..a2d8201e6 100644
--- a/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php
@@ -19,13 +19,15 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see
+ *
+ * @author Jeffrey Bostoen - (2018 - 2020)
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
// Errors
- 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
- 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
- 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
+ 'FilesInformation:Error:MissingFile' => 'Ontbrekend bestand: %1$s',
+ 'FilesInformation:Error:CorruptedFile' => 'Corrupt bestand: %1$s',
+ 'FilesInformation:Error:CantWriteToFile' => 'Kan niet schrijven naar bestand %1$s',
));
diff --git a/datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php
index 529aa2288..edb410166 100644
--- a/datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php
@@ -2,9 +2,9 @@
/**
* Localized data
*
- * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @copyright Copyright (C) 2010-2019 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*
* This file is part of iTop.
*
@@ -26,19 +26,19 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Menu:iTopHub' => 'iTop Hub',
'Menu:iTopHub:Register' => 'Verbinding maken met iTop Hub',
'Menu:iTopHub:Register+' => 'Ga naar de iTop Hub om je iTop bij te werken.',
- 'Menu:iTopHub:Register:Description' => 'Verkrijg toegang tot jouw iTop Hub (community platform)!Je vindt er alle informatie die je nodig hebt, je kan je omgevingen beheren met gepersonaliseerde tools en extensies.
Door van hieruit te verbinden met de Hub, stuur je informatie over deze iTop-mgeving naar de Hub.
',
+ 'Menu:iTopHub:Register:Description' => 'Verkrijg toegang tot jouw iTop Hub (community platform)!Je vindt er alle informatie die je nodig hebt. Je kan je omgevingen beheren met gepersonaliseerde tools en extensies.
Door van hieruit te verbinden met de Hub, stuur je informatie over deze iTop-omgeving naar de Hub.
',
'Menu:iTopHub:MyExtensions' => 'Mijn extensies',
'Menu:iTopHub:MyExtensions+' => 'Bekijk de lijst van extensies die je gebruikt in deze iTop-omgeving.',
'Menu:iTopHub:BrowseExtensions' => 'Vind extensies op iTop Hub',
'Menu:iTopHub:BrowseExtensions+' => 'Blader door de extensiecatalogus op iTop Hub',
- 'Menu:iTopHub:BrowseExtensions:Description' => 'In de iTop Hub Store vind je heel wat extensies!Blader door de catalogus en ontdek welke extensies jou helpen om iTop aan te passen aan jouw manier van werken.
Door van hieruit te verbinden met de Hub, stuur je informatie over deze iTop-mgeving naar de Hub.
',
+ 'Menu:iTopHub:BrowseExtensions:Description' => 'In de iTop Hub Store vind je heel wat extensies!Blader door de catalogus en ontdek welke extensies jou helpen om iTop aan te passen aan jouw manier van werken.
Door van hieruit te verbinden met de Hub, stuur je informatie over deze iTop-omgeving naar de Hub.
',
'iTopHub:GoBtn' => 'Ga naar iTop Hub',
'iTopHub:CloseBtn' => 'Sluiten',
'iTopHub:GoBtn:Tooltip' => 'Ga naar www.itophub.io',
'iTopHub:OpenInNewWindow' => 'Open iTop Hub in een nieuw venster',
'iTopHub:AutoSubmit' => 'Vraag dit niet opnieuw en ga volgende keer automatisch naar iTop Hub.',
'UI:About:RemoteExtensionSource' => 'iTop Hub',
- 'iTopHub:Explanation' => 'Door op deze knop te klikken, wordt je doorgestuurd naar iTop Hub.',
+ 'iTopHub:Explanation' => 'Door op deze knop te klikken, word je doorgestuurd naar iTop Hub.',
'iTopHub:BackupFreeDiskSpaceIn' => '%1$s vrije schijfruimte in %2$s.',
'iTopHub:FailedToCheckFreeDiskSpace' => 'Kon niet controleren hoeveel schijfruimte nog vrij is.',
@@ -48,7 +48,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'iTopHub:Landing:Install' => 'Bezig met extensies te installeren...',
'iTopHub:CompiledOK' => 'Compilatie geslaagd.',
'iTopHub:ConfigurationSafelyReverted' => 'Er trad een fout op bij de installatie!
iTop-configuratie werd NIET aangepast.',
- 'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
+ 'iTopHub:FailAuthent' => 'Aanmelden lukt niet voor deze actie.',
'iTopHub:InstalledExtensions' => 'Manueel geïnstalleerde extensies',
'iTopHub:ExtensionCategory:Manual' => 'Manueel geïnstalleerde extensies',
@@ -59,14 +59,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'iTopHub:ExtensionNotInstalled' => 'Niet geïnstalleerd',
'iTopHub:GetMoreExtensions' => 'Extensies zoeken op iTop Hub...',
- 'iTopHub:LandingWelcome' => 'Gefeliciteerd! Deze extensies werden gedownload via iTop Hub en op jouw iTop geïnstalleerd.',
+ 'iTopHub:LandingWelcome' => 'Gefeliciteerd! Deze extensies werden gedownload via iTop Hub en op deze iTop geïnstalleerd.',
'iTopHub:GoBackToITopBtn' => 'Terug naar iTop',
'iTopHub:Uncompressing' => 'Extensies aan het uitpakken...',
'iTopHub:InstallationWelcome' => 'Installatie van extensies via iTop Hub',
- 'iTopHub:DBBackupLabel' => 'Backup van jouw omgeving',
- 'iTopHub:DBBackupSentence' => 'Neem vooraf een backup van de database en iTop-configuratie de update door te voeren',
+ 'iTopHub:DBBackupLabel' => 'Backup van deze omgeving',
+ 'iTopHub:DBBackupSentence' => 'Neem vooraf een backup van de database en iTop-configuratie vooraleer de update uit te voeren',
'iTopHub:DeployBtn' => 'Installeer!',
- 'iTopHub:DatabaseBackupProgress' => 'Backup omgeving...',
+ 'iTopHub:DatabaseBackupProgress' => 'Backup deze omgeving...',
'iTopHub:InstallationEffect:Install' => 'Versie: %1$s zal geïnstalleerd worden.',
'iTopHub:InstallationEffect:NoChange' => 'Versie: %1$s is al geïnstalleerd.',
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php
index 8b8dfeefe..352259250 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php
@@ -5,7 +5,7 @@
* @copyright Copyright (C) 2018 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
* @author Thomas Casteleyn
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen (2018, 2019)
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Menu:IncidentManagement' => 'Incident Management',
@@ -169,16 +169,16 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Incident/Attribute:pending_reason+' => 'Reden waarvoor het in afwachting staat',
'Class:Incident/Attribute:parent_incident_id' => 'Hoofdincident',
'Class:Incident/Attribute:parent_incident_id+' => '',
- 'Class:Incident/Attribute:parent_incident_ref' => 'Ref. Hoofdincident',
+ 'Class:Incident/Attribute:parent_incident_ref' => 'Ref. hoofdincident',
'Class:Incident/Attribute:parent_incident_ref+' => '',
'Class:Incident/Attribute:parent_change_id' => 'Hoofdchange',
'Class:Incident/Attribute:parent_change_id+' => '',
'Class:Incident/Attribute:parent_change_ref' => 'Ref. hoofdchange',
'Class:Incident/Attribute:parent_change_ref+' => '',
- 'Class:Incident/Attribute:parent_problem_id' => 'Parent problem id~~',
- 'Class:Incident/Attribute:parent_problem_id+' => '~~',
- 'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
- 'Class:Incident/Attribute:parent_problem_ref+' => '~~',
+ 'Class:Incident/Attribute:parent_problem_id' => 'Hoofdprobleem',
+ 'Class:Incident/Attribute:parent_problem_id+' => '',
+ 'Class:Incident/Attribute:parent_problem_ref' => 'Ref. hoofdprobleem',
+ 'Class:Incident/Attribute:parent_problem_ref+' => '',
'Class:Incident/Attribute:related_request_list' => 'Subverzoeken',
'Class:Incident/Attribute:related_request_list+' => '',
'Class:Incident/Attribute:child_incidents_list' => 'Subincidenten',
@@ -195,9 +195,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Ontevreden',
'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Erg ontevreden',
'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Erg ontevreden',
- 'Class:Incident/Attribute:user_comment' => 'Gebruikersreactie',
+ 'Class:Incident/Attribute:user_comment' => 'Reactie gebruiker',
'Class:Incident/Attribute:user_comment+' => '',
- 'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'Ref. Hoofdincident',
+ 'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'Ref. hoofdincident',
'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
'Class:Incident/Stimulus:ev_assign' => 'Wijs toe',
'Class:Incident/Stimulus:ev_assign+' => '',
@@ -207,19 +207,19 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Incident/Stimulus:ev_pending+' => '',
'Class:Incident/Stimulus:ev_timeout' => 'Time-out',
'Class:Incident/Stimulus:ev_timeout+' => '',
- 'Class:Incident/Stimulus:ev_autoresolve' => 'Automatisch oplossen',
+ 'Class:Incident/Stimulus:ev_autoresolve' => 'Los automatisch op',
'Class:Incident/Stimulus:ev_autoresolve+' => '',
- 'Class:Incident/Stimulus:ev_autoclose' => 'Automatisch sluiten',
+ 'Class:Incident/Stimulus:ev_autoclose' => 'Sluit automatisch',
'Class:Incident/Stimulus:ev_autoclose+' => '',
- 'Class:Incident/Stimulus:ev_resolve' => 'Oplossen',
+ 'Class:Incident/Stimulus:ev_resolve' => 'Los op',
'Class:Incident/Stimulus:ev_resolve+' => '',
'Class:Incident/Stimulus:ev_close' => 'Sluit dit incident',
'Class:Incident/Stimulus:ev_close+' => '',
'Class:Incident/Stimulus:ev_reopen' => 'Heropen',
'Class:Incident/Stimulus:ev_reopen+' => '',
- 'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Kan het incident niet toewijzen als hoofdincident',
+ 'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Kan het incident niet aan zichzelf toewijzen als hoofdincident',
'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
- 'Class:Incident/Method:ResolveChildTickets+' => 'Pas de oplossing ook toe op subverzoeken (ev_autoresolve) en neem de kenmerken over wat betreft service, team, agent, oplossing',
+ 'Class:Incident/Method:ResolveChildTickets+' => 'Pas de oplossing ook toe op subverzoeken (ev_autoresolve) en neem deze kenmerken over: service, team, agent, oplossing',
'Tickets:Related:OpenIncidents' => 'Open incidenten',
));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
index a2645039f..94b31ae9c 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
@@ -1,5 +1,5 @@
(2018 - 2020)
*
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
@@ -52,7 +52,7 @@
// Class: KnownError
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:KnownError' => 'Gekende Fout',
+ 'Class:KnownError' => 'Gekende fout',
'Class:KnownError+' => 'Gedocumenteerde fout voor een gekend probleem',
'Class:KnownError/Attribute:name' => 'Naam',
'Class:KnownError/Attribute:name+' => '',
@@ -120,7 +120,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
//
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Class:lnkDocumentToError' => 'Link Documenten / Fouten',
+ 'Class:lnkDocumentToError' => 'Link Document / Fout',
'Class:lnkDocumentToError+' => 'Een link tussen een document en een gekende fout',
'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
'Class:lnkDocumentToError/Attribute:document_id+' => '',
@@ -167,7 +167,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:FAQCategory+' => 'Categorie voor de FAQ',
'Class:FAQCategory/Attribute:name' => 'Naam',
'Class:FAQCategory/Attribute:name+' => '',
- 'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+ 'Class:FAQCategory/Attribute:faq_list' => 'FAQ\'s',
'Class:FAQCategory/Attribute:faq_list+' => 'Alle veelgestelde vragen gerelateerd aan deze categorie',
));
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
@@ -182,8 +182,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Menu:Problem:KnownErrors+' => 'Alle gekende fouten',
'Menu:FAQCategory' => 'FAQ-categorieën',
'Menu:FAQCategory+' => 'Alle FAQ-categorieën',
- 'Menu:FAQ' => 'FAQs',
- 'Menu:FAQ+' => 'Alle FAQs',
+ 'Menu:FAQ' => 'FAQ\'s',
+ 'Menu:FAQ+' => 'Alle FAQ\'s',
'Brick:Portal:FAQ:Menu' => 'FAQ',
'Brick:Portal:FAQ:Title' => 'Veelgestelde vragen',
diff --git a/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
index ab56d0c1c..75a4e9a57 100644
--- a/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
@@ -18,7 +18,7 @@
*/
/**
- * @author jbostoen (2018)
+ * @author Jeffrey Bostoen - (2018 - 2020)
*/
// Portal
@@ -38,7 +38,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Portal:Button:Delete' => 'Verwijderen',
'Portal:EnvironmentBanner:Title' => 'Je werkt momenteel in de %1$s-omgeving',
'Portal:EnvironmentBanner:GoToProduction' => 'Keer terug naar de productie-omgeving',
- 'Error:HTTP:400' => 'Bad request~~',
+ 'Error:HTTP:400' => 'Ongeldig verzoek',
'Error:HTTP:401' => 'Aanmelden is vereist',
'Error:HTTP:404' => 'Pagina kan niet worden gevonden',
'Error:HTTP:500' => 'Oeps! Er is een fout opgetreden',
@@ -66,7 +66,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Portal:File:DisplayInfo' => '%1$s',
'Portal:File:DisplayInfo+' => '%1$s (%2$s) Open / Download',
'Portal:Calendar-FirstDayOfWeek' => 'nl', //work with moment.js locales
- 'Portal:Form:Close:Warning' => 'Do you want to leave this form ? Data entered may be lost~~',
+ 'Portal:Form:Close:Warning' => 'Ben je zeker dat je dit venster wil sluiten? Ingevoerde gegevens kunnen verloren gaan.',
));
// UserProfile brick
@@ -78,7 +78,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Nieuw wachtwoord',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Bevestig nieuw wachtwoord',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'Neem contact op met de beheerder om jouw wachtwoord te wijzgen',
- 'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Jouw wachtwoord kan niet worden gewijzigd, neem contact op met de beheerder',
+ 'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Jouw wachtwoord kan niet gewijzigd worden. Neem contact op met de beheerder',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Persoonlijke informatie',
'Brick:Portal:UserProfile:Photo:Title' => 'Foto',
));
@@ -130,12 +130,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Vul de volgende informatie in:',
'Brick:Portal:Object:Form:Message:Saved' => 'Opgeslagen',
- 'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s opgeslagen~~',
+ 'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s opgeslagen',
'Brick:Portal:Object:Search:Regular:Title' => 'Geselecteerd %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => 'Selecteer %1$s (%2$s)',
- 'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',
- 'Brick:Portal:Object:Copy:Tooltip' => 'Copy object link~~',
- 'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copied~~'
+ 'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
+ 'Brick:Portal:Object:Copy:Tooltip' => 'Kopieer link naar object',
+ 'Brick:Portal:Object:Copy:CopiedTooltip' => 'Gekopieerd'
));
// CreateBrick brick
@@ -146,7 +146,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
// Filter brick
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
- 'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
+ 'Brick:Portal:Filter:Name' => 'Voorfilteren van een bouwsteen',
'Brick:Portal:Filter:SearchInput:Placeholder' => 'bv. wifi-verbinding',
'Brick:Portal:Filter:SearchInput:Submit' => 'Zoek',
));
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
index 99a301e35..702bb3611 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
@@ -25,6 +25,7 @@ use AttributeDateTime;
use AttributeDefinition;
use AttributeExternalKey;
use AttributeImage;
+use AttributeSet;
use AttributeTagSet;
use BinaryExpression;
use CMDBSource;
@@ -686,6 +687,12 @@ class ManageBrickController extends BrickController
$sValue = $oAttDef->GenerateViewHtmlForValues($aCodes, '', false);
$sSortValue = implode(' ', $aCodes);
}
+ elseif ($oAttDef instanceof AttributeSet)
+ {
+ $oAttDef->SetDisplayLink(false);
+ $sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
+ $sSortValue = "".$oCurrentRow->Get($sItemAttr);
+ }
else
{
$sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
index 071ad6e89..a2257168b 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
@@ -1172,7 +1172,7 @@ class ObjectFormManager extends FormManager
{
/** @var \Combodo\iTop\Portal\Helper\SessionMessageHelper $oSessionMessageHelper */
$oSessionMessageHelper = $this->oContainer->get('session_message_helper');
- $oSessionMessageHelper->AddMessage(uniqid(), Dict::Format('Brick:Portal:Object:Form:Message:ObjectSaved', $this->oObject->GetName()), SessionMessageHelper::ENUM_SEVERITY_OK);
+ $oSessionMessageHelper->AddMessage(uniqid(), Dict::Format('Brick:Portal:Object:Form:Message:ObjectSaved', $this->oObject->GetName()), SessionMessageHelper::ENUM_SEVERITY_OK, array('object_class' => $sObjectClass, 'object_id' => $this->oObject->GetKey()));
}
}
catch (Exception $e)
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php b/datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
index 3de26bc5b..8c9ca8893 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
@@ -23,6 +23,7 @@ namespace Combodo\iTop\Portal\Helper;
use AttributeImage;
+use AttributeSet;
use AttributeTagSet;
use Combodo\iTop\Portal\Brick\BrowseBrick;
use DBSearch;
@@ -399,6 +400,11 @@ class BrowseBrickHelper
$sHtmlForFieldValue = $oAttDef->GenerateViewHtmlForValues($aCodes, '', false);
break;
+ case $oAttDef instanceof AttributeSet:
+ $oAttDef->SetDisplayLink(false);
+ $sHtmlForFieldValue = $value->Get($aField['code']);
+ break;
+
case $oAttDef instanceof AttributeImage:
// Todo: This should be refactored, it has been seen multiple times in the portal
$oOrmDoc = $value->Get($aField['code']);
@@ -553,4 +559,4 @@ class BrowseBrickHelper
$this->AddToTreeItems($aItems[$sCurrentIndex]['subitems'], $aCurrentRowSliced, $aLevelsProperties, $aCurrentRowObjects);
}
}
-}
\ No newline at end of file
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Helper/SessionMessageHelper.php b/datamodels/2.x/itop-portal-base/portal/src/Helper/SessionMessageHelper.php
index 86ac97dc7..08435c8d9 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/SessionMessageHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/SessionMessageHelper.php
@@ -22,6 +22,7 @@ namespace Combodo\iTop\Portal\Helper;
use ArrayIterator;
use IteratorAggregate;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use utils;
/**
* Class SessionMessageHelper
@@ -65,9 +66,10 @@ class SessionMessageHelper implements IteratorAggregate
* @param string $sId
* @param string $sContent
* @param string $sSeverity
+ * @param array $aMetadata An array of key => scalar value
* @param int $iRank
*/
- public function AddMessage($sId, $sContent, $sSeverity = self::DEFAULT_SEVERITY, $iRank = 1)
+ public function AddMessage($sId, $sContent, $sSeverity = self::DEFAULT_SEVERITY, $aMetadata = array(), $iRank = 1)
{
$sKey = $this->GetMessagesKey();
if(!isset($_SESSION['obj_messages'][$sKey]))
@@ -79,6 +81,7 @@ class SessionMessageHelper implements IteratorAggregate
'severity' => $sSeverity,
'rank' => $iRank,
'message' => $sContent,
+ 'metadata' => $aMetadata,
);
}
@@ -158,7 +161,13 @@ class SessionMessageHelper implements IteratorAggregate
$sMsgClass .= 'success';
break;
}
- $aObjectMessages[] = array('css_classes' => $sMsgClass, 'message' => $aMessageData['message']);
+
+ $sMsgMetadata = '';
+ foreach ($aMessageData['metadata'] as $sMetadatumName => $sMetadatumValue)
+ {
+ $sMsgMetadata .= 'data-'.str_replace('_', '-', $sMetadatumName).'="'.utils::HtmlEntities($sMetadatumValue).'" ';
+ }
+ $aObjectMessages[] = array('css_classes' => $sMsgClass, 'message' => $aMessageData['message'], 'metadata' => $sMsgMetadata);
$aRanks[] = $aMessageData['rank'];
}
unset($_SESSION['obj_messages'][$sMessageKey]);
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
index d9aeeef4d..85d1693b6 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
@@ -3,7 +3,7 @@
{% extends 'itop-portal-base/portal/templates/bricks/browse/layout.html.twig' %}
{% block bBrowseMainContent%}
-
+
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
index 132e6d4e5..66354ba56 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
@@ -39,7 +39,7 @@
{% endif %}
{% endif %}
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
index 1a4cbe9d2..edd26d5a0 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
@@ -7,7 +7,7 @@
{% set sFormDisplayModeClass = (form.display_mode is defined and form.display_mode is not null) ? 'form_' ~ form.display_mode : '' %}
{% set sFormObjectStateClass = (form.object_state is defined and form.object_state is not null) ? 'form_object_state_' ~ form.object_state : '' %}
-