From 6b6ff6afa4eae2df37b349c9244bc4abc60988e0 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 2 Jul 2009 00:33:27 +0200 Subject: [PATCH] credui: Build language resource files separately. Do not include them from an other rc file. --- dlls/credui/Makefile.in | 19 ++++++++++++++++++- dlls/credui/credui.rc | 21 --------------------- dlls/credui/credui_Da.rc | 2 ++ dlls/credui/credui_De.rc | 2 ++ dlls/credui/credui_En.rc | 2 ++ dlls/credui/credui_Es.rc | 5 +++-- dlls/credui/credui_Fr.rc | 5 +++-- dlls/credui/credui_Ko.rc | 2 ++ dlls/credui/credui_Lt.rc | 4 ++-- dlls/credui/credui_Nl.rc | 2 ++ dlls/credui/credui_No.rc | 2 ++ dlls/credui/credui_Pl.rc | 2 ++ dlls/credui/credui_Pt.rc | 2 ++ dlls/credui/credui_Ro.rc | 4 ++-- dlls/credui/credui_Ru.rc | 2 ++ dlls/credui/credui_Si.rc | 4 ++-- dlls/credui/credui_Sv.rc | 2 ++ dlls/credui/credui_Zh.rc | 4 ++-- dlls/credui/credui_resources.h | 3 +++ 19 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index c9d574fefd2..f29278c571b 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -9,7 +9,24 @@ IMPORTS = comctl32 user32 advapi32 kernel32 C_SRCS = \ credui_main.c -RC_SRCS = credui.rc +RC_SRCS = \ + credui.rc \ + credui_Da.rc \ + credui_De.rc \ + credui_En.rc \ + credui_Es.rc \ + credui_Fr.rc \ + credui_Ko.rc \ + credui_Lt.rc \ + credui_Nl.rc \ + credui_No.rc \ + credui_Pl.rc \ + credui_Pt.rc \ + credui_Ro.rc \ + credui_Ru.rc \ + credui_Si.rc \ + credui_Sv.rc \ + credui_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index f66a9428043..0f16f0065b5 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" #include "credui_resources.h" /* @makedep: banner.bmp */ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp - -#include "credui_Da.rc" -#include "credui_De.rc" -#include "credui_En.rc" -#include "credui_Es.rc" -#include "credui_Fr.rc" -#include "credui_Ko.rc" -#include "credui_Lt.rc" -#include "credui_Nl.rc" -#include "credui_No.rc" -#include "credui_Pl.rc" -#include "credui_Pt.rc" -#include "credui_Ro.rc" -#include "credui_Ru.rc" -#include "credui_Si.rc" -#include "credui_Sv.rc" -#include "credui_Zh.rc" diff --git a/dlls/credui/credui_Da.rc b/dlls/credui/credui_Da.rc index d5e7608e874..26ef9914c5d 100644 --- a/dlls/credui/credui_Da.rc +++ b/dlls/credui/credui_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 7c197d6790f..9e72698494c 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_En.rc b/dlls/credui/credui_En.rc index 8e475bb60ac..feb4afc4b02 100644 --- a/dlls/credui/credui_En.rc +++ b/dlls/credui/credui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Es.rc b/dlls/credui/credui_Es.rc index 0a48b3ff963..8f71d5ff4c5 100644 --- a/dlls/credui/credui_Es.rc +++ b/dlls/credui/credui_Es.rc @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -50,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Bloq Mayus está activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseña incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseña." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Fr.rc b/dlls/credui/credui_Fr.rc index fb7cd126fbe..387a86d39a1 100644 --- a/dlls/credui/credui_Fr.rc +++ b/dlls/credui/credui_Fr.rc @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -49,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "VERR.MAJ est activé" IDS_CAPSLOCKON "Le verrouillage majuscule étant activé, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de désactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 62bd1355d30..ab1f1ec853f 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Lt.rc b/dlls/credui/credui_Lt.rc index 9ad3e4bc4ba..4eb6ebaf9b4 100644 --- a/dlls/credui/credui_Lt.rc +++ b/dlls/credui/credui_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Didžiųjų raidžių būsena įjungta" IDS_CAPSLOCKON "Kai įjungta didžiųjų raidžių būsena, savo slaptažodį galite įvesti neteisingai.\n\nPaspauskite didžiųjų raidžių klaviatūros klavišą didžiųjų raidžių būsenai išjungti\nprieš rinkdami savo slaptažodį." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index ed5c41e4b72..575496ccf33 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_No.rc b/dlls/credui/credui_No.rc index cc09cd8351d..c47fec1bf74 100644 --- a/dlls/credui/credui_No.rc +++ b/dlls/credui/credui_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pl.rc b/dlls/credui/credui_Pl.rc index 902ced6a4d4..e2fab5ce42e 100644 --- a/dlls/credui/credui_Pl.rc +++ b/dlls/credui/credui_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pt.rc b/dlls/credui/credui_Pt.rc index 930fb4336a7..2283e43bfda 100644 --- a/dlls/credui/credui_Pt.rc +++ b/dlls/credui/credui_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc index 3d3367e7473..29e98991983 100644 --- a/dlls/credui/credui_Ro.rc +++ b/dlls/credui/credui_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -49,5 +51,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ru.rc b/dlls/credui/credui_Ru.rc index fce2c5f055b..a990525b3b6 100644 --- a/dlls/credui/credui_Ru.rc +++ b/dlls/credui/credui_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Si.rc b/dlls/credui/credui_Si.rc index d2152adf1cf..34915e668b5 100644 --- a/dlls/credui/credui_Si.rc +++ b/dlls/credui/credui_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Caps Lock je vključen" IDS_CAPSLOCKON "Vključen Caps Lock je lahko vzrok nepravilnega vnosa gesla.\n\nPritisnite tipko Caps Lock, s čimer ga izklopite\nin ponovno vnesite geslo." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Sv.rc b/dlls/credui/credui_Sv.rc index 453b7a38934..a43c216b227 100644 --- a/dlls/credui/credui_Sv.rc +++ b/dlls/credui/credui_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Zh.rc b/dlls/credui/credui_Zh.rc index 99294c71a95..041aecdaaa0 100644 --- a/dlls/credui/credui_Zh.rc +++ b/dlls/credui/credui_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -82,5 +84,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "大寫鎖定開著" IDS_CAPSLOCKON "開著大寫鎖定可能導致你輸入錯誤的密碼." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_resources.h b/dlls/credui/credui_resources.h index e5bd8ee9335..0a6ab72b092 100644 --- a/dlls/credui/credui_resources.h +++ b/dlls/credui/credui_resources.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include + #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 #define IDC_PASSWORD 102