Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 4 insertions, 4 deletions

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp
index cbc16b6..35f9c47 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp
@@ -58,7 +58,7 @@ void CliCommandDbList::execute()
 
         msg = pad(name, maxNameLength, ' ');
         msg += "|";
-        msg += pad((open ? tr("Open") : tr("Closed")), connStateLength, ' ');
+        msg += pad((open ? tr("Open", "CLI connection state column") : tr("Closed", "CLI connection state column")), connStateLength, ' ');
         msg += "|";
         msg += path;
         println(msg);
@@ -74,9 +74,9 @@ QString CliCommandDbList::fullHelp() const
 {
     return tr(
                 "Prints list of databases registered in the SQLiteStudio. Each database on the list can be in open or closed state "
-                "and .dblist tells you that. The current working database (aka default database) is also marked on the list with '*' at the start of its name. "
-                "See help for %1 command to learn about the default database."
-                ).arg(cmdName("use"));
+                "and %1 tells you that. The current working database (aka default database) is also marked on the list with '*' at the start of its name. "
+                "See help for %2 command to learn about the default database."
+                ).arg(cmdName("dblist"), cmdName("use"));
 }
 
 void CliCommandDbList::defineSyntax()