Branch: master

a34baae7 2019-07-29 20:00:09 Chris
Fix branding of Tork and also translations, for fuzzy prevention.

Signed-off-by: Chris <xchrisx@...>
M po/cs.po
M po/de.po
M po/el.po
M po/es.po
M po/fr.po
M po/it.po
M po/tork.pot
M po/tr.po
M po/zh_CN.po
M src/update.cpp

po/cs.po

diff --git a/po/cs.po b/po/cs.po
index f9a2c0d..15c49b7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2615,14 +2615,14 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p><b>Pokud je to poprvé co se snažíte kompilovat programy, tak vám dáme pár "
-"užitečných rad:</b><br>1. Některé chyby v záznamu se slovy \"TDE\", \"Qt\", "
+"užitečných rad:</b><br>1. Některé chyby v záznamu se slovy \"TDE\", \"TQt\", "
 "\"Curl\", nebo \"X\" jsou tam proto, protože nemáte nainstalovány zdrojové "
 "kódy knihoven.<br>2. Některé balíčky, které poskytuje vaše distribuce, které "
 "mají v názvu \"lib\", nebo \"devel\" obsahují zdrojové kódy knihoven. Např.: "
-"qt-devel,libkde,...<br></p>"
+"tqt-devel,libtde,...<br></p>"
 
 #: update.cpp:312
 msgid "Checking for new version of Privoxy..."

po/de.po

diff --git a/po/de.po b/po/de.po
index c2922f7..4784549 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2681,7 +2681,7 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p><b>Wenn Sie zum ersten Mal Software kompiliert haben, habe ich ein paar "
 "nützliche Tips:</b><br>1. Fehler, die die Worte 'TDE', 'TQt', 'curl' oder "

po/el.po

diff --git a/po/el.po b/po/el.po
index 2cd90ee..0ec48f9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2687,14 +2687,14 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p> <b> Αν αυτή η πρώτη φορά που έχετε καταρτίσει λογισμικό και στη συνέχεια "
 "εδώ, είναι μερικέςχρήσιμες συμβουλές: </b> <br> 1. κανένα μήνυμα λάθους στο "
-"αρχείο καταγραφής με τις λέξεις' TDE ', 'Qt', 'μπούκλα ' ή ' X ' αυτές "
+"αρχείο καταγραφής με τις λέξεις' TDE ', 'TQt', 'μπούκλα ' ή ' X ' αυτές "
 "σημαίνουν ότι το χρειάζεστε για την εγκατάσταση του κατάλληλη ανάπτυξη "
 "βιβλιοθηκών. <br> 2. Κάθε πακέτο που σας παρέχει ηδιανομή με 'lib ' ή ' "
-"devel 'στο όνομα της ανάπτυξης είναι μια βιβλιοθήκη, ε.ζ. qt-devel, libkde. "
+"devel 'στο όνομα της ανάπτυξης είναι μια βιβλιοθήκη, ε.ζ. tqt-devel, libtde. "
 "<br></p>"
 
 #: update.cpp:312

po/es.po

diff --git a/po/es.po b/po/es.po
index a9200a3..ac37cec 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2677,15 +2677,15 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p> Si esta la primera vez que el software compilado luego aquí son unos "
 "pocosconsejos útiles: </b> <br> 1. Toda mensajes de error en el archivo de "
-"registro con las palabras 'TDE', 'Qt', 'curl' o 'X' en ellos significa que "
+"registro con las palabras 'TDE', 'TQt', 'curl' o 'X' en ellos significa que "
 "usted necesita para instalar elbibliotecas de desarrollo apropiadas. <br> 2. "
 "Cualquier paquete proporcionado por ella distribución con 'lib' o "
-"'desarrollo' en el nombre es un desarrollo de la biblioteca, e.g. qt-devel, "
-"libkde. <br> </p>"
+"'desarrollo' en el nombre es un desarrollo de la biblioteca, e.g. tqt-devel, "
+"libtde. <br> </p>"
 
 #: update.cpp:312
 msgid "Checking for new version of Privoxy..."

po/fr.po

diff --git a/po/fr.po b/po/fr.po
index 63bf727..474b369 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2680,14 +2680,14 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p><b>Si c'est la première fois que vous compilez un logiciel, voici deux "
 "informations utiles.</b><br>1. La présence de messages d'erreur comprenant "
