New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

10 files changed, 94 insertions, 106 deletions

diff --git a/SQLiteStudio3/sqlitestudiocli/cli.cpp b/SQLiteStudio3/sqlitestudiocli/cli.cpp
index 90c8d5e..30bf175 100644
--- a/SQLiteStudio3/sqlitestudiocli/cli.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/cli.cpp
@@ -197,12 +197,8 @@ bool CLI::isComplete(const QString& contents) const
     if (contents.startsWith(CFG_CLI.Console.CommandPrefixChar.get()))
         return true;
 
-    Dialect dialect = Dialect::Sqlite3;
-    if (getCurrentDb())
-        dialect = getCurrentDb()->getDialect();
-
     bool complete = true;
-    splitQueries(contents, dialect, true, false, &complete);
+    splitQueries(contents, true, false, &complete);
     return complete;
 }
 
diff --git a/SQLiteStudio3/sqlitestudiocli/clicommandsyntax.cpp b/SQLiteStudio3/sqlitestudiocli/clicommandsyntax.cpp
index a473c5d..cfe8483 100644
--- a/SQLiteStudio3/sqlitestudiocli/clicommandsyntax.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/clicommandsyntax.cpp
@@ -297,7 +297,7 @@ bool CliCommandSyntax::isArgumentSet(int id) const
 QString CliCommandSyntax::getArgument(int id) const

 {

     if (!argumentMap.contains(id))

-        return QString::null;

+        return QString();

 

     return argumentMap[id]->value;

 }

@@ -313,7 +313,7 @@ bool CliCommandSyntax::isOptionSet(int id) const
 QString CliCommandSyntax::getOptionValue(int id) const

 {

     if (!optionMap.contains(id))

-        return QString::null;

+        return QString();

 

     return optionMap[id]->value;

 }

diff --git a/SQLiteStudio3/sqlitestudiocli/clicompleter.cpp b/SQLiteStudio3/sqlitestudiocli/clicompleter.cpp
index 3d6dcb0..4ad54be 100644
--- a/SQLiteStudio3/sqlitestudiocli/clicompleter.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/clicompleter.cpp
@@ -142,11 +142,7 @@ QStringList CliCompleter::completeQuery(const QString& toBeReplaced, const QStri
 

 bool CliCompleter::doKeepOriginalStr(const QString& str, int curPos)

 {

-    Dialect dialect = Dialect::Sqlite3;

-    if (cli->getCurrentDb())

-        dialect = cli->getCurrentDb()->getDialect();

-

-    TokenList tokens = Lexer::tokenize(str.mid(0, curPos), dialect);

+    TokenList tokens = Lexer::tokenize(str.mid(0, curPos));

     if (tokens.size() == 0)

         return false;

 

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp
index 20f180e..e23a042 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp
@@ -147,14 +147,12 @@ QStringList CliCommand::getCompletionTables()
     if (!cli->getCurrentDb())
         return results;
 
-    Dialect dialect = Dialect::Sqlite3;
-
     SchemaResolver resolver(cli->getCurrentDb());
     resolver.setIgnoreSystemObjects(true);
-    results += wrapObjNamesIfNeeded(resolver.getTables(), dialect);
-    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTables("temp"), dialect));
+    results += wrapObjNamesIfNeeded(resolver.getTables());
+    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTables("temp")));
     for (const QString& database : resolver.getDatabases())
-        results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getTables(database), dialect));
+        results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getTables(database)));
 
     return results;
 }
@@ -165,14 +163,12 @@ QStringList CliCommand::getCompletionIndexes()
     if (!cli->getCurrentDb())
         return results;
 
-    Dialect dialect = Dialect::Sqlite3;
-
     SchemaResolver resolver(cli->getCurrentDb());
     resolver.setIgnoreSystemObjects(true);
-    results += wrapObjNamesIfNeeded(resolver.getIndexes(), dialect);
-    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getIndexes("temp"), dialect));
+    results += wrapObjNamesIfNeeded(resolver.getIndexes());
+    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getIndexes("temp")));
     for (const QString& database : resolver.getDatabases())
-        results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getIndexes(database), dialect));
+        results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getIndexes(database)));
 
     return results;
 }
@@ -183,14 +179,12 @@ QStringList CliCommand::getCompletionTriggers()
     if (!cli->getCurrentDb())
         return results;
 
-    Dialect dialect = Dialect::Sqlite3;
-
     SchemaResolver resolver(cli->getCurrentDb());
     resolver.setIgnoreSystemObjects(true);
