merge upstream changes, sanitize file names

com_zimbra_emailtemplates/com_zimbra_emailtemplates.properties

@@ -1,44 +1,41 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Zimbra Collaboration Suite Web Client
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Zimbra, Inc.
-# 
-# The contents of this file are subject to the Zimbra Public License
-# Version 1.3 ("License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.zimbra.com/license.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
-# ***** END LICENSE BLOCK *****
-
-EmailTemplatesZimlet_templates =Templates
-EmailTemplatesZimlet_tooltip =Allows users to setup and insert Templates
-EmailTemplatesZimlet_folderNotExist=Template's folder does not exist
-EmailTemplatesZimlet_bodyOnly=Insert (body only)
-EmailTemplatesZimlet_bodyAndSubject=Insert (body & subject)
-EmailTemplatesZimlet_bodySubjectAndParticipants=Insert (body, subject & participants)
-EmailTemplatesZimlet_reloadTemplates=Reload Templates
-EmailTemplatesZimlet_preferences=Preferences
-EmailTemplatesZimlet_replaceTemplateData=Replace Template Data
-EmailTemplatesZimlet_replaceGenericData=Please replace the following generic text(s) with valid data
-EmailTemplatesZimlet_couldNotInsertApptAttendees=Could not insert appointment's attendees
-EmailTemplatesZimlet_templateFolderPath=Template Folder's path:
-EmailTemplatesZimlet_setTemplatesFolder=Set Templates Folder
-EmailTemplatesZimlet_selectTemplatesFolder=Please select a folder where Templates are stored
-EmailTemplatesZimlet_save=Save
-EmailTemplatesZimlet_saved=Template saved successfully
-EmailTemplatesZimlet_saved_title=Template saved
-EmailTemplatesZimlet_restartBrowser=The browser must be refreshed for the changes to take effect.  Continue?
-EmailTemplatesZimlet_noSubject=You haven't specified a subject. Please do \
-  so prior saving the template!
-EmailTemplatesZimlet_noSubject_title=No subject!
-
-#Help messages
-EmailTemplatesZimlet_genericNames=Generic Names
-EmailTemplatesZimlet_helpLine1=You can use generic names technique to replace common words. Just before inserting the template <br/>Zimlet will alert you to replace them
-EmailTemplatesZimlet_helpLine2=For example: You could have <strong>hi ${firstName}</strong> in the body or in the subject
-EmailTemplatesZimlet_helpLine3=<strong>Generic Name Rules:</strong><br/>1. The name of the generic word <strong>can only contain</strong> letters, numbers and underscore 
-EmailTemplatesZimlet_helpLine4=For example: <strong>${firstName}</strong>, <strong>${first123}</strong> or  <strong>${First_Name}</strong>
-EmailTemplatesZimlet_helpLine5=2.The generic names are <strong>case sensitive</strong>.
-EmailTemplatesZimlet_helpLine6=For example:<strong>${firstName}</strong> and <strong>${FIRSTNAME}</strong> are considered different
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Zimbra Collaboration Suite Zimlets
+# Copyright (C) 2010, 2013, 2014, 2016 Synacor, Inc.
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software Foundation,
+# version 2 of the License.
+#
+# This program 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 General Public License for more details.
+# You should have received a copy of the GNU General Public License along with this program.
+# If not, see <https://www.gnu.org/licenses/>.
+# ***** END LICENSE BLOCK *****
+
+label = Email Templates
+description = Allows users to insert Email Templates
+
+EmailTemplatesZimlet_tooltip =Allows users to setup and insert Templates
+EmailTemplatesZimlet_folderNotExist=Template's folder does not exist
+EmailTemplatesZimlet_bodyOnly=Insert (body only)
+EmailTemplatesZimlet_bodyAndSubject=Insert (body & subject)
+EmailTemplatesZimlet_bodySubjectAndParticipants=Insert (body, subject & participants)
+EmailTemplatesZimlet_reloadTemplates=Reload Templates
+EmailTemplatesZimlet_preferences=Preferences
+EmailTemplatesZimlet_replaceTemplateData=Replace Template Data
+EmailTemplatesZimlet_replaceGenericData=Please replace the following generic text(s) with valid data
+EmailTemplatesZimlet_couldNotInsertApptAttendees=Could not insert appointment's attendees
+EmailTemplatesZimlet_templateFolderPath=Template Folder's path:
+EmailTemplatesZimlet_setTemplatesFolder=Set Templates Folder
+EmailTemplatesZimlet_selectTemplatesFolder=Please select a folder where Templates are stored
+
+#Help messages
+EmailTemplatesZimlet_genericNames=Generic Names
+EmailTemplatesZimlet_helpLine1=You can use generic names technique to replace common words. Just before inserting the template <br/>Zimlet will alert you to replace them
+EmailTemplatesZimlet_helpLine2=For example: You could have <strong>hi ${firstName}</strong> in the body or in the subject
+EmailTemplatesZimlet_helpLine3=<strong>Generic Name Rules:</strong><br/>1. The name of the generic word <strong>can only contain</strong> letters, numbers and underscore 
+EmailTemplatesZimlet_helpLine4=For example: <strong>${firstName}</strong>, <strong>${first123}</strong> or  <strong>${First_Name}</strong>
+EmailTemplatesZimlet_helpLine5=2.The generic names are <strong>case sensitive</strong>.
+EmailTemplatesZimlet_helpLine6=For example:<strong>${firstName}</strong> and <strong>${FIRSTNAME}</strong> are considered different

