[akhaldi] 70074: [OLEDLG] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Mon Nov 23 20:43:09 2015
New Revision: 70074

URL: http://svn.reactos.org/svn/reactos?rev=70074&view=rev
Log:
[OLEDLG] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
    trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
    trunk/reactos/dll/win32/oledlg/oledlg_main.c
    trunk/reactos/dll/win32/oledlg/resource.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -31,7 +31,9 @@
   IDS_NOTOLEMOD         "Soubor není platným OLE modulem. Nelze registrovat OLE propojení."
   IDS_NOTOLEMODCAPTION  "Přidat propojení"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -28,7 +28,9 @@
   IDS_NOTOLEMOD         "Filen ser ikke ud til at være et gyldig OLE modul. Kunne ikke registrere OLE control'en."
   IDS_NOTOLEMODCAPTION  "Tilføj control"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -28,7 +28,9 @@
   IDS_NOTOLEMOD         "Die Datei ist offenbar kein gültiges OLE-Steuermodul. Die OLE-Steuerung konnte nicht registriert werden."
   IDS_NOTOLEMODCAPTION  "Steuerung hinzufügen"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -26,7 +26,9 @@
   IDS_NOTOLEMOD         "File does not appear to be a valid OLE module. Unable to register OLE control."
   IDS_NOTOLEMODCAPTION  "Add Control"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -26,7 +26,9 @@
   IDS_NOTOLEMOD         "El archivo no parece ser un módulo OLE válido. Incapaz de registrar el control OLE."
   IDS_NOTOLEMODCAPTION  "Añadir control"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -33,7 +33,9 @@
   IDS_NOTOLEMOD         "Le fichier ne semble pas être un module OLE valide. Impossible d'enregistrer le contrôle OLE."
   IDS_NOTOLEMODCAPTION  "Ajouter un contrôle"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -28,7 +28,9 @@
   IDS_NOTOLEMOD         "File does not appear to be a valid OLE module. Unable to register OLE control."
   IDS_NOTOLEMODCAPTION  "הוספת בקר"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -29,7 +29,9 @@
   IDS_NOTOLEMOD         "A fájl úgy tűnik nem egy érvényes OLE modul. Nem tudom regisztrálni az OLE vezérlőt."
   IDS_NOTOLEMODCAPTION  "Vezérlő hozzáadása"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -30,7 +30,9 @@
   IDS_NOTOLEMOD         "Il file non sembra essere un modulo OLE valido. Impossibile registrare il controllo OLE."
   IDS_NOTOLEMODCAPTION  "Aggiungi Controllo"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -29,7 +29,9 @@
   IDS_NOTOLEMOD         "ファイルは有効なOLEモジュールではないようです。OLEコントロールを登録できません。"
   IDS_NOTOLEMODCAPTION  "ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚’è¿½åŠ "
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -27,7 +27,9 @@
   IDS_NOTOLEMOD         "이 파일은 올바른 OLE모듈이 아닌거로 보입니다. OLE컨트롤을 ë“±ë¡í• ìˆ˜ 없습니다."
   IDS_NOTOLEMODCAPTION  "컨트롤 더하기"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -29,7 +29,9 @@
   IDS_NOTOLEMOD         "Panašu, kad failas nėra galiojantis OLE modulis. Nepavyko užregistruoti OLE valdiklio."
   IDS_NOTOLEMODCAPTION  "Pridėti valdiklį"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -30,7 +30,9 @@
   IDS_NOTOLEMOD         "Het bestand is geen geldig OLE bestand. De registratie is mislukt."
   IDS_NOTOLEMODCAPTION  "Toevoegen"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -26,7 +26,9 @@
   IDS_NOTOLEMOD         "Filen ser ikke ut til å være en gyldig OLE-modul. Kunne ikke registrere OLE-kontroller."
   IDS_NOTOLEMODCAPTION  "Legg til kontroller"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -27,7 +27,9 @@
   IDS_NOTOLEMOD         "Plik nie wydaje się być poprawnym modułem OLE. Nie udało się zarejestrować kontrolki OLE."
   IDS_NOTOLEMODCAPTION  "Dodaj kontrolkę"
   IDS_VERBMENU_OBJECT   "&Obiekt"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Konwertuj..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -31,7 +31,9 @@
   IDS_NOTOLEMOD         "O arquivo não parece ser um módulo OLE válido. Impossível registrar o controle OLE."
   IDS_NOTOLEMODCAPTION  "Adicionar Controle"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE
@@ -111,7 +113,9 @@
   IDS_NOTOLEMOD         "O ficheiro não parece ser um módulo OLE válido. Impossível registrar o controlo OLE."
   IDS_NOTOLEMODCAPTION  "Adicionar Controlo"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -31,7 +31,9 @@
   IDS_NOTOLEMOD         "Fișierul nu pare a fi un modul OLE valid. Nu se poate înregistra controlul OLE."
   IDS_NOTOLEMODCAPTION  "Adaugă un control"
   IDS_VERBMENU_OBJECT   "&Obiect"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convertire…"
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -29,7 +29,9 @@
   IDS_NOTOLEMOD         "Файл не является корректным модулем OLE. Невозможно зарегистрировать элемент управления OLE."
   IDS_NOTOLEMODCAPTION  "Добавить элемент управления"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -28,7 +28,9 @@
   IDS_NOTOLEMOD         "Datoteka ni veljaven OLE modul. OLE kontrole ni mogoče registrirati."
   IDS_NOTOLEMODCAPTION  "Dodajanje kontrole"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -29,7 +29,9 @@
   IDS_NOTOLEMOD         "Dokument nuk duket të ketë një modul të vlefshme OLE. Në pamundësi për të regjistruar kontrollin OLE."
   IDS_NOTOLEMODCAPTION  "Shto Kontroll"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -26,7 +26,9 @@
   IDS_NOTOLEMOD         "File does not appear to be a valid OLE module. Unable to register OLE control."
   IDS_NOTOLEMODCAPTION  "Add Control"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -28,7 +28,9 @@
   IDS_NOTOLEMOD         "Kütük, geçerli bir OLE parçası olarak görünmüyor. OLE denetimi saklanamıyor."
   IDS_NOTOLEMODCAPTION  "Denetim Ekle"
   IDS_VERBMENU_OBJECT   "&Nesne"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Dönüştür..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -29,7 +29,9 @@
   IDS_NOTOLEMOD         "Файл не є модулем управління OLE.  Не вдається зареєструвати елемент управління OLE."
   IDS_NOTOLEMODCAPTION  "Додати елемент управління"
   IDS_VERBMENU_OBJECT   "&Object"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "&Convert..."
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oledl...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -31,7 +31,9 @@
   IDS_NOTOLEMOD         "本文件不像是一个有效的 OLE 模型. 不能注册 OLE 控件."
   IDS_NOTOLEMODCAPTION  "æ·»åŠ æŽ§ä»¶"
   IDS_VERBMENU_OBJECT   "对象 (&O)"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "转换... (&C)"
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE
@@ -111,7 +113,9 @@
   IDS_NOTOLEMOD         "本檔案不像是一個有效的 OLE 模型. 不能註冊 OLE 控件."
   IDS_NOTOLEMODCAPTION  "æ·»åŠ æŽ§ä»¶"
   IDS_VERBMENU_OBJECT   "對象 (&O)"
+  IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object"
   IDS_VERBMENU_CONVERT  "轉換... (&C)"
+  IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object"
 }

STRINGTABLE

Modified: trunk/reactos/dll/win32/oledlg/oledlg_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_mai...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_main.c	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -143,14 +143,15 @@
 BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype,
     HMENU hMenu, UINT uPos, UINT idmin, UINT idmax, BOOL addConvert, UINT idConvert, HMENU *ret_submenu)
 {
-    static const WCHAR spaceW[] = {' ',0};
     IEnumOLEVERB *enumverbs = NULL;
-    WCHAR *rootname, *objecttype;
     LPOLESTR usertype = NULL;
     OLEVERB firstverb, verb;
+    WCHAR *objecttype;
     WCHAR resstrW[32]; /* should be enough */
+    DWORD_PTR args[2];
     BOOL singleverb;
     HMENU submenu;
+    WCHAR *str;

TRACE("(%p, %s, %p, %d, %d, %d, %d, %d, %p)\n", object, debugstr_w(shorttype),
         hMenu, uPos, idmin, idmax, addConvert, idConvert, ret_submenu);
@@ -167,7 +168,7 @@

LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR));
     /* no object, or object without enumeration support */
