Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

1 files changed, 1 insertions, 16 deletions

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
index 370959afa..8a6590097 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('en.searchreplace_dlg',{

-searchnext_desc:"Find again",

-notfound:"The search has been completed. The search string could not be found.",

-search_title:"Find",

-replace_title:"Find/Replace",

-allreplaced:"All occurrences of the search string were replaced.",

-findwhat:"Find what",

-replacewith:"Replace with",

-direction:"Direction",

-up:"Up",

-down:"Down",

-mcase:"Match case",

-findnext:"Find next",

-replace:"Replace",

-replaceall:"Replace all"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
\ No newline at end of file