p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git

This commit is contained in:
hmm 2014-09-10 11:00:04 +08:00
parent dab0984203 8f1044364a
commit 25c9af9af1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties
View File

@ -37,7 +37,7 @@ recordScript=\u5F55\u5236\u811A\u672C
startServerFail=\u542F\u52A8\u670D\u52A1\u5668\u5931\u8D25: startServerFail=\u542F\u52A8\u670D\u52A1\u5668\u5931\u8D25:
setProxy=\u8BF7\u8BBE\u7F6E\u4EE3\u7406: setProxy=\u8BF7\u8BBE\u7F6E\u4EE3\u7406:
recordScript=\u5F55\u5236\u811A\u672C recordScript=\u5F55\u5236\u811A\u672C
stopRecord=\u505C\u6B62\u811A\u672C\u5F55\u5236\uFF0C\u8BF7\u5148\u66f4\u6539\u6d4f\u89c8\u5668\u4ee3\u7406\u8bbe\u7f6e\uff0c\u518d\u8F93\u5165\u811A\u672C\u540D\u79F0\uFF0C\u4FDD\u5B58\u811A\u672C stopRecord=\u505C\u6B62\u811A\u672C\u5F55\u5236\uFF0C\u8BF7\u8F93\u5165\u811A\u672C\u540D\u79F0\uFF0C\u4FDD\u5B58\u811A\u672C
saveScriptSuccess=\u4FDD\u5B58\u6210\u529F\u3002 saveScriptSuccess=\u4FDD\u5B58\u6210\u529F\u3002
saveScriptFail=\u4FDD\u5B58\u811A\u672C\u5931\u8D25 saveScriptFail=\u4FDD\u5B58\u811A\u672C\u5931\u8D25
plugin_jsp_addPage=\u52A0\u9875 plugin_jsp_addPage=\u52A0\u9875
@ -45,4 +45,4 @@ stopTestPlan_fail=\u505C\u6B62\u8FD0\u884C\u6D4B\u8BD5\u8BA1\u5212\u5931\u8D25
startRecordingMessage=\u8bf7\u70b9\u51fb\u5f00\u59cb\u5f55\u5236 startRecordingMessage=\u8bf7\u70b9\u51fb\u5f00\u59cb\u5f55\u5236
stopRecordingMessage=\u8bf7\u70b9\u51fb\u505c\u6b62\u5f55\u5236 stopRecordingMessage=\u8bf7\u70b9\u51fb\u505c\u6b62\u5f55\u5236
failed-connect-server=\u8FDE\u63A5\u670D\u52A1\u5668\u5931\u8D25\uFF01 failed-connect-server=\u8FDE\u63A5\u670D\u52A1\u5668\u5931\u8D25\uFF01
close-proxy-setting=\u8BF7\u5173\u95ED\u4EE3\u7406 close-proxy-setting=\u8BF7\u5173\u95ED\u4EE3\u7406

4
Bench4Q-Web/src/main/webapp/script.jsp
View File

@ -171,7 +171,7 @@ button#createScript{
</div> </div>
</div> </div>
<div class="modal hide fade" id="mySecondModal"> <div class="modal hide fade" id="mySecondModal" data-backdrop="static">
<div class="modal-header"> <div class="modal-header">
<button type="button" id="myModal-close" class="close" <button type="button" id="myModal-close" class="close"
onclick="dismiss(mySecondModal)">×</button> onclick="dismiss(mySecondModal)">×</button>
@ -195,7 +195,7 @@ button#createScript{
</div> </div>
</div> </div>
<div class="modal hide fade" id="myThirdModal"> <div class="modal hide fade" id="myThirdModal" data-backdrop="static">
<div class="modal-header"> <div class="modal-header">
<button type="button" id="myModal-close" class="close" onclick="dismiss(myThirdModal)">×</button> <button type="button" id="myModal-close" class="close" onclick="dismiss(myThirdModal)">×</button>
<h3><fmt:message key="settings" /></h3> <h3><fmt:message key="settings" /></h3>