Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 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>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

16 files changed, 304 insertions, 3 deletions

diff --git a/Plugins/Printing/Printing.pro b/Plugins/Printing/Printing.pro
index 3f496be..c1afb9f 100644
--- a/Plugins/Printing/Printing.pro
+++ b/Plugins/Printing/Printing.pro
@@ -4,10 +4,10 @@
 #
 #-------------------------------------------------
 
-include($$PWD/../../SQLiteStudio3/plugins.pri)
-
 QT += printsupport
 
+include($$PWD/../../SQLiteStudio3/plugins.pri)
+
 TARGET = Printing
 TEMPLATE = lib
 
@@ -35,5 +35,23 @@ RESOURCES += \
     printing.qrc
 
 
-TRANSLATIONS += Printing_pl.ts
+TRANSLATIONS += Printing_zh_CN.ts \
+		Printing_sk.ts \
+		Printing_de.ts \
+		Printing_ru.ts \
+		Printing_pt_BR.ts \
+		Printing_fr.ts \
+		Printing_es.ts \
+		Printing_pl.ts
+
+
+
+
+
+
+
+
+
+
+
 
diff --git a/Plugins/Printing/Printing_de.qm b/Plugins/Printing/Printing_de.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/Printing/Printing_de.qm
diff --git a/Plugins/Printing/Printing_de.ts b/Plugins/Printing/Printing_de.ts
new file mode 100644
index 0000000..9ce2cb4
--- /dev/null
+++ b/Plugins/Printing/Printing_de.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="de_DE">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/Printing_es.qm b/Plugins/Printing/Printing_es.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/Printing/Printing_es.qm
diff --git a/Plugins/Printing/Printing_es.ts b/Plugins/Printing/Printing_es.ts
new file mode 100644
index 0000000..d76730d
--- /dev/null
+++ b/Plugins/Printing/Printing_es.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="es_ES">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/Printing_fr.qm b/Plugins/Printing/Printing_fr.qm
new file mode 100644
index 0000000..2f50430
--- /dev/null
+++ b/Plugins/Printing/Printing_fr.qm
diff --git a/Plugins/Printing/Printing_fr.ts b/Plugins/Printing/Printing_fr.ts
new file mode 100644
index 0000000..9d86ad5
--- /dev/null
+++ b/Plugins/Printing/Printing_fr.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation>Imprimer les données</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation>Requête imprimée</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation>Aucune données à imrpimer..</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation>Impression des données.</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation>Impression de la requête.</translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation>Impression</translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/Printing_pt_BR.qm b/Plugins/Printing/Printing_pt_BR.qm
new file mode 100644
index 0000000..c02994c
--- /dev/null
+++ b/Plugins/Printing/Printing_pt_BR.qm
diff --git a/Plugins/Printing/Printing_pt_BR.ts b/Plugins/Printing/Printing_pt_BR.ts
new file mode 100644
index 0000000..c003b38
--- /dev/null
+++ b/Plugins/Printing/Printing_pt_BR.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="pt_BR">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/Printing_ru.qm b/Plugins/Printing/Printing_ru.qm
new file mode 100644
index 0000000..4e6e864
--- /dev/null
+++ b/Plugins/Printing/Printing_ru.qm
diff --git a/Plugins/Printing/Printing_ru.ts b/Plugins/Printing/Printing_ru.ts
new file mode 100644
index 0000000..6a63c83
--- /dev/null
+++ b/Plugins/Printing/Printing_ru.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ru_RU">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation>Печать данных</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation>Печать запроса</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation>Нет данных для печати.</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation>Печать данных.</translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation>Печать запроса.</translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation>Печать</translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/Printing_sk.qm b/Plugins/Printing/Printing_sk.qm
new file mode 100644
index 0000000..1776294
--- /dev/null
+++ b/Plugins/Printing/Printing_sk.qm
diff --git a/Plugins/Printing/Printing_sk.ts b/Plugins/Printing/Printing_sk.ts
new file mode 100644
index 0000000..4e35c9d
--- /dev/null
+++ b/Plugins/Printing/Printing_sk.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="sk_SK">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/Printing_zh_CN.qm b/Plugins/Printing/Printing_zh_CN.qm
new file mode 100644
index 0000000..be651ee
--- /dev/null
+++ b/Plugins/Printing/Printing_zh_CN.qm
@@ -0,0 +1 @@
+<�d��!�`���
\ No newline at end of file
diff --git a/Plugins/Printing/Printing_zh_CN.ts b/Plugins/Printing/Printing_zh_CN.ts
new file mode 100644
index 0000000..7c6dcfe
--- /dev/null
+++ b/Plugins/Printing/Printing_zh_CN.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_CN">
+<context>
+    <name>Printing</name>
+    <message>
+        <location filename="printing.cpp" line="35"/>
+        <source>Print data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="37"/>
+        <source>Print query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="75"/>
+        <source>No data to print.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="84"/>
+        <source>Printing data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printing.cpp" line="110"/>
+        <source>Printing query.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintingExport</name>
+    <message>
+        <location filename="printingexport.cpp" line="34"/>
+        <source>Printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/Printing/printing.qrc b/Plugins/Printing/printing.qrc
index 54dc86f..dc7f27c 100644
--- a/Plugins/Printing/printing.qrc
+++ b/Plugins/Printing/printing.qrc
@@ -4,5 +4,7 @@
     </qresource>
     <qresource prefix="/msg">
         <file>Printing_pl.qm</file>
+        <file>Printing_ru.qm</file>
+        <file>Printing_fr.qm</file>
     </qresource>
 </RCC>