ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Remove conflicts between resource.h and mshtmcid.h.

This commit is contained in:
Jacek Caban 2006-09-27 16:36:19 +02:00 committed by Alexandre Julliard
parent 335144dc04
commit 5c7078b268
13 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mshtml/Bg.rc
View File

@ -65,7 +65,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Êî&äèðîâêà", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "Ïå&÷àò", IDM_PRINT
MENUITEM "Îïð&åñíè", IDM_REFRESH
MENUITEM "Îïð&åñíè", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Ñâî&éñòâà", IDM_PROPERTIES
@ -117,7 +117,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Êëåòêà", IDM_CELL
MENUITEM "&Ðåä", IDM_ROW
MENUITEM "&Êîëîíà", IDM_COLUMN
MENUITEM "&Òàáëèöà", IDM_TABLE
MENUITEM "&Òàáëèöà", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -179,7 +179,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Âúçïðîèçâåäè", IDM_PLAY
MENUITEM "Ñïðè", IDM_STOP
MENUITEM "Ñïðè", IDM_DYNSRCSTOP
MENUITEM "&Ñâîéñòâà", IDM_PROPERTIES
}
@ -203,7 +203,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Äîáàâè êúì îò&ìåòêèòå...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Âúçïðîèçâåäè", IDM_PLAY
MENUITEM "Ñïðè", IDM_STOP
MENUITEM "Ñïðè", IDM_DYNSRCSTOP
MENUITEM "Âúðíè ñå â íà÷àëîòî", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/De.rc
View File

@ -51,7 +51,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Textkodierung", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "&Drucken", IDM_PRINT
MENUITEM "A&ktualisieren", IDM_REFRESH
MENUITEM "A&ktualisieren", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Eigenschaften", IDM_PROPERTIES
@ -103,7 +103,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Zelle", IDM_CELL
MENUITEM "Zei&le", IDM_ROW
MENUITEM "&Spalte", IDM_COLUMN
MENUITEM "&Tabelle", IDM_TABLE
MENUITEM "&Tabelle", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -165,7 +165,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Abspielen", IDM_PLAY
MENUITEM "Halt", IDM_STOP
MENUITEM "Halt", IDM_DYNSRCSTOP
MENUITEM "&Eigenschaften", IDM_PROPERTIES
}
@ -189,7 +189,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Abspielen", IDM_PLAY
MENUITEM "Anhalten", IDM_STOP
MENUITEM "Anhalten", IDM_DYNSRCSTOP
MENUITEM "Rückspulen", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/En.rc
View File

@ -64,7 +64,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Encoding", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "Pr&int", IDM_PRINT
MENUITEM "&Refresh", IDM_REFRESH
MENUITEM "&Refresh", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Properties", IDM_PROPERTIES
@ -116,7 +116,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Cell", IDM_CELL
MENUITEM "&Row", IDM_ROW
MENUITEM "&Column", IDM_COLUMN
MENUITEM "&Table", IDM_TABLE
MENUITEM "&Table", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -178,7 +178,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Play", IDM_PLAY
MENUITEM "Stop", IDM_STOP
MENUITEM "Stop", IDM_DYNSRCSTOP
MENUITEM "P&roperties", IDM_PROPERTIES
}
@ -202,7 +202,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Add to &Favorites...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Play", IDM_PLAY
MENUITEM "Stop", IDM_STOP
MENUITEM "Stop", IDM_DYNSRCSTOP
MENUITEM "Rewind", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Fi.rc
View File

@ -51,7 +51,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Koo&daus", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "Tul&osta", IDM_PRINT
MENUITEM "P&äivitä", IDM_REFRESH
MENUITEM "P&äivitä", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "O&minaisuudet", IDM_PROPERTIES
@ -103,7 +103,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Solu", IDM_CELL
MENUITEM "&Rivi", IDM_ROW
MENUITEM "&Palsta", IDM_COLUMN
MENUITEM "&Taulukko", IDM_TABLE
MENUITEM "&Taulukko", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -165,7 +165,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Toista", IDM_PLAY
MENUITEM "P&ysäytä", IDM_STOP
MENUITEM "P&ysäytä", IDM_DYNSRCSTOP
MENUITEM "O&minaisuuedet", IDM_PROPERTIES
}
@ -189,7 +189,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Lis&ää Suosikkeihin...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "&Toista", IDM_PLAY
MENUITEM "P&ysäytä", IDM_STOP
MENUITEM "P&ysäytä", IDM_DYNSRCSTOP
MENUITEM "Al&kuun", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Fr.rc
View File

