Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT 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>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

11 files changed, 12 insertions, 10 deletions

diff --git a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc
index 7a27dfe..46f8566 100644
--- a/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc
+++ b/SQLiteStudio3/sqlitestudiocli/sqlitestudiocli.qrc
@@ -3,5 +3,7 @@
         <file>translations/sqlitestudiocli_pl.qm</file>
         <file>translations/sqlitestudiocli_ru.qm</file>
         <file>translations/sqlitestudiocli_fr.qm</file>
+        <file>translations/sqlitestudiocli_sk.qm</file>
+        <file>translations/sqlitestudiocli_zh_CN.qm</file>
     </qresource>
 </RCC>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts
index 887f13b..9dee56c 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>CLI</name>
     <message>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts
index bd93869..d446494 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>CLI</name>
     <message>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts
index 3d10f87..5096d8c 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>CLI</name>
     <message>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm
index b438a02..6af2684 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.qm
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts
index b2ecd33..c7bdf0f 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>CLI</name>
     <message>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>Database passed in command line parameters (%1) was already on the list under name: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Baz danych przekazana w parametrach linii poleceń (%1) była już na liście pod nazwą: %2</translation>
     </message>
 </context>
 <context>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts
index f9c8a82..5b92d37 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>CLI</name>
     <message>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.qm b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.qm
index ab88676..2f2ac76 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.qm
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.qm
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts
index c63207d..0cbe067 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>CLI</name>
     <message>
@@ -21,7 +21,7 @@
     <message>
         <location filename="../cli.cpp" line="228"/>
         <source>Database passed in command line parameters (%1) was already on the list under name: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>База данных, переданная через аргументы командной строки (%1), уже находится в списке под именем %2</translation>
     </message>
     <message>
         <location filename="../cli.cpp" line="235"/>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts
index d817c65..df9da22 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>CLI</name>
     <message>
diff --git a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts
index 01469f1..4dd7f0a 100644
--- a/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts
+++ b/SQLiteStudio3/sqlitestudiocli/translations/sqlitestudiocli_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>CLI</name>
     <message>