layout fixes and cleanup

1 files changed, 72 insertions, 92 deletions

diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 8ae714e..10bc25c 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -27,60 +27,55 @@
 #include <termios.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 #include <qregexp.h>
 #include <qapplication.h>
-//#include <kiconloader.h>
 #include <qbuttongroup.h>
-//#include <klocale.h>
-#define i18n QObject::tr
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qdialog.h>
-//#include <kwin.h>
 
 #include "edit.h"
 #include "pppdata.h"
-//#include "newwidget.h"
 #include "iplined.h"
 #include "auth.h"
 
 DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
                         , const char *name )
     : QWidget(parent, name), _pppdata(pd)
 {
   const int GRIDROWS = 6;
 
   QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint());
 
-  connect_label = new QLabel(i18n("Connection name:"), this);
+  connect_label = new QLabel(tr("Connection name:"), this);
   tl->addWidget(connect_label, 0, 0);
 
   connectname_l = new QLineEdit(this);
 //  connectname_l->setMaxLength(ACCNAME_SIZE);
   tl->addWidget(connectname_l, 0, 1);
-  QString tmp = i18n("Type in a unique name for this connection");
+  QString tmp = tr("Type in a unique name for this connection");
 
   QWhatsThis::add(connect_label,tmp);
   QWhatsThis::add(connectname_l,tmp);
 
 
-  number_label = new QLabel(i18n("Phone number:"), this);
+  number_label = new QLabel(tr("Phone number:"), this);
   number_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(number_label, 1, 0);
 
   QHBoxLayout *lpn = new QHBoxLayout(5);
   tl->addLayout(lpn, 1, 1);
   numbers = new QListBox(this);
 //  numbers->setMinimumSize(120, 70);
   lpn->addWidget(numbers);
   QVBoxLayout *lpn1 = new QVBoxLayout;
   lpn->addLayout(lpn1);
-  add = new QPushButton(i18n("&Add..."), this);
-  del = new QPushButton(i18n("&Remove"), this);
+  add = new QPushButton(tr("&Add..."), this);
+  del = new QPushButton(tr("&Remove"), this);
 
   up = new QPushButton(this);
 //FIXME:  QPixmap pm = BarIcon("up");
 //  up->setPixmap(pm);
   down = new QPushButton(this);
 //FIXME:  pm = BarIcon("down");
@@ -99,60 +94,60 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
   connect(down, SIGNAL(clicked()),
           this, SLOT(downNumber()));
   connect(numbers, SIGNAL(highlighted(int)),
           this, SLOT(selectionChanged(int)));
   numbersChanged();
 