-"les mots 'TDE', 'Qt','curl' ou 'X' dans le journal signifie que vous devez "
+"les mots 'TDE', 'TQt','curl' ou 'X' dans le journal signifie que vous devez "
 "installer les bibliothèques de développement correspondantes.<br>2. Les "
 "paquetages de votre distribution avec 'lib', 'dev' ou 'devel' dans leur nom "
-"sont des bibliothèques de développement, par exemple qt-devel et libkde."
+"sont des bibliothèques de développement, par exemple tqt-devel et libtde."
 "<br></p>"
 
 #: update.cpp:312

po/it.po

diff --git a/po/it.po b/po/it.po
index 8badc95..4559b16 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2657,15 +2657,15 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p><b>Se questa è la prima volta che hai compilato il software allora qui ci "
 "sono alcuni suggerimenti utili:</b><br>1. Eventuali messaggi di errore nel "
-"file di log, contenenti le parole \"TDE\", \"Qt\", \"curl\" o \"X\", "
+"file di log, contenenti le parole \"TDE\", \"TQt\", \"curl\" o \"X\", "
 "indicano che occorre installare un adeguato pacchetto di sviluppo.<br>2. "
 "Ogni pacchetto fornito dalla tua distribuzione che presenta i termini \"lib"
-"\" o \"devel\" nel nome è una libreria di sviluppo (ad es.: qt-devel, "
-"libkde).<br></p>"
+"\" o \"devel\" nel nome è una libreria di sviluppo (ad es.: tqt-devel, "
+"libtde).<br></p>"
 
 #: update.cpp:312
 msgid "Checking for new version of Privoxy..."

po/tork.pot

diff --git a/po/tork.pot b/po/tork.pot
index 5e74252..115bbf5 100644
--- a/po/tork.pot
+++ b/po/tork.pot
@@ -2256,7 +2256,7 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, "
-"e.g. qt-devel, libkde.<br></p>"
+"e.g. tqt-devel, libtde.<br></p>"
 msgstr ""
 
 #: update.cpp:312

po/tr.po

diff --git a/po/tr.po b/po/tr.po
index d3ef7c6..9a08084 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2320,10 +2320,10 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p><b>Eğer bu işi ilk kez yapacaksanız size bir kaç faydalı öneri:<br>1- "
-"Yükleme başladığınızda 'TDE' 'Qt' 'Curl' yada 'X' gibi semboller görürseniz "
+"Yükleme başladığınızda 'TDE' 'TQt' 'Curl' yada 'X' gibi semboller görürseniz "
 "bağımlılık kütüphanelerini yüklemeniz gerekecektir. <br>2- lib yada devel "
 "uzantılı her tür dosya bağlımlık kütüphanesi dosyasıdır.<br></p>"
 

po/zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9bf7284..d1a2e2f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2456,12 +2456,12 @@
 "'TDE', 'TQt','curl' or 'X' in them mean that you need to install the "
 "appropriate development libraries.<br>2. Any package provided by your "
 "distribution with 'lib' or 'devel' in the name is a development library, e."
-"g. qt-devel, libkde.<br></p>"
+"g. tqt-devel, libtde.<br></p>"
 msgstr ""
 "<p><b>如果这是您第一次编译软件,那么这里有一些有用的提示:</b><br>1.在日志文"
-"件中任何带有“TDE”,“Qt”,“curl”或者“X”这些字的错误消息通常意味着您需要安装适"
+"件中任何带有“TDE”,“TQt”,“curl”或者“X”这些字的错误消息通常意味着您需要安装适"
 "当的开发库。<br>2.在您的发行版中那些名称带有“lib”或者“devel”的软件包通常就是"
-"一个开发库,例如,qt-devel,libkde。<br></p>"
+"一个开发库,例如,tqt-devel,libtde。<br></p>"
 
 #: update.cpp:312
 msgid "Checking for new version of Privoxy..."

src/update.cpp

diff --git a/src/update.cpp b/src/update.cpp
index 859e617..87e5935 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -261,7 +261,7 @@
                 KMessageBox::information (this,i18n( "<p><b>If this the first time you've compiled software then here are a few useful tips:</b><br>"
                     "1. Any error messages in the log file with the words 'TDE', 'TQt','curl' or 'X' in them mean that you need to install "
                     "the appropriate development libraries.<br>"
-                    "2. Any package provided by your distribution with 'lib' or 'devel' in the name is a development library, e.g. qt-devel, libkde.<br>"
+                    "2. Any package provided by your distribution with 'lib' or 'devel' in the name is a development library, e.g. tqt-devel, libtde.<br>"
                     "</p>" ),"Compilation Tips","compiler");
 
                  TQString command;