From 380e3401db2008b52dda34227debf5e15f3bd045 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 9 Jan 2014 14:04:57 -0600 Subject: Branding and code cleanup. --- doc/en/index.docbook | 16 +++++----- po/cs.po | 26 +++++++-------- po/de.po | 22 ++++++------- po/el.po | 20 ++++++------ po/es.po | 22 ++++++------- po/fr.po | 22 ++++++------- po/it.po | 20 ++++++------ po/libkickermenu_tork.pot | 4 +-- po/tork.pot | 10 +++--- po/tr.po | 20 ++++++------ po/zh_CN.po | 24 +++++++------- src/Makefile.am | 2 +- src/arkollon/wizard.cpp | 4 +-- src/dcoptork.h | 4 +-- src/eventsrc | 2 +- src/hiddensrvs.ui.h | 4 +-- src/konqplugin/tork_plug_in.cpp | 22 ++++++------- src/konqplugin/tork_plug_in.h | 4 +-- src/main.cpp | 4 +-- src/menu/tork.in | 2 +- src/newstreamosd.cpp | 26 +++++++-------- src/newstreamosd.h | 6 ++-- src/quickconfig.ui | 2 +- src/tor_ioslave/torioslave.cpp | 8 ++--- src/tork.1 | 8 ++--- src/tork.cpp | 70 ++++++++++++++++++++--------------------- src/tork.desktop | 2 +- src/tork.h | 14 ++++----- src/torkapplet/tork_mnu.cpp | 20 ++++++------ src/torkapplet/tork_mnu.h | 2 +- src/torkconfig.kcfg | 4 +-- src/torkview.cpp | 2 +- src/trayicon.cpp | 2 +- src/update.cpp | 2 +- tork.tdevelop | 2 +- 35 files changed, 212 insertions(+), 212 deletions(-) diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 8e173c9..0b837d0 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -23,7 +23,7 @@ with lots of help from: Eric Bischoff ebisch@cybercable.tm.fr and Frederik Fouvry fouvry@sfs.nphil.uni-tuebingen.de of the KDE DocBook team. -You may freely use this template for writing any sort of KDE documentation. +You may freely use this template for writing any sort of TDE documentation. If you have any changes or improvements, please let us know. Remember: @@ -89,11 +89,11 @@ ever want. -KDE +TDE tork nothing nothing else @@ -108,7 +108,7 @@ document, and if there is no ID, the name of the generated HTML files will vary from time to time making it hard to manage for maintainers and for the CVS system. Any chapter labelled (OPTIONAL) may be left out at the author's discretion. Other chapters should not be left out in order to maintain a -consistent documentation style across all KDE apps. --> +consistent documentation style across all TDE apps. --> Introduction @@ -230,7 +230,7 @@ or menu bars. --> The <guimenu>Help</guimenu> Menu - + @@ -427,7 +427,7 @@ installed. Credits and License @@ -441,7 +441,7 @@ Program copyright 2006 Robert Hogan robert@roberthogan.net Contributors: -Konqui the KDE Dragon konqui@kde.org +Konqui the TDE Dragon konqui@kde.org Tux the Linux Penguin tux@linux.org @@ -476,7 +476,7 @@ Documentation copyright 2006 Robert Hogan robert@roberthogan.net How to obtain &tork; &install.intro.documentation; diff --git a/po/cs.po b/po/cs.po index 21f5560..00e66e6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2041,12 +2041,12 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" "

Předpona 'tor:'.

\n" "

Můžete požadovat, aby se webová stránka načetla kdykoli " "anonymně, když před její jméno jednoduše vložíte 'tor'..

\n" -"

Tohle funguje v Konqueroru a v konzoli v prostředí KDE.

" +"

Tohle funguje v Konqueroru a v konzoli v prostředí TDE.

" #. i18n: file ./introwizard.ui line 1215 #. i18n: file ./introwizard.ui line 1362 @@ -2058,8 +2058,8 @@ msgstr "Předpona 'tor:' v Konqueroru. " #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:603 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " -msgstr "Předpona 'tor:' v konzoli v KDE. " +msgid "The 'tor:' prefix on the TDE command console. " +msgstr "Předpona 'tor:' v konzoli v TDE. " #. i18n: file ./introwizard.ui line 1278 #: introwizard.cpp:58811 rc.cpp:606 @@ -2497,7 +2497,7 @@ msgstr "Komentář odeslán" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." @@ -2508,8 +2508,8 @@ msgid "Document to open." msgstr "Dokument k otevření." #: main.cpp:46 -msgid "Toggle Anonymous KDE" -msgstr "Přepněte na anonymní KDE" +msgid "Toggle Anonymous TDE" +msgstr "Přepněte na anonymní TDE" #: main.cpp:47 msgid "Launch Anonymous Firefox" @@ -6221,13 +6221,13 @@ msgstr "Instalace %1 byla přerušena." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Pokud je to poprvé co se snažíte kompilovat programy, tak vám dáme pár " -"užitečných rad:
1. Některé chyby v záznamu se slovy \"KDE\", \"Qt\", " +"užitečných rad:
1. Některé chyby v záznamu se slovy \"TDE\", \"Qt\", " "\"Curl\", nebo \"X\" jsou tam proto, protože nemáte nainstalovány zdrojové " "kódy knihoven.
2. Některé balíčky, které poskytuje vaše distribuce, které " "mají v názvu \"lib\", nebo \"devel\" obsahují zdrojové kódy knihoven. Např.: " @@ -6277,8 +6277,8 @@ msgstr "" "Pokud bude instalace dokončena úspěšně, bude nutné restartovat součást aby " "nová verze začala pracovat." -#~ msgid "TorK - An Anonymity Manager for the KDE Desktop" -#~ msgstr "TorK - Správce anonymity pro KDE" +#~ msgid "TorK - An Anonymity Manager for the TDE Desktop" +#~ msgstr "TorK - Správce anonymity pro TDE" #~ msgid "Citizen Of.." #~ msgstr "Přiřadit národnost.." @@ -6318,11 +6318,11 @@ msgstr "" #~ msgstr "Stáhnout Dante (SOCKS klient)" #~ msgid "" -#~ "

Your version of KDE cannot process the Dante tarball.

Try " +#~ "

Your version of TDE cannot process the Dante tarball.

Try " #~ "downloading and installing Dante directly from http://www.mirrors." #~ "wiretapped.net/security/firewalls/dante/" #~ msgstr "" -#~ "

Vaše verze KDE není schopna pracovat s Dante tarballem.

Zkuste " +#~ "

Vaše verze TDE není schopna pracovat s Dante tarballem.

Zkuste " #~ "stáhnout a instalovat Dante přímo z http://www.mirrors.wiretapped.net/" #~ "security/firewalls/dante/" diff --git a/po/de.po b/po/de.po index 35b409b..c44419e 100644 --- a/po/de.po +++ b/po/de.po @@ -1929,7 +1929,7 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" "

Das 'tor':' Präfix.

\n" "

