28 May
2016
28 May
'16
10:05 p.m.
Author: hbelusca
Date: Sat May 28 22:05:48 2016
New Revision: 71450
URL: http://svn.reactos.org/svn/reactos?rev=71450&view=rev
Log:
[DESK.CPL]
- Fix french translation;
- Whitespace fix.
Modified:
trunk/reactos/dll/cpl/desk/advappdlg.c
trunk/reactos/dll/cpl/desk/lang/fr-FR.rc
Modified: trunk/reactos/dll/cpl/desk/advappdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Sat May 28 22:05:48 2016
@@ -24,30 +24,32 @@
/* This const assigns the color and metric numbers to the elements from the elements list
*/
-/* Size 1 (width) Size 2 (height) Color 1 Color 2
Font Fontcolor */
+/* Size 1 (width) Size 2 (height) Color 1 Color 2
Font Fontcolor */
const ASSIGNMENT g_Assignment[NUM_ELEMENTS] =
-{ {-1, -1, COLOR_DESKTOP, -1,
-1, -1}, /* -Desktop */
- {SIZE_CAPTION_HEIGHT, -1, COLOR_INACTIVECAPTION,
COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, -1}, /* inactive window
caption */
- {SIZE_BORDER_WIDTH, -1, COLOR_INACTIVEBORDER, -1,
-1, -1}, /* inactive window border */
- {SIZE_CAPTION_HEIGHT, -1, COLOR_ACTIVECAPTION,
COLOR_GRADIENTACTIVECAPTION, FONT_CAPTION, COLOR_CAPTIONTEXT}, /* -active window
caption */
- {SIZE_BORDER_WIDTH, -1, COLOR_ACTIVEBORDER, -1,
-1, -1}, /* active window border */
- {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_MENU, -1,
FONT_MENU, COLOR_MENUTEXT}, /* menu */
- {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_HIGHLIGHT, -1,
-1, COLOR_HIGHLIGHTTEXT},/* marked element */
- {-1, -1, COLOR_WINDOW, -1
/*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */
- {SIZE_SCROLL_WIDTH, SIZE_SCROLL_HEIGHT, COLOR_SCROLLBAR, -1,
-1, -1}, /* scroll bar */
- {-1, -1, COLOR_3DFACE, -1,
-1, COLOR_BTNTEXT}, /* 3d objects */
- {SIZE_SM_CAPTION_HEIGHT, -1, -1, -1,
FONT_SMCAPTION, -1}, /* palette window caption */
- {-1, -1, -1, -1,
-1, -1}, /* symbol caption FIXME: Access? */
- {SIZE_CAPTION_HEIGHT, -1, -1, -1,
-1, -1}, /* caption bar */
- {-1, -1, -1, -1,
-1, COLOR_GRAYTEXT}, /* inactive menu item FIXME: Access?
*/
- {-1, -1, -1, -1,
FONT_MESSAGE, COLOR_WINDOWTEXT}, /* dialog */
- {-1, -1, -1, -1,
-1, -1}, /* scrollbar controls FIXME: Access?
*/
- {-1, -1, COLOR_APPWORKSPACE, -1,
-1, -1}, /* application background */
- {-1, -1, -1, -1,
-1, -1}, /* small caption bar FIXME: Access? */
- {SIZE_ICON_SPACE_X, -1, -1, -1,
-1, -1}, /* symbol distance horiz. */
- {SIZE_ICON_SPACE_Y, -1, -1, -1,
-1, -1}, /* symbol distance vert. */
- {-1, -1, COLOR_INFOBK, -1,
FONT_STATUS, COLOR_INFOTEXT}, /* quickinfo */
- {SIZE_ICON, -1, -1, -1,
FONT_ICON, -1}}; /* symbol */
+{
+ {-1, -1, COLOR_DESKTOP, -1,
-1, -1}, /* Desktop */
+ {SIZE_CAPTION_HEIGHT, -1, COLOR_INACTIVECAPTION,
COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, -1}, /* inactive window
caption */
+ {SIZE_BORDER_WIDTH, -1, COLOR_INACTIVEBORDER, -1,
-1, -1}, /* inactive window border */
+ {SIZE_CAPTION_HEIGHT, -1, COLOR_ACTIVECAPTION,
COLOR_GRADIENTACTIVECAPTION, FONT_CAPTION, COLOR_CAPTIONTEXT}, /* active window
caption */
+ {SIZE_BORDER_WIDTH, -1, COLOR_ACTIVEBORDER, -1,
-1, -1}, /* active window border */
+ {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_MENU, -1,
FONT_MENU, COLOR_MENUTEXT}, /* menu */
+ {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_HIGHLIGHT, -1,
-1, COLOR_HIGHLIGHTTEXT},/* marked element */
+ {-1, -1, COLOR_WINDOW, -1
/*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */
+ {SIZE_SCROLL_WIDTH, SIZE_SCROLL_HEIGHT, COLOR_SCROLLBAR, -1,
-1, -1}, /* scroll bar */
+ {-1, -1, COLOR_3DFACE, -1,
-1, COLOR_BTNTEXT}, /* 3d objects */
+ {SIZE_SM_CAPTION_HEIGHT, -1, -1, -1,
FONT_SMCAPTION, -1}, /* palette window caption */
+ {-1, -1, -1, -1,
-1, -1}, /* symbol caption -- FIXME: Access?
*/
+ {SIZE_CAPTION_HEIGHT, -1, -1, -1,
-1, -1}, /* caption bar */
+ {-1, -1, -1, -1,
-1, COLOR_GRAYTEXT}, /* inactive menu item -- FIXME:
Access? */
+ {-1, -1, -1, -1,
FONT_MESSAGE, COLOR_WINDOWTEXT}, /* dialog */
+ {-1, -1, -1, -1,
-1, -1}, /* scrollbar controls -- FIXME:
Access? */
+ {-1, -1, COLOR_APPWORKSPACE, -1,
-1, -1}, /* application background */
+ {-1, -1, -1, -1,
-1, -1}, /* small caption bar -- FIXME:
Access? */
+ {SIZE_ICON_SPACE_X, -1, -1, -1,
-1, -1}, /* symbol distance horiz. */
+ {SIZE_ICON_SPACE_Y, -1, -1, -1,
-1, -1}, /* symbol distance vert. */
+ {-1, -1, COLOR_INFOBK, -1,
FONT_STATUS, COLOR_INFOTEXT}, /* quickinfo */
+ {SIZE_ICON, -1, -1, -1,
FONT_ICON, -1} /* symbol */
+};
/******************************************************************************/
@@ -357,7 +359,6 @@
SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0,
(LPARAM)&g->SchemeAdv);
-
/* Add the elements to the combo */
for (iElement = 0; iElement < NUM_ELEMENTS; iElement++)
{
Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc…
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sat May 28 22:05:48 2016
@@ -229,7 +229,7 @@
STRINGTABLE
BEGIN
IDS_ELEMENT_1 "Bureau"
- IDS_ELEMENT_2 "Titre de fenêtres actives"
+ IDS_ELEMENT_2 "Titre de fenêtres inactives"
IDS_ELEMENT_3 "Bord de fenêtres inactives"
IDS_ELEMENT_4 "Titre de fenêtres actives"
IDS_ELEMENT_5 "Bord de fenêtres actives"
@@ -238,7 +238,7 @@
IDS_ELEMENT_8 "Fenêtres"
IDS_ELEMENT_9 "Barres de défilement"
IDS_ELEMENT_10 "Objets 3D "
- IDS_ELEMENT_11 "Palette title"
+ IDS_ELEMENT_11 "Titre de palette"
IDS_ELEMENT_12 "Titre d'icône"
IDS_ELEMENT_13 "Barre de titre"
IDS_ELEMENT_14 "Ãléments de menu désactivés"