@ -67,7 +67,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Co&dage", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "&Imprimer", IDM_PRINT
MENUITEM "Actualis&er", IDM_REFRESH
MENUITEM "Actualis&er", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Propriétés", IDM_PROPERTIES
@ -119,7 +119,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&cellule", IDM_CELL
MENUITEM "&ligne", IDM_ROW
MENUITEM "c&olonne", IDM_COLUMN
MENUITEM "&table", IDM_TABLE
MENUITEM "&table", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -181,7 +181,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Lecture", IDM_PLAY
MENUITEM "Arrêt", IDM_STOP
MENUITEM "Arrêt", IDM_DYNSRCSTOP
MENUITEM "&Propriétés", IDM_PROPERTIES
}
@ -205,7 +205,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Ajouter au&x Favoris...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Lecture", IDM_PLAY
MENUITEM "Arrêt", IDM_STOP
MENUITEM "Arrêt", IDM_DYNSRCSTOP
MENUITEM "Retour arrière", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Hu.rc
View File

@ -49,7 +49,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "K&ódolás", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "&Nyomtatás", IDM_PRINT
MENUITEM "F&rissítés", IDM_REFRESH
MENUITEM "F&rissítés", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Tula&jdonságok", IDM_PROPERTIES
@ -101,7 +101,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Cella", IDM_CELL
MENUITEM "&Sor", IDM_ROW
MENUITEM "&Oszlop", IDM_COLUMN
MENUITEM "&Tábla", IDM_TABLE
MENUITEM "&Tábla", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -164,7 +164,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Lejátszás", IDM_PLAY
MENUITEM "Leállítás", IDM_STOP
MENUITEM "Leállítás", IDM_DYNSRCSTOP
MENUITEM "Tula&jdonságok", IDM_PROPERTIES
}
@ -188,7 +188,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Hozzáa&dás a kedvencekhez...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Lejátszás", IDM_PLAY
MENUITEM "Leállítás", IDM_STOP
MENUITEM "Leállítás", IDM_DYNSRCSTOP
MENUITEM "Visszatekerés", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Ko.rc
View File

@ -66,7 +66,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "인코딩(&E)", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "인쇄(&I)", IDM_PRINT
MENUITEM "다시 읽기(&R)", IDM_REFRESH
MENUITEM "다시 읽기(&R)", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "옵션(&P)", IDM_PROPERTIES
@ -118,7 +118,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "칸(&C)", IDM_CELL
MENUITEM "가로줄(&R)", IDM_ROW
MENUITEM "세로줄(&C)", IDM_COLUMN
MENUITEM "표(&T)", IDM_TABLE
MENUITEM "표(&T)", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -180,7 +180,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "재생", IDM_PLAY
MENUITEM "정지", IDM_STOP
MENUITEM "정지", IDM_DYNSRCSTOP
MENUITEM "속성(&R)", IDM_PROPERTIES
}
@ -204,7 +204,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "즐겨찾기에 더하기(&F)...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "재생", IDM_PLAY
MENUITEM "정지", IDM_STOP
MENUITEM "정지", IDM_DYNSRCSTOP
MENUITEM "다시 감기", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Nl.rc
View File

@ -51,7 +51,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Tekstcodering", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "&Afdrukken", IDM_PRINT
MENUITEM "A&ctualiseren", IDM_REFRESH
MENUITEM "A&ctualiseren", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Eigenschappen", IDM_PROPERTIES
@ -103,7 +103,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Cel", IDM_CELL
MENUITEM "&Regel", IDM_ROW
MENUITEM "&Kolom", IDM_COLUMN
MENUITEM "&Tabel", IDM_TABLE
MENUITEM "&Tabel", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -165,7 +165,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Afspelen", IDM_PLAY
MENUITEM "Stop", IDM_STOP
MENUITEM "Stop", IDM_DYNSRCSTOP
MENUITEM "&Eigenschappen", IDM_PROPERTIES
}
@ -189,7 +189,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Aan &favorieten toevoegen...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Afspelen", IDM_PLAY
MENUITEM "Stop", IDM_STOP
MENUITEM "Stop", IDM_DYNSRCSTOP
MENUITEM "Terugspoelen", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/No.rc
View File