Sie können eine Webseite zu jeder Zeit anonym anfordern " @@ -1947,8 +1947,8 @@ msgstr "Das 'tor:' Präfix in Konqueror. " #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:1361 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " -msgstr "Das 'tor:' Präfix auf der KDE Konsole. " +msgid "The 'tor:' prefix on the TDE command console. " +msgstr "Das 'tor:' Präfix auf der TDE Konsole. " #. i18n: file ./introwizard.ui line 1278 #: introwizard.cpp:58811 rc.cpp:1365 @@ -2364,16 +2364,16 @@ msgid "Comment Sent" msgstr "Kommentar Gesendet" #: main.cpp:34 -msgid "TorK - An Anonymity Manager for the KDE Desktop" -msgstr "TorK - Ein Anonymitätsmanager für den KDE Desktop" +msgid "TorK - An Anonymity Manager for the TDE Desktop" +msgstr "TorK - Ein Anonymitätsmanager für den TDE Desktop" #: main.cpp:41 msgid "Document to open." msgstr "Zu öffnendes Dokument" #: main.cpp:42 -msgid "Toggle Anonymous KDE" -msgstr "Anonymes KDE umschalten" +msgid "Toggle Anonymous TDE" +msgstr "Anonymes TDE umschalten" #: main.cpp:43 msgid "Launch Anonymous Firefox" @@ -6063,13 +6063,13 @@ msgstr "Installation von %1 abgebrochen." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Wenn Sie zum ersten Mal Software kompiliert haben, habe ich ein paar " -"nützliche Tips:
1. Fehler, die die Worte'KDE', 'Qt', 'curl' oder 'X' " +"nützliche Tips:
1. Fehler, die die Worte'TDE', 'Qt', 'curl' oder 'X' " "enthalten, bedeuten, daß Sie die entprechenden Libraries installieren müssen." "
2. Alle Pakete mit 'lib' oder 'dev' im Namen (z.B. qt-dev, libkde) sind " "solche Libraries.

" @@ -6151,11 +6151,11 @@ msgstr "Wenn die Installation vollständig abgeschlossen ist, sollten Sie alle K #~ msgstr "Lande Dante herunter (SOCKS Klient)" #~ msgid "" -#~ "

Your version of KDE cannot process the Dante tarball.

Try " +#~ "

Your version of TDE cannot process the Dante tarball.

Try " #~ "downloading and installing Dante directly from http://www.mirrors." #~ "wiretapped.net/security/firewalls/dante/" #~ msgstr "" -#~ "

Ihre KDE-Version kann mit dem Dante tarball nicht umgehen.

" +#~ "

Ihre TDE-Version kann mit dem Dante tarball nicht umgehen.

" #~ "Versuchen Sie es direkt von http://www.mirrors.wiretapped.net/security/" #~ "firewalls/dante/ herunterzuladen." diff --git a/po/el.po b/po/el.po index 74ec2fd..9dcaf8b 100644 --- a/po/el.po +++ b/po/el.po @@ -2008,12 +2008,12 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" "Η

'Tor: ' πρόθεμα.

\n" "

Μπορείτε να ζητήσετε από έναν δικτυακό τόπο που πρέπει να φορτωθούν σε ανώνυμα" "οποιαδήποτε στιγμή με την απλή prefixing Το όνομά του με 'Tor :'..

\n" -"

Αυτό λειτουργεί σε Konqueror και το KDE γραμμή.

" +"

Αυτό λειτουργεί σε Konqueror και το TDE γραμμή.

" #. i18n: file ./introwizard.ui line 1215 #. i18n: file ./introwizard.ui line 1362 @@ -2025,8 +2025,8 @@ msgstr " Η 'Tor: ' το πρόθεμα Konqueror. " #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:1361 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " -msgstr " Η 'Tor: ' πρόθεμα για το KDE εντολή κονσόλα. " +msgid "The 'tor:' prefix on the TDE command console. " +msgstr " Η 'Tor: ' πρόθεμα για το TDE εντολή κονσόλα. " #. i18n: file ./introwizard.ui line 1278 #: introwizard.cpp:58811 rc.cpp:1365 @@ -2456,16 +2456,16 @@ msgid "Comment Sent" msgstr "Σχόλιο Απεσταλμένα" #: main.cpp:34 -msgid "TorK - An Anonymity Manager for the KDE Desktop" -msgstr "TorK - Η ανωνυμία Manager για το KDE Desktop" +msgid "TorK - An Anonymity Manager for the TDE Desktop" +msgstr "TorK - Η ανωνυμία Manager για το TDE Desktop" #: main.cpp:41 msgid "Document to open." msgstr "Document να ανοίξει." #: main.cpp:42 -msgid "Toggle Anonymous KDE" -msgstr "Toggle Ανώνυμος KDE" +msgid "Toggle Anonymous TDE" +msgstr "Toggle Ανώνυμος TDE" #: main.cpp:43 msgid "Launch Anonymous Firefox" @@ -6146,14 +6146,14 @@ msgstr "Η εγκατάσταση του %1 ακυρώθηκε." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Αν αυτή η πρώτη φορά που έχετε καταρτίσει λογισμικό και στη συνέχεια εδώ, είναι μερικές" "χρήσιμες συμβουλές:
1. κανένα μήνυμα λάθους στο αρχείο καταγραφής με τις λέξεις" -"' KDE ', 'Qt', 'μπούκλα ' ή ' X ' αυτές σημαίνουν ότι το χρειάζεστε για την εγκατάσταση του " +"' TDE ', 'Qt', 'μπούκλα ' ή ' X ' αυτές σημαίνουν ότι το χρειάζεστε για την εγκατάσταση του " "κατάλληλη ανάπτυξη βιβλιοθηκών.
2. Κάθε πακέτο που σας παρέχει η" "διανομή με 'lib ' ή ' devel 'στο όνομα της ανάπτυξης είναι μια βιβλιοθήκη, ε." "ζ. qt-devel, libkde.

" diff --git a/po/es.po b/po/es.po index b9f0d8f..d58135d 100644 --- a/po/es.po +++ b/po/es.po @@ -2098,13 +2098,13 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" "El

'Tor:' «prefijo.

\n" "

Usted puede solicitar un sitio web que se cargan en forma " "anónimaen cualquier momento simplemente por que prefijo con el nombre de " "'Tor :'..

\n" -"

Esto funciona en Konqueror de KDE y la línea de " +"

Esto funciona en Konqueror de TDE y la línea de " "comandos.

