UTF-8 resource files must explicitly say so with a pragma.

Francois Gouget fgouget at codeweavers.com
Mon Feb 4 17:01:08 CST 2008


---

Otherwise we get raw UTF-8 characters in the GUI...
The alternative would be to convert these files to the default encoding 
for their locales (mostly ISO-8859-1).

 dlls/credui/credui_Es.rc         |    3 +++
 dlls/credui/credui_Fr.rc         |    3 +++
 dlls/crypt32/crypt32_Sv.rc       |    3 +++
 dlls/gphoto2.ds/gphoto2_Es.rc    |    3 +++
 dlls/localui/ui_Fr.rc            |    3 +++
 dlls/sane.ds/sane_Es.rc          |    3 +++
 programs/net/Fr.rc               |    3 +++
 programs/wineboot/wineboot_Es.rc |    3 +++
 programs/wineboot/wineboot_Fr.rc |    3 +++
 programs/write/Fr.rc             |    3 +++
 programs/xcopy/Fr.rc             |    3 +++
 11 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/dlls/credui/credui_Es.rc b/dlls/credui/credui_Es.rc
index 821d8dd..7227627 100644
--- a/dlls/credui/credui_Es.rc
+++ b/dlls/credui/credui_Es.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
@@ -48,3 +49,5 @@ 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 c1d71d4..468eb1c 100644
--- a/dlls/credui/credui_Fr.rc
+++ b/dlls/credui/credui_Fr.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
@@ -48,3 +49,5 @@ 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/crypt32/crypt32_Sv.rc b/dlls/crypt32/crypt32_Sv.rc
index 132b7b7..33167d1 100644
--- a/dlls/crypt32/crypt32_Sv.rc
+++ b/dlls/crypt32/crypt32_Sv.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
@@ -164,3 +165,5 @@ STRINGTABLE DISCARDABLE
     IDS_LIFETIME_SIGNING "Lifetime Signing"
     IDS_ANY_CERT_POLICY "All issuance policies"
 }
+
+#pragma code_page(default)
diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc
index 2a29e9a..534c68e 100644
--- a/dlls/gphoto2.ds/gphoto2_Es.rc
+++ b/dlls/gphoto2.ds/gphoto2_Es.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
@@ -53,3 +54,5 @@ BEGIN
     LTEXT           "Conectando a la c??mara... Por favor espere",IDC_STATIC,128,58,
                     116,8
 END
+
+#pragma code_page(default)
diff --git a/dlls/localui/ui_Fr.rc b/dlls/localui/ui_Fr.rc
index a838293..261fa0b 100644
--- a/dlls/localui/ui_Fr.rc
+++ b/dlls/localui/ui_Fr.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
@@ -52,3 +53,5 @@ STRINGTABLE DISCARDABLE
     IDS_PORTEXISTS "Le port %s existe d??j??"
     IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration"
 }
+
+#pragma code_page(default)
diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc
index e6e0ab3..bae6b62 100644
--- a/dlls/sane.ds/sane_Es.rc
+++ b/dlls/sane.ds/sane_Es.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
@@ -38,3 +39,5 @@ STRINGTABLE DISCARDABLE
  5 "%"
  6 "ns"
 }
+
+#pragma code_page(default)
diff --git a/programs/net/Fr.rc b/programs/net/Fr.rc
index 83d1a6c..bca25a4 100644
--- a/programs/net/Fr.rc
+++ b/programs/net/Fr.rc
@@ -18,6 +18,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
@@ -41,3 +42,5 @@ STRINGTABLE
     STRING_USE_HEADER, "\nStatut    Local   Distant\n---------------------------------------------------------------\n"
     STRING_USE_ENTRY, "%s      %S      %S      Ressources ouvertes??: %lu\n"
 }
+
+#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Es.rc b/programs/wineboot/wineboot_Es.rc
index 4af1677..229eaba 100644
--- a/programs/wineboot/wineboot_Es.rc
+++ b/programs/wineboot/wineboot_Es.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
@@ -33,3 +34,5 @@ BEGIN
     LTEXT           "Si termina el programa puede perder los datos no grabados.",
                     IDC_STATIC,7,28,172,15
 END
+
+#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Fr.rc b/programs/wineboot/wineboot_Fr.rc
index cae61f6..b24c5d1 100644
--- a/programs/wineboot/wineboot_Fr.rc
+++ b/programs/wineboot/wineboot_Fr.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
@@ -33,3 +34,5 @@ BEGIN
     LTEXT           "Si vous arr??tez le programme, vous pouvez perdre toutes les donn??es non enregistr??es.",
                     IDC_STATIC,7,28,172,15
 END
+
+#pragma code_page(default)
diff --git a/programs/write/Fr.rc b/programs/write/Fr.rc
index 452244e..0258efc 100644
--- a/programs/write/Fr.rc
+++ b/programs/write/Fr.rc
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
@@ -24,3 +25,5 @@ STRINGTABLE
 {
     IDS_FAILED, "Wordpad n'a pas pu ??tre d??marr??"
 }
+
+#pragma code_page(default)
diff --git a/programs/xcopy/Fr.rc b/programs/xcopy/Fr.rc
index 92c8311..e641e6a 100644
--- a/programs/xcopy/Fr.rc
+++ b/programs/xcopy/Fr.rc
@@ -18,6 +18,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#pragma code_page(65001)
 
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -77,3 +78,5 @@ O????:\n\
 \t\tque le fichier source\n\n"
 
 }
+
+#pragma code_page(default)
-- 
1.5.3.8




More information about the wine-patches mailing list