Merge branch 'dev'

_locales/en/messages.json

@@ -153,7 +153,7 @@
     "message": "Settings"
   },
   "stnm_function": {
-    "message": "Features ON"
+    "message": "Features"
   },
   "stnm_opts": {
     "message": "Settings of Options Page"
@@ -807,7 +807,7 @@
     "message": "Appearance"
   },
   "fnswitch": {
-    "message": "Features ON"
+    "message": "Features"
   },
   "searchmgr": {
     "message": "Search Engines"
@@ -1418,5 +1418,26 @@
   },
   "center":{
     "message":"CENTER"
+  },
+  "mergewin":{
+    "message":"Merge all Windows"
+  },
+  "n_winstate":{
+    "message":"Window State:"
+  },
+  "s_minimized":{
+    "message":"Minimized"
+  },
+  "s_maximized":{
+    "message":"Maximized"
+  },
+  "s_fullscreen":{
+    "message":"Fullscreen"
+  },
+  "ext_issue":{
+    "message":"Issues:"
+  },
+  "ext_allver":{
+    "message":"All versions:"
   }
 }

_locales/it/messages.json

@@ -1387,5 +1387,26 @@
   },
   "center":{
     "message":"CENTER"
+  },
+  "mergewin":{
+    "message":"Merge all Windows"
+  },
+  "n_winstate":{
+    "message":"Window State:"
+  },
+  "s_minimized":{
+    "message":"Minimized"
+  },
+  "s_maximized":{
+    "message":"Maximized"
+  },
+  "s_fullscreen":{
+    "message":"Fullscreen"
+  },
+  "ext_issue":{
+    "message":"Issues:"
+  },
+  "ext_allver":{
+    "message":"All versions:"
   }
 }

_locales/ru/messages.json

@@ -1390,5 +1390,26 @@
   },
   "center":{
     "message":"CENTER"
+  },
+  "mergewin":{
+    "message":"Merge all Windows"
+  },
+  "n_winstate":{
+    "message":"Window State:"
+  },
+  "s_minimized":{
+    "message":"Minimized"
+  },
+  "s_maximized":{
+    "message":"Maximized"
+  },
+  "s_fullscreen":{
+    "message":"Fullscreen"
+  },
+  "ext_issue":{
+    "message":"Issues:"
+  },
+  "ext_allver":{
+    "message":"All versions:"
   }
 }

_locales/zh_CN/messages.json

@@ -1390,5 +1390,26 @@
   },
   "center":{
     "message":"居中"
+  },
+  "mergewin":{
+    "message":"合并所有窗口"
+  },
+  "n_winstate":{
+    "message":"窗口状态："
+  },
+  "s_minimized":{
+    "message":"最小化"
+  },
+  "s_maximized":{
+    "message":"最大化"
+  },
+  "s_fullscreen":{
+    "message":"全屏"
+  },
+  "ext_issue":{
+    "message":"问题反馈："
+  },
+  "ext_allver":{
+    "message":"所有版本："
   }
 }

_locales/zh_TW/messages.json

@@ -1387,5 +1387,26 @@
   },
   "center":{
     "message":"CENTER"
+  },
+  "mergewin":{
+    "message":"Merge all Windows"
+  },
+  "n_winstate":{
+    "message":"Window State:"
+  },
+  "s_minimized":{
+    "message":"Minimized"
+  },
+  "s_maximized":{
+    "message":"Maximized"
+  },
+  "s_fullscreen":{
+    "message":"Fullscreen"
+  },
+  "ext_issue":{
+    "message":"Issues:"
+  },
+  "ext_allver":{
+    "message":"All versions:"
   }
 }

change.log

@@ -1,5 +1,14 @@
 {
 	"log": [
+		{
+			"ver":"6.1.645.828",
+			"date":"2018.05.27",
+			"content":[
+				"new action: merge all windows",
+				"change part of interface: about, features on",
+				"fix bug: icon actions cant work, option- Set the last action as default one cant work"
+			]
+		},
 		{
 			"ver":"6.0.625.820",
 			"date":"2018.05.09",

css/options.css

@@ -1361,6 +1361,52 @@ select:hover{
 	margin: 2px 0;
 }
 
+#about_main{
+
+}
+#abmain_log{
+	display: block;
+	float: left;
+	height: 64px;
+}
+#abmain_title{
+	padding: 5px 70px;
+}
+#abmain_name{
+	font-size: 16px;
+}
+#abmain_des{
+	font-size: 12px;
+}
+
+#about_info{
+	padding: 10px
+}
+#about_info div{
+	background-size: contain;
+	background-repeat: no-repeat;
+	padding-left: 24px;
+	height: 16px;
+	line-height: 16px;
+	margin: 5px 0;
+}
+#abinfo_git{
+	background-image: url(../image/github.svg);
+}
+#abinfo_fb{
+	background-image: url(../image/issue.svg);
+}
+#abinfo_ver,#abinfo_vers{
+	background-image: url(../image/version.svg);
+}
+
+#about_des{
+	font-size: 12px;
+    line-height: 14px;
+    color: #444;
+    margin: 10px 0;
+}
+
 #about_box{
 	/*width:660px;*/
 	/*margin:0 auto;*/