Revise patch applied earlier: put Ok on left and Cancel on right.
(Also fix French dialog which was left out before.)
Src: Merge.rc
Src/Languages: */Merge*.rc
BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
(Wrap multimon def with ifndef
Src: MainFrm.cpp
+ PATCH: [ 1423461 ] Rearrange language select dialog
+ Revise patch applied earlier: put Ok on left and Cancel on right.
+ (Also fix French dialog which was left out before.)
+ Src: Merge.rc
+ Src/Languages: */Merge*.rc
2006-02-03 Perry
PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
CAPTION "Idiomas"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Cancelar",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Cancelar",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Idiomas disponíveis:",IDC_STATIC,7,7,140,8
CAPTION "Åçèê"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "Äîáðå",IDOK,115,123,52,14
- PUSHBUTTON "Ïðåêðàòè",IDCANCEL,30,123,52,14
+ PUSHBUTTON "Äîáðå",IDOK,30,123,52,14
+ PUSHBUTTON "Ïðåêðàòè",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Âúçìîæíè åçèöè:",IDC_STATIC,7,7,140,8
CAPTION "Idioma"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "D'acord",IDOK,115,123,52,14
- PUSHBUTTON "Cancel·la",IDCANCEL,30,123,52,14
+ PUSHBUTTON "D'acord",IDOK,30,123,52,14
+ PUSHBUTTON "Cancel·la",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Idiomes disponibles:",IDC_STATIC,7,7,140,8
CAPTION "ÓïÑÔ"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "È·¶¨",IDOK,115,123,52,14
- PUSHBUTTON "È¡Ïû",IDCANCEL,30,123,52,14
+ PUSHBUTTON "È·¶¨",IDOK,30,123,52,14
+ PUSHBUTTON "È¡Ïû",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "¿ÉÓõÄÓïÑÔ:",IDC_STATIC,7,7,140,8
CAPTION "»y¨¥"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "½T©w",IDOK,115,123,52,14
- PUSHBUTTON "¨ú®ø",IDCANCEL,30,123,52,14
+ PUSHBUTTON "½T©w",IDOK,30,123,52,14
+ PUSHBUTTON "¨ú®ø",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "¥i¥Îªº»y¨¥:",IDC_STATIC,7,7,140,8
CAPTION "Jazyk"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Storno",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Storno",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Dostupné jazyky:",IDC_STATIC,7,7,140,8
CAPTION "Sprog"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Afbryd",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Afbryd",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Tilgængelige sprog:",IDC_STATIC,7,7,140,8
CAPTION "Taalkeuze"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Annuleren",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Annuleren",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Beschikbare talen",IDC_STATIC,7,7,140,8
IDC_STATIC,7,124,168,31
END
-IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 111
+IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "Langage"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,154,16,52,14
- PUSHBUTTON "Ann&uler",IDCANCEL,154,33,52,14
- LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Ann&uler",IDCANCEL,115,123,52,14
+ LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Langages disponibles :",IDC_STATIC,7,7,140,8
END
CAPTION "Sprache"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Abbrechen",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Abbrechen",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Verfügbare Sprachen:",IDC_STATIC,7,7,140,8
CAPTION "Nyelv"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "Rendben",IDOK,115,123,52,14
- PUSHBUTTON "Mégsem",IDCANCEL,30,123,52,14
+ PUSHBUTTON "Rendben",IDOK,30,123,52,14
+ PUSHBUTTON "Mégsem",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Választható nyelvek:",IDC_STATIC,7,7,140,8
CAPTION "Lingua"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Annulla",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Annulla",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Lingue disponibili:",IDC_STATIC,7,7,140,8
CAPTION "\8c¾\8cê"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "\8eg\97p\89Â\94\\82È\8c¾\8cê:",IDC_STATIC,7,7,140,8
CAPTION "¾ð¾î"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "È®ÀÎ",IDOK,115,123,52,14
- PUSHBUTTON "Ãë¼Ò",IDCANCEL,30,123,52,14
+ PUSHBUTTON "È®ÀÎ",IDOK,30,123,52,14
+ PUSHBUTTON "Ãë¼Ò",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "¼±Åà °¡´ÉÇÑ ¾ð¾î:",IDC_STATIC,7,7,140,8
CAPTION "Språk"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Avbryt",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Avbryt",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Tilgjengelige språk:",IDC_STATIC,7,7,140,8
CAPTION "Jêzyk"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Anuluj",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Anuluj",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Dostêpne jêzyki:",IDC_STATIC,7,7,140,8
CAPTION "ßçûê"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Îòìåíà",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Îòìåíà",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Äîñòóïíûå ÿçûêè:",IDC_STATIC,7,7,140,8
CAPTION "Jazyk"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Storno",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Storno",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Dostupné jazyky:",IDC_STATIC,7,7,140,8
CAPTION "Idioma"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "Aceptar",IDOK,115,123,52,14
- PUSHBUTTON "Cancelar",IDCANCEL,30,123,52,14
+ PUSHBUTTON "Aceptar",IDOK,30,123,52,14
+ PUSHBUTTON "Cancelar",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Idiomas disponibles:",IDC_STATIC,7,7,140,8
CAPTION "Språk"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Avbryt",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Avbryt",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Tillgängliga språk:",IDC_STATIC,7,7,140,8
CAPTION "Language"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Cancel",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Cancel",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Available languages:",IDC_STATIC,7,7,140,8
CAPTION "Language"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- PUSHBUTTON "OK",IDOK,115,123,52,14
- PUSHBUTTON "Cancel",IDCANCEL,30,123,52,14
+ PUSHBUTTON "OK",IDOK,30,123,52,14
+ PUSHBUTTON "Cancel",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Available languages:",IDC_STATIC,7,7,140,8