IOS: Merge branch 'master' into ios-fix

9 files changed, 22 insertions, 10 deletions

diff --git a/dists/debian/copyright b/dists/debian/copyright
index 734ec77039..06705fd6bc 100644
--- a/dists/debian/copyright
+++ b/dists/debian/copyright
@@ -7,7 +7,7 @@ It was downloaded from <http://www.scummvm.org/>.
 
 Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'.
 
-ScummVM is Copyright © 2002-2015 The ScummVM Team
+ScummVM is Copyright © 2002-2016 The ScummVM Team
 
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 2a9a1998ae..92f82d082b 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.8.0git, Copyright 2001-2015 The ScummVM Team</string>
+	<string>1.8.0git, Copyright 2001-2016 The ScummVM Team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,15 +19,20 @@
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
+		<string>be</string>
 		<string>ca</string>
 		<string>cs</string>
 		<string>da</string>
 		<string>de</string>
 		<string>es</string>
+		<string>eu</string>
+		<string>fi</string>
 		<string>fr</string>
+		<string>gl</string>
 		<string>hu</string>
 		<string>it</string>
 		<string>nb</string>
+		<string>nl</string>
 		<string>nn</string>
 		<string>pl</string>
 		<string>pt</string>
@@ -44,9 +49,11 @@
 	<key>CFBundleVersion</key>
 	<string>1.8.0git</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2001-2015 The ScummVM Team</string>
+	<string>Copyright 2001-2016 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2001-2016 The ScummVM Team</string>
 	<key>SUFeedURL</key>
 	<string>http://www.scummvm.org/appcasts/macosx/release.xml</string>
 	<key>SUPublicDSAKeyFile</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 7e91984f39..1a83447e26 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -7,15 +7,20 @@
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
+		<string>be</string>
 		<string>ca</string>
 		<string>cs</string>
 		<string>da</string>
 		<string>de</string>
 		<string>es</string>
+		<string>eu</string>
+		<string>fi</string>
 		<string>fr</string>
+		<string>gl</string>
 		<string>hu</string>
 		<string>it</string>
 		<string>nb</string>
+		<string>nl</string>
 		<string>nn</string>
 		<string>pl</string>
 		<string>pt</string>
@@ -28,7 +33,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>@VERSION@, Copyright 2001-2015 The ScummVM Team</string>
+	<string>@VERSION@, Copyright 2001-2016 The ScummVM Team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -46,7 +51,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2001-2015 The ScummVM Team</string>
+	<string>Copyright 2001-2016 The ScummVM Team</string>
 	<key>SUFeedURL</key>
 	<string>http://www.scummvm.org/appcasts/macosx/release.xml</string>
 	<key>SUPublicDSAKeyFile</key>
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index fbf2f44434..002dc42112 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -84,7 +84,7 @@ BEGIN
             VALUE "FileDescription", "http://www.scummvm.org/\0"
             VALUE "FileVersion", "1.8.0git\0"
             VALUE "InternalName", "scummvm\0"
-            VALUE "LegalCopyright", "Copyright � 2001-2015 The ScummVM Team\0"
+            VALUE "LegalCopyright", "Copyright � 2001-2016 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index fc68f95a95..34a4948381 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -84,7 +84,7 @@ BEGIN
             VALUE "FileDescription", "http://www.scummvm.org/\0"
             VALUE "FileVersion", "@VERSION@\0"
             VALUE "InternalName", "scummvm\0"
-            VALUE "LegalCopyright", "Copyright � 2001-2015 The ScummVM Team\0"
+            VALUE "LegalCopyright", "Copyright � 2001-2016 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
diff --git a/dists/scummvm_logo.bmp b/dists/scummvm_logo.bmp
new file mode 100644
index 0000000000..8217019be4
--- /dev/null
+++ b/dists/scummvm_logo.bmp
diff --git a/dists/win32/migration.bat b/dists/win32/migration.bat
index e1b27a1fb3..0ab38653f6 100644
--- a/dists/win32/migration.bat
+++ b/dists/win32/migration.bat
@@ -4,7 +4,7 @@
 :: This script will copy any saved games located in the
 :: old default location, to the new default location.
 ::
-:: (c) 2012-2014 ScummVM Team
+:: (c) 2012-2016 ScummVM Team
 ::
 
 @echo off
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index a7e891acc2..3bcc621965 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -76,7 +76,7 @@ Name ScummVM
 !define COMPANY     "ScummVM Team"
 !define URL         "http://scummvm.org/"
 !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT   "Copyright � 2001-2015 The ScummVM Team"
+!define COPYRIGHT   "Copyright � 2001-2016 The ScummVM Team"
 
 #########################################################################################
 # Installer configuration
diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in
index 7a156fb7b4..79e1a9d581 100644
--- a/dists/win32/scummvm.nsi.in
+++ b/dists/win32/scummvm.nsi.in
@@ -76,7 +76,7 @@ Name ScummVM
 !define COMPANY     "ScummVM Team"
 !define URL         "http://scummvm.org/"
 !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT   "Copyright � 2001-2015 The ScummVM Team"
+!define COPYRIGHT   "Copyright � 2001-2016 The ScummVM Team"
 
 #########################################################################################
 # Installer configuration