Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1042] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-16 16:28:34
|
Revision: 1042
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1042&view=rev
Author: arnetheduck
Date: 2008-03-16 09:28:29 -0700 (Sun, 16 Mar 2008)
Log Message:
-----------
i18n fixes
Modified Paths:
--------------
dcplusplus/trunk/SConstruct
dcplusplus/trunk/dcpp/SConscript
dcplusplus/trunk/win32/AboutDlg.cpp
dcplusplus/trunk/win32/Advanced3Page.cpp
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/SConscript
dcplusplus/trunk/win32/resource.h
Modified: dcplusplus/trunk/SConstruct
===================================================================
--- dcplusplus/trunk/SConstruct 2008-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/SConstruct 2008-03-16 16:28:29 UTC (rev 1042)
@@ -160,7 +160,7 @@
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',
+ '--keyword=F_', '--keyword=gettext_noop', '--keyword=N_', '--keyword=CT_', '--boost', '-s',
'--output=$TARGET', '$SOURCES']
pot_bld = Builder (action = Action([pot_args], 'Extracting messages to $TARGET from $SOURCES'))
Modified: dcplusplus/trunk/dcpp/SConscript
===================================================================
--- dcplusplus/trunk/dcpp/SConscript 2008-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/dcpp/SConscript 2008-03-16 16:28:29 UTC (rev 1042)
@@ -39,8 +39,10 @@
env.Append(CPPDEFINES=["BUILDING_DCPP=1"])
-dev.i18n(source_path, env, sources, 'libdcpp')
+headers=dev.get_sources(source_path, "*.h")
+dev.i18n(source_path, env, [sources, headers], 'libdcpp')
+
ret = env.StaticLibrary(target, sources)
Return('ret')
Modified: dcplusplus/trunk/win32/AboutDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/AboutDlg.cpp 2008-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/win32/AboutDlg.cpp 2008-03-16 16:28:29 UTC (rev 1042)
@@ -53,12 +53,20 @@
}
bool AboutDlg::handleInitDialog() {
- setItemText(IDC_VERSION, Text::toT("DC++ " VERSIONSTRING "\n(c) Copyright 2001-2008 Jacek Sieka\nEx-codeveloper: Per Lind\303\251n\nGraphics: Martin Skogevall et al.\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/"));
- attachTextBox(IDC_TTH)->setText(WinUtil::tth);
- attachTextBox(IDC_THANKS)->setText(Text::toT(thanks));
+ setText(T_("About DC++"));
+
+ setItemText(IDC_VERSION, Text::toT(APPNAME " " VERSIONSTRING) + T_("\n(c) Copyright 2001-2008 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, str(TF_("Upload: %1%, Download: %2%") % Text::toT(Util::formatBytes(SETTING(TOTAL_UPLOAD))) % Text::toT(Util::formatBytes(SETTING(TOTAL_DOWNLOAD)))));
+ setItemText(IDC_GREETZ, T_("Greetz and Contributors"));
+ setItemText(IDC_TOTALS, T_("Totals"));
+ setItemText(IDC_LATEST_VERSION, T_("Latest stable version"));
+
if(SETTING(TOTAL_DOWNLOAD) > 0) {
setItemText(IDC_RATIO, str(TF_("Ratio (up/down): %1$0.2f") % (((double)SETTING(TOTAL_UPLOAD)) / ((double)SETTING(TOTAL_DOWNLOAD)))));
+ } else {
+ setItemText(IDC_RATIO, str(TF_("No transfers yet") % (((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-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-03-16 16:28:29 UTC (rev 1042)
@@ -40,6 +40,8 @@
{ 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") },
+ { IDC_SETTINGS_SOCKET_IN_BUFFER, N_("Socket read buffer") },
+ { IDC_SETTINGS_SOCKET_OUT_BUFFER, N_("Socket write buffer") },
{ 0, 0 }
};
Modified: dcplusplus/trunk/win32/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-03-16 16:28:29 UTC (rev 1042)
@@ -94,10 +94,10 @@
GROUPBOX "",IDC_STATIC,7,7,229,102
EDITTEXT IDC_TTH,35,93,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
LTEXT "TTH:",IDC_STATIC,13,93,18,12
- GROUPBOX "Greetz && Contributors",IDC_STATIC,7,112,229,82,BS_CENTER
- GROUPBOX "Latest version",IDC_STATIC,7,239,229,24,BS_CENTER
+ GROUPBOX "Greetz and Contributors",IDC_GREETZ,7,112,229,82,BS_CENTER
+ GROUPBOX "Latest stable version",IDC_LATEST_VERSION,7,239,229,24,BS_CENTER
CTEXT "0.xxx",IDC_LATEST,13,250,218,8
- GROUPBOX "Totals",IDC_STATIC,7,197,229,39,BS_CENTER
+ GROUPBOX "Totals",IDC_TOTALS,7,197,229,39,BS_CENTER
CTEXT "Upload: xx.xx MiB, Download: xx.xx MiB",IDC_TOTALS,13,208,218,8
CTEXT "Ratio (Up/Down): x.xx",IDC_RATIO,13,221,218,8
EDITTEXT IDC_THANKS,13,122,218,66,ES_MULTILINE | ES_READONLY | WS_VSCROLL
Modified: dcplusplus/trunk/win32/SConscript
===================================================================
--- dcplusplus/trunk/win32/SConscript 2008-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/win32/SConscript 2008-03-16 16:28:29 UTC (rev 1042)
@@ -14,7 +14,8 @@
env.Append(CPPPATH=['#/openssl/include', "#/smartwin/include", "#/"])
env.Append(LIBPATH=["#/openssl/lib"])
-dev.i18n(source_path, env, sources, 'dcpp-win32')
+headers=dev.get_sources(source_path, "*.h")
+dev.i18n(source_path, env, [sources,headers], 'dcpp-win32')
ret = env.Program(target, [sources, res, dev.client, dev.zlib, dev.bzip2, dev.smartwin, dev.boost, dev.intl])
Return('ret')
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-03-14 22:26:18 UTC (rev 1041)
+++ dcplusplus/trunk/win32/resource.h 2008-03-16 16:28:29 UTC (rev 1042)
@@ -449,5 +449,7 @@
#define IDC_SETTINGS_PAGES 2291
#define IDC_SETTINGS_MIN_SEGMENT_SIZE 2292
#define IDC_MIN_SEGMENT_SIZE 2293
+#define IDC_GREETZ 2294
+#define IDC_LATEST_VERSION 2295
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