" #. i18n: file ./introwizard.ui line 1215 @@ -2117,8 +2117,8 @@ msgstr " El 'Tor:' prefijo en Konqueror. " #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:603 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " -msgstr " El 'Tor:' prefijo en la consola de comandos de KDE. " +msgid "The 'tor:' prefix on the TDE command console. " +msgstr " El 'Tor:' prefijo en la consola de comandos de TDE. " #. i18n: file ./introwizard.ui line 1278 #: introwizard.cpp:58811 rc.cpp:606 @@ -2571,7 +2571,7 @@ msgstr "Comentarios enviados" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." @@ -2582,8 +2582,8 @@ msgid "Document to open." msgstr "Documento para abrir." #: main.cpp:46 -msgid "Toggle Anonymous KDE" -msgstr "Cambiar Anónimo KDE" +msgid "Toggle Anonymous TDE" +msgstr "Cambiar Anónimo TDE" #: main.cpp:47 msgid "Launch Anonymous Firefox" @@ -6374,14 +6374,14 @@ msgstr "Instalación d %1 Cancelado." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Si esta la primera vez que el software compilado luego aquí son unos " "pocosconsejos útiles:
1. Toda mensajes de error en el archivo de " -"registro con las palabras 'KDE', 'Qt', 'curl' o 'X' en ellos significa que " +"registro con las palabras 'TDE', 'Qt', 'curl' o 'X' en ellos significa que " "usted necesita para instalar elbibliotecas de desarrollo apropiadas.
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, " @@ -6431,8 +6431,8 @@ msgstr "" "Si la instalación se ha completado correctamente debe reiniciar el " "componentepara la nueva versión tenga efecto." -#~ msgid "TorK - An Anonymity Manager for the KDE Desktop" -#~ msgstr "Tork - Un Administrador de anonimato para el escritorio KDE" +#~ msgid "TorK - An Anonymity Manager for the TDE Desktop" +#~ msgstr "Tork - Un Administrador de anonimato para el escritorio TDE" #~ msgid "Citizen Of.." #~ msgstr "ciudadano de .." diff --git a/po/fr.po b/po/fr.po index c9686e1..62ccf20 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2075,7 +2075,7 @@ msgid "" msgstr "" "

Le lanceur rapide TorK

\n" "

Vous pouvez ajouter un lanceur rapide pour TorK dans votre " -"tableau de bord KDE. Cliquez-droit sur le tableau de bord, sélectionnez " +"tableau de bord TDE. Cliquez-droit sur le tableau de bord, sélectionnez " "'Ajoutez une applet au tableau de bord...', puis cliquez sur l'applet TorK " "comme l'image le montre en haut à droite. L'applet TorK est ainsi ajoutée en " "bas à droite de votre tableau de bord.

" @@ -2107,13 +2107,13 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" "

Le préfixe 'tor:'

\n" "

Vous pouvez naviguer anonymement sur un site web à tout " "moment simplement en préfixant son adresse avec 'tor:'.

\n" "

Ce raccourci fonctionne avec Konqueror et avec la ligne de " -"commande de KDE.

" +"commande de TDE.

" #. i18n: file ./introwizard.ui line 1215 #. i18n: file ./introwizard.ui line 1362 @@ -2125,7 +2125,7 @@ msgstr "Le préfixe 'tor:' dans Konqueror" #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:603 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " +msgid "The 'tor:' prefix on the TDE command console. " msgstr "Le préfixe 'tor:' dans Konsole" #. i18n: file ./introwizard.ui line 1278 @@ -2578,7 +2578,7 @@ msgstr "Envoi d'une remarque" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." @@ -2589,8 +2589,8 @@ msgid "Document to open." msgstr "Document à ouvrir." #: main.cpp:46 -msgid "Toggle Anonymous KDE" -msgstr "Inverser l'état d'anonymat de KDE" +msgid "Toggle Anonymous TDE" +msgstr "Inverser l'état d'anonymat de TDE" #: main.cpp:47 msgid "Launch Anonymous Firefox" @@ -6385,14 +6385,14 @@ msgstr "Installation de %1 annulée." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Si c'est la première fois que vous compilez un logiciel, voici deux " "informations utiles.
1. La présence de messages d'erreur comprenant " -"les mots 'KDE', 'Qt','curl' ou 'X' dans le journal signifie que vous devez " +"les mots 'TDE', 'Qt','curl' ou 'X' dans le journal signifie que vous devez " "installer les bibliothèques de développement correspondantes.
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." @@ -6442,8 +6442,8 @@ msgstr "" "Si l'installation se termine avec succès, vous devez redémarrer le composant " "pour que la nouvelle version prenne effet." -#~ msgid "TorK - An Anonymity Manager for the KDE Desktop" -#~ msgstr "TorK - Un gestionnaire d'anonymat pour l'environnement KDE" +#~ msgid "TorK - An Anonymity Manager for the TDE Desktop" +#~ msgstr "TorK - Un gestionnaire d'anonymat pour l'environnement TDE" #~ msgid "Citizen Of.." #~ msgstr "Citoyen de..." diff --git a/po/it.po b/po/it.po index c83ba95..cc40b90 100644 --- a/po/it.po +++ b/po/it.po @@ -1614,12 +1614,12 @@ msgstr "Commento inviato" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." msgstr "" -"TorK - Un gestore di anonimato per il desktop KDE.\n" +"TorK - Un gestore di anonimato per il desktop TDE.\n" "Questo prodotto è realizzato indipendentemente dal software di\n" "anonimato Tor, e non fornisce garanzie per il progetto Tor, circa\n" "la sua qualità, adeguatezza o qualsiasi altra caratteristica." @@ -1629,8 +1629,8 @@ msgid "Document to open." msgstr "Documento da aprire." #: main.cpp:46 -msgid "Toggle Anonymous KDE" -msgstr "Commuta modo anonimo di KDE" +msgid "Toggle Anonymous TDE" +msgstr "Commuta modo anonimo di TDE" #: main.cpp:47 msgid "Launch Anonymous Firefox" @@ -4289,13 +4289,13 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" "

Il prefisso \"tor:\"

\n" "

Puoi accedere ad un sito web in modo anonimo in qualsiasi " "momento semplicemente preponendo il prefisso \"tor:\" al nome del sito.

\n" "

Ciò funzionerà solo in Konqueror e nella linea di comando " -"di KDE.

" +"di TDE.

" #. i18n: file ./introwizard.ui line 1215 #. i18n: file ./introwizard.ui line 1362 @@ -4307,8 +4307,8 @@ msgstr "Il prefisso in Konqueror..." #. i18n: file ./introwizard.ui line 1253 #: rc.cpp:1320 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " -msgstr "...e nella linea di comando di KDE." +msgid "The 'tor:' prefix on the TDE command console. " +msgstr "...e nella linea di comando di TDE." #. i18n: file ./introwizard.ui line 1278 #: rc.cpp:1323 @@ -6313,14 +6313,14 @@ msgstr "Installazione di %1 annullata." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Se questa è la prima volta che hai compilato il software allora qui ci " "sono alcuni suggerimenti utili:
1. Eventuali messaggi di errore nel " -"file di log, contenenti le parole \"KDE\", \"Qt\", \"curl\" o \"X\", " +"file di log, contenenti le parole \"TDE\", \"Qt\", \"curl\" o \"X\", " "indicano che occorre installare un adeguato pacchetto di sviluppo.
2. " "Ogni pacchetto fornito dalla tua distribuzione che presenta i termini \"lib" "\" o \"devel\" nel nome è una libreria di sviluppo (ad es.: qt-devel, " diff --git a/po/libkickermenu_tork.pot b/po/libkickermenu_tork.pot index cc1871a..c19db24 100644 --- a/po/libkickermenu_tork.pot +++ b/po/libkickermenu_tork.pot @@ -48,9 +48,9 @@ msgid "Send Anonymous Email" msgstr "" #: tork_mnu.cpp:148 tork_mnu.cpp:168 -msgid "Anonymize KDE" +msgid "Anonymize TDE" msgstr "" #: tork_mnu.cpp:166 -msgid "De-Anonymize KDE" +msgid "De-Anonymize TDE" msgstr "" diff --git a/po/tork.pot b/po/tork.pot index caa0d4e..3e054f8 100644 --- a/po/tork.pot +++ b/po/tork.pot @@ -1770,7 +1770,7 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" #. i18n: file ./introwizard.ui line 1215 @@ -1783,7 +1783,7 @@ msgstr "" #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:603 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " +msgid "The 'tor:' prefix on the TDE command console. " msgstr "" #. i18n: file ./introwizard.ui line 1278 @@ -2162,7 +2162,7 @@ msgstr "" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." @@ -2173,7 +2173,7 @@ msgid "Document to open." msgstr "" #: main.cpp:46 -msgid "Toggle Anonymous KDE" +msgid "Toggle Anonymous TDE" msgstr "" #: main.cpp:47 @@ -5549,7 +5549,7 @@ msgstr "" msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" diff --git a/po/tr.po b/po/tr.po index 6f64449..1e2e369 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1797,7 +1797,7 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" #. i18n: file ./introwizard.ui line 1215 @@ -1810,7 +1810,7 @@ msgstr "" #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:603 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " +msgid "The 'tor:' prefix on the TDE command console. " msgstr "" #. i18n: file ./introwizard.ui line 1278 @@ -2191,7 +2191,7 @@ msgstr "Bileşen ismi" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." @@ -2202,7 +2202,7 @@ msgid "Document to open." msgstr "" #: main.cpp:46 -msgid "Toggle Anonymous KDE" +msgid "Toggle Anonymous TDE" msgstr "" #: main.cpp:47 @@ -5666,13 +5666,13 @@ msgstr "%1 Kurulumu İptal Edildi." msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

