# By David Anderson (617) and others
# Via Oliver Bock (56) and others
* commit '03cc6849c7d32f0028869a581ad03916ceb4d8b5': (1943 commits)
remote job submission: add C++ interface to estimate_batch function
translation stuff
locale: Update compiled localization files
Commit from Pootle Demo by user admin.: 1563 of 2856 strings translated (190 fuzzy).
Commit from Pootle Demo by user admin.: 2741 of 2859 strings translated (45 fuzzy).
Commit from Pootle Demo by user admin.: 1097 of 2859 strings translated (154 fuzzy).
locale: Update compiled localization files
Commit from Pootle Demo by user admin.: 2831 of 2859 strings translated (1 fuzzy).
Commit from Pootle Demo by user admin.: 1097 of 2859 strings translated (154 fuzzy).
Commit from Pootle Demo by user admin.: 3158 of 3183 strings translated (2 fuzzy).
client: Remove build environment changes that attempted to detect Android, it wasn't needed.
client: fix Android OS detection
client: only add the pthread libs if not linking for Android
android: Bulk import of localization text
android: Bulk import of localization text
locale: Update compiled localization files
Commit from Pootle Demo by user admin.: 2817 of 2859 strings translated (4 fuzzy).
Commit from Pootle Demo by user admin.: 2830 of 2859 strings translated (1 fuzzy).
locale: Update compiled localization files
Commit from Pootle Demo by user admin.: 2741 of 2859 strings translated (95 fuzzy).
...
Conflicts:
checkin_notes
clientgui/AsyncRPC.cpp
clientgui/BOINCGUIApp.cpp
clientgui/DlgEventLog.cpp
clientgui/DlgEventLogListCtrl.cpp
clientgui/DlgEventLogListCtrl.h
clientgui/MainDocument.cpp
clientgui/NoticeListCtrl.cpp
clientgui/mac/MacBitmapComboBox.cpp
clientgui/mac/SetVersion.cpp
clientgui/mac/templates/SystemMenu-Info.plist
clientgui/sg_BoincSimpleFrame.cpp
mac_build/boinc.xcodeproj/project.pbxproj
win_build/example_app_multi_thread.vcproj
win_build/gr_boinc_ss.vcproj
win_build/sleeper.vcproj
win_build/uc2.vcproj
win_build/uc2_graphics.vcproj
win_build/vboxwrapper.vcproj
win_build/wrapper.vcproj
Charlie Fenton