[boinc] 02/04: Merge tag 'upstream/7.6.12+dfsg'

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit a3698f3404ca0f65bf2763dbaf9249d61229cede
Merge: a56f9ba a269173
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Oct 6 19:30:58 2015 +0200

    Merge tag 'upstream/7.6.12+dfsg'
    
    Upstream version 7.6.12+dfsg

 android/BOINC/AndroidManifest.xml |   4 +-
 client/client_state.cpp           |  59 +--
 client/client_state.h             |   1 +
 client/cs_prefs.cpp               |  20 +-
 client/cs_proxy.cpp               |   2 +
 client/gpu_nvidia.cpp             |   2 +
 client/hostinfo_unix.cpp          |  56 ++-
 client/work_fetch.cpp             |  13 +-
 clientgui/DlgItemProperties.cpp   |  16 +-
 clientgui/MainDocument.cpp        |  13 +-
 clientgui/MainDocument.h          |   7 +-
 clientgui/ViewProjects.cpp        |  44 +-
 clientgui/ViewProjects.h          |  10 +-
 clientgui/ViewStatistics.cpp      |  10 +-
 clientgui/ViewTransfers.cpp       |  18 +-
 clientgui/ViewTransfers.h         |   6 +-
 clientgui/ViewWork.cpp            |  38 +-
 clientgui/ViewWork.h              |  16 +-
 clientgui/sg_ProjectPanel.cpp     |   2 +-
 clientgui/sg_TaskPanel.cpp        |   2 +-
 clientscr/mac_saver_module.cpp    |  34 +-
 configure.ac                      |   2 +-
 lib/str_util.cpp                  |  50 +-
 lib/str_util.h                    |   2 +-
 locale/de/BOINC-Manager.mo        | Bin 80193 -> 80540 bytes
 locale/de/BOINC-Manager.po        | 375 ++++++++-------
 locale/fr/BOINC-Manager.mo        | Bin 81360 -> 81684 bytes
 locale/fr/BOINC-Manager.po        | 385 +++++++--------
 locale/ja/BOINC-Manager.mo        | Bin 91465 -> 91709 bytes
 locale/ja/BOINC-Manager.po        | 957 +++++++++++++++++++-------------------
 locale/pl/BOINC-Client.mo         | Bin 4824 -> 4810 bytes
 locale/pl/BOINC-Client.po         |  15 +-
 locale/zh_CN/BOINC-Drupal.po      | 557 +++++++++++++++-------
 locale/zh_CN/BOINC-Manager.mo     | Bin 73346 -> 73720 bytes
 locale/zh_CN/BOINC-Manager.po     | 382 ++++++++-------
 version.log                       |   2 +-
 36 files changed, 1693 insertions(+), 1407 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git