Eğer bu işi ilk kez yapacaksanız size bir kaç faydalı öneri:
1- " -"Yükleme başladığınızda 'KDE' 'Qt' 'Curl' yada 'X' gibi semboller görürseniz " +"Yükleme başladığınızda 'TDE' 'Qt' 'Curl' yada 'X' gibi semboller görürseniz " "bağımlılık kütüphanelerini yüklemeniz gerekecektir.
2- lib yada devel " "uzantılı her tür dosya bağlımlık kütüphanesi dosyasıdır.

" @@ -5844,8 +5844,8 @@ msgstr "" #~ msgid "Configure (3 of 3)" #~ msgstr "Yapılandır (3/3)" -#~ msgid "Configure &KDE to use Tor for Internet Traffic" -#~ msgstr "&KDE'yi Tor'un İnternet Trafiğinde kullanılması için yapılandır" +#~ msgid "Configure &TDE to use Tor for Internet Traffic" +#~ msgstr "&TDE'yi Tor'un İnternet Trafiğinde kullanılması için yapılandır" #~ msgid "Proxies &I use to connect to the Internet" #~ msgstr "&İnternet'e bağlanmak için kullandığım Vekil Sunucular." @@ -5871,8 +5871,8 @@ msgstr "" #~ msgid " onionskins" #~ msgstr " soğankabuğu" -#~ msgid "Configure KDE to &use Tor for Internet Traffic" -#~ msgstr "İnternet trafiğinde Tor'un kullanılması için KDE'yi ayarla." +#~ msgid "Configure TDE to &use Tor for Internet Traffic" +#~ msgstr "İnternet trafiğinde Tor'un kullanılması için TDE'yi ayarla." #~ msgid "Alt+U" #~ msgstr "Alt+U" diff --git a/po/zh_CN.po b/po/zh_CN.po index 45c30d9..12a12fd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1884,7 +1884,7 @@ msgid "" "

The 'tor:' prefix.

\n" "

You can request a website to be loaded anonymously at " "anytime by simply prefixing it's name with 'tor:'..

\n" -"

This works in Konqueror and the KDE command line.

" +"

This works in Konqueror and the TDE command line.

" msgstr "" #. i18n: file ./introwizard.ui line 1215 @@ -1897,8 +1897,8 @@ msgstr "Konqueror 中的“tor:”路径。" #. i18n: file ./introwizard.ui line 1253 #: introwizard.cpp:58809 rc.cpp:603 #, no-c-format -msgid "The 'tor:' prefix on the KDE command console. " -msgstr "KDE 命令行会话中的“tor:”路径。" +msgid "The 'tor:' prefix on the TDE command console. " +msgstr "TDE 命令行会话中的“tor:”路径。" #. i18n: file ./introwizard.ui line 1278 #: introwizard.cpp:58811 rc.cpp:606 @@ -2291,7 +2291,7 @@ msgstr "评述已发送" #: main.cpp:35 msgid "" -"TorK - An Anonymity Manager for the KDE Desktop.\n" +"TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else." @@ -2302,8 +2302,8 @@ msgid "Document to open." msgstr "要打开的文档。" #: main.cpp:46 -msgid "Toggle Anonymous KDE" -msgstr "切换匿名 KDE" +msgid "Toggle Anonymous TDE" +msgstr "切换匿名 TDE" #: main.cpp:47 msgid "Launch Anonymous Firefox" @@ -5900,13 +5900,13 @@ msgstr "%1 的安装已取消。" msgid "" "

If this the first time you've compiled software then here are a few " "useful tips:
1. Any error messages in the log file with the words " -"'KDE', 'Qt','curl' or 'X' in them mean that you need to install the " +"'TDE', 'Qt','curl' or 'X' in them mean that you need to install the " "appropriate development libraries.
2. Any package provided by your " "distribution with 'lib' or 'devel' in the name is a development library, e." "g. qt-devel, libkde.

" msgstr "" "

如果这是您第一次编译软件，那么这里有一些有用的提示：
1.在日志文" -"件中任何带有“KDE”，“Qt”，“curl”或者“X”这些字的错误消息通常意味着您需要安装适" +"件中任何带有“TDE”，“Qt”，“curl”或者“X”这些字的错误消息通常意味着您需要安装适" "当的开发库。
2.在您的发行版中那些名称带有“lib”或者“devel”的软件包通常就是" "一个开发库，例如，qt-devel，libkde。

" @@ -5950,8 +5950,8 @@ msgid "" "for the new version to take effect." msgstr "如果安装成功完成了，您应该重新启动该组件以使新版本生效。" -#~ msgid "TorK - An Anonymity Manager for the KDE Desktop" -#~ msgstr "TorK - 一款 KDE 桌面下的匿名管理器" +#~ msgid "TorK - An Anonymity Manager for the TDE Desktop" +#~ msgstr "TorK - 一款 TDE 桌面下的匿名管理器" #~ msgid "Citizen Of.." #~ msgstr "公民.." @@ -5992,11 +5992,11 @@ msgstr "如果安装成功完成了，您应该重新启动该组件以使新版 #~ msgstr "下载 Dante (SOCKS 客户端)" #~ msgid "" -#~ "

Your version of KDE cannot process the Dante tarball.

Try " +#~ "

Your version of TDE cannot process the Dante tarball.

Try " #~ "downloading and installing Dante directly from http://www.mirrors." #~ "wiretapped.net/security/firewalls/dante/" #~ msgstr "" -#~ "

您的 KDE 版本无法处理 Dante tarball 包。

尝试直接从 http://www." +#~ "

您的 TDE 版本无法处理 Dante tarball 包。

