3 files changed, 22 insertions, 18 deletions
diff --git a/misc/Info.plist b/misc/Info.plist
index 848ccfa30..1498ee474 100644
--- a/misc/Info.plist
+++ b/misc/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>../Resources/minetest</string>
+	<string>minetest</string>
 	<key>CFBundleIconFile</key>
-	<string>minetest.icns</string>
+	<string>minetest-icon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.minetest.minetest</string>
 </dict>
diff --git a/misc/minetest.desktop b/misc/minetest.desktop
index 896404789..4257cef37 100644
--- a/misc/minetest.desktop
+++ b/misc/minetest.desktop
@@ -2,8 +2,12 @@
 Name=Minetest
 GenericName=Minetest
 Comment=Multiplayer infinite-world block sandbox
-Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
 Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten
+Comment[es]=Juego sandbox multijugador con mundos infinitos
+Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
+Comment[ja]=マルチプレイに対応した、無限の世界のブロック型サンドボックスゲームです
+Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
+Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
 Exec=minetest
 Icon=minetest-icon
 Terminal=false
@@ -11,4 +15,3 @@ Type=Application
 Categories=Game;
 StartupNotify=false
 Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying;
-
diff --git a/misc/winresource.rc b/misc/winresource.rc
index ecb314c12..6b82e261b 100644
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -5,10 +5,10 @@
 #include "config.h"
 #undef USE_CMAKE_CONFIG_H
 
-#if RUN_IN_PLACE == 1
-	#define BUILDMODE "RUN_IN_PLACE=1\0"
+#if RUN_IN_PLACE
+	#define BUILDMODE "RUN_IN_PLACE=1"
 #else
-	#define BUILDMODE "RUN_IN_PLACE=0\0"
+	#define BUILDMODE "RUN_IN_PLACE=0"
 #endif
 
 LANGUAGE 0, SUBLANG_NEUTRAL
@@ -20,8 +20,8 @@ LANGUAGE 0, SUBLANG_NEUTRAL
 //
 
 1 VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH_ORIG,0
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH_ORIG,0
+ FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
+ PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
  FILEFLAGSMASK 0x3fL
 #ifndef NDEBUG
  FILEFLAGS 0x1L
@@ -36,16 +36,16 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
     BEGIN
-        VALUE "Comments", "\0"
-        VALUE "CompanyName", "Minetest Community\0"
-        VALUE "FileDescription", "Minetest engine core main application\0"
+        VALUE "Comments", ""
+        VALUE "CompanyName", PROJECT_NAME_C " community"
+        VALUE "FileDescription", PROJECT_NAME_C " engine"
         VALUE "FileVersion", VERSION_STRING
-        VALUE "InternalName", "Minetest engine\0"
-        VALUE "LegalCopyright", "(c) 2014 celeron55\0"
-        VALUE "LegalTrademarks", """Minetest"" is property of Minetest community, don't use the name for your application without permission!\0"
-        VALUE "OriginalFilename", "minetest.exe\0"
-        VALUE "PrivateBuild", VERSION_EXTRA_STRING
-        VALUE "ProductName", "Minetest\0"
+        VALUE "InternalName", PROJECT_NAME
+        VALUE "LegalCopyright", "(c) 2011-2015 celeron55"
+        VALUE "LegalTrademarks", """Minetest"" is the property of the Minetest community, don't use it without permission!"
+        VALUE "OriginalFilename", "minetest.exe"
+        VALUE "PrivateBuild", VERSION_EXTRA
+        VALUE "ProductName", PROJECT_NAME_C
         VALUE "ProductVersion", PRODUCT_VERSION_STRING
         VALUE "SpecialBuild", BUILDMODE
     END
@@ -55,3 +55,4 @@ BEGIN
     VALUE "Translation", 0x409, 1200
 END
 END
+