Merge tag 'upstream/3.0.7'

Upstream version 3.0.7

# gpg: Signature made Wed 25 Nov 2015 04:48:48 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>"

4 files changed, 55 insertions, 13 deletions

diff --git a/Plugins/Printing/Printing.pro b/Plugins/Printing/Printing.pro
index c1afb9f..5006d60 100644
--- a/Plugins/Printing/Printing.pro
+++ b/Plugins/Printing/Printing.pro
@@ -35,7 +35,8 @@ RESOURCES += \
     printing.qrc
 
 
-TRANSLATIONS += Printing_zh_CN.ts \
+TRANSLATIONS += Printing_it.ts \
+		Printing_zh_CN.ts \
 		Printing_sk.ts \
 		Printing_de.ts \
 		Printing_ru.ts \
@@ -55,3 +56,4 @@ TRANSLATIONS += Printing_zh_CN.ts \
 
 
 
+
diff --git a/Plugins/Printing/Printing_de.ts b/Plugins/Printing/Printing_de.ts
index 6a165a2..fb45beb 100644
--- a/Plugins/Printing/Printing_de.ts
+++ b/Plugins/Printing/Printing_de.ts
@@ -6,27 +6,27 @@
     <message>
         <location filename="printing.cpp" line="35"/>
         <source>Print data</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten drucken</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="37"/>
         <source>Print query</source>
-        <translation type="unfinished"></translation>
+        <translation>Abfrage drucken</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="75"/>
         <source>No data to print.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Daten, die gedruckt werden müssen.</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="84"/>
         <source>Printing data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Drucke Daten.</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="110"/>
         <source>Printing query.</source>
-        <translation type="unfinished"></translation>
+        <translation>Drucke Abfrage.</translation>
     </message>
 </context>
 <context>
@@ -34,7 +34,7 @@
     <message>
         <location filename="printingexport.cpp" line="34"/>
         <source>Printing</source>
-        <translation type="unfinished"></translation>
+        <translation>Drucken</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/Printing/Printing_it.ts b/Plugins/Printing/Printing_it.ts
new file mode 100644
index 0000000..0a21af2
--- /dev/null
+++ b/Plugins/Printing/Printing_it.ts
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it_IT">
+<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.ts b/Plugins/Printing/Printing_zh_CN.ts
index 0b1b255..e3a7a2d 100644
--- a/Plugins/Printing/Printing_zh_CN.ts
+++ b/Plugins/Printing/Printing_zh_CN.ts
@@ -6,27 +6,27 @@
     <message>
         <location filename="printing.cpp" line="35"/>
         <source>Print data</source>
-        <translation type="unfinished"></translation>
+        <translation>打印数据</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="37"/>
         <source>Print query</source>
-        <translation type="unfinished"></translation>
+        <translation>打印 query</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="75"/>
         <source>No data to print.</source>
-        <translation type="unfinished"></translation>
+        <translation>没有数据可打印。</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="84"/>
         <source>Printing data.</source>
-        <translation type="unfinished"></translation>
+        <translation>打印数据中。</translation>
     </message>
     <message>
         <location filename="printing.cpp" line="110"/>
         <source>Printing query.</source>
-        <translation type="unfinished"></translation>
+        <translation>打印query中。</translation>
     </message>
 </context>
 <context>
@@ -34,7 +34,7 @@
     <message>
         <location filename="printingexport.cpp" line="34"/>
         <source>Printing</source>
-        <translation type="unfinished"></translation>
+        <translation>打印</translation>
     </message>
 </context>
 </TS>