[ros-diffs] [spetreolle] 51244: [CMAKE] Merge r51243.

Author: spetreolle
Date: Sun Apr  3 20:36:28 2011
New Revision: 51244

URL: http://svn.reactos.org/svn/reactos?rev=51244&view=rev
Log:
[CMAKE]
Merge r51243.

Added:
    branches/cmake-bringup/dll/cpl/console/lang/fr-FR.rc
      - copied unchanged from r51243, trunk/reactos/dll/cpl/console/lang/fr-FR.rc
Removed:
    branches/cmake-bringup/dll/cpl/console/lang/fr-Fr.rc

Removed: branches/cmake-bringup/dll/cpl/console/lang/fr-Fr.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/console/l…
==============================================================================
--- branches/cmake-bringup/dll/cpl/console/lang/fr-Fr.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/console/lang/fr-Fr.rc (removed)
@@ -1,148 +1,0 @@
-/*
- * PROJECT:         ReactOS Console Configuration DLL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            dll/cpl/console/lang/fr-FR.rc
- * PURPOSE:         French resource file
- * TRANSLATOR:      Jason Toscano <JasonGenie(a)gmail.com>
- */
-
-#include <commctrl.h>
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Options"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	GROUPBOX "Taille du curseur", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE |
WS_GROUP
-	CONTROL "&Petit", IDC_RADIO_SMALL_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10
-	CONTROL "&Moyen", IDC_RADIO_MEDIUM_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10
-	CONTROL "&Grand", IDC_RADIO_LARGE_CURSOR, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10
-	GROUPBOX "Options d'affichage", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE
| WS_GROUP
-	CONTROL "&Fenêtre", IDC_RADIO_DISPLAY_WINDOW, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10
-	CONTROL "P&lein écran", IDC_RADIO_DISPLAY_FULL, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10
-	GROUPBOX "Historique des commandes", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE
| WS_GROUP
-	LTEXT "Taille du &buffer :", -1, 14, 101, 70, 12
-	EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15
-	LTEXT "&Nombre de buffers :", -1, 14, 124, 70, 12
-	EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15
-	CHECKBOX "&Se débarrasser des vielles copies",
IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15
-	GROUPBOX "Options d'édition", -1, 133, 85, 112, 77, BS_GROUPBOX |
WS_CHILD | WS_VISIBLE | WS_GROUP
-	CHECKBOX "M&ode d'édition rapide", IDC_CHECK_QUICK_EDIT, 140, 97,
102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	CHECKBOX "Mode &insertion", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Police"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	LTEXT "Fenêtre de Prévisualisation :", -1, 10, 10, 94, 10
-	LTEXT "Taille :", -1, 180, 10, 36, 10
-	CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 10, 20, 163, 74
-	LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
-	LTEXT "&Police :", -1, 10, 105, 33, 10
-	CHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
-	LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
-	GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
-	CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW |
SS_SUNKEN, 16, 165, 95, 35
-	LTEXT "Chaque caractère est :", -1, 124, 166, 75, 10
-	LTEXT "largeur du pixel\nhauteur du pixel", -1, 136, 180, 101, 20
-	LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10
-	LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10
-END
-
-IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Disposition"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	LTEXT "Fenêtre de Prévisualisation :", -1, 8, 6, 95, 10
-	CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN |
SS_OWNERDRAW, 8, 16, 115, 70
-	GROUPBOX "Taille du buffer de l'écran", -1, 130, 12, 115, 50
-	LTEXT "&Largeur :", -1, 140, 28, 40, 10
-	LTEXT "&Hauteur :", -1, 140, 46, 39, 10
-	EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 25, 13, 14
-	EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 42, 13, 14
-	GROUPBOX "Taille de la fenêtre", -1, 130, 65, 115, 47
-	LTEXT "&L&argeur :", -1, 140, 78, 39, 10
-	LTEXT "&H&auteur :", -1, 140, 95, 37, 10
-	EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 75, 13, 14
-	EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 92, 13, 14
-	GROUPBOX "Position de la Fenêtre", -1, 130, 116, 115, 64
-	LTEXT "&Gauche :", -1, 140, 132, 38, 10
-	LTEXT "&En haut :", -1, 140, 149, 40, 10
-	EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 128, 13, 14
-	EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,
238, 146, 13, 14
-	CHECKBOX "Laisser le système &positionner la fenêtre",
IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10
-END
-
-IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220
-STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Couleurs"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	CONTROL "&Texte à l'écran", IDC_RADIO_SCREEN_TEXT,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112,
10
-	CONTROL "Fond de l'&écran", IDC_RADIO_SCREEN_BACKGROUND,
"Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112,
10
-	CONTROL "Texte du &popup", IDC_RADIO_POPUP_TEXT, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10
-	CONTROL "Fond du Pop&up", IDC_RADIO_POPUP_BACKGROUND, "Button",
BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10
-	GROUPBOX "Valeurs de couleur séléctionnées", -1, 129, 7, 118, 73
-	LTEXT "&Rouge :", -1, 140, 25, 48, 10
-	EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14
-	LTEXT "&Vert :", -1, 140, 42, 48, 10
-	EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14
-	LTEXT "&Bleu :", -1, 140, 60, 48, 10
-	EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP
-	CONTROL  "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14
-	CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 17, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 31, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 45, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 59, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 73, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 87, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 101, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 115, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 129, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 143, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 157, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 171, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 185, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 199, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 213, 90, 12, 12
-	CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN |
SS_OWNERDRAW, 227, 90, 12, 12
-	GROUPBOX "Couleurs de l'écran sélectionneés", -1, 7, 111, 240, 40
-	CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 124, 224, 20
-	GROUPBOX "Couleurs du popup sélectionneés", -1, 7, 162, 240, 40
-	CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW |
SS_SUNKEN, 15, 176, 224, 20
-END
-
-IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79
-STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "Appliquer propriétés"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	CONTROL "&Appliquer les propriétés à la fenêtre actuelle seulement",
IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE |
WS_TABSTOP, 12, 12, 207, 10
-	CONTROL "&Enregistrer les propriétés pour les prochaines fenêtres avec le
même titre", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10
-	PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE
-	PUSHBUTTON "Cancel", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE
-END
-
-STRINGTABLE
-BEGIN
-	IDS_CPLNAME "Console"
-	IDS_CPLDESCRIPTION "Configurer les propriétés de la console."
-	IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window"
-	IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM          <DIR>     10-01-99    
5:00\nSYSTEM32      <DIR>     10-01-99     5:00"
-	IDS_RASTERFONTS "Polices Raster"
-END