尝试直接从 http://www." #~ "mirrors.wiretapped.net/security/firewalls/dante/ 下载并安装 Dante。" #~ msgid "Version Limitation" diff --git a/src/Makefile.am b/src/Makefile.am index 5abd534..8a738c4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \ DISTCLEANFILES=dcoptork.kidl -# set the include path for X, qt and KDE +# set the include path for X, qt and TDE INCLUDES = $(all_includes) # let automoc handle all of the meta source files (moc) diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp index ec41827..fd2cfac 100644 --- a/src/arkollon/wizard.cpp +++ b/src/arkollon/wizard.cpp @@ -292,7 +292,7 @@ void Wizard::setupFromRc() c.subDir = parser.readString("SubDir"); c.forceDir = sub(parser.readString("ForceDir")); c.optional = parser.readBool("Optional", false); - c.kdeOnly = parser.readBool("KDEOnly", false); + c.kdeOnly = parser.readBool("TDEOnly", false); c.gnomeOnly = parser.readBool("GnomeOnly", false); c.description = sub(parser.readString("Description")); c.confOptions = parser.readString("ConfigureOptions"); @@ -328,7 +328,7 @@ void Wizard::setupFromRc() case 0: headers[item->section]->setText(0, "Required components"); break; case 1: headers[item->section]->setText(0, "Optional components"); break; case 2: headers[item->section]->setText(0, "Gnome specific components"); break; - case 3: headers[item->section]->setText(0, "KDE specific components"); break; + case 3: headers[item->section]->setText(0, "TDE specific components"); break; } } diff --git a/src/dcoptork.h b/src/dcoptork.h index d83c055..5ce358a 100644 --- a/src/dcoptork.h +++ b/src/dcoptork.h @@ -31,8 +31,8 @@ class DCOPTork : virtual public DCOPObject virtual void startEverything() = 0; virtual void stopTor() = 0; - virtual void toggleKDESetting() = 0; - virtual bool getKDESetting() = 0; + virtual void toggleTDESetting() = 0; + virtual bool getTDESetting() = 0; virtual void anonymousEmail() = 0; virtual void anonymousFirefox() = 0; virtual void anonymizedFirefox(const TQString & url) = 0; diff --git a/src/eventsrc b/src/eventsrc index a9a7bdb..ac82f57 100644 --- a/src/eventsrc +++ b/src/eventsrc @@ -4,7 +4,7 @@ Comment=Anonymity Notice [TorDisabled] Name=TorDisabled -Comment=Anonymous Use of KDE/Konqueror Disabled +Comment=Anonymous Use of TDE/Konqueror Disabled #default_sound=k3b_success1.wav default_presentation=16 # None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h index e2c10aa..9bc6647 100644 --- a/src/hiddensrvs.ui.h +++ b/src/hiddensrvs.ui.h @@ -175,7 +175,7 @@ void MyHidden::startAllServices_clicked() void MyHidden::testService_clicked() { - if ((TorkConfig::kDEUsesTor()) && + if ((TorkConfig::tDEUsesTor()) && (static_cast(this->topLevelWidget()->parentWidget())->connectedToTor())){ KURL url = TQString("http://%1").arg(servicesList->currentItem()->text(0)); kapp->invokeBrowser(url.url(), "0"); @@ -191,7 +191,7 @@ void MyHidden::testService_clicked() void MyHidden::publishService_clicked() { - if ((TorkConfig::kDEUsesTor()) && + if ((TorkConfig::tDEUsesTor()) && (static_cast(this->topLevelWidget()->parentWidget())->connectedToTor())){ KURL url = TQString("tor:6sxoyfb3h2nvok2d.onion/tor/FrontPage?action=edit"); diff --git a/src/konqplugin/tork_plug_in.cpp b/src/konqplugin/tork_plug_in.cpp index 9d1f825..98dd755 100644 --- a/src/konqplugin/tork_plug_in.cpp +++ b/src/konqplugin/tork_plug_in.cpp @@ -69,13 +69,13 @@ Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name ) menu->setDelayed( false ); connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() )); - m_paToggleKDE=new TDEAction(i18n("Anonymize KDE"), + m_paToggleTDE=new TDEAction(i18n("Anonymize TDE"), TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff", TDEIcon::Small), TDEShortcut(), - this, SLOT(toggleKDE()), + this, SLOT(toggleTDE()), actionCollection(), "tork_konqueroron" ); - menu->insert( m_paToggleKDE ); + menu->insert( m_paToggleTDE ); TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"), @@ -111,17 +111,17 @@ void Tork_plug_in::showPopup() if (p_dcopServer->isApplicationRegistered ("tork")) { DCOPRef tork( "tork", "DCOPTork" ); - anonymized = tork.call( "getKDESetting" ); + anonymized = tork.call( "getTDESetting" ); } if (anonymized){ - m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff", + m_paToggleTDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff", TDEIcon::Small) ); - m_paToggleKDE->setText( "De-Anonymize KDE" ); + m_paToggleTDE->setText( "De-Anonymize TDE" ); }else{ - m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron", + m_paToggleTDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron", TDEIcon::Small) ); - m_paToggleKDE->setText( "Anonymize KDE" ); + m_paToggleTDE->setText( "Anonymize TDE" ); } } @@ -153,14 +153,14 @@ void Tork_plug_in::openWithBrowser(const TQString &browser) } -void Tork_plug_in::toggleKDE() +void Tork_plug_in::toggleTDE() { if (!p_dcopServer->isApplicationRegistered ("tork")) - KRun::runCommand("tork --toggleKDE"); + KRun::runCommand("tork --toggleTDE"); else { DCOPRef tork( "tork", "DCOPTork" ); - tork.send( "toggleKDESetting"); + tork.send( "toggleTDESetting"); } } diff --git a/src/konqplugin/tork_plug_in.h b/src/konqplugin/tork_plug_in.h index 93d2069..115bd94 100644 --- a/src/konqplugin/tork_plug_in.h +++ b/src/konqplugin/tork_plug_in.h @@ -50,12 +50,12 @@ class Tork_plug_in : public KParts::Plugin Q_OBJECT public: Tork_plug_in( TQObject* parent = 0, const char* name = 0 ); - TDEAction *m_paToggleKDE ; + TDEAction *m_paToggleTDE ; DCOPClient* p_dcopServer; virtual ~Tork_plug_in(); private slots: - void toggleKDE(); + void toggleTDE(); void openWithBrowser(const TQString&); void openWithFirefox(); void openWithOpera(); diff --git a/src/main.cpp b/src/main.cpp index 7caf450..6889b4a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,7 +32,7 @@ #include static const char description[] = - I18N_NOOP("TorK - An Anonymity Manager for the KDE Desktop.\n" + I18N_NOOP("TorK - An Anonymity Manager for the TDE Desktop.\n" "This product is produced independently from the Tor anonymity\n" "software and carries no guarantee from The Tor Project about\n" "quality, suitability or anything else."); @@ -43,7 +43,7 @@ static const char title[] = "TorK 0.33"; static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Document to open." ), 0 }, - { "toggleKDE", I18N_NOOP("Toggle Anonymous KDE"), 0 }, + { "toggleTDE", I18N_NOOP("Toggle Anonymous TDE"), 0 }, { "anonymousFirefox", I18N_NOOP("Launch Anonymous Firefox"), 0 }, { "anonymousOpera", I18N_NOOP("Launch Anonymous Opera"), 0 }, { "anonymousKonsole", I18N_NOOP("Launch Anonymous Konsole"), 0 }, diff --git a/src/menu/tork.in b/src/menu/tork.in index a22ec7b..ab28611 100644 --- a/src/menu/tork.in +++ b/src/menu/tork.in @@ -1,4 +1,4 @@ ?package(tork):needs="X11" section="Applications/Network/Web Browsing"\ title="TorK"\ - description="An anonymity manager for KDE."\ + description="An anonymity manager for TDE."\ command="@prefix@/bin/tork" icon="@prefix@/share/pixmaps/tork.xpm" diff --git a/src/newstreamosd.cpp b/src/newstreamosd.cpp index e8785e3..ebdb068 100644 --- a/src/newstreamosd.cpp +++ b/src/newstreamosd.cpp @@ -162,13 +162,13 @@ void StreamOSD::renderOSD() TQToolTip::add( changeID, i18n( "Change the 'Exit' used for current traffic.") ); - toggleKDE = new TQToolButton( this,"konq" ); - toggleKDE->setIconSet( SmallIconSet( "tork_konqueroroff" ) ); - toggleKDE->setUsesTextLabel(false); - toggleKDE->setMaximumSize(SmallIconSet( "tork_konqueroroff" ).iconSize(TQIconSet::Small)); - toggleKDE->adjustSize(); - TabPageLayout->addWidget(toggleKDE,0,6); - TQToolTip::add( toggleKDE,i18n("Enable/Disable Konqueror's use of Tor")); + toggleTDE = new TQToolButton( this,"konq" ); + toggleTDE->setIconSet( SmallIconSet( "tork_konqueroroff" ) ); + toggleTDE->setUsesTextLabel(false); + toggleTDE->setMaximumSize(SmallIconSet( "tork_konqueroroff" ).iconSize(TQIconSet::Small)); + toggleTDE->adjustSize(); + TabPageLayout->addWidget(toggleTDE,0,6); + TQToolTip::add( toggleTDE,i18n("Enable/Disable Konqueror's use of Tor")); TQToolButton* hideMonitor = new TQToolButton( this,"hide" ); hideMonitor->setIconSet( SmallIconSet( "cancel" ) ); @@ -185,13 +185,13 @@ void StreamOSD::renderOSD() connect( hideMonitor, SIGNAL(clicked()), SLOT(slotHideMonitor()) ); - connect( toggleKDE, SIGNAL(clicked()), - SLOT(slotToggleKDE()) ); + connect( toggleTDE, SIGNAL(clicked()), + SLOT(slotToggleTDE()) ); connect( changeID, SIGNAL(clicked()), SLOT(slotChangeID()) ); -// connect( toggleKDE, SIGNAL(clicked()), -// SLOT(slotToggleKDE()) ); +// connect( toggleTDE, SIGNAL(clicked()), +// SLOT(slotToggleTDE()) ); infoList = new TQListView( this, "infoList" ); @@ -504,9 +504,9 @@ void StreamOSD::slotChangeID( ) emit requestChangeID(); } -void StreamOSD::slotToggleKDE( ) +void StreamOSD::slotToggleTDE( ) { - emit requestToggleKDE(); + emit requestToggleTDE(); } void StreamOSD::contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) diff --git a/src/newstreamosd.h b/src/newstreamosd.h index a2f332b..e64bf0c 100644 --- a/src/newstreamosd.h +++ b/src/newstreamosd.h @@ -54,7 +54,7 @@ class StreamOSD : public TQWidget signals: void requestHideMonitor(); - void requestToggleKDE(); + void requestToggleTDE(); void requestChangeID(); void closeStream(const TQString &); @@ -63,7 +63,7 @@ class StreamOSD : public TQWidget void setText( const TQString& ); void setProgress( int ); void slotHideMonitor(); - void slotToggleKDE(); + void slotToggleTDE(); void slotChangeID(); /** @@ -92,7 +92,7 @@ class StreamOSD : public TQWidget StatGraph* m_graphIn; StatGraph* m_graphOut; Chart* chart; - TQToolButton* toggleKDE; + TQToolButton* toggleTDE; TQToolButton* changeID; private: /** diff --git a/src/quickconfig.ui b/src/quickconfig.ui index 374e8d7..e292994 100644 --- a/src/quickconfig.ui +++ b/src/quickconfig.ui @@ -318,7 +318,7 @@ - kcfg_AlwaysAnonymizeKDE + kcfg_AlwaysAnonymizeTDE diff --git a/src/tor_ioslave/torioslave.cpp b/src/tor_ioslave/torioslave.cpp index 429ced0..1c1e875 100644 --- a/src/tor_ioslave/torioslave.cpp +++ b/src/tor_ioslave/torioslave.cpp @@ -106,7 +106,7 @@ void tdeio_torProtocol::get(const KURL& url ) if (p_dcopServer->isApplicationRegistered ("tork")){ m_torkrunning = true; DCOPRef tork( "tork", "DCOPTork" ); - anonymized = tork.call( "getKDESetting" ); + anonymized = tork.call( "getTDESetting" ); } @@ -114,18 +114,18 @@ void tdeio_torProtocol::get(const KURL& url ) if (m_torkrunning){ DCOPRef("tork*", "DCOPTork").send("startEverything"); if (!anonymized) - DCOPRef("tork*", "DCOPTork").send("toggleKDESetting"); + DCOPRef("tork*", "DCOPTork").send("toggleTDESetting"); wait = "3"; }else{ KProcIO *whichproc = new KProcIO(); whichproc->setUseShell(TRUE); - TQString whichCommand="tork --toggleKDE"; + TQString whichCommand="tork --toggleTDE"; *whichproc<start(KProcIO::NotifyOnExit,TRUE); - //KRun::runCommand( "tork --toggleKDE"); + //KRun::runCommand( "tork --toggleTDE"); wait = "10"; } diff --git a/src/tork.1 b/src/tork.1 index cd7a195..fc24053 100644 --- a/src/tork.1 +++ b/src/tork.1 @@ -1,13 +1,13 @@ .TH "TORK" "1" .SH "NAME" -tork \- an anonymity manager for KDE. +tork \- an anonymity manager for TDE. .SH "SYNOPSIS" \fBtork\fR .SH "DESCRIPTION" This manual page documents briefly the \fBtork\fR commandline parameters. -\fBtork\fR is an anonymity manager for KDE. +\fBtork\fR is an anonymity manager for TDE. It allows you to monitor all your tor and non-tor traffic, to search and setup tor servers and to launch programs like Konqueror, Opera or @@ -17,8 +17,8 @@ This program follows the usual GNU command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. .TP -.B \-\-toggleKDE -Toggle Anonymous KDE +.B \-\-toggleTDE +Toggle Anonymous TDE .TP .B \-\-anonymousFirefox Launch Anonymous Firefox diff --git a/src/tork.cpp b/src/tork.cpp index 2c56e0a..00b1ae4 100644 --- a/src/tork.cpp +++ b/src/tork.cpp @@ -252,8 +252,8 @@ tork::tork() const TQString&, const TQString&))); connect(m_view->m_osd, SIGNAL(requestHideMonitor()), this, SLOT(toggleTorMon2())); - connect(m_view->m_osd, SIGNAL(requestToggleKDE()), - this, SLOT(toggleKDESetting())); + connect(m_view->m_osd, SIGNAL(requestToggleTDE()), + this, SLOT(toggleTDESetting())); connect(m_view->m_osd, SIGNAL(requestChangeID()), this, SLOT(useNewIdentity())); @@ -265,7 +265,7 @@ tork::tork() connect(m_view, SIGNAL(newIdentity()), this, SLOT(useNewIdentity())); connect(m_view, SIGNAL(konqWithTor()), - this, SLOT(toggleKDESettingAndLaunchKonq())); + this, SLOT(toggleTDESettingAndLaunchKonq())); connect(m_view, SIGNAL(networkList()), this, SLOT(networkList())); connect(m_view, SIGNAL(hiddenServices()), @@ -321,15 +321,15 @@ tork::tork() changeStatusbar("zero","zero"); sayWhatImDoing(i18n("To connect to Tor, press play.")); showTipOnStart(); - turnOffKDE(); + turnOffTDE(); if ((TDEApplication::kApplication()->isRestored())) startEverything(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - if( args->isSet( "toggleKDE" ) ){ + if( args->isSet( "toggleTDE" ) ){ startEverything(); - enableKDE(true); + enableTDE(true); } if( args->isSet( "anonymousFirefox" ) ){ @@ -488,7 +488,7 @@ void tork::shuttingDown() KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", "TorK Has Closed And Returned " - "KDE To Its Non-Anonymous State! Goodbye!"); + "TDE To Its Non-Anonymous State! Goodbye!"); prepareToShut(); @@ -511,7 +511,7 @@ void tork::setupActions() torkStop = new TDEAction(i18n("Disconnect From Tor"),"tork_stop", 0,this, SLOT(stopTorGracefully()),actionCollection(),"stop_tor"); enableKonqi = new TDEAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this, - SLOT(toggleKDESetting()),actionCollection(),"enable_konqi"); + SLOT(toggleTDESetting()),actionCollection(),"enable_konqi"); enableTormon = new TDEAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this, SLOT(toggleTorMon()),actionCollection(),"enable_tormon"); browseHiddenServices = new TDEAction(i18n("Browse Hidden Services"),"tork_tor", 0,this, @@ -2043,7 +2043,7 @@ void tork::stopTor() //timer->stop(); _tray->setPixmap(KSystemTray::loadIcon("tork_pressplay")); changeStatusbar("zero","zero"); - turnOffKDE(); + turnOffTDE(); m_view->m_osd->infoList->clear(); m_view->m_osd->hide(); sayWhatImDoing(i18n("To connect to Tor, press play.")); @@ -2622,7 +2622,7 @@ void tork::childExited() browseHiddenServices->setEnabled(false); sayWhatImDoing(i18n("To connect to Tor, press play.")); - turnOffKDE(); + turnOffTDE(); @@ -2979,10 +2979,10 @@ void tork::startController() m_view->welcomeitem->setEnabled(false); _tray->setPixmap(KSystemTray::loadIcon("tork_green")); - if( TorkConfig::alwaysAnonymizeKDE()) - enableKDE(true); + if( TorkConfig::alwaysAnonymizeTDE()) + enableTDE(true); else - TorkConfig::setKDEUsesTor(false); + TorkConfig::setTDEUsesTor(false); TorkConfig::setCurrentExcludeNodes(""); TorkConfig::setCurrentEntryNodes(""); @@ -3300,9 +3300,9 @@ void tork::runWizard() } -void tork::turnOffKDE() +void tork::turnOffTDE() { - setKDE(false); + setTDE(false); } void tork::toggleTorBar() @@ -3359,12 +3359,12 @@ void tork::networkList() kapp->invokeBrowser(url.url(), "0"); } -void tork::toggleKDESetting() +void tork::toggleTDESetting() { - TorkConfig::setKDEUsesTor(!TorkConfig::kDEUsesTor()); - setKDE(TorkConfig::kDEUsesTor()); + TorkConfig::setTDEUsesTor(!TorkConfig::tDEUsesTor()); + setTDE(TorkConfig::tDEUsesTor()); - if (TorkConfig::kDEUsesTor()) + if (TorkConfig::tDEUsesTor()) KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All Konqueror Sessions Are Now Safe for Anonymous Use.
Amarok, Akregator, KTorrent should be treated with caution!
This is because they may have javascript/java/plugins/flash enabled.")); else KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("Konqueror is Now Back to " @@ -3374,12 +3374,12 @@ void tork::toggleKDESetting() } -void tork::enableKDE(bool enable) +void tork::enableTDE(bool enable) { - TorkConfig::setKDEUsesTor(enable); - setKDE(TorkConfig::kDEUsesTor()); + TorkConfig::setTDEUsesTor(enable); + setTDE(TorkConfig::tDEUsesTor()); - if (TorkConfig::kDEUsesTor()) + if (TorkConfig::tDEUsesTor()) KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All Konqueror Sessions Are Now Safe for Anonymous Use.
Amarok, Akregator, KTorrent should be treated with caution!
This is because they may have javascript/java/plugins/flash enabled.")); else KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("Konqueror is Now Back to " @@ -3389,11 +3389,11 @@ void tork::enableKDE(bool enable) } -void tork::toggleKDESettingAndLaunchKonq() +void tork::toggleTDESettingAndLaunchKonq() { - toggleKDESetting(); + toggleTDESetting(); - if (TorkConfig::kDEUsesTor()){ + if (TorkConfig::tDEUsesTor()){ KRun::runCommand( "konqueror --caption \"Anonymous Browsing Session\" " "http://healthcheck.anonymityanywhere.com/", @@ -3403,12 +3403,12 @@ void tork::toggleKDESettingAndLaunchKonq() } } -void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url) +void tork::enableTDEAndLaunchKonqWithUrl(const TQString &url) { - if (!TorkConfig::kDEUsesTor()) - toggleKDESetting(); + if (!TorkConfig::tDEUsesTor()) + toggleTDESetting(); - if (TorkConfig::kDEUsesTor()){ + if (TorkConfig::tDEUsesTor()){ KRun::runCommand( TQString("konqueror --caption \"Anonymous Browsing Session\" " "%1").arg(url), @@ -3416,12 +3416,12 @@ void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url) } } -bool tork::getKDESetting() +bool tork::getTDESetting() { - return TorkConfig::kDEUsesTor(); + return TorkConfig::tDEUsesTor(); } -void tork::setKDE(bool set) +void tork::setTDE(bool set) { if (!m_view->konqitem) @@ -3515,7 +3515,7 @@ void tork::setKDE(bool set) if (set){ enableKonqi->setIcon("tork_konqueroroff"); - m_view->m_osd->toggleKDE->setIconSet(SmallIconSet( "tork_konqueroroff")); + m_view->m_osd->toggleTDE->setIconSet(SmallIconSet( "tork_konqueroroff")); m_view->konqitem->setIcon("tork_konqueror_stop"); m_view->konqitem->icon->repaint(); m_view->konqitem->setDescriptionText(""+ @@ -3535,7 +3535,7 @@ void tork::setKDE(bool set) }else{ enableKonqi->setIcon("tork_konqueroron"); - m_view->m_osd->toggleKDE->setIconSet(SmallIconSet( "tork_konqueroron")); + m_view->m_osd->toggleTDE->setIconSet(SmallIconSet( "tork_konqueroron")); m_view->konqitem->setIcon("tork_konqueror_play"); m_view->konqitem->setDescriptionText(""+ i18n("Click the icon to launch an anonymous " diff --git a/src/tork.desktop b/src/tork.desktop index 85d9a8b..678bb2a 100644 --- a/src/tork.desktop +++ b/src/tork.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=TorK GenericName=Anonymity Manager -Comment=An Anonymity Manager for KDE +Comment=An Anonymity Manager for TDE Type=Application Categories=Qt;TDE;Network;FileTransfer Terminal=false diff --git a/src/tork.h b/src/tork.h index 1ad1497..722c618 100644 --- a/src/tork.h +++ b/src/tork.h @@ -119,13 +119,13 @@ public: void anonymousGaim(){torkify( 2 );}; void anonymousPidgin(){torkify( 3 );}; void anonymousKonsole(){torkify( 4 );}; - bool getKDESetting(); + bool getTDESetting(); bool routerDiscovered(){ return m_routerDiscovered;}; void setRouterDiscovered(bool discovered){ m_routerDiscovered = discovered;}; TQStringList getDiscoveredRouters(){ return discoveredRouters;}; void setBandwidthFromSysTray(int rate ); - void enableKDEAndLaunchKonqWithUrl(const TQString &); + void enableTDEAndLaunchKonqWithUrl(const TQString &); int upnpORPort(){ return orPort; }; int upnpDirPort(){ return dirPort; }; void setUpnpDirPort(int port){ dirPort=port; }; @@ -159,11 +159,11 @@ private slots: void receivedOutput(KProcIO *); void processFilter(KProcIO *filterproc); void receivedNetStatOutput(KProcIO *); - void toggleKDESetting(); - void enableKDE(bool enable); - void toggleKDESettingAndLaunchKonq(); - void setKDE(bool set); - void turnOffKDE(); + void toggleTDESetting(); + void enableTDE(bool enable); + void toggleTDESettingAndLaunchKonq(); + void setTDE(bool set); + void turnOffTDE(); void sayWhatImDoing(const TQString& ); void slotOnItem( int, TQListViewItem *, const TQPoint &, int ); void slotOnORItem( TQListViewItem * ); diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp index 29e96b0..fc5a45d 100644 --- a/src/torkapplet/tork_mnu.cpp +++ b/src/torkapplet/tork_mnu.cpp @@ -114,7 +114,7 @@ void TorkMenu::initialize() insertSeparator(); - insertItem( SmallIcon("tork_konqueroron"), i18n( "Anonymize KDE" ), 9,9 ); + insertItem( SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" ), 9,9 ); connect( this, SIGNAL( aboutToShow() ), SLOT( showPopup() )); @@ -128,13 +128,13 @@ void TorkMenu::showPopup() if (p_dcopServer->isApplicationRegistered ("tork")) { DCOPRef tork( "tork", "DCOPTork" ); - anonymized = tork.call( "getKDESetting" ); + anonymized = tork.call( "getTDESetting" ); } if (anonymized) - changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize KDE" )); + changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize TDE" )); else - changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize KDE" )); + changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" )); } @@ -150,7 +150,7 @@ void TorkMenu::slotExec(int id) switch(id) { case 9: - anonymizeKDE(); break; + anonymizeTDE(); break; default: anonymousApp(id);break; } @@ -172,18 +172,18 @@ void TorkMenu::anonymousApp(int id) } -void TorkMenu::anonymizeKDE() +void TorkMenu::anonymizeTDE() { if (m_torkrunning){ DCOPRef("tork*", "DCOPTork").send("startEverything"); - DCOPRef("tork*", "DCOPTork").send("toggleKDESetting"); + DCOPRef("tork*", "DCOPTork").send("toggleTDESetting"); }else - KRun::runCommand( "tork --toggleKDE", "tork", "tork" ); + KRun::runCommand( "tork --toggleTDE", "tork", "tork" ); // if (m_kdestate) -// changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize KDE" )); +// changeItem(9, SmallIcon("tork_konqueroroff"), i18n( "De-Anonymize TDE" )); // else -// changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize KDE" )); +// changeItem(9, SmallIcon("tork_konqueroron"), i18n( "Anonymize TDE" )); // // m_kdestate = !m_kdestate; diff --git a/src/torkapplet/tork_mnu.h b/src/torkapplet/tork_mnu.h index 274da88..f92c534 100644 --- a/src/torkapplet/tork_mnu.h +++ b/src/torkapplet/tork_mnu.h @@ -38,7 +38,7 @@ public: TorkMenu(TQWidget *parent, const char *name, const TQStringList& /* args */); ~TorkMenu(); void anonymousApp(int id); - void anonymizeKDE(); + void anonymizeTDE(); bool m_kdestate; bool m_torkrunning; DCOPClient* p_dcopServer; diff --git a/src/torkconfig.kcfg b/src/torkconfig.kcfg index bdcd084..8137916 100644 --- a/src/torkconfig.kcfg +++ b/src/torkconfig.kcfg @@ -348,11 +348,11 @@ true - + false - + false diff --git a/src/torkview.cpp b/src/torkview.cpp index 6a238e6..ace59d8 100644 --- a/src/torkview.cpp +++ b/src/torkview.cpp @@ -1655,7 +1655,7 @@ void torkView::populateMenu() konqitem->setIcon("tork_konqueror_play"); - if (TorkConfig::kDEUsesTor()) + if (TorkConfig::tDEUsesTor()) konqitem->icon->pixmap()->fill(TQt::red); konqitem->setDescriptionText(""+i18n("Click the icon to launch an anonymous browsing session.
" diff --git a/src/trayicon.cpp b/src/trayicon.cpp index 6884564..20fd2a9 100644 --- a/src/trayicon.cpp +++ b/src/trayicon.cpp @@ -92,7 +92,7 @@ void TrayIcon::droppedfile (KURL::List url) { m_parent->startEverything(); if (TorkConfig::availablePrograms().contains("konqueror")) - m_parent->enableKDEAndLaunchKonqWithUrl(url.first().url()); + m_parent->enableTDEAndLaunchKonqWithUrl(url.first().url()); else if (TorkConfig::availablePrograms().contains("firefox")) m_parent->anonymizedFirefox(url.first().url()); } diff --git a/src/update.cpp b/src/update.cpp index 43f4a8d..859e617 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -259,7 +259,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin TDEProcess* arkollonproc = new KShellProcess(); KMessageBox::information (this,i18n( "

If this the first time you've compiled software then here are a few useful tips:
" - "1. Any error messages in the log file with the words 'KDE', 'TQt','curl' or 'X' in them mean that you need to install " + "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.
" "2. Any package provided by your distribution with 'lib' or 'devel' in the name is a development library, e.g. qt-devel, libkde.
" "

" ),"Compilation Tips","compiler"); diff --git a/tork.tdevelop b/tork.tdevelop index ed5e77c..9614e36 100644 --- a/tork.tdevelop +++ b/tork.tdevelop @@ -10,7 +10,7 @@ C++ Code Qt - KDE + TDE . false -- cgit v1.2.1