Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [966] dcplusplus/trunk
|
From: <arn...@us...> - 2008-01-17 21:49:05
|
Revision: 966
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=966&view=rev
Author: arnetheduck
Date: 2008-01-17 13:48:59 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
More translations
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/dcpp/Text.h
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/DownloadsFrame.h
dcplusplus/trunk/win32/FavHubProperties.cpp
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/MagnetDlg.cpp
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/SplashWindow.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/UserInfoBase.h
dcplusplus/trunk/win32/UsersFrame.cpp
dcplusplus/trunk/win32/WinUtil.cpp
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/changelog.txt 2008-01-17 21:48:59 UTC (rev 966)
@@ -104,9 +104,9 @@
* [bug 1066] Search for alternates not available on uploads (thanks ullner)
* [bug 1104] Better error message on dupe source (thanks ullner)
* [bug 1132] Download queue updated when users go offline (thanks stephan hohe)
-* [bug 1133] Fixed max tab rows being reset (thanks pothead)
+* [bug 1133] Fixed max tab rows being reset (thanks mikejj)
* [bug 1134] Use SO_REUSEADDR for connection manager socket (thanks mikael eman)
-* [bug 1136] Fixed dupe changelog rebuild (thanks pothead)
+* [bug 1136] Fixed dupe changelog rebuild (thanks mikejj)
* [bug 1139] Fixed download delay in some cases (thanks mikael eman)
* [bug 1144] Added possibility to add many hub lists in one go (use ; as separator) (thanks poy)
* [bug 1152] Only refresh if there are directories shared (thanks ullner)
@@ -188,7 +188,7 @@
-- 0.696 2006-09-22 --
* Fixed a possible deadlock
-* [bug 1058] Removed some whitespace (big thanks to pothead)
+* [bug 1058] Removed some whitespace (big thanks to mikejj)
* Removed the possibility to download files without TTH
* Removed the possibility to read *.DcLst files (no TTH, no i18n support)
* Files with no TTH no longer show up in search and directory listings
@@ -220,13 +220,13 @@
* [bug 1027] Improved unix socket support (thanks steven sheehy)
* [bug 1028] Improved big endian support (thanks steven sheehy)
* [bug 1029] Fixed BSD compile issue (thanks steven sheehy)
-* [bug 1031] Fixed a crash after closing hub window (thanks bigmuscle/pothead)
-* [bug 1032] Fixed certificates help (thanks pothead)
+* [bug 1031] Fixed a crash after closing hub window (thanks bigmuscle/mikejj)
+* [bug 1032] Fixed certificates help (thanks mikejj)
* Added possibility to store configuration files in separate directory
* Switched back to unicows for w9x users, opencow was missing too many functions
* [bug 876] Fixed lost tooltips (thanks poy and bigmuscle)
-* [bug 1041] Fixed about tab order (thanks pothead)
-* [bug 1042] Fixed experts tab order (thanks pothead)
+* [bug 1041] Fixed about tab order (thanks mikejj)
+* [bug 1042] Fixed experts tab order (thanks mikejj)
* [bug 1047] Fixed possible nmdc crash (thanks guitarm)
* [bug 1049] Added tooltip to tab bar (thanks poy)
* [bug 1053] Fixed vista detection (thanks ullner)
@@ -245,7 +245,7 @@
* Added language code to example language xml
-- 0.692 2006-07-09 --
-* [bug 927] Fixed OP detection bug really (thanks pothead)
+* [bug 927] Fixed OP detection bug really (thanks mikejj)
* [bug 938] Added a few more ADC info fields (thanks ullner)
* [bug 939] Fixed hub info update (thanks ullner)
* [bug 940] Fixed a 64-bit compile error (thanks steven sheehy)
@@ -254,10 +254,10 @@
* [bug 944] Fixed unix string conversion bug (thanks tobias nygren)
* [bug 945] Fixed unix mutex initialiser (thanks tobias nygren)
* [bug 946] Tiger hash supports big endian and 64-bit architectures (thanks tobias nygren)
-* [bug 941] Updated usercount display (thanks pothead)
+* [bug 941] Updated usercount display (thanks mikejj)
* [bug 951] Fixed issue with high port numbers (thanks tpo)
* [bug 958] Search spy tth option automagically saved (thanks ullner)
-* [bug 959] Code cleanup (thanks pothead)
+* [bug 959] Code cleanup (thanks mikejj)
* [bug 966] Max hash speed fixed when fast hashing method is not used (thanks steven sheehy)
* [bug 967] Fixed path case-sensitivity issue (thanks steven sheehy)
* Fixed auto-reconnect
@@ -270,8 +270,8 @@
* Fixed a crash bug when hash data cannot be saved
* Possibly fixed issues with queue items not being updated
* Added warning when someone tries to spam hublist.org or dcpp.net with your client
-* [bug 968] Fixed unix compile issue (thanks pothead)
-* [bug 975] Fixed silly warning (thanks pothead)
+* [bug 968] Fixed unix compile issue (thanks mikejj)
+* [bug 975] Fixed silly warning (thanks mikejj)
* [bug 978] Fixed 64-bit compiler issue (thanks steven sheehy)
* [bug 988] Only unique nicks diplayed in title bar
* Added protection from hubs/clients sending junk data resulting in high memory usage / crash
@@ -283,7 +283,7 @@
* [bug 949] Fixed a crash when reading invalid XML files
* TLS port may now be specified in settings and is only opened if TLS is enabled
* Added TLS port to /connection
-* [bug 977] Added copy hub address to hub right-click menu (thanks pothead)
+* [bug 977] Added copy hub address to hub right-click menu (thanks mikejj)
* [bug 1001] Fixed assertion on unix (thanks steven sheehy)
-- 0.691 2006-06-03 --
@@ -294,7 +294,7 @@
* [bug 878] Added close all ... to window menu (thanks trem)
* [bug 903] Holding shift while minimizing will use opposite tray setting (thanks joakim tosteberg)
* [bug 923] PM history always read (thanks trem)
-* [bug 927] Fixed OP detection bug (thanks pothead)
+* [bug 927] Fixed OP detection bug (thanks mikejj)
* [bug 929] Fixed list view flicker issues (thanks trem)
* [bug 931] Improved keyboard navigation (thanks trem)
* Added "all" to hub list field search (thanks trem)
@@ -335,7 +335,7 @@
* [bug 853] Fixed missing function in opencow
-- 0.688 2006-03-18 --
-* Fixed public hubs sorting (thanks pothead)
+* Fixed public hubs sorting (thanks mikejj)
* Fixed a ZPipe issue (thanks jove)
* [bug 858] Fixed a 100% cpu / crash bug
* [bug 872] Fixed a pm issue hopefully
@@ -374,7 +374,7 @@
* Added filelist download speed to filelist browser status bar
* Added advanced hublist filter (thanks trem)
* [bug 579] Fixed 0-byte files not being created if directory doesn't exist
-* [bug 804] Cleaned up project files (thanks pothead)
+* [bug 804] Cleaned up project files (thanks mikejj)
* Socket buffer size = 0 now means use system default
* [bug 789] Fixed wrong nick being copied (thanks ullner)
* [bug 794] [ADC] Fixed automatic reconnect (thanks ullner)
@@ -382,8 +382,8 @@
* Updated to latest ADC specs, this will break 0.68/0.681/0.6811 queue sources and fav users (for NMDC as well)
* Fixed a bufferedsocket crash
* [ADC] Fixed quitting user processing (thanks ullner)
-* Clarified upload speed setting (thanks pothead)
-* Manual away setting no longer cleared when un-minimizing (thanks pothead)
+* Clarified upload speed setting (thanks mikejj)
+* Manual away setting no longer cleared when un-minimizing (thanks mikejj)
* Search result automatching waits with match until file list is downloaded if auto-matching enabled
* Slight performance improvement when sending files
* Fixed an issue with nick names disappearing from hub
@@ -409,7 +409,7 @@
* [bug 484] Added a check for multiple refreshes running at the same time (thanks trem)
* Fixed a few crashes here and there
* Fixed no-slots message not being sent out always
-* Fixed yassl build locations (thanks pothead)
+* Fixed yassl build locations (thanks mikejj)
* Added ip resolve cache when searching (thanks trem)
* [bug 413] Failed file moves are now reported to the system log
@@ -438,8 +438,8 @@
* Updated bzip2 to 1.0.3 (thanks garg)
* Some small *nix fixes (thanks poison)
* Source path no longer saved for TTH enabled clients (saves memory and queue file space)
-* [bug 335] Search window settings saved automatically (thanks pothead)
-* Open folder selects file in explorer (thanks pothead)
+* [bug 335] Search window settings saved automatically (thanks mikejj)
+* Open folder selects file in explorer (thanks mikejj)
* Local echo in pm window formatted as the other side should see it (thanks paka)
* Fixed debug assertion (thanks tpo)
* Dirty tabs settings improved (thanks ullner)
@@ -474,11 +474,11 @@
* Improved hashing error reporting
* Fixed hash database rebuild
* Added /removefav command to remove a favorite hub (thanks ullner)
-* [bug 717] Fixed search combo box (thanks pothead)
+* [bug 717] Fixed search combo box (thanks mikejj)
* Added option to change auto-refresh interval (thanks ullner)
* [bug 740] Removed tab completion option (thanks ullner)
* [bug 743] Added registry key creation failure notification (thanks ullner)
-* [bug 717] Fixed dropdown sizes (thanks pothead)
+* [bug 717] Fixed dropdown sizes (thanks mikejj)
* [bug 760] Fixed list subtraction issue (thanks cologic)
* Added some right-to-left support, but it probably needs more work
* [NMDC] Minislots are no longer given to old DC++ clients (<0.304)
Modified: dcplusplus/trunk/dcpp/Text.h
===================================================================
--- dcplusplus/trunk/dcpp/Text.h 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/dcpp/Text.h 2008-01-17 21:48:59 UTC (rev 966)
@@ -132,25 +132,7 @@
}
string toDOS(string tmp);
-
- template<typename T>
- tstring tformat(const tstring& src, T t) {
- tstring ret(src.size() + 64, _T('\0'));
- int n = _sntprintf(&ret[0], ret.size(), src.c_str(), t);
- if(n != -1 && n < static_cast<int>(ret.size())) {
- ret.resize(n);
- }
- return ret;
- }
- template<typename T, typename T2, typename T3>
- tstring tformat(const tstring& src, T t, T2 t2, T3 t3) {
- tstring ret(src.size() + 128, _T('\0'));
- int n = _sntprintf(&ret[0], ret.size(), src.c_str(), t, t2, t3);
- if(n != -1 && n < static_cast<int>(ret.size())) {
- ret.resize(n);
- }
- return ret;
- }
+
}
} // namespace dcpp
Modified: dcplusplus/trunk/win32/AboutDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/AboutDlg.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -40,7 +40,7 @@
"theparanoidone, gadget, naga, tremor, joakim tosteberg, pofis, psf8500, lauris ievins, "
"defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, "
"bsod, sulan, jonathan stone, tim burton, izzzo, guitarm, paka, nils maier, jens oknelid, yoji, "
-"krzysztof tyszecki, poison, pothead, pur, bigmuscle, martin, jove, bart vullings, "
+"krzysztof tyszecki, poison, mikejj, pur, bigmuscle, martin, jove, bart vullings, "
"steven sheehy, tobias nygren, poy, dorian, stephan hohe, mafa_45, mikael eman, james ross,"
"stanislav maslovski. "
"Keep it coming!";
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -258,7 +258,7 @@
void DirectoryListingFrame::handleMatchQueue() {
int matched = QueueManager::getInstance()->matchListing(*dl);
- setStatus(STATUS_STATUS, Text::tformat(TSTRING(MATCHED_FILES), matched));
+ setStatus(STATUS_STATUS, str(TFN_("Matched %1% file", "Matched %1% files", matched) % matched));
}
void DirectoryListingFrame::handleListDiff() {
Modified: dcplusplus/trunk/win32/DownloadsFrame.h
===================================================================
--- dcplusplus/trunk/win32/DownloadsFrame.h 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/DownloadsFrame.h 2008-01-17 21:48:59 UTC (rev 966)
@@ -22,7 +22,6 @@
#include <dcpp/DownloadManagerListener.h>
#include <dcpp/QueueManagerListener.h>
#include <dcpp/forward.h>
-#include <dcpp/ResourceManager.h>
#include "TypedListView.h"
#include "StaticFrame.h"
Modified: dcplusplus/trunk/win32/FavHubProperties.cpp
===================================================================
--- dcplusplus/trunk/win32/FavHubProperties.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/FavHubProperties.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -117,7 +117,7 @@
void FavHubProperties::handleOKClicked() {
tstring addressText = address->getText();
if(addressText.empty()) {
- createMessageBox().show(T_("Hub address cannot be empty."), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONEXCLAMATION);
+ createMessageBox().show(T_("Hub address cannot be empty"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONEXCLAMATION);
return;
}
entry->setServer(Text::fromT(addressText));
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -34,8 +34,16 @@
int HubFrame::columnSizes[] = { 100, 75, 75, 100, 75, 100, 100, 125 };
int HubFrame::columnIndexes[] = { COLUMN_NICK, COLUMN_SHARED, COLUMN_DESCRIPTION, COLUMN_TAG, COLUMN_CONNECTION, COLUMN_IP, COLUMN_EMAIL, COLUMN_CID };
-static ResourceManager::Strings columnNames[] = { ResourceManager::NICK, ResourceManager::SHARED,
-ResourceManager::DESCRIPTION, ResourceManager::TAG, ResourceManager::CONNECTION, ResourceManager::IP_BARE, ResourceManager::EMAIL, ResourceManager::CID };
+static const char* columnNames[] = {
+ N_("Nick"),
+ N_("Shared"),
+ N_("Description"),
+ N_("Tag"),
+ N_("Connection"),
+ N_("IP"),
+ N_("E-Mail"),
+ N_("CID")
+};
HubFrame::FrameList HubFrame::frames;
@@ -117,9 +125,9 @@
addWidget(filterType);
for(int j=0; j<COLUMN_LAST; j++) {
- filterType->addValue(TSTRING_I(columnNames[j]));
+ filterType->addValue(T_(columnNames[j]));
}
- filterType->addValue(TSTRING(ANY));
+ filterType->addValue(T_("Any"));
filterType->setSelectedIndex(COLUMN_LAST);
filterType->onSelectionChanged(std::tr1::bind(&HubFrame::updateUserList, this, (UserInfo*)0));
}
@@ -130,7 +138,7 @@
paned->setSecond(users);
users->setSmallImageList(WinUtil::userImages);
- users->createColumns(ResourceManager::getInstance()->getStrings(columnNames));
+ users->createColumns(WinUtil::getStrings(columnNames));
users->setColumnOrder(WinUtil::splitTokens(SETTING(HUBFRAME_ORDER), columnIndexes));
users->setColumnWidths(WinUtil::splitTokens(SETTING(HUBFRAME_WIDTHS), columnSizes));
users->setColor(WinUtil::textColor, WinUtil::bgColor);
@@ -286,16 +294,16 @@
handleFollow();
}
} else {
- addStatus(TSTRING(SPECIFY_SERVER));
+ addStatus(T_("Specify a server to connect to"));
}
} else if(Util::stricmp(cmd.c_str(), _T("clear")) == 0) {
chat->setText(_T(""));
} else if(Util::stricmp(cmd.c_str(), _T("ts")) == 0) {
timeStamps = !timeStamps;
if(timeStamps) {
- addStatus(TSTRING(TIMESTAMPS_ENABLED));
+ addStatus(T_("Timestamps enabled"));
} else {
- addStatus(TSTRING(TIMESTAMPS_DISABLED));
+ addStatus(T_("Timestamps disabled"));
}
} else if( (Util::stricmp(cmd.c_str(), _T("password")) == 0) && waitingForPW ) {
client->setPassword(Text::fromT(param));
@@ -304,16 +312,16 @@
} else if( Util::stricmp(cmd.c_str(), _T("showjoins")) == 0 ) {
showJoins = !showJoins;
if(showJoins) {
- addStatus(TSTRING(JOIN_SHOWING_ON));
+ addStatus(T_("Join/part showing on"));
} else {
- addStatus(TSTRING(JOIN_SHOWING_OFF));
+ addStatus(T_("Join/part showing off"));
}
} else if( Util::stricmp(cmd.c_str(), _T("favshowjoins")) == 0 ) {
favShowJoins = !favShowJoins;
if(favShowJoins) {
- addStatus(TSTRING(FAV_JOIN_SHOWING_ON));
+ addStatus(T_("Join/part of favorite users showing on"));
} else {
- addStatus(TSTRING(FAV_JOIN_SHOWING_OFF));
+ addStatus(T_("Join/part of favorite users showing off"));
}
} else if(Util::stricmp(cmd.c_str(), _T("close")) == 0) {
this->close(true);
@@ -491,7 +499,7 @@
addStatus(Text::toT("*** " + STRING(PARTS) + u.identity.getNick()));
}
} else if(i->first == CONNECTED) {
- addStatus(TSTRING(CONNECTED));
+ addStatus(T_("Connected"));
#ifdef PORT_ME
setTabColor(GREEN);
#endif
@@ -511,7 +519,7 @@
} else if(i->first == GET_PASSWORD) {
if(client->getPassword().size() > 0) {
client->password(client->getPassword());
- addStatus(TSTRING(STORED_PASSWORD_SENT));
+ addStatus(T_("Stored password sent..."));
} else {
if(!BOOLSETTING(PROMPT_PASSWORD)) {
message->setText(_T("/password "));
@@ -519,7 +527,7 @@
message->setSelection(10, 10);
waitingForPW = true;
} else {
- LineDlg linePwd(this, TSTRING(ENTER_PASSWORD), TSTRING(ENTER_PASSWORD), Util::emptyStringT, true);
+ LineDlg linePwd(this, T_("Please enter a password"), T_("Please enter a password"), Util::emptyStringT, true);
if(linePwd.run() == IDOK) {
client->setPassword(Text::fromT(linePwd.getLine()));
client->password(Text::fromT(linePwd.getLine()));
@@ -955,9 +963,9 @@
aEntry.setConnect(false);
aEntry.setNick(client->getMyNick());
FavoriteManager::getInstance()->addFavorite(aEntry);
- addStatus(TSTRING(FAVORITE_HUB_ADDED));
+ addStatus(T_("Favorite hub added"));
} else {
- addStatus(TSTRING(FAVORITE_HUB_ALREADY_EXISTS));
+ addStatus(T_("Hub already exists as a favorite"));
}
}
@@ -965,9 +973,9 @@
FavoriteHubEntry* removeHub = FavoriteManager::getInstance()->getFavoriteHubEntry(client->getHubUrl());
if(removeHub) {
FavoriteManager::getInstance()->removeFavorite(removeHub);
- addStatus(TSTRING(FAVORITE_HUB_REMOVED));
+ addStatus(T_("Favorite hub removed"));
} else {
- addStatus(TSTRING(FAVORITE_HUB_DOES_NOT_EXIST));
+ addStatus(T_("This hub is not a favorite hub"));
}
}
@@ -1151,7 +1159,7 @@
WidgetMenuPtr menu = createMenu(true);
appendUserItems(getParent(), menu);
- menu->appendItem(IDC_COPY_NICK, TSTRING(COPY_NICK), std::tr1::bind(&HubFrame::handleCopyNick, this));
+ menu->appendItem(IDC_COPY_NICK, T_("Copy nick to clipboard"), std::tr1::bind(&HubFrame::handleCopyNick, this));
menu->setDefaultItem(IDC_GETLIST);
prepareMenu(menu, UserCommand::CONTEXT_CHAT, client->getHubUrl());
@@ -1167,15 +1175,15 @@
WidgetMenuPtr menu = createMenu(true);
if(!FavoriteManager::getInstance()->isFavoriteHub(url)) {
- menu->appendItem(IDC_ADD_TO_FAVORITES, TSTRING(ADD_TO_FAVORITES), std::tr1::bind(&HubFrame::addAsFavorite, this));
+ menu->appendItem(IDC_ADD_TO_FAVORITES, T_("Add To Favorites"), std::tr1::bind(&HubFrame::addAsFavorite, this));
}
menu->appendItem(IDC_RECONNECT, TSTRING(MENU_RECONNECT), std::tr1::bind(&HubFrame::handleReconnect, this));
- menu->appendItem(IDC_COPY_HUB, TSTRING(COPY_HUB), std::tr1::bind(&HubFrame::handleCopyHub, this));
+ menu->appendItem(IDC_COPY_HUB, T_("Copy address to clipboard"), std::tr1::bind(&HubFrame::handleCopyHub, this));
prepareMenu(menu, UserCommand::CONTEXT_HUB, url);
menu->appendSeparatorItem();
- menu->appendItem(IDC_CLOSE_WINDOW, TSTRING(CLOSE), std::tr1::bind(&HubFrame::close, this, true));
+ menu->appendItem(IDC_CLOSE_WINDOW, T_("Close"), std::tr1::bind(&HubFrame::close, this, true));
inTabMenu = true;
@@ -1362,7 +1370,7 @@
void HubFrame::handleFollow() {
if(!redirect.empty()) {
if(ClientManager::getInstance()->isConnected(redirect)) {
- addStatus(TSTRING(REDIRECT_ALREADY_CONNECTED));
+ addStatus(T_("Redirect request received to a hub that's already connected"));
return;
}
Modified: dcplusplus/trunk/win32/HubListsDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HubListsDlg.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/HubListsDlg.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -22,7 +22,6 @@
#include "HubListsDlg.h"
-#include <dcpp/ResourceManager.h>
#include <dcpp/FavoriteManager.h>
#include <dcpp/StringTokenizer.h>
#include "HoldRedraw.h"
Modified: dcplusplus/trunk/win32/MagnetDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/MagnetDlg.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/MagnetDlg.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -42,7 +42,7 @@
}
bool MagnetDlg::handleInitDialog() {
- setText(TSTRING(MAGNET_DLG_TITLE));
+ setText(T_("MAGNET Link detected"));
::SetDlgItemText(handle(), IDC_MAGNET_TEXT, CTSTRING(MAGNET_DLG_TEXT_GOOD));
::SetDlgItemText(handle(), IDC_MAGNET_HASH, CTSTRING(MAGNET_DLG_HASH));
::SetDlgItemText(handle(), IDC_MAGNET_DISP_HASH, mHash.c_str());
@@ -50,21 +50,21 @@
::SetDlgItemText(handle(), IDC_MAGNET_DISP_NAME, mFileName.c_str());
//queue = attachRadioButton(IDC_MAGNET_1_QUEUE);
- //queue->setText(TSTRING(MAGNET_DLG_QUEUE));
+ //queue->setText(T_("Add this file to your download queue"));
//queue->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, queue));
::ShowWindow(::GetDlgItem(handle(), IDC_MAGNET_1_QUEUE), false);
search = attachRadioButton(IDC_MAGNET_2_SEARCH);
- search->setText(TSTRING(MAGNET_DLG_SEARCH));
+ search->setText(T_("Start a search for this file"));
search->setFocus();
//search->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, search));
doNothing = attachRadioButton(IDC_MAGNET_3_NOTHING);
- doNothing->setText(TSTRING(MAGNET_DLG_NOTHING));
+ doNothing->setText(T_("Do nothing"));
//doNothing->onClicked(std::tr1::bind(&MagnetDlg::handleRadioButtonClicked, this, doNothing));
//remember = attachCheckBox(IDC_MAGNET_REMEMBER);
- //remember->setText(TSTRING(MAGNET_DLG_REMEMBER));
+ //remember->setText(T_("Do the same action next time without asking"));
::ShowWindow(::GetDlgItem(handle(), IDC_MAGNET_REMEMBER), false);
::CheckRadioButton(handle(), IDC_MAGNET_1_QUEUE, IDC_MAGNET_3_NOTHING, IDC_MAGNET_2_SEARCH);
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -141,7 +141,7 @@
::ShowWindow(handle(), ((cmdShow == SW_SHOWDEFAULT) || (cmdShow == SW_SHOWNORMAL)) ? SETTING(MAIN_WINDOW_STATE) : cmdShow);
if(SmartWin::LibraryLoader::getCommonControlsVersion() < PACK_COMCTL_VERSION(5,80))
- createMessageBox().show(TSTRING(COMCTL_TOO_OLD), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONEXCLAMATION);
+ createMessageBox().show(T_("Your version of windows common controls is too old for DC++ to run correctly, and you will most probably experience problems with the user interface. You should download version 5.80 or higher from the DC++ homepage or from Microsoft directly."), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONEXCLAMATION);
}
void MainWindow::initWindow() {
@@ -181,68 +181,68 @@
WidgetMenuPtr file = mainMenu->appendPopup(CTSTRING(MENU_FILE));
- file->appendItem(IDC_QUICK_CONNECT, TSTRING(MENU_QUICK_CONNECT), std::tr1::bind(&MainWindow::handleQuickConnect, this));
- file->appendItem(IDC_FOLLOW, TSTRING(MENU_FOLLOW_REDIRECT));
- file->appendItem(IDC_RECONNECT, TSTRING(MENU_RECONNECT));
+ file->appendItem(IDC_QUICK_CONNECT, T_("&Quick Connect ...\tCtrl+Q"), std::tr1::bind(&MainWindow::handleQuickConnect, this));
+ file->appendItem(IDC_FOLLOW, T_("Follow last redirec&t\tCtrl+T"));
+ file->appendItem(IDC_RECONNECT, T_("&Reconnect\tCtrl+R"));
file->appendSeparatorItem();
- file->appendItem(IDC_OPEN_FILE_LIST, TSTRING(MENU_OPEN_FILE_LIST), std::tr1::bind(&MainWindow::handleOpenFileList, this));
- file->appendItem(IDC_OPEN_OWN_LIST, TSTRING(MENU_OPEN_OWN_LIST), std::tr1::bind(&MainWindow::handleOpenOwnList, this));
- file->appendItem(IDC_MATCH_ALL, TSTRING(MENU_OPEN_MATCH_ALL), std::tr1::bind(&MainWindow::handleMatchAll, this));
- file->appendItem(IDC_REFRESH_FILE_LIST, TSTRING(MENU_REFRESH_FILE_LIST), std::tr1::bind(&MainWindow::handleRefreshFileList, this));
- file->appendItem(IDC_OPEN_DOWNLOADS, TSTRING(MENU_OPEN_DOWNLOADS_DIR), std::tr1::bind(&MainWindow::handleOpenDownloadsDir, this));
+ file->appendItem(IDC_OPEN_FILE_LIST, T_("Open file list...\tCtrl+L"), std::tr1::bind(&MainWindow::handleOpenFileList, this));
+ file->appendItem(IDC_OPEN_OWN_LIST, T_("Open own list"), std::tr1::bind(&MainWindow::handleOpenOwnList, this));
+ file->appendItem(IDC_MATCH_ALL, T_("Match downloaded lists"), std::tr1::bind(&MainWindow::handleMatchAll, this));
+ file->appendItem(IDC_REFRESH_FILE_LIST, T_("Refresh file list\tCtrl+E"), std::tr1::bind(&MainWindow::handleRefreshFileList, this));
+ file->appendItem(IDC_OPEN_DOWNLOADS, T_("Open downloads directory"), std::tr1::bind(&MainWindow::handleOpenDownloadsDir, this));
file->appendSeparatorItem();
- file->appendItem(IDC_SETTINGS, TSTRING(MENU_SETTINGS), std::tr1::bind(&MainWindow::handleSettings, this));
+ file->appendItem(IDC_SETTINGS, T_("Settings..."), std::tr1::bind(&MainWindow::handleSettings, this));
file->appendSeparatorItem();
- file->appendItem(IDC_EXIT, TSTRING(MENU_EXIT), std::tr1::bind(&MainWindow::handleExit, this));
+ file->appendItem(IDC_EXIT, T_("E&xit"), std::tr1::bind(&MainWindow::handleExit, this));
WidgetMenuPtr view = mainMenu->appendPopup(CTSTRING(MENU_VIEW));
- view->appendItem(IDC_PUBLIC_HUBS, TSTRING(MENU_PUBLIC_HUBS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_FAVORITE_HUBS, TSTRING(MENU_FAVORITE_HUBS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_FAVUSERS, TSTRING(MENU_FAVORITE_USERS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_PUBLIC_HUBS, T_("&Public Hubs\tCtrl+P"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_FAVORITE_HUBS, T_("&Favorite Hubs\tCtrl+F"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_FAVUSERS, T_("Favorite &Users\tCtrl+U"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
view->appendSeparatorItem();
- view->appendItem(IDC_QUEUE, TSTRING(MENU_DOWNLOAD_QUEUE), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_FINISHED_DL, TSTRING(FINISHED_DOWNLOADS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_WAITING_USERS, TSTRING(WAITING_USERS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_FINISHED_UL, TSTRING(FINISHED_UPLOADS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_QUEUE, T_("&Download Queue\tCtrl+D"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_FINISHED_DL, T_("Finished Downloads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_WAITING_USERS, T_("Waiting Users"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_FINISHED_UL, T_("Finished Uploads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
view->appendSeparatorItem();
- view->appendItem(IDC_SEARCH, TSTRING(MENU_SEARCH), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_ADL_SEARCH, TSTRING(MENU_ADL_SEARCH), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_SEARCH_SPY, TSTRING(MENU_SEARCH_SPY), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_SEARCH, T_("&Search\tCtrl+S"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_ADL_SEARCH, T_("ADL Search"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_SEARCH_SPY, T_("Search Spy"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
view->appendSeparatorItem();
- view->appendItem(IDC_NOTEPAD, TSTRING(MENU_NOTEPAD), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_SYSTEM_LOG, TSTRING(MENU_SYSTEM_LOG), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_NET_STATS, TSTRING(MENU_NETWORK_STATISTICS), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_NOTEPAD, T_("&Notepad\tCtrl+N"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_SYSTEM_LOG, T_("System Log"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
+ view->appendItem(IDC_NET_STATS, T_("Network Statistics"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
view->appendItem(IDC_DOWNLOADS, T_("Downloads"), std::tr1::bind(&MainWindow::handleOpenWindow, this, _1));
- view->appendItem(IDC_HASH_PROGRESS, TSTRING(MENU_HASH_PROGRESS), std::tr1::bind(&MainWindow::handleHashProgress, this));
+ view->appendItem(IDC_HASH_PROGRESS, T_("Indexing progress"), std::tr1::bind(&MainWindow::handleHashProgress, this));
WidgetMenuPtr window = mainMenu->appendPopup(CTSTRING(MENU_WINDOW));
- window->appendItem(IDC_CLOSE_ALL_DISCONNECTED, TSTRING(MENU_CLOSE_DISCONNECTED), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
- window->appendItem(IDC_CLOSE_ALL_PM, TSTRING(MENU_CLOSE_ALL_PM), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
- window->appendItem(IDC_CLOSE_ALL_OFFLINE_PM, TSTRING(MENU_CLOSE_ALL_OFFLINE_PM), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
- window->appendItem(IDC_CLOSE_ALL_DIR_LIST, TSTRING(MENU_CLOSE_ALL_DIR_LIST), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
- window->appendItem(IDC_CLOSE_ALL_SEARCH_FRAME, TSTRING(MENU_CLOSE_ALL_SEARCHFRAME), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
+ window->appendItem(IDC_CLOSE_ALL_DISCONNECTED, T_("Close disconnected"), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
+ window->appendItem(IDC_CLOSE_ALL_PM, T_("Close all PM windows"), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
+ window->appendItem(IDC_CLOSE_ALL_OFFLINE_PM, T_("Close all offline PM windows"), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
+ window->appendItem(IDC_CLOSE_ALL_DIR_LIST, T_("Close all file list windows"), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
+ window->appendItem(IDC_CLOSE_ALL_SEARCH_FRAME, T_("Close all search windows"), std::tr1::bind(&MainWindow::handleCloseWindows, this, _1));
WidgetMenuPtr help = mainMenu->appendPopup(TSTRING(MENU_HELP));
- help->appendItem(IDC_HELP_CONTENTS, TSTRING(MENU_CONTENTS), std::tr1::bind(&MainWindow::handleMenuHelp, this, _1));
+ help->appendItem(IDC_HELP_CONTENTS, T_("Help &Contents\tF1"), std::tr1::bind(&MainWindow::handleMenuHelp, this, _1));
help->appendSeparatorItem();
- help->appendItem(IDC_HELP_CHANGELOG, TSTRING(MENU_CHANGELOG), std::tr1::bind(&MainWindow::handleMenuHelp, this, _1));
- help->appendItem(IDC_ABOUT, TSTRING(MENU_ABOUT), std::tr1::bind(&MainWindow::handleAbout, this));
+ help->appendItem(IDC_HELP_CHANGELOG, T_("Change Log"), std::tr1::bind(&MainWindow::handleMenuHelp, this, _1));
+ help->appendItem(IDC_ABOUT, T_("About DC++..."), std::tr1::bind(&MainWindow::handleAbout, this));
help->appendSeparatorItem();
- help->appendItem(IDC_HELP_HOMEPAGE, TSTRING(MENU_HOMEPAGE), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_DOWNLOADS, TSTRING(MENU_HELP_DOWNLOADS), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_GEOIPFILE, TSTRING(MENU_HELP_GEOIPFILE), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_TRANSLATIONS, TSTRING(MENU_HELP_TRANSLATIONS), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_FAQ, TSTRING(MENU_FAQ), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_FORUM, TSTRING(MENU_HELP_FORUM), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_DISCUSS, TSTRING(MENU_DISCUSS), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_REQUEST_FEATURE, TSTRING(MENU_REQUEST_FEATURE), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_REPORT_BUG, TSTRING(MENU_REPORT_BUG), std::tr1::bind(&MainWindow::handleLink, this, _1));
- help->appendItem(IDC_HELP_DONATE, TSTRING(MENU_DONATE), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_HOMEPAGE, T_("DC++ Homepage"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_DOWNLOADS, T_("Downloads"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_GEOIPFILE, T_("GeoIP database update"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_TRANSLATIONS, T_("Translations"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_FAQ, T_("Frequently asked questions"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_FORUM, T_("Help forum"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_DISCUSS, T_("DC++ discussion forum"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_REQUEST_FEATURE, T_("Request a feature"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_REPORT_BUG, T_("Report a bug"), std::tr1::bind(&MainWindow::handleLink, this, _1));
+ help->appendItem(IDC_HELP_DONATE, T_("Donate (paypal)"), std::tr1::bind(&MainWindow::handleLink, this, _1));
mainMenu->attach(this);
}
@@ -342,7 +342,7 @@
if (SETTING(NICK).empty())
return;
- LineDlg dlg(this, TSTRING(QUICK_CONNECT), TSTRING(HUB_ADDRESS));
+ LineDlg dlg(this, T_("Quick Connect"), T_("Address"));
if (dlg.run() == IDOK) {
@@ -457,7 +457,7 @@
bool MainWindow::closing() {
if (stopperThread == NULL) {
- if ( !BOOLSETTING(CONFIRM_EXIT) || (createMessageBox().show(TSTRING(REALLY_EXIT), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_YESNO, WidgetMessageBox::BOX_ICONQUESTION) == IDYES)) {
+ if ( !BOOLSETTING(CONFIRM_EXIT) || (createMessageBox().show(T_("Really exit?"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_YESNO, WidgetMessageBox::BOX_ICONQUESTION) == IDYES)) {
if (c != NULL) {
c->removeListener(this);
delete c;
@@ -610,7 +610,7 @@
try {
ConnectionManager::getInstance()->listen();
} catch(const Exception&) {
- WidgetMessageBox().show(TSTRING(TCP_PORT_BUSY), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONSTOP);
+ WidgetMessageBox().show(T_("Unable to open TCP/TLS port. File transfers will not work correctly until you change settings or turn off any application that might be using the TCP/TLS port"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONSTOP);
}
try {
SearchManager::getInstance()->listen();
@@ -632,7 +632,7 @@
if ( FAILED(UPnP_UDPConnection->OpenPorts()) || FAILED(UPnP_TCPConnection->OpenPorts()) )
{
LogManager::getInstance()->message(STRING(UPNP_FAILED_TO_CREATE_MAPPINGS));
- createMessageBox().show(TSTRING(UPNP_FAILED_TO_CREATE_MAPPINGS), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
+ createMessageBox().show(T_("Failed to create port mappings. Please set up your NAT yourself."), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
// We failed! thus reset the objects
delete UPnP_TCPConnection;
@@ -651,7 +651,7 @@
//:-( Looks like we have to rely on the user setting the external IP manually
// no need to do cleanup here because the mappings work
LogManager::getInstance()->message(STRING(UPNP_FAILED_TO_GET_EXTERNAL_IP));
- createMessageBox().show(TSTRING(UPNP_FAILED_TO_GET_EXTERNAL_IP), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
+ createMessageBox().show(T_("Failed to get external IP via UPnP. Please set it yourself."), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
}
}
}
@@ -690,7 +690,7 @@
if (u) {
DirectoryListingFrame::openWindow(getMDIParent(), file, Text::toT(Util::emptyString), u, 0);
} else {
- createMessageBox().show(TSTRING(INVALID_LISTNAME), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
+ createMessageBox().show(T_("Invalid file list name"), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
}
}
}
@@ -999,10 +999,10 @@
} else if(lParam == WM_RBUTTONDOWN || lParam == WM_CONTEXTMENU) {
SmartWin::ScreenCoordinate pt;
WidgetMenuPtr trayMenu = createMenu(true);
- trayMenu->appendItem(IDC_TRAY_SHOW, TSTRING(MENU_SHOW), std::tr1::bind(&MainWindow::handleRestore, this));
+ trayMenu->appendItem(IDC_TRAY_SHOW, T_("Show"), std::tr1::bind(&MainWindow::handleRestore, this));
trayMenu->appendItem(IDC_TRAY_QUIT, TSTRING(MENU_EXIT), std::tr1::bind(&MainWindow::close, this, true));
- trayMenu->appendItem(IDC_OPEN_DOWNLOADS, TSTRING(MENU_OPEN_DOWNLOADS_DIR));
- trayMenu->appendItem(IDC_SETTINGS, TSTRING(MENU_SETTINGS));
+ trayMenu->appendItem(IDC_OPEN_DOWNLOADS, T_("Open downloads directory"));
+ trayMenu->appendItem(IDC_SETTINGS, T_("Settings..."));
trayMenu->setDefaultItem(0,TRUE);
::GetCursorPos(&pt.getPoint());
::SetForegroundWindow(handle());
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -46,20 +46,19 @@
int PublicHubsFrame::columnSizes[] = { 200, 290, 50, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
-static ResourceManager::Strings columnNames[] = {
- ResourceManager::HUB_NAME,
- ResourceManager::DESCRIPTION,
- ResourceManager::USERS,
- ResourceManager::HUB_ADDRESS,
- ResourceManager::COUNTRY,
- ResourceManager::SHARED,
- ResourceManager::MIN_SHARE,
- ResourceManager::MIN_SLOTS,
- ResourceManager::MAX_HUBS,
- ResourceManager::MAX_USERS,
- ResourceManager::RELIABILITY,
- ResourceManager::RATING,
-
+static const char* columnNames[] = {
+ N_("Name"),
+ N_("Description"),
+ N_("Users"),
+ N_("Address"),
+ N_("Country"),
+ N_("Shared"),
+ N_("Min Share"),
+ N_("Min Slots"),
+ N_("Max Hubs"),
+ N_("Max Users"),
+ N_("Reliability"),
+ N_("Rating")
};
PublicHubsFrame::HubInfo::HubInfo(const HubEntry* entry_) : entry(entry_) {
@@ -110,7 +109,7 @@
hubs = SmartWin::WidgetCreator<WidgetHubs>::create(this, cs);
addWidget(hubs);
- hubs->createColumns(ResourceManager::getInstance()->getStrings(columnNames));
+ hubs->createColumns(WinUtil::getStrings(columnNames));
hubs->setColumnOrder(WinUtil::splitTokens(SETTING(FAVHUBSFRAME_ORDER), columnIndexes));
hubs->setColumnWidths(WinUtil::splitTokens(SETTING(FAVHUBSFRAME_WIDTHS), columnSizes));
hubs->setColor(WinUtil::textColor, WinUtil::bgColor);
@@ -135,9 +134,9 @@
//populate the filter list with the column names
for(int j=0; j<COLUMN_LAST; j++) {
- filterSel->addValue(TSTRING_I(columnNames[j]));
+ filterSel->addValue(T_(columnNames[j]));
}
- filterSel->addValue(TSTRING(ANY));
+ filterSel->addValue(T_("Any"));
filterSel->setSelectedIndex(COLUMN_LAST);
filterSel->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::updateList, this));
@@ -149,13 +148,13 @@
{
WidgetButton::Seed cs = WinUtil::Seeds::button;
- cs.caption = TSTRING(CONFIGURE);
+ cs.caption = T_("&Configure");
configure = createButton(cs);
configure->onClicked(std::tr1::bind(&PublicHubsFrame::handleConfigure, this));
configure->setFont(WinUtil::font);
addWidget(configure);
- cs.caption = TSTRING(REFRESH);
+ cs.caption = T_("&Refresh");
refresh = createButton(cs);
refresh->onClicked(std::tr1::bind(&PublicHubsFrame::handleRefresh, this));
refresh->setFont(WinUtil::font);
@@ -163,11 +162,11 @@
cs.style = WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON | BS_GROUPBOX;
cs.exStyle = WS_EX_TRANSPARENT;
- cs.caption = TSTRING(CONFIGURED_HUB_LISTS);
+ cs.caption = T_("Configured Public Hub Lists");
lists = createButton(cs);
lists->setFont(WinUtil::font);
- cs.caption = TSTRING(FILTER);
+ cs.caption = T_("F&ilter");
filterDesc = createButton(cs);
filterDesc->setFont(WinUtil::font);
}
@@ -187,7 +186,7 @@
onSpeaker(std::tr1::bind(&PublicHubsFrame::handleSpeaker, this, _1, _2));
if(FavoriteManager::getInstance()->isDownloading()) {
- setStatus(STATUS_STATUS, TSTRING(DOWNLOADING_HUB_LIST));
+ setStatus(STATUS_STATUS, T_("Downloading public hub list..."));
} else if(entries.empty()) {
FavoriteManager::getInstance()->refresh();
}
@@ -447,8 +446,8 @@
WidgetMenuPtr menu = createMenu(true);
menu->appendItem(IDC_CONNECT, TSTRING(CONNECT), std::tr1::bind(&PublicHubsFrame::handleConnect, this));
- menu->appendItem(IDC_ADD, TSTRING(ADD_TO_FAVORITES), std::tr1::bind(&PublicHubsFrame::handleAdd, this));
- menu->appendItem(IDC_COPY_HUB, TSTRING(COPY_HUB), std::tr1::bind(&PublicHubsFrame::handleCopyHub, this));
+ menu->appendItem(IDC_ADD, T_("Add To Favorites"), std::tr1::bind(&PublicHubsFrame::handleAdd, this));
+ menu->appendItem(IDC_COPY_HUB, T_("Copy address to clipboard"), std::tr1::bind(&PublicHubsFrame::handleCopyHub, this));
menu->setDefaultItem(IDC_CONNECT);
menu->trackPopupMenu(this, pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON);
return true;
@@ -495,7 +494,7 @@
bool PublicHubsFrame::checkNick() {
if(SETTING(NICK).empty()) {
- createMessageBox().show(TSTRING(ENTER_NICK), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
+ createMessageBox().show(T_("Please enter a nickname in the settings dialog!"), _T(APPNAME) _T(" ") _T(VERSIONSTRING));
return false;
}
return true;
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -25,7 +25,6 @@
#include "PrivateFrame.h"
#include <dcpp/QueueManager.h>
-#include <dcpp/ResourceManager.h>
#include <dcpp/version.h>
int QueueFrame::columnIndexes[] = { COLUMN_TARGET, COLUMN_STATUS, COLUMN_SIZE, COLUMN_DOWNLOADED, COLUMN_PRIORITY,
@@ -414,42 +413,32 @@
tmp += WinUtil::getNicks(j->getUser());
}
- display->columns[COLUMN_USERS] = tmp.empty() ? TSTRING(NO_USERS) : tmp;
+ display->columns[COLUMN_USERS] = tmp.empty() ? T_("No users") : tmp;
}
if(colMask & MASK_STATUS) {
if(!getRunning()) {
-
- TCHAR buf[64];
if(online > 0) {
if(getSources().size() == 1) {
- display->columns[COLUMN_STATUS] = TSTRING(WAITING_USER_ONLINE);
+ display->columns[COLUMN_STATUS] = T_("Waiting (User online)");
} else {
- _sntprintf(buf, 64, CTSTRING(WAITING_USERS_ONLINE), online, getSources().size());
- display->columns[COLUMN_STATUS] = buf;
+ display->columns[COLUMN_STATUS] = str(TF_("Waiting (%1% of %2% users online)") % online % getSources().size());
}
} else {
if(getSources().size() == 0) {
- display->columns[COLUMN_STATUS] = TSTRING(NO_USERS_TO_DOWNLOAD_FROM);
+ display->columns[COLUMN_STATUS] = T_("No users to download from");
} else if(getSources().size() == 1) {
- display->columns[COLUMN_STATUS] = TSTRING(USER_OFFLINE);
- } else if(getSources().size() == 2) {
- display->columns[COLUMN_STATUS] = TSTRING(BOTH_USERS_OFFLINE);
- } else if(getSources().size() == 3) {
- display->columns[COLUMN_STATUS] = TSTRING(ALL_3_USERS_OFFLINE);
- } else if(getSources().size() == 4) {
- display->columns[COLUMN_STATUS] = TSTRING(ALL_4_USERS_OFFLINE);
+ display->columns[COLUMN_STATUS] = T_("User offline");
} else {
- _sntprintf(buf, 64, CTSTRING(ALL_USERS_OFFLINE), getSources().size());
- display->columns[COLUMN_STATUS] = buf;
+ display->columns[COLUMN_STATUS] = str(TF_("All %1% users offline") % getSources().size());
}
}
} else {
- display->columns[COLUMN_STATUS] = TSTRING(RUNNING);
+ display->columns[COLUMN_STATUS] = T_("Running...");
}
}
if(colMask & MASK_SIZE) {
- display->columns[COLUMN_SIZE] = (getSize() == -1) ? TSTRING(UNKNOWN) : Text::toT(Util::formatBytes(getSize()));
- display->columns[COLUMN_EXACT_SIZE] = (getSize() == -1) ? TSTRING(UNKNOWN) : Text::toT(Util::formatExactSize(getSize()));
+ display->columns[COLUMN_SIZE] = (getSize() == -1) ? T_("Unknown") : Text::toT(Util::formatBytes(getSize()));
+ display->columns[COLUMN_EXACT_SIZE] = (getSize() == -1) ? T_("Unknown") : Text::toT(Util::formatExactSize(getSize()));
}
if(colMask & MASK_DOWNLOADED) {
if(getSize() > 0)
@@ -459,12 +448,12 @@
}
if(colMask & MASK_PRIORITY) {
switch(getPriority()) {
- case QueueItem::PAUSED: display->columns[COLUMN_PRIORITY] = TSTRING(PAUSED); break;
- case QueueItem::LOWEST: display->columns[COLUMN_PRIORITY] = TSTRING(LOWEST); break;
- case QueueItem::LOW: display->columns[COLUMN_PRIORITY] = TSTRING(LOW); break;
- case QueueItem::NORMAL: display->columns[COLUMN_PRIORITY] = TSTRING(NORMAL); break;
- case QueueItem::HIGH: display->columns[COLUMN_PRIORITY] = TSTRING(HIGH); break;
- case QueueItem::HIGHEST: display->columns[COLUMN_PRIORITY] = TSTRING(HIGHEST); break;
+ case QueueItem::PAUSED: display->columns[COLUMN_PRIORITY] = T_("Paused"); break;
+ case QueueItem::LOWEST: display->columns[COLUMN_PRIORITY] = T_("Lowest"); break;
+ case QueueItem::LOW: display->columns[COLUMN_PRIORITY] = T_("Low"); break;
+ case QueueItem::NORMAL: display->columns[COLUMN_PRIORITY] = T_("Normal"); break;
+ case QueueItem::HIGH: display->columns[COLUMN_PRIORITY] = T_("High"); break;
+ case QueueItem::HIGHEST: display->columns[COLUMN_PRIORITY] = T_("Highest"); break;
default: dcasserta(0); break;
}
}
@@ -482,22 +471,22 @@
tmp += WinUtil::getNicks(j->getUser());
tmp += _T(" (");
if(j->isSet(QueueItem::Source::FLAG_FILE_NOT_AVAILABLE)) {
- tmp += TSTRING(FILE_NOT_AVAILABLE);
+ tmp += T_("File not available");
} else if(j->isSet(QueueItem::Source::FLAG_PASSIVE)) {
- tmp += TSTRING(PASSIVE_USER);
+ tmp += T_("Passive user");
} else if(j->isSet(QueueItem::Source::FLAG_CRC_FAILED)) {
- tmp += TSTRING(SFV_INCONSISTENCY);
+ tmp += T_("CRC32 inconsistency (SFV-Check)");
} else if(j->isSet(QueueItem::Source::FLAG_BAD_TREE)) {
- tmp += TSTRING(INVALID_TREE);
+ tmp += T_("Full tree does not match TTH root");
} else if(j->isSet(QueueItem::Source::FLAG_SLOW_SOURCE)) {
- tmp += TSTRING(SOURCE_TOO_SLOW);
+ tmp += T_("Source too slow");
} else if(j->isSet(QueueItem::Source::FLAG_NO_TTHF)) {
- tmp += TSTRING(SOURCE_TOO_OLD);
+ tmp += T_("Remote client does not fully support TTH - cannot download");
}
tmp += ')';
}
}
- display->columns[COLUMN_ERRORS] = tmp.empty() ? TSTRING(NO_ERRORS) : tmp;
+ display->columns[COLUMN_ERRORS] = tmp.empty() ? T_("No errors") : tmp;
}
if(colMask & MASK_ADDED) {
@@ -701,12 +690,12 @@
}
void QueueFrame::removeSelected() {
- if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || createMessageBox().show(TSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_YESNO, WidgetMessageBox::BOX_ICONQUESTION) == IDYES)
+ if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || createMessageBox().show(T_("Really remove?"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_YESNO, WidgetMessageBox::BOX_ICONQUESTION) == IDYES)
files->forEachSelected(&QueueItemInfo::remove);
}
void QueueFrame::removeSelectedDir() {
- if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || createMessageBox().show(TSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_YESNO, WidgetMessageBox::BOX_ICONQUESTION) == IDYES)
+ if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || createMessageBox().show(T_("Really remove?"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_YESNO, WidgetMessageBox::BOX_ICONQUESTION) == IDYES)
removeDir(dirs->getSelection());
}
@@ -987,10 +976,10 @@
QueueFrame::WidgetMenuPtr QueueFrame::makeSingleMenu(QueueItemInfo* qii) {
WidgetMenuPtr menu = createMenu(true);
- menu->appendItem(IDC_SEARCH_ALTERNATES, TSTRING(SEARCH_FOR_ALTERNATES), std::tr1::bind(&QueueFrame::handleSearchAlternates, this));
- menu->appendItem(IDC_BITZI_LOOKUP, TSTRING(LOOKUP_AT_BITZI), std::tr1::bind(&QueueFrame::handleBitziLookup, this));
- menu->appendItem(IDC_COPY_MAGNET, TSTRING(COPY_MAGNET), std::tr1::bind(&QueueFrame::handleCopyMagnet, this));
- menu->appendItem(IDC_MOVE, TSTRING(MOVE), std::tr1::bind(&QueueFrame::handleMove, this));
+ menu->appendItem(IDC_SEARCH_ALTERNATES, T_("Search for alternates"), std::tr1::bind(&QueueFrame::handleSearchAlternates, this));
+ menu->appendItem(IDC_BITZI_LOOKUP, T_("Lookup TTH at Bitzi.com"), std::tr1::bind(&QueueFrame::handleBitziLookup, this));
+ menu->appendItem(IDC_COPY_MAGNET, T_("Copy magnet link to clipboard"), std::tr1::bind(&QueueFrame::handleCopyMagnet, this));
+ menu->appendItem(IDC_MOVE, T_("Move/Rename"), std::tr1::bind(&QueueFrame::handleMove, this));
addPriorityMenu(menu);
addBrowseMenu(menu, qii);
addPMMenu(menu, qii);
@@ -1008,7 +997,7 @@
addPriorityMenu(menu);
- menu->appendItem(IDC_MOVE, TSTRING(MOVE), std::tr1::bind(&QueueFrame::handleMove, this));
+ menu->appendItem(IDC_MOVE, T_("Move/Rename"), std::tr1::bind(&QueueFrame::handleMove, this));
menu->appendSeparatorItem();
menu->appendItem(IDC_REMOVE, TSTRING(REMOVE), std::tr1::bind(&QueueFrame::handleRemove, this));
return menu;
@@ -1018,25 +1007,25 @@
WidgetMenuPtr menu = createMenu(true);
addPriorityMenu(menu);
- menu->appendItem(IDC_MOVE, TSTRING(MOVE), std::tr1::bind(&QueueFrame::handleMove, this));
+ menu->appendItem(IDC_MOVE, T_("Move/Rename"), std::tr1::bind(&QueueFrame::handleMove, this));
menu->appendSeparatorItem();
menu->appendItem(IDC_REMOVE, TSTRING(REMOVE), std::tr1::bind(&QueueFrame::handleRemove, this));
return menu;
}
void QueueFrame::addPriorityMenu(const WidgetMenuPtr& parent) {
- WidgetMenuPtr menu = parent->appendPopup(TSTRING(SET_PRIORITY));
- menu->appendItem(IDC_PRIORITY_PAUSED, TSTRING(PAUSED), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
- menu->appendItem(IDC_PRIORITY_LOWEST, TSTRING(LOWEST), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
- menu->appendItem(IDC_PRIORITY_LOW, TSTRING(LOW), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
- menu->appendItem(IDC_PRIORITY_NORMAL, TSTRING(NORMAL), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
- menu->appendItem(IDC_PRIORITY_HIGH, TSTRING(HIGH), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
- menu->appendItem(IDC_PRIORITY_HIGHEST, TSTRING(HIGHEST), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
+ WidgetMenuPtr menu = parent->appendPopup(T_("Set priority"));
+ menu->appendItem(IDC_PRIORITY_PAUSED, T_("Paused"), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
+ menu->appendItem(IDC_PRIORITY_LOWEST, T_("Lowest"), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
+ menu->appendItem(IDC_PRIORITY_LOW, T_("Low"), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
+ menu->appendItem(IDC_PRIORITY_NORMAL, T_("Normal"), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
+ menu->appendItem(IDC_PRIORITY_HIGH, T_("High"), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
+ menu->appendItem(IDC_PRIORITY_HIGHEST, T_("Highest"), std::tr1::bind(&QueueFrame::handlePriority, this, _1));
}
void QueueFrame::addBrowseMenu(const WidgetMenuPtr& parent, QueueItemInfo* qii) {
unsigned int pos = parent->getCount();
- WidgetMenuPtr menu = parent->appendPopup(TSTRING(GET_FILE_LIST));
+ WidgetMenuPtr menu = parent->appendPopup(T_("Get file list"));
if(addUsers(menu, IDC_BROWSELIST, &QueueFrame::handleBrowseList, qii, false) == 0) {
::EnableMenuItem(menu->handle(), pos, MF_BYPOSITION | MF_GRAYED);
}
@@ -1044,7 +1033,7 @@
void QueueFrame::addPMMenu(const WidgetMenuPtr& parent, QueueItemInfo* qii) {
unsigned int pos = parent->getCount();
- WidgetMenuPtr menu = parent->appendPopup(TSTRING(SEND_PRIVATE_MESSAGE));
+ WidgetMenuPtr menu = parent->appendPopup(T_("Send private message"));
if(addUsers(menu, IDC_PM, &QueueFrame::handlePM, qii, false) == 0) {
::EnableMenuItem(menu->handle(), pos, MF_BYPOSITION | MF_GRAYED);
}
@@ -1052,9 +1041,9 @@
void QueueFrame::addReaddMenu(const WidgetMenuPtr& parent, QueueItemInfo* qii) {
unsigned int pos = parent->getCount();
- WidgetMenuPtr menu = parent->appendPopup(TSTRING(READD_SOURCE));
+ WidgetMenuPtr menu = parent->appendPopup(T_("Re-add source"));
- menu->appendItem(IDC_READD, TSTRING(ALL), std::tr1::bind(&QueueFrame::handleReadd, this, UserPtr()));
+ menu->appendItem(IDC_READD, T_("All"), std::tr1::bind(&QueueFrame::handleReadd, this, UserPtr()));
menu->appendSeparatorItem();
if(addUsers(menu, IDC_READD + 1, &QueueFrame::handleReadd, qii, true) == 0) {
::EnableMenuItem(menu->handle(), pos, MF_BYPOSITION | MF_GRAYED);
@@ -1063,8 +1052,8 @@
void QueueFrame::addRemoveMenu(const WidgetMenuPtr& parent, QueueItemInfo* qii) {
unsigned int pos = parent->getCount();
- WidgetMenuPtr menu = parent->appendPopup(TSTRING(REMOVE_SOURCE));
- menu->appendItem(IDC_REMOVE_SOURCE, TSTRING(ALL), std::tr1::bind(&QueueFrame::handleRemoveSource, this, UserPtr()));
+ WidgetMenuPtr menu = parent->appendPopup(T_("Remove source"));
+ menu->appendItem(IDC_REMOVE_SOURCE, T_("All"), std::tr1::bind(&QueueFrame::handleRemoveSource, this, UserPtr()));
menu->appendSeparatorItem();
if(addUsers(menu, IDC_REMOVE_SOURCE + 1, &QueueFrame::handleRemoveSource, qii, true) == 0) {
::EnableMenuItem(menu->handle(), pos, MF_BYPOSITION | MF_GRAYED);
@@ -1073,7 +1062,7 @@
void QueueFrame::addRemoveAllMenu(const WidgetMenuPtr& parent, QueueItemInfo* qii) {
unsigned int pos = parent->getCount();
- WidgetMenuPtr menu = parent->appendPopup(TSTRING(REMOVE_FROM_ALL));
+ WidgetMenuPtr menu = parent->appendPopup(T_("Remove user from queue"));
if(addUsers(menu, IDC_REMOVE_SOURCES, &QueueFrame::handleRemoveSources, qii, true) == 0) {
::EnableMenuItem(menu->handle(), pos, MF_BYPOSITION | MF_GRAYED);
}
Modified: dcplusplus/trunk/win32/SearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SearchFrame.cpp 2008-01-15 13:54:45 UTC (rev 965)
+++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-01-17 21:48:59 UTC (rev 966)
@@ -83,7 +83,7 @@
}
SearchFrame::SearchFrame(SmartWin::WidgetTabView* mdiParent, const tstring& initialString_, LONGLONG initialSize_, SearchManager::SizeModes initialMode_, SearchManager::TypeModes initialType_) :
- BaseType(mdiParent, TSTRING(SEARCH), SmartWin::IconPtr(new SmartWin::Icon(IDR_SEARCH))),
+ BaseType(mdiParent, T_("Search"), SmartWin::IconPtr(new SmartWin::Icon(IDR_SEARCH))),
searchLabel(0),
searchBox(0),
purge(0),
@@ -114,19 +114,19 @@
cs.exStyle = WS_EX_TRANSPARENT;
searchLabel = createStatic(cs);
- searchLabel->setText(TSTRING(SEARCH_FOR));
+ searchLabel->setText(T_("Search for"));
sizeLabel = createStatic(cs);
- sizeLabel->setText(TSTRING(SIZE));
+ sizeLabel->setText(T_("Size"));
typeLabel = createStatic(cs);
- typeLabel->setText(TSTRING(FILE_TYPE));
+ typeLabel->setText(T_("File type"));
optionLabel = createStatic();
- optionLabel->setText(TSTRING(SEARCH_OPTIONS));
+ optionLabel->setText(T_("Search options"));
hubsLabel = createStatic();
- hubsLabel->setText(TSTRING(HUBS));
+ hubsLabel->setText(T_("Hubs"));
}
@@ -143,7 +143,7 @@
{
WidgetButton::Seed cs = WinUtil::Seeds::button;
cs.style |= BS_DEFPUSHBUTTON;
- cs.caption = TSTRING(SEARCH);
+ cs.caption = T_("Search");
doSearch = createButton(cs);
doSearch->onClicked(std::tr1::bind(&SearchFrame::runSearch, this));
@@ -153,9 +153,9 @@
mode = createComboBox(WinUtil::Seeds::comboBoxStatic);
addWidget(mode);
- mode->addValue(TSTRING(NORMAL));
- mode->addValue(TSTRING(AT_LEAST));
- mode->addValue(TSTRING(AT_MOST));
+ mode->addValue(T_("Normal"));
+ mode->addValue(T_("At least"));
+ mode->addValue(T_("At most"));
}
{
@@ -169,10 +169,10 @@
sizeMode = createComboBox(WinUtil::Seeds::comboBoxStatic);
addWidget(sizeMode);
- sizeMode->addValue(TSTRING(B));
- sizeMode->addValue(TSTRING(KiB));
- sizeMode->addValue(TSTRING(MiB));
- sizeMode->addValue(TSTRING(GiB));
+ sizeMode->addValue(T_("B"));
+ sizeMode->addValue(T_("KiB"));
+ sizeMode->addValue(T_("MiB"));
+ sizeMode->addValue(T_("GiB"));
sizeMode->setSelectedIndex((initialSize == 0) ? 2 : 0);
}
@@ -180,19 +180,19 @@
fileType = createComboBox(WinUtil::Seeds::comboBoxStatic);
addWidget(fileType);
- fileType->addValue(TSTRING(ANY));
- fileType->addValue(TSTRING(AUDIO));
- fileType->addValue(TSTRING(COMPRESSED));
- fileType->addValue(TSTRING(DOCUMENT));
- fileType->addValue(TSTRING(EXECUTABLE));
- fileType->addValue(TSTRING(PICTURE));
- fileType->addValue(TSTRING(VIDEO));
- fileType->addValue(TSTRING(DIRECTORY));
- fileType->addValue(_T("TTH"));
+ fileType->addValue(T_("Any"));
+ fileType->addValue(T_("Audio"));
+ fileType->addValue(T_("Compressed"));
+ fileType->addValue(T_("Document"));
+ fileType->addValue(T_("Executable"));
+ fileType->addValue(T_("Picture"));
+ fileType->addValue(T_("Video"));
+ fileType->addValue(T_("Directory"));
+ fileType->addValue(T_("TTH"));
}
{
- WidgetCheckBox::Seed cs(TSTRING(ONLY_FREE_SLOTS));
+ WidgetCheckBox::Seed cs(T_("Only users with free slots"));
slots = createCheckBox(cs);
slots->setChecked(onlyFree);
@@ -214,7 +214,7 @@
hubs->onRaw(std::tr1::bind(&SearchFrame::handleHubItemChanged, this, _1, _2), SmartWin::Message(WM_NOTIFY, LVN_ITEMCHANGED));
- hubs->insert(new HubInfo(Util::emptyStringT, TSTRING(ONLY_WHERE_OP), false));
+ hubs->insert(new HubInfo(Util::emptyStringT, T_("Only where I'm op"), false));
hubs->setChecked(0, false);
@@ -238,7 +238,7 @@
{
WidgetButton::Seed cs = WinUtil::Seeds::button;
- cs.caption = TSTRING(PURGE);
+ cs.caption = T_("Purge");
purge = createButton(cs);
purge->onClicked(std::tr1::bind(&SearchFrame::handlePurgeClicked, this));
@@ -528,7 +528,7 @@
} else {
columns[COLUMN_FILENAME] = Text::toT(sr->getFileName());
columns[COLUMN_PATH] = Text::toT(sr->getFile());
- columns[COLUMN_TYPE] = TSTRING(DIRECTORY);
+ columns[COLUMN_TYPE] = T_("Directory");
if(sr->getSize() > 0) {
columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(sr->getSize()));
columns[COLUMN_EXACT_SIZE] = Text::toT(Util::formatExactSize(sr->getSize()));
@@ -770,15 +770,15 @@
StringPairList favoriteDirs = FavoriteManager::getInstance()->getFavoriteDirs();
SearchInfo::CheckTTH checkTTH = results->forEachSelectedT(SearchInfo::CheckTTH());
- menu->appendItem(IDC_DOWNLOAD, TSTRING(DOWNLOAD), std::tr1::bind(&SearchFrame::handleDownload, this));
+ menu->appendItem(IDC_DOWNLOAD, T_("Download"), std::tr1::bind(&SearchFrame::handleDownload, this));
addTargetMenu(menu, favoriteDirs, checkTTH);
- menu->appendItem(IDC_DOWNLOADDIR, TSTRING(DOWNLOAD_WHOLE_DIR), std::tr1::bind(&SearchFrame::handleDownloadDir, this));
+ menu->appendItem(IDC_DOWNLOADDIR, T_("Download whole directory"), std::tr1::bind(&SearchFrame::handleDownloadDir, this));
addTargetDirMenu(menu, favoriteDirs);
- menu->appendItem(IDC_VIEW_AS_TEXT, TSTRING(VIEW_AS_TEXT), std::tr1::bind(&SearchFrame::handleViewAsText, this));
+ menu->appendItem(IDC_VIEW_AS_TEXT, T_("View as text"), std::tr1::bind(&SearchFrame::handleViewAsText, this));
menu->appendSeparatorItem();
- menu->appendItem(IDC_SEARCH_ALTERNATES, TSTRING(SEARCH_FOR_ALTERNATES), std::tr1::bind(&SearchFrame::handleSearchAlternates, this));
- menu->appendItem(IDC_BITZI_LOOKUP, TSTRING(LOOKUP_AT_BITZI), std::tr1::bind(&SearchFrame::handleBitziLookup, this));
- menu->appendItem(IDC_COPY_MAGNET, TSTRING(COPY_MAGNET), std::tr1::bind(&SearchFrame::handleCopyMagnet, this));
+ m...
[truncated message content] |
