6 files changed, 21 insertions, 53 deletions
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index dd6edde8d2..6a34d64cd5 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
   <key>LSMinimumSystemVersion</key>
-  <string>10.6.0</string>
+  <string>10.7.0</string>
 
   <key>LSArchitecturePriority</key>
   <array>
@@ -17,7 +17,7 @@
   <string>APPL</string>
 
   <key>CFBundleGetInfoString</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
 
   <key>CFBundleShortVersionString</key>
   <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
@@ -30,6 +30,12 @@
 
   <key>CFBundleExecutable</key>
   <string>Bitcoin-Qt</string>
+  
+  <key>CFBundleName</key>
+  <string>Bitcoin-Qt</string>
+
+  <key>LSHasLocalizedDisplayName</key>
+  <true/>
 
   <key>CFBundleIdentifier</key>
   <string>org.bitcoinfoundation.Bitcoin-Qt</string>
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index d4bd585138..2ba8bb9b3a 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python
 '''
-Extract _("...") strings for translation and convert to Qt4 stringdefs so that
+Extract _("...") strings for translation and convert to Qt stringdefs so that
 they can be picked up by Qt linguist.
 '''
+from __future__ import division,print_function,unicode_literals
 from subprocess import Popen, PIPE
 import glob
 import operator
@@ -31,7 +32,7 @@ def parse_po(text):
                 in_msgstr = False
             # message start
             in_msgid = True
-            
+
             msgid = [line[6:]]
         elif line.startswith('msgstr '):
             in_msgid = False
@@ -52,17 +53,21 @@ files = sys.argv[1:]
 
 # xgettext -n --keyword=_ $FILES
 XGETTEXT=os.getenv('XGETTEXT', 'xgettext')
+if not XGETTEXT:
+    print('Cannot extract strings: xgettext utility is not installed or not configured.',file=sys.stderr)
+    print('Please install package "gettext" and re-run \'./configure\'.',file=sys.stderr)
+    exit(1)
 child = Popen([XGETTEXT,'--output=-','-n','--keyword=_'] + files, stdout=PIPE)
 (out, err) = child.communicate()
 
-messages = parse_po(out) 
+messages = parse_po(out.decode('utf-8'))
 
 f = open(OUT_CPP, 'w')
 f.write("""
 
 #include <QtGlobal>
 
-// Automatically generated by extract_strings.py
+// Automatically generated by extract_strings_qt.py
 #ifdef __GNUC__
 #define UNUSED __attribute__((unused))
 #else
@@ -70,6 +75,10 @@ f.write("""
 #endif
 """)
 f.write('static const char UNUSED *bitcoin_strings[] = {\n')
+f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('PACKAGE_NAME'),))
+f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS'),))
+if os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION') != os.getenv('PACKAGE_NAME'):
+    f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION'),))
 messages.sort(key=operator.itemgetter(0))
 for (msgid, msgstr) in messages:
     if msgid != EMPTY:
diff --git a/share/qt/img/reload.png b/share/qt/img/reload.png
deleted file mode 100644
index 9068db9a63..0000000000
--- a/share/qt/img/reload.png
+++ /dev/null
diff --git a/share/qt/img/reload.xcf b/share/qt/img/reload.xcf
deleted file mode 100644
index dc8be62831..0000000000
--- a/share/qt/img/reload.xcf
+++ /dev/null
diff --git a/share/qt/make_spinner.py b/share/qt/make_spinner.py
deleted file mode 100755
index bb19e91508..0000000000
--- a/share/qt/make_spinner.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# W.J. van der Laan, 2011
-# Make spinning animation from a .png
-# Requires imagemagick 6.7+
-from __future__ import division
-from os import path
-from PIL import Image
-from subprocess import Popen
-
-SRC='img/reload.png'
-TMPDIR='../../src/qt/res/movies/'
-TMPNAME='spinner-%03i.png'
-NUMFRAMES=35
-FRAMERATE=10.0
-CONVERT='convert'
-CLOCKWISE=True
-DSIZE=(16,16)
-
-im_src = Image.open(SRC)
-
-if CLOCKWISE:
-    im_src = im_src.transpose(Image.FLIP_LEFT_RIGHT)
-
-def frame_to_filename(frame):
-    return path.join(TMPDIR, TMPNAME % frame)
-
-frame_files = []
-for frame in xrange(NUMFRAMES):
-    rotation = (frame + 0.5) / NUMFRAMES * 360.0
-    if CLOCKWISE:
-        rotation = -rotation
-    im_new = im_src.rotate(rotation, Image.BICUBIC)
-    im_new.thumbnail(DSIZE, Image.ANTIALIAS)
-    outfile = frame_to_filename(frame)
-    im_new.save(outfile, 'png')
-    frame_files.append(outfile)
-
-
diff --git a/share/qt/make_windows_icon.sh b/share/qt/make_windows_icon.sh
deleted file mode 100755
index bf607b1c62..0000000000
--- a/share/qt/make_windows_icon.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# create multiresolution windows icon
-ICON_SRC=../../src/qt/res/icons/bitcoin.png
-ICON_DST=../../src/qt/res/icons/bitcoin.ico
-convert ${ICON_SRC} -resize 16x16 bitcoin-16.png
-convert ${ICON_SRC} -resize 32x32 bitcoin-32.png
-convert ${ICON_SRC} -resize 48x48 bitcoin-48.png
-convert bitcoin-16.png bitcoin-32.png bitcoin-48.png ${ICON_DST}
-