-    results += wrapObjNamesIfNeeded(resolver.getTriggers(), dialect);
-    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTriggers("temp"), dialect));
+    results += wrapObjNamesIfNeeded(resolver.getTriggers());
+    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTriggers("temp")));
     for (const QString& database : resolver.getDatabases())
-        results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getTriggers(database), dialect));
+        results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getTriggers(database)));
 
     return results;
 }
@@ -201,14 +195,12 @@ QStringList CliCommand::getCompletionViews()
     if (!cli->getCurrentDb())
         return results;
 
-    Dialect dialect = Dialect::Sqlite3;
-
     SchemaResolver resolver(cli->getCurrentDb());
     resolver.setIgnoreSystemObjects(true);
-    results += wrapObjNamesIfNeeded(resolver.getViews(), dialect);
-    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getViews("temp"), dialect));
+    results += wrapObjNamesIfNeeded(resolver.getViews());
+    results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getViews("temp")));
     for (const QString& database : resolver.getDatabases())
-        results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getViews(database), dialect));
+        results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getViews(database)));
 
     return results;
 }
@@ -274,7 +266,7 @@ QStringList CliCommand::getCompletionInternalDbs()
         return results;
 
     SchemaResolver resolver(cli->getCurrentDb());
-    results += resolver.getDatabases().toList();
+    results += resolver.getDatabases().values();
     results << "main" << "temp";
     results.sort(Qt::CaseInsensitive);
     return results;
diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp
index 4b66592..cb89dfe 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp
@@ -8,6 +8,7 @@
 #include "common/unused.h"
 #include "cli_config.h"
 #include "cliutils.h"
+#include "common/compatibility.h"
 #include <QList>
 #include <QDebug>
 
@@ -290,7 +291,7 @@ void CliCommandSql::shrinkColumns(QList<CliCommandSql::SortedColumnWidth*>& colu
         previousTotalWidth = totalWidth;
 
         // Sort columns by current widths
-        qSort(columnWidths);
+        sSort(columnWidths);
 
         // See if we can shrink headers only, or we already need to shrink the data
         for (SortedColumnWidth* colWidth : columnWidths)
diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp
index 8a8f5dc..8f79e82 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp
@@ -41,7 +41,7 @@ void CliCommandTables::execute()
     dbList << "main" << "temp";

     dbList += resolver.getDatabases();

 

-    int width = longest(dbList.toList()).length();

+    int width = longest(dbList.values()).length();

     width = qMax(width, tr("Database").length());

 

     println(pad(tr("Database"), width, ' ') + " " + tr("Table"));

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp
index c99fe66..0fc359e 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp
@@ -27,7 +27,7 @@ void CliCommandTree::execute()
     else

     {

         databases << "main" << "temp";

-        databases += resolver.getDatabases().toList();

+        databases += resolver.getDatabases().values();

     }

 

     AsciiTree tree;

diff --git a/SQLiteStudio3/sqlitestudiocli/main.cpp b/SQLiteStudio3/sqlitestudiocli/main.cpp
index 7a126e3..3ffc2e3 100644
--- a/SQLiteStudio3/sqlitestudiocli/main.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/main.cpp
@@ -46,13 +46,14 @@ QString cliHandleCmdLineArgs()
     if (args.size() > 0)
         return args[0];
 
-    return QString::null;
+    return QString();
 }
 
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     QCoreApplication::setApplicationName("SQLiteStudio");
+    QCoreApplication::setOrganizationName("SalSoft");
     QCoreApplication::setApplicationVersion(SQLITESTUDIO->getVersionString());
 
     qInstallMessageHandler(cliMessageHandler);
