[boinc] 02/03: Merge tag 'upstream/7.2.42+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 89c03170b4788c7c6bc96649e4718b7337806442
Merge: 1a287de 69ddfc0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Mar 1 11:27:48 2014 +0100

    Merge tag 'upstream/7.2.42+dfsg'
    
    Upstream version 7.2.42+dfsg
    
    Conflicts:
    	android/BOINC/AndroidManifest.xml
    	android/BOINC/res/values-cs/strings.xml
    	android/BOINC/res/values-el/strings.xml
    	android/BOINC/res/values-es/strings.xml
    	android/BOINC/res/values-fr/strings.xml
    	android/BOINC/res/values-ja/strings.xml
    	android/BOINC/res/values-pt-rBR/strings.xml
    	android/BOINC/res/values-sk/strings.xml
    	android/BOINC/res/values-zh-rCN/strings.xml
    	android/BOINC/res/values/configuration.xml
    	android/BOINC/res/values/strings.xml
    	android/BOINC/src/edu/berkeley/boinc/AppPreferences.java
    	android/BOINC/src/edu/berkeley/boinc/PrefsActivity.java
    	android/BOINC/src/edu/berkeley/boinc/client/DeviceStatus.java
    	clientgui/BOINCGUIApp.cpp
    	clientgui/BOINCGUIApp.h
    	clientgui/MainDocument.cpp
    	configure.ac
    	locale/cs/BOINC-Android.po
    	locale/el/BOINC-Android.po
    	locale/es/BOINC-Android.po
    	locale/fr/BOINC-Android.po
    	locale/ja/BOINC-Android.po
    	locale/pt_BR/BOINC-Android.po
    	locale/sk/BOINC-Android.po
    	locale/zh_CN/BOINC-Android.po

 android/BOINC/AndroidManifest.xml                  |   4 +-
 android/BOINC/res/values-cs/strings.xml            | 247 +-------
 android/BOINC/res/values-el/strings.xml            | 227 +------
 android/BOINC/res/values-es/strings.xml            | 245 +-------
 android/BOINC/res/values-fr/strings.xml            | 219 +------
 android/BOINC/res/values-ja/strings.xml            | 267 +-------
 android/BOINC/res/values-pt-rBR/strings.xml        | 259 +-------
 android/BOINC/res/values-sk/strings.xml            | 254 +-------
 android/BOINC/res/values-zh-rCN/strings.xml        | 179 +-----
 android/BOINC/res/values/configuration.xml         |   1 +
 android/BOINC/res/values/strings.xml               |   2 +
 .../src/edu/berkeley/boinc/AppPreferences.java     |  13 +
 .../src/edu/berkeley/boinc/PrefsActivity.java      |  17 +-
 .../edu/berkeley/boinc/client/DeviceStatus.java    |  48 +-
 client/hostinfo_unix.cpp                           |   2 +-
 clientgui/BOINCGUIApp.cpp                          |   5 +-
 clientgui/BOINCGUIApp.h                            |   4 +-
 clientgui/DlgEventLog.cpp                          |  26 +-
 clientgui/MainDocument.cpp                         |   5 +-
 clientgui/MainDocument.h                           |   2 +-
 configure.ac                                       |   2 +-
 lib/procinfo_mac.cpp                               |  10 +-
 locale/cs/BOINC-Android.po                         | 552 +++++++++--------
 locale/el/BOINC-Android.po                         | 570 +++++++++--------
 locale/es/BOINC-Android.po                         | 607 +++++++++---------
 locale/fr/BOINC-Android.po                         | 594 +++++++++---------
 locale/ja/BOINC-Android.po                         | 589 +++++++++---------
 locale/pt_BR/BOINC-Android.po                      | 593 +++++++++---------
 locale/sk/BOINC-Android.po                         | 559 ++++++++---------
 locale/zh_CN/BOINC-Android.po                      | 681 +++++++++------------
 30 files changed, 2385 insertions(+), 4398 deletions(-)

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