-    if (!object || (object && !enumverbs)) {
+    if (!object || !enumverbs) {
         InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING|MF_GRAYED, idmin, resstrW);
         return FALSE;
     }
@@ -178,12 +179,6 @@
     else
         objecttype = (WCHAR*)shorttype;

-    rootname = CoTaskMemAlloc((strlenW(objecttype) + strlenW(resstrW) + 2)*sizeof(WCHAR));
-    strcpyW(rootname, objecttype);
-    strcatW(rootname, spaceW);
-    strcatW(rootname, resstrW);
-    CoTaskMemFree(usertype);
-
     /* iterate through verbs */

/* find first suitable verb */
@@ -191,18 +186,20 @@
     singleverb = get_next_insertable_verb(enumverbs, idmin, idmax, &verb) != S_OK;

if (singleverb && !addConvert) {
-        WCHAR *str = CoTaskMemAlloc((strlenW(rootname) + strlenW(firstverb.lpszVerbName) + 2)*sizeof(WCHAR));
-
-        strcpyW(str, firstverb.lpszVerbName);
-        strcatW(str, spaceW);
-        strcatW(str, rootname);
+        LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR));
+
+        args[0] = (DWORD_PTR)firstverb.lpszVerbName;
+        args[1] = (DWORD_PTR)objecttype;
+
+        FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+            resstrW, 0, 0, (WCHAR*)&str, 0, (__ms_va_list*)args);

RemoveMenu(hMenu, uPos, MF_BYPOSITION);
         InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING, idmin, str);
         CoTaskMemFree(firstverb.lpszVerbName);
-        CoTaskMemFree(rootname);
-        CoTaskMemFree(str);
+        HeapFree(GetProcessHeap(), 0, str);
         IEnumOLEVERB_Release(enumverbs);
+        CoTaskMemFree(usertype);
         return TRUE;
     }

@@ -231,9 +228,16 @@
         *ret_submenu = submenu;

/* now submenu is ready, add root entry to original menu, attach submenu */
-    InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_POPUP|MF_STRING, (UINT_PTR)submenu, rootname);
+    LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, sizeof(resstrW)/sizeof(WCHAR));
+
+    args[0] = (DWORD_PTR)objecttype;
+    FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+        resstrW, 0, 0, (WCHAR*)&str, 0, (__ms_va_list*)args);
+
+    InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_POPUP|MF_STRING, (UINT_PTR)submenu, str);
+    HeapFree(GetProcessHeap(), 0, str);
     IEnumOLEVERB_Release(enumverbs);
-    CoTaskMemFree(rootname);
+    CoTaskMemFree(usertype);
     return TRUE;
 }

Modified: trunk/reactos/dll/win32/oledlg/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.h...
==============================================================================
--- trunk/reactos/dll/win32/oledlg/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/resource.h	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -43,6 +43,8 @@

/* String ids for verb menu */
 #define IDS_VERBMENU_CONVERT            0x130
+#define IDS_VERBMENU_SINGLEVERB_OBJECT  0x132
+#define IDS_VERBMENU_OBJECT_WITH_NAME   0x134
 #define IDS_VERBMENU_OBJECT             0x135

/* String ids for Paste Special */

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Nov 23 20:43:09 2015
@@ -147,7 +147,7 @@
 reactos/dll/win32/oleacc              # Synced to WineStaging-1.7.47
 reactos/dll/win32/oleaut32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/olecli32            # Synced to WineStaging-1.7.47
-reactos/dll/win32/oledlg              # Synced to WineStaging-1.7.47
+reactos/dll/win32/oledlg              # Synced to WineStaging-1.7.55
 reactos/dll/win32/olepro32            # Synced to WineStaging-1.7.47
 reactos/dll/win32/olesvr32            # Synced to WineStaging-1.7.47
 reactos/dll/win32/olethk32            # Synced to WineStaging-1.7.47