marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winefile: Fix a string resource so its format placeholders can be reordered.

oldstable
Francois Gouget 2011-10-20 14:48:10 +02:00 committed by Alexandre Julliard
parent 4ac1e8e034
commit bdfc307ff7
47 changed files with 75 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/ar.po
View File

@ -10464,7 +10464,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/bg.po
View File

@ -10621,7 +10621,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/ca.po
View File

@ -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

3
po/cs.po
View File

@ -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

3
po/da.po
View File

@ -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

3
po/de.po
View File

@ -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

2
po/el.po
View File

@ -10462,7 +10462,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/en.po
View File

@ -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

4
po/en_US.po
View File

@ -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"

2
po/eo.po
View File

@ -10638,7 +10638,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/es.po
View File

@ -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

2
po/fa.po
View File

@ -10467,7 +10467,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/fi.po
View File

@ -10758,7 +10758,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/fr.po
View File

@ -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

3
po/he.po
View File

@ -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

2
po/hi.po
View File

@ -10328,7 +10328,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/hu.po
View File

@ -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

3
po/it.po
View File

@ -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

3
po/ja.po
View File

@ -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

3
po/ko.po
View File

@ -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

3
po/lt.po
View File

@ -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

2
po/ml.po
View File

@ -10328,7 +10328,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/nb_NO.po
View File

@ -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

3
po/nl.po
View File

@ -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

2
po/or.po
View File

@ -10328,7 +10328,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/pa.po
View File

@ -10328,7 +10328,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/pl.po
View File

@ -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

3
po/pt_BR.po
View File

@ -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

3
po/pt_PT.po
View File

@ -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

2
po/rm.po
View File

@ -10376,7 +10376,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/ro.po
View File

@ -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

3
po/ru.po
View File

@ -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

2
po/sk.po
View File

@ -10477,7 +10477,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/sl.po
View File

@ -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

2
po/sr_RS@cyrillic.po
View File

@ -10861,7 +10861,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/sr_RS@latin.po
View File

@ -10942,7 +10942,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/sv.po
View File

@ -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

2
po/te.po
View File

@ -10328,7 +10328,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/th.po
View File

@ -10476,7 +10476,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

3
po/tr.po
View File

@ -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

3
po/uk.po
View File

@ -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

2
po/wa.po
View File

@ -10435,7 +10435,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/wine.pot
View File

@ -10295,7 +10295,7 @@ msgid "Security"
msgstr ""
#: winefile.rc:120
msgid "%s of %s free"
msgid "%1 of %2 free"
msgstr ""
#: winemine.rc:34

2
po/zh_CN.po
View File

@ -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

2
po/zh_TW.po
View File

@ -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

7
programs/winefile/winefile.c
View File

@ -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);

2
programs/winefile/winefile.rc
View File

@ -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