Branch: master

422c9f33 2019-11-13 02:27:10 Rafael de Campos 
Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (464 of 464 strings)

Translation: dependencies/tqt3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/dependencies/tqt3/pt_BR/
M translations/qt_pt-br.ts

translations/qt_pt-br.ts

diff --git a/translations/qt_pt-br.ts b/translations/qt_pt-br.ts
index 287195a..c675064 100644
--- a/translations/qt_pt-br.ts
+++ b/translations/qt_pt-br.ts
@@ -1,4 +1,6 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS language="pt-br">
 <context>
     <name>QAccel</name>
     <message>
@@ -175,7 +177,7 @@
     </message>
     <message>
         <source>Media Stop</source>
-        <translation>Interromper Mídia </translation>
+        <translation>Interromper Mídia</translation>
     </message>
     <message>
         <source>Media Previous</source>
@@ -2000,5 +2002,3 @@
     </message>
 </context>
 </TS>
-
-
4052defa 2019-11-16 20:05:32 François Andriot 
Remove double German entry for desktop files.

Signed-off-by: gregory guy <gregory-tde@...>
M tools/assistant/tqassistant.desktop
M tools/qtconfig/tqtconfig.desktop

tools/assistant/tqassistant.desktop

diff --git a/tools/assistant/tqassistant.desktop b/tools/assistant/tqassistant.desktop
index 4e3afa2..270a34b 100644
--- a/tools/assistant/tqassistant.desktop
+++ b/tools/assistant/tqassistant.desktop
@@ -5,7 +5,6 @@
 Name[de]=TQt3 Assistent
 Name[bg]=TQt3 асистент
 Name[cs]=TQt3 asistent
-Name[de]=TQt3 Assistent
 Name[hu]=TQt3 Asszisztens
 Name[ja]=TQt3アシスタント
 Name[km]=អ្នក​ជំនួយការ TQt3

tools/qtconfig/tqtconfig.desktop

diff --git a/tools/qtconfig/tqtconfig.desktop b/tools/qtconfig/tqtconfig.desktop
index 2cabe2c..ac10ca5 100644
--- a/tools/qtconfig/tqtconfig.desktop
+++ b/tools/qtconfig/tqtconfig.desktop
@@ -5,7 +5,6 @@
 Name[de]=TQt3 Konfiguration
 Name[bg]=Настройки на TQt3
 Name[cs]=TQt3 nastavení
-Name[de]=TQt3 Konfiguration
 Name[el]=Ρυθμίσεις TQt3
 Name[fi]=TQt3 asetukset
 Name[fr]=Configuration de TQt3
e7d72ab3 2019-11-17 19:25:22 Slávek Banko 
Update translations binary files
because they are not generated during build.

Signed-off-by: Slávek Banko <slavek.banko@...>
M translations/qt_pt-br.qm

translations/qt_pt-br.qm

diff --git a/translations/qt_pt-br.qm b/translations/qt_pt-br.qm
index 1b7a483..92e0871 100644
--- a/translations/qt_pt-br.qm
+++ b/translations/qt_pt-br.qm
Binary files differ
90ea30a4 2019-11-18 12:02:48 François Andriot 
Remove bool/my_bool artifact, the 'bool' data type is part of the c++
language and was added to c compilers with c99.

Signed-off-by: gregory guy <gregory-tde@...>
M src/sql/drivers/mysql/qsql_mysql.cpp

src/sql/drivers/mysql/qsql_mysql.cpp

diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 131e762..dc5a40c 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -517,7 +517,7 @@
 	    return FALSE;
     }
 
-    my_bool reconnect = 0;
+    bool reconnect = 0;
     for ( it = opts.begin(); it != opts.end(); ++it ) {
 	TQString opt( (*it).upper() );
 	if ( opt == "CLIENT_COMPRESS" )
9a6ac9dd 2019-11-18 15:37:00 Slávek Banko 
Fix build with PostgreSQL 12+.

Signed-off-by: Slávek Banko <slavek.banko@...>
M src/sql/drivers/psql/qsql_psql.cpp

src/sql/drivers/psql/qsql_psql.cpp

diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index b6466e8..7a12fe8 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -147,8 +147,10 @@
     case FLOAT8OID      :
 	type = TQVariant::Double;
 	break;
+#ifdef ABSTIMEOID // PostgreSQL << 12.x
     case ABSTIMEOID     :
     case RELTIMEOID     :
+#endif
     case DATEOID	:
 	type = TQVariant::Date;
 	break;
0a4af9fa 2019-11-20 19:27:00 Francois 
Translated using Weblate (French)

Currently translated at 17.7% (50 of 282 strings)

Translation: dependencies/tqt3 - examples-demo
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/dependencies/tqt3-examples-demo/fr/
M examples/demo/translations/demo_fr.ts

examples/demo/translations/demo_fr.ts

diff --git a/examples/demo/translations/demo_fr.ts b/examples/demo/translations/demo_fr.ts
index 5e2b73c..9a9bd21 100644
--- a/examples/demo/translations/demo_fr.ts
+++ b/examples/demo/translations/demo_fr.ts
@@ -1,233 +1,235 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS language="fr">
 <context encoding="UTF-8">
     <name>BookForm</name>
     <message encoding="UTF-8">
         <source>Book</source>
-        <translation type="unfinished"></translation>
+        <translation>Livre</translation>
     </message>
     <message encoding="UTF-8">
         <source>Surname</source>
-        <translation type="unfinished"></translation>
+        <translation>Surnom</translation>
     </message>
     <message encoding="UTF-8">
         <source>surname</source>
-        <translation type="unfinished"></translation>
+        <translation>surnom</translation>
     </message>
     <message encoding="UTF-8">
         <source>Forename</source>
-        <translation type="unfinished"></translation>
+        <translation>Prénom</translation>
     </message>
     <message encoding="UTF-8">
         <source>forename</source>
-        <translation type="unfinished"></translation>
+        <translation>prénom</translation>
     </message>
     <message encoding="UTF-8">
         <source>surname ASC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">surnom ASV</translation>
     </message>
     <message encoding="UTF-8">
         <source>forename ASC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">prénom ASV</translation>
     </message>
     <message encoding="UTF-8">
         <source>(default)</source>
-        <translation type="unfinished"></translation>
+        <translation>(défaut)</translation>
     </message>
     <message encoding="UTF-8">
         <source>author</source>
-        <translation type="unfinished"></translation>
+        <translation>auteur</translation>
     </message>
     <message encoding="UTF-8">
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Titre</translation>
     </message>
     <message encoding="UTF-8">
         <source>title</source>
-        <translation type="unfinished"></translation>
+        <translation>titre</translation>
     </message>
     <message encoding="UTF-8">
         <source>Price</source>
-        <translation type="unfinished"></translation>
+        <translation>Prix</translation>
     </message>
     <message encoding="UTF-8">
         <source>price</source>
-        <translation type="unfinished"></translation>
+        <translation>prix</translation>
     </message>
     <message encoding="UTF-8">
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes</translation>
     </message>
     <message encoding="UTF-8">
         <source>notes</source>
-        <translation type="unfinished"></translation>
+        <translation>notes</translation>
     </message>
     <message encoding="UTF-8">
         <source>title ASC</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">titre ASC</translation>
     </message>
     <message encoding="UTF-8">
         <source>book</source>
-        <translation type="unfinished"></translation>
+        <translation>livre</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;Connect...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Connecter...</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;Edit Books</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Modifier les Livres</translation>
     </message>
 </context>
 <context encoding="UTF-8">
     <name>ConnectDialog</name>
     <message encoding="UTF-8">
         <source>Connect...</source>
-        <translation type="unfinished"></translation>
+        <translation>Connecter...</translation>
     </message>
     <message encoding="UTF-8">
         <source>Connection settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paramètres de la connexion</translation>
     </message>
     <message encoding="UTF-8">
         <source>Database Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom de la base de données:</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom d&apos;&amp;Utilisateur:</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mot de &amp;Passe:</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;Hostname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom d&apos;&amp;Hôte:</translation>
     </message>
     <message encoding="UTF-8">
         <source>P&amp;ort:</source>
-        <translation type="unfinished"></translation>
+        <translation>P&amp;ort:</translation>
     </message>
     <message encoding="UTF-8">
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Défaut</translation>
     </message>
     <message encoding="UTF-8">
         <source>D&amp;river</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pilote</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message encoding="UTF-8">
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Annuler</translation>
     </message>
 </context>
 <context encoding="UTF-8">
** Diff limit reached (max: 250 lines) **
5826489a 2019-11-23 12:55:56 Chris 
Translated using Weblate (German)

Currently translated at 100.0% (198 of 198 strings)

Translation: dependencies/tqt3 - tools-assistant
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/dependencies/tqt3-tools-assistant/de/
M tools/assistant/assistant_de.ts
** Diff limit reached (max: 250 lines) **

Branch: r14.0.x

058f98f8 2019-11-17 19:24:36 François Andriot 
Remove double German entry for desktop files.

Signed-off-by: gregory guy <gregory-tde@...>
(cherry picked from commit 4052defa1b90cd40e01293a4106c734381461251)
M tools/assistant/tqassistant.desktop
M tools/qtconfig/tqtconfig.desktop
** Diff limit reached (max: 250 lines) **
acb0f52d 2019-11-17 19:25:38 Slávek Banko 
Update translations binary files
because they are not generated during build.

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit e7d72ab3f2e7f1a2fa07beaf0204a412795ceffe)
M translations/qt_pt-br.qm
** Diff limit reached (max: 250 lines) **
b94e9468 2019-11-18 13:32:41 François Andriot 
Remove bool/my_bool artifact, the 'bool' data type is part of the c++
language and was added to c compilers with c99.

Signed-off-by: gregory guy <gregory-tde@...>
(cherry picked from commit 90ea30a42a102ac57b26439965ec1240341c568d)
M src/sql/drivers/mysql/qsql_mysql.cpp
** Diff limit reached (max: 250 lines) **
54ca124d 2019-11-18 15:37:17 Slávek Banko 
Fix build with PostgreSQL 12+.

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 9a6ac9dde59581df39cdc6734e99e1db97b03887)
M src/sql/drivers/psql/qsql_psql.cpp
** Diff limit reached (max: 250 lines) **