From 7ce1bb89b92469b3f469ff6d639aff33e6e66a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Zalewski?= <mikolaj@zalewski.pl>
Date: Wed, 12 Jul 2006 19:16:10 +0200
Subject: [PATCH] comctl32: Use wsprintf instead of strcat building the
 properties dialog title to allow different word orders.

---
 dlls/comctl32/comctl_Bg.rc | 2 +-
 dlls/comctl32/comctl_Cn.rc | 2 +-
 dlls/comctl32/comctl_Cs.rc | 2 +-
 dlls/comctl32/comctl_De.rc | 2 +-
 dlls/comctl32/comctl_En.rc | 2 +-
 dlls/comctl32/comctl_Eo.rc | 2 +-
 dlls/comctl32/comctl_Es.rc | 2 +-
 dlls/comctl32/comctl_Fr.rc | 2 +-
 dlls/comctl32/comctl_Hu.rc | 2 +-
 dlls/comctl32/comctl_It.rc | 2 +-
 dlls/comctl32/comctl_Ja.rc | 2 +-
 dlls/comctl32/comctl_Ko.rc | 2 +-
 dlls/comctl32/comctl_Nl.rc | 2 +-
 dlls/comctl32/comctl_No.rc | 2 +-
 dlls/comctl32/comctl_Pl.rc | 2 +-
 dlls/comctl32/comctl_Pt.rc | 2 +-
 dlls/comctl32/comctl_Ru.rc | 2 +-
 dlls/comctl32/comctl_Si.rc | 2 +-
 dlls/comctl32/comctl_Sv.rc | 2 +-
 dlls/comctl32/comctl_Th.rc | 2 +-
 dlls/comctl32/comctl_Tr.rc | 2 +-
 dlls/comctl32/comctl_Uk.rc | 2 +-
 dlls/comctl32/propsheet.c  | 3 +--
 23 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/dlls/comctl32/comctl_Bg.rc b/dlls/comctl32/comctl_Bg.rc
index b14e7681b86..94dd8703c64 100644
--- a/dlls/comctl32/comctl_Bg.rc
+++ b/dlls/comctl32/comctl_Bg.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ñâîéñòâà íà "
+CAPTION "Ñâîéñòâà íà %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Cn.rc b/dlls/comctl32/comctl_Cn.rc
index 1d86f60f177..a9fa9979bed 100644
--- a/dlls/comctl32/comctl_Cn.rc
+++ b/dlls/comctl32/comctl_Cn.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "ÊôÐÔ "
+CAPTION "ÊôÐÔ %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "È·¶¨",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Cs.rc b/dlls/comctl32/comctl_Cs.rc
index b66eea2553b..63cc0bbc68b 100644
--- a/dlls/comctl32/comctl_Cs.rc
+++ b/dlls/comctl32/comctl_Cs.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Vlastnosti "
+CAPTION "Vlastnosti %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc
index d0f9dd893e7..e4b8a1d2caa 100644
--- a/dlls/comctl32/comctl_De.rc
+++ b/dlls/comctl32/comctl_De.rc
@@ -41,7 +41,7 @@ STRINGTABLE DISCARDABLE
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschaften für "
+CAPTION "Eigenschaften für %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "&OK",        IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_En.rc b/dlls/comctl32/comctl_En.rc
index 4e3094691a3..369eecd90ff 100644
--- a/dlls/comctl32/comctl_En.rc
+++ b/dlls/comctl32/comctl_En.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
+CAPTION "Properties for %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Eo.rc b/dlls/comctl32/comctl_Eo.rc
index ab4f7865a14..bda181759f8 100644
--- a/dlls/comctl32/comctl_Eo.rc
+++ b/dlls/comctl32/comctl_Eo.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ecoj laý "
+CAPTION "Ecoj laý %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "Bone",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Es.rc b/dlls/comctl32/comctl_Es.rc
index 82450086ca9..ea2968edcaa 100644
--- a/dlls/comctl32/comctl_Es.rc
+++ b/dlls/comctl32/comctl_Es.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propiedades de "
+CAPTION "Propiedades de %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "Aceptar",  IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Fr.rc b/dlls/comctl32/comctl_Fr.rc
index 3ac39415ddb..1bf8e230b02 100644
--- a/dlls/comctl32/comctl_Fr.rc
+++ b/dlls/comctl32/comctl_Fr.rc
@@ -24,7 +24,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriétés pour "
+CAPTION "Propriétés pour %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Hu.rc b/dlls/comctl32/comctl_Hu.rc
index acf06ee328e..6019777c1bd 100644
--- a/dlls/comctl32/comctl_Hu.rc
+++ b/dlls/comctl32/comctl_Hu.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Tulajdonságok: "
+CAPTION "Tulajdonságok: %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_It.rc b/dlls/comctl32/comctl_It.rc
index b617d50ce4e..c3b06f7073f 100644
--- a/dlls/comctl32/comctl_It.rc
+++ b/dlls/comctl32/comctl_It.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Proprietà per "
+CAPTION "Proprietà per %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Ja.rc b/dlls/comctl32/comctl_Ja.rc
index 3c78c890bc9..b00969a3e08 100644
--- a/dlls/comctl32/comctl_Ja.rc
+++ b/dlls/comctl32/comctl_Ja.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
+CAPTION "Properties for %s"
 FONT 9, "MS UI Gothic"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc
index 4c65f17abfd..cf7f72332a0 100644
--- a/dlls/comctl32/comctl_Ko.rc
+++ b/dlls/comctl32/comctl_Ko.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¼Ó¼º"
+CAPTION "¼Ó¼º %s"
 FONT 9, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "È®ÀÎ",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc
index 770985cd18c..06b23be03e8 100644
--- a/dlls/comctl32/comctl_Nl.rc
+++ b/dlls/comctl32/comctl_Nl.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschappen van "
+CAPTION "Eigenschappen van %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",         IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_No.rc b/dlls/comctl32/comctl_No.rc
index 743405cf03e..77b9ec8da70 100644
--- a/dlls/comctl32/comctl_No.rc
+++ b/dlls/comctl32/comctl_No.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Egenskaper for "
+CAPTION "Egenskaper for %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Pl.rc b/dlls/comctl32/comctl_Pl.rc
index 6adbecccd68..252c43eb1a3 100644
--- a/dlls/comctl32/comctl_Pl.rc
+++ b/dlls/comctl32/comctl_Pl.rc
@@ -21,7 +21,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "W³aœciwoœci "
+CAPTION "W³aœciwoœci %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc
index dcdb7ae23d3..f3ed6bf506a 100644
--- a/dlls/comctl32/comctl_Pt.rc
+++ b/dlls/comctl32/comctl_Pt.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriedades para "
+CAPTION "Propriedades para %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Ru.rc b/dlls/comctl32/comctl_Ru.rc
index a335abee2e6..35418e45cf2 100644
--- a/dlls/comctl32/comctl_Ru.rc
+++ b/dlls/comctl32/comctl_Ru.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ñâîéñòâà äëÿ "
+CAPTION "Ñâîéñòâà äëÿ %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Si.rc b/dlls/comctl32/comctl_Si.rc
index fb5e1bbadd6..90c65148801 100644
--- a/dlls/comctl32/comctl_Si.rc
+++ b/dlls/comctl32/comctl_Si.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Lastnosti"
+CAPTION "Lastnosti %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "V redu",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Sv.rc b/dlls/comctl32/comctl_Sv.rc
index e67f1ff233c..fb4673abd85 100644
--- a/dlls/comctl32/comctl_Sv.rc
+++ b/dlls/comctl32/comctl_Sv.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Egenskaper för "
+CAPTION "Egenskaper för %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Th.rc b/dlls/comctl32/comctl_Th.rc
index c943ce91c55..3195e1b9a55 100644
--- a/dlls/comctl32/comctl_Th.rc
+++ b/dlls/comctl32/comctl_Th.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ "
+CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "µ¡Å§",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Tr.rc b/dlls/comctl32/comctl_Tr.rc
index 1429af83552..c0f65127f9d 100644
--- a/dlls/comctl32/comctl_Tr.rc
+++ b/dlls/comctl32/comctl_Tr.rc
@@ -20,7 +20,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Özellikler: "
+CAPTION "Özellikler: %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "Tamam",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/comctl_Uk.rc b/dlls/comctl32/comctl_Uk.rc
index 3c52e009d38..95e502dd471 100644
--- a/dlls/comctl32/comctl_Uk.rc
+++ b/dlls/comctl32/comctl_Uk.rc
@@ -22,7 +22,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Âëàñòèâîñò³ äëÿ "
+CAPTION "Âëàñòèâîñò³ äëÿ %s"
 FONT 8, "MS Shell Dlg"
 BEGIN
   DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index f21852c4f31..907e638a840 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -2151,8 +2151,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText)
     int lenprop  = strlenW(psInfo->strPropertiesFor);
 
     dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR));
-    strcpyW(dest, psInfo->strPropertiesFor);
-    strcatW(dest, lpszText);
+    wsprintfW(dest, psInfo->strPropertiesFor, lpszText);
 
     SetWindowTextW(hwndDlg, dest);
     Free(dest);