diff --git a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro
index 6583172..e32eca3 100644
--- a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro
+++ b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.pro
@@ -19,7 +19,7 @@ CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-CONFIG   += c++11
+CONFIG   += c++17
 QMAKE_CXXFLAGS += -pedantic
 linux {
     portable {
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts
index 7cf3e27..ab95a5d 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts
@@ -57,7 +57,7 @@
     <message>
         <location filename="../commands/clicommandadd.cpp" line="19"/>
         <source>adds new database to the list</source>
-        <translation type="unfinished"></translation>
+        <translation>添加新的数据库到列表</translation>
     </message>
     <message>
         <location filename="../commands/clicommandadd.cpp" line="24"/>
@@ -74,7 +74,7 @@
         <location filename="../commands/clicommandadd.cpp" line="35"/>
         <source>path</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>路径</translation>
     </message>
 </context>
 <context>
@@ -92,7 +92,7 @@
     <message>
         <location filename="../commands/clicommandcd.cpp" line="17"/>
         <source>changes current working directory</source>
-        <translation type="unfinished"></translation>
+        <translation>更改当前工作目录</translation>
     </message>
     <message>
         <location filename="../commands/clicommandcd.cpp" line="22"/>
@@ -103,7 +103,7 @@
         <location filename="../commands/clicommandcd.cpp" line="33"/>
         <source>path</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>路径</translation>
     </message>
 </context>
 <context>
@@ -117,17 +117,17 @@
         <location filename="../commands/clicommandclose.cpp" line="21"/>
         <location filename="../commands/clicommandclose.cpp" line="29"/>
         <source>Connection to database %1 closed.</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库 %1 的连接已关闭。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandclose.cpp" line="24"/>
         <source>No such database: %1. Use %2 to see list of known databases.</source>
-        <translation type="unfinished"></translation>
+        <translation>没有这样的数据库：%1。使用 %2 去查看已知数据库列表。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandclose.cpp" line="35"/>
         <source>closes given (or current) database</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭给定的（或当前）数据库</translation>
     </message>
     <message>
         <location filename="../commands/clicommandclose.cpp" line="40"/>
@@ -138,7 +138,7 @@
         <location filename="../commands/clicommandclose.cpp" line="50"/>
         <source>name</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">名称</translation>
     </message>
 </context>
 <context>
@@ -151,46 +151,46 @@
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="18"/>
         <source>Databases:</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库：</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="23"/>
         <location filename="../commands/clicommanddblist.cpp" line="34"/>
         <source>Name</source>
         <comment>CLI db name column</comment>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="31"/>
         <location filename="../commands/clicommanddblist.cpp" line="61"/>
         <source>Open</source>
         <comment>CLI connection state column</comment>
-        <translation type="unfinished"></translation>
+        <translation>打开</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="31"/>
         <location filename="../commands/clicommanddblist.cpp" line="61"/>
         <source>Closed</source>
         <comment>CLI connection state column</comment>
-        <translation type="unfinished"></translation>
+        <translation>关闭</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="32"/>
         <location filename="../commands/clicommanddblist.cpp" line="36"/>
         <source>Connection</source>
         <comment>CLI connection state column</comment>
-        <translation type="unfinished"></translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="38"/>
         <location filename="../commands/clicommanddblist.cpp" line="45"/>
         <source>Database file path</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库文件路径</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="70"/>
         <source>prints list of registered databases</source>
-        <translation type="unfinished"></translation>
+        <translation>打印已注册数据库列表</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddblist.cpp" line="75"/>
@@ -210,12 +210,12 @@ Call %2 to see list of all databases.</source>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="26"/>
         <source>Database is not open.</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库未被打开。</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="35"/>
         <source>Cannot find table named: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无法找到名为 %1 的表</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="52"/>
@@ -230,22 +230,22 @@ Call %2 to see list of all databases.</source>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="70"/>
         <source>Table: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>表：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="74"/>
         <source>Column name</source>
-        <translation type="unfinished"></translation>
+        <translation>字段名</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="76"/>
         <source>Data type</source>
-        <translation type="unfinished"></translation>
+        <translation>数据类型</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="80"/>
         <source>Constraints</source>
-        <translation type="unfinished"></translation>
+        <translation>约束条件</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddesc.cpp" line="105"/>
@@ -268,7 +268,7 @@ Call %2 to see list of all databases.</source>
     <message>
         <location filename="../commands/clicommanddir.cpp" line="33"/>
         <source>lists directories and files in current working directory</source>
-        <translation type="unfinished"></translation>
+        <translation>列出当前工作目录中的目录与文件</translation>
     </message>
     <message>
         <location filename="../commands/clicommanddir.cpp" line="38"/>
@@ -293,7 +293,7 @@ You can pass &lt;pattern&gt; with wildcard characters to filter output.</source>
     <message>
         <location filename="../commands/clicommandexit.cpp" line="17"/>
         <source>Quits the application. Settings are stored in configuration file and will be restored on next startup.</source>
-        <translation type="unfinished"></translation>
+        <translation>退出本程序。设置已被存储在配置文件并且会在下一次启动时恢复。</translation>
     </message>
 </context>
 <context>
@@ -301,7 +301,7 @@ You can pass &lt;pattern&gt; with wildcard characters to filter output.</source>
     <message>
         <location filename="../commands/clicommandhelp.cpp" line="16"/>
         <source>shows this help message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">显示这个帮助信息</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhelp.cpp" line="21"/>
@@ -317,27 +317,27 @@ You can always execute any command with exactly single &apos;--help&apos; option
         <location filename="../commands/clicommandhelp.cpp" line="33"/>
         <source>command</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>命令</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhelp.cpp" line="42"/>
         <source>No such command: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有这个命令：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhelp.cpp" line="43"/>
         <source>Type &apos;%1&apos; for list of available commands.</source>
-        <translation type="unfinished"></translation>
+        <translation>输入 &apos;%1&apos; 列出所有可用的命令。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhelp.cpp" line="52"/>
         <source>Usage: %1%2</source>
-        <translation type="unfinished">用法： %1%2</translation>
+        <translation>用法： %1%2</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhelp.cpp" line="62"/>
         <source>Aliases: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>别名：%1</translation>
     </message>
 </context>
 <context>
@@ -350,7 +350,7 @@ You can always execute any command with exactly single &apos;--help&apos; option
     <message>
         <location filename="../commands/clicommandhistory.cpp" line="39"/>
         <source>prints history or erases it</source>
-        <translation type="unfinished"></translation>
+        <translation>打印历史或擦除它</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhistory.cpp" line="44"/>
@@ -369,12 +369,12 @@ Use -ql or --querylimit option to see the current limit value.</source>
     <message>
         <location filename="../commands/clicommandhistory.cpp" line="66"/>
         <source>Console history erased.</source>
-        <translation type="unfinished"></translation>
+        <translation>控制台历史已擦除。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhistory.cpp" line="75"/>
         <source>Invalid number: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无效的数字：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandhistory.cpp" line="80"/>
@@ -387,17 +387,17 @@ Use -ql or --querylimit option to see the current limit value.</source>
     <message>
         <location filename="../commands/clicommandmode.cpp" line="9"/>
         <source>Current results printing mode: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>当前结果打印模式：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandmode.cpp" line="16"/>
         <source>Invalid results printing mode: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无效结果打印模式：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandmode.cpp" line="21"/>
         <source>New results printing mode: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>新结果打印模式：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandmode.cpp" line="26"/>
@@ -451,22 +451,22 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
     <message>
         <location filename="../commands/clicommandopen.cpp" line="29"/>
         <source>Could not add database %1 to list.</source>
-        <translation type="unfinished">未能将数据库“%1”添加到列表。</translation>
+        <translation>未能将数据库“%1”添加到列表。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandopen.cpp" line="37"/>
         <source>File %1 doesn&apos;t exist in %2. Cannot open inexisting database with %3 command. To create a new database, use %4 command.</source>
-        <translation type="unfinished"></translation>
+        <translation>文件 %1 不存在于 %2。无法使用 %3 命令打开不存在的数据库。使用 %4 命令创建一个新数据库。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandopen.cpp" line="61"/>
         <source>Database %1 has been open and set as the current working database.</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库 %1 已被打开并设为当前工作数据库。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandopen.cpp" line="66"/>
         <source>opens database connection</source>
-        <translation type="unfinished"></translation>
+        <translation>打开数据库连接</translation>
     </message>
     <message>
         <location filename="../commands/clicommandopen.cpp" line="71"/>
@@ -477,13 +477,13 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
         <location filename="../commands/clicommandopen.cpp" line="83"/>
         <source>name</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location filename="../commands/clicommandopen.cpp" line="83"/>
         <source>path</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>路径</translation>
     </message>
 </context>
 <context>
@@ -491,7 +491,7 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
     <message>
         <location filename="../commands/clicommandpwd.cpp" line="13"/>
         <source>prints the current working directory</source>
-        <translation type="unfinished"></translation>
+        <translation>打印当前工作目录</translation>
     </message>
     <message>
         <location filename="../commands/clicommandpwd.cpp" line="18"/>
@@ -504,7 +504,7 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
     <message>
         <location filename="../commands/clicommandremove.cpp" line="12"/>
         <source>No such database: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有这样一个数据库：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandremove.cpp" line="20"/>
@@ -519,7 +519,7 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
     <message>
         <location filename="../commands/clicommandremove.cpp" line="35"/>
         <source>removes database from the list</source>
-        <translation type="unfinished"></translation>
+        <translation>从列表中移除数据库</translation>
     </message>
     <message>
         <location filename="../commands/clicommandremove.cpp" line="40"/>
@@ -530,7 +530,7 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
         <location filename="../commands/clicommandremove.cpp" line="50"/>
         <source>name</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
 </context>
 <context>
@@ -540,17 +540,19 @@ The ROW mode is recommended if you need to see whole values and you don&apos;t e
         <source>No working database is set.
 Call %1 command to set working database.
 Call %2 to see list of all databases.</source>
-        <translation type="unfinished"></translation>
+        <translation>没有设置工作数据库。
+调用 %1 命令去设置工作数据库。
+调用 %2 去浏览所有数据库列表。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandsql.cpp" line="29"/>
         <source>Database is not open.</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库没有打开。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandsql.cpp" line="64"/>
         <source>executes SQL query</source>
-        <translation type="unfinished"></translation>
+        <translation>执行 SQL 查询</translation>
     </message>
     <message>
         <location filename="../commands/clicommandsql.cpp" line="69"/>
@@ -561,7 +563,7 @@ Call %2 to see list of all databases.</source>
         <location filename="../commands/clicommandsql.cpp" line="85"/>
         <source>sql</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">sql</translation>
     </message>
     <message>
         <location filename="../commands/clicommandsql.cpp" line="134"/>
@@ -572,12 +574,12 @@ Call %2 to see list of all databases.</source>
     <message>
         <location filename="../commands/clicommandsql.cpp" line="253"/>
         <source>Row %1</source>
-        <translation type="unfinished"></translation>
+        <translation>行 %1</translation>
     </message>
     <message>
         <location filename="../commands/clicommandsql.cpp" line="403"/>
         <source>Query execution error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>查询执行错误：%1</translation>
     </message>
 </context>
 <context>
@@ -585,7 +587,7 @@ Call %2 to see list of all databases.</source>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="15"/>
         <source>No such database: %1. Use %2 to see list of known databases.</source>
-        <translation type="unfinished"></translation>
+        <translation>没有这样一个数据库：%1。使用 %2 去查看已知的数据库列表。</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="25"/>
@@ -595,23 +597,23 @@ Call %2 to see list of all databases.</source>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="32"/>
         <source>Database %1 is closed.</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库已被关闭</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="45"/>
         <location filename="../commands/clicommandtables.cpp" line="47"/>
         <source>Database</source>
-        <translation type="unfinished"></translation>
+        <translation>数据库</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="47"/>
         <source>Table</source>
-        <translation type="unfinished"></translation>
+        <translation>表</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="61"/>
         <source>prints list of tables in the database</source>
-        <translation type="unfinished"></translation>
+        <translation>列出数据库中的所有表</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtables.cpp" line="66"/>
@@ -623,7 +625,7 @@ When the -s option is given, then system tables are also listed.</source>
         <location filename="../commands/clicommandtables.cpp" line="77"/>
         <source>database</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>数据库</translation>
     </message>
 </context>
 <context>
@@ -636,28 +638,28 @@ When the -s option is given, then system tables are also listed.</source>
     <message>
         <location filename="../commands/clicommandtree.cpp" line="54"/>
         <source>Tables</source>
-        <translation type="unfinished"></translation>
+        <translation>表</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtree.cpp" line="58"/>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>视图</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtree.cpp" line="83"/>
         <source>Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>字段</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtree.cpp" line="88"/>
         <source>Indexes</source>
-        <translation type="unfinished"></translation>
+        <translation>索引</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtree.cpp" line="92"/>
         <location filename="../commands/clicommandtree.cpp" line="113"/>
         <source>Triggers</source>
-        <translation type="unfinished"></translation>
+        <translation>触发器</translation>
     </message>
     <message>
         <location filename="../commands/clicommandtree.cpp" line="132"/>
@@ -684,17 +686,17 @@ The database argument is optional and if provided, then only given database will
         <location filename="../commands/clicommanduse.cpp" line="16"/>
         <location filename="../commands/clicommanduse.cpp" line="30"/>
         <source>Current database: %1</source>
-        <translation type="unfinished">当前数据库：%1</translation>
+        <translation>当前数据库：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommanduse.cpp" line="23"/>
         <source>No such database: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">没有这样一个数据库：%1</translation>
     </message>
     <message>
         <location filename="../commands/clicommanduse.cpp" line="35"/>
         <source>changes default working database</source>
-        <translation type="unfinished"></translation>
+        <translation>更改默认工作数据库</translation>
     </message>
     <message>
         <location filename="../commands/clicommanduse.cpp" line="40"/>
@@ -715,7 +717,7 @@ The default database can be selected in various ways:
         <location filename="../commands/clicommanduse.cpp" line="63"/>
         <source>name</source>
         <comment>CLI command syntax</comment>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
 </context>
 <context>
@@ -728,7 +730,7 @@ The default database can be selected in various ways:
     <message>
         <location filename="../clicommandsyntax.cpp" line="325"/>
         <source>Too many arguments.</source>
-        <translation type="unfinished"></translation>
+        <translation>参数过多。</translation>
     </message>
     <message>
         <location filename="../clicommandsyntax.cpp" line="347"/>
@@ -777,7 +779,7 @@ Expected one of: %2</source>
     <message>
         <location filename="../main.cpp" line="33"/>
         <source>file</source>
-        <translation type="unfinished"></translation>
+        <translation>文件</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="33"/>