-  tmp = i18n("<p>Specifies the phone numbers to dial. You\n"
+  tmp = tr("<p>Specifies the phone numbers to dial. You\n"
              "can supply multiple numbers here, simply\n"
              "click on \"Add\". You can arrange the\n"
              "order the numbers are tried by using the\n"
              "arrow buttons.\n\n"
              "When a number is busy or fails, <i>kppp</i> will \n"
              "try the next number and so on");
 
   QWhatsThis::add(number_label,tmp);
   QWhatsThis::add(numbers,tmp);
 
-  auth_l = new QLabel(i18n("Authentication:"), this);
+  auth_l = new QLabel(tr("Authentication:"), this);
   tl->addWidget(auth_l, 3, 0);
 
   auth = new QComboBox(this);
-  auth->insertItem(i18n("Script-based"));
-  auth->insertItem(i18n("PAP"));
-  auth->insertItem(i18n("Terminal-based"));
-  auth->insertItem(i18n("CHAP"));
-  auth->insertItem(i18n("PAP/CHAP"));
+  auth->insertItem(tr("Script-based"));
+  auth->insertItem(tr("PAP"));
+  auth->insertItem(tr("Terminal-based"));
+  auth->insertItem(tr("CHAP"));
+  auth->insertItem(tr("PAP/CHAP"));
   tl->addWidget(auth, 3, 1);
-  tmp = i18n("<p>Specifies the method used to identify yourself to\n"
+  tmp = tr("<p>Specifies the method used to identify yourself to\n"
              "the PPP server. Most universities still use\n"
              "<b>Terminal</b>- or <b>Script</b>-based authentication,\n"
              "while most ISP use <b>PAP</b> and/or <b>CHAP</b>. If\n"
              "unsure, contact your ISP.\n"
              "\n"
              "If you can choose between PAP and CHAP,\n"
              "choose CHAP, because it's much safer. If you don't know\n"
              "whether PAP or CHAP is right, choose PAP/CHAP.");
 
   QWhatsThis::add(auth_l,tmp);
   QWhatsThis::add(auth,tmp);
 
-  store_password = new QCheckBox(i18n("Store password"), this);
+  store_password = new QCheckBox(tr("Store password"), this);
   store_password->setChecked(true);
   tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight);
   QWhatsThis::add(store_password,
-                  i18n("<p>When this is turned on, your ISP password\n"
+                  tr("<p>When this is turned on, your ISP password\n"
                        "will be saved in <i>kppp</i>'s config file, so\n"
                        "you do not need to type it in every time.\n"
                        "\n"
                        "<b><font color=\"red\">Warning:</font> your password will be stored as\n"
                        "plain text in the config file, which is\n"
                        "readable only to you. Make sure nobody\n"
                        "gains access to this file!"));
 
-  pppdargs = new QPushButton(i18n("Customize pppd Arguments..."), this);
+  pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this);
   connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton()));
   tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter);
 
   // Set defaults if editing an existing connection
   if(!isnewaccount) {
     connectname_l->setText(_pppdata->accname());
@@ -275,81 +270,75 @@ void DialWidget::pppdargsbutton() {
 /////////////////////////////////////////////////////////////////////////////
 ExecWidget::ExecWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name) :
     QWidget(parent, name), _pppdata(pd)
 {
     QVBoxLayout *tl = new QVBoxLayout(this, 0 );//, KDialog::spacingHint());
 
-  QLabel *l = new QLabel(\
-i18n("Here you can select commands to run at certain stages of the\n"
-     "connection. The commands are run with your real user id, so\n"
-     "you cannot run any commands here requiring root permissions\n"
-     "(unless, of course, you are root).\n\n"
-     "Be sure to supply the whole path to the program otherwise\n"
-     "kppp might be unable to find it."), this);
-//  l->setMinimumHeight(l->sizeHint().height());
+  QLabel *l = new QLabel( tr("Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).<br><br>Be sure to supply the whole path to the program otherwise we might be unable to find it."), this);
+
   tl->addWidget(l);
   tl->addStretch(1);
 
   QGridLayout *l1 = new QGridLayout(4, 2, 10);
   tl->addLayout(l1);
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
-  before_connect_l = new QLabel(i18n("Before connect:"), this);
+  before_connect_l = new QLabel(tr("Before connect:"), this);
   before_connect_l->setAlignment(AlignVCenter);
   l1->addWidget(before_connect_l, 0, 0);
   before_connect = new QLineEdit(this);
 //  before_connect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(before_connect, 0, 1);
-  QString tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
+  QString tmp = tr("Allows you to run a program <b>before</b> a connection\n"
              "is established. It is called immediately before\n"
              "dialing has begun.\n\n"
              "This might be useful, e.g. to stop HylaFAX blocking the\n"
              "modem.");
 
   QWhatsThis::add(before_connect_l,tmp);
   QWhatsThis::add(before_connect,tmp);
 
-  command_label = new QLabel(i18n("Upon connect:"), this);
+  command_label = new QLabel(tr("Upon connect:"), this);
   command_label->setAlignment(AlignVCenter);
   l1->addWidget(command_label, 1, 0);
   command = new QLineEdit(this);
 //  command->setMaxLength(COMMAND_SIZE);
   l1->addWidget(command, 1, 1);
-  tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
+  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
              "is established. When your program is called, all\n"
              "preparations for an Internet connection are finished.\n"
              "\n"
              "Very useful for fetching mail and news");
 
   QWhatsThis::add(command_label,tmp);
   QWhatsThis::add(command,tmp);
 
-  predisconnect_label = new QLabel(i18n("Before disconnect:"),
+  predisconnect_label = new QLabel(tr("Before disconnect:"),
                                  this);
   predisconnect_label->setAlignment(AlignVCenter);
   l1->addWidget(predisconnect_label, 2, 0);
   predisconnect = new QLineEdit(this);
 //  predisconnect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(predisconnect, 2, 1);
-  tmp = i18n("Allows you to run a program <b>before</b> a connection\n"
+  tmp = tr("Allows you to run a program <b>before</b> a connection\n"
              "is closed. The connection will stay open until\n"
              "the program exits.");
 
   QWhatsThis::add(predisconnect_label,tmp);
   QWhatsThis::add(predisconnect,tmp);
 
-  discommand_label = new QLabel(i18n("Upon disconnect:"),
+  discommand_label = new QLabel(tr("Upon disconnect:"),
                               this);
   discommand_label->setAlignment(AlignVCenter);
   l1->addWidget(discommand_label, 3, 0);
 
   discommand = new QLineEdit(this);
 //  discommand->setMaxLength(COMMAND_SIZE);
   l1->addWidget(discommand, 3, 1);
-  tmp = i18n("Allows you to run a program <b>after</b> a connection\n"
+  tmp = tr("Allows you to run a program <b>after</b> a connection\n"
              "has been closed.");
 
   QWhatsThis::add(discommand_label,tmp);
   QWhatsThis::add(discommand,tmp);
 
   // extra space between entries
@@ -387,58 +376,58 @@ bool ExecWidget::save() {
 IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
     : QWidget(parent, name), _pppdata(pd)
 {
   QVBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->setSpacing( 3 );//KDialog::spacingHint());
 
-  box = new QVGroupBox(i18n("Configuration"), this);
+  box = new QVGroupBox(tr("Configuration"), this);
 //  box->setInsideSpacing( 1 );//KDialog::spacingHint());
 
   rb = new QButtonGroup(this);
   rb->hide();
   connect(rb, SIGNAL(clicked(int)),
           SLOT(hitIPSelect(int)));
 
   dynamicadd_rb = new QRadioButton(box);
-  dynamicadd_rb->setText(i18n("Dynamic IP address"));
+  dynamicadd_rb->setText(tr("Dynamic IP address"));
   QWhatsThis::add(dynamicadd_rb,
-                  i18n("Select this option when your computer gets an\n"
+                  tr("Select this option when your computer gets an\n"
                        "internet address (IP) every time a\n"
                        "connection is made.\n"
                        "\n"
                        "Almost every Internet Service Provider uses\n"
                        "this method, so this should be turned on."));
 
   staticadd_rb = new QRadioButton(box);
-  staticadd_rb->setText(i18n("Static IP address"));
+  staticadd_rb->setText(tr("Static IP address"));
   rb->insert(dynamicadd_rb, 0);
   rb->insert(staticadd_rb, 1);
   QWhatsThis::add(staticadd_rb,
-                  i18n("Select this option when your computer has a\n"
+                  tr("Select this option when your computer has a\n"
                        "fixed internet address (IP). Most computers\n"
                        "don't have this, so you should probably select\n"
                        "dynamic IP addressing unless you know what you\n"
                        "are doing."));
 
   QWidget *ipWidget = new QWidget(box);
   QGridLayout *ipLayout = new QGridLayout(ipWidget, 2, 2);
   ipLayout->setSpacing( 2 );//KDialog::spacingHint());
 
-  ipaddress_label = new QLabel(i18n("IP address:"), ipWidget);
-  QString tmp = i18n("If your computer has a permanent internet\n"
+  ipaddress_label = new QLabel(tr("IP address:"), ipWidget);
+  QString tmp = tr("If your computer has a permanent internet\n"
              "address, you must supply your IP address here.");
   ipLayout->addWidget(ipaddress_label, 0, 0);
 
   ipaddress_l = new IPLineEdit(ipWidget);
   ipLayout->addWidget(ipaddress_l, 0, 1);
 
   QWhatsThis::add(ipaddress_label,tmp);
   QWhatsThis::add(ipaddress_l,tmp);
 
-  sub_label = new QLabel(i18n("Subnet mask:"), ipWidget);
-  tmp = i18n("<p>If your computer has a static Internet address,\n"
+  sub_label = new QLabel(tr("Subnet mask:"), ipWidget);
+  tmp = tr("<p>If your computer has a static Internet address,\n"
              "you must supply a network mask here. In almost\n"
              "all cases this netmask will be <b>255.255.255.0</b>,\n"
              "but your mileage may vary.\n"
              "\n"
              "If unsure, contact your Internet Service Provider");
   ipLayout->addWidget(sub_label, 1, 0);
@@ -446,19 +435,19 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
   subnetmask_l = new IPLineEdit(ipWidget);
   ipLayout->addWidget(subnetmask_l, 1, 1);
 
   QWhatsThis::add(sub_label,tmp);
   QWhatsThis::add(subnetmask_l,tmp);
 
-  autoname = new QCheckBox(i18n("Auto-configure hostname from this IP"), this);
+  autoname = new QCheckBox(tr("Auto-configure hostname from this IP"), this);
   autoname->setChecked(_pppdata->autoname());
   connect(autoname,SIGNAL(toggled(bool)),
           this,SLOT(autoname_t(bool)));
 
   QWhatsThis::add(autoname,
-                  i18n("<p>Whenever you connect, this reconfigures\n"
+                  tr("<p>Whenever you connect, this reconfigures\n"
                        "your hostname to match the IP address you\n"
                        "got from the PPP server. This may be useful\n"
                        "if you need to use a protocol which depends\n"
                        "on this information, but it can also cause several\n"
                        "<a href=\"kppp-7.html#autohostname\">problems</a>.\n"
                        "\n"
@@ -493,20 +482,20 @@ IPWidget::IPWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char
 void IPWidget::autoname_t(bool on) {
   static bool was_warned = false;
 
   // big-fat warning when selecting the auto configure hostname option
   if(on && !was_warned) {
     QMessageBox::information(this,
-                         i18n("Selecting this option might cause some weird "
+                         tr("Selecting this option might cause some weird "
                               "problems with the X-server and applications "
                               "while kppp is connected. Don't use it until "
                               "you know what you are doing!\n"
                               "For more information take a look at the "
                               "handbook (or help) in the section \"Frequently "
                               "asked questions\"."),
-                         i18n("Warning"));
+                         tr("Warning"));
     was_warned = true;
   }
 }
 
 
 void IPWidget::save() {
@@ -538,121 +527,112 @@ void IPWidget::hitIPSelect( int i ) {
 
 
 
 DNSWidget::DNSWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
     : QWidget(parent, name), _pppdata(pd)
 {
-  //  box = new QGroupBox(this);
-    QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );//, KDialog::spacingHint());
+    QGridLayout *tl = new QGridLayout(this, 7, 2, 0 );
 
-  dnsdomain_label = new QLabel(i18n("Domain name:"), this);
+  dnsdomain_label = new QLabel(tr("Domain name:"), this);
   tl->addWidget(dnsdomain_label, 0, 0);
 
   dnsdomain = new QLineEdit(this);
-//  dnsdomain->setMaxLength(DOMAIN_SIZE);
+
   tl->addWidget(dnsdomain, 0, 1);
-  QString tmp = i18n("If you enter a domain name here, this domain\n"
+  QString tmp = tr("If you enter a domain name here, this domain\n"
                      "name is used for your computer while you are\n"
                      "connected. When the connection is closed, the\n"
                      "original domain name of your computer is\n"
                      "restored.\n"
                      "\n"
                      "If you leave this field blank, no changes are\n"
                      "made to the domain name.");
 
   QWhatsThis::add(dnsdomain_label,tmp);
   QWhatsThis::add(dnsdomain,tmp);
 
-  conf_label = new QLabel(i18n("Configuration:"), this);
+  conf_label = new QLabel(tr("Configuration:"), this);
   tl->addWidget(conf_label, 1, 0);
 
   bg = new QButtonGroup("Group", this);
   connect(bg, SIGNAL(clicked(int)), SLOT(DNS_Mode_Selected(int)));
   bg->hide();
 
-  autodns = new QRadioButton(i18n("Automatic"), this);
+  autodns = new QRadioButton(tr("Automatic"), this);
   bg->insert(autodns, 0);
   tl->addWidget(autodns, 1, 1);
-  // no automatic DNS detection for pppd < 2.3.7
   if(!_pppdata->pppdVersionMin(2, 3, 7))
     autodns->setEnabled(false);
 
-  mandns = new QRadioButton(i18n("Manual"), this);
+  mandns = new QRadioButton(tr("Manual"), this);
   bg->insert(mandns, 1);
   tl->addWidget(mandns, 2, 1);
 
-  dns_label = new QLabel(i18n("DNS IP address:"), this);
+  dns_label = new QLabel(tr("DNS IP address:"), this);
   tl->addWidget(dns_label, 3, 0);
 
   QHBoxLayout *l2 = new QHBoxLayout;
   tl->addLayout(l2, 3, 1);
   dnsipaddr = new IPLineEdit(this);
   connect(dnsipaddr, SIGNAL(returnPressed()),
           SLOT(adddns()));
   connect(dnsipaddr, SIGNAL(textChanged(const QString &)),
           SLOT(DNS_Edit_Changed(const QString &)));
   l2->addWidget(dnsipaddr, 1);
   l2->addStretch(1);
-  tmp = i18n("<p>Allows you to specify a new DNS server to be\n"
+  tmp = tr("<p>Allows you to specify a new DNS server to be\n"
              "used while you are connected. When the\n"
              "connection is closed, this DNS entry will be\n"
              "removed again.\n"
              "\n"
              "To add a DNS server, type in the IP address of\n"
              "the DNS server here and click on <b>Add</b>");
 
   QWhatsThis::add(dns_label, tmp);
   QWhatsThis::add(dnsipaddr, tmp);
 
   QHBoxLayout *l1 = new QHBoxLayout;
   tl->addLayout(l1, 4, 1);
-  add = new QPushButton(i18n("Add"), this);
+  add = new QPushButton(tr("Add"), this);
   connect(add, SIGNAL(clicked()), SLOT(adddns()));
-//   int width = add->sizeHint().width();
-//   width = QMAX(width,60);
-//   add->setMinimumWidth(width);
   l1->addWidget(add);
-  l1->addStretch(1);
+//  l1->addStretch(1);
   QWhatsThis::add(add,
-                  i18n("Click this button to add the DNS server\n"
+                  tr("Click this button to add the DNS server\n"
                        "specified in the field above. The entry\n"
                        "will then be added to the list below"));
 
-  remove = new QPushButton(i18n("Remove"), this);
+  remove = new QPushButton(tr("Remove"), this);
   connect(remove, SIGNAL(clicked()), SLOT(removedns()));
-//   width = remove->sizeHint().width();
-//   width = QMAX(width,60);
-//   remove->setMinimumWidth(width);
   l1->addWidget(remove);
   QWhatsThis::add(remove,
-                  i18n("Click this button to remove the selected DNS\n"
+                  tr("Click this button to remove the selected DNS\n"
                        "server entry from the list below"));
 
-  servers_label = new QLabel(i18n("DNS address list:"), this);
+  servers_label = new QLabel(tr("DNS address list:"), this);
   servers_label->setAlignment(AlignTop|AlignLeft);
   tl->addWidget(servers_label, 5, 0);
 
   dnsservers = new QListBox(this);
   dnsservers->setMinimumSize(150, 80);
   connect(dnsservers, SIGNAL(highlighted(int)),
           SLOT(DNS_Entry_Selected(int)));
   tl->addWidget(dnsservers, 5, 1);
-  tmp = i18n("<p>This shows all defined DNS servers to use\n"
+  tmp = tr("<p>This shows all defined DNS servers to use\n"
              "while you are connected. Use the <b>Add</b> and\n"
              "<b>Remove</b> buttons to modify the list");
 
   QWhatsThis::add(servers_label,tmp);
   QWhatsThis::add(dnsservers,tmp);
 
-  exdnsdisabled_toggle = new QCheckBox(i18n( \
-"Disable existing DNS servers during connection"),
-                                     this);
+  exdnsdisabled_toggle = new QCheckBox(tr("Disable DNS servers during connection"), this);
+  // exdnsdisabled_toggle = new QCheckBox(tr("Disable existing DNS servers during connection"), this);
   exdnsdisabled_toggle->setChecked(_pppdata->exDNSDisabled());
   tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
   QWhatsThis::add(exdnsdisabled_toggle,
-                  i18n("<p>When this option is selected, all DNS\n"
+                  tr("<p>When this option is selected, all DNS\n"
                        "servers specified in <tt>/etc/resolv.conf</tt> are\n"
                        "temporary disabled while the dialup connection\n"
                        "is established. After the connection is\n"
                        "closed, the servers will be re-enabled\n"
                        "\n"
                        "Typically, there is no reason to use this\n"
@@ -734,50 +714,50 @@ void DNSWidget::removedns() {
 // GatewayWidget
 //
 GatewayWidget::GatewayWidget( PPPData *pd, QWidget *parent, bool isnewaccount, const char *name )
     : QWidget(parent, name), _pppdata(pd)
 {
   QVBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->setSpacing( 2 );//KDialog::spacingHint());
+  topLayout->setSpacing( 2 );
+  topLayout->setMargin( 0 );
 
-  box = new QVGroupBox(i18n("Configuration"), this);
-//  box->setInsideSpacing( 2 );//KDialog::spacingHint());
+  box = new QVGroupBox(tr("Configuration"), this);
 
   rb = new QButtonGroup(this);
   rb->hide();
   connect(rb, SIGNAL(clicked(int)), SLOT(hitGatewaySelect(int)));
 
   defaultgateway = new QRadioButton(box);
-  defaultgateway->setText(i18n("Default gateway"));
+  defaultgateway->setText(tr("Default gateway"));
   rb->insert(defaultgateway, 0);
   QWhatsThis::add(defaultgateway,
-                  i18n("This makes the PPP peer computer (the computer\n"
+                  tr("This makes the PPP peer computer (the computer\n"
                        "you are connected to with your modem) to act as\n"
                        "a gateway. Your computer will send all packets not\n"
                        "going to a computer inside your local net to this\n"
                        "computer, which will route these packets.\n"
                        "\n"
                        "This is the default for most ISPs, so you should\n"
                        "probably leave this option on."));
 
 
   staticgateway = new QRadioButton(box);
-  staticgateway->setText(i18n("Static gateway"));
+  staticgateway->setText(tr("Static gateway"));
   rb->insert(staticgateway, 1);
   QWhatsThis::add(staticgateway,
-                  i18n("<p>Allows you to specify which computer you want\n"
+                  tr("<p>Allows you to specify which computer you want\n"
                        "to use as gateway (see <i>Default Gateway</i> above)"));
 
   QHBox *gateBox = new QHBox(box);
-  gate_label = new QLabel(i18n("Gateway IP address:"), gateBox);
+  gate_label = new QLabel(tr("Gateway IP address:"), gateBox);
   gatewayaddr = new IPLineEdit(gateBox);
 
-  defaultroute = new QCheckBox(i18n("Assign the default route to this gateway"),
+  defaultroute = new QCheckBox(tr("Assign the default route to this gateway"),
                              this);
   QWhatsThis::add(defaultroute,
-                  i18n("If this option is enabled, all packets not\n"
+                  tr("If this option is enabled, all packets not\n"
                        "going to the local net are routed through\n"
                        "the PPP connection.\n"
                        "\n"
                        "Normally, you should turn this on"));
 
   topLayout->addWidget(box);
@@ -833,19 +813,19 @@ ScriptWidget::ScriptWidget( PPPData *pd, QWidget *parent, bool isnewaccount, con
   connect(se, SIGNAL(returnPressed()), SLOT(addButton()));
   tl->addWidget(se);
 
   // insert equal-sized buttons
   QHBoxLayout *hl = new QHBoxLayout( this );
   tl->addLayout( hl );
-  add = new QPushButton( i18n("Add"), this );
+  add = new QPushButton( tr("Add"), this );
   hl->addWidget( add );
   connect(add, SIGNAL(clicked()), SLOT(addButton()));
-  insert = new QPushButton( i18n("Insert"), this );
+  insert = new QPushButton( tr("Insert"), this );
   hl->addWidget( insert );
   connect(insert, SIGNAL(clicked()), SLOT(insertButton()));
-  remove = new QPushButton( i18n("Remove"), this );
+  remove = new QPushButton( tr("Remove"), this );
   hl->addWidget( remove );
   connect(remove, SIGNAL(clicked()), SLOT(removeButton()));
 
   QHBoxLayout *l12 = new QHBoxLayout(0);
   tl->addLayout(l12);
   stl = new QListBox(this);
@@ -1152,13 +1132,13 @@ void ScriptWidget::removeButton() {
 // Used to specify a new phone number
 //
 /////////////////////////////////////////////////////////////////////////////
 PhoneNumberDialog::PhoneNumberDialog(QWidget *parent)
     : QDialog(parent,"PhoneNumberDialog",true)
 {
-    setCaption( i18n("Add Phone Number") );
+    setCaption( tr("Add Phone Number") );
 
 
   QVBoxLayout *layout = new QVBoxLayout( this );
   layout->setSpacing( 3 );
   layout->setMargin( 3 );