Author: mkupfer
Date: Sun Jan 18 14:02:41 2009
New Revision: 38909
URL:
http://svn.reactos.org/svn/reactos?rev=38909&view=rev
Log:
- Replace static message text by resource strings.
- Add German translation for those strings.
Modified:
trunk/reactos/dll/cpl/desk/lang/de-DE.rc
trunk/reactos/dll/cpl/desk/lang/en-US.rc
trunk/reactos/dll/cpl/desk/resource.h
trunk/reactos/dll/cpl/desk/settings.c
Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc…
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sun Jan 18 14:02:41 2009
@@ -219,3 +219,10 @@
IDS_ELEMENT_21 "Quickinfo"
IDS_ELEMENT_22 "Symbol"
END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_DISPLAY_SETTINGS "Anzeigeeinstellungen"
+ IDS_APPLY_FAILED "Beim Anwenden Ihrer Änderungen ist ein Fehler
aufgetreten..."
+ IDS_APPLY_NEEDS_RESTART "Sie müssen Ihren Computer neu starten, damit die
Änderungen wirksam werden."
+END
Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc…
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun Jan 18 14:02:41 2009
@@ -221,3 +221,10 @@
IDS_ELEMENT_21 "Quickinfo"
IDS_ELEMENT_22 "Symbol"
END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_DISPLAY_SETTINGS "Display settings"
+ IDS_APPLY_FAILED "Failed to apply new settings..."
+ IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply
changes."
+END
Modified: trunk/reactos/dll/cpl/desk/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun Jan 18 14:02:41 2009
@@ -157,6 +157,11 @@
#define IDS_UNKNOWNMONITOR 3301
#define IDS_ADVANCEDTITLEFMT 3302
+#define IDS_DISPLAY_SETTINGS 3400
+
+#define IDS_APPLY_FAILED 3500
+#define IDS_APPLY_NEEDS_RESTART 3501
+
/* Advanced General Dialog */
#define IDC_FONTSIZE_COMBO 5000
#define IDC_FONTSIZE_COSTOM 5001
Modified: trunk/reactos/dll/cpl/desk/settings.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Jan 18 14:02:41 2009
@@ -627,6 +627,8 @@
PGLOBAL_DATA pGlobalData;
pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
+
+ TCHAR Message[1024], Title[256];
switch(uMsg)
{
@@ -710,14 +712,16 @@
pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsHeight =
pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight;
pGlobalData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel =
pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel;
break;
+ case DISP_CHANGE_RESTART:
+ LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR));
+ LoadString(hApplet, IDS_APPLY_NEEDS_RESTART, Message, sizeof(Message) / sizeof
(TCHAR));
+ MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONINFORMATION);
+ break;
case DISP_CHANGE_FAILED:
- MessageBox(NULL, TEXT("Failed to apply new settings..."),
TEXT("Display settings"), MB_OK | MB_ICONSTOP);
- break;
- case DISP_CHANGE_RESTART:
- MessageBox(NULL, TEXT("You need to restart your computer to apply
changes."), TEXT("Display settings"), MB_OK | MB_ICONINFORMATION);
- break;
default:
- MessageBox(NULL, TEXT("Unknown error when applying new settings..."),
TEXT("Display settings"), MB_OK | MB_ICONSTOP);
+ LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR));
+ LoadString(hApplet, IDS_APPLY_FAILED, Message, sizeof(Message) / sizeof (TCHAR));
+ MessageBox(hwndDlg, Message, Title, MB_OK | MB_ICONSTOP);
break;
}
}