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/advhr/langs/ja_dlg.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/js/tiny_mce/plugins/advhr/langs/ja_dlg.js b/program/js/tiny_mce/plugins/advhr/langs/ja_dlg.js
index dc6549f..70adc8b 100644
--- a/program/js/tiny_mce/plugins/advhr/langs/ja_dlg.js
+++ b/program/js/tiny_mce/plugins/advhr/langs/ja_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('ja.advhr_dlg',{size:"\u9ad8\u3055",noshade:"\u5f71\u306a\u3057",width:"\u5e45",normal:"\u666e\u901a",widthunits:"Units"});
\ No newline at end of file
+tinyMCE.addI18n('ja.advhr_dlg',{size:"\u9ad8\u3055",noshade:"\u5f71\u306a\u3057",width:"\u5e45",normal:"\u901a\u5e38",widthunits:"\u5358\u4f4d"});
\ No newline at end of file
--
Gitblit v1.9.1