From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/js/tiny_mce/plugins/searchreplace/langs/gl_dlg.js | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/gl_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/gl_dlg.js
index fefcd08..72be08c 100644
--- a/program/js/tiny_mce/plugins/searchreplace/langs/gl_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/gl_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('gl.searchreplace_dlg',{
-searchnext_desc:"Buscar outra vez",
-notfound:"A busca rematou. No se atopou o texto buscado.",
-search_title:"Buscar",
-replace_title:"Buscar/Reemplazar",
-allreplaced:"T\u00F3da-las coincidencias do texto buscado foron reemplazadas.",
-findwhat:"Localizar",
-replacewith:"Reemplazar por",
-direction:"Direcci\u00F3n",
-up:"Arriba",
-down:"Abaixo",
-mcase:"Min\u00FAs./Mai\u00FAs.",
-findnext:"Buscar seginte",
-replace:"Reemplazar",
-replaceall:"Reemplazar todo"
-});
\ No newline at end of file
+tinyMCE.addI18n('gl.searchreplace_dlg',{findwhat:"Localizar",replacewith:"Reemplazar por",direction:"Direcci\u00f3n",up:"Arriba",down:"Abaixo",mcase:"Min\u00fas./Mai\u00fas.",findnext:"Buscar seginte",allreplaced:"T\u00f3da-las coincidencias do texto buscado foron reemplazadas.","searchnext_desc":"Buscar outra vez",notfound:"A busca rematou. No se atopou o texto buscado.","search_title":"Buscar","replace_title":"Buscar/Reemplazar",replaceall:"Reemplazar todo",replace:"Reemplazar"});
\ No newline at end of file
--
Gitblit v1.9.1