[PAINT]

* apply patch from [#CORE-7521] (paint fails silently if a file could not be opened)
* apply patch from [#CORE-7311] (fix and improve resource and UI) in modified form
New resource strings are involved => please check translations

svn path=/trunk/; revision=60850

diff --git a/reactos/base/applications/mspaint/definitions.h b/reactos/base/applications/mspaint/definitions.h
index 200ca9e..f616042 100644 (file)
--- a/reactos/base/applications/mspaint/definitions.h
+++ b/reactos/base/applications/mspaint/definitions.h
@@ -203,3 +203,5 @@
 #define IDS_INTNUMBERS  930
 #define IDS_PERCENTAGE  931
 #define IDS_ANGLE       932
+
+#define IDS_LOADERRORTEXT  933

diff --git a/reactos/base/applications/mspaint/lang/bg-BG.rc b/reactos/base/applications/mspaint/lang/bg-BG.rc
index 02e27a9..d77bbc4 100644 (file)
--- a/reactos/base/applications/mspaint/lang/bg-BG.rc
+++ b/reactos/base/applications/mspaint/lang/bg-BG.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/cs-CZ.rc b/reactos/base/applications/mspaint/lang/cs-CZ.rc
index 11ef885..fabcc65 100644 (file)
--- a/reactos/base/applications/mspaint/lang/cs-CZ.rc
+++ b/reactos/base/applications/mspaint/lang/cs-CZ.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/de-DE.rc b/reactos/base/applications/mspaint/lang/de-DE.rc
index 139eae0..99aca71 100644 (file)
--- a/reactos/base/applications/mspaint/lang/de-DE.rc
+++ b/reactos/base/applications/mspaint/lang/de-DE.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Bitte geben Sie nur ganze Zahlen ein!"
     IDS_PERCENTAGE, "Der Prozentsatz muss zwischen 1 und 500 liegen."
     IDS_ANGLE, "Der Winkel muss zwischen -89 und 89 liegen."
+    IDS_LOADERRORTEXT, "Die Datei %s konnte nicht geladen werden."
 END

diff --git a/reactos/base/applications/mspaint/lang/en-GB.rc b/reactos/base/applications/mspaint/lang/en-GB.rc
index e4ba6f0..17d01ed 100644 (file)
--- a/reactos/base/applications/mspaint/lang/en-GB.rc
+++ b/reactos/base/applications/mspaint/lang/en-GB.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/en-US.rc b/reactos/base/applications/mspaint/lang/en-US.rc
index 239ca59..4002375 100644 (file)
--- a/reactos/base/applications/mspaint/lang/en-US.rc
+++ b/reactos/base/applications/mspaint/lang/en-US.rc
@@ -26,32 +26,32 @@ BEGIN
 
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Undo\tCtrl+Z", IDM_EDITUNDO
-        MENUITEM "Redo\tCtrl+Y", IDM_EDITREDO
+        MENUITEM "&Undo\tCtrl+Z", IDM_EDITUNDO
+        MENUITEM "&Redo\tCtrl+Y", IDM_EDITREDO
         MENUITEM SEPARATOR
-        MENUITEM "Cut\tCtrl+X", IDM_EDITCUT
-        MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY
-        MENUITEM "Paste\tCtrl+V", IDM_EDITPASTE
-        MENUITEM "Delete selection\tDel", IDM_EDITDELETESELECTION
-        MENUITEM "Invert selection", IDM_EDITINVERTSELECTION
-        MENUITEM "Select all\tCtrl+A", IDM_EDITSELECTALL
+        MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT
+        MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY
+        MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE
+        MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION
+        MENUITEM "&Invert selection", IDM_EDITINVERTSELECTION
+        MENUITEM "Select &all\tCtrl+A", IDM_EDITSELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "Copy to...", IDM_EDITCOPYTO
-        MENUITEM "Paste from...", IDM_EDITPASTEFROM
+        MENUITEM "C&opy to...", IDM_EDITCOPYTO
+        MENUITEM "Paste &from...", IDM_EDITPASTEFROM
     END
 
     POPUP "&View"
     BEGIN
-        MENUITEM "Tool box\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
-        MENUITEM "Color palette\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
-        MENUITEM "Status bar", IDM_VIEWSTATUSBAR, CHECKED
-        MENUITEM "Text Toolbar", IDM_FORMATICONBAR, CHECKED, GRAYED
+        MENUITEM "&Tool box\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
+        MENUITEM "&Color palette\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
+        MENUITEM "&Status bar", IDM_VIEWSTATUSBAR, CHECKED
+        MENUITEM "T&ext Toolbar", IDM_FORMATICONBAR, CHECKED, GRAYED
         MENUITEM SEPARATOR
-        POPUP "Zoom"
+        POPUP "&Zoom"
         BEGIN
-            POPUP "User defined"
+            POPUP "&User defined"
             BEGIN
-                MENUITEM "12,5%", IDM_VIEWZOOM125
+                MENUITEM "12.5%", IDM_VIEWZOOM125
                 MENUITEM "25%", IDM_VIEWZOOM25
                 MENUITEM "50%", IDM_VIEWZOOM50
                 MENUITEM "100%", IDM_VIEWZOOM100
@@ -60,26 +60,26 @@ BEGIN
                 MENUITEM "800%", IDM_VIEWZOOM800
             END
             MENUITEM SEPARATOR
-            MENUITEM "Show grid\tCtrl+G", IDM_VIEWSHOWGRID
-            MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
+            MENUITEM "Show &grid\tCtrl+G", IDM_VIEWSHOWGRID
+            MENUITEM "S&how miniature", IDM_VIEWSHOWMINIATURE
         END
-        MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN
+        MENUITEM "&Full screen\tCtrl+F", IDM_VIEWFULLSCREEN
     END
 
     POPUP "&Image"
     BEGIN
-        MENUITEM "Rotate/Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR
-        MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW
-        MENUITEM "Crop", IDM_IMAGECROP
-        MENUITEM "Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS
-        MENUITEM "Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES
+        MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR
+        MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW
+        MENUITEM "&Crop", IDM_IMAGECROP
+        MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS
+        MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES
         MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE
-        MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE
+        MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE
     END
 
     POPUP "&Colors"
     BEGIN
-        MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE
+        MENUITEM "&Edit palette...", IDM_COLORSEDITPALETTE
         MENUITEM SEPARATOR
         MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE
         MENUITEM "Old palette", IDM_COLORSOLDPALETTE
@@ -87,9 +87,9 @@ BEGIN
 
     POPUP "&?"
     BEGIN
-        MENUITEM "Help topics", IDM_HELPHELPTOPICS
+        MENUITEM "&Help topics", IDM_HELPHELPTOPICS
         MENUITEM SEPARATOR
-        MENUITEM "Info", IDM_HELPINFO
+        MENUITEM "&Info", IDM_HELPINFO
     END
 END
 
@@ -122,12 +122,12 @@ FONT 8, "MS Shell Dlg"
 CAPTION "Rotate and mirror image"
 BEGIN
     GROUPBOX "Rotate or mirror", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86
-    AUTORADIOBUTTON "Mirror horizontally", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP
-    AUTORADIOBUTTON "Mirror vertically", IDD_MIRRORROTATERB2, 12, 30, 100, 10
-    AUTORADIOBUTTON "Rotate by an angle of", IDD_MIRRORROTATERB3, 12, 42, 100, 10
-    AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED
-    AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED
-    AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED
+    AUTORADIOBUTTON "Mirror &horizontally", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP
+    AUTORADIOBUTTON "Mirror &vertically", IDD_MIRRORROTATERB2, 12, 30, 100, 10
+    AUTORADIOBUTTON "&Rotate by an angle of", IDD_MIRRORROTATERB3, 12, 42, 100, 10
+    AUTORADIOBUTTON "&90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED
+    AUTORADIOBUTTON "&180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED
+    AUTORADIOBUTTON "&270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED
     DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14
     PUSHBUTTON "Cancel", IDCANCEL, 125, 24, 48, 14
 END
@@ -139,21 +139,21 @@ CAPTION "Attributes"
 BEGIN
     EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12
     EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12
-    LTEXT "Width:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10
-    LTEXT "Height:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10
-    LTEXT "File date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
-    LTEXT "File size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
-    LTEXT "Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
+    LTEXT "&Width:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10
+    LTEXT "&Height:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10
+    LTEXT "File &date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
+    LTEXT "File &size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
+    LTEXT "&Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
     LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10
     LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10
     LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10
     GROUPBOX "Units", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27
-    AUTORADIOBUTTON "Inches", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP
-    AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10
-    AUTORADIOBUTTON "Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10
+    AUTORADIOBUTTON "&Inches", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP
+    AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10
+    AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10
     GROUPBOX "Colors", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27
-    AUTORADIOBUTTON "Black and white", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
-    AUTORADIOBUTTON "Colors", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
+    AUTORADIOBUTTON "&Black and white", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
+    AUTORADIOBUTTON "Co&lors", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
     DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14
     PUSHBUTTON "Cancel", IDCANCEL, 170, 24, 48, 14
     PUSHBUTTON "Default", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/es-ES.rc b/reactos/base/applications/mspaint/lang/es-ES.rc
index 1a0fa94..1b56672 100644 (file)
--- a/reactos/base/applications/mspaint/lang/es-ES.rc
+++ b/reactos/base/applications/mspaint/lang/es-ES.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/eu-ES.rc b/reactos/base/applications/mspaint/lang/eu-ES.rc
index 7fe841a..7b5c25b 100644 (file)
--- a/reactos/base/applications/mspaint/lang/eu-ES.rc
+++ b/reactos/base/applications/mspaint/lang/eu-ES.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/fr-FR.rc b/reactos/base/applications/mspaint/lang/fr-FR.rc
index b0a39f6..1edeeca 100644 (file)
--- a/reactos/base/applications/mspaint/lang/fr-FR.rc
+++ b/reactos/base/applications/mspaint/lang/fr-FR.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/he-IL.rc b/reactos/base/applications/mspaint/lang/he-IL.rc
index 0ec2819..73b30da 100644 (file)
--- a/reactos/base/applications/mspaint/lang/he-IL.rc
+++ b/reactos/base/applications/mspaint/lang/he-IL.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/hu-HU.rc b/reactos/base/applications/mspaint/lang/hu-HU.rc
index 4558665..55a35d8 100644 (file)
--- a/reactos/base/applications/mspaint/lang/hu-HU.rc
+++ b/reactos/base/applications/mspaint/lang/hu-HU.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/it-IT.rc b/reactos/base/applications/mspaint/lang/it-IT.rc
index ac132b1..b2cde04 100644 (file)
--- a/reactos/base/applications/mspaint/lang/it-IT.rc
+++ b/reactos/base/applications/mspaint/lang/it-IT.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/ja-JP.rc b/reactos/base/applications/mspaint/lang/ja-JP.rc
index 35b7f85..157154c 100644 (file)
--- a/reactos/base/applications/mspaint/lang/ja-JP.rc
+++ b/reactos/base/applications/mspaint/lang/ja-JP.rc
@@ -3,7 +3,7 @@
  * LICENSE:     unknown (LGPL assumed)
  * FILE:        base/applications/mspaint/lang/ja-JP.rc
  * PURPOSE:     Japanese Language resource file
- * TRANSLATORS: pcds90net, Tomoya Kitagawa
+ * TRANSLATORS: pcds90net, Tomoya Kitagawa, Katayama Hirofumi MZ
  */
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
@@ -26,32 +26,32 @@ BEGIN
 
     POPUP "編集(&E)"
     BEGIN
-        MENUITEM "元に戻す\tCtrl+Z", IDM_EDITUNDO
-        MENUITEM "やり直し\tCtrl+Y", IDM_EDITREDO
+        MENUITEM "元に戻す(&U)\tCtrl+Z", IDM_EDITUNDO
+        MENUITEM "やり直し(&R)\tCtrl+Y", IDM_EDITREDO
         MENUITEM SEPARATOR
-        MENUITEM "切り取り\tCtrl+X", IDM_EDITCUT
-        MENUITEM "コピー\tCtrl+C", IDM_EDITCOPY
-        MENUITEM "貼り付け\tCtrl+V", IDM_EDITPASTE
-        MENUITEM "選択範囲の削除\tDel", IDM_EDITDELETESELECTION
-        MENUITEM "選択範囲の挿入", IDM_EDITINVERTSELECTION
-        MENUITEM "すべて選択\tCtrl+A", IDM_EDITSELECTALL
+        MENUITEM "切り取り(&T)\tCtrl+X", IDM_EDITCUT
+        MENUITEM "コピー(&C)\tCtrl+C", IDM_EDITCOPY
+        MENUITEM "貼り付け(&P)\tCtrl+V", IDM_EDITPASTE
+        MENUITEM "選択範囲の削除(&L)\tDel", IDM_EDITDELETESELECTION
+        MENUITEM "選択範囲の反転(&I)", IDM_EDITINVERTSELECTION
+        MENUITEM "すべて選択(&A)\tCtrl+A", IDM_EDITSELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "ファイルへコピー", IDM_EDITCOPYTO
-        MENUITEM "ファイルから貼り付け", IDM_EDITPASTEFROM
+        MENUITEM "ファイルへコピー(&O)", IDM_EDITCOPYTO
+        MENUITEM "ファイルから貼り付け(&F)", IDM_EDITPASTEFROM
     END
 
     POPUP "表示(&V)"
     BEGIN
-        MENUITEM "ツール ボックス\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
-        MENUITEM "カラー パレット\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
-        MENUITEM "ステータス バー", IDM_VIEWSTATUSBAR, CHECKED
-        MENUITEM "テキスト ツール バー", IDM_FORMATICONBAR, CHECKED, GRAYED
+        MENUITEM "ツール ボックス(&T)\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
+        MENUITEM "カラー パレット(&C)\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
+        MENUITEM "ステータス バー(&S)", IDM_VIEWSTATUSBAR, CHECKED
+        MENUITEM "テキスト ツール バー(&E)", IDM_FORMATICONBAR, CHECKED, GRAYED
         MENUITEM SEPARATOR
-        POPUP "拡大"
+        POPUP "拡大(&Z)"
         BEGIN
-            POPUP "ユーザー定義"
+            POPUP "ユーザー定義(&U)"
             BEGIN
-                MENUITEM "12,5%", IDM_VIEWZOOM125
+                MENUITEM "12.5%", IDM_VIEWZOOM125
                 MENUITEM "25%", IDM_VIEWZOOM25
                 MENUITEM "50%", IDM_VIEWZOOM50
                 MENUITEM "100%", IDM_VIEWZOOM100
@@ -60,26 +60,26 @@ BEGIN
                 MENUITEM "800%", IDM_VIEWZOOM800
             END
             MENUITEM SEPARATOR
-            MENUITEM "グリッドを表示\tCtrl+G", IDM_VIEWSHOWGRID
-            MENUITEM "実寸表示", IDM_VIEWSHOWMINIATURE
+            MENUITEM "グリッドを表示(&G)\tCtrl+G", IDM_VIEWSHOWGRID
+            MENUITEM "実寸表示(&H)", IDM_VIEWSHOWMINIATURE
         END
-        MENUITEM "全画面表示\tCtrl+F", IDM_VIEWFULLSCREEN
+        MENUITEM "全画面表示(&F)\tCtrl+F", IDM_VIEWFULLSCREEN
     END
 
     POPUP "画像(&I)"
     BEGIN
-        MENUITEM "回転と反転\tCtrl+R", IDM_IMAGEROTATEMIRROR
-        MENUITEM "Stretch/Skew\tCtrl+W", IDM_IMAGESTRETCHSKEW
-        MENUITEM "切り取り", IDM_IMAGECROP
-        MENUITEM "色の反転\tCtrl+I", IDM_IMAGEINVERTCOLORS
-        MENUITEM "画像の属性\tCtrl+E", IDM_IMAGEATTRIBUTES
+        MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR
+        MENUITEM "Stretch/Skew(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW
+        MENUITEM "切り取り(&C)", IDM_IMAGECROP
+        MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS
+        MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES
         MENUITEM "画像の削除\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE
-        MENUITEM "不透明色を描画する", IDM_IMAGEDRAWOPAQUE
+        MENUITEM "不透明色を描画する(&D)", IDM_IMAGEDRAWOPAQUE
     END
 
     POPUP "色(&C)"
     BEGIN
-        MENUITEM "パレットの編集", IDM_COLORSEDITPALETTE
+        MENUITEM "パレットの編集(&E)", IDM_COLORSEDITPALETTE
         MENUITEM SEPARATOR
         MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE
         MENUITEM "Old palette", IDM_COLORSOLDPALETTE
@@ -87,9 +87,9 @@ BEGIN
 
     POPUP "&?"
     BEGIN
-        MENUITEM "ヘルプ トピック", IDM_HELPHELPTOPICS
+        MENUITEM "ヘルプ トピック(&H)", IDM_HELPHELPTOPICS
         MENUITEM SEPARATOR
-        MENUITEM "情報", IDM_HELPINFO
+        MENUITEM "情報(&I)", IDM_HELPINFO
     END
 END
 
@@ -122,12 +122,12 @@ FONT 9, "MS UI Gothic"
 CAPTION "回転と反転"
 BEGIN
     GROUPBOX "回転と反転", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86
-    AUTORADIOBUTTON "水平方向に反転", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP
-    AUTORADIOBUTTON "垂直方向に反転", IDD_MIRRORROTATERB2, 12, 30, 100, 10
-    AUTORADIOBUTTON "角度を指定", IDD_MIRRORROTATERB3, 12, 42, 100, 10
-    AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED
-    AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED
-    AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED
+    AUTORADIOBUTTON "水平方向に反転(&H)", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP
+    AUTORADIOBUTTON "垂直方向に反転(&V)", IDD_MIRRORROTATERB2, 12, 30, 100, 10
+    AUTORADIOBUTTON "角度を指定(&R)", IDD_MIRRORROTATERB3, 12, 42, 100, 10
+    AUTORADIOBUTTON "&90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED
+    AUTORADIOBUTTON "&180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED
+    AUTORADIOBUTTON "&270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED
     DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 125, 24, 48, 14
 END
@@ -139,21 +139,21 @@ CAPTION "画像の属性"
 BEGIN
     EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12
     EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12
-    LTEXT "幅:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10
-    LTEXT "高さ:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10
-    LTEXT "ファイルの日付:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
-    LTEXT "ファイルのサイズ:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
-    LTEXT "解像度:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
-    LTEXT "利用不可能", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10
-    LTEXT "利用不可能", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10
-    LTEXT "利用不可能", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10
+    LTEXT "幅(&W):", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10
+    LTEXT "高さ(&H):", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10
+    LTEXT "ファイルの日付(&D):", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
+    LTEXT "ファイルのサイズ(&S):", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
+    LTEXT "解像度(&R):", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
+    LTEXT "利用不可能", IDD_ATTRIBUTESTEXT6, 75, 5, 90, 10
+    LTEXT "利用不可能", IDD_ATTRIBUTESTEXT7, 75, 15, 90, 10
+    LTEXT "利用不可能", IDD_ATTRIBUTESTEXT8, 75, 25, 90, 10
     GROUPBOX "単位", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27
-    AUTORADIOBUTTON "インチ", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP
-    AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10
-    AUTORADIOBUTTON "ピクセル", IDD_ATTRIBUTESRB3, 112, 69, 45, 10
+    AUTORADIOBUTTON "インチ(&I)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP
+    AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10
+    AUTORADIOBUTTON "ピクセル(&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10
     GROUPBOX "色", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27
-    AUTORADIOBUTTON "白黒", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
-    AUTORADIOBUTTON "カラー", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
+    AUTORADIOBUTTON "白黒(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
+    AUTORADIOBUTTON "カラー(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
     DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 170, 24, 48, 14
     PUSHBUTTON "デフォルト", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/nl-NL.rc b/reactos/base/applications/mspaint/lang/nl-NL.rc
index eda8e2f..774f36c 100644 (file)
--- a/reactos/base/applications/mspaint/lang/nl-NL.rc
+++ b/reactos/base/applications/mspaint/lang/nl-NL.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/no-NO.rc b/reactos/base/applications/mspaint/lang/no-NO.rc
index e43a125..38fd102 100644 (file)
--- a/reactos/base/applications/mspaint/lang/no-NO.rc
+++ b/reactos/base/applications/mspaint/lang/no-NO.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/pl-PL.rc b/reactos/base/applications/mspaint/lang/pl-PL.rc
index 02fc5cc..412d6a9 100644 (file)
--- a/reactos/base/applications/mspaint/lang/pl-PL.rc
+++ b/reactos/base/applications/mspaint/lang/pl-PL.rc
@@ -219,4 +219,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/pt-BR.rc b/reactos/base/applications/mspaint/lang/pt-BR.rc
index f7a5920..d466c2c 100644 (file)
--- a/reactos/base/applications/mspaint/lang/pt-BR.rc
+++ b/reactos/base/applications/mspaint/lang/pt-BR.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/pt-PT.rc b/reactos/base/applications/mspaint/lang/pt-PT.rc
index 0948ec8..0e9e1e4 100644 (file)
--- a/reactos/base/applications/mspaint/lang/pt-PT.rc
+++ b/reactos/base/applications/mspaint/lang/pt-PT.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/ro-RO.rc b/reactos/base/applications/mspaint/lang/ro-RO.rc
index b848b6e..07cad8f 100644 (file)
--- a/reactos/base/applications/mspaint/lang/ro-RO.rc
+++ b/reactos/base/applications/mspaint/lang/ro-RO.rc
@@ -219,4 +219,5 @@ BEGIN
     IDS_INTNUMBERS,       "Please enter integral numbers only!"
     IDS_PERCENTAGE,       "The percentage must be between 1 and 500."
     IDS_ANGLE,            "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/ru-RU.rc b/reactos/base/applications/mspaint/lang/ru-RU.rc
index e5486cd..513effc 100644 (file)
--- a/reactos/base/applications/mspaint/lang/ru-RU.rc
+++ b/reactos/base/applications/mspaint/lang/ru-RU.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/sk-SK.rc b/reactos/base/applications/mspaint/lang/sk-SK.rc
index 65eb1af..9ca4474 100644 (file)
--- a/reactos/base/applications/mspaint/lang/sk-SK.rc
+++ b/reactos/base/applications/mspaint/lang/sk-SK.rc
@@ -219,4 +219,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/sv-SE.rc b/reactos/base/applications/mspaint/lang/sv-SE.rc
index 06f3e72..10f2a5c 100644 (file)
--- a/reactos/base/applications/mspaint/lang/sv-SE.rc
+++ b/reactos/base/applications/mspaint/lang/sv-SE.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/tr-TR.rc b/reactos/base/applications/mspaint/lang/tr-TR.rc
index 0d07feb..df38a8f 100644 (file)
--- a/reactos/base/applications/mspaint/lang/tr-TR.rc
+++ b/reactos/base/applications/mspaint/lang/tr-TR.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Buraya yalnızca tamsayı girilmelidir."
     IDS_PERCENTAGE, "Buradaki değer 1 ilâ 500 olmalıdır."
     IDS_ANGLE, "Buradaki değer -89 ilâ 89 olmalıdır."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/uk-UA.rc b/reactos/base/applications/mspaint/lang/uk-UA.rc
index 627fa93..73d3481 100644 (file)
--- a/reactos/base/applications/mspaint/lang/uk-UA.rc
+++ b/reactos/base/applications/mspaint/lang/uk-UA.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/zh-CN.rc b/reactos/base/applications/mspaint/lang/zh-CN.rc
index bd086f3..658ae75 100644 (file)
--- a/reactos/base/applications/mspaint/lang/zh-CN.rc
+++ b/reactos/base/applications/mspaint/lang/zh-CN.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/lang/zh-TW.rc b/reactos/base/applications/mspaint/lang/zh-TW.rc
index f3f78dd..9ab6056 100644 (file)
--- a/reactos/base/applications/mspaint/lang/zh-TW.rc
+++ b/reactos/base/applications/mspaint/lang/zh-TW.rc
@@ -218,4 +218,5 @@ BEGIN
     IDS_INTNUMBERS, "Please enter integral numbers only!"
     IDS_PERCENTAGE, "The percentage must be between 1 and 500."
     IDS_ANGLE, "The angle must be between -89 and 89."
+    IDS_LOADERRORTEXT, "The file %s could not be loaded."
 END

diff --git a/reactos/base/applications/mspaint/winproc.c b/reactos/base/applications/mspaint/winproc.c
index 9e1b6ad..9ee8376 100644 (file)
--- a/reactos/base/applications/mspaint/winproc.c
+++ b/reactos/base/applications/mspaint/winproc.c
@@ -433,8 +433,8 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             if (hwnd == hMainWnd)
             {
                 MINMAXINFO *mm = (LPMINMAXINFO) lParam;
-                (*mm).ptMinTrackSize.x = 330;
-                (*mm).ptMinTrackSize.y = 430;
+                mm->ptMinTrackSize.x = 330;
+                mm->ptMinTrackSize.y = 430;
             }
             break;
 
@@ -793,6 +793,16 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                             clearHistory();
                             isAFile = TRUE;
                         }
+                        else
+                        {
+                            TCHAR programname[20];
+                            TCHAR loaderrortext[100];
+                            TCHAR temptext[500];
+                            LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname));
+                            LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext));
+                            _stprintf(temptext, loaderrortext, ofn.lpstrFile);
+                            MessageBox(hwnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION);
+                        }
                     }
                     break;
                 case IDM_FILESAVE: