diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:40:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:40:12 -0600 |
| commit | 1cc6550ea24abfd0acd8b2a5f627e4ff0b53dce7 (patch) | |
| tree | 4ea4f480a5e503473600a48d44e163d64930a3c4 | |
| parent | 699e356180fde57a72e0c37af2170b87a95f90b4 (diff) | |
| download | kvpnc-1cc6550ea24abfd0acd8b2a5f627e4ff0b53dce7.tar.gz kvpnc-1cc6550ea24abfd0acd8b2a5f627e4ff0b53dce7.zip | |
Remove additional unneeded tq method conversions
41 files changed, 563 insertions, 563 deletions
@@ -1737,7 +1737,7 @@ crash fix if no currentprofile defined. thank to Laurent Montel <montel@kde.org> who has it provided. 2004-12-16 Christoph Thielecke <crissi99@gmx.de> - tqgeometry setting of mainwindow fixed + geometry setting of mainwindow fixed 2004-12-11 Christoph Thielecke <crissi99@gmx.de> profile widget better organized diff --git a/kvpnc.kdevses.save b/kvpnc.kdevses.save index 1786dc1..5f9c294 100644 --- a/kvpnc.kdevses.save +++ b/kvpnc.kdevses.save @@ -28,7 +28,7 @@ <kdevvalgrind> <executable path="" params="" /> <valgrind path="valgrind" params="--tool=memcheck --leak-check=yes" /> - <calltree path="calltree" params=" --trace-tqchildren=yes" /> + <calltree path="calltree" params=" --trace-children=yes" /> <kcachegrind path="kcachegrind" /> </kdevvalgrind> </pluginList> @@ -14025,22 +14025,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -14036,22 +14036,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13721,22 +13721,22 @@ msgid "write of %1 was ok." msgstr "Det lykkedes at gemme %1." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13437,22 +13437,22 @@ msgid "write of %1 was ok." msgstr "schreiben von %1 war ok." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13913,22 +13913,22 @@ msgid "write of %1 was ok." msgstr "la escritura de %1 se ha realizado correctamente." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13925,22 +13925,22 @@ msgid "write of %1 was ok." msgstr "ecriture de %1 complétée." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -14145,22 +14145,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13782,22 +13782,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13741,22 +13741,22 @@ msgid "write of %1 was ok." msgstr "%1 の書き込みに成功しました。" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); diff --git a/po/kvpnc.pot b/po/kvpnc.pot index 724cd6e..194ddc0 100644 --- a/po/kvpnc.pot +++ b/po/kvpnc.pot @@ -12842,22 +12842,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13913,22 +13913,22 @@ msgid "write of %1 was ok." msgstr "schrijven van %1 is gelukt." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13729,22 +13729,22 @@ msgid "write of %1 was ok." msgstr "poprawny zapis %1." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); diff --git a/po/pt_BR.po b/po/pt_BR.po index 062ab6a..6b389f8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13922,22 +13922,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -14019,22 +14019,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -13768,22 +13768,22 @@ msgid "write of %1 was ok." msgstr "zápis %1 bol v poriadku." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -14026,22 +14026,22 @@ msgid "write of %1 was ok." msgstr "skrivning av %1 var ok." #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); @@ -14035,22 +14035,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); diff --git a/po/zh_CN.po b/po/zh_CN.po index c4f0772..64f4caf 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13939,22 +13939,22 @@ msgid "write of %1 was ok." msgstr "" #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("user password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "User password", it->getUserPassword() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), +#. i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); #. } #. i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" -#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), -#. i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), +#. "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), +#. i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), #. KGuiItem( i18n( "Store &Unsafe" ), QString::fromLatin1( "unlock" ),QString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) #. { #. config->writeEntry( "Pre shared key", it->getPreSharedKey() ); diff --git a/src/configdaemonoptionsbase.ui b/src/configdaemonoptionsbase.ui index 527a75d..173baab 100644 --- a/src/configdaemonoptionsbase.ui +++ b/src/configdaemonoptionsbase.ui @@ -217,7 +217,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -404,7 +404,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -591,7 +591,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -1029,7 +1029,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -1230,7 +1230,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -1327,7 +1327,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -1663,7 +1663,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -1850,7 +1850,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -2003,7 +2003,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -2209,7 +2209,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -2354,7 +2354,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -2475,7 +2475,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignJustify|AlignVCenter</set> </property> <property name="toolTip" stdset="0"> diff --git a/src/displaycertdialogbase.ui b/src/displaycertdialogbase.ui index e00c660..e3ef1ac 100644 --- a/src/displaycertdialogbase.ui +++ b/src/displaycertdialogbase.ui @@ -309,7 +309,7 @@ <property name="text"> <string><b>Data of certificate:</b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/src/enterpassworddialog.cpp b/src/enterpassworddialog.cpp index d3d556a..be96482 100644 --- a/src/enterpassworddialog.cpp +++ b/src/enterpassworddialog.cpp @@ -83,7 +83,7 @@ void EnterUsernamePasswordDialog::accept() } if (!msg.isEmpty()) { - KMessageBox::sorry( 0, i18n( "All fields must be filled in. Please check:\n%1").tqarg(msg)); + KMessageBox::sorry( 0, i18n( "All fields must be filled in. Please check:\n%1").arg(msg)); ok=false; } diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp index 0e631f6..8fdc1ae 100644 --- a/src/generateopenvpnkeydialog.cpp +++ b/src/generateopenvpnkeydialog.cpp @@ -91,12 +91,12 @@ void GenerateOpenvpnKeyDialog::canAccept() connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); if ( !generateOpenvpnKeyProcess->start(env) ) { - KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).tqarg( "openvpn" ) ); - GlobalConfig->appendLogEntry(i18n( "\"%1\" start failed!" ).tqarg( "openvpn" ),GlobalConfig->error); + KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).arg( "openvpn" ) ); + GlobalConfig->appendLogEntry(i18n( "\"%1\" start failed!" ).arg( "openvpn" ),GlobalConfig->error); } else { - GlobalConfig->appendLogEntry( i18n("Generating of %1 key was successful.").tqarg("openvpn"), GlobalConfig->info); + GlobalConfig->appendLogEntry( i18n("Generating of %1 key was successful.").arg("openvpn"), GlobalConfig->info); genOk = true; } @@ -109,9 +109,9 @@ void GenerateOpenvpnKeyDialog::canAccept() delete generateOpenvpnKeyProcess; generateOpenvpnKeyProcess = 0L; if (genOk) - KMessageBox::information( this, i18n( "Generating the key in \"%1\" was successful." ).tqarg( filename ) ); + KMessageBox::information( this, i18n( "Generating the key in \"%1\" was successful." ).arg( filename ) ); else - KMessageBox::sorry( this, i18n( "Generating the key in \"%1\" failed!" ).tqarg( filename ) ); + KMessageBox::sorry( this, i18n( "Generating the key in \"%1\" failed!" ).arg( filename ) ); //std::cout << "accept" << std::endl; TQDialog::accept(); } diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp index 0fe7abe..0321242 100644 --- a/src/importcertificatedialog.cpp +++ b/src/importcertificatedialog.cpp @@ -490,7 +490,7 @@ void ImportCertificateDialog::accept() processname="openssl"; if ( GlobalConfig->KvpncDebugLevel >3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -642,7 +642,7 @@ void ImportCertificateDialog::doCacert() { disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCacert()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -695,7 +695,7 @@ void ImportCertificateDialog::doCacert() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -766,7 +766,7 @@ void ImportCertificateDialog::doPrivateKey() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); // if ( main->ImportPasswordEdit->text().isEmpty() ) // ImportProcess->writeToStdin ( "\n" ); @@ -777,14 +777,14 @@ void ImportCertificateDialog::doPrivateKey() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -794,14 +794,14 @@ void ImportCertificateDialog::doPrivateKey() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -826,7 +826,7 @@ void ImportCertificateDialog::doCreateHash() disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCreateHash()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -866,7 +866,7 @@ void ImportCertificateDialog::doCreateHash() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug ); if ( main->ImportPasswordEdit->text().isEmpty() ) ImportProcess->writeToStdin ( "\n" ); @@ -894,7 +894,7 @@ void ImportCertificateDialog::doLink() { disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doLink()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -957,7 +957,7 @@ void ImportCertificateDialog::doLink() void ImportCertificateDialog::exit() { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("exit()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("exit()"),GlobalConfig->debug ); if ( (ImportProcess != 0L && ImportProcess->normalExit() ) || ImportProcess == 0L ) @@ -1021,14 +1021,14 @@ void ImportCertificateDialog::readFromStdout_import() if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" ); } else { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); @@ -1313,7 +1313,7 @@ void ImportCertificateDialog::removePrivateKey() { disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("removePrivateKey()"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug ); if ( ImportProcess->normalExit () ) { @@ -1349,7 +1349,7 @@ void ImportCertificateDialog::removePrivateKey() { if ( GlobalConfig->KvpncDebugLevel > 3 ) - GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug ); // we need 4 chars here ImportProcess->writeToStdin ( "abcd\n" ); diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp index 95a8e47..0f596c8 100644 --- a/src/importopenvpnprofiledialog.cpp +++ b/src/importopenvpnprofiledialog.cpp @@ -761,7 +761,7 @@ void ImportOpenvpnProfileDialog::canAccept() { acc->setAuthenticationDirection(tlsauthdirection); if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).tqarg(tlsauthdirection), config->debug ); + config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).arg(tlsauthdirection), config->debug ); } } else if ( line.startsWith ( "redirect-gateway" ) ) @@ -965,7 +965,7 @@ void ImportOpenvpnProfileDialog::canAccept() // TQTextStream CaCertDstStream( &CaCertFileDst ); // // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug ); // // // if ( CaCertFileSrc.open( IO_ReadOnly ) ) { @@ -974,17 +974,17 @@ void ImportOpenvpnProfileDialog::canAccept() // CaCertDstStream << CaCertFileString; // CaCertFileDst.close(); // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug ); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).tqarg( CaCertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).arg( CaCertFileDst.name() ), config->debug ); // // // return; // } // CaCertFileDst.close(); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).tqarg( CaCertFileSrc.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).arg( CaCertFileSrc.name() ), config->debug ); // // // return; // } @@ -1001,7 +1001,7 @@ void ImportOpenvpnProfileDialog::canAccept() // TQTextStream X509CertDstStream( &X509CertFileDst ); // // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug ); // // // if ( X509CertFileSrc.open( IO_ReadOnly ) ) { @@ -1010,17 +1010,17 @@ void ImportOpenvpnProfileDialog::canAccept() // X509CertDstStream << X509CertFileString; // X509CertFileDst.close(); // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug ); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).tqarg( X509CertFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).arg( X509CertFileDst.name() ), config->debug ); // // // return; // } // X509CertFileDst.close(); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).tqarg( X509CertFileSrc.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).arg( X509CertFileSrc.name() ), config->debug ); // // // return; // } @@ -1037,7 +1037,7 @@ void ImportOpenvpnProfileDialog::canAccept() // TQTextStream PreSharedKeyDstStream( &PreSharedKeyFileDst ); // // if ( config->KvpncDebugLevel > 1 ) -// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug ); // // if ( PreSharedKeyFileSrc.open( IO_ReadOnly ) ) { // if ( PreSharedKeyFileDst.open( IO_WriteOnly ) ) { @@ -1045,17 +1045,17 @@ void ImportOpenvpnProfileDialog::canAccept() // PreSharedKeyDstStream << PreSharedKeyFileString; // PreSharedKeyFileDst.close(); // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug ); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).tqarg( PreSharedKeyFileDst.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).arg( PreSharedKeyFileDst.name() ), config->debug ); // // // return; // } // PreSharedKeyFileDst.close(); // } else { // if ( config->KvpncDebugLevel > 2 ) -// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).tqarg( PreSharedKeyFileSrc.name() ), config->debug ); +// config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).arg( PreSharedKeyFileSrc.name() ), config->debug ); // // // return; // } diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp index 67cfea8..b20646e 100644 --- a/src/importprofiledialog.cpp +++ b/src/importprofiledialog.cpp @@ -108,7 +108,7 @@ void ImportProfileDialog::canAccept() TQString groups=""; for ( TQStringList::Iterator group = grouplist.begin(); group != grouplist.end(); ++group ) groups += TQString(" "+*group); - GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").tqarg(groups), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").arg(groups), GlobalConfig->debug); } config.setGroup( "main" ); @@ -154,12 +154,12 @@ void ImportProfileDialog::canAccept() TQString Description = config.readEntry( "Description", "" ); if (Description.isEmpty()) - Description = config.readEntry("!Description",i18n("Profile imported from file %1.").tqarg(filename)); + Description = config.readEntry("!Description",i18n("Profile imported from file %1.").arg(filename)); if (!Description.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").tqarg(Description), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").arg(Description), GlobalConfig->debug); acc->setDescription( Description ); } @@ -172,7 +172,7 @@ void ImportProfileDialog::canAccept() if (!Gateway.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").tqarg(Gateway), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").arg(Gateway), GlobalConfig->debug); acc->setGateway( Gateway ); } @@ -193,7 +193,7 @@ void ImportProfileDialog::canAccept() if (!GroupName.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").tqarg(GroupName), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").arg(GroupName), GlobalConfig->debug); acc->setID( GroupName ); } @@ -204,7 +204,7 @@ void ImportProfileDialog::canAccept() if (!NtDomain.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").tqarg(NtDomain), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").arg(NtDomain), GlobalConfig->debug); acc->setNtDomainName( NtDomain ); } @@ -217,7 +217,7 @@ void ImportProfileDialog::canAccept() TQString CertName = config.readEntry( "CertName", "" ); if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").tqarg(CertName), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").arg(CertName), GlobalConfig->debug); TQString CertPath = config.readEntry( "CertPath", "" ); TQString CertSubjectName = config.readEntry( "CertSubjectName", "" ); @@ -234,7 +234,7 @@ void ImportProfileDialog::canAccept() if (CertStore == 1) useCertStore = true; if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").tqarg(TQString().setNum(int(useCertStore))), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").arg(TQString().setNum(int(useCertStore))), GlobalConfig->debug); if (useCertStore) { @@ -328,13 +328,13 @@ void ImportProfileDialog::canAccept() if (useUdp) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("UDP"), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("UDP"), GlobalConfig->debug); acc->setUseUdp( true); } else { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("TCP"), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("TCP"), GlobalConfig->debug); acc->setUseUdp( false); } /* @@ -345,13 +345,13 @@ void ImportProfileDialog::canAccept() if (enableNAT) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("yes")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("yes")), GlobalConfig->debug); acc->setUseNat(true); } else { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("no")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("no")), GlobalConfig->debug); acc->setUseNat(false); } @@ -375,7 +375,7 @@ void ImportProfileDialog::canAccept() if (DHGroup != -1 ) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").tqarg(TQString().setNum(DHGroup)), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").arg(TQString().setNum(DHGroup)), GlobalConfig->debug); IkeGroup = "dh" + TQString().setNum( DHGroup ) ; useIkeGroup = true; acc->setIkeGroup( IkeGroup ); @@ -385,7 +385,7 @@ void ImportProfileDialog::canAccept() if (PeerTimeout > -1 ) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").tqarg(TQString().setNum(PeerTimeout)), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").arg(TQString().setNum(PeerTimeout)), GlobalConfig->debug); // read minutes but store seconds acc->setPeerTimeout( PeerTimeout*60 ); } @@ -394,7 +394,7 @@ void ImportProfileDialog::canAccept() if (!Username.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: user name found: %1").tqarg(Username), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: user name found: %1").arg(Username), GlobalConfig->debug); acc->setUserName( Username ); } @@ -405,7 +405,7 @@ void ImportProfileDialog::canAccept() if (!UserPassword.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").tqarg(UserPassword), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").arg(UserPassword), GlobalConfig->debug); acc->setUserPassword( UserPassword ); } @@ -416,7 +416,7 @@ void ImportProfileDialog::canAccept() if (!enc_UserPassword.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").tqarg(enc_UserPassword), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").arg(enc_UserPassword), GlobalConfig->debug); } CiscoPasswdDecoder dec (filename); @@ -438,15 +438,15 @@ void ImportProfileDialog::canAccept() if (!userpasswd.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").tqarg(userpasswd), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").arg(userpasswd), GlobalConfig->debug); acc->setUserPassword( userpasswd ); } if (GlobalConfig->KvpncDebugLevel > 0) if (saveUserPassword) - GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("yes")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("yes")), GlobalConfig->debug); else - GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("no")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("no")), GlobalConfig->debug); acc->setSaveUserPassword( saveUserPassword ); bool saveGroupPwd = true; @@ -457,7 +457,7 @@ void ImportProfileDialog::canAccept() if (!GroupPwd.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").tqarg(GroupPwd), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").arg(GroupPwd), GlobalConfig->debug); acc->setPreSharedKey( GroupPwd ); } @@ -469,7 +469,7 @@ void ImportProfileDialog::canAccept() if (!grouppasswd.isEmpty()) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").tqarg(grouppasswd), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").arg(grouppasswd), GlobalConfig->debug); acc->setPreSharedKey( grouppasswd ); } @@ -502,13 +502,13 @@ void ImportProfileDialog::canAccept() if (GlobalConfig->KvpncDebugLevel > 0) if (AuthType ==1) - GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("PSK")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("PSK")), GlobalConfig->debug); else if (AuthType ==3) - GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("certificate")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("certificate")), GlobalConfig->debug); else if (AuthType ==5) - GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("hybrid")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("hybrid")), GlobalConfig->debug); else - GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").tqarg(i18n("PSK")), GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").arg(i18n("PSK")), GlobalConfig->debug); if (AuthType == 3 || AuthType == 5) { diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 26eef17..c3746a7 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -4169,15 +4169,15 @@ void KVpnc::connectClicked() // if ( !Utils( GlobalConfig, parent ).loadKernelModule( "esp4", parent ) ) // { - // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "esp4" ) ); - // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "esp4" ), GlobalConfig->error ); + // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "esp4" ) ); + // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "esp4" ), GlobalConfig->error ); // ok = false; // } // // if ( !Utils( GlobalConfig, parent ).loadKernelModule( "ah4", parent ) ) // { - // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg( "ah4" ) ); - // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).tqarg( "ah4" ), GlobalConfig->error ); + // KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg( "ah4" ) ); + // GlobalConfig->appendLogEntry( i18n( "Loading module \"%1\" has failed: stop." ).arg( "ah4" ), GlobalConfig->error ); // ok = false; // } @@ -4894,13 +4894,13 @@ void KVpnc::connectClicked() TQString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialRemoteID()); if (resolvedIp.isEmpty()) { - GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) could not resolved, ommiting right id.").arg(GlobalConfig->currentProfile->getSpecialRemoteID()), GlobalConfig->error ); } else { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialRemoteID()).tqarg(resolvedIp), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("Remote ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialRemoteID()).arg(resolvedIp), GlobalConfig->debug ); stream << " rightid=" + resolvedIp << "\n"; } } @@ -4923,13 +4923,13 @@ void KVpnc::connectClicked() TQString resolvedIp = Utils(GlobalConfig).resolveName(GlobalConfig->currentProfile->getSpecialLocalID()); if (resolvedIp.isEmpty()) { - GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) could not resolved, ommiting left id.").arg(GlobalConfig->currentProfile->getSpecialLocalID()), GlobalConfig->error ); } else { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").tqarg(GlobalConfig->currentProfile->getSpecialLocalID()).tqarg(resolvedIp), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("Local ID \"%1\" (type: address) resolved to: %2").arg(GlobalConfig->currentProfile->getSpecialLocalID()).arg(resolvedIp), GlobalConfig->debug ); stream << " leftid=" + resolvedIp << "\n"; } } @@ -5359,7 +5359,7 @@ void KVpnc::connectClicked() if ( gresupportfound ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).tqarg("GRE"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "Support for %1 found (compiled into kernel or kernel module already loaded)." ).arg("GRE"), GlobalConfig->debug ); } else { @@ -6100,7 +6100,7 @@ void KVpnc::connectClicked() bool load_module_ok=true; if ( !Utils ( GlobalConfig, parent ).loadKernelModule ( "ppp-compress-18", parent ) ) { - //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).tqarg("\"ppp-compress-18\" (ppp_mppe)")); + //KMessageBox::information( this, i18n( "Loading of module \"%1\" failed!" ).arg("\"ppp-compress-18\" (ppp_mppe)")); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Loading module \"%1\" has been failed, trying \"%2\"..." ).arg ( "ppp-compress-18" ).arg ( "ppp_mppe" ), GlobalConfig->debug ); @@ -6219,8 +6219,8 @@ void KVpnc::connectClicked() // Utils(GlobalConfig).getSmartcardInfo(); // if ( GlobalConfig->pathToPkcs11Tool.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToPkcs11Tool.section( '/', -1, -1 ), GlobalConfig->pathTopathToPkcs11Tool.section( '/', 0, -2 ) ).isEmpty() ) // { - // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool) ); - // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).tqarg( "pkcs11-tool" ).tqarg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool) ); + // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error ); // ok = false; // setGuiStatus( disconnected ); // return ; @@ -6260,8 +6260,8 @@ void KVpnc::connectClicked() CertTmpFile.setName ( GlobalConfig->currentProfile->getX509Certificate() ); if ( !CertTmpFile.exists() ) { - // KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) ); - // GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).tqarg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error ); + // KMessageBox::error( 0, i18n( "Certificate file (%1) could not be found. Please check the path of it." ).arg( GlobalConfig->currentProfile->getX509Certificate() ), i18n( "File Not Found" ) ); + // GlobalConfig->appendLogEntry( i18n( "Certificate file (%1) could not be found. Please check the path of it." ).arg( GlobalConfig->currentProfile->getX509Certificate() ), GlobalConfig->error ); // ok = false; // setGuiStatus( disconnected ); // return ; @@ -6356,13 +6356,13 @@ void KVpnc::connectClicked() // GlobalConfig->TmpGatewayIP = Utils( GlobalConfig, parent ).resolveName(GlobalConfig->currentProfile->getGateway()); // if (GlobalConfig->TmpGatewayIP=="0.0.0.0" || GlobalConfig->TmpGatewayIP.isEmpty()) // { - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()) ); - // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()) ); + // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); // ok =false; // } // else // { - // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); + // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); // } bool askUsernamePass = false; @@ -7352,18 +7352,18 @@ void KVpnc::connectClicked() // if (managementhandler->isConnectedToManagementPort()) // { // if (! GlobalConfig->KvpncDebugLevel > 1 ) - // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).tqarg( "openvpn" ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Connect to %1 management handler was sucessful" ).arg( "openvpn" ) , GlobalConfig->debug ); // break; // } // if (! GlobalConfig->KvpncDebugLevel > 1 ) - // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).tqarg( "openvpn" ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Trying to connect to %1 management handler..." ).arg( "openvpn" ) , GlobalConfig->debug ); // } // // managementhandler->sendToServer("help"); // // } // if (failManagementHandlerConnectCheckCount >= maxfailManagementHandlerConnectCheckCount) // { - // // KMessageBox::sorry( this, i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) ); - // GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).tqarg( "openvpn" ) , GlobalConfig->error ); + // // KMessageBox::sorry( this, i18n( "Could not connect to %1 management handler!" ).arg( "openvpn" ) ); + // GlobalConfig->appendLogEntry( i18n( "Could not connect to %1 management handler!" ).arg( "openvpn" ) , GlobalConfig->error ); // if (OpenvpnProcess != 0) // OpenvpnProcess->kill(); // setGuiStatus(disconnected); @@ -7474,13 +7474,13 @@ void KVpnc::connectClicked() // GlobalConfig->TmpGatewayIP = Utils( GlobalConfig, parent ).resolveName(GlobalConfig->currentProfile->getGateway()); // if (GlobalConfig->TmpGatewayIP=="0.0.0.0" || GlobalConfig->TmpGatewayIP.isEmpty()) // { - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()) ); - // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).tqarg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()) ); + // GlobalConfig->appendLogEntry(i18n( "Host \"%1\" could not be resolved!" ).arg(GlobalConfig->currentProfile->getGateway()),GlobalConfig->error); // ok =false; // } // else // { - // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); + // GlobalConfig->appendLogEntry( i18n( "Gateway hostname (%1) resolved to \"%2\"." ).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP), GlobalConfig->info ); // } bool askUsernamePass = false; @@ -8496,7 +8496,7 @@ void KVpnc::disconnectClicked() // if ( setkey.exists() ) // GlobalConfig->pathToSetkey = "/usr/bin/setkey"; // else { - // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).tqarg("setkey") ); + // KMessageBox::error( this, i18n( "Unable to find \"%1\"!" ).arg("setkey") ); // ok = false; // } // } @@ -8520,7 +8520,7 @@ void KVpnc::disconnectClicked() } else { - // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) ); + // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error ); } @@ -8768,11 +8768,11 @@ void KVpnc::disconnectClicked() // connect( DisconnectProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT( removeSetkey() ) ); // // if ( !DisconnectProcess->start(env) ) - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg("killall -3 racoon") ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg("killall -3 racoon") ); // else { // RacoonTailProcess->tryTerminate(); // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).tqarg("killall -3 racoon"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "\"%1\" was successful." ).arg("killall -3 racoon"), GlobalConfig->debug ); // } // } @@ -9039,7 +9039,7 @@ void KVpnc::disconnectClicked() stream.unsetDevice(); //if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).tqarg( "ipsec.conf.before.kvpnc" ).tqarg( IpsecPrefix ).tqarg( IpsecPrefix ).tqarg( IpsecType ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).arg( "ipsec.conf.before.kvpnc" ).arg( IpsecPrefix ).arg( IpsecPrefix ).arg( IpsecType ), GlobalConfig->debug ); // ipsec.secret TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" ); @@ -9554,7 +9554,7 @@ void KVpnc::disconnectClicked() // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) ); // else // { // sleep(1); @@ -9590,7 +9590,7 @@ void KVpnc::disconnectClicked() // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) ); // } else { @@ -9831,7 +9831,7 @@ void KVpnc::disconnectClicked() } //if (!restoreResolvConf()) - //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").tqarg(""),GlobalConfig->error); + //GlobalConfig->appendLogEntry(i18n("Restore of %1 has been failed!").arg(""),GlobalConfig->error); stream << GlobalConfig->pathToIp + " route flush cache\n"; @@ -10133,7 +10133,7 @@ void KVpnc::disconnectClicked() stream.unsetDevice(); //if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).tqarg( "ipsec.conf.before.kvpnc" ).tqarg( IpsecPrefix ).tqarg( IpsecPrefix ).tqarg( IpsecType ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "%1 found in %2, assuming %3 as prefix for %4." ).arg( "ipsec.conf.before.kvpnc" ).arg( IpsecPrefix ).arg( IpsecPrefix ).arg( IpsecType ), GlobalConfig->debug ); // ipsec.secret TQFile originalIpsecSecretFile ( "/etc/ipsec.secrets.before.kvpnc" ); @@ -10315,7 +10315,7 @@ void KVpnc::disconnectClicked() } else { - // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).tqarg( "setkey (remove)" ) ); + // KMessageBox::error( this, i18n( "\"%1\" write failed!" ).arg( "setkey (remove)" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" write failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error ); } @@ -11000,7 +11000,7 @@ void KVpnc::disconnectClicked() // connect( VtundProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall vtund" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall vtund" ) ); // } // else // { @@ -11036,7 +11036,7 @@ void KVpnc::disconnectClicked() // connect( SshProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_disconnect() ) ); // // if ( !DisconnectProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "killall ssh" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "killall ssh" ) ); // } else { @@ -11105,14 +11105,14 @@ void KVpnc::helpClicked() // TQString host = "www.fdkldghgfdsfjhsjfgdjhsgfds.de"; // TQString ip = Utils( GlobalConfig, parent ).resolveName(host, parent); // if (ip=="0.0.0.0") - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(host) ); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host) ); // else // mw->DebugOutput->append( TQString("first ip of "+host+": "+ip )); // // TQString host2 = "www.hs-harz.de"; // TQString ip2 = Utils( GlobalConfig, parent ).resolveName(host2, parent); // if (ip2=="0.0.0.0") - // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).tqarg(host2) ); + // KMessageBox::error( this, i18n( "Host \"%1\" could not be resolved!" ).arg(host2) ); // else // mw->DebugOutput->append( TQString("first ip of "+host2+": "+ip2 )); @@ -11282,7 +11282,7 @@ void KVpnc::helpClicked() /* TQString testfilename="sfsd/::::( *#v v###\\"; TQString cleanedUpName = Utils(this->GlobalConfig).removeSpecialCharsForFilename( testfilename); - cTQString("testfilename: \"%1\", cleaned up: \"%2\"").tqarg(testfilename).tqarg(cleanedUpName)); + cTQString("testfilename: \"%1\", cleaned up: \"%2\"").arg(testfilename).arg(cleanedUpName)); */ // GlobalConfig->exportKvpncConfig("./kvpnc_export.xml"); @@ -11488,7 +11488,7 @@ void KVpnc::readOutputFrom_vpnc() VpncProcess->writeToStdin ( "\n" ); if ( GlobalConfig->KvpncDebugLevel > 6 ) - GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).tqarg(GrpPassStr), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password: %1" ).arg(GrpPassStr), GlobalConfig->debug ); } @@ -11504,7 +11504,7 @@ void KVpnc::readOutputFrom_vpnc() VpncProcess->writeToStdin ( "\n" ); if ( GlobalConfig->KvpncDebugLevel > 6 ) - GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).tqarg(UserPassStr), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password: %1" ).arg(UserPassStr), GlobalConfig->debug ); } @@ -11546,7 +11546,7 @@ void KVpnc::readOutputFrom_vpnc() VpncProcess->writeToStdin ( "\n" ); if ( GlobalConfig->KvpncDebugLevel > 6 ) - GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).tqarg(UsernameStr), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User name: %1" ).arg(UsernameStr), GlobalConfig->debug ); } @@ -11758,7 +11758,7 @@ void KVpnc::readOutputFrom_vpnc() // if (oldpidfile.exists()) // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug ); // TQTextStream pidFileStream( &oldpidfile ); // TQString Vpnc_pid = ""; // if ( oldpidfile.open( IO_ReadOnly ) ) @@ -11771,7 +11771,7 @@ void KVpnc::readOutputFrom_vpnc() // { // // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug); + // GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( Vpnc_pid ) , GlobalConfig->debug); // killvpncprocess.addArgument(GlobalConfig->pathToKill); // killvpncprocess.addArgument("-3"); // killvpncprocess.addArgument(Vpnc_pid); @@ -11787,7 +11787,7 @@ void KVpnc::readOutputFrom_vpnc() // killvpncprocess.addArgument("vpnc"); // // if (!killvpncprocess.start()) - // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); + // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); // // while (killvpncprocess.isRunning()) // parent->processEvents(); @@ -11800,7 +11800,7 @@ void KVpnc::readOutputFrom_vpnc() // killvpncprocess.addArgument("vpnc"); // // if (!killvpncprocess.start()) - // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); + // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); // // while (killvpncprocess.isRunning()) // parent->processEvents(); @@ -11824,7 +11824,7 @@ void KVpnc::readOutputFrom_vpnc() // OldDefaultroute = lst.first(); // default-route.<id> // // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).tqarg(OldDefaultroute), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "Old defaultroute file found: %1" ).arg(OldDefaultroute), GlobalConfig->debug ); // // // TQFile file( VpncDisconnectScript ); @@ -11876,7 +11876,7 @@ void KVpnc::readOutputFrom_vpnc() // // if ( !DisconnectProcess->start(env) ) // { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc_disconnect" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc_disconnect" ) ); // } // else // { @@ -11926,7 +11926,7 @@ void KVpnc::readOutputFrom_vpnc() if (oldpidfile.exists()) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).tqarg(oldpidfile.name()), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "Old pid file found: %1" ).arg(oldpidfile.name()), GlobalConfig->debug ); TQTextStream pidFileStream( &oldpidfile ); TQString Vpnc_pid = ""; if ( oldpidfile.open( IO_ReadOnly ) ) @@ -11939,7 +11939,7 @@ void KVpnc::readOutputFrom_vpnc() { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).tqarg( Vpnc_pid ) , GlobalConfig->debug); + GlobalConfig->appendLogEntry( i18n( "Vpnc pid file contains a pid: %1, try to terminate the process with this pid." ).arg( Vpnc_pid ) , GlobalConfig->debug); killvpncprocess.addArgument(GlobalConfig->pathToKill); killvpncprocess.addArgument("-3"); killvpncprocess.addArgument(Vpnc_pid); @@ -11955,7 +11955,7 @@ void KVpnc::readOutputFrom_vpnc() killvpncprocess.addArgument("vpnc"); if (!killvpncprocess.start()) - GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); while (killvpncprocess.isRunning()) parent->processEvents(); @@ -11968,7 +11968,7 @@ void KVpnc::readOutputFrom_vpnc() killvpncprocess.addArgument("vpnc"); if (!killvpncprocess.start()) - GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("vpnc") ,GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("vpnc") ,GlobalConfig->error); while (killvpncprocess.isRunning()) parent->processEvents(); @@ -13186,8 +13186,8 @@ void KVpnc::readFromStdout_ipsec() else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 ) { TQString interfacemissing = ProcessMsg_connect.section(" ", 1,1).replace(':', ""); - KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).tqarg(interfacemissing) ); - GlobalConfig->appendLogEntry ( i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).tqarg(interfacemissing) , GlobalConfig->error ); + KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) ); + GlobalConfig->appendLogEntry ( i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) , GlobalConfig->error ); abort = true; IpsecGotError = true; IpsecWhackStatusTimer.stop(); @@ -13801,8 +13801,8 @@ void KVpnc::readFromStderr_ipsecwhack() // // if (!killipsecprocess.start()) // { - // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).tqarg("ipsec") ,GlobalConfig->error); - // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).tqarg("ipsec") ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( i18n( "%1 could not be killed." ).arg("ipsec") ,GlobalConfig->error); + // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug ); // abort = true; // } // else @@ -13830,15 +13830,15 @@ void KVpnc::readFromStderr_ipsecwhack() // if ( !IpsecProcess->start(env) ) // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).tqarg( "l2tpd" ), GlobalConfig->error ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" start failed!" ).arg( "l2tpd" ), GlobalConfig->error ); // - // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).tqarg("ipsec") ) , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( TQString( "[ipsec err] " + i18n( "Bind to given port has been failed. Another %1 process is running. Please stop %1 first." ).arg("ipsec") ) , GlobalConfig->debug ); // abort=false; // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).tqarg( "ipsec" ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n( "%1 was already running. It was killed and restarted." ).arg( "ipsec" ), GlobalConfig->debug ); // } // } // } @@ -15240,7 +15240,7 @@ void KVpnc::readFromStdout_pptp() // NetworkInterface iface(GlobalConfig,parent); // TunnelInterfaceIP = iface.getInterfaceIP( PppdDevice ); // if (GlobalConfig->VpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).tqarg(TunnelInterfaceIP) , GlobalConfig->debug); + // GlobalConfig->appendLogEntry( "[pppd] "+i18n( "Tunnel IP:" ).arg(TunnelInterfaceIP) , GlobalConfig->debug); // abort = false; @@ -15300,7 +15300,7 @@ void KVpnc::readFromStdout_pptp() else if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 ) { // if (GlobalConfig->KvpncDebugLevel > 0) - // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).tqarg( ProcessMsg_connect), GlobalConfig->debug); + // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( ProcessMsg_connect), GlobalConfig->debug); TunnelInterfaceIP = ProcessMsg_connect.simplifyWhiteSpace().section ( ' ', 3, 3 ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Tunnel IP address: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug ); @@ -15524,7 +15524,7 @@ void KVpnc::readFromStdout_pptp() // if (GlobalConfig->NewDefaultGw != "0.0.0.0") // { // if ( GlobalConfig->KvpncDebugLevel > 3 ) - // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).tqarg( pppdev ).tqarg( GlobalConfig->NewDefaultGw), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n ( "Setting extra route: %1 over %2 gw %3" ).arg ( "0.0.0.0" ).arg( pppdev ).arg( GlobalConfig->NewDefaultGw), GlobalConfig->debug ); // pppdupstream << GlobalConfig->pathToIp + " route add 0.0.0.0 via " << GlobalConfig->NewDefaultGw << " dev " << pppdev << "\n"; // } pppdupfile.close(); @@ -15587,14 +15587,14 @@ void KVpnc::readFromStdout_pptp() // ReplaceDefaultRouteProcess->addArgument ( PppdReplaceDefaultRouteScript ); // if ( !ReplaceDefaultRouteProcess->start(env) ) // { - // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") ); + // KMessageBox::sorry ( this, i18n ( "\"%1\" %2 start failed!" ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") ); // // disconnectClicked(); // // setGuiStatus(disconnected); // } // else // { // if ( GlobalConfig->KvpncDebugLevel > 1 ) - // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).tqarg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n ( "\"%1\" (%2) started." ).arg ( i18n ( "pppd replace route process" )).arg( tmpPath + "pppd_replace_defaultroute." + GlobalConfig->currentProfile->getName() + ".sh") , GlobalConfig->debug ); // while (ReplaceDefaultRouteProcess->isRunning()) // { // sleep(1); @@ -15605,7 +15605,7 @@ void KVpnc::readFromStdout_pptp() // } // else // { - // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).tqarg(PppdReplaceDefaultRouteScript), GlobalConfig->error ); + // GlobalConfig->appendLogEntry ( i18n ( "Could not write: \"%1\" (%2)!" ).arg ( i18n ( "pppd replace route script" )).arg(PppdReplaceDefaultRouteScript), GlobalConfig->error ); // } // // } @@ -15623,7 +15623,7 @@ void KVpnc::readFromStdout_pptp() // if ( !PptpRouteProcess->start(env) ) // { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) ); // disconnectClicked(); // setGuiStatus(disconnected); // } @@ -15635,7 +15635,7 @@ void KVpnc::readFromStdout_pptp() // } // delete PptpRouteProcess; // PptpRouteProcess=0L; - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info ); if ( GlobalConfig->currentProfile->getUseAdditionalNetworkRoutes() && !GlobalConfig->currentProfile->getAdditionalNetworkRoutes().isEmpty() ) addAdditionalNetworkRoutes(); @@ -15664,7 +15664,7 @@ void KVpnc::readFromStdout_pptp() // // remove kvpnc entries from chap-secerets // TQFile ChapSecretsFile ( "/etc/ppp/chap-secrets" ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); // TQTextStream stream ( &ChapSecretsFile ); // if ( ChapSecretsFile.open ( IO_ReadOnly ) ) // { @@ -15731,7 +15731,7 @@ void KVpnc::readFromStdout_pptp() // // remove kvpnc entries from pap-secerets // TQFile papSecretsFile ( "/etc/ppp/pap-secrets" ); // if ( GlobalConfig->KvpncDebugLevel > 0 ) - // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").tqarg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n ( "pppd secrets file: %1").arg("/etc/ppp/chap-secrets" ), GlobalConfig->debug ); // TQTextStream stream ( &papSecretsFile ); // if ( papSecretsFile.open ( IO_ReadOnly ) ) // { @@ -16009,7 +16009,7 @@ void KVpnc::readOutput_openvpn() disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); // abort=true; } @@ -16019,7 +16019,7 @@ void KVpnc::readOutput_openvpn() disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error ); abort = true; } @@ -16028,7 +16028,7 @@ void KVpnc::readOutput_openvpn() disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error ); abort = true; } @@ -16039,7 +16039,7 @@ void KVpnc::readOutput_openvpn() disconnect ( OpenvpnProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readOutput_openvpn() ) ); // disconnect( OpenvpnProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readOutput_openvpn() ) ); connectClicked(); - // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).tqarg(i18n("user password") )); + // KMessageBox::error( this, i18n( "Authentication failed (%1)!" ).arg(i18n("user password") )); GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , GlobalConfig->error ); abort = true; } @@ -16058,8 +16058,8 @@ void KVpnc::readOutput_openvpn() } else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , FALSE ) > -1 ) { - // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).tqarg( "tun" ).tqarg( "tap" ) ); - // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).tqarg( "tun" ).tqarg( "tap" ) , GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tun" ).arg( "tap" ) ); + // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tun" ).arg( "tap" ) , GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Local network type is %1 but remote network type is %2. This will be fixed." ).arg ( "tun" ).arg ( "tap" ), GlobalConfig->info ); @@ -16070,8 +16070,8 @@ void KVpnc::readOutput_openvpn() } else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , FALSE ) > -1 ) { - // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).tqarg( "tap" ).tqarg( "tun" ) ); - // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).tqarg( "tap" ).tqarg( "tun" ), GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tap" ).arg( "tun" ) ); + // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tap" ).arg( "tun" ), GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Local network type is %1 but remote network type is %2. This will be fixed." ).arg ( "tap" ).arg ( "tun" ), GlobalConfig->info ); @@ -16299,8 +16299,8 @@ void KVpnc::readOutput_openvpn() { TQString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); TQString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); - // KMessageBox::error( this, i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalAuth ).tqarg( PeerAuth ).tqarg( i18n( "OpenVPN" ) ) ); - // GlobalConfig->appendLogEntry( i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalAuth ).tqarg( PeerAuth ).tqarg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalAuth ).arg( PeerAuth ).arg( i18n( "OpenVPN" ) ) ); + // GlobalConfig->appendLogEntry( i18n( "Wrong authentication method used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalAuth ).arg( PeerAuth ).arg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Wrong authentication method used. We use \"%1\" but peer want \"%2\", this will be fixed." ).arg ( LocalAuth ).arg ( PeerAuth ) , GlobalConfig->info ); @@ -16315,8 +16315,8 @@ void KVpnc::readOutput_openvpn() // example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC' TQString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); TQString PeerCipher = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); - // KMessageBox::error( this, i18n( "Wrong cipher used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalCipher ).tqarg( PeerCipher ).tqarg( i18n( "OpenVPN" ) ) ); - // GlobalConfig->appendLogEntry( i18n( "Wrong chiper used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).tqarg( LocalCipher ).tqarg( PeerCipher ).tqarg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); + // KMessageBox::error( this, i18n( "Wrong cipher used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalCipher ).arg( PeerCipher ).arg( i18n( "OpenVPN" ) ) ); + // GlobalConfig->appendLogEntry( i18n( "Wrong chiper used. We use \"%1\" but peer want \"%2\". Please change it in %3 settings." ).arg( LocalCipher ).arg( PeerCipher ).arg( i18n( "OpenVPN" ) ) , GlobalConfig->error ); // abort = true; GlobalConfig->appendLogEntry ( i18n ( "Wrong chipher used. We use \"%1\" but peer want \"%2\", this will be fixed." ).arg ( LocalCipher ).arg ( PeerCipher ) , GlobalConfig->info ); @@ -17613,7 +17613,7 @@ void KVpnc::readFromStderr_vtun() } // // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 ) // // { -// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error); +// // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error); // // abort=true; // // ErrorMsg=true; // // } @@ -18100,13 +18100,13 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen ) // if ( !PptpRouteProcess->start(env) ) // { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( i18n( "pppd route process" ) ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( i18n( "pppd route process" ) ) ); // disconnectClicked(); // setGuiStatus(disconnected); // } // else { - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg( i18n( "pppd route process" ) ), GlobalConfig->info ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg( i18n( "pppd route process" ) ), GlobalConfig->info ); // while (PptpRouteProcess->isRunning()) // { @@ -18426,15 +18426,15 @@ void KVpnc::readFromStderr_connectionStatusCheck() // { // /* Connection alive */ // if (GlobalConfig->KvpncDebugLevel > 0) - // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug ); // // } // if ( msg.find( "PING failed!", 0 , FALSE ) > -1 ) // { // /* Connection dead?! */ // if (GlobalConfig->KvpncDebugLevel > 0) - // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error ); - // KNotifyClient::event( topLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).tqarg(GlobalConfig->currentProfile->getConnectionStatusInterval()) ); + // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg( GlobalConfig->currentProfile->getConnectionStatusInterval() ), GlobalConfig->error ); + // KNotifyClient::event( topLevelWidget()->winId(), "connection lost",i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()) ); // // kill connection // disconnectClicked(); // } @@ -18732,7 +18732,7 @@ void KVpnc::newSessionClicked() if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Oldname + "_2" ), &ok ); @@ -18929,7 +18929,7 @@ void KVpnc::renameSessionClicked () if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == GlobalConfig->currentProfile->getName() ) ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( GlobalConfig->currentProfile->getName() + "_2" ), &ok ); @@ -19025,7 +19025,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) TQString Gateway = it->getGateway(); TQString Username = it->getUserName(); //if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry (i18n("Username: \"%1").tqarg(Username), KVpncConfig::debug); + // GlobalConfig->appendLogEntry (i18n("Username: \"%1").arg(Username), KVpncConfig::debug); if (it->getDontSaveUsername() || (Username == "")) Username = i18n("<ask at connect>"); TQString IpsecId = ""; @@ -19311,9 +19311,9 @@ void KVpnc::sessionToggled ( const TQString& Name ) AuthTypePretty += i18n(" (using password)"); else if (it->getPskIsInFile()) - AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKeyFile()); + AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKeyFile()); else - AuthTypePretty += i18n(" (using key: %1)").tqarg(it->getPreSharedKey()); + AuthTypePretty += i18n(" (using key: %1)").arg(it->getPreSharedKey()); } if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -19349,7 +19349,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemon (%1) available").tqarg(bin); + TypeRequirementStatus = i18n ( "Daemon (%1) available").arg(bin); } else { @@ -19366,7 +19366,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) mw->buttonConnect->setEnabled ( TRUE ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) and helper program (%2) is available, connect will be enabled." ).arg ( bin ).arg ( "pkcs11-tool" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).tqarg("pkcs11-tool"); + TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool"); } } } @@ -19375,7 +19375,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) this->ConnectAction->setEnabled ( FALSE ); mw->buttonConnect->setEnabled ( FALSE ); GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) isn't available, connect will be disabled." ).arg ( bin ), KVpncConfig::error ); - TypeRequirementStatus = i18n ( "Daemon (%1) not available").tqarg(bin); + TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin); } } else @@ -19532,7 +19532,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) mw->buttonConnect->setEnabled ( TRUE ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info ); - TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).tqarg(deamon).arg ( "pkcs11-tool" ); + TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" ); } } } @@ -19643,7 +19643,7 @@ void KVpnc::slotDurationEvent() if ( !isHidden() ) { TQString StatusMsg = ""; - TQString durationString(i18n("%1:%2:%3" ).tqarg( TQString().sprintf("%02u", hour)).tqarg( TQString().sprintf("%02u", min)).tqarg( TQString().sprintf("%02u", sec))); + TQString durationString(i18n("%1:%2:%3" ).arg( TQString().sprintf("%02u", hour)).arg( TQString().sprintf("%02u", min)).arg( TQString().sprintf("%02u", sec))); TQString Username = ""; if (!GlobalConfig->TmpUsername.isEmpty()) @@ -19653,15 +19653,15 @@ void KVpnc::slotDurationEvent() if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco) { - StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig) { - StatusMsg = i18n("Connected: %2@%1, [%3], %4").tqarg(Username).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %2@%1, [%3], %4").arg(Username).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg( Username).tqarg( PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg( GlobalConfig->currentProfile->getGateway()).arg( Username).arg( PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() == true) || @@ -19672,37 +19672,37 @@ void KVpnc::slotDurationEvent() { if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && !(GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())) { - StatusMsg = i18n("Connected: %1 [%2], %3").tqarg( GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %1 [%2], %3").arg( GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon) { - StatusMsg = i18n("Connected: %1 [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %1 [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan || (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword())) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn) { - StatusMsg = i18n("Connected: %2@%1 [%3], %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %2@%1 [%3], %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(PrettyTypeString).arg(durationString); } } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn) { - StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %1, [%2], %3").arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun) { - StatusMsg = i18n("Connected: %1, [%2], %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQString(PrettyTypeString)).tqarg(durationString); + StatusMsg = i18n("Connected: %1, [%2], %3").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(TQString(PrettyTypeString)).arg(durationString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) { - StatusMsg = i18n("Connected: %1@%2 [%3], %4").tqarg(TQString(Username)).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(PrettyTypeString).tqarg(durationString); + StatusMsg = i18n("Connected: %1@%2 [%3], %4").arg(TQString(Username)).arg(GlobalConfig->currentProfile->getGateway()).arg(PrettyTypeString).arg(durationString); } @@ -19768,7 +19768,7 @@ void KVpnc::showDockTooltip() if (GlobalConfig->status == GlobalConfig->connected) { ConnectionStatus = i18n("connected"); - durationString = i18n("%1:%2:%3").tqarg( TQString().sprintf("%02u", hour)).tqarg(TQString().sprintf("%02u", min)).tqarg(TQString().sprintf("%02u", sec)); + durationString = i18n("%1:%2:%3").arg( TQString().sprintf("%02u", hour)).arg(TQString().sprintf("%02u", min)).arg(TQString().sprintf("%02u", sec)); } else { @@ -19977,31 +19977,31 @@ void KVpnc::setGuiStatus ( int status ) } if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk) { - ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus); + ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getUserName()).arg(GlobalConfig->currentProfile->getID()).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus); - ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectionStatus); + ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus); - LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->currentProfile->getUserName()).tqarg(GlobalConfig->currentProfile->getID()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\", IPSec ID: \"%3\" at %4").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getUserName()).arg(GlobalConfig->currentProfile->getID()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); } if (GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert) { - ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus); + ToolTipMsg = i18n("\nstatus: %6\nserver: %1\nuser: %2\nIPSec ID: %3\nduration: %4\nprofile: %5").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus); - ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectionStatus); + ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus); - LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server: \"%1\", user: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQDateTime::currentDateTime().toString(Qt::TextDate) + " [" + PrettyTypeString + "]"); } } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp) { PrettyTypeString = i18n("PPTP"); DaemonString = "pppd, pptp"; - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString , GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]").arg(ConnectionStatus); - ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString); + ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString); TQString TypeString2 = " [" + i18n("%1" , PrettyTypeString) + TQString("]"); - LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(TQString(TQDateTime::currentDateTime().toString(Qt::TextDate)) + TypeString2); + LogMsg = i18n("Successful connected to server \"%1\"\nuser: \"%2\" at %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(TQString(TQDateTime::currentDateTime().toString(Qt::TextDate)) + TypeString2); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan) { @@ -20009,73 +20009,73 @@ void KVpnc::setGuiStatus ( int status ) { PrettyTypeString = i18n("racoon"); DaemonString = "racoon"; - ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").tqarg(DaemonString); + ConnectMsg = i18n("Policy was successfully activated, daemon (%1) is running and tunnel is up.").arg(DaemonString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan) { PrettyTypeString = IpsecType; // openswan, strongswan, ... DaemonString = "ipsec"; - ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").tqarg(DaemonString); + ConnectMsg = i18n("Policy was successful activated and daemon (%1) is running.").arg(DaemonString); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon) { PrettyTypeString = i18n("L2TP (racoon)"); DaemonString = "racoon, " + GlobalConfig->currentProfile->getL2tpDaemon(); - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString).arg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus); - ConnectMsg = i18n("%5: %2@%1, %3 [%4]").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString).tqarg(PrettyTypeString).tqarg(ConnectionStatus); + ConnectMsg = i18n("%5: %2@%1, %3 [%4]").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString).arg(PrettyTypeString).arg(ConnectionStatus); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan) { PrettyTypeString = IpsecType; if (!GlobalConfig->pathToXl2tpd.isEmpty() && TQFile(GlobalConfig->pathToXl2tpd).exists()) DaemonString = "ipsec, " + GlobalConfig->currentProfile->getL2tpDaemon(); - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus); - ConnectMsg = i18n("%4: %2@%1, %3").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg( Username).tqarg(durationString).tqarg(ConnectionStatus); + ConnectMsg = i18n("%4: %2@%1, %3").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg( Username).arg(durationString).arg(ConnectionStatus); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword()) { PrettyTypeString = IpsecType; DaemonString = "ipsec"; - ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(Username).tqarg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %5\nserver: %1\nuser: %2\nduration: %3\nprofile %4").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(Username).arg(durationString , TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]").arg(ConnectionStatus); - ConnectMsg = i18n("Connected: %2@%1, %3").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(Username).tqarg(durationString); + ConnectMsg = i18n("Connected: %2@%1, %3").arg(GlobalConfig->currentProfile->getGateway()).arg(Username).arg(durationString); } - LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").tqarg(DaemonString).tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(GlobalConfig->TmpGatewayIP).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Policy successful activated and daemon (%1) running for server \"%2\" (%3) at date %4, profile \"%5\".").arg(DaemonString).arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->TmpGatewayIP).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn) { PrettyTypeString = i18n("OpenVPN"); DaemonString = "openvpn"; - ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %3 \nserver: %1\nduration: %2").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(ConnectionStatus); - ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(durationString).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(GlobalConfig->currentProfile->getGateway()).arg(durationString).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); - LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun) { PrettyTypeString = i18n("Vtun"); DaemonString = "vtun"; - ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus); - ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); + ConnectMsg = i18n("Connected: %1, %2, profile \"%3\"").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); - LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(TQString(GlobalConfig->currentProfile->getName()) + " [" + PrettyTypeString + "]"); } else if (GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh) { PrettyTypeString = i18n("SSH"); DaemonString = "ssh"; - ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString).tqarg(ConnectionStatus); + ToolTipMsg = i18n("status: %3\nserver: %1\nduration: %2").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString).arg(ConnectionStatus); - ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").tqarg(TQString(GlobalConfig->currentProfile->getGateway())).tqarg(durationString ).tqarg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); + ConnectMsg = i18n("%4: %1, %2, profile \"%3\"").arg(TQString(GlobalConfig->currentProfile->getGateway())).arg(durationString ).arg(TQString(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]")); - LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").tqarg(GlobalConfig->currentProfile->getGateway()).tqarg(TQDateTime::currentDateTime().toString(Qt::TextDate)).tqarg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); + LogMsg = i18n("Successful connected to server \"%1\" at %2, profile \"%3\".").arg(GlobalConfig->currentProfile->getGateway()).arg(TQDateTime::currentDateTime().toString(Qt::TextDate)).arg(GlobalConfig->currentProfile->getName() + " [" + PrettyTypeString + "]"); } if (status == GlobalConfig->connected) KNotifyClient::event ( topLevelWidget() ->winId(), "connection established", ConnectMsg ); @@ -20153,7 +20153,7 @@ void KVpnc::importProfileClicked ( TQString file ) if ( it->getName() == account->getName() ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); nameOk = false; TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok ); @@ -20265,7 +20265,7 @@ void KVpnc::importOpenvpnProfileClicked ( TQString file ) if ( it->getName() == account->getName() ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() + "_2" ), &ok ); @@ -20870,7 +20870,7 @@ void KVpnc::removeSetkey() if ( !RemoveSetkeyProcess->start ( env ) ) { - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "setkey (remove)" ) ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "setkey (remove)" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "setkey (remove)" ) , GlobalConfig->error ); } else @@ -20983,7 +20983,7 @@ void KVpnc::addRouteIpsec() { if ( GlobalConfig->currentProfile->getReplaceDefaultRoute() ) GlobalConfig->appendLogEntry ( i18n ( "route (%1): route add default gw " ).arg ( "ipsec" ) + GlobalConfig->currentProfile->getGateway() + " " + tmpInterface, GlobalConfig->debug ); - // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).tqarg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug ); + // GlobalConfig->appendLogEntry ( i18n( "route (%1): route add -net " ).arg("ipsec") + RemoteNet << " " + tmpInterface, GlobalConfig->debug ); while ( RouteProcess->isRunning() ) { usleep ( 500 ); @@ -21044,7 +21044,7 @@ void KVpnc::delRouteIpsec() if ( !RouteProcess->start ( env ) ) { - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "del route ("+IpsecType+")" ) ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "del route ("+IpsecType+")" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "del route (" + IpsecType + ")" ) , GlobalConfig->error ); } else @@ -21077,7 +21077,7 @@ void KVpnc::removeIptablesFreeswan() DisconnectProcess->addArgument ( tmpPath + "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ); if ( !DisconnectProcess->start ( env ) ) { - // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).tqarg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) ); + // KMessageBox::error( this, i18n( "\"%1\" start failed!" ).arg( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "iptables." + GlobalConfig->currentProfile->getName() + ".remove_ipsec_freeswan.sh" ), GlobalConfig->error ); } else @@ -21201,9 +21201,9 @@ void KVpnc::vpncStarted() // connect( VpncProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutputFrom_vpnc() ) ); // // if ( !VpncProcess->start(env) ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "vpnc-connect" ) ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "vpnc-connect" ) ); // } else { - // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).tqarg("vpnc-connect"),GlobalConfig->info ); + // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info ); // // // connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectTimedOut() ) ); // // timer.start( tryConnectTimeout * 1000, FALSE ); @@ -21737,7 +21737,7 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction) ActionPretty=i18n("Removing"); if ( GlobalConfig->KvpncDebugLevel > 4 ) - GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).tqarg(ActionPretty).tqarg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "%1 virtual IP (%2) and special route..." ).arg(ActionPretty).arg(GlobalConfig->currentProfile->getLeftSourceIp()), GlobalConfig->debug ); // FIXME convert LeftSourceIp to Virtual IP @@ -21807,7 +21807,7 @@ void KVpnc::doAddRemoveVirtualIp(TQString vaction) } else { - GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).tqarg("VirtualIpScript"), GlobalConfig->error ); + GlobalConfig->appendLogEntry ( i18n ( "%1 file could not be written." ).arg("VirtualIpScript"), GlobalConfig->error ); } } @@ -21983,7 +21983,7 @@ TQString KVpnc::getX509CertificateID ( TQString Cert, bool user ) } else { - //KMessageBox::information( this, i18n( "\"%1\" started." ).tqarg("openssl") ); + //KMessageBox::information( this, i18n( "\"%1\" started." ).arg("openssl") ); if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( "openssl (getCertificate)" ), GlobalConfig->debug ); X509CertificateExtractRunning = true; @@ -22983,7 +22983,7 @@ void KVpnc::startConnectionStatusCheck() disconnect ( ConnectionStatusCheckProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_connectionStatusCheck() ) ); delete ConnectionStatusCheckProcess; ConnectionStatusCheckProcess=0L; - //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "ping_check.sh" ) ); + //KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "ping_check.sh" ) ); GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ping_check.sh" ) , GlobalConfig->error ); } else @@ -23390,7 +23390,7 @@ void KVpnc::showNewProfileWizardClicked() if ( it->getName() == account->getName() ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( account->getName() += "_2" ), &ok ); if ( ok == false ) @@ -23811,7 +23811,7 @@ void KVpnc::pptpProcessExited() void KVpnc::vtun_exited() { -// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").tqarg("vtund"),GlobalConfig->error); +// GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error); // sleep(2); // if (GlobalConfig->status == GlobalConfig->connecting || GlobalConfig->connected) // disconnectClicked(); diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp index 47ee54b..46c10ea 100644 --- a/src/kvpncconfig.cpp +++ b/src/kvpncconfig.cpp @@ -536,66 +536,66 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile) { if (UserPasswordOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was ok." ).tqarg(i18n("user password")), debug); + appendLogEntry(i18n( "write of %1 was ok." ).arg(i18n("user password")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" - // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("user password")), - // i18n( "Unable to store secure %1" ).tqarg(i18n("user password")), + // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")), + // i18n( "Unable to store secure %1" ).arg(i18n("user password")), // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "User password", it->getUserPassword() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("user password")), error); + appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("user password")), error); } if (PskOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key")), debug); + appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" - // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("pre shared key")), - // i18n( "Unable to store secure %1" ).tqarg(i18n("pre shared key")), + // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")), + // i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")), // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "Pre shared key", it->getPreSharedKey() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key")),error); + appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key")),error); } if (PskOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key")), debug); + appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" - // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), - // i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), + // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), + // i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "Pre shared key", it->getPreSharedKey() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key")),error); + appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key")),error); } if (PskKeyPassOK) if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "write of %1 was successful." ).tqarg(i18n("preshared key password")), debug); + appendLogEntry(i18n( "write of %1 was successful." ).arg(i18n("preshared key password")), debug); else { // if ( KMessageBox::warningContinueCancel( 0, // i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>" - // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).tqarg(i18n("preshared key password")), - // i18n( "Unable to store secure %1" ).tqarg(i18n("reshared key password")), + // "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")), + // i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")), // KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue ) // { // config->writeEntry( "Pre shared key", it->getPreSharedKey() ); // } - appendLogEntry(i18n( "write of %1 has failed." ).tqarg(i18n("preshared key password")),error); + appendLogEntry(i18n( "write of %1 has failed." ).arg(i18n("preshared key password")),error); } //std::cout << "success: " << pwdOK << std::endl; } @@ -881,9 +881,9 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile) // wallet->sync(); /* give info */ -// slotStatusMsg ( i18n( "Profile \"%1\" saved." ).tqarg( ProfileName.remove("Profile_") ), ID_FLASH_MSG ); +// slotStatusMsg ( i18n( "Profile \"%1\" saved." ).arg( ProfileName.remove("Profile_") ), ID_FLASH_MSG ); - appendLogEntry ( i18n( "Profile \"%1\" saved." ).tqarg( ProfileName.remove("Profile_") ) , info); + appendLogEntry ( i18n( "Profile \"%1\" saved." ).arg( ProfileName.remove("Profile_") ) , info); // appPointer->processEvents(); } appPointer->processEvents(); @@ -1011,12 +1011,12 @@ void KVpncConfig::loadOptions() TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc")); if (!AppFolder.exists()) { - // KMessageBox::error( this, i18n( "creating dir: %1" ).tqarg(dirs->saveLocation( "data" )+"/kvpnc" )); + // KMessageBox::error( this, i18n( "creating dir: %1" ).arg(dirs->saveLocation( "data" )+"/kvpnc" )); TQDir AppFolder2(dirs->saveLocation( "data" )); if(!AppFolder2.mkdir("kvpnc",true)) { - KMessageBox::error( 0, i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).tqarg(dirs->saveLocation( "data" )) ); - appendLogEntry( i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).tqarg(dirs->saveLocation( "data" )),error); + KMessageBox::error( 0, i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).arg(dirs->saveLocation( "data" )) ); + appendLogEntry( i18n( "The appdir for kvpnc could not be created. Be sure that you have write permission of \"%1\"." ).arg(dirs->saveLocation( "data" )),error); } } @@ -1027,7 +1027,7 @@ void KVpncConfig::loadOptions() if ( !logfile.open( IO_WriteOnly | IO_Append ) ) { KMessageBox::error( 0, i18n( "Log file cant be opened!" ) ); - appendLogEntry(i18n( "Unable to find \"%1\"!" ).tqarg("pppd"),error); + appendLogEntry(i18n( "Unable to find \"%1\"!" ).arg("pppd"),error); } else { @@ -1120,22 +1120,22 @@ void KVpncConfig::loadOptions() TQString profilename = name.right( ( name.length() ) - 8 ); if (wallet->readPassword(TQString(profilename+"__user_pw"), UserPassword) != 0) - appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("user password")),error); + appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("user password")),error); else if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("user password")),debug); + appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("user password")),debug); if (wallet->readPassword(TQString(profilename+"__psk"), PreSharedKey) != 0) - appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("preshared key")),error); + appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("preshared key")),error); else if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("preshared key")),debug); + appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("preshared key")),debug); if (wallet->readPassword(TQString(profilename+"__priv_key_pwd"), PrivateKeyPass) != 0) - appendLogEntry(i18n( "read of %1 has failed." ).tqarg(i18n("preshared key password")),error); + appendLogEntry(i18n( "read of %1 has failed." ).arg(i18n("preshared key password")),error); else if (KvpncDebugLevel > 2) - appendLogEntry(i18n( "read of %1 was successful." ).tqarg(i18n("preshared key password")),debug); + appendLogEntry(i18n( "read of %1 was successful." ).arg(i18n("preshared key password")),debug); } else { @@ -1438,7 +1438,7 @@ void KVpncConfig::loadOptions() appendLogEntry ( i18n( "Old configuration found, converted." ),info ); if ( KvpncDebugLevel > 2 ) - appendLogEntry( i18n( "Configuration for profile \"%1\" loaded." ).tqarg( Name ),info ); + appendLogEntry( i18n( "Configuration for profile \"%1\" loaded." ).arg( Name ),info ); appPointer->processEvents(); } @@ -1996,9 +1996,9 @@ bool KVpncConfig::exportKvpncConfig(TQString filename) } TQString msg=""; if (exportCount > 0 && exportGlobal==true) - msg = i18n("Export was successful. %1 profiles and global settings are exported.").tqarg(TQString::number(exportCount)); + msg = i18n("Export was successful. %1 profiles and global settings are exported.").arg(TQString::number(exportCount)); if (exportCount > 0 && exportGlobal==false) - msg = i18n("Export was successful. %1 profiles are exported.").tqarg(TQString::number(exportCount)); + msg = i18n("Export was successful. %1 profiles are exported.").arg(TQString::number(exportCount)); if (exportCount < 1 && exportGlobal==true) msg = i18n("Export was successful. Global settings are exported."); KMessageBox::information ( 0, msg,i18n("Export success") ); @@ -2140,7 +2140,7 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool& } importfile.close(); - // print out the element names of all elements that are direct tqchildren + // print out the element names of all elements that are direct children // of the outermost element. TQDomElement docElem = doc.documentElement(); @@ -2621,7 +2621,7 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool& if ( it->getName() == data->getName() ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); nameOk = false; TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( data->getName() + "_2" ), &ok ); @@ -2763,9 +2763,9 @@ bool KVpncConfig::importKvpncConfig(TQString filename, TQString& RetName, bool& TQString msg=""; if (importCount > 0 && importGlobal==true) - msg = i18n("Import was successful. %1 profiles and global settings are imported.").tqarg(TQString::number(importCount)); + msg = i18n("Import was successful. %1 profiles and global settings are imported.").arg(TQString::number(importCount)); if (importCount > 0 && importGlobal==false) - msg = i18n("Import was successful. %1 profiles are imported.").tqarg(TQString::number(importCount)); + msg = i18n("Import was successful. %1 profiles are imported.").arg(TQString::number(importCount)); if (importCount < 1 && importGlobal==false) msg = i18n("Import was successful. Global settings are imported."); KMessageBox::information ( 0, msg,i18n("Import success") ); @@ -2827,7 +2827,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool& // end of section found // std::cout << "end of section " << IpsecConfigSectionName << " found." << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n("import ipsec config: end of section %1 found.").tqarg(IpsecConfigSectionName), debug); + appendLogEntry(i18n("import ipsec config: end of section %1 found.").arg(IpsecConfigSectionName), debug); sectionEndFound=true; IpsecImportSection *section = new IpsecImportSection(); @@ -3032,7 +3032,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool& { // std::cout << "section " << OtherSection << " found, appending:" << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: section %1 found, appending:").tqarg(OtherSection),debug); + appendLogEntry(i18n ("import ipsec config: section %1 found, appending:").arg(OtherSection),debug); // std::cout << "other data:" << std::endl << it3->SectionData.join("\n") << "--------" << std::endl; // std::cout << "section data:" << std::endl << section->SectionData.join("\n") << "--------" << std::endl; section_found=true; @@ -3073,7 +3073,7 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool& { // std::cout << "section " << OtherSection << " not found, skipping" << std::endl; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import ipsec config: section %1 not found, skipping").tqarg(OtherSection) ,debug); + appendLogEntry(i18n ("import ipsec config: section %1 not found, skipping").arg(OtherSection) ,debug); } } @@ -3757,9 +3757,9 @@ bool KVpncConfig::importIpsecConfig(TQString filename, TQString& RetName, bool& TQString msg=""; if (importCount > 0 ) - msg = i18n("Import was successful. %1 profiles are imported.").tqarg(TQString::number(importCount)); + msg = i18n("Import was successful. %1 profiles are imported.").arg(TQString::number(importCount)); else - msg = i18n("Import was canceled because no profiles are selected.").tqarg(TQString::number(importCount)); + msg = i18n("Import was canceled because no profiles are selected.").arg(TQString::number(importCount)); KMessageBox::information ( 0, msg,i18n("Import success") ); @@ -3916,43 +3916,43 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { line = removeWhiteSpaceAtBegin(stream.readLine()).simplifyWhiteSpace(); if (KvpncDebugLevel > 6) - appendLogEntry(i18n ("import fritzbox config: line: %1").tqarg(line), debug); + appendLogEntry(i18n ("import fritzbox config: line: %1").arg(line), debug); if (line.startsWith("datapipecfg")) { datapipecfgFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("datapipecfg"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").arg("datapipecfg"), debug); } if (line.startsWith("policies")) { policiesFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("policies"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").arg("policies"), debug); } if (line.startsWith("targets")) { targetsFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("targets"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").arg("targets"), debug); } if (line.startsWith("localid")) { localidFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("localid"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").arg("localid"), debug); } if (line.startsWith("phase2localid")) { phase2localidFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("phase2localid"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").arg("phase2localid"), debug); } if (line.startsWith("phase2remoteid")) { phase2remoteidFound = true; if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found").tqarg("phase2remoteid"), debug); + appendLogEntry(i18n ("import fritzbox config: %1 found").arg("phase2remoteid"), debug); } if (line.startsWith("ipnet")) { @@ -3970,7 +3970,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString ProfileName=line.section("= ",1,1).replace("\"","").replace(";","").replace(" ","_"); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("name").tqarg(ProfileName) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("name").arg(ProfileName) ,debug); profiledata->setName(ProfileName); nameFound = true; } @@ -3981,9 +3981,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo reconnectAfterConnectionLost = true; if (KvpncDebugLevel > 2) if (reconnectAfterConnectionLost) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("always_renew").tqarg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("always_renew").arg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("always_renew").tqarg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("always_renew").arg(i18n("no")) ,debug); profiledata->setDoReconnectAfterConnectionLost(reconnectAfterConnectionLost); } if (line.startsWith("dont_filter_netbios = ")) @@ -3993,23 +3993,23 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo dont_filter_netbios = true; if (KvpncDebugLevel > 2) if (dont_filter_netbios) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("dont_filter_netbios").tqarg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("dont_filter_netbios").arg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("dont_filter_netbios").tqarg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("dont_filter_netbios").arg(i18n("no")) ,debug); // nothing to yet } if (line.startsWith("localip = ")) { TQString LocalIp=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("localip").tqarg(LocalIp) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("localip").arg(LocalIp) ,debug); // nothing to do yet } if (line.startsWith("virtualip = ")) { TQString LocalVirtualIp=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("virtualip").tqarg(LocalVirtualIp) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("virtualip").arg(LocalVirtualIp) ,debug); profiledata->setUseLeftSourceIp(true); profiledata->setLeftSourceIp(LocalVirtualIp); } @@ -4017,14 +4017,14 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString RemoteIp=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("remoteip").tqarg(RemoteIp) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("remoteip").arg(RemoteIp) ,debug); // nothing to do yet } if (line.startsWith("remotehostname = ")) { TQString Gateway=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("remotehostname").tqarg(Gateway) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("remotehostname").arg(Gateway) ,debug); profiledata->setGateway(Gateway); } if (localidFound) @@ -4033,7 +4033,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString LocalId=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(TQString("user_fqdn")+" ("+i18n("local id")+")").tqarg(LocalId) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(TQString("user_fqdn")+" ("+i18n("local id")+")").arg(LocalId) ,debug); profiledata->setSpecialLocalID(LocalId); profiledata->setUseSpecialLocalID(true); profiledata->setLocalIDType("user_fqdn"); @@ -4045,7 +4045,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo TQString IpsecExchangeMode=line.section("= ",1,1).replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("exchange mode")).tqarg(IpsecExchangeMode) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("exchange mode")).arg(IpsecExchangeMode) ,debug); if (IpsecExchangeMode == "mode_aggressive") profiledata->setExchangeMode("aggressive"); @@ -4056,7 +4056,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString AuthType=line.section("= ",1,1).replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("keytype").tqarg(AuthType) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("keytype").arg(AuthType) ,debug); if (AuthType == "keytype_pre_shared") profiledata->setAuthType(VpnAccountData::psk); @@ -4067,9 +4067,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString PreshardKey=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2 && KvpncDebugLevel < 5) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("key").tqarg("******") ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("key").arg("******") ,debug); if (KvpncDebugLevel > 5) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("key").tqarg(PreshardKey) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("key").arg(PreshardKey) ,debug); profiledata->setPreSharedKey(PreshardKey); profiledata->setPskIsInFile(false); } @@ -4080,9 +4080,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo cert_do_server_auth = true; if (KvpncDebugLevel > 2) if (cert_do_server_auth) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("cert_do_server_auth").tqarg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("cert_do_server_auth").arg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("cert_do_server_auth").tqarg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("cert_do_server_auth").arg(i18n("no")) ,debug); // nothing to to yet } if (line.startsWith("use_nat_t = ")) @@ -4092,9 +4092,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo UseNat = true; if (KvpncDebugLevel > 2) if (UseNat) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_nat_t").tqarg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_nat_t").arg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_nat_t").tqarg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_nat_t").arg(i18n("no")) ,debug); profiledata->setUseNat(UseNat); profiledata->setUseUdp(true); } @@ -4105,9 +4105,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo UseXauth = true; if (KvpncDebugLevel > 2) if (UseXauth) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_xauth").tqarg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_xauth").arg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_xauth").tqarg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_xauth").arg(i18n("no")) ,debug); profiledata->setAuthWithUsernameAndPassword(UseXauth); } if (line.startsWith("use_cfgmode = ")) @@ -4117,9 +4117,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo ModeConfig = true; if (KvpncDebugLevel > 2) if (ModeConfig) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_cfgmode").tqarg(i18n("yes")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_cfgmode").arg(i18n("yes")) ,debug); else - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg("use_cfgmode").tqarg(i18n("no")) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg("use_cfgmode").arg(i18n("no")) ,debug); profiledata->setUseModeConfig(ModeConfig); } if (phase2localidFound) @@ -4128,7 +4128,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString Phase2LocalId=line.section("= ",1,1).replace("\"","").replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("ip addr for phase 2")).tqarg(Phase2LocalId) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("ip addr for phase 2")).arg(Phase2LocalId) ,debug); // nothing to do yet } } @@ -4139,7 +4139,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo { TQString RemoteNetWorkAddr=line.section("= ",1,1).replace(";",""); if (KvpncDebugLevel > 2) - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("remote network ip")).tqarg(RemoteNetWorkAddr) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("remote network ip")).arg(RemoteNetWorkAddr) ,debug); profiledata->setRemoteNetAddr(RemoteNetWorkAddr); } if (line.startsWith("mask = ")) @@ -4148,9 +4148,9 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo TQString RemoteNetWorkMaskNumeric = TQString().setNum(Utils(this).dottedIpv4Netmask2NetmaskBytes(RemoteNetWorkMask)); if (KvpncDebugLevel > 2) { - appendLogEntry(i18n ("import fritzbox config: %1 found: %2").tqarg(i18n("remote network netmask")).tqarg(RemoteNetWorkMask) ,debug); + appendLogEntry(i18n ("import fritzbox config: %1 found: %2").arg(i18n("remote network netmask")).arg(RemoteNetWorkMask) ,debug); - appendLogEntry(i18n("Netmask (dotted): %1, numeric value: %2").tqarg(RemoteNetWorkMask).tqarg(RemoteNetWorkMaskNumeric), debug); + appendLogEntry(i18n("Netmask (dotted): %1, numeric value: %2").arg(RemoteNetWorkMask).arg(RemoteNetWorkMaskNumeric), debug); } profiledata->setRemoteNetMask(RemoteNetWorkMaskNumeric); } @@ -4170,7 +4170,7 @@ bool KVpncConfig::importFritzboxConfig(TQString filename, TQString& RetName, boo if ( it->getName() == profiledata->getName() ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( 0, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); nameOk = false; TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( profiledata->getName() + "_2" ), &ok ); @@ -4391,19 +4391,19 @@ void KVpncConfig::removeEntry(TQString Name) if (KvpncDebugLevel > 2) { if (UserPasswordOK) - appendLogEntry(i18n( "delete of %1 was ok." ).tqarg(i18n("user password")), debug); + appendLogEntry(i18n( "delete of %1 was ok." ).arg(i18n("user password")), debug); else - appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("user password")), debug); + appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("user password")), debug); // if (PskOK) - appendLogEntry(i18n( "delete of %1 was successful." ).tqarg(i18n("preshared key")), debug); + appendLogEntry(i18n( "delete of %1 was successful." ).arg(i18n("preshared key")), debug); else - appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("preshared key")),debug); + appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("preshared key")),debug); if (PskKeyPassOK) - appendLogEntry(i18n( "delete of %1 was successful." ).tqarg(i18n("private key password")), debug); + appendLogEntry(i18n( "delete of %1 was successful." ).arg(i18n("private key password")), debug); else - appendLogEntry(i18n( "delete of %1 has failed." ).tqarg(i18n("private key password")),debug); + appendLogEntry(i18n( "delete of %1 has failed." ).arg(i18n("private key password")),debug); // //std::cout << "success: " << pwdOK << std::endl; @@ -4509,8 +4509,8 @@ void KVpncConfig::removeEntry(TQString Name) config->deleteGroup( ProfileName ); /* give info */ - //slotStatusMsg ( i18n( "Profile \"%1\" removed." ).tqarg( Name ), ID_FLASH_MSG ); - appendLogEntry ( i18n( "Profile \"%1\" removed." ).tqarg( Name ) , info); + //slotStatusMsg ( i18n( "Profile \"%1\" removed." ).arg( Name ), ID_FLASH_MSG ); + appendLogEntry ( i18n( "Profile \"%1\" removed." ).arg( Name ) , info); AccountList->remove(it); break; } diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp index 9ddac49..c957ddf 100644 --- a/src/kvpnckicker.cpp +++ b/src/kvpnckicker.cpp @@ -45,7 +45,7 @@ KVpncKicker::~KVpncKicker() {} void KVpncKicker::closeEvent( TQCloseEvent *e ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).tqarg("kvpnckicker"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "CloseEvent recieved (reciever: %1)." ).arg("kvpnckicker"), GlobalConfig->debug ); emit closeEventKicker(e); } diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp index 7d5d611..e6601f3 100644 --- a/src/manageciscocert.cpp +++ b/src/manageciscocert.cpp @@ -65,7 +65,7 @@ void ManageCiscoCert::deleteCertClicked() { TQListViewItem *item = main->CertListView->currentItem(); - int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the cert \"%1\" (type: %2) from cert store?" ).tqarg(item->text(1).tqarg(item->text(2))), i18n( "Delete certificate?" ) ); + int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the cert \"%1\" (type: %2) from cert store?" ).arg(item->text(1).arg(item->text(2))), i18n( "Delete certificate?" ) ); // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry( "Result: "+ TQString().setNum(result), GlobalConfig->debug ) ; diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp index cddd016..9383435 100644 --- a/src/networkinterface.cpp +++ b/src/networkinterface.cpp @@ -159,7 +159,7 @@ TQString NetworkInterface::getInterfaceIP2( TQString Interface ) if ( !InterfaceIpProc->start(env) ) { - GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").tqarg(i18n("getting IP address from interface")), KVpncConfig::error); + GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").arg(i18n("getting IP address from interface")), KVpncConfig::error); } else { @@ -219,7 +219,7 @@ TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface ) if ( !InterfaceAddressProc->start(env) ) { - GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").tqarg(i18n("script for get interface from IP address")), KVpncConfig::error); + GlobalConfig->appendLogEntry(i18n("unable to start proc (%1)!").arg(i18n("script for get interface from IP address")), KVpncConfig::error); } else diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp index b2f56b2..479b75b 100644 --- a/src/newprofiledialog.cpp +++ b/src/newprofiledialog.cpp @@ -326,7 +326,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("cisco"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").arg("cisco"),GlobalConfig->debug ); profileData->setConnectionType( VpnAccountData::cisco ); @@ -372,7 +372,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("racoon"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").arg("racoon"),GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -424,7 +424,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("freeswan"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").arg("freeswan"), GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -476,7 +476,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& ) { - GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("pptp"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").arg("pptp"),GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; @@ -526,7 +526,7 @@ void NewProfileDialog::connectiontypeChanged( const TQString& ) else if ( item == VpnAccountData::ConnectionType(VpnAccountData::openvpn) ) { if (GlobalConfig->KvpncDebugLevel > 0) - GlobalConfig->appendLogEntry( i18n("New type: %1").tqarg("openvpn"),GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n("New type: %1").arg("openvpn"),GlobalConfig->debug ); // KURLRequester* main->x509certURLRequester; // KComboBox* main->AuthTypeComboBox; // KPushButton* ImportCertificatePushButton; diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp index 09315dc..69fec28 100644 --- a/src/newprofilewizard.cpp +++ b/src/newprofilewizard.cpp @@ -535,7 +535,7 @@ void NewProfileWizard::setupPages() //if (GlobalConfig->KvpncDebugLevel > 2) //{ - // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug); + // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug); //} if (KeyFiles.size() > 1) @@ -545,13 +545,13 @@ void NewProfileWizard::setupPages() TQString item = TQString(*it); if (GlobalConfig->KvpncDebugLevel > 2) { - //GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug); + //GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(item),GlobalConfig->debug); } if (!item.contains (".pub", false) && !item.contains ("authorized_keys", false) && !item.contains ("known_hosts", false) && !item.contains (".", false) && !item.contains ("..", false) && !item.contains ("config", false) ) { if (GlobalConfig->KvpncDebugLevel > 2) { - GlobalConfig->appendLogEntry(i18n("SSH key found: %1").tqarg(*it),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug); } newprofilewizardsshpagecontent->SshKeyComboBox->insertItem(*it); } @@ -796,7 +796,7 @@ void NewProfileWizard::next () if ( it->getName() == Name ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Name += "_2" ), &ok ); @@ -1674,7 +1674,7 @@ void NewProfileWizard::next () { profileData->setUseCustomEsp(true); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("yes")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(i18n("yes")), KVpncConfig::debug ); profileData->setIpsecEsp(EspList.join(",")); @@ -1692,14 +1692,14 @@ void NewProfileWizard::next () { profileData->setUseCustomEsp(false); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("no")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(i18n("no")), KVpncConfig::debug ); } if(newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox->isChecked() && !IkeList.isEmpty()) { profileData->setUseCustomIke(true); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).tqarg(i18n("yes")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("yes")), KVpncConfig::debug ); profileData->setIpsecIke(IkeList.join(",")); @@ -1717,7 +1717,7 @@ void NewProfileWizard::next () { profileData->setUseCustomIke(false); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).tqarg(i18n("false")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("false")), KVpncConfig::debug ); } if (ok) @@ -2377,13 +2377,13 @@ void NewProfileWizard::next () profileData->setPskIsInFile(newprofilewizardsshpagecontent->CostumKeyRadioButton->isChecked()); profileData->setPreSharedKeyFile(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).tqarg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).arg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug ); } else { profileData->setPreSharedKey(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).tqarg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).arg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug ); } if (newprofilewizardsshpagecontent->UseSshConfigRemoteScriptCheckBox->isChecked() && !newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text().isEmpty()) @@ -2392,7 +2392,7 @@ void NewProfileWizard::next () profileData->setSshConfigRemoteScript(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).tqarg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).arg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug ); } else @@ -2402,7 +2402,7 @@ void NewProfileWizard::next () { ok = false; msg += "- " + i18n ( "Special server certificate" ) + "\n"; - GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), GlobalConfig->error); } } @@ -2813,7 +2813,7 @@ void NewProfileWizard::next () if ( validAddr == true ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).tqarg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).arg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug ); profileData->setUseRemoteNetwork(true); profileData->setRemoteNetAddr ( addr ); profileData->setRemoteNetMask ( newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText() ); @@ -3650,7 +3650,7 @@ void NewProfileWizard::useSmartcardToggled ( bool ) // } // IpsecToolInfo.collectToolInfo(); // if (IpsecToolInfo.Version.contains("Openswan") || IpsecToolInfo.Version.contains("Free")) -// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").tqarg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); +// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); // } } @@ -3687,7 +3687,7 @@ void NewProfileWizard::useSmartcardOnCertFormateToggled ( bool ) // } // IpsecToolInfo.collectToolInfo(); // if (IpsecToolInfo.Version.contains("Openswan") || IpsecToolInfo.Version.contains("Free")) -// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").tqarg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); +// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); // } } else diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp index a30b8e0..4007bcb 100644 --- a/src/openvpnmanagementhandler.cpp +++ b/src/openvpnmanagementhandler.cpp @@ -80,7 +80,7 @@ void OpenvpnManagementHandler::socketConnectionClosed() if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Disconnected to the OpenVPN manage port (%1)." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Disconnected to the OpenVPN manage port (%1)." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); } void OpenvpnManagementHandler::socketClosed() @@ -91,7 +91,7 @@ void OpenvpnManagementHandler::socketClosed() greetingtimer.stop(); disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); socketReallyClosed = true; // emit terminate_openvpn(); } @@ -106,7 +106,7 @@ void OpenvpnManagementHandler::socketConnected() connectedToManagementPort=true; if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connected to the OpenVPN manage port (%1)." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connected to the OpenVPN manage port (%1)." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); socketReadyRead(); @@ -115,7 +115,7 @@ void OpenvpnManagementHandler::socketConnected() void OpenvpnManagementHandler::socketError( int e ) { - // infoText->append( tr("Error number %1 occurred\n").tqarg(e) ); + // infoText->append( tr("Error number %1 occurred\n").arg(e) ); if ( e != 0 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + TQString().setNum( e ) , GlobalConfig->error ); } @@ -125,7 +125,7 @@ void OpenvpnManagementHandler::greetingTimedOut() disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); greetingtimer.stop(); - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").tqarg("3"), GlobalConfig->error ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").arg("3"), GlobalConfig->error ); closeConnection(); @@ -173,7 +173,7 @@ void OpenvpnManagementHandler::socketReadyRead() // else if ( line.find( ">HOLD:", 0, FALSE ) > -1 ) { // // if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message." ).tqarg("'hold'"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message." ).arg("'hold'"), GlobalConfig->debug ); // // fInHold = true; // int ret = 0; @@ -205,7 +205,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'need ok'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'need ok'"), GlobalConfig->debug ); TQString req = line.section( TQRegExp( ".*'(.*)'. * MSG:( .* )" ), 0, 0 ); // $1; TQString msg = line.section( TQRegExp( ".*'(.*)'. * MSG:( .* )" ), 1, 1 ); // $2; @@ -240,7 +240,7 @@ void OpenvpnManagementHandler::socketReadyRead() // if ( line.find( " >PASSWORD:", 0, FALSE ) > -1 ) { // // if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'password'"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug ); // // TQString req = line.section( TQRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1; // TQCString password; @@ -264,7 +264,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'need username/password'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'need username/password'"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send username..." ), GlobalConfig->debug ); @@ -314,7 +314,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS: 'Auth' username entered"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS: 'Auth' username entered"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send password..." ), GlobalConfig->debug ); @@ -367,7 +367,7 @@ void OpenvpnManagementHandler::socketReadyRead() // else if ( line.find( "SUCCESS: 'Auth' username entered", 0, FALSE ) > -1 ) { // // if ( GlobalConfig->KvpncDebugLevel > 2 ) - // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message, 2. step" ).tqarg("'need username/password'"), GlobalConfig->debug ); + // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message, 2. step" ).arg("'need username/password'"), GlobalConfig->debug ); // // if ( GlobalConfig->KvpncDebugLevel > 2 ) // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send password..." ), GlobalConfig->debug ); @@ -383,7 +383,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'HTTP Proxy password'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'HTTP Proxy password'"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send HTTP Proxy username..." ), GlobalConfig->debug ); @@ -402,7 +402,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS: 'HTTP Proxy' username entered"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS: 'HTTP Proxy' username entered"), GlobalConfig->debug ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Send HTTP Proxy password..." ), GlobalConfig->debug ); @@ -486,7 +486,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("'private key password'"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'private key password'"), GlobalConfig->debug ); if ( !GlobalConfig->currentProfile->getPrivateKeyPass().isEmpty() ) { @@ -643,7 +643,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: password verification failed!" , GlobalConfig->error ); - GlobalConfig->appendLogEntry( i18n( "Authentication failed (%1)!" ).tqarg( i18n( "user password" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "Authentication failed (%1)!" ).arg( i18n( "user password" ) ) , GlobalConfig->error ); abort = true; } @@ -654,7 +654,7 @@ void OpenvpnManagementHandler::socketReadyRead() if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry( i18n("OpenvpnManagementHandler: CA certifcate file could not be loaded! Please check your CA certificate file.") , GlobalConfig->error ); - GlobalConfig->appendLogEntry( i18n( "Certificate load failed (%1)!" ).tqarg( i18n( "CA certificate" ) ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "Certificate load failed (%1)!" ).arg( i18n( "CA certificate" ) ) , GlobalConfig->error ); abort = true; } @@ -663,9 +663,9 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( i18n("OpenvpnManagementHandler: Hash algorithm %1 could not found! Please check your OpenVPN settings.").tqarg(line.section(' ',3,3).remove('\'')) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n("OpenvpnManagementHandler: Hash algorithm %1 could not found! Please check your OpenVPN settings.").arg(line.section(' ',3,3).remove('\'')) , GlobalConfig->error ); - GlobalConfig->appendLogEntry( i18n( "Hash algorithm not found (%1)!" ).tqarg(line.section(' ',3,3).remove('\'') ) , GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "Hash algorithm not found (%1)!" ).arg(line.section(' ',3,3).remove('\'') ) , GlobalConfig->error ); abort = true; } @@ -682,7 +682,7 @@ void OpenvpnManagementHandler::socketReadyRead() GlobalConfig->TmpPrivateKeyPass = ""; EnterXauthInteractivePasscodeDialog dlg( 0); dlg.setCaption( i18n( "Enter token pin" ) ); - dlg.main->DescriptionLabel->setText( i18n( "Enter eToken pin for unlocking token \"%1\":" ).tqarg(GlobalConfig->currentProfile->getPkcs11Id()) ); + dlg.main->DescriptionLabel->setText( i18n( "Enter eToken pin for unlocking token \"%1\":" ).arg(GlobalConfig->currentProfile->getPkcs11Id()) ); dlg.main->LabelPassword->setText( i18n( "eToken pin:" ) ); dlg.main->SavePasswordCheckBox->hide(); dlg.main->adjustSize(); @@ -727,7 +727,7 @@ void OpenvpnManagementHandler::socketReadyRead() else if ( line.find( "SUCCESS: 'eToken token' password entered, but not yet verified", 0, FALSE ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for 'eToken token' password"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'eToken token' password"), GlobalConfig->debug ); } else if ( line.find( ">PASSWORD:Need '", 0, FALSE) > -1 && line.find( "token' password", 0, FALSE ) > -1) @@ -738,7 +738,7 @@ void OpenvpnManagementHandler::socketReadyRead() TQString TokenName = line.section('\'',1,1); if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).tqarg(TokenName), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).arg(TokenName), GlobalConfig->debug ); } TQTextStream os( socket ); @@ -747,7 +747,7 @@ void OpenvpnManagementHandler::socketReadyRead() GlobalConfig->TmpPrivateKeyPass = ""; EnterXauthInteractivePasscodeDialog dlg( 0); dlg.setCaption( i18n( "Enter token pin" ) ); - dlg.main->DescriptionLabel->setText( i18n( "Enter pin for unlocking token \"%1\":" ).tqarg(GlobalConfig->currentProfile->getPkcs11Id()) ); + dlg.main->DescriptionLabel->setText( i18n( "Enter pin for unlocking token \"%1\":" ).arg(GlobalConfig->currentProfile->getPkcs11Id()) ); dlg.main->LabelPassword->setText( i18n( "PIN:" ) ); dlg.main->SavePasswordCheckBox->hide(); dlg.main->adjustSize(); @@ -794,23 +794,23 @@ void OpenvpnManagementHandler::socketReadyRead() TQString TokenName = line.section('\'',1,1); if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).tqarg(TokenName), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( "[openvpn] " + i18n( "token name detected: %1\n" ).arg(TokenName), GlobalConfig->debug ); } if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for '%1' password").tqarg(TokenName), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for '%1' password").arg(TokenName), GlobalConfig->debug ); } else if ( line.find( "SUCCESS: 'Auth' password entered, but not yet verified", 0, FALSE ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for user password"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for user password"), GlobalConfig->debug ); } else if ( line.find( "Need 'token-insertion-request'", 0, FALSE ) > -1 ) { // if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("token-insertion-request"), GlobalConfig->debug ); - KMessageBox::error ( 0, i18n("Token \"%1\" is not inserted!").tqarg(GlobalConfig->currentProfile->getPkcs11Id()), i18n("Token missing") ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("token-insertion-request"), GlobalConfig->debug ); + KMessageBox::error ( 0, i18n("Token \"%1\" is not inserted!").arg(GlobalConfig->currentProfile->getPkcs11Id()), i18n("Token missing") ); abort = true; } @@ -818,7 +818,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).tqarg("SUCCESS for 'Private Key' password"), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("SUCCESS for 'Private Key' password"), GlobalConfig->debug ); } else if ( line.find( "external program fork failed", 0, FALSE ) > -1 ) { @@ -830,7 +830,7 @@ void OpenvpnManagementHandler::socketReadyRead() else { if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got other management message: %1" ).tqarg(line), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got other management message: %1" ).arg(line), GlobalConfig->debug ); } if (abort) { @@ -861,7 +861,7 @@ void OpenvpnManagementHandler::socketReadyRead() { if ( GlobalConfig->KvpncDebugLevel > 4 ) { - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket state is strange: %1" ).tqarg( TQString().setNum( socket->state() ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket state is strange: %1" ).arg( TQString().setNum( socket->state() ) ), GlobalConfig->debug ); } } } @@ -888,7 +888,7 @@ bool OpenvpnManagementHandler::doConnect() { if ( GlobalConfig->KvpncDebugLevel > 1 ) { - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)..." ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)..." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); } socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort ); @@ -919,7 +919,7 @@ void OpenvpnManagementHandler::hostFound() // KMessageBox::error ( 0, TQString("bar"), TQString("foo") ); if ( GlobalConfig->KvpncDebugLevel > 1 ) { - GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)... host found" ).tqarg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Connecting to the OpenVPN manage port (%1)... host found" ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); } } diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index 26e842a..d371011 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -527,12 +527,12 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe // TODO read types from list ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (vpnc)" ), VpnAccountData::cisco ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).tqarg("racoon"), VpnAccountData::racoon ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).tqarg("Openswan/strongSwan"), VpnAccountData::freeswan ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("racoon"), VpnAccountData::racoon ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::freeswan ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "PPTP" ), VpnAccountData::pptp ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "OpenVPN" ), VpnAccountData::openvpn ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).tqarg("racoon"), VpnAccountData::l2tpd_racoon ); - ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).tqarg("Openswan/strongSwan"), VpnAccountData::l2tpd_freeswan ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("racoon"), VpnAccountData::l2tpd_racoon ); + ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::l2tpd_freeswan ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (proprietary)" ), VpnAccountData::ciscoorig ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Vtun" ), VpnAccountData::vtun ); ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "SSH" ), VpnAccountData::ssh ); @@ -1471,7 +1471,7 @@ void PreferencesDialog::setupGui() //if (GlobalConfig->KvpncDebugLevel > 2) //{ - // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug); + // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug); //} if (KeyFiles.size() > 1) @@ -1481,13 +1481,13 @@ void PreferencesDialog::setupGui() TQString item = TQString(*it); if (GlobalConfig->KvpncDebugLevel > 2) { - GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(item),GlobalConfig->debug); } if (!item.contains (".pub", false) && !item.contains ("authorized_keys", false) && !item.contains ("known_hosts", false) && !item.contains (".", false) && !item.contains ("..", false) && !item.contains ("config", false) ) { if (GlobalConfig->KvpncDebugLevel > 2) { - GlobalConfig->appendLogEntry(i18n("SSH key found: %1").tqarg(*it),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug); } ProfileSshOptionsWidget->SshKeyComboBox->insertItem(*it); } @@ -1760,7 +1760,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) if ( GlobalConfig->KvpncDebugLevel > 1 ) - GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).tqarg( TQString().setNum( type ) ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).arg( TQString().setNum( type ) ), GlobalConfig->debug ); // KMessageBox::information(0,"connection type changed: "+TQString().setNum(type),TQString("type set")); @@ -1832,27 +1832,27 @@ void PreferencesDialog::connectionTypeChanged( int type ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "racoon" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "racoon" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (racoon)" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (racoon)" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp ) { @@ -1862,7 +1862,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "openvpn" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "openvpn" ), GlobalConfig->debug ); ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false ); ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false ); @@ -1884,7 +1884,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "Vtun" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "Vtun" ), GlobalConfig->debug ); ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false ); ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false ); @@ -1906,7 +1906,7 @@ void PreferencesDialog::connectionTypeChanged( int type ) else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "SSH" ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "SSH" ), GlobalConfig->debug ); ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false ); ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false ); @@ -2004,7 +2004,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) authtype = VpnAccountData::hybrid; } } - GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug ); if ( ProfileCertOptionsWidget->AuthTypeComboBox->currentText() == i18n( "X.509 Certificate" )) GlobalConfig->currentProfile->setAuthType(VpnAccountData::cert); else if ( ProfileCertOptionsWidget->AuthTypeComboBox->currentText() == i18n( "Pre Shared Key" )) @@ -2027,7 +2027,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) authtype = VpnAccountData::hybrid; } } - GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug ); if ( ProfilePskOptionsWidget->AuthTypeComboBox->currentText() == i18n( "X.509 Certificate" )) GlobalConfig->currentProfile->setAuthType(VpnAccountData::cert); else if ( ProfilePskOptionsWidget->AuthTypeComboBox->currentText() == i18n( "Pre Shared Key" )) @@ -2055,7 +2055,7 @@ void PreferencesDialog::authTypeChanged( int authtype ) type ="unknown auth"; - GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).tqarg( type ) , GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).arg( type ) , GlobalConfig->debug ); } ProfilePskOptionsWidget->PskGroupBox->setEnabled( false ); @@ -2471,7 +2471,7 @@ void PreferencesDialog::profileChanged( const TQString& itemtext ) ProfileCmdExecAfterDisconnectSelector->setCurrentText( lastProfileName ); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).tqarg( Name ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).arg( Name ), GlobalConfig->debug ); profileHasChanged=true; NewProfileName = Name; @@ -2541,14 +2541,14 @@ void PreferencesDialog::profileChanged( const TQString& itemtext ) ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( "default" ); if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).tqarg( it->getName() ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).arg( it->getName() ), GlobalConfig->debug ); } else { ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( it->getNetworkDevice() ); if ( GlobalConfig->KvpncDebugLevel > 2 ) - GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).tqarg( it->getName() ).tqarg( it->getNetworkDevice() ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).arg( it->getName() ).arg( it->getNetworkDevice() ), GlobalConfig->debug ); } ProfileGeneralOptionsWidget->ConnectionTypeComboBox->setCurrentItem( it->getConnectionType() ); @@ -2886,7 +2886,7 @@ void PreferencesDialog::profileChanged( const TQString& itemtext ) if ( vpnc_version_major ==0 && vpnc_version_minor < 3 ) { - GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).tqarg( "vpnc" ).tqarg( "0.3.x" ), GlobalConfig->error ); + GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).arg( "vpnc" ).arg( "0.3.x" ), GlobalConfig->error ); ProfileCiscoOptionsWidget->UseXauthInteractiveCheckBox->setEnabled( false ); } @@ -5714,7 +5714,7 @@ void PreferencesDialog::saveSessionClicked() if (ProfileSshOptionsWidget->UseSshConfigRemoteScriptCheckBox->isChecked() && ProfileSshOptionsWidget->SshConfigRemoteScriptLineEdit->text().isEmpty()) { - KMessageBox::error ( this, i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), i18n( "%1 empty" ).tqarg(i18n("ssh config remote script")) ); + KMessageBox::error ( this, i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), i18n( "%1 empty" ).arg(i18n("ssh config remote script")) ); IPOk=false; } @@ -5996,7 +5996,7 @@ void PreferencesDialog::saveSessionClicked() GlobalConfig->config->sync(); GlobalConfig->appPointer->restoreOverrideCursor(); - //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).tqarg( newName ),GlobalConfig->debug); + //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).arg( newName ),GlobalConfig->debug); // enableButtonApply(false); } @@ -6049,7 +6049,7 @@ void PreferencesDialog::deleteSessionClicked() if ( !ProfileGeneralSelector->currentText().isEmpty() ) { - int result = KMessageBox::questionYesNo ( this, i18n ( "Really delete profile \"%1\" (type: %2, Server: %3)?" ).arg ( GlobalConfig->currentProfile->getName() ).tqarg(TypeString).tqarg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() ); + int result = KMessageBox::questionYesNo ( this, i18n ( "Really delete profile \"%1\" (type: %2, Server: %3)?" ).arg ( GlobalConfig->currentProfile->getName() ).arg(TypeString).arg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() ); //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 3 ) // Yes { @@ -6122,12 +6122,12 @@ void PreferencesDialog::deleteSessionClicked() // CommandExecutionGroupBox->setEnabled( false ); } - // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), ID_FLASH_MSG ); + // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).arg( Name ), ID_FLASH_MSG ); profileAddedOrDeleted = true; saveSessionClicked(); GlobalConfig->removeEntry( Name ); - GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).arg( Name ), GlobalConfig->debug ); //saveOptions(); // TODO save, currently after closing dialog @@ -6160,7 +6160,7 @@ void PreferencesDialog::newSessionClicked() if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) ) { //account->setName( TQString( account->getName() + "_2" ) ); - // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) ); + // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Oldname + "_2" ), &ok ); @@ -6190,7 +6190,7 @@ void PreferencesDialog::newSessionClicked() if ( it->getName() == newName ) { if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).tqarg( newName ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).arg( newName ), GlobalConfig->debug ); profileAddedOrDeleted=true; ProfileGeneralSelector->insertItem( newName ); ProfileNetworkRouteSelector->insertItem( newName ); @@ -6230,10 +6230,10 @@ void PreferencesDialog::newSessionClicked() // GeneralGroupbox->setEnabled( true ); // CommandExecutionGroupBox->setEnabled( true ); - KMessageBox::information ( this, i18n( "Profile \"%1\" added.\nNow set the right type,\n fill in the fields\nand press \"Save\" to complete the profile." ).tqarg( newName ), i18n( "Complete Profile" ) ); - //slotStatusMsg ( i18n( "Profile \"%1\" added." ).tqarg( Name ), ID_FLASH_MSG ); + KMessageBox::information ( this, i18n( "Profile \"%1\" added.\nNow set the right type,\n fill in the fields\nand press \"Save\" to complete the profile." ).arg( newName ), i18n( "Complete Profile" ) ); + //slotStatusMsg ( i18n( "Profile \"%1\" added." ).arg( Name ), ID_FLASH_MSG ); - GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).tqarg( newName ), GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).arg( newName ), GlobalConfig->debug ); profileAddedOrDeleted = true; configChanged=true; NewProfileName = newName; @@ -6357,8 +6357,8 @@ void PreferencesDialog::renameSessionClicked() saveSessionClicked(); GlobalConfig->removeEntry( oldName ); - KMessageBox::information ( 0, i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).tqarg(GlobalConfig->currentProfile->getName()) ); - GlobalConfig->appendLogEntry ( i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).tqarg(GlobalConfig->currentProfile->getName()), GlobalConfig->info ); + KMessageBox::information ( 0, i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).arg(GlobalConfig->currentProfile->getName()) ); + GlobalConfig->appendLogEntry ( i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).arg(GlobalConfig->currentProfile->getName()), GlobalConfig->info ); } @@ -6863,19 +6863,19 @@ void PreferencesDialog::detectPkcs11Ids() Pkcs11IdTypeTmp="id"; if (KvpncDebugLevel > 1) - GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug); + GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug); } else if (Pkcs11IdType == 1) { Pkcs11IdTypeTmp="label"; if (KvpncDebugLevel > 1) - GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug); + GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug); } else { Pkcs11IdTypeTmp="subject"; if (KvpncDebugLevel > 1) - GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug); + GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug); } TQString ProviderLib=""; @@ -7092,7 +7092,7 @@ bool PreferencesDialog::getVpncHasHybridSupport() { if (tool->Name == "vpnc") { - GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).tqarg( tool->Capabilities),GlobalConfig->debug ); + GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).arg( tool->Capabilities),GlobalConfig->debug ); if( tool->Capabilities.find(i18n("openssl (certificate) support"),0,-1) > -1 ) { hasHybridSupport = true; diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp index 55f1449..37424f6 100644 --- a/src/profilenetworkrouteoptions.cpp +++ b/src/profilenetworkrouteoptions.cpp @@ -71,7 +71,7 @@ void ProfileNetworkRouteOptions::delNetworkRouteClicked() TQListViewItem *item = NetworkListView->currentItem(); TQString Network = item->text(0); TQString Netmask = item->text(1); - int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the network \"%1/%2\"?" ).tqarg( Network ).tqarg(Netmask), i18n( "Delete?" ) ); + int result = KMessageBox::questionYesNo ( this, i18n( "Do you really want to delete the network \"%1/%2\"?" ).arg( Network ).arg(Netmask), i18n( "Delete?" ) ); //LogOutput->append( "Result: "+ TQString().setNum(result) ) ; if ( result == 3) // Yes { diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp index f59eed3..06765d5 100644 --- a/src/toolinfo.cpp +++ b/src/toolinfo.cpp @@ -83,7 +83,7 @@ bool ToolInfo::collectToolInfo() { // if (GlobalConfig->KvpncDebugLevel > 2) // { -// std::cout << TQString(i18n("Trying first %1 at %2 has been failed, trying other paths").tqarg(Name).tqarg(TryPath_first)).ascii() << std::endl; +// std::cout << TQString(i18n("Trying first %1 at %2 has been failed, trying other paths").arg(Name).arg(TryPath_first)).ascii() << std::endl; // std::cout << "searchpath list: " << SearchPathList.join(" ").ascii() << std::endl; // } // std::cout << "searchpath list: " << SearchPathList.join(" ").ascii() << std::endl; @@ -91,12 +91,12 @@ bool ToolInfo::collectToolInfo() { TQString TryPath=TQString(*it)+"/"+Name; // if (GlobalConfig->KvpncDebugLevel > 2) -// std::cout << TQString (i18n("Trying %1 at: %2").tqarg(Name).tqarg(TryPath)).ascii() << std::endl; +// std::cout << TQString (i18n("Trying %1 at: %2").arg(Name).arg(TryPath)).ascii() << std::endl; if (!TryPath.isEmpty() && TQFile (TryPath).exists() && TQFileInfo(TryPath).isFile() ) { // if (GlobalConfig->KvpncDebugLevel > 2) -// std::cout << TQString(i18n("%1 found at: %2").tqarg(Name).tqarg(TryPath)).ascii() << std::endl; +// std::cout << TQString(i18n("%1 found at: %2").arg(Name).arg(TryPath)).ascii() << std::endl; found=true; PathToExec=TryPath; break; @@ -197,7 +197,7 @@ bool ToolInfo::collectToolInfo() if ( !PathToExec.isEmpty() && !CollectToolInfoProcess->start(env) ) { - std::cerr << (i18n("Unable to start collectToolInfo process (%1)!").tqarg(Name)).ascii() << std::endl; + std::cerr << (i18n("Unable to start collectToolInfo process (%1)!").arg(Name)).ascii() << std::endl; //delete CollectToolInfoProcess; collectRunning=false; success=false; @@ -237,7 +237,7 @@ bool ToolInfo::collectToolInfo() else { // if (GlobalConfig->KvpncDebugLevel > 2) -// std::cout << TQString(i18n("%1 not found.").tqarg(Name)).ascii() << std::endl; +// std::cout << TQString(i18n("%1 not found.").arg(Name)).ascii() << std::endl; } return success; } @@ -263,7 +263,7 @@ void ToolInfo::getOpenvpnCapabilities() if ( !PathToExec.isEmpty() && !CollectOpenvpnCapabilitiesProcess->start(env) ) { - std::cerr << i18n("Unable to start collectToolInfo process (%1)!").tqarg(Name).ascii() << std::endl; + std::cerr << i18n("Unable to start collectToolInfo process (%1)!").arg(Name).ascii() << std::endl; //delete CollectToolInfoProcess; collectOpenvpnCapabilitiesRunning=false; diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp index 1d64c5c..0c8ed10 100644 --- a/src/toolsinfodialog.cpp +++ b/src/toolsinfodialog.cpp @@ -109,16 +109,16 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co if ( tool->Version.contains("Openswan")) { comment="Openswan"; - comment+=", "+i18n("kernel %1 support").tqarg("2.6"); + comment+=", "+i18n("kernel %1 support").arg("2.6"); comment+=", "+i18n("smartcard support"); } else if ( tool->Version.contains("strongSwan")) { comment="strongSwan"; comment+=", "+i18n("no aggressive mode"); - comment+=", "+i18n("kernel %1 support").tqarg("2.4"); + comment+=", "+i18n("kernel %1 support").arg("2.4"); if (!(majorversion <= 2 && minorversion <= 8 && subminorversion <= 1)) - comment+=", "+i18n("kernel %1 support").tqarg("2.6"); + comment+=", "+i18n("kernel %1 support").arg("2.6"); comment+=", "+i18n("smartcard support"); } else @@ -328,7 +328,7 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co } else if (tool->Name == "tail") { -// comment+=", "+i18n("kernel %1 support").tqarg("2.6"); +// comment+=", "+i18n("kernel %1 support").arg("2.6"); } else if (tool->Name == "ssh") { diff --git a/src/utils.cpp b/src/utils.cpp index aaca26a..b457bd3 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -289,7 +289,7 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force) bool Utils::doChmod( TQString file, TQString mode ) { - config->appendLogEntry ( i18n( "\"%1\" begin." ).tqarg("chmod"),config->info ); + config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info ); KProcess *chmodProcess = new KProcess; *chmodProcess << "/bin/chmod"; *chmodProcess << mode; @@ -297,27 +297,27 @@ bool Utils::doChmod( TQString file, TQString mode ) if ( !chmodProcess->start() ) { - // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "PppdUpScript" ) ); - config->appendLogEntry( i18n( "Chmod of %1 failed!" ).tqarg( file ), config->error ); + // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "PppdUpScript" ) ); + config->appendLogEntry( i18n( "Chmod of %1 failed!" ).arg( file ), config->error ); delete chmodProcess; return false; } else { if ( config->KvpncDebugLevel > 0 ) - config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).tqarg( file ).tqarg( mode ) , config->debug ); + config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).arg( file ).arg( mode ) , config->debug ); int max_count = 9; int count=0; while ( count < max_count && chmodProcess->isRunning() ) { if ( config->KvpncDebugLevel > 6 ) - config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).tqarg( file ).tqarg( mode ) , config->debug ); + config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).arg( file ).arg( mode ) , config->debug ); usleep ( 250 ); if ( config->appPointer->hasPendingEvents () ) config->appPointer->processEvents(); count++; } - config->appendLogEntry ( i18n( "\"%1\" finished." ).tqarg("chmod"),config->info ); + config->appendLogEntry ( i18n( "\"%1\" finished." ).arg("chmod"),config->info ); delete chmodProcess; return true; } @@ -1010,7 +1010,7 @@ Utils::IpsecAlgos Utils::getKernelCrypto() } else { - config->appendLogEntry(i18n("%1 cant be opened!").tqarg("/proc/crypto"),config->error); + config->appendLogEntry(i18n("%1 cant be opened!").arg("/proc/crypto"),config->error); } return salgos; } @@ -1216,7 +1216,7 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type) type="user"; if (config->KvpncDebugLevel > 2) - config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").tqarg(type),config->debug ); + config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").arg(type),config->debug ); CertsFromCiscoCertStore.clear(); CertsFromCiscoCertPos=0; @@ -1581,13 +1581,13 @@ void Utils::readPppdtestProcessOutput() pppdcap.pppdHasReplacedefaultrouteSupport = false; if (config->KvpncDebugLevel > 1) - config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("failed")),config->debug); + config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("failed")),config->debug); } else { pppdcap.pppdHasReplacedefaultrouteSupport = true; if (config->KvpncDebugLevel > 1) - config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("succeded")),config->debug); + config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("succeded")),config->debug); } } @@ -1680,7 +1680,7 @@ void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int b if ( msg.contains( "Slot" ) && !msg.contains("empty") ) { //std::cout << msg.ascii() << std::endl; -// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg.stripWhiteSpace() ), TQString("foo") ); +// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg.stripWhiteSpace() ), TQString("foo") ); // we put in this format: <id>:<name> TQString id = msg.stripWhiteSpace().section( ' ', 1, 1 ); TQString name = msg.stripWhiteSpace().remove(TQString("Slot "+id)).stripWhiteSpace(); @@ -1702,7 +1702,7 @@ void Utils::readOutGetSmartcardCertsFromSlot() // KMessageBox::sorry( 0, TQString("msg: "+msg), TQString("foo1"),0 ); Pkcs11CertFound=true; } -// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") ); +// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), TQString("foo") ); if (IdType == "id") { if ( msg.contains( "ID:" ) && Pkcs11CertFound==true ) { @@ -1815,7 +1815,7 @@ void Utils::readOutGetOpenvpnPkcs11Ids() if (config->KvpncDebugLevel > 5) config->appendLogEntry ( TQString("[readOutGetOpenvpnPkcs11Ids] "+TQString(msg)) ,config->debug ); -// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") ); +// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), TQString("foo") ); if ( msg.contains( "Serialized id:" )) { //std::cout << msg.ascii() << std::endl; diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp index 2eeb90d..862494f 100644 --- a/src/vpntypesinfodialog.cpp +++ b/src/vpntypesinfodialog.cpp @@ -127,12 +127,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if (vpnc_found || vpnclient_found) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").tqarg(i18n("some tools")); + it->state=i18n("%1 missing").arg(i18n("some tools")); } if (vpnc_found && !vpnclient_found ) @@ -169,12 +169,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if (ipsec_found || racoon_found) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").tqarg(i18n("some tools")); + it->state=i18n("%1 missing").arg(i18n("some tools")); } if (ipsec_found && ( !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "Openswan" ) && !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) )) @@ -187,7 +187,7 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa } if (ipsec_found &&UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) ) { - it->Comment+=i18n("%1 detected").tqarg(i18n("strongSwan")); + it->Comment+=i18n("%1 detected").arg(i18n("strongSwan")); } item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); @@ -213,32 +213,32 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if (pppd_found && pptpd_found && (pppdcap.pppdHasMppeRequiredSupport || pppdcap.pppdHasRequireMppeSupport)) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").tqarg(i18n("some tools")); + it->state=i18n("%1 missing").arg(i18n("some tools")); } if (pptpd_found && !pppd_found ) { - it->Comment+=i18n("%1 is missing").tqarg("pppd"); + it->Comment+=i18n("%1 is missing").arg("pppd"); } if (!pptpd_found && pppd_found) { - it->Comment+=i18n("%1 is missing").tqarg("pptpclient"); + it->Comment+=i18n("%1 is missing").arg("pptpclient"); } if (!pptpd_found && !pppd_found) { - it->Comment+=i18n("%1 are missing").tqarg(i18n("pptpclient and pppd")); + it->Comment+=i18n("%1 are missing").arg(i18n("pptpclient and pppd")); } if (!it->Comment.isEmpty()) it->Comment+=", "; if (!pppdcap.pppdHasMppeRequiredSupport && !pppdcap.pppdHasRequireMppeSupport ) - it->Comment+=i18n("%1 are missing").tqarg(i18n("MPPE support")); + it->Comment+=i18n("%1 are missing").arg(i18n("MPPE support")); item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); if (it->VpnState == true) @@ -261,25 +261,25 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if (openvpn_found && openssl_found) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").tqarg(i18n("some tools")); + it->state=i18n("%1 missing").arg(i18n("some tools")); } if (!openvpn_found && openssl_found ) { - it->Comment+=i18n("%1 is missing").tqarg("openvpn"); + it->Comment+=i18n("%1 is missing").arg("openvpn"); } if (openvpn_found && !openssl_found ) { - it->Comment+=i18n("%1 is missing").tqarg("openssl"); + it->Comment+=i18n("%1 is missing").arg("openssl"); } if (!openvpn_found && !openssl_found) { - it->Comment+=i18n("%1 are missing").tqarg(i18n("openvpn and openssl")); + it->Comment+=i18n("%1 are missing").arg(i18n("openvpn and openssl")); } item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); @@ -307,12 +307,12 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if ((ipsec_found || racoon_found) && (l2tpd_found || xl2tpd_found || openl2tp_found)) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 missing").tqarg(i18n("some tools")); + it->state=i18n("%1 missing").arg(i18n("some tools")); } if (ipsec_found && ( !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "Openswan" ) && !UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) )) @@ -325,23 +325,23 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa } if (ipsec_found && UtilsInstance.getToolInfo("ipsec")->Version.contains ( "strongswan" ) ) { - it->Comment+=i18n("%1 detected").tqarg(i18n("strongSwan")); + it->Comment+=i18n("%1 detected").arg(i18n("strongSwan")); } if (l2tpd_found) { it->Comment+=", "; - it->Comment+=i18n("%1 detected").tqarg(i18n("l2tpd")); + it->Comment+=i18n("%1 detected").arg(i18n("l2tpd")); } if (xl2tpd_found) { it->Comment+=", "; - it->Comment+=i18n("%1 detected").tqarg(i18n("xl2tpd")); + it->Comment+=i18n("%1 detected").arg(i18n("xl2tpd")); } if (openl2tp_found) { it->Comment+=", "; - it->Comment+=i18n("%1 detected").tqarg(i18n("openl2tp")); + it->Comment+=i18n("%1 detected").arg(i18n("openl2tp")); } item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); @@ -365,21 +365,21 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if (vtund_found && pppd_found) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; - it->state=i18n("%1 are missing").tqarg(i18n("some tools")); + it->state=i18n("%1 are missing").arg(i18n("some tools")); } if (vtund_found && !pppd_found) { - it->Comment+=i18n("%1 is missing").tqarg("pppd"); + it->Comment+=i18n("%1 is missing").arg("pppd"); } if (!vtund_found && pppd_found ) { - it->Comment+=i18n("%1 is missing").tqarg("vtun"); + it->Comment+=i18n("%1 is missing").arg("vtun"); } item = new TQListViewItem(main->InfoListView, it->VpnType,it->state, it->Requirements.join(" "+i18n("and")+" "), it->Comment); @@ -404,15 +404,15 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa if (ssh_found && (ksshaskpass_found || sshaskpassgnome_found)) { it->VpnState=true; - it->state=i18n("%1 found").tqarg(i18n("all tools")); + it->state=i18n("%1 found").arg(i18n("all tools")); } else { it->VpnState=false; if (!ssh_found && (ksshaskpass_found || sshaskpassgnome_found) ) - it->Comment+=i18n("%1 is missing").tqarg("ssh"); + it->Comment+=i18n("%1 is missing").arg("ssh"); else - it->Comment+=i18n("%1 is missing").tqarg(i18n("Password entry tool")); + it->Comment+=i18n("%1 is missing").arg(i18n("Password entry tool")); } |