Merge branch 'master' of https://github.com/balloonwj/flamingo

Change-Id: Iadfe75901d615a3ccd560964933ffd858e23c6bf
BooooL · Apr 3, 2020 · 0a8d6e0 · 0a8d6e0
2 parents a058dbc + f4c8df4
commit 0a8d6e0
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 142 deletions.
diff --git a/flamingoclient/Bin/config/flamingo.ini b/flamingoclient/Bin/config/flamingo.ini
@@ -15,10 +15,10 @@ reconnectinterval=5000
 clearexpirelog=1
 loglevel=0
 [ui]
-apptitle=Flamingo���İ�
-aboutdlgtitle=����Hootina Flamingo IM
+apptitle=Flamingo中文版
+aboutdlgtitle=关于Hootina Flamingo IM
 copyrighttext=Flamingo IM 2017 v1.000
 companyurllink=http://www.hootina.org/
-defaultcompanyname=hootina.org ��Ȩ����
-mywebsitetooltiptext=���ҵĲ���
-mywebsitelink=http://www.hootina.org
+defaultcompanyname=hootina.org 版权所有
+mywebsitetooltiptext=打开我的博客
+mywebsitelink=http://www.hootina.or