Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [971] dcplusplus/trunk
|
From: <arn...@us...> - 2008-01-21 19:13:14
|
Revision: 971
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=971&view=rev
Author: arnetheduck
Date: 2008-01-21 11:13:08 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Translations, require gettext 0.17 again...
Modified Paths:
--------------
dcplusplus/trunk/Compile.txt
dcplusplus/trunk/SConstruct
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/AdvancedPage.cpp
dcplusplus/trunk/win32/Appearance2Page.cpp
dcplusplus/trunk/win32/AppearancePage.cpp
dcplusplus/trunk/win32/CertificatesPage.cpp
dcplusplus/trunk/win32/CommandDlg.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/DownloadPage.cpp
dcplusplus/trunk/win32/FavHubProperties.cpp
dcplusplus/trunk/win32/FavoriteDirsPage.cpp
dcplusplus/trunk/win32/GeneralPage.cpp
dcplusplus/trunk/win32/HashProgressDlg.cpp
dcplusplus/trunk/win32/LogPage.cpp
dcplusplus/trunk/win32/MagnetDlg.cpp
dcplusplus/trunk/win32/NetworkPage.cpp
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/QueuePage.cpp
dcplusplus/trunk/win32/SystemFrame.h
dcplusplus/trunk/win32/TabsPage.cpp
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/UCPage.cpp
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/WindowsPage.cpp
Modified: dcplusplus/trunk/Compile.txt
===================================================================
--- dcplusplus/trunk/Compile.txt 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/Compile.txt 2008-01-21 19:13:08 UTC (rev 971)
@@ -9,9 +9,6 @@
but if you want to experiment you can try the potentially slower sjlj. After installing gcc, you will
need to go to the bin folder of your mingw installation and copy g++-dw2/sjlj.exe and gcc-dw2/sjlj.exe to g++.exe
and gcc.exe respectively.
- You will also need the gettext tools: gettext-0.16.1-1-bin.tar.bz2, gettext-0.16.1-1-dll.tar.bz2 and
- libiconv-1.11-1-dll.tar.bz2. Extract and make sure they're in your PATH.
-
Note; Make sure gcc/g++ is in your path and before any cygwin installation.
1b) or install Microsoft Visual C++ 8.0 (I don't use it so there might be some compile problems)
@@ -29,7 +26,15 @@
include and library files to the respective directories in the htmlhelp folder. Make sure hhc.exe is
in your PATH.
-4) Open a command prompt and type "scons" followed by some options:
+4) Install gettext (http://www.gnu.org/software/gettext/). The easiest way to do this is to get the
+ precompiled binaries from http://www.gimp.org/~tml/gimp/win32/downloads.html, you'll need
+ gettext-runtime and gettext-tools, at least version 0.17. These links should work:
+ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-0.17.zip
+ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-tools-0.17.zip
+
+ Make sure gettext is in your PATH.
+
+5) Open a command prompt and type "scons" followed by some options:
"tools=mingw" - Use mingw for building (default)
"tools=default" - Use msvc for building (yes, the option value is strange)
"mode=debug" - Compile a debug build (default)
Modified: dcplusplus/trunk/SConstruct
===================================================================
--- dcplusplus/trunk/SConstruct 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/SConstruct 2008-01-21 19:13:08 UTC (rev 971)
@@ -156,7 +156,7 @@
mo_bld = Builder (action = Action([mo_args], 'Compiling message catalog $TARGET from $SOURCES'))
env.Append(BUILDERS = {'MoBuild' : mo_bld})
-pot_args = ['xgettext', '--from-code=UTF-8', '--foreign-user',# '--package-name=$PACKAGE',
+pot_args = ['xgettext', '--from-code=UTF-8', '--foreign-user', '--package-name=$PACKAGE',
'--copyright-holder=Jacek Sieka', '--msgid-bugs-address=dcp...@li...',
'--no-wrap', '--keyword=_', '--keyword=T_', '--keyword=TF_', '--keyword=TFN_:1,2',
'--keyword=F_', '--keyword=gettext_noop', '--keyword=N_', '--boost', '-s',
Modified: dcplusplus/trunk/win32/AboutDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/AboutDlg.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -21,7 +21,6 @@
#include "AboutDlg.h"
#include <dcpp/SimpleXML.h>
-#include <dcpp/ResourceManager.h>
#include <dcpp/version.h>
#include "WinUtil.h"
@@ -57,11 +56,9 @@
setItemText(IDC_VERSION, Text::toT("DC++ " VERSIONSTRING "\n(c) Copyright 2001-2007 Jacek Sieka\nEx-codeveloper: Per Lind\303\251n\nGraphics: Martin Skogevall et al.\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/"));
setItemText(IDC_TTH, WinUtil::tth);
setItemText(IDC_THANKS, Text::toT(thanks));
- setItemText(IDC_TOTALS, Text::toT("Upload: " + Util::formatBytes(SETTING(TOTAL_UPLOAD)) + ", Download: " + Util::formatBytes(SETTING(TOTAL_DOWNLOAD))));
+ setItemText(IDC_TOTALS, str(TF_("Upload: %1%, Download: %2%") % Text::toT(Util::formatBytes(SETTING(TOTAL_UPLOAD))) % Text::toT(Util::formatBytes(SETTING(TOTAL_DOWNLOAD)))));
if(SETTING(TOTAL_DOWNLOAD) > 0) {
- char buf[64];
- sprintf(buf, "Ratio (up/down): %.2f", ((double)SETTING(TOTAL_UPLOAD)) / ((double)SETTING(TOTAL_DOWNLOAD)));
- setItemText(IDC_RATIO, Text::toT(buf));
+ setItemText(IDC_RATIO, str(TF_("Ratio (up/down): %1$0.2f") % (((double)SETTING(TOTAL_UPLOAD)) / ((double)SETTING(TOTAL_DOWNLOAD)))));
}
setItemText(IDC_LATEST, T_("Downloading..."));
Modified: dcplusplus/trunk/win32/Advanced3Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -25,23 +25,21 @@
#include <dcpp/SettingsManager.h>
PropPage::TextItem Advanced3Page::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_B, ResourceManager::B },
- { IDC_SETTINGS_WRITE_BUFFER, ResourceManager::SETTINGS_WRITE_BUFFER },
- { IDC_SETTINGS_KB, ResourceManager::KiB },
- { IDC_SETTINGS_MAX_HASH_SPEED, ResourceManager::SETTINGS_MAX_HASH_SPEED },
- { IDC_SETTINGS_MBS, ResourceManager::MiBPS },
- { IDC_SETTINGS_PM_HISTORY, ResourceManager::SETTINGS_PM_HISTORY },
- { IDC_SETTINGS_SEARCH_HISTORY, ResourceManager::SETTINGS_SEARCH_HISTORY },
- { IDC_SETTINGS_TEXT_MINISLOT, ResourceManager::SETTINGS_TEXT_MINISLOT },
- { IDC_SETTINGS_KB2, ResourceManager::KiB },
- { IDC_SETTINGS_BIND_ADDRESS, ResourceManager::SETTINGS_BIND_ADDRESS },
- { IDC_SETTINGS_MAX_FILELIST_SIZE, ResourceManager::SETTINGS_MAX_FILELIST_SIZE },
- { IDC_SETTINGS_MB, ResourceManager::MiB },
- { IDC_SETTINGS_AUTO_REFRESH_TIME, ResourceManager::SETTINGS_AUTO_REFRESH_TIME },
- { IDC_SETTINGS_AUTO_SEARCH_LIMIT, ResourceManager::SETTINGS_AUTO_SEARCH_LIMIT },
- { IDC_SETTINGS_MIN_SEGMENT_SIZE, ResourceManager::SETTINGS_MIN_SEGMENT_SIZE },
-#endif
+ { IDC_SETTINGS_B, N_("B") },
+ { IDC_SETTINGS_WRITE_BUFFER, N_("Write buffer size") },
+ { IDC_SETTINGS_KB, N_("KiB") },
+ { IDC_SETTINGS_MAX_HASH_SPEED, N_("Max hash speed") },
+ { IDC_SETTINGS_MBS, N_("MiB/s") },
+ { IDC_SETTINGS_PM_HISTORY, N_("PM history") },
+ { IDC_SETTINGS_SEARCH_HISTORY, N_("Search history") },
+ { IDC_SETTINGS_TEXT_MINISLOT, N_("Mini slot size") },
+ { IDC_SETTINGS_KB2, N_("KiB") },
+ { IDC_SETTINGS_BIND_ADDRESS, N_("Bind address") },
+ { IDC_SETTINGS_MAX_FILELIST_SIZE, N_("Max filelist size") },
+ { IDC_SETTINGS_MB, N_("MiB") },
+ { IDC_SETTINGS_AUTO_REFRESH_TIME, N_("Auto refresh time") },
+ { IDC_SETTINGS_AUTO_SEARCH_LIMIT, N_("Auto-search limit") },
+ { IDC_SETTINGS_MIN_SEGMENT_SIZE, N_("Min segment size") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/AdvancedPage.cpp
===================================================================
--- dcplusplus/trunk/win32/AdvancedPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/AdvancedPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -27,27 +27,25 @@
PropPage::Item AdvancedPage::items[] = { { 0, 0, PropPage::T_END } };
AdvancedPage::ListItem AdvancedPage::listItems[] = {
-#ifdef PORT_ME
- { SettingsManager::AUTO_AWAY, ResourceManager::SETTINGS_AUTO_AWAY },
- { SettingsManager::AUTO_FOLLOW, ResourceManager::SETTINGS_AUTO_FOLLOW },
- { SettingsManager::CLEAR_SEARCH, ResourceManager::SETTINGS_CLEAR_SEARCH },
- { SettingsManager::LIST_DUPES, ResourceManager::SETTINGS_LIST_DUPES },
- { SettingsManager::URL_HANDLER, ResourceManager::SETTINGS_URL_HANDLER },
- { SettingsManager::MAGNET_REGISTER, ResourceManager::SETTINGS_URL_MAGNET },
- { SettingsManager::KEEP_LISTS, ResourceManager::SETTINGS_KEEP_LISTS },
- { SettingsManager::AUTO_KICK, ResourceManager::SETTINGS_AUTO_KICK },
- { SettingsManager::SHOW_PROGRESS_BARS, ResourceManager::SETTINGS_SHOW_PROGRESS_BARS },
- { SettingsManager::SFV_CHECK, ResourceManager::SETTINGS_SFV_CHECK },
- { SettingsManager::NO_AWAYMSG_TO_BOTS, ResourceManager::SETTINGS_NO_AWAYMSG_TO_BOTS },
- { SettingsManager::ADLS_BREAK_ON_FIRST, ResourceManager::SETTINGS_ADLS_BREAK_ON_FIRST },
- { SettingsManager::COMPRESS_TRANSFERS, ResourceManager::SETTINGS_COMPRESS_TRANSFERS },
- { SettingsManager::HUB_USER_COMMANDS, ResourceManager::SETTINGS_HUB_USER_COMMANDS },
- { SettingsManager::SEND_UNKNOWN_COMMANDS, ResourceManager::SETTINGS_SEND_UNKNOWN_COMMANDS },
- { SettingsManager::ADD_FINISHED_INSTANTLY, ResourceManager::SETTINGS_ADD_FINISHED_INSTANTLY },
- { SettingsManager::USE_CTRL_FOR_LINE_HISTORY, ResourceManager::SETTINGS_USE_CTRL_FOR_LINE_HISTORY },
- { SettingsManager::AUTO_KICK_NO_FAVS, ResourceManager::SETTINGS_AUTO_KICK_NO_FAVS },
- { SettingsManager::SHOW_SHELL_MENU, ResourceManager::SETTINGS_SHOW_SHELL_MENU },
-#endif
+ { SettingsManager::AUTO_AWAY, N_("Auto-away on minimize (and back on restore)") },
+ { SettingsManager::AUTO_FOLLOW, N_("Automatically follow redirects") },
+ { SettingsManager::CLEAR_SEARCH, N_("Clear search box after each search") },
+ { SettingsManager::LIST_DUPES, N_("Keep duplicate files in your file list") },
+ { SettingsManager::URL_HANDLER, N_("Register with Windows to handle dchub:// and adc:// URL links") },
+ { SettingsManager::MAGNET_REGISTER, N_("Register with Windows to handle magnet: URI links") },
+ { SettingsManager::KEEP_LISTS, N_("Don't delete file lists when exiting") },
+ { SettingsManager::AUTO_KICK, N_("Automatically disconnect users who leave the hub") },
+ { SettingsManager::SHOW_PROGRESS_BARS, N_("Show progress bars for transfers") },
+ { SettingsManager::SFV_CHECK, N_("Enable automatic SFV checking") },
+ { SettingsManager::NO_AWAYMSG_TO_BOTS, N_("Don't send the away message to bots") },
+ { SettingsManager::ADLS_BREAK_ON_FIRST, N_("Break on first ADLSearch match") },
+ { SettingsManager::COMPRESS_TRANSFERS, N_("Enable safe and compressed transfers") },
+ { SettingsManager::HUB_USER_COMMANDS, N_("Accept custom user commands from hub") },
+ { SettingsManager::SEND_UNKNOWN_COMMANDS, N_("Send unknown /commands to the hub") },
+ { SettingsManager::ADD_FINISHED_INSTANTLY, N_("Add finished files to share instantly (if shared)") },
+ { SettingsManager::USE_CTRL_FOR_LINE_HISTORY, N_("Use CTRL for line history") },
+ { SettingsManager::AUTO_KICK_NO_FAVS, N_("Don't automatically disconnect favorite users who leave the hub") },
+ { SettingsManager::SHOW_SHELL_MENU, N_("Show shell menu where possible") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/Appearance2Page.cpp
===================================================================
--- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -26,20 +26,18 @@
#include "WinUtil.h"
PropPage::TextItem Appearance2Page::texts[] = {
-#ifdef PORT_ME
- { IDC_BEEP_NOTIFICATION, ResourceManager::SETTINGS_NOTIFICATION_SOUND },
- { IDC_BROWSE, ResourceManager::BROWSE_ACCEL },
- { IDC_SETTINGS_COLORS, ResourceManager::SETTINGS_COLORS },
- { IDC_SELWINCOLOR, ResourceManager::SETTINGS_SELECT_WINDOW_COLOR },
- { IDC_SELTEXT, ResourceManager::SETTINGS_SELECT_TEXT_FACE },
- { IDC_COLOREXAMPLE, ResourceManager::SETTINGS_EXAMPLE_TEXT },
- { IDC_SETTINGS_REQUIRES_RESTART, ResourceManager::SETTINGS_REQUIRES_RESTART },
- { IDC_SETTINGS_UPLOAD_BAR_COLOR, ResourceManager::UPLOADS },
- { IDC_SETTINGS_SOUNDS, ResourceManager::SETTINGS_SOUNDS },
- { IDC_PRIVATE_MESSAGE_BEEP, ResourceManager::SETTINGS_PM_BEEP },
- { IDC_PRIVATE_MESSAGE_BEEP_OPEN, ResourceManager::SETTINGS_PM_BEEP_OPEN },
- { IDC_SETTINGS_DOWNLOAD_BAR_COLOR, ResourceManager::DOWNLOADS },
-#endif
+ { IDC_BEEP_NOTIFICATION, N_("Notification sound") },
+ { IDC_BROWSE, N_("&Browse...") },
+ { IDC_SETTINGS_COLORS, N_("Colors") },
+ { IDC_SELWINCOLOR, N_("Select &window color") },
+ { IDC_SELTEXT, N_("Select &text style") },
+ { IDC_COLOREXAMPLE, N_("Donate \342\202\254\342\202\254\342\202\254:s! (ok, dirty dollars are fine as well =) (see help menu)") },
+ { IDC_SETTINGS_REQUIRES_RESTART, N_("Note; most of these options require that you restart DC++") },
+ { IDC_SETTINGS_UPLOAD_BAR_COLOR, N_("Uploads") },
+ { IDC_SETTINGS_SOUNDS, N_("Sounds") },
+ { IDC_PRIVATE_MESSAGE_BEEP, N_("Make an annoying sound every time a private message is received") },
+ { IDC_PRIVATE_MESSAGE_BEEP_OPEN, N_("Make an annoying sound when a private message window is opened") },
+ { IDC_SETTINGS_DOWNLOAD_BAR_COLOR, N_("Downloads") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/AppearancePage.cpp
===================================================================
--- dcplusplus/trunk/win32/AppearancePage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/AppearancePage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -28,13 +28,11 @@
#include "WinUtil.h"
PropPage::TextItem AppearancePage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_APPEARANCE_OPTIONS, ResourceManager::SETTINGS_OPTIONS },
- { IDC_SETTINGS_DEFAULT_AWAY_MSG, ResourceManager::SETTINGS_DEFAULT_AWAY_MSG },
- { IDC_SETTINGS_TIME_STAMPS_FORMAT, ResourceManager::SETTINGS_TIME_STAMPS_FORMAT },
- { IDC_SETTINGS_LANGUAGE_FILE, ResourceManager::SETTINGS_LANGUAGE_FILE },
- { IDC_SETTINGS_REQUIRES_RESTART, ResourceManager::SETTINGS_REQUIRES_RESTART },
-#endif
+ { IDC_SETTINGS_APPEARANCE_OPTIONS, N_("Options") },
+ { IDC_SETTINGS_DEFAULT_AWAY_MSG, N_("Default away message") },
+ { IDC_SETTINGS_TIME_STAMPS_FORMAT, N_("Set timestamps") },
+ { IDC_SETTINGS_LANGUAGE_FILE, N_("Language file") },
+ { IDC_SETTINGS_REQUIRES_RESTART, N_("Note; most of these options require that you restart DC++") },
{ 0, 0 }
};
@@ -45,19 +43,17 @@
};
PropPage::ListItem AppearancePage::listItems[] = {
-#ifdef PORT_ME
- { SettingsManager::ALT_SORT_ORDER, ResourceManager::SETTINGS_ALT_SORT_ORDER },
- { SettingsManager::FILTER_MESSAGES, ResourceManager::SETTINGS_FILTER_MESSAGES },
- { SettingsManager::MINIMIZE_TRAY, ResourceManager::SETTINGS_MINIMIZE_TRAY },
- { SettingsManager::TIME_STAMPS, ResourceManager::SETTINGS_TIME_STAMPS },
- { SettingsManager::STATUS_IN_CHAT, ResourceManager::SETTINGS_STATUS_IN_CHAT },
- { SettingsManager::SHOW_JOINS, ResourceManager::SETTINGS_SHOW_JOINS },
- { SettingsManager::FAV_SHOW_JOINS, ResourceManager::SETTINGS_FAV_SHOW_JOINS },
- { SettingsManager::SORT_FAVUSERS_FIRST, ResourceManager::SETTINGS_SORT_FAVUSERS_FIRST },
- { SettingsManager::USE_SYSTEM_ICONS, ResourceManager::SETTINGS_USE_SYSTEM_ICONS },
- { SettingsManager::USE_OEM_MONOFONT, ResourceManager::SETTINGS_USE_OEM_MONOFONT },
- { SettingsManager::GET_USER_COUNTRY, ResourceManager::SETTINGS_GET_USER_COUNTRY },
-#endif
+ { SettingsManager::ALT_SORT_ORDER, N_("Sort all downloads first") },
+ { SettingsManager::FILTER_MESSAGES, N_("Filter kick and NMDC debug messages") },
+ { SettingsManager::MINIMIZE_TRAY, N_("Minimize to tray") },
+ { SettingsManager::TIME_STAMPS, N_("Show timestamps in chat by default") },
+ { SettingsManager::STATUS_IN_CHAT, N_("View status messages in main chat") },
+ { SettingsManager::SHOW_JOINS, N_("Show joins / parts in chat by default") },
+ { SettingsManager::FAV_SHOW_JOINS, N_("Only show joins / parts for favorite users") },
+ { SettingsManager::SORT_FAVUSERS_FIRST, N_("Sort favorite users first") },
+ { SettingsManager::USE_SYSTEM_ICONS, N_("Use system icons when browsing files (slows browsing down a bit)") },
+ { SettingsManager::USE_OEM_MONOFONT, N_("Use OEM monospaced font for viewing text files") },
+ { SettingsManager::GET_USER_COUNTRY, N_("Guess user country from IP") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/CertificatesPage.cpp
===================================================================
--- dcplusplus/trunk/win32/CertificatesPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/CertificatesPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -38,11 +38,9 @@
};
PropPage::ListItem CertificatesPage::listItems[] = {
-#ifdef PORT_ME
- { SettingsManager::USE_TLS, ResourceManager::SETTINGS_USE_TLS },
- { SettingsManager::ALLOW_UNTRUSTED_HUBS, ResourceManager::SETTINGS_ALLOW_UNTRUSTED_HUBS },
- { SettingsManager::ALLOW_UNTRUSTED_CLIENTS, ResourceManager::SETTINGS_ALLOW_UNTRUSTED_CLIENTS, },
-#endif
+ { SettingsManager::USE_TLS, N_("Use TLS when remote client supports it") },
+ { SettingsManager::ALLOW_UNTRUSTED_HUBS, N_("Allow TLS connections to hubs without trusted certificate") },
+ { SettingsManager::ALLOW_UNTRUSTED_CLIENTS, N_("Allow TLS connections to clients without trusted certificate") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/CommandDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/CommandDlg.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/CommandDlg.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -22,7 +22,6 @@
#include "CommandDlg.h"
-#include <dcpp/ResourceManager.h>
#include <dcpp/UserCommand.h>
#include <dcpp/NmdcHub.h>
#include <dcpp/version.h>
Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -25,7 +25,6 @@
#include "resource.h"
-#include <dcpp/ResourceManager.h>
#include <dcpp/ADLSearch.h>
#include <dcpp/FavoriteManager.h>
#include <dcpp/File.h>
Modified: dcplusplus/trunk/win32/DownloadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -27,21 +27,19 @@
#include "HubListsDlg.h"
PropPage::TextItem DownloadPage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_DIRECTORIES, ResourceManager::SETTINGS_DIRECTORIES },
- { IDC_SETTINGS_DOWNLOAD_DIRECTORY, ResourceManager::SETTINGS_DOWNLOAD_DIRECTORY },
- { IDC_BROWSEDIR, ResourceManager::BROWSE_ACCEL },
- { IDC_SETTINGS_UNFINISHED_DOWNLOAD_DIRECTORY, ResourceManager::SETTINGS_UNFINISHED_DOWNLOAD_DIRECTORY },
- { IDC_BROWSETEMPDIR, ResourceManager::BROWSE },
- { IDC_SETTINGS_DOWNLOAD_LIMITS, ResourceManager::SETTINGS_DOWNLOAD_LIMITS },
- { IDC_SETTINGS_DOWNLOADS_MAX, ResourceManager::SETTINGS_DOWNLOADS_MAX },
- { IDC_SETTINGS_DOWNLOADS_SPEED_PAUSE, ResourceManager::SETTINGS_DOWNLOADS_SPEED_PAUSE },
- { IDC_SETTINGS_SPEEDS_NOT_ACCURATE, ResourceManager::SETTINGS_SPEEDS_NOT_ACCURATE },
- { IDC_SETTINGS_PUBLIC_HUB_LIST, ResourceManager::SETTINGS_PUBLIC_HUB_LIST },
- { IDC_SETTINGS_PUBLIC_HUB_LIST_URL, ResourceManager::SETTINGS_PUBLIC_HUB_LIST_URL },
- { IDC_SETTINGS_LIST_CONFIG, ResourceManager::SETTINGS_CONFIGURE_HUB_LISTS },
- { IDC_SETTINGS_PUBLIC_HUB_LIST_HTTP_PROXY, ResourceManager::SETTINGS_PUBLIC_HUB_LIST_HTTP_PROXY },
-#endif
+ { IDC_SETTINGS_DIRECTORIES, N_("Directories") },
+ { IDC_SETTINGS_DOWNLOAD_DIRECTORY, N_("Default download directory") },
+ { IDC_BROWSEDIR, N_("&Browse...") },
+ { IDC_SETTINGS_UNFINISHED_DOWNLOAD_DIRECTORY, N_("Unfinished downloads directory") },
+ { IDC_BROWSETEMPDIR, N_("Browse...") },
+ { IDC_SETTINGS_DOWNLOAD_LIMITS, N_("Limits") },
+ { IDC_SETTINGS_DOWNLOADS_MAX, N_("Maximum simultaneous downloads (0 = infinite)") },
+ { IDC_SETTINGS_DOWNLOADS_SPEED_PAUSE, N_("No new downloads if speed exceeds (KiB/s, 0 = disable)") },
+ { IDC_SETTINGS_SPEEDS_NOT_ACCURATE, N_("Note; because of changing download speeds, this is not 100% accurate...") },
+ { IDC_SETTINGS_PUBLIC_HUB_LIST, N_("Public Hubs list") },
+ { IDC_SETTINGS_PUBLIC_HUB_LIST_URL, N_("Public Hubs list URL") },
+ { IDC_SETTINGS_LIST_CONFIG, N_("Configure Public Hub Lists") },
+ { IDC_SETTINGS_PUBLIC_HUB_LIST_HTTP_PROXY, N_("HTTP Proxy (for hublist only)") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/FavHubProperties.cpp
===================================================================
--- dcplusplus/trunk/win32/FavHubProperties.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/FavHubProperties.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -23,7 +23,6 @@
#include "FavHubProperties.h"
#include <dcpp/FavoriteManager.h>
-#include <dcpp/ResourceManager.h>
#include <dcpp/version.h>
FavHubProperties::FavHubProperties(SmartWin::Widget* parent, FavoriteHubEntry *_entry) :
Modified: dcplusplus/trunk/win32/FavoriteDirsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -29,12 +29,10 @@
#include "LineDlg.h"
PropPage::TextItem FavoriteDirsPage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_FAVORITE_DIRECTORIES, ResourceManager::SETTINGS_FAVORITE_DIRS },
- { IDC_REMOVE, ResourceManager::REMOVE },
- { IDC_ADD, ResourceManager::SETTINGS_ADD_FOLDER },
- { IDC_RENAME, ResourceManager::SETTINGS_RENAME_FOLDER },
-#endif
+ { IDC_SETTINGS_FAVORITE_DIRECTORIES, N_("Favorite download directories") },
+ { IDC_REMOVE, N_("&Remove") },
+ { IDC_ADD, N_("&Add folder") },
+ { IDC_RENAME, N_("Rename") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/GeneralPage.cpp
===================================================================
--- dcplusplus/trunk/win32/GeneralPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/GeneralPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -25,14 +25,12 @@
#include <dcpp/SettingsManager.h>
PropPage::TextItem GeneralPage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_PERSONAL_INFORMATION, ResourceManager::SETTINGS_PERSONAL_INFORMATION },
- { IDC_SETTINGS_NICK, ResourceManager::NICK },
- { IDC_SETTINGS_EMAIL, ResourceManager::EMAIL },
- { IDC_SETTINGS_DESCRIPTION, ResourceManager::DESCRIPTION },
- { IDC_SETTINGS_UPLOAD_LINE_SPEED, ResourceManager::SETTINGS_UPLOAD_LINE_SPEED },
- { IDC_SETTINGS_MEBIBITS, ResourceManager::MiBITSPS },
-#endif
+ { IDC_SETTINGS_PERSONAL_INFORMATION, N_("Personal Information") },
+ { IDC_SETTINGS_NICK, N_("Nick") },
+ { IDC_SETTINGS_EMAIL, N_("E-Mail") },
+ { IDC_SETTINGS_DESCRIPTION, N_("Description") },
+ { IDC_SETTINGS_UPLOAD_LINE_SPEED, N_("Line speed (upload)") },
+ { IDC_SETTINGS_MEBIBITS, N_("MiBits/s") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/HashProgressDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -23,7 +23,6 @@
#include "HashProgressDlg.h"
#include <dcpp/HashManager.h>
-#include <dcpp/ResourceManager.h>
HashProgressDlg::HashProgressDlg(SmartWin::Widget* parent, bool aAutoClose) :
SmartWin::WidgetFactory<SmartWin::WidgetModalDialog>(parent),
@@ -81,24 +80,24 @@
}
double diff = tick - startTime;
if(diff < 1000 || files == 0 || bytes == 0) {
- ::SetDlgItemText(handle(), IDC_FILES_PER_HOUR, Text::toT("-.-- " + STRING(FILES_PER_HOUR) + ", " + Util::toString((uint32_t)files) + " " + STRING(FILES_LEFT)).c_str());
- ::SetDlgItemText(handle(), IDC_HASH_SPEED, Text::toT("-.-- B/s, " + Util::formatBytes(bytes) + " " + STRING(LEFT)).c_str());
- ::SetDlgItemText(handle(), IDC_TIME_LEFT, Text::toT("-:--:-- " + STRING(LEFT)).c_str());
+ ::SetDlgItemText(handle(), IDC_FILES_PER_HOUR, str(TF_("-.-- files/h, %1% files left") % (uint32_t)files).c_str());
+ ::SetDlgItemText(handle(), IDC_HASH_SPEED, str(TF_("-.-- B/s, %1% left") % Text::toT(Util::formatBytes(bytes))).c_str());
+ ::SetDlgItemText(handle(), IDC_TIME_LEFT, CT_("-:--:-- left"));
progress->setPosition(0);
} else {
double filestat = (((double)(startFiles - files)) * 60 * 60 * 1000) / diff;
double speedStat = (((double)(startBytes - bytes)) * 1000) / diff;
- ::SetDlgItemText(handle(), IDC_FILES_PER_HOUR, Text::toT(Util::toString(filestat) + " " + STRING(FILES_PER_HOUR) + ", " + Util::toString((uint32_t)files) + " " + STRING(FILES_LEFT)).c_str());
- ::SetDlgItemText(handle(), IDC_HASH_SPEED, Text::toT(Util::formatBytes((int64_t)speedStat) + "/s, " + Util::formatBytes(bytes) + " " + STRING(LEFT)).c_str());
+ ::SetDlgItemText(handle(), IDC_FILES_PER_HOUR, str(TF_("%1% files/h, %2% files left") % filestat % (uint32_t)files).c_str());
+ ::SetDlgItemText(handle(), IDC_HASH_SPEED, str(TF_("%1%/s, %2% left") % Text::toT(Util::formatBytes((int64_t)speedStat)) % Text::toT(Util::formatBytes(bytes))).c_str());
if(filestat == 0 || speedStat == 0) {
- ::SetDlgItemText(handle(), IDC_TIME_LEFT, Text::toT("-:--:-- " + STRING(LEFT)).c_str());
+ ::SetDlgItemText(handle(), IDC_TIME_LEFT, CT_("-:--:-- left"));
} else {
double fs = files * 60 * 60 / filestat;
double ss = bytes / speedStat;
- ::SetDlgItemText(handle(), IDC_TIME_LEFT, Text::toT(Util::formatSeconds((int64_t)(fs + ss) / 2) + " " + STRING(LEFT)).c_str());
+ ::SetDlgItemText(handle(), IDC_TIME_LEFT, str(TF_("%1% left") % Text::toT(Util::formatSeconds((int64_t)(fs + ss) / 2))).c_str());
}
}
Modified: dcplusplus/trunk/win32/LogPage.cpp
===================================================================
--- dcplusplus/trunk/win32/LogPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/LogPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -28,13 +28,11 @@
#include "WinUtil.h"
PropPage::TextItem LogPage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_LOGGING, ResourceManager::SETTINGS_LOGGING },
- { IDC_SETTINGS_LOG_DIR, ResourceManager::DIRECTORY },
- { IDC_BROWSE_LOG, ResourceManager::BROWSE_ACCEL },
- { IDC_SETTINGS_FORMAT, ResourceManager::SETTINGS_FORMAT },
- { IDC_SETTINGS_FILE_NAME, ResourceManager::SETTINGS_FILE_NAME },
-#endif
+ { IDC_SETTINGS_LOGGING, N_("Logging") },
+ { IDC_SETTINGS_LOG_DIR, N_("Directory") },
+ { IDC_BROWSE_LOG, N_("&Browse...") },
+ { IDC_SETTINGS_FORMAT, N_("Format") },
+ { IDC_SETTINGS_FILE_NAME, N_("Filename") },
{ 0, 0 }
};
@@ -44,15 +42,13 @@
};
PropPage::ListItem LogPage::listItems[] = {
-#ifdef PORT_ME
- { SettingsManager::LOG_MAIN_CHAT, ResourceManager::SETTINGS_LOG_MAIN_CHAT },
- { SettingsManager::LOG_PRIVATE_CHAT, ResourceManager::SETTINGS_LOG_PRIVATE_CHAT },
- { SettingsManager::LOG_DOWNLOADS, ResourceManager::SETTINGS_LOG_DOWNLOADS },
- { SettingsManager::LOG_UPLOADS, ResourceManager::SETTINGS_LOG_UPLOADS },
- { SettingsManager::LOG_SYSTEM, ResourceManager::SETTINGS_LOG_SYSTEM_MESSAGES },
- { SettingsManager::LOG_STATUS_MESSAGES, ResourceManager::SETTINGS_LOG_STATUS_MESSAGES },
- { SettingsManager::LOG_FILELIST_TRANSFERS, ResourceManager::SETTINGS_LOG_FILELIST_TRANSFERS },
-#endif
+ { SettingsManager::LOG_MAIN_CHAT, N_("Log main chat") },
+ { SettingsManager::LOG_PRIVATE_CHAT, N_("Log private chat") },
+ { SettingsManager::LOG_DOWNLOADS, N_("Log downloads") },
+ { SettingsManager::LOG_UPLOADS, N_("Log uploads") },
+ { SettingsManager::LOG_SYSTEM, N_("Log system messages") },
+ { SettingsManager::LOG_STATUS_MESSAGES, N_("Log status messages") },
+ { SettingsManager::LOG_FILELIST_TRANSFERS, N_("Log filelist transfers") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/MagnetDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/MagnetDlg.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/MagnetDlg.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -22,7 +22,6 @@
#include "MagnetDlg.h"
-#include <dcpp/ResourceManager.h>
#include "WinUtil.h"
MagnetDlg::MagnetDlg(SmartWin::Widget* parent, const tstring& aHash, const tstring& aFileName) :
Modified: dcplusplus/trunk/win32/NetworkPage.cpp
===================================================================
--- dcplusplus/trunk/win32/NetworkPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/NetworkPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -27,27 +27,25 @@
#include "WinUtil.h"
PropPage::TextItem NetworkPage::texts[] = {
-#ifdef PORT_ME
- { IDC_DIRECT, ResourceManager::SETTINGS_DIRECT },
- { IDC_DIRECT_OUT, ResourceManager::SETTINGS_DIRECT },
- { IDC_FIREWALL_UPNP, ResourceManager::SETTINGS_FIREWALL_UPNP },
- { IDC_FIREWALL_NAT, ResourceManager::SETTINGS_FIREWALL_NAT },
- { IDC_FIREWALL_PASSIVE, ResourceManager::SETTINGS_FIREWALL_PASSIVE },
- { IDC_OVERRIDE, ResourceManager::SETTINGS_OVERRIDE },
- { IDC_SOCKS5, ResourceManager::SETTINGS_SOCKS5 },
- { IDC_SETTINGS_PORTS, ResourceManager::SETTINGS_PORTS },
- { IDC_SETTINGS_IP, ResourceManager::SETTINGS_EXTERNAL_IP },
- { IDC_SETTINGS_PORT_TCP, ResourceManager::SETTINGS_TCP_PORT },
- { IDC_SETTINGS_PORT_UDP, ResourceManager::SETTINGS_UDP_PORT },
- { IDC_SETTINGS_PORT_TLS, ResourceManager::SETTINGS_TLS_PORT },
- { IDC_SETTINGS_SOCKS5_IP, ResourceManager::SETTINGS_SOCKS5_IP },
- { IDC_SETTINGS_SOCKS5_PORT, ResourceManager::SETTINGS_SOCKS5_PORT },
- { IDC_SETTINGS_SOCKS5_USERNAME, ResourceManager::SETTINGS_SOCKS5_USERNAME },
- { IDC_SETTINGS_SOCKS5_PASSWORD, ResourceManager::PASSWORD },
- { IDC_SOCKS_RESOLVE, ResourceManager::SETTINGS_SOCKS5_RESOLVE },
- { IDC_SETTINGS_INCOMING, ResourceManager::SETTINGS_INCOMING },
- { IDC_SETTINGS_OUTGOING, ResourceManager::SETTINGS_OUTGOING },
-#endif
+ { IDC_DIRECT, N_("Direct connection") },
+ { IDC_DIRECT_OUT, N_("Direct connection") },
+ { IDC_FIREWALL_UPNP, N_("Firewall with UPnP") },
+ { IDC_FIREWALL_NAT, N_("Firewall with manual port forwarding") },
+ { IDC_FIREWALL_PASSIVE, N_("Firewall (passive, last resort)") },
+ { IDC_OVERRIDE, N_("Don't allow hub/UPnP to override") },
+ { IDC_SOCKS5, N_("SOCKS5") },
+ { IDC_SETTINGS_PORTS, N_("Ports") },
+ { IDC_SETTINGS_IP, N_("External / WAN IP") },
+ { IDC_SETTINGS_PORT_TCP, N_("TCP") },
+ { IDC_SETTINGS_PORT_UDP, N_("UDP") },
+ { IDC_SETTINGS_PORT_TLS, N_("TLS") },
+ { IDC_SETTINGS_SOCKS5_IP, N_("Socks IP") },
+ { IDC_SETTINGS_SOCKS5_PORT, N_("Port") },
+ { IDC_SETTINGS_SOCKS5_USERNAME, N_("Login") },
+ { IDC_SETTINGS_SOCKS5_PASSWORD, N_("Password") },
+ { IDC_SOCKS_RESOLVE, N_("Use SOCKS5 server to resolve host names") },
+ { IDC_SETTINGS_INCOMING, N_("Incoming connection settings (see Help/FAQ if unsure)") },
+ { IDC_SETTINGS_OUTGOING, N_("Outgoing connection settings") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -26,7 +26,6 @@
#include "HubListsDlg.h"
#include <dcpp/FavoriteManager.h>
-#include <dcpp/ResourceManager.h>
#include <dcpp/version.h>
int PublicHubsFrame::columnIndexes[] = {
Modified: dcplusplus/trunk/win32/QueuePage.cpp
===================================================================
--- dcplusplus/trunk/win32/QueuePage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/QueuePage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -25,30 +25,28 @@
#include <dcpp/SettingsManager.h>
PropPage::TextItem QueuePage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_AUTOPRIO, ResourceManager::SETTINGS_PRIO_AUTOPRIO },
- { IDC_SETTINGS_PRIO_HIGHEST, ResourceManager::SETTINGS_PRIO_HIGHEST },
- { IDC_SETTINGS_KB3, ResourceManager::KiB },
- { IDC_SETTINGS_PRIO_HIGH, ResourceManager::SETTINGS_PRIO_HIGH },
- { IDC_SETTINGS_KB4, ResourceManager::KiB },
- { IDC_SETTINGS_PRIO_NORMAL, ResourceManager::SETTINGS_PRIO_NORMAL },
- { IDC_SETTINGS_KB5, ResourceManager::KiB },
- { IDC_SETTINGS_PRIO_LOW, ResourceManager::SETTINGS_PRIO_LOW },
- { IDC_SETTINGS_KB6, ResourceManager::KiB },
- { IDC_SETTINGS_AUTODROP, ResourceManager::SETTINGS_AUTODROP_AUTODROPSETTINGS },
- { IDC_SETTINGS_AUTODROP_SPEED, ResourceManager::SETTINGS_AUTODROP_SPEED },
- { IDC_SETTINGS_BPS, ResourceManager::BPS },
- { IDC_SETTINGS_AUTODROP_INTERVAL, ResourceManager::SETTINGS_AUTODROP_INTERVAL },
- { IDC_SETTINGS_S1, ResourceManager::S },
- { IDC_SETTINGS_AUTODROP_ELAPSED, ResourceManager::SETTINGS_AUTODROP_ELAPSED },
- { IDC_SETTINGS_S2, ResourceManager::S },
- { IDC_SETTINGS_AUTODROP_INACTIVITY, ResourceManager::SETTINGS_AUTODROP_INACTIVITY },
- { IDC_SETTINGS_S3, ResourceManager::S },
- { IDC_SETTINGS_AUTODROP_MINSOURCES, ResourceManager::SETTINGS_AUTODROP_MINSOURCES },
- { IDC_SETTINGS_AUTODROP_FILESIZE, ResourceManager::SETTINGS_AUTODROP_FILESIZE },
- { IDC_SETTINGS_KB7, ResourceManager::KiB },
- { IDC_SETTINGS_OTHER_QUEUE_OPTIONS, ResourceManager::SETTINGS_OTHER_QUEUE_OPTIONS },
-#endif
+ { IDC_SETTINGS_AUTOPRIO, N_("Auto priority settings") },
+ { IDC_SETTINGS_PRIO_HIGHEST, N_("Highest prio max size") },
+ { IDC_SETTINGS_KB3, N_("KiB") },
+ { IDC_SETTINGS_PRIO_HIGH, N_("High prio max size") },
+ { IDC_SETTINGS_KB4, N_("KiB") },
+ { IDC_SETTINGS_PRIO_NORMAL, N_("Normal prio max size") },
+ { IDC_SETTINGS_KB5, N_("KiB") },
+ { IDC_SETTINGS_PRIO_LOW, N_("Low prio max size") },
+ { IDC_SETTINGS_KB6, N_("KiB") },
+ { IDC_SETTINGS_AUTODROP, N_("Autodrop settings") },
+ { IDC_SETTINGS_AUTODROP_SPEED, N_("Drop sources below") },
+ { IDC_SETTINGS_BPS, N_("B/s") },
+ { IDC_SETTINGS_AUTODROP_INTERVAL, N_("Check every") },
+ { IDC_SETTINGS_S1, N_("s") },
+ { IDC_SETTINGS_AUTODROP_ELAPSED, N_("Min elapsed") },
+ { IDC_SETTINGS_S2, N_("s") },
+ { IDC_SETTINGS_AUTODROP_INACTIVITY, N_("Max inactivity") },
+ { IDC_SETTINGS_S3, N_("s") },
+ { IDC_SETTINGS_AUTODROP_MINSOURCES, N_("Min sources online") },
+ { IDC_SETTINGS_AUTODROP_FILESIZE, N_("Min filesize") },
+ { IDC_SETTINGS_KB7, N_("KiB") },
+ { IDC_SETTINGS_OTHER_QUEUE_OPTIONS, N_("Other queue options") },
{ 0, 0 }
};
@@ -67,18 +65,16 @@
};
PropPage::ListItem QueuePage::optionItems[] = {
-#ifdef PORT_ME
- { SettingsManager::PRIO_LOWEST, ResourceManager::SETTINGS_PRIO_LOWEST },
- { SettingsManager::AUTODROP_ALL, ResourceManager::SETTINGS_AUTODROP_ALL },
- { SettingsManager::AUTODROP_FILELISTS, ResourceManager::SETTINGS_AUTODROP_FILELISTS },
- { SettingsManager::AUTODROP_DISCONNECT, ResourceManager::SETTINGS_AUTODROP_DISCONNECT },
- { SettingsManager::AUTO_SEARCH, ResourceManager::SETTINGS_AUTO_SEARCH },
- { SettingsManager::AUTO_SEARCH_AUTO_MATCH, ResourceManager::SETTINGS_AUTO_SEARCH_AUTO_MATCH },
- { SettingsManager::SKIP_ZERO_BYTE, ResourceManager::SETTINGS_SKIP_ZERO_BYTE },
- { SettingsManager::DONT_DL_ALREADY_SHARED, ResourceManager::SETTINGS_DONT_DL_ALREADY_SHARED },
- { SettingsManager::DONT_DL_ALREADY_QUEUED, ResourceManager::SETTINGS_DONT_DL_ALREADY_QUEUED },
- { SettingsManager::ANTI_FRAG, ResourceManager::SETTINGS_ANTI_FRAG },
-#endif
+ { SettingsManager::PRIO_LOWEST, N_("Set lowest prio for newly added files larger than Low prio size") },
+ { SettingsManager::AUTODROP_ALL, N_("Autodrop slow sources for all queue items (except filelists)") },
+ { SettingsManager::AUTODROP_FILELISTS, N_("Remove slow filelists") },
+ { SettingsManager::AUTODROP_DISCONNECT, N_("Don't remove the source when autodropping, only disconnect") },
+ { SettingsManager::AUTO_SEARCH, N_("Automatically search for alternative download locations") },
+ { SettingsManager::AUTO_SEARCH_AUTO_MATCH, N_("Automatically match queue for auto search hits") },
+ { SettingsManager::SKIP_ZERO_BYTE, N_("Skip zero-byte files") },
+ { SettingsManager::DONT_DL_ALREADY_SHARED, N_("Don't download files already in share") },
+ { SettingsManager::DONT_DL_ALREADY_QUEUED, N_("Don't download files already in the queue") },
+ { SettingsManager::ANTI_FRAG, N_("Use antifragmentation method for downloads") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/SystemFrame.h
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.h 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/SystemFrame.h 2008-01-21 19:13:08 UTC (rev 971)
@@ -22,7 +22,6 @@
#include "StaticFrame.h"
#include <dcpp/LogManager.h>
-#include <dcpp/ResourceManager.h>
#include "resource.h"
class SystemFrame : public StaticFrame<SystemFrame>,
Modified: dcplusplus/trunk/win32/TabsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/TabsPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/TabsPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -29,23 +29,19 @@
};
PropPage::TextItem TabsPage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_BOLD_CONTENTS, ResourceManager::SETTINGS_BOLD_OPTIONS },
-#endif
+ { IDC_SETTINGS_BOLD_CONTENTS, N_("Tab highlight on content change") },
{ 0, 0 }
};
PropPage::ListItem TabsPage::listItems[] = {
-#ifdef PORT_ME
- { SettingsManager::BOLD_HUB, ResourceManager::HUB },
- { SettingsManager::BOLD_PM, ResourceManager::PRIVATE_MESSAGE },
- { SettingsManager::BOLD_SEARCH, ResourceManager::SEARCH },
- { SettingsManager::BOLD_SYSTEM_LOG, ResourceManager::SYSTEM_LOG },
- { SettingsManager::BOLD_QUEUE, ResourceManager::DOWNLOAD_QUEUE },
- { SettingsManager::BOLD_FINISHED_DOWNLOADS, ResourceManager::FINISHED_DOWNLOADS },
- { SettingsManager::BOLD_WAITING_USERS, ResourceManager::WAITING_USERS },
- { SettingsManager::BOLD_FINISHED_UPLOADS, ResourceManager::FINISHED_UPLOADS },
-#endif
+ { SettingsManager::BOLD_HUB, N_("Hub") },
+ { SettingsManager::BOLD_PM, N_("Private message") },
+ { SettingsManager::BOLD_SEARCH, N_("Search") },
+ { SettingsManager::BOLD_SYSTEM_LOG, N_("System Log") },
+ { SettingsManager::BOLD_QUEUE, N_("Download Queue") },
+ { SettingsManager::BOLD_FINISHED_DOWNLOADS, N_("Finished Downloads") },
+ { SettingsManager::BOLD_WAITING_USERS, N_("Waiting Users") },
+ { SettingsManager::BOLD_FINISHED_UPLOADS, N_("Finished Uploads") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -23,7 +23,6 @@
#include "WinUtil.h"
#include "HoldRedraw.h"
-#include <dcpp/ResourceManager.h>
#include <dcpp/SettingsManager.h>
#include <dcpp/ConnectionManager.h>
#include <dcpp/DownloadManager.h>
Modified: dcplusplus/trunk/win32/UCPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UCPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/UCPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -29,12 +29,10 @@
PropPage::TextItem UCPage::texts[] = {
{ IDC_MOVE_UP, N_("Move &Up") },
-#ifdef PORT_ME
- { IDC_MOVE_DOWN, ResourceManager::MOVE_DOWN },
- { IDC_ADD_MENU, ResourceManager::ADD },
- { IDC_CHANGE_MENU, ResourceManager::SETTINGS_CHANGE },
- { IDC_REMOVE_MENU, ResourceManager::REMOVE },
-#endif
+ { IDC_MOVE_DOWN, N_("Move &Down") },
+ { IDC_ADD_MENU, N_("&Add") },
+ { IDC_CHANGE_MENU, N_("&Change") },
+ { IDC_REMOVE_MENU, N_("&Remove") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/UploadPage.cpp
===================================================================
--- dcplusplus/trunk/win32/UploadPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/UploadPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -30,18 +30,16 @@
#include "HashProgressDlg.h"
PropPage::TextItem UploadPage::texts[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_SHARED_DIRECTORIES, ResourceManager::SETTINGS_SHARED_DIRECTORIES },
- { IDC_SETTINGS_SHARE_SIZE, ResourceManager::SETTINGS_SHARE_SIZE },
- { IDC_SHAREHIDDEN, ResourceManager::SETTINGS_SHARE_HIDDEN },
- { IDC_REMOVE, ResourceManager::REMOVE },
- { IDC_ADD, ResourceManager::SETTINGS_ADD_FOLDER },
- { IDC_RENAME, ResourceManager::SETTINGS_RENAME_FOLDER },
- { IDC_SETTINGS_UPLOADS_MIN_SPEED, ResourceManager::SETTINGS_UPLOADS_MIN_SPEED },
- { IDC_SETTINGS_KBPS, ResourceManager::KiBPS },
- { IDC_SETTINGS_UPLOADS_SLOTS, ResourceManager::SETTINGS_UPLOADS_SLOTS },
- { IDC_SETTINGS_ONLY_HASHED, ResourceManager::SETTINGS_ONLY_HASHED },
-#endif
+ { IDC_SETTINGS_SHARED_DIRECTORIES, N_("Shared directories") },
+ { IDC_SETTINGS_SHARE_SIZE, N_("Total size:") },
+ { IDC_SHAREHIDDEN, N_("Share hidden files") },
+ { IDC_REMOVE, N_("&Remove") },
+ { IDC_ADD, N_("&Add folder") },
+ { IDC_RENAME, N_("Rename") },
+ { IDC_SETTINGS_UPLOADS_MIN_SPEED, N_("Automatically open an extra slot if speed is below (0 = disable)") },
+ { IDC_SETTINGS_KBPS, N_("KiB/s") },
+ { IDC_SETTINGS_UPLOADS_SLOTS, N_("Upload slots") },
+ { IDC_SETTINGS_ONLY_HASHED, N_("Note; Files appear in the share only after they've been hashed!") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/WindowsPage.cpp
===================================================================
--- dcplusplus/trunk/win32/WindowsPage.cpp 2008-01-19 23:29:06 UTC (rev 970)
+++ dcplusplus/trunk/win32/WindowsPage.cpp 2008-01-21 19:13:08 UTC (rev 971)
@@ -27,54 +27,46 @@
PropPage::Item WindowsPage::items[] = { { 0, 0, PropPage::T_END } };
PropPage::TextItem WindowsPage::textItem[] = {
-#ifdef PORT_ME
- { IDC_SETTINGS_AUTO_OPEN, ResourceManager::SETTINGS_AUTO_OPEN },
- { IDC_SETTINGS_WINDOWS_OPTIONS, ResourceManager::SETTINGS_WINDOWS_OPTIONS },
- { IDC_SETTINGS_CONFIRM_OPTIONS, ResourceManager::SETTINGS_CONFIRM_DIALOG_OPTIONS },
-#endif
+ { IDC_SETTINGS_AUTO_OPEN, N_("Auto-open at startup") },
+ { IDC_SETTINGS_WINDOWS_OPTIONS, N_("Window options") },
+ { IDC_SETTINGS_CONFIRM_OPTIONS, N_("Confirm dialog options") },
{ 0, 0 }
};
WindowsPage::ListItem WindowsPage::listItems[] = {
-#ifdef PORT_ME
- { SettingsManager::OPEN_SYSTEM_LOG, ResourceManager::SYSTEM_LOG },
- { SettingsManager::OPEN_FAVORITE_USERS, ResourceManager::FAVORITE_USERS },
- { SettingsManager::OPEN_QUEUE, ResourceManager::DOWNLOAD_QUEUE },
- { SettingsManager::OPEN_FINISHED_DOWNLOADS, ResourceManager::FINISHED_DOWNLOADS },
- { SettingsManager::OPEN_WAITING_USERS, ResourceManager::WAITING_USERS },
- { SettingsManager::OPEN_FINISHED_UPLOADS, ResourceManager::FINISHED_UPLOADS },
- { SettingsManager::OPEN_SEARCH_SPY, ResourceManager::SEARCH_SPY },
- { SettingsManager::OPEN_NETWORK_STATISTICS, ResourceManager::NETWORK_STATISTICS },
- { SettingsManager::OPEN_NOTEPAD, ResourceManager::NOTEPAD },
- { SettingsManager::OPEN_PUBLIC, ResourceManager::PUBLIC_HUBS },
- { SettingsManager::OPEN_FAVORITE_HUBS, ResourceManager::FAVORITE_HUBS },
- { SettingsManager::OPEN_DOWNLOADS, ResourceManager::DOWNLOADS },
-#endif
+ { SettingsManager::OPEN_SYSTEM_LOG, N_("System Log") },
+ { SettingsManager::OPEN_FAVORITE_USERS, N_("Favorite Users") },
+ { SettingsManager::OPEN_QUEUE, N_("Download Queue") },
+ { SettingsManager::OPEN_FINISHED_DOWNLOADS, N_("Finished Downloads") },
+ { SettingsManager::OPEN_WAITING_USERS, N_("Waiting Users") },
+ { SettingsManager::OPEN_FINISHED_UPLOADS, N_("Finished Uploads") },
+ { SettingsManager::OPEN_SEARCH_SPY, N_("Search Spy") },
+ { SettingsManager::OPEN_NETWORK_STATISTICS, N_("Network Statistics") },
+ { SettingsManager::OPEN_NOTEPAD, N_("Notepad") },
+ { SettingsManager::OPEN_PUBLIC, N_("Public Hubs") },
+ { SettingsManager::OPEN_FAVORITE_HUBS, N_("Favorite Hubs") },
+ { SettingsManager::OPEN_DOWNLOADS, N_("Downloads") },
{ 0, 0 }
};
WindowsPage::ListItem WindowsPage::optionItems[] = {
-#ifdef PORT_ME
- { SettingsManager::POPUP_PMS, ResourceManager::SETTINGS_POPUP_PMS },
- { SettingsManager::POPUP_HUB_PMS, ResourceManager::SETTINGS_POPUP_HUB_PMS },
- { SettingsManager::POPUP_BOT_PMS, ResourceManager::SETTINGS_POPUP_BOT_PMS },
- { SettingsManager::POPUNDER_FILELIST, ResourceManager::SETTINGS_POPUNDER_FILELIST },
- { SettingsManager::POPUNDER_PM, ResourceManager::SETTINGS_POPUNDER_PM },
- { SettingsManager::JOIN_OPEN_NEW_WINDOW, ResourceManager::SETTINGS_OPEN_NEW_WINDOW },
- { SettingsManager::IGNORE_HUB_PMS, ResourceManager::SETTINGS_IGNORE_HUB_PMS },
- { SettingsManager::IGNORE_BOT_PMS, ResourceManager::SETTINGS_IGNORE_BOT_PMS },
- { SettingsManager::TOGGLE_ACTIVE_WINDOW, ResourceManager::SETTINGS_TOGGLE_ACTIVE_WINDOW },
- { SettingsManager::PROMPT_PASSWORD, ResourceManager::SETTINGS_PROMPT_PASSWORD },
-#endif
+ { SettingsManager::POPUP_PMS, N_("Open private messages in their own window") },
+ { SettingsManager::POPUP_HUB_PMS, N_("Open private messages from bots in their own window") },
+ { SettingsManager::POPUP_BOT_PMS, N_("Open private messages from the hub in their own window") },
+ { SettingsManager::POPUNDER_FILELIST, N_("Open new file list windows in the background") },
+ { SettingsManager::POPUNDER_PM, N_("Open new private message windows in the background") },
+ { SettingsManager::JOIN_OPEN_NEW_WINDOW, N_("Open new window when using /join") },
+ { SettingsManager::IGNORE_HUB_PMS, N_("Ignore private messages from the hub") },
+ { SettingsManager::IGNORE_BOT_PMS, N_("Ignore private messages from bots") },
+ { SettingsManager::TOGGLE_ACTIVE_WINDOW, N_("Toggle window when selecting an active tab") },
+ { SettingsManager::PROMPT_PASSWORD, N_("Popup box to input password for hubs") },
{ 0, 0 }
};
WindowsPage::ListItem WindowsPage::confirmItems[] = {
-#ifdef PORT_ME
- { SettingsManager::CONFIRM_EXIT, ResourceManager::SETTINGS_CONFIRM_EXIT },
- { SettingsManager::CONFIRM_HUB_REMOVAL, ResourceManager::SETTINGS_CONFIRM_HUB_REMOVAL },
- { SettingsManager::CONFIRM_ITEM_REMOVAL, ResourceManager::SETTINGS_CONFIRM_ITEM_REMOVAL },
-#endif
+ { SettingsManager::CONFIRM_EXIT, N_("Confirm application exit") },
+ { SettingsManager::CONFIRM_HUB_REMOVAL, N_("Confirm favorite hub removal") },
+ { SettingsManager::CONFIRM_ITEM_REMOVAL, N_("Confirm item removal in download queue") },
{ 0, 0 }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
