[translations]

frappe/public/css/desk.css

@@ -694,7 +694,7 @@ fieldset[disabled] .form-control {
   padding-top: 20px;
   text-transform: uppercase;
 }
-.search-dialog .layout-side-section .nav > li a {
+.search-dialog .layout-side-section .nav li a {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -716,17 +716,14 @@ fieldset[disabled] .form-control {
 .search-dialog .results-area .search-intro-placeholder span {
   text-align: center;
 }
-.search-dialog .results-area .search-intro-placeholder span i{
+.search-dialog .results-area .search-intro-placeholder span i {
   font-size: 120px;
   display: block;
 }
-.search-dialog .results-area .search-intro-placeholder span p{
+.search-dialog .results-area .search-intro-placeholder span p {
   font-size: 20px;
   display: block;
 }
-/*.search-dialog .results-area a {
-  color: #5E64FF;
-}*/
 .search-dialog .results-area .single-link a {
   color: #36414c;
 }

frappe/translations/da-DK.csv

@@ -6,4 +6,4 @@ For e.g. 1 USD = 100 Cent",1 Valuta = [?] Fraktion For eksempel 1 USD = 100 Cent
 DocType: Workflow State,zoom-in,zoom-in
 DocType: Workflow State,zoom-out,zoom-out
 apps/frappe/frappe/public/js/frappe/form/workflow.js +32, by Role ,af rolle
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +505,Half Day,Half Day
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +579,Half Day,Half Day

frappe/translations/es-AR.csv

@@ -1,3 +1,3 @@
 DocType: Communication,Comment Type,Tipo de Comentario
-apps/frappe/frappe/public/js/frappe/form/control.js +977,Clear Attachment,Limpiar Adjunto
+apps/frappe/frappe/public/js/frappe/form/control.js +942,Clear Attachment,Limpiar Adjunto
 DocType: Communication,Communication,Comunicacion

frappe/translations/es-CL.csv

@@ -1,2 +1,25 @@
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +219,Permissions can be managed via Setup > Role Permissions Manager,Los permisos se pueden gestionar a través de Configuración > Administrador de permisos
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Por defecto la plantilla <!-- h4--> 
+ <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible <!-- p--> 
+ </p><pre> <code> {{address_line1}} &amp; lt; br &amp; gt; 
+ {% if address_line2%} {{address_line2}} &amp; lt; br &amp; gt; { endif% -%} 
+ {{ciudad}} &amp; lt; br &amp; gt; 
+ {% if%} Estado {{Estado}} &amp; lt; br &amp; gt; {% endif -%} {% if 
+ código PIN%} PIN: {{código PIN}} &amp; lt; br &amp; gt; {% endif -%} 
+ {{país}} &amp; lt; br &amp; gt; 
+ {% if teléfono%} Teléfono: {{teléfono}} &amp; lt; br &amp; gt; { % endif -%} 
+ {% if fax%} Fax: {{fax}} &amp; lt; br &amp; gt; {% endif -%} 
+ {% if email_ID%} Email: {{email_ID}} &amp; lt; br &amp; gt ; {% endif -%} 
+ <!-- code--> <!-- pre--></code></pre></h4>"
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +226,Permissions can be managed via Setup &gt; Role Permissions Manager,Los permisos se pueden gestionar a través de Configuración &gt; Administrador de permisos
 DocType: Website Settings,&lt;head&gt; HTML,HTML

frappe/translations/es-MX.csv

@@ -1,5 +1,28 @@
 DocType: Currency,Smallest circulating fraction unit (coin). For e.g. 1 cent for USD and it should be entered as 0.01,"Fracción más pequeña de circulación (moneda). Por ejemplo, 1 centavo por USD y debe ser ingresado como 0.01"
-DocType: Website Settings,<head> HTML,HTML
-DocType: Error Snapshot,Snapshot View,Vista de instantánea
 DocType: Currency,Smallest Currency Fraction Value,Valor de la fracción de moneda más pequeña
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +219,Permissions can be managed via Setup > Role Permissions Manager,Los permisos se pueden gestionar a través de Configuración > Administrador de permisos
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +226,Permissions can be managed via Setup > Role Permissions Manager,Los permisos se pueden gestionar a través de Configuración > Administrador de permisos
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Por defecto la plantilla <!-- h4--> 
+ <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible <!-- p--> 
+ </p><pre> <code> {{address_line1}} &amp; lt; br &amp; gt; 
+ {% if address_line2%} {{address_line2}} &amp; lt; br &amp; gt; { endif% -%} 
+ {{ciudad}} &amp; lt; br &amp; gt; 
+ {% if%} Estado {{Estado}} &amp; lt; br &amp; gt; {% endif -%} {% if 
+ código PIN%} PIN: {{código PIN}} &amp; lt; br &amp; gt; {% endif -%} 
+ {{país}} &amp; lt; br &amp; gt; 
+ {% if teléfono%} Teléfono: {{teléfono}} &amp; lt; br &amp; gt; { % endif -%} 
+ {% if fax%} Fax: {{fax}} &amp; lt; br &amp; gt; {% endif -%} 
+ {% if email_ID%} Email: {{email_ID}} &amp; lt; br &amp; gt ; {% endif -%} 
+ <!-- code--> <!-- pre--></code></pre></h4>"
+DocType: Error Snapshot,Snapshot View,Vista de instantánea
+DocType: Website Settings,&lt;head&gt; HTML,HTML

frappe/translations/es-NI.csv

@@ -3,4 +3,4 @@ DocType: Auto Email Report,Based on Permissions For User,Base sobre Permiso de U
 apps/frappe/frappe/model/base_document.py +574,"{0}: '{1}' ({3}) will get truncated, as max characters allowed is {2}","{0}: '{1}' ({3}) resultarán truncadas, como caracteres máximo permitido es {2}"
 DocType: System Settings,Backups,Respaldos
 DocType: Integration Service,Background Events,Eventos de Fondo
-apps/frappe/frappe/utils/password_strength.py +53,Better add a few more letters or another word,Mejor añadir algunas letras extras u otra palabra
+apps/frappe/frappe/utils/password_strength.py +54,Better add a few more letters or another word,Mejor añadir algunas letras extras u otra palabra

frappe/translations/fr-CA.csv

@@ -1,3 +1,26 @@
-DocType: Email Alert,"To add dynamic subject, use jinja tags like
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Modèle par défaut <!-- h4--> 
+ <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> et tous les champs d'adresse ( y compris les champs personnalisés le cas échéant) sera disponible <!-- p--> 
+ </p><pre> <code> {{address_line1}} &amp; lt; br &amp; gt; 
+ {% si address_line2%} {{address_line2}} &amp; lt; br &amp; gt; { % endif -%} 
+ {{ville}} &amp; lt; br &amp; gt; 
+ {% si l'état%} {{}} Etat &amp; lt; br &amp; gt; {% endif -%} {% if 
+ code PIN%} PIN: {{code PIN}} &amp; lt; br &amp; gt; {% endif -%} 
+ {{pays}} &amp; lt; br &amp; gt; 
+ {% si le téléphone%} Téléphone: {{téléphone}} &amp; lt; br &amp; gt; { % endif -%} 
+ {% if télécopieur%} Fax: {{fax}} &amp; lt; br &amp; gt; {% endif -%} 
+ {% si email_id%} Email: {{email_id}} &amp; lt; br &amp; gt ; {% endif -%} 
+ <!-- code--> <!-- pre--></code></pre></h4>"
+DocType: Feedback Trigger,"To add dynamic subject, use jinja tags like
 
 <div><pre><code>{{ doc.name }} Delivered</code></pre></div>","Pour ajouter l'objet dynamique, utiliser des balises comme Jinja <div><pre> <code>{{ doc.name }} Delivered</code> </pre> </div>"