com_zimbra_emailtemplates/com_zimbra_emailtemplates.xml

@@ -1,9 +1,7 @@
-<zimlet name="com_zimbra_emailtemplates" version="0.9.6" description="Allows users to insert Email Templates" target="main compose-window">
+<zimlet name="com_zimbra_emailtemplates" version="0.9.6" label="${msg.label}" description="${msg.description}" target="main compose-window">
   <include>emailtemplates.js</include>
 	<includeCSS>emailtemplates.css</includeCSS>
   <handlerObject>Com_Zimbra_EmailTemplates</handlerObject>
-  <zimletPanelItem icon="Message"
-    label="${msg.EmailTemplatesZimlet_templates}" />
   <userProperties>
 		<property type="string" name="etemplates_sourcefolderPath" value=""/>	
   </userProperties>

com_zimbra_emailtemplates/com_zimbra_emailtemplates_ar.properties

@@ -0,0 +1,41 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Zimbra Collaboration Suite Zimlets
+# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Synacor, Inc.
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software Foundation,
+# version 2 of the License.
+#
+# This program 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 General Public License for more details.
+# You should have received a copy of the GNU General Public License along with this program.
+# If not, see <https://www.gnu.org/licenses/>.
+# ***** END LICENSE BLOCK *****
+
+label = \u0642\u0648\u0627\u0644\u0628 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a
+description = \u062a\u062a\u064a\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0625\u062f\u0631\u0627\u062c \u0642\u0648\u0627\u0644\u0628 \u0628\u0631\u064a\u062f \u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a
+
+EmailTemplatesZimlet_tooltip =\u0627\u0644\u0633\u0645\u0627\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0628\u0625\u0639\u062f\u0627\u062f \u0627\u0644\u0642\u0648\u0627\u0644\u0628 \u0648\u0625\u062f\u0631\u0627\u062c\u0647\u0627
+EmailTemplatesZimlet_folderNotExist=\u0645\u062c\u0644\u062f \u0627\u0644\u0642\u0627\u0644\u0628 \u063a\u064a\u0631 \u0645\u0648\u062c\u0648\u062f
+EmailTemplatesZimlet_bodyOnly=\u0625\u062f\u0631\u0627\u062c \u200e(\u0627\u0644\u0646\u0635 \u0641\u0642\u0637)
+EmailTemplatesZimlet_bodyAndSubject=\u0625\u062f\u0631\u0627\u062c \u200e(\u0627\u0644\u0646\u0635 \u0648\u0627\u0644\u0645\u0648\u0636\u0648\u0639)
+EmailTemplatesZimlet_bodySubjectAndParticipants=\u0625\u062f\u0631\u0627\u062c \u200e(\u0627\u0644\u0646\u0635 \u0648\u0627\u0644\u0645\u0648\u0636\u0648\u0639 \u0648\u0627\u0644\u0645\u0634\u0627\u0631\u0643\u064a\u0646)
+EmailTemplatesZimlet_reloadTemplates=\u0625\u0639\u0627\u062f\u0629 \u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0642\u0648\u0627\u0644\u0628
+EmailTemplatesZimlet_preferences=\u0627\u0644\u062a\u0641\u0636\u064a\u0644\u0627\u062a
+EmailTemplatesZimlet_replaceTemplateData=\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0642\u0627\u0644\u0628
+EmailTemplatesZimlet_replaceGenericData=\u064a\u0631\u062c\u0649 \u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0627\u0644\u0646\u0635 (\u0627\u0644\u0646\u0635\u0648\u0635) \u0627\u0644\u0639\u0627\u0645 \u0627\u0644\u0639\u0627\u0645\u0629) \u0627\u0644\u062a\u0627\u0644\u064a (\u0627\u0644\u062a\u0627\u0644\u064a\u0629) \u0628\u0628\u064a\u0627\u0646\u0627\u062a \u0635\u0627\u0644\u062d\u0629
+EmailTemplatesZimlet_couldNotInsertApptAttendees=\u064a\u062a\u0639\u0630\u0631 \u0625\u062f\u0631\u0627\u062c \u062d\u0627\u0636\u0631\u064a \u0627\u0644\u0645\u0648\u0639\u062f
+EmailTemplatesZimlet_templateFolderPath=\u0645\u0633\u0627\u0631 \u0645\u062c\u0644\u062f \u0627\u0644\u0642\u0627\u0644\u0628:\u200f
+EmailTemplatesZimlet_setTemplatesFolder=\u0636\u0628\u0637 \u0645\u062c\u0644\u062f \u0627\u0644\u0642\u0648\u0627\u0644\u0628
+EmailTemplatesZimlet_selectTemplatesFolder=\u064a\u0631\u062c\u0649 \u062a\u062d\u062f\u064a\u062f \u0645\u062c\u0644\u062f \u064a\u062a\u0645 \u062a\u062e\u0632\u064a\u0646 \u0627\u0644\u0642\u0648\u0627\u0644\u0628 \u0641\u064a\u0647
+
+#Help messages
+EmailTemplatesZimlet_genericNames=\u0627\u0644\u0623\u0633\u0645\u0627\u0621 \u0627\u0644\u0639\u0627\u0645\u0629
+EmailTemplatesZimlet_helpLine1=\u064a\u0645\u0643\u0646\u0643 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0623\u0633\u0644\u0648\u0628 \u0627\u0644\u0623\u0633\u0645\u0627\u0621 \u0627\u0644\u0639\u0627\u0645\u0629 \u0644\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0627\u0644\u0643\u0644\u0645\u0627\u062a \u0627\u0644\u0634\u0627\u0626\u0639\u0629. \u0642\u0628\u0644 \u0625\u062f\u0631\u0627\u062c \u0627\u0644\u0642\u0627\u0644\u0628 \u0645\u0628\u0627\u0634\u0631\u0629\u060c \u0633\u0648\u0641 \u062a\u0646\u0628\u0647\u0643 \u0628\u0631\u0645\u062c\u064a\u0629 <br/>Zimlet \u0628\u0627\u0633\u062a\u0628\u062f\u0627\u0644\u0647\u0627
+EmailTemplatesZimlet_helpLine2=\u0639\u0644\u0649 \u0633\u0628\u064a\u0644 \u0627\u0644\u0645\u062b\u0627\u0644:\u200f \u0642\u062f \u064a\u0643\u0648\u0646 \u0644\u062f\u064a\u0643 <strong>\u0645\u0631\u062d\u0628\u064b\u0627 ${firstName}</strong> \u0641\u064a \u0627\u0644\u0646\u0635 \u0623\u0648 \u0641\u064a \u0627\u0644\u0645\u0648\u0636\u0648\u0639
+EmailTemplatesZimlet_helpLine3=<strong>\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u0623\u0633\u0645\u0627\u0621 \u0627\u0644\u0639\u0627\u0645\u0629:\u200f</strong><br/>1. \u064a\u0645\u0643\u0646 \u0644\u0627\u0633\u0645 \u0627\u0644\u0643\u0644\u0645\u0629 \u0627\u0644\u0639\u0627\u0645\u0629 <strong>\u0623\u0646 \u064a\u062d\u062a\u0648\u064a \u0641\u0642\u0637 \u0639\u0644\u0649</strong> \u062d\u0631\u0648\u0641 \u0648\u0623\u0631\u0642\u0627\u0645 \u0648\u0634\u0631\u0637\u0629 \u0633\u0641\u0644\u064a\u0629 
+EmailTemplatesZimlet_helpLine4=\u0639\u0644\u0649 \u0633\u0628\u064a\u0644 \u0627\u0644\u0645\u062b\u0627\u0644:\u200f <strong>${firstName}</strong>\u060c <strong>${first123}</strong> \u0623\u0648  <strong>${First_Name}</strong>
+EmailTemplatesZimlet_helpLine5=2. \u0627\u0644\u0623\u0633\u0645\u0627\u0621 \u0627\u0644\u0639\u0627\u0645\u0629 <strong>\u0645\u0645\u064a\u0632\u0629 \u0644\u062d\u062c\u0645 \u0627\u0644\u0623\u062d\u0631\u0641</strong>.
+EmailTemplatesZimlet_helpLine6=\u0639\u0644\u0649 \u0633\u0628\u064a\u0644 \u0627\u0644\u0645\u062b\u0627\u0644:\u200f \u064a\u0639\u062a\u0628\u0631 <strong>${firstName}</strong> \u0648<strong>${FIRSTNAME}</strong> \u0645\u062e\u062a\u0644\u0641\u0627\u0646