@ -64,7 +64,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "K&oding", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "Skr&iv ut", IDM_PRINT
MENUITEM "Oppdate&r", IDM_REFRESH
MENUITEM "Oppdate&r", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Egenska&per", IDM_PROPERTIES
@ -116,7 +116,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Celle", IDM_CELL
MENUITEM "&Rad", IDM_ROW
MENUITEM "&Kolonne", IDM_COLUMN
MENUITEM "&Tabell", IDM_TABLE
MENUITEM "&Tabell", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -178,7 +178,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Spill av", IDM_PLAY
MENUITEM "Stopp", IDM_STOP
MENUITEM "Stopp", IDM_DYNSRCSTOP
MENUITEM "Egenskape&r", IDM_PROPERTIES
}
@ -202,7 +202,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Legg til i &Favoritter . . .", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Spill av", IDM_PLAY
MENUITEM "Stopp", IDM_STOP
MENUITEM "Stopp", IDM_DYNSRCSTOP
MENUITEM "Spol tilbake", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Sv.rc
View File

@ -64,7 +64,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Tecken&kodning", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "Skriv &ut", IDM_PRINT
MENUITEM "Upp&datera", IDM_REFRESH
MENUITEM "Upp&datera", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Egenskapar", IDM_PROPERTIES
@ -116,7 +116,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Cell", IDM_CELL
MENUITEM "&Rad", IDM_ROW
MENUITEM "&Kolumn", IDM_COLUMN
MENUITEM "&Tabell", IDM_TABLE
MENUITEM "&Tabell", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -178,7 +178,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Spela upp", IDM_PLAY
MENUITEM "Stoppa", IDM_STOP
MENUITEM "Stoppa", IDM_DYNSRCSTOP
MENUITEM "&Egenskaper", IDM_PROPERTIES
}
@ -202,7 +202,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Lägg till &i Favoriter...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Spela upp", IDM_PLAY
MENUITEM "Stoppa", IDM_STOP
MENUITEM "Stoppa", IDM_DYNSRCSTOP
MENUITEM "Spola tillbaka", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

8
dlls/mshtml/Tr.rc
View File

@ -64,7 +64,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Kodlama", IDM_ENCODING
MENUITEM SEPARATOR
MENUITEM "Ya&zdýr", IDM_PRINT
MENUITEM "&Yenile", IDM_REFRESH
MENUITEM "&Yenile", _IDM_REFRESH
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "&Özellikler", IDM_PROPERTIES
@ -116,7 +116,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "&Hücre", IDM_CELL
MENUITEM "&Satýr", IDM_ROW
MENUITEM "&Sütun", IDM_COLUMN
MENUITEM "&Tablo", IDM_TABLE
MENUITEM "&Tablo", IDM_TABLESELECT
}
MENUITEM SEPARATOR
MENUITEM SEPARATOR
@ -178,7 +178,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM SEPARATOR
MENUITEM SEPARATOR
MENUITEM "Yürüt", IDM_PLAY
MENUITEM "Durdur", IDM_STOP
MENUITEM "Durdur", IDM_DYNSRCSTOP
MENUITEM "&Özellikler", IDM_PROPERTIES
}
@ -202,7 +202,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
MENUITEM "Sýk Ku&llanýlanlara Ekle...", IDM_ADDTOFAVOURITES
MENUITEM SEPARATOR
MENUITEM "Yürüt", IDM_PLAY
MENUITEM "Durdur", IDM_STOP
MENUITEM "Durdur", IDM_DYNSRCSTOP
MENUITEM "Geri Çevir", IDM_REWIND
MENUITEM SEPARATOR
MENUITEM SEPARATOR

4
dlls/mshtml/resource.h
View File

@ -51,7 +51,6 @@
#define IDM_CELL 2206
#define IDM_ROW 2207
#define IDM_COLUMN 2208
#define IDM_TABLE 2209
#define IDM_TABLEPROPERTIES 2210
#define IDM_CELLPROPERTIES 2211
@ -66,7 +65,6 @@
#define IDM_SHOWPICTURE 2269
#define IDM_SAVEPICTUREAS 2270
#define IDM_PLAY 2271
#define IDM_STOP 2272
#define IDM_PRINTTARGET 2273
#define IDM_REWIND 2276
@ -111,4 +109,4 @@
#define IDM_DUMPFORMATCACHES 6016
#define IDM_DUMPLAYOUTRECTS 6017
#define IDM_REFRESH 6042
#define _IDM_REFRESH 6042

1
dlls/mshtml/rsrc.rc
View File

@ -19,6 +19,7 @@
#include "windef.h"
#include "winuser.h"
#include "commctrl.h"
#include "mshtmcid.h"
#include "resource.h"