From 866dfe453121a3ea9fbe459638253d09ef9419ad Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Tue, 21 Aug 2018 12:29:46 +0200
Subject: [PATCH] =?UTF-8?q?(Retrofit=20from=20develop=2007056613)=20N?=
 =?UTF-8?q?=C2=B01611=20Fix=20"UTF-8=20Characters=20Malformed"=20error=20d?=
 =?UTF-8?q?ue=20to=20wrong=20file=20encoding.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es_cr.dict.authent-external.php           | 94 +++++++++---------
 .../authent-ldap/es_cr.dict.authent-ldap.php  | 95 +++++++++----------
 .../es_cr.dict.authent-local.php              | 94 +++++++++---------
 .../es_cr.dict.itop-attachments.php           | 88 ++++++++---------
 4 files changed, 183 insertions(+), 188 deletions(-)

diff --git a/datamodels/2.x/authent-external/es_cr.dict.authent-external.php b/datamodels/2.x/authent-external/es_cr.dict.authent-external.php
index 935e8e7c2..757617528 100644
--- a/datamodels/2.x/authent-external/es_cr.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/es_cr.dict.authent-external.php
@@ -1,49 +1,45 @@
-<?php
-// Copyright (C) 2010-2013 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
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserExternal
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:UserExternal' => 'Usuario Externo',
-	'Class:UserExternal+' => 'Usuario Autenticado fuera de iTop',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2018 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
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:UserExternal' => 'Usuario Externo',
+	'Class:UserExternal+' => 'Usuario Autenticado fuera de iTop',
+));
diff --git a/datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php
index a23ba8fc3..5d1395a43 100644
--- a/datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php
@@ -1,48 +1,47 @@
-<?php
-// Copyright (C) 2010-2013 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
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-  'Class:UserLDAP' => 'Usuario LDAP',
-	'Class:UserLDAP+' => 'Usuario Autenticado vía LDAP',
-	'Class:UserLDAP/Attribute:password' => 'Contraseña',
-	'Class:UserLDAP/Attribute:password+' => 'Contraseña',
-));
-
+<?php
+// Copyright (C) 2010-2018 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
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+  'Class:UserLDAP' => 'Usuario LDAP',
+	'Class:UserLDAP+' => 'Usuario Autenticado vía LDAP',
+	'Class:UserLDAP/Attribute:password' => 'Contraseña',
+	'Class:UserLDAP/Attribute:password+' => 'Contraseña',
+));
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 c9a048ac0..81af35001 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
@@ -1,47 +1,47 @@
-<?php
-// Copyright (C) 2010-2013 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
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:UserLocal' => 'Usuario de iTop',
-	'Class:UserLocal+' => 'Usuario Autenticado vía iTop',
-	'Class:UserLocal/Attribute:password' => 'Contraseña',
-	'Class:UserLocal/Attribute:password+' => 'Contraseña',
-));
+<?php
+// Copyright (C) 2010-2018 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
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:UserLocal' => 'Usuario de iTop',
+	'Class:UserLocal+' => 'Usuario Autenticado vía iTop',
+	'Class:UserLocal/Attribute:password' => 'Contraseña',
+	'Class:UserLocal/Attribute:password+' => 'Contraseña',
+));
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 4351dbae3..8483a197c 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
@@ -1,44 +1,44 @@
-<?php
-// Copyright (C) 2010-2013 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
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
- */
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
-	'Attachments:EmptyTabTitle' => 'Anexos',
-	'Attachments:FieldsetTitle' => 'Anexos',
-	'Attachments:DeleteBtn' => 'Borrar',
-	'Attachments:History_File_Added' => 'Anexo %1$s agregado.',
-	'Attachments:History_File_Removed' => 'Anexo %1$s removido.',
-	'Attachments:AddAttachment' => 'Agregar Anexo: ',
-	'Attachments:UploadNotAllowedOnThisSystem' => 'La carga de archivos NO está permitida en este sistema.',
-	'Attachment:Max_Go' => '(Tamaño Máximo de Archivo: %1$s Gb)',
-	'Attachment:Max_Mo' => '(Tamaño Máximo de Archivo: %1$s Mb)',
-	'Attachment:Max_Ko' => '(Tamaño Máximo de Archivo: %1$s Kb)',
-	'Attachments:NoAttachment' => 'No hay Anexo. ',
-	'Class:Attachment' => 'Anexo',
-	'Class:Attachment+' => 'Anexo',
-  'Attachments:PreviewNotAvailable' => 'Vista preliminar no disponible para este tipo de Anexo.',
-  ));
+<?php
+// Copyright (C) 2010-2018 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
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Anexos',
+	'Attachments:FieldsetTitle' => 'Anexos',
+	'Attachments:DeleteBtn' => 'Borrar',
+	'Attachments:History_File_Added' => 'Anexo %1$s agregado.',
+	'Attachments:History_File_Removed' => 'Anexo %1$s removido.',
+	'Attachments:AddAttachment' => 'Agregar Anexo: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'La carga de archivos NO está permitida en este sistema.',
+	'Attachment:Max_Go' => '(Tamaño Máximo de Archivo: %1$s Gb)',
+	'Attachment:Max_Mo' => '(Tamaño Máximo de Archivo: %1$s Mb)',
+	'Attachment:Max_Ko' => '(Tamaño Máximo de Archivo: %1$s Kb)',
+	'Attachments:NoAttachment' => 'No hay Anexo. ',
+	'Class:Attachment' => 'Anexo',
+	'Class:Attachment+' => 'Anexo',
+  'Attachments:PreviewNotAvailable' => 'Vista preliminar no disponible para este tipo de Anexo.',
+  ));