com_zimbra_emailtemplates/com_zimbra_emailtemplates_ca.properties

@@ -1,45 +1,41 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Zimbra Collaboration Suite Web Client
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Zimbra, Inc.
-# Copyright (C) 2016 BTACTIC, SCCL
-#
-# The contents of this file are subject to the Zimbra Public License
-# Version 1.3 ("License"); you may not use this file except in
-# compliance with the License.  You may obtain a copy of the License at
-# http://www.zimbra.com/license.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
-# ***** END LICENSE BLOCK *****
-
-EmailTemplatesZimlet_templates=Plantilles
-EmailTemplatesZimlet_tooltip=Permet configurar i insertar plantilles
-EmailTemplatesZimlet_folderNotExist=La carpeta de plantilles no existeix
-EmailTemplatesZimlet_bodyOnly=Inserir (nom\u00e9s el cos)
-EmailTemplatesZimlet_bodyAndSubject=Inserir (cos i assumpte)
-EmailTemplatesZimlet_bodySubjectAndParticipants=Inserir (cos, assumpte i destinataris)
-EmailTemplatesZimlet_reloadTemplates=Recarregar plantilles
-EmailTemplatesZimlet_preferences=Configuraci\u00f3
-EmailTemplatesZimlet_replaceTemplateData=Dades a substituir a la plantilla
-EmailTemplatesZimlet_replaceGenericData=Si us plau, substitueixi els seg\u00fcents camps gen\u00e8rics per dades v\u00e0lides
-EmailTemplatesZimlet_couldNotInsertApptAttendees=No s'han pogut inserir els assistents a la cita
-EmailTemplatesZimlet_templateFolderPath=Carpeta de plantilles: 
-EmailTemplatesZimlet_setTemplatesFolder=Triar la carpeta de plantilles
-EmailTemplatesZimlet_selectTemplatesFolder=Indiqui la carpeta on es desen les plantilles
-EmailTemplatesZimlet_save=Desar
-EmailTemplatesZimlet_saved=La plantilla ha estat desada correctament
-EmailTemplatesZimlet_saved_title=Plantilla desada
-EmailTemplatesZimlet_restartBrowser=S'ha de refrescar la p\u00e0gina perqu\u00e8 els canvis tinguin efecte. Continuar?
-EmailTemplatesZimlet_noSubject=No ha indicat un assumpte. Si us plau, \
-  especifiqui'l abans de desar la plantilla!
-EmailTemplatesZimlet_noSubject_title=No hi ha un assumpte!
-
-#Help messages
-EmailTemplatesZimlet_genericNames=Noms gen\u00e8rics
-EmailTemplatesZimlet_helpLine1=Pot utilitzar la t\u00e8cnica dels noms gen\u00e8rics per a substituir-los a l'hora d'utilitzar una plantilla. El zimlet li preguntar\u00e0 per a quins valors els ha de substituir abans d'aplicar la plantilla.
-EmailTemplatesZimlet_helpLine2=Per exemple: pot tenir <strong>Hola ${nom}</strong> al cos o l'assumpte de la plantilla.
-EmailTemplatesZimlet_helpLine3=<strong>Regles de noms gen\u00e8rics:</strong><br/>1. El nom gen\u00e8ric <strong>nom\u00e9s pot contenir</strong> lletres, n\u00fameros i el gui\u00f3 baix.
-EmailTemplatesZimlet_helpLine4=Per exemple: <strong>${primerCognom}</strong>, <strong>${cognom1}</strong> o <strong>${Primer_Cognom}</strong>.
-EmailTemplatesZimlet_helpLine5=2.Els noms gen\u00e8rics <strong>s\u00f3n sensibles a les maj\u00fascules i min\u00fascules</strong>.
-EmailTemplatesZimlet_helpLine6=Per exemple: <strong>${primerCognom}</strong> i <strong>${PRIMERCOGNOM}</strong> s\u00f3n considerats diferents.
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Zimbra Collaboration Suite Zimlets
+# Copyright (C) 2010, 2013, 2014, 2016 Synacor, Inc.
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software Foundation,
+# version 2 of the License.
+#
+# This program 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 General Public License for more details.
+# You should have received a copy of the GNU General Public License along with this program.
+# If not, see <https://www.gnu.org/licenses/>.
+# ***** END LICENSE BLOCK *****
+
+label = Plantilles de correu
+description = Permet que els usuaris insereixin Plantilles de correu
+
+EmailTemplatesZimlet_tooltip =Permet que els usuaris configurin i insereixin Plantilles
+EmailTemplatesZimlet_folderNotExist=La carpeta de les Plantilles no existeix
+EmailTemplatesZimlet_bodyOnly=Insereix (nom\u00e9s al cos del missatge)
+EmailTemplatesZimlet_bodyAndSubject=Insereix (al cos & a l\u2019assumpte del missatge)
+EmailTemplatesZimlet_bodySubjectAndParticipants=Insereix (al cos, a l\u2019assumpte & als participants)
+EmailTemplatesZimlet_reloadTemplates=Recarrega les plantilles
+EmailTemplatesZimlet_preferences=Prefer\u00e8ncies
+EmailTemplatesZimlet_replaceTemplateData=Canvia les dades de les plantilles
+EmailTemplatesZimlet_replaceGenericData=Canvieu els texts gen\u00e8rics seg\u00fcents per dades v\u00e0lides
+EmailTemplatesZimlet_couldNotInsertApptAttendees=No s\u2019han pogut inserir els assistents a la cita
+EmailTemplatesZimlet_templateFolderPath=Ruta de la carpeta de les Plantilles:
+EmailTemplatesZimlet_setTemplatesFolder=Configura la carpeta de les Plantilles
+EmailTemplatesZimlet_selectTemplatesFolder=Trieu una carpeta per desar-hi les Plantilles
+
+#Help messages
+EmailTemplatesZimlet_genericNames=Noms gen\u00e8rics
+EmailTemplatesZimlet_helpLine1=Podeu fer servir la t\u00e8cnica dels noms gen\u00e8rics per substituir-hi paraules habituals. Just abans d\u2019inserir-hi la plantilla, <br/>el Zimlet us n\u2019alertar\u00e0 perqu\u00e8 les canvieu
+EmailTemplatesZimlet_helpLine2=Per exemple: Podeu incloure <strong>hola${firstName}</strong> al cos o a l\u2019assumpte
+EmailTemplatesZimlet_helpLine3=<strong>Normes sobre els noms gen\u00e8rics:</strong><br/>1. El nom de la paraula gen\u00e8rica <strong>nom\u00e9s pot contenir</strong> lletres, n\u00fameros i guions baixos 
+EmailTemplatesZimlet_helpLine4=Per exemple: <strong>${firstName}</strong>, <strong>${first123}</strong> o <strong>${First_Name}</strong>
+EmailTemplatesZimlet_helpLine5=2. Els noms gen\u00e8rics reconeixen <strong>maj\u00fascules i min\u00fascules</strong>.
+EmailTemplatesZimlet_helpLine6=Per exemple:<strong>${firstName}</strong> i <strong>${FIRSTNAME}</strong> es consideren diferents.