Merge branch 'paris_france_app' of http://1.95.131.171:3000/zzkj/smart_storage_app into paris_france_app

# Conflicts:
#	common/locales/homePage/ar.js
#	common/locales/homePage/de.js
#	common/locales/homePage/en.js

common/locales/homePage/zh.js

@@ -264,8 +264,9 @@ export default {
 		sureRead: '确认已读',
 		cancel: '取消',
 		messageDetail: '消息详情',
-		operateSuccess: '操作成功',
-		messageReaded: '该消息已读，无需重复操作'
+	    operateSuccess: '操作成功',
+	    operateFail: '操作失败',
+	    messageReaded: '该消息已读，无需重复操作'
 	},
 	device: {
 		inputNameQuery: '输入名称搜索',
@@ -549,5 +550,6 @@ export default {
 		selectPlanCurveTem: '请选择计划曲线模板',
 		deliverErrorTip: '充放电功率大于额定功率，请确认计划曲线设置！',
 		deliverTip: '是否确定下发命令?',
+		policyTitle: '策略下发',
 	}
 };