Merge tag 'upstream/3.0.6'

Upstream version 3.0.6

# gpg: Signature made Tue 12 May 2015 04:19:45 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>"

10 files changed, 15 insertions, 8 deletions

diff --git a/Plugins/CsvExport/CsvExport_sk.ts b/Plugins/CsvExport/CsvExport_sk.ts
index 54ab016..e283fc3 100644
--- a/Plugins/CsvExport/CsvExport_sk.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/csvexport.json b/Plugins/CsvExport/csvexport.json
index face150..cbb0ea7 100644
--- a/Plugins/CsvExport/csvexport.json
+++ b/Plugins/CsvExport/csvexport.json
@@ -2,6 +2,6 @@
     "type":        "ExportPlugin",
     "title":       "CSV export",
     "description": "Provides CSV format for exporting",
-    "version":     10002,
+    "version":     10003,
     "author":      "SalSoft"
 }
diff --git a/Plugins/CsvImport/CsvImport_sk.ts b/Plugins/CsvImport/CsvImport_sk.ts
index 5d915ac..3120bf9 100644
--- a/Plugins/CsvImport/CsvImport_sk.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/csvimport.json b/Plugins/CsvImport/csvimport.json
index 64f8e18..05d8b5d 100644
--- a/Plugins/CsvImport/csvimport.json
+++ b/Plugins/CsvImport/csvimport.json
@@ -2,6 +2,6 @@
     "type":        "ImportPlugin",
     "title":       "CSV import",
     "description": "CSV format support for importing data",
-    "version":     10003,
+    "version":     10004,
     "author":      "SalSoft"
 }
diff --git a/Plugins/DbSqlite2/dbsqlite2.json b/Plugins/DbSqlite2/dbsqlite2.json
index c1e1817..59a17e1 100644
--- a/Plugins/DbSqlite2/dbsqlite2.json
+++ b/Plugins/DbSqlite2/dbsqlite2.json
@@ -2,6 +2,6 @@
     "type":        "DbPlugin",
     "title":       "SQLite 2",
     "description": "Provides support for SQLite 2.* databases",
-    "version":     10003,
+    "version":     10005,
     "author":      "SalSoft"
 }
diff --git a/Plugins/DbSqlite2/dbsqlite2instance.cpp b/Plugins/DbSqlite2/dbsqlite2instance.cpp
index 905f6fe..35f1f9f 100644
--- a/Plugins/DbSqlite2/dbsqlite2instance.cpp
+++ b/Plugins/DbSqlite2/dbsqlite2instance.cpp
@@ -5,3 +5,8 @@ DbSqlite2Instance::DbSqlite2Instance(const QString& name, const QString& path, c
 {
 
 }
+
+QString DbSqlite2Instance::getEncoding()
+{
+    return "UTF-8";
+}
diff --git a/Plugins/DbSqlite2/dbsqlite2instance.h b/Plugins/DbSqlite2/dbsqlite2instance.h
index 83c54d3..08ea368 100644
--- a/Plugins/DbSqlite2/dbsqlite2instance.h
+++ b/Plugins/DbSqlite2/dbsqlite2instance.h
@@ -22,6 +22,8 @@ class DbSqlite2Instance : public AbstractDb2<Sqlite2>
          * All values from this constructor are just passed to AbstractDb2 constructor.
          */
         DbSqlite2Instance(const QString& name, const QString& path, const QHash<QString, QVariant>& connOptions);
+
+        QString getEncoding();
 };
 
 #endif // DBSQLITE2INSTANCE_H
diff --git a/Plugins/HtmlExport/HtmlExport_sk.ts b/Plugins/HtmlExport/HtmlExport_sk.ts
index 55dedbe..edcf4cc 100644
--- a/Plugins/HtmlExport/HtmlExport_sk.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_sk.ts b/Plugins/JsonExport/JsonExport_sk.ts
index caade25..9049c29 100644
--- a/Plugins/JsonExport/JsonExport_sk.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_sk.ts b/Plugins/PdfExport/PdfExport_sk.ts
index 9a8f3e2..6684b8b 100644
--- a/Plugins/PdfExport/PdfExport_sk.ts
+++ b/Plugins/PdfExport/PdfExport_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>PdfExport</name>
     <message>