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>"

5 files changed, 35 insertions, 3 deletions

diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro
index 08d8796..7197a11 100644
--- a/Plugins/ScriptingTcl/ScriptingTcl.pro
+++ b/Plugins/ScriptingTcl/ScriptingTcl.pro
@@ -136,3 +136,7 @@ win32: {
 
 RESOURCES += \
     scriptingtcl.qrc
+
+
+TRANSLATIONS += ScriptingTcl_pl.ts
+
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_pl.qm b/Plugins/ScriptingTcl/ScriptingTcl_pl.qm
new file mode 100644
index 0000000..1232971
--- /dev/null
+++ b/Plugins/ScriptingTcl/ScriptingTcl_pl.qm
diff --git a/Plugins/ScriptingTcl/ScriptingTcl_pl.ts b/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
new file mode 100644
index 0000000..be6a580
--- /dev/null
+++ b/Plugins/ScriptingTcl/ScriptingTcl_pl.ts
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="pl_PL">
+<context>
+    <name>ScriptingTcl</name>
+    <message>
+        <location filename="scriptingtcl.cpp" line="411"/>
+        <source>No database available in current context, while called Tcl&apos;s &apos;%1&apos; command.</source>
+        <oldsource>No database available in current context, while called Tcl&apos;s &apos;db&apos; command.</oldsource>
+        <translation>Brak dostępnej bazy w bieżącym kontekście, podczas wywołania polecenie Tcl &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <location filename="scriptingtcl.cpp" line="433"/>
+        <source>Invalid &apos;%1&apos; command sytax. Should be: %2</source>
+        <oldsource>Invalid &apos;db&apos; command sytax. Should be: db eval sql</oldsource>
+        <translation>Niepoprawna składnia polecenia &apos;%1&apos;. Powinno być: %2</translation>
+    </message>
+    <message>
+        <location filename="scriptingtcl.cpp" line="554"/>
+        <source>Error from Tcl&apos;s&apos; &apos;%1&apos; command: %2</source>
+        <oldsource>Error from Tcl&apos;s&apos; &apos;db&apos; command: %1</oldsource>
+        <translation>Wystąpił błąd w poleceniu Tcl &apos;%1&apos;: %2</translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/ScriptingTcl/scriptingtcl.cpp b/Plugins/ScriptingTcl/scriptingtcl.cpp
index 5709808..4390317 100644
--- a/Plugins/ScriptingTcl/scriptingtcl.cpp
+++ b/Plugins/ScriptingTcl/scriptingtcl.cpp
@@ -408,7 +408,7 @@ int ScriptingTcl::dbCommand(ClientData clientData, Tcl_Interp* interp, int objc,
     Tcl_Obj* result = nullptr;
     if (!ctx->db)
     {
-        result = Tcl_NewStringObj(tr("No database available in current context, while called Tcl's 'db' command.").toUtf8().constData(), -1);
+        result = Tcl_NewStringObj(tr("No database available in current context, while called Tcl's '%1' command.").arg("db").toUtf8().constData(), -1);
         Tcl_SetObjResult(interp, result);
         return TCL_ERROR;
     }
@@ -430,7 +430,7 @@ int ScriptingTcl::dbCommand(ClientData clientData, Tcl_Interp* interp, int objc,
         return dbEvalOneColumn(ctx, interp, objv);
     }
 
-    result = Tcl_NewStringObj(tr("Invalid 'db' command sytax. Should be: db eval sql").toUtf8().constData(), -1);
+    result = Tcl_NewStringObj(tr("Invalid '%1' command sytax. Should be: %2").arg("db", "db eval sql").toUtf8().constData(), -1);
     Tcl_SetObjResult(interp, result);
     return TCL_ERROR;
 }
@@ -551,7 +551,7 @@ SqlQueryPtr ScriptingTcl::dbCommonEval(ContextTcl* ctx, Tcl_Interp* interp, Tcl_
     SqlQueryPtr execResults = ctx->db->exec(sql, queryArgs, flags);
     if (execResults->isError())
     {
-        result = Tcl_NewStringObj(tr("Error from Tcl's' 'db' command: %1").arg(execResults->getErrorText()).toUtf8().constData(), -1);
+        result = Tcl_NewStringObj(tr("Error from Tcl's' '%1' command: %2").arg("db", execResults->getErrorText()).toUtf8().constData(), -1);
         Tcl_SetObjResult(interp, result);
     }
     return execResults;
diff --git a/Plugins/ScriptingTcl/scriptingtcl.qrc b/Plugins/ScriptingTcl/scriptingtcl.qrc
index 8a0d047..0a78160 100644
--- a/Plugins/ScriptingTcl/scriptingtcl.qrc
+++ b/Plugins/ScriptingTcl/scriptingtcl.qrc
@@ -2,4 +2,7 @@
     <qresource prefix="/scriptingtcl">
         <file>scriptingtcl.png</file>
     </qresource>
+    <qresource prefix="/msg">
+        <file>ScriptingTcl_pl.qm</file>
+    </qresource>
 </RCC>