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/ro_dlg.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/ro_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/ro_dlg.js
old mode 100755
new mode 100644
index 8d1f171..d076707
--- a/program/js/tiny_mce/plugins/searchreplace/langs/ro_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/ro_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('ro.searchreplace_dlg',{findwhat:"Termen c\u0103utat:",replacewith:"\u00cenlocuie\u015fte cu:",direction:"Direc\u0163ia",up:"\u00cen sus",down:"\u00cen jos",mcase:"Conteaz\u0103 litere mici/mari?",findnext:"Caut\u0103 urm\u0103torul",allreplaced:"Toate instan\u0163ele termenului c\u0103utat au fost \u00eenlocuite.",searchnext_desc:"Caut\u0103 din nou",notfound:"C\u0103utarea a fost terminat\u0103. Nu am g\u0103sit termenul c\u0103utat.",search_title:"Caut\u0103",replace_title:"Caut\u0103/\u00eenlocuie\u015fte",replaceall:"\u00cenlocuie\u015fte toate",replace:"\u00cenlocuie\u015fte"});
\ No newline at end of file
+tinyMCE.addI18n('ro.searchreplace_dlg',{findwhat:"Termen c\u0103utat:",replacewith:"\u00cenlocuie\u0219te cu:",direction:"Direc\u021bia",up:"\u00cen sus",down:"\u00cen jos",mcase:"Conteaz\u0103 literele mici/mari?",findnext:"Mai caut\u0103",allreplaced:"Toate instan\u021bele termenului c\u0103utat au fost \u00eenlocuite.","searchnext_desc":"Caut\u0103 din nou",notfound:"C\u0103utarea a fost terminat\u0103. Nu am g\u0103sit termenul c\u0103utat.","search_title":"Caut\u0103","replace_title":"C\u0103utare/\u00eenlocuire",replaceall:"\u00cenlocuie\u0219te tot",replace:"\u00cenlocuie\u0219te"});
\ No newline at end of file

--
Gitblit v1.9.1