diff --git a/po/ar.po b/po/ar.po index c54bd7fd69d..2550a391d02 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10464,7 +10464,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/bg.po b/po/bg.po index 1f8531f2a82..d848c1b1ddd 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10621,7 +10621,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/ca.po b/po/ca.po index 3f58d6a5847..90fc9cd5fb7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10985,7 +10985,8 @@ msgid "Security" msgstr "Seguritat" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s de %s lliure" #: winemine.rc:34 diff --git a/po/cs.po b/po/cs.po index dc18fda7d7c..705091d83ea 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11088,7 +11088,8 @@ msgid "Security" msgstr "Zabezpečení" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s z %s volného" #: winemine.rc:34 diff --git a/po/da.po b/po/da.po index 322b62ec741..b6a790840d0 100644 --- a/po/da.po +++ b/po/da.po @@ -11187,7 +11187,8 @@ msgid "Security" msgstr "Sikkerhed" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s af %s ledig" #: winemine.rc:34 diff --git a/po/de.po b/po/de.po index 13842bae64a..c8c7a257978 100644 --- a/po/de.po +++ b/po/de.po @@ -11024,7 +11024,8 @@ msgid "Security" msgstr "Sicherheit" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s von %s frei" #: winemine.rc:34 diff --git a/po/el.po b/po/el.po index 1d088b7eecd..e1cd04305fa 100644 --- a/po/el.po +++ b/po/el.po @@ -10462,7 +10462,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/en.po b/po/en.po index 60bfa1fc6bc..75fc5da1a26 100644 --- a/po/en.po +++ b/po/en.po @@ -10690,7 +10690,7 @@ msgid "Security" msgstr "Security" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/en_US.po b/po/en_US.po index 0f56f23fbb6..97128c3b9e5 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -10904,8 +10904,8 @@ msgid "Security" msgstr "Security" #: winefile.rc:120 -msgid "%s of %s free" -msgstr "%s of %s free" +msgid "%1 of %2 free" +msgstr "%1 of %2 free" #: winemine.rc:34 msgid "&Game" diff --git a/po/eo.po b/po/eo.po index ebfbb3d572e..3ee4daefdf8 100644 --- a/po/eo.po +++ b/po/eo.po @@ -10638,7 +10638,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/es.po b/po/es.po index 226ea3f5338..119ba9dd369 100644 --- a/po/es.po +++ b/po/es.po @@ -11391,7 +11391,8 @@ msgid "Security" msgstr "Seguridad" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s de %s libre" #: winemine.rc:34 diff --git a/po/fa.po b/po/fa.po index 2a9fe668fcd..5b4d1043f8f 100644 --- a/po/fa.po +++ b/po/fa.po @@ -10467,7 +10467,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/fi.po b/po/fi.po index 5b44b3a4601..cdb289f775f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10758,7 +10758,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/fr.po b/po/fr.po index 8e6fc05145d..6e090ec4e10 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11044,7 +11044,8 @@ msgid "Security" msgstr "Sécurité" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s libres sur %s" #: winemine.rc:34 diff --git a/po/he.po b/po/he.po index 51045956526..512862a2bc5 100644 --- a/po/he.po +++ b/po/he.po @@ -11048,7 +11048,8 @@ msgid "Security" msgstr "אבטחה" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s מתוך %s פנויים" #: winemine.rc:34 diff --git a/po/hi.po b/po/hi.po index aff6f7f30be..91d288e9a06 100644 --- a/po/hi.po +++ b/po/hi.po @@ -10328,7 +10328,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/hu.po b/po/hu.po index a48ccddebec..edbe4aa45ae 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11026,7 +11026,7 @@ msgid "Security" msgstr "&Biztonság" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/it.po b/po/it.po index 4f931a5b29c..92889fc78fb 100644 --- a/po/it.po +++ b/po/it.po @@ -10982,7 +10982,8 @@ msgid "Security" msgstr "Sicurezza" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "liberi %s di %s" #: winemine.rc:34 diff --git a/po/ja.po b/po/ja.po index 30c56badc1f..1410f82779f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10901,7 +10901,8 @@ msgid "Security" msgstr "セキュリティ" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s の空き (全容量 %s)" #: winemine.rc:34 diff --git a/po/ko.po b/po/ko.po index 844d09aff16..a39ce6c4c59 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10861,7 +10861,8 @@ msgid "Security" msgstr "보안" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s of %s 사용가능" #: winemine.rc:34 diff --git a/po/lt.po b/po/lt.po index bd059ff6352..24f7ab77a4e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -10926,7 +10926,8 @@ msgid "Security" msgstr "Saugumas" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s iš %s laisva" #: winemine.rc:34 diff --git a/po/ml.po b/po/ml.po index 31e31d8d1ce..a3db7ba0bf7 100644 --- a/po/ml.po +++ b/po/ml.po @@ -10328,7 +10328,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/nb_NO.po b/po/nb_NO.po index 3affcf27546..64414f155b0 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11220,7 +11220,8 @@ msgid "Security" msgstr "Sikkerhet" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s av %s ledig" #: winemine.rc:34 diff --git a/po/nl.po b/po/nl.po index ab3847e4344..7cba8ce6f65 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11076,7 +11076,8 @@ msgid "Security" msgstr "Beveiliging" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s van %s vrij" #: winemine.rc:34 diff --git a/po/or.po b/po/or.po index 31ccf103375..7eac78de192 100644 --- a/po/or.po +++ b/po/or.po @@ -10328,7 +10328,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/pa.po b/po/pa.po index fe5922b10a5..12754116969 100644 --- a/po/pa.po +++ b/po/pa.po @@ -10328,7 +10328,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/pl.po b/po/pl.po index 857e2f4483c..03d538c86a1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10900,7 +10900,8 @@ msgid "Security" msgstr "Prawa dostępu" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s z %s wolne" #: winemine.rc:34 diff --git a/po/pt_BR.po b/po/pt_BR.po index 145601e51d2..e61bcf098c0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11303,7 +11303,8 @@ msgid "Security" msgstr "Segurança" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s de %s livre" #: winemine.rc:34 diff --git a/po/pt_PT.po b/po/pt_PT.po index 59fb2d82d92..b72b03bd6a3 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -11320,7 +11320,8 @@ msgid "Security" msgstr "Segurança" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s de %s livre" #: winemine.rc:34 diff --git a/po/rm.po b/po/rm.po index 41a54e83634..2747fc456f0 100644 --- a/po/rm.po +++ b/po/rm.po @@ -10376,7 +10376,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/ro.po b/po/ro.po index f50b11f272f..60564cea1b1 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11539,7 +11539,8 @@ msgid "Security" msgstr "Securitate" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s din %s liber" #: winemine.rc:34 diff --git a/po/ru.po b/po/ru.po index 52e4256ab43..14d902040ae 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10914,7 +10914,8 @@ msgid "Security" msgstr "Безопасность" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s из %s свободно" #: winemine.rc:34 diff --git a/po/sk.po b/po/sk.po index 0e6b25bb0d6..6c2758ab784 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10477,7 +10477,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/sl.po b/po/sl.po index 3fa68594606..b2de0be9d9b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -10963,7 +10963,8 @@ msgid "Security" msgstr "Varnost" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "Prosto: %s od %s" #: winemine.rc:34 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 1c7b1a9efd0..d3c2c5f99fd 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -10861,7 +10861,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 1db52af0d61..461d53888a7 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -10942,7 +10942,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/sv.po b/po/sv.po index 720562c3872..8043fcc1263 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10907,7 +10907,8 @@ msgid "Security" msgstr "Säkerhet" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s av %s ledigt" #: winemine.rc:34 diff --git a/po/te.po b/po/te.po index a073ecc4b04..bd568b1cd5e 100644 --- a/po/te.po +++ b/po/te.po @@ -10328,7 +10328,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/th.po b/po/th.po index 3d7e7c68478..37ae6fc9b88 100644 --- a/po/th.po +++ b/po/th.po @@ -10476,7 +10476,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/tr.po b/po/tr.po index 25f9945d987..0fb21e87fe2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11206,7 +11206,8 @@ msgid "Security" msgstr "Güvenlik" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s / %s boş" #: winemine.rc:34 diff --git a/po/uk.po b/po/uk.po index 4cc1954766d..8ee408a1e4b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -10890,7 +10890,8 @@ msgid "Security" msgstr "Безпека" #: winefile.rc:120 -msgid "%s of %s free" +#, fuzzy +msgid "%1 of %2 free" msgstr "%s з %s вільно" #: winemine.rc:34 diff --git a/po/wa.po b/po/wa.po index 69c07eb036a..e1bc05d05cc 100644 --- a/po/wa.po +++ b/po/wa.po @@ -10435,7 +10435,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/wine.pot b/po/wine.pot index 75712a98443..85eea7d68eb 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -10295,7 +10295,7 @@ msgid "Security" msgstr "" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/zh_CN.po b/po/zh_CN.po index 4a320733678..9a4722f1cd0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10823,7 +10823,7 @@ msgid "Security" msgstr "安全(&S)" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/po/zh_TW.po b/po/zh_TW.po index c559ccc3e7d..47372ed8cd5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10866,7 +10866,7 @@ msgid "Security" msgstr "安全(&S)" #: winefile.rc:120 -msgid "%s of %s free" +msgid "%1 of %2 free" msgstr "" #: winemine.rc:34 diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index fb9f6d06d12..638adeb36e1 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2774,9 +2774,14 @@ static void set_space_status(void) WCHAR fmt[64], b1[64], b2[64], buffer[BUFFER_LEN]; if (GetDiskFreeSpaceExW(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { + DWORD_PTR args[2]; format_bytes(b1, ulFreeBytesToCaller.QuadPart); format_bytes(b2, ulTotalBytes.QuadPart); - wsprintfW(buffer, RS(fmt,IDS_FREE_SPACE_FMT), b1, b2); + args[0] = (DWORD_PTR)b1; + args[1] = (DWORD_PTR)b2; + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, + sizeof(buffer)/sizeof(*buffer), (__ms_va_list*)args); } else lstrcpyW(buffer, sQMarks); diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 78391a54510..4ef3b689b7d 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -117,7 +117,7 @@ STRINGTABLE IDS_COL_ATTR "Attributes" IDS_COL_SEC "Security" - IDS_FREE_SPACE_FMT "%s of %s free" + IDS_FREE_SPACE_FMT "%1 of %2 free" } LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL