Merged Drop 5
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/plugin_zh_CN.msg b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/plugin_zh_CN.msg
index cdf319f..1420f3d 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/plugin_zh_CN.msg
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/plugin_zh_CN.msg
@@ -4,8 +4,8 @@
DatabaseManagement.command.explain=»ñÈ¡Ö´Ðз½°¸
DatabaseManagement.command.execute=È«²¿Ö´ÐÐ
DatabaseManagement.command.execute.select=Ö´ÐÐËùÑ¡Îı¾
-DatabaseManagement.command.execute.current=Execute Current Text
-DatabaseManagement.command.execute.as.one.statement=Execute Selected Text As One Statement
+DatabaseManagement.command.execute.current=Ö´Ðе±Ç°Îı¾
+DatabaseManagement.command.execute.as.one.statement=×÷Ϊһ¸öÓï¾äÖ´ÐÐÑ¡¶¨Îı¾
DatabaseManagement.command.dmldialog.select=ÔÚ SQL ²éѯÉú³ÉÆ÷Öбà¼...
DatabaseManagement.ToggleComment=Çл»×¢ÊÍ
DatabaseManagement.command.run=ÔËÐÐ
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/messages_zh_CN.msg b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/messages_zh_CN.msg
index 2c13bc7..72257c5 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/messages_zh_CN.msg
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/internal/actions/messages_zh_CN.msg
@@ -32,11 +32,11 @@
ExecuteSelectionSQLAction_label=Ö´ÐÐÑ¡¶¨µÄÎı¾(&X)
ExecuteSelectionSQLAction_tooltip=Ö´ÐÐÑ¡¶¨µÄ SQL Óï¾ä
-ExecuteSQLAsOneStatement_label=Exe&cute Selected Text As One Statement
-ExecuteSQLAsOneStatement_tooltip=Execute Selected Text As One Statement
+ExecuteSQLAsOneStatement_label=×÷Ϊһ¸öÓï¾äÖ´ÐÐÑ¡¶¨Îı¾(&C)
+ExecuteSQLAsOneStatement_tooltip=×÷Ϊһ¸öÓï¾äÖ´ÐÐÑ¡¶¨Îı¾
-ExecuteCurrentSQLAction_label=Exec&ute Current Text
-ExecuteCurrentSQLAction_tooltip=Execute Current SQL Statements
+ExecuteCurrentSQLAction_label=Ö´Ðе±Ç°Îı¾(&U)
+ExecuteCurrentSQLAction_tooltip=Ö´Ðе±Ç° SQL Óï¾ä
DMLDialogSelectionSQLAction_label=ÔÚ SQL ²éѯÉú³ÉÆ÷Öбà¼(&Q)...
DMLDialogSelectionSQLAction_tooltip=ÔÚ SQL ²éѯÉú³ÉÆ÷Öбà¼Ñ¡¶¨µÄ SQL Óï¾ä
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/preferences/PreferenceMessages_zh_CN.msg b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/preferences/PreferenceMessages_zh_CN.msg
index 300418e..3388407 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/preferences/PreferenceMessages_zh_CN.msg
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/src/org/eclipse/datatools/sqltools/sqleditor/preferences/PreferenceMessages_zh_CN.msg
@@ -28,13 +28,13 @@
SQLEditor_showSyntaxErorrDetail=ÏÔʾÏêϸעÊÍÐÅÏ¢(&H)
SQLEditor_showSyntaxErorrDetail_tooltip=ÏÔʾÏêϸעÊÍÐÅÏ¢£¬ÈçijЩÓï·¨½¨Òé
-SQLEditor_executeCurrentSQLGroup=Execute current text
-SQLEditor_executeSQLBetweenDelimiter=Execute SQLs between delimiters
-SQLEditor_executeSQLBetweenDelimiter_tip=Execute SQLs between the delimiters before and after current cursor position
-SQLEditor_executeCurrentLine=Execute current line
-SQLEditor_executeCurrentLine_tip=Execute the line text where the cursor place
-SQLEditor_executeSQLBetweenBlankLine=Execute SQLs between blank lines
-SQLEditor_executeSQLBetweenBlankLine_tip=Execute SQLs between the blank lines before and after current cursor position
+SQLEditor_executeCurrentSQLGroup=Ö´Ðе±Ç°Îı¾
+SQLEditor_executeSQLBetweenDelimiter=Ö´Ðзָô·ûÖ®¼äµÄ SQL
+SQLEditor_executeSQLBetweenDelimiter_tip=Ö´Ðе±Ç°¹â±êλÖÃÇ°ºóµÄ·Ö¸ô·ûÖ®¼äµÄ SQL
+SQLEditor_executeCurrentLine=Ö´Ðе±Ç°ÐÐ
+SQLEditor_executeCurrentLine_tip=Ö´Ðйâ±êλÖõÄÐÐÎı¾
+SQLEditor_executeSQLBetweenBlankLine=Ö´Ðпհ×ÐÐÖ®¼äµÄ SQL
+SQLEditor_executeSQLBetweenBlankLine_tip=Ö´Ðе±Ç°¹â±êλÖÃÇ°ºóµÄ¿Õ¼äÐÐÖ®¼äµÄ SQL
SQLEditor_typing_title=ÊäÈë(&T)
SQLEditor_typingAidsGroup_title=ÔÚÖÇÄܲåÈ뷽ʽÏÂÆôÓÃÊäÈë°ïÖú: