Replace 'All xxx pages' text in common print dialog by simple 'All'
Dmitry Timoshkov
dmitry at baikal.ru
Wed Dec 22 02:15:07 CST 2004
Hello,
common print dialog in Windows uses 'All' instead of 'All xxx pages' text
which is much simpler and more natural IMO.
Changelog:
Dmitry Timoshkov <dmitry at codeweavers.com>
Replace 'All xxx pages' text in common print dialog by simple 'All'.
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Cn.rc wine/dlls/commdlg/cdlg_Cn.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Cn.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Cn.rc 2004-12-22 15:41:53.000000000 +0800
@@ -408,7 +408,6 @@ supported by your printer.\nPlease enter
PD32_DEFAULT_PRINTER "Default Printer; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue"
- PD32_PRINT_ALL_X_PAGES "&All %d pages"
PD32_MARGINS_IN_INCHES "Margins [inches]"
PD32_MARGINS_IN_MILIMETERS "Margins [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_De.rc wine/dlls/commdlg/cdlg_De.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_De.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_De.rc 2004-12-22 15:37:24.000000000 +0800
@@ -402,7 +402,6 @@ Bitte geben sie einen Wert zwischen %d u
PD32_DEFAULT_PRINTER "Standard Drucker; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Es sind %d Dokumente in der Queue"
- PD32_PRINT_ALL_X_PAGES "&Alle %d Seiten"
PD32_MARGINS_IN_INCHES "Ränder [inches/zoll]"
PD32_MARGINS_IN_MILIMETERS "Ränder [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_En.rc wine/dlls/commdlg/cdlg_En.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_En.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_En.rc 2004-12-22 15:37:24.000000000 +0800
@@ -408,7 +408,6 @@ supported by your printer.\nPlease enter
PD32_DEFAULT_PRINTER "Default Printer; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue"
- PD32_PRINT_ALL_X_PAGES "&All %d pages"
PD32_MARGINS_IN_INCHES "Margins [inches]"
PD32_MARGINS_IN_MILIMETERS "Margins [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Es.rc wine/dlls/commdlg/cdlg_Es.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Es.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Es.rc 2004-12-22 15:42:12.000000000 +0800
@@ -409,7 +409,6 @@ desconocido."
PD32_DEFAULT_PRINTER "Impresora por defecto; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Hay %d documentos en la cola"
- PD32_PRINT_ALL_X_PAGES "&Todas las %d páginas"
PD32_MARGINS_IN_INCHES "Márgenes [pulgadas]"
PD32_MARGINS_IN_MILIMETERS "Márgenes [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Fr.rc wine/dlls/commdlg/cdlg_Fr.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Fr.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Fr.rc 2004-12-22 15:37:24.000000000 +0800
@@ -411,7 +411,6 @@ Veuillez indiquer un nombre de copies en
PD32_DEFAULT_PRINTER "Imprimante par défaut; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Il y a %d documents dans la file d'attente"
- PD32_PRINT_ALL_X_PAGES "&Toutes les %d pages"
PD32_MARGINS_IN_INCHES "Marges [pouces]"
PD32_MARGINS_IN_MILIMETERS "Marges [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg.h wine/dlls/commdlg/cdlg.h
--- cvs/hq/wine/dlls/commdlg/cdlg.h 2003-12-31 13:25:16.000000000 +0800
+++ wine/dlls/commdlg/cdlg.h 2004-12-22 15:37:24.000000000 +0800
@@ -93,7 +93,7 @@ typedef struct {
#define PD32_DEFAULT_PRINTER 1582
#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583
-#define PD32_PRINT_ALL_X_PAGES 1584
+
#define PD32_MARGINS_IN_INCHES 1585
#define PD32_MARGINS_IN_MILIMETERS 1586
#define PD32_MILIMETERS 1587
diff -up cvs/hq/wine/dlls/commdlg/cdlg_It.rc wine/dlls/commdlg/cdlg_It.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_It.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_It.rc 2004-12-22 15:42:31.000000000 +0800
@@ -407,7 +407,6 @@ supportato dalla stampante.\nInserire un
PD32_DEFAULT_PRINTER "Stampante predefinita; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Ci sono %d documenti nella coda di stampa"
- PD32_PRINT_ALL_X_PAGES "&Tutte le %d pagine"
PD32_MARGINS_IN_INCHES "Margini [pollici]"
PD32_MARGINS_IN_MILIMETERS "Margini [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Nl.rc wine/dlls/commdlg/cdlg_Nl.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Nl.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Nl.rc 2004-12-22 15:37:24.000000000 +0800
@@ -251,7 +251,7 @@ FONT 8, "MS Shell Dlg"
EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER
GROUPBOX "Afdrukbereik", grp1, 8,92, 144,64, WS_GROUP
- CONTROL "&Alle xx", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+ CONTROL "&Alle", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
CONTROL "&Pagina's", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
CONTROL "Sele&ctie", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER
@@ -289,7 +289,6 @@ gespecifieerde fout"
PD32_DEFAULT_PRINTER "Default Printer, "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Er staan %d documenten in de \
wachtrij"
- PD32_PRINT_ALL_X_PAGES "&Alle %d pagina's"
PD32_MARGINS_IN_INCHES "Marges [inch]"
PD32_MARGINS_IN_MILIMETERS "Marges [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Pl.rc wine/dlls/commdlg/cdlg_Pl.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Pl.rc 2004-10-06 16:10:19.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Pl.rc 2004-12-22 15:42:41.000000000 +0800
@@ -405,7 +405,6 @@ STRINGTABLE DISCARDABLE
PD32_DEFAULT_PRINTER "Domyœlna Drukarka; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "W kolejce znajduj¹ siê %d dokumenty"
- PD32_PRINT_ALL_X_PAGES "&Wszystkie %d strony"
PD32_MARGINS_IN_INCHES "Marginesy [cale]"
PD32_MARGINS_IN_MILIMETERS "Marginesy [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Pt.rc wine/dlls/commdlg/cdlg_Pt.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Pt.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Pt.rc 2004-12-22 15:37:24.000000000 +0800
@@ -407,7 +407,6 @@ pela sua impressora.\nPor favor entre um
PD32_DEFAULT_PRINTER "Impressora Padrão; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila"
- PD32_PRINT_ALL_X_PAGES "&Todas %d páginas"
PD32_MARGINS_IN_INCHES "Margens [polegadas]"
PD32_MARGINS_IN_MILIMETERS "Margens [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Ru.rc wine/dlls/commdlg/cdlg_Ru.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Ru.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Ru.rc 2004-12-22 15:37:24.000000000 +0800
@@ -376,7 +376,6 @@ STRINGTABLE DISCARDABLE
PD32_DEFAULT_PRINTER "Ïðèíòåð ïî óìîë÷àíèþ; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíòîâ â î÷åðåäè"
- PD32_PRINT_ALL_X_PAGES "&Âñå %d ñòðàíèö"
PD32_MARGINS_IN_INCHES "Ãðàíèöû [äþéìû)"
PD32_MARGINS_IN_MILIMETERS "Ãðàíèöû [ìì]"
PD32_MILIMETERS "ìì"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Si.rc wine/dlls/commdlg/cdlg_Si.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Si.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Si.rc 2004-12-22 15:37:24.000000000 +0800
@@ -405,7 +405,6 @@ Vnesite število med %d in %d."
PD32_DEFAULT_PRINTER "Privzeti tiskalnik; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d èakajoèih dok."
- PD32_PRINT_ALL_X_PAGES "&Vse strani -- %d"
PD32_MARGINS_IN_INCHES "Robovi [palci]"
PD32_MARGINS_IN_MILIMETERS "Robovi [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Sk.rc wine/dlls/commdlg/cdlg_Sk.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Sk.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Sk.rc 2004-12-22 15:37:24.000000000 +0800
@@ -378,7 +378,6 @@ supported by your printer.\nPlease enter
PD32_DEFAULT_PRINTER "Implicitná tlaèiareò; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in queue"
- PD32_PRINT_ALL_X_PAGES "&Všetky %d strany"
PD32_MARGINS_IN_INCHES "Okraje [palce]"
PD32_MARGINS_IN_MILIMETERS "Okraje [mm]"
PD32_MILIMETERS "mm"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Sv.rc wine/dlls/commdlg/cdlg_Sv.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Sv.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Sv.rc 2004-12-22 15:37:24.000000000 +0800
@@ -398,7 +398,6 @@ pappersgränserna.\nVar god skriv in marg
PD32_DEFAULT_PRINTER "Standardskrivare; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det är %d dokument i kön"
- PD32_PRINT_ALL_X_PAGES "&Alla %d sidor"
PD32_MARGINS_IN_INCHES "Marginaler [inches]"
PD32_MARGINS_IN_MILIMETERS "Marginaler [millimeter]"
PD32_MILIMETERS "millimeter"
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Th.rc wine/dlls/commdlg/cdlg_Th.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Th.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Th.rc 2004-12-22 15:43:00.000000000 +0800
@@ -402,7 +402,6 @@ supported by your printer.\nPlease enter
PD32_DEFAULT_PRINTER "à¤Ã×èͧ¾ÔÁ¾ì»¡µÔ; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "ÁÕ %d á¿éÁÃÍÍÂÙè"
- PD32_PRINT_ALL_X_PAGES "·Ø¡ %d ˹éÒ"
PD32_MARGINS_IN_INCHES "¢Íº¡ÃдÒÉ [¹ÔéÇ]"
PD32_MARGINS_IN_MILIMETERS "¢Íº¡ÃдÒÉ [ÁÁ.]"
PD32_MILIMETERS "ÁÁ."
diff -up cvs/hq/wine/dlls/commdlg/cdlg_Uk.rc wine/dlls/commdlg/cdlg_Uk.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Uk.rc 2004-08-26 14:46:20.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Uk.rc 2004-12-22 15:43:26.000000000 +0800
@@ -376,7 +376,6 @@ STRINGTABLE DISCARDABLE
PD32_DEFAULT_PRINTER "Ïðèíòåð çà îáóìîâëåííÿì; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíò³â ó ÷åðç³"
- PD32_PRINT_ALL_X_PAGES "&Âñ³ %d ñòîð³íîê"
PD32_MARGINS_IN_INCHES "Ìåæ³ [äþéìè]"
PD32_MARGINS_IN_MILIMETERS "Ìåæ³ [ìì]"
PD32_MILIMETERS "ìì"
diff -up cvs/hq/wine/dlls/commdlg/printdlg.c wine/dlls/commdlg/printdlg.c
--- cvs/hq/wine/dlls/commdlg/printdlg.c 2004-12-15 20:43:22.000000000 +0800
+++ wine/dlls/commdlg/printdlg.c 2004-12-22 15:40:20.000000000 +0800
@@ -928,15 +928,6 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg,
if (lppd->Flags & PD_PAGENUMS)
CheckRadioButton(hDlg, rad1, rad3, rad3);
}
- /* "All xxx pages"... */
- {
- char resourcestr[64];
- char result[64];
- LoadStringA(COMDLG32_hInstance, PD32_PRINT_ALL_X_PAGES,
- resourcestr, 49);
- sprintf(result,resourcestr,lppd->nMaxPage - lppd->nMinPage + 1);
- SendDlgItemMessageA(hDlg, rad1, WM_SETTEXT, 0, (LPARAM) result);
- }
/* Collate pages
*
@@ -1090,15 +1081,6 @@ static BOOL PRINTDLG_ChangePrinterW(HWND
if (lppd->Flags & PD_PAGENUMS)
CheckRadioButton(hDlg, rad1, rad3, rad3);
}
- /* "All xxx pages"... */
- {
- WCHAR resourcestr[64];
- WCHAR result[64];
- LoadStringW(COMDLG32_hInstance, PD32_PRINT_ALL_X_PAGES,
- resourcestr, 49);
- wsprintfW(result,resourcestr,lppd->nMaxPage - lppd->nMinPage + 1);
- SendDlgItemMessageW(hDlg, rad1, WM_SETTEXT, 0, (LPARAM) result);
- }
/* Collate pages
*
More information about the wine-patches
mailing list