Changeset 469
- Timestamp:
- 03/23/06 18:48:53 (3 years ago)
- Location:
- trunk/src
- Files:
-
- 11 modified
-
control/controlsocket.cpp (modified) (4 diffs)
-
control/torprocess.cpp (modified) (3 diffs)
-
gui/about/aboutdialog.cpp (modified) (2 diffs)
-
gui/bwgraph/bwgraph.cpp (modified) (1 diff)
-
gui/bwgraph/bwgraph.ui (modified) (4 diffs)
-
gui/config/configdialog.cpp (modified) (1 diff)
-
gui/config/configdialog.ui (modified) (9 diffs)
-
gui/help/browser/helpbrowser.cpp (modified) (2 diffs)
-
gui/help/browser/helpbrowser.ui (modified) (2 diffs)
-
gui/log/messagelog.cpp (modified) (5 diffs)
-
gui/log/messagelog.ui (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/control/controlsocket.cpp
r460 r469 82 82 if (errmsg) { 83 83 *errmsg = 84 QString("Error disconnecting socket. [%1]").arg(errorString());84 tr("Error disconnecting socket. [%1]").arg(errorString()); 85 85 } 86 86 return false; … … 141 141 if (errmsg) { 142 142 *errmsg = 143 QString("Error sending control command. [%1]").arg(errorString());143 tr("Error sending control command. [%1]").arg(errorString()); 144 144 } 145 145 return false; … … 160 160 if (!isConnected()) { 161 161 if (errmsg) { 162 *errmsg = "Socket disconnected while attempting to read a line of data.";162 *errmsg = tr("Socket disconnected while attempting to read a line of data."); 163 163 } 164 164 return false; … … 202 202 if (errmsg) { 203 203 *errmsg = 204 QString("Invalid control reply. [%1]").arg(line);204 tr("Invalid control reply. [%1]").arg(line); 205 205 } 206 206 return false; -
trunk/src/control/torprocess.cpp
r449 r469 58 58 if (errmsg) { 59 59 *errmsg = 60 QString("\"%1\" is not an executable.").arg(path);60 tr("\"%1\" is not an executable.").arg(path); 61 61 } 62 62 return false; … … 97 97 if (errmsg) { 98 98 *errmsg = 99 QString("Process %1 failed to stop. [%2]").arg(pid()).arg(errorString());99 tr("Process %1 failed to stop. [%2]").arg(pid()).arg(errorString()); 100 100 } 101 101 return false; … … 180 180 switch (error()) { 181 181 case QProcess::FailedToStart: 182 err = "Failed to start"; break;182 err = tr("Failed to start"); break; 183 183 case QProcess::Crashed: 184 err = "Crashed"; break;184 err = tr("Crashed"); break; 185 185 case QProcess::Timedout: 186 err = "Timed out"; break;186 err = tr("Timed out"); break; 187 187 case QProcess::WriteError: 188 err = "Write error"; break;188 err = tr("Write error"); break; 189 189 case QProcess::ReadError: 190 err = "Read error"; break;190 err = tr("Read error"); break; 191 191 default: 192 err = "Unknown error"; break;192 err = tr("Unknown error"); break; 193 193 } 194 194 return err; -
trunk/src/gui/about/aboutdialog.cpp
r449 r469 83 83 resize(_maxSize); 84 84 ui.btnLicense->setChecked(true); 85 ui.btnLicense->setText( "Hide License");85 ui.btnLicense->setText(tr("Hide License")); 86 86 } else { 87 87 resize(_minSize); 88 88 ui.btnLicense->setChecked(false); 89 ui.btnLicense->setText( "View License");89 ui.btnLicense->setText(tr("View License")); 90 90 } 91 91 } … … 99 99 ui.lblTorVersion->setText(_torControl->getTorVersion()); 100 100 } else { 101 ui.lblTorVersion->setText( "<Not Running>");101 ui.lblTorVersion->setText(tr("<Not Running>")); 102 102 } 103 103 QDialog::show(); -
trunk/src/gui/bwgraph/bwgraph.cpp
r449 r469 191 191 ui.frmSettings->setVisible(true); 192 192 ui.btnToggleSettings->setChecked(true); 193 ui.btnToggleSettings->setText( "Hide Settings");193 ui.btnToggleSettings->setText(tr("Hide Settings")); 194 194 } else { 195 195 ui.frmSettings->setVisible(false); 196 196 ui.btnToggleSettings->setChecked(false); 197 ui.btnToggleSettings->setText( "Show Settings");197 ui.btnToggleSettings->setText(tr("Show Settings")); 198 198 } 199 199 } -
trunk/src/gui/bwgraph/bwgraph.ui
r437 r469 400 400 </property> 401 401 <property name="text" > 402 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Since:</p></body></html></string>402 <string>Since:</string> 403 403 </property> 404 404 </widget> … … 427 427 </property> 428 428 <property name="text" > 429 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Jan 26 00:55:07</p></body></html></string>429 <string>Jan 1 2000</string> 430 430 </property> 431 431 </widget> … … 628 628 </property> 629 629 <property name="text" > 630 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">100</p></body></html></string>630 <string>100</string> 631 631 </property> 632 632 </widget> … … 649 649 </property> 650 650 <property name="text" > 651 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">% Opaque</p></body></html></string>651 <string>% Opaque</string> 652 652 </property> 653 653 </widget> -
trunk/src/gui/config/configdialog.cpp
r451 r469 195 195 (ui.lineServerPort->text().isEmpty() || 196 196 ui.lineServerNickname->text().isEmpty())) { 197 *errmsg = "You must specify at least a server nickname and port.";197 *errmsg = tr("You must specify at least a server nickname and port."); 198 198 return false; 199 199 } -
trunk/src/gui/config/configdialog.ui
r437 r469 9 9 <x>0</x> 10 10 <y>0</y> 11 <width> 334</width>12 <height> 322</height>11 <width>566</width> 12 <height>403</height> 13 13 </rect> 14 14 </property> … … 871 871 </property> 872 872 <property name="text" > 873 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Address:</span></p></body></html></string>873 <string>Address:</string> 874 874 </property> 875 875 <property name="alignment" > … … 917 917 </item> 918 918 <item row="6" column="0" colspan="3" > 919 <widget class="QLabel" name="l abel_5" >919 <widget class="QLabel" name="lblRequired" > 920 920 <property name="layoutDirection" > 921 921 <enum>Qt::LeftToRight</enum> 922 922 </property> 923 923 <property name="text" > 924 <string><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Required Fields</span></p></body></html></string> 924 <string>Nickname and Server Port are required</string> 925 </property> 926 <property name="textFormat" > 927 <enum>Qt::AutoText</enum> 925 928 </property> 926 929 <property name="alignment" > … … 980 983 </property> 981 984 <property name="text" > 982 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Directory Port:</p></body></html></string>985 <string>Directory Port:</string> 983 986 </property> 984 987 </widget> … … 1048 1051 </property> 1049 1052 <item> 1050 <widget class="QLabel" name="l abel" >1053 <widget class="QLabel" name="lblServerPort" > 1051 1054 <property name="contextMenuPolicy" > 1052 1055 <enum>Qt::NoContextMenu</enum> 1053 1056 </property> 1054 1057 <property name="text" > 1055 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Server Port:</span></p></body></html></string>1058 <string>Server Port:</string> 1056 1059 </property> 1057 1060 <property name="alignment" > … … 1124 1127 </property> 1125 1128 <property name="text" > 1126 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Contact Info:</p></body></html></string>1129 <string>Contact Info:</string> 1127 1130 </property> 1128 1131 <property name="alignment" > … … 1155 1158 </property> 1156 1159 <item> 1157 <widget class="QLabel" name="l abel_2" >1160 <widget class="QLabel" name="lblNickname" > 1158 1161 <property name="contextMenuPolicy" > 1159 1162 <enum>Qt::NoContextMenu</enum> 1160 1163 </property> 1161 1164 <property name="text" > 1162 <string><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Nickname:</span></p></body></html></string> 1165 <string>Nickname:</string> 1166 </property> 1167 <property name="textFormat" > 1168 <enum>Qt::AutoText</enum> 1163 1169 </property> 1164 1170 <property name="alignment" > … … 1759 1765 </property> 1760 1766 <property name="text" > 1761 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Run as User:</span></p></body></html></string>1767 <string>Run as User:</string> 1762 1768 </property> 1763 1769 <property name="indent" > … … 1792 1798 </property> 1793 1799 <property name="text" > 1794 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Run as Group:</span></p></body></html></string>1800 <string>Run as Group:</string> 1795 1801 </property> 1796 1802 </widget> -
trunk/src/gui/help/browser/helpbrowser.cpp
r466 r469 120 120 QDomElement root = document->documentElement(); 121 121 if (root.tagName() != ELEMENT_CONTENTS) { 122 errorString = "Supplied XML file is not a valid Contents document.";122 errorString = tr("Supplied XML file is not a valid Contents document."); 123 123 return false; 124 124 } … … 359 359 360 360 /* Set the status bar text */ 361 this->statusBar()->showMessage( QString("Found %1 results")361 this->statusBar()->showMessage(tr("Found %1 results") 362 362 .arg(ui.treeSearch->topLevelItemCount())); 363 363 } -
trunk/src/gui/help/browser/helpbrowser.ui
r454 r469 437 437 </property> 438 438 <property name="text" > 439 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Find:</span></p></body></html></string>439 <string>Find:</string> 440 440 </property> 441 441 <property name="buddy" > … … 644 644 </property> 645 645 <property name="text" > 646 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Searching for:</span></p></body></html></string>646 <string>Searching for:</string> 647 647 </property> 648 648 <property name="buddy" > -
trunk/src/gui/log/messagelog.cpp
r449 r469 267 267 268 268 /* Set Message Counter */ 269 ui.lstMessages->setStatusTip( QString("Messages Shown: %1")269 ui.lstMessages->setStatusTip(tr("Messages Shown: %1") 270 270 .arg(_messagesShown)); 271 271 /* Save Message Log opacity */ … … 358 358 MessageLog::format(QTreeWidgetItem *item) 359 359 { 360 return QString("%1 [%2] %3\n").arg(item->text(COL_TIME))360 return tr("%1 [%2] %3\n").arg(item->text(COL_TIME)) 361 361 .arg(item->text(COL_TYPE)) 362 362 .arg(item->text(COL_MSG).trimmed()); … … 508 508 { 509 509 _messagesShown = 0; 510 ui.lstMessages->setStatusTip( QString("Messages Shown: %1")510 ui.lstMessages->setStatusTip(tr("Messages Shown: %1") 511 511 .arg(_messagesShown)); 512 512 } … … 545 545 ui.frmSettings->setVisible(true); 546 546 ui.btnToggleSettings->setChecked(true); 547 ui.btnToggleSettings->setText( "Hide Settings");547 ui.btnToggleSettings->setText(tr("Hide Settings")); 548 548 } else { 549 549 ui.frmSettings->setVisible(false); 550 550 ui.btnToggleSettings->setChecked(false); 551 ui.btnToggleSettings->setText( "Show Settings");551 ui.btnToggleSettings->setText(tr("Show Settings")); 552 552 } 553 553 } … … 629 629 630 630 _messagesShown++; 631 ui.lstMessages->setStatusTip( QString("Messages Shown: %1")631 ui.lstMessages->setStatusTip(tr("Messages Shown: %1") 632 632 .arg(_messagesShown)); 633 633 ui.lstMessages->scrollToItem(newMessage); -
trunk/src/gui/log/messagelog.ui
r437 r469 608 608 </property> 609 609 <property name="text" > 610 <string> <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">% Opaque</p></body></html></string>610 <string>% Opaque</string> 611 611 </property> 612 612 </widget>
