avifil32: The stream format string cannot really be translated so remove it from the resources.

dlls/avifil32/avifil32.rc

@@ -30,7 +30,6 @@ STRINGTABLE
   IDS_ALLFILES		"All files (*.*)"
   IDS_VIDEO		"video"
   IDS_AUDIO		"audio"
-  IDS_AVISTREAMFORMAT	"%s %s #%d"
   IDS_AVIFILETYPE	"Wine AVI-default-filehandler"
   IDS_UNCOMPRESSED      "uncompressed"
 }

dlls/avifil32/avifile.c

@@ -1746,10 +1746,10 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
 	case ckidSTREAMHEADER:
 	  {
 	    static const WCHAR streamTypeFmt[] = {'%','4','.','4','h','s',0};
+	    static const WCHAR streamNameFmt[] = {'%','s',' ','%','s',' ','#','%','d',0};
 
 	    AVIStreamHeader streamHdr;
 	    WCHAR           szType[25];
-	    WCHAR           streamNameFmt[25];
 	    UINT            count;
 	    LONG            n = ck.cksize;
 
@@ -1796,8 +1796,6 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
 
 	    memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName));
 
-	    LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)/sizeof(streamNameFmt[0]));
-
 	    /* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */
 	    wsprintfW(pStream->sInfo.szName, streamNameFmt,
 		      AVIFILE_BasenameW(This->szFileName), szType, count);

dlls/avifil32/avifile_private.h

@@ -49,7 +49,6 @@
 #define IDS_ALLFILES         0x0185
 #define IDS_VIDEO            0x0189
 #define IDS_AUDIO            0x0190
-#define IDS_AVISTREAMFORMAT  0x0191
 #define IDS_AVIFILETYPE      0x0192
 #define IDS_UNCOMPRESSED     0x0193
 

po/ar.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/bg.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/ca.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/cs.po

@@ -120,14 +120,10 @@ msgid "audio"
 msgstr "audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "nekomprimovaný"
 

po/da.po

@@ -121,14 +121,10 @@ msgid "audio"
 msgstr "lyd"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-standard-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "ukomprimeret"
 

po/de.po

@@ -109,14 +109,10 @@ msgid "audio"
 msgstr "Audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-Standard-Dateibehandlungsroutine"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "Unkomprimiert"
 

po/el.po

@@ -106,14 +106,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/en.po

@@ -107,14 +107,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/en_US.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr "audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "uncompressed"
 

po/eo.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/es.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr "audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Manejador de archivo AVI por defecto de Wine"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "sin compresión"
 

po/fa.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/fi.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/fr.po

@@ -112,14 +112,10 @@ msgid "audio"
 msgstr "audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Gestionnaire de fichiers AVI par défaut de Wine"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "non compressé"
 

po/he.po

@@ -110,14 +110,10 @@ msgid "audio"
 msgstr "שמע"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s מס׳ %d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "ללא דחיסה"
 

po/hi.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/hu.po

@@ -117,14 +117,10 @@ msgid "audio"
 msgstr "hang"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-alapértelmezett-fájlkezelő"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "tömörítetlen"
 

po/it.po

@@ -113,14 +113,10 @@ msgid "audio"
 msgstr "Audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Gestore predefinito di Wine dei file AVI"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "Non compresso"
 

po/ja.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr "音声"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "未圧縮"
 

po/ko.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr "오디오"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-기본-파일핸들러"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "압축안됨"
 

po/lt.po

@@ -114,14 +114,10 @@ msgid "audio"
 msgstr "garsas"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine numatyta-AVI-doroklė"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "neglaudintas"
 

po/ml.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/nb_NO.po

@@ -109,14 +109,10 @@ msgid "audio"
 msgstr "lyd"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine standardfilhåndterer for AVI"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "ukomprimert"
 

po/nl.po

@@ -113,14 +113,10 @@ msgid "audio"
 msgstr "audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-standaard-bestandskoppeling"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "ongecomprimeerd"
 

po/or.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/pa.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/pl.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr "dźwięk"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-domyślna-obsługa-pliku"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "nie skompresowany"
 

po/pt_BR.po

@@ -111,14 +111,10 @@ msgid "audio"
 msgstr "áudio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Manipulador de AVI padrão do Wine"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "sem compressão"
 

po/pt_PT.po

@@ -116,14 +116,10 @@ msgid "audio"
 msgstr "áudio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Manipulador AVI Wine predefinido"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "sem compressão"
 

po/rm.po

@@ -107,14 +107,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/ro.po

@@ -110,14 +110,10 @@ msgid "audio"
 msgstr "audio"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Tratare implicită Wine pentru AVI"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "necomprimat"
 

po/ru.po

@@ -110,14 +110,10 @@ msgid "audio"
 msgstr "аудио"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Обработчик по умолчанию avi-файлов в Wine"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "без сжатия"
 

po/sk.po

@@ -108,14 +108,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/sl.po

@@ -113,14 +113,10 @@ msgid "audio"
 msgstr "zvok"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine privzeti-upravljalnik-AVI-datotek"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "nestisnjeno"
 

po/sr_RS@cyrillic.po

@@ -114,14 +114,10 @@ msgid "audio"
 msgstr "аудио запис"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "несажето"
 

po/sr_RS@latin.po

@@ -124,14 +124,10 @@ msgid "audio"
 msgstr "audio zapis"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "nesažeto"
 

po/sv.po

@@ -112,14 +112,10 @@ msgid "audio"
 msgstr "ljud"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-standardfilhanterare"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "okomprimerad"
 

po/te.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/th.po

@@ -105,14 +105,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/tr.po

@@ -117,14 +117,10 @@ msgid "audio"
 msgstr "ses"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-default-filehandler"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "sıkıştırılmamış"
 

po/uk.po

@@ -109,14 +109,10 @@ msgid "audio"
 msgstr "аудіо"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine обробник AVI-файлів за замовчуванням"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "без стиснення"
 

po/wa.po

@@ -106,14 +106,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/wine.pot

@@ -102,14 +102,10 @@ msgid "audio"
 msgstr ""
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr ""
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr ""
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr ""
 

po/zh_CN.po

@@ -107,14 +107,10 @@ msgid "audio"
 msgstr "音频"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-默认处理器"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "未压缩"
 

po/zh_TW.po

@@ -112,14 +112,10 @@ msgid "audio"
 msgstr "音頻"
 
 #: avifil32.rc:33
-msgid "%s %s #%d"
-msgstr "%s %s #%d"
-
-#: avifil32.rc:34
 msgid "Wine AVI-default-filehandler"
 msgstr "Wine AVI-默認處理器"
 
-#: avifil32.rc:35
+#: avifil32.rc:34
 msgid "uncompressed"
 msgstr "未壓縮"