From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java
index c46988b..aaf0e78 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDialogLogic.java
@@ -48,7 +48,7 @@
 
                 ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(context);
                 dialog.setTitle(context.getString(R.string.loading_title_tip));
-                dialog.setContent("璇峰墠寰�璁剧疆鏉冮檺.");
+                dialog.setContent(context.getString(R.string.please_go_set_permissions));
                 dialog.setConfirmation(context.getString(R.string.me_set));
                 dialog.show();
                 dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {

--
Gitblit v1.8.0