diff --git a/client/app.cpp b/client/app.cpp
index e5f5e10bbf..71fa2fcffd 100644
--- a/client/app.cpp
+++ b/client/app.cpp
@@ -495,7 +495,7 @@ bool ACTIVE_TASK_SET::is_slot_dir_in_use(char* dir) {
 // Get a free slot,
 // and make a slot dir if needed
 //
-void ACTIVE_TASK::get_free_slot(RESULT* rp) {
+int ACTIVE_TASK::get_free_slot(RESULT* rp) {
 #ifndef SIM
     int j, retval;
     char path[MAXPATHLEN];
@@ -515,12 +515,22 @@ void ACTIVE_TASK::get_free_slot(RESULT* rp) {
             retval = make_slot_dir(j);
             if (!retval) break;
         }
+
+        // paranoia - don't allow unbounded slots
+        //
+        if (j > 1000) {
+            msg_printf(rp->project, MSG_INTERNAL_ERROR,
+                "exceeded limit of 1000 slot directories"
+            );
+            return ERR_NULL;
+        }
     }
     slot = j;
     if (log_flags.slot_debug) {
         msg_printf(rp->project, MSG_INFO, "[slot] assigning slot %d to %s", j, rp->name);
     }
 #endif
+    return 0;
 }
 
 bool ACTIVE_TASK_SET::slot_taken(int slot) {
diff --git a/client/app.h b/client/app.h
index 1c44dcad5e..7941357a75 100644
--- a/client/app.h
+++ b/client/app.h
@@ -187,7 +187,7 @@ struct ACTIVE_TASK {
 
     int current_disk_usage(double&);
         // disk used by output files and temp files of this task
-    void get_free_slot(RESULT*);
+    int get_free_slot(RESULT*);
     int start(bool test=false);         // start a process
 
     // Termination stuff.
diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp
index fc30331068..9da464e2d8 100644
--- a/client/cpu_sched.cpp
+++ b/client/cpu_sched.cpp
@@ -1566,6 +1566,12 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
         RESULT* rp = results[i];
         if (rp->non_cpu_intensive() && rp->runnable()) {
             atp = get_task(rp);
+            if (!atp) {
+                msg_printf(rp->project, MSG_INTERNAL_ERROR,
+                    "Can't create task for %s", rp->name
+                );
+                continue;
+            }
             atp->next_scheduler_state = CPU_SCHED_SCHEDULED;
 
             // don't count RAM usage because it's used sporadically,
@@ -1685,6 +1691,12 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
         if (!atp) {
             atp = get_task(rp);
         }
+        if (!atp) {
+            msg_printf(rp->project, MSG_INTERNAL_ERROR,
+                "Can't create task for %s", rp->name
+            );
+            continue;
+        }
 
         if (rp->avp->avg_ncpus > 1) {
             scheduled_mt = true;
@@ -1954,7 +1966,11 @@ ACTIVE_TASK* CLIENT_STATE::get_task(RESULT* rp) {
     ACTIVE_TASK *atp = lookup_active_task_by_result(rp);
     if (!atp) {
         atp = new ACTIVE_TASK;
-        atp->get_free_slot(rp);
+        int retval = atp->get_free_slot(rp);
+        if (retval) {
+            delete atp;
+            return NULL;
+        }
         atp->init(rp);
         active_tasks.active_tasks.push_back(atp);
     }
diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index ccef659110..eadf23faed 100644
--- a/client/cs_account.cpp
+++ b/client/cs_account.cpp
@@ -252,6 +252,10 @@ int PROJECT::parse_account_file_venue() {
             if (btemp) handle_no_rsc_pref(this, GPU_TYPE_ATI);
             continue;
         }
+        else if (xp.parse_bool("no_intel_gpu", btemp)) {
+            if (btemp) handle_no_rsc_pref(this, GPU_TYPE_INTEL);
+            continue;
+        }
 
         else if (xp.parse_str("no_rsc", buf2, sizeof(buf2))) {
             handle_no_rsc_pref(this, buf2);
diff --git a/client/gpu_amd.cpp b/client/gpu_amd.cpp
index 82204f06bc..52dc2b8a10 100644
--- a/client/gpu_amd.cpp
+++ b/client/gpu_amd.cpp
@@ -276,39 +276,33 @@ void COPROC_ATI::get(
             break;
         case 10:
             gpu_name="ATI Radeon HD 5500/5600 series (Redwood)";
-			// AMD Radeon HD 6390/7510 (OEM rebranded)
-			break;
+	    break;
         case 11:
             gpu_name="ATI Radeon HD 5400 series (Cedar)";
-			// real names would be AMD Radeon HD 6290/6350/7350/8350 (OEM rebranded)
-			break;
-// AMD CAL Chaos - see http://developer.amd.com/download/AMD_Accelerated_Parallel_Processing_OpenCL_Programming_Guide.pdf @page 230
-		case 12:
-            gpu_name="AMD Radeon HD 6370D/6380G/6410D/6480G (Sumo)"; // OpenCL-Name = WinterPark
-			break;
+	    break;
+        case 12:
+            gpu_name="AMD Radeon HD 6370D/6380G/6410D/6480G (Sumo)";
+	    break;
         case 13:
-            gpu_name="AMD Radeon HD 6520G/6530D/6550D/6620G (SuperSumo)"; // OpenCL-Name = BeaverCreek
-			break;
+            gpu_name="AMD Radeon HD 6520G/6530D/6550D/6620G (SuperSumo)";
+	    break;
         case 14:
-            gpu_name="AMD Radeon HD 6200/6300/7300 series (Wrestler)"; // OpenCL-Name = Loveland
-			// real names would be AMD Radeon HD 6250/6290/6310/6320/7310/7340 series (Wrestler)
+            gpu_name="AMD Radeon HD 6200/6300/7200/7300 series (Wrestler)";
             break;
         case 15:
             gpu_name="AMD Radeon HD 6900 series (Cayman)";
             break;
         case 16:
             gpu_name="AMD Radeon HD (Kauai)";
-			break;
+	    break;
         case 17:
             gpu_name="AMD Radeon HD 6790/6850/6870 series (Barts)";
-			// AMD Radeon 7720 (OEM rebranded)
             break;
         case 18:
             gpu_name="AMD Radeon HD 6570/6670/7570/7670 series (Turks)";
             break;
         case 19:
             gpu_name="AMD Radeon HD 6350/6450/7450/7470 series (Caicos)";
-			// AMD Radeon HD 7450/7470/8450/8470/8490 (OEM rebranded)
             break;
         case 20:
             gpu_name="AMD Radeon HD 7870/7950/7970 series (Tahiti)";
@@ -321,36 +315,33 @@ void COPROC_ATI::get(
             break;
         case 23:
             gpu_name="AMD Radeon HD 7500/7600/8500/8600 series (Devastator)";
-			// higher GPUs inside Trinity/Richland APUs
-			// PCI Device IDs 9900h to 991Fh 
             break;
-		case 24:
+        case 24:
             gpu_name="AMD Radeon HD 7400/7500/8300/8400 series (Scrapper)";
-			// (s)lower GPUs of Trinity/Richland APUs
-			// PCI Device IDs 9990h to 99AFh
             break;
         case 25:
-            gpu_name="AMD Radeon HD 8600/8790M (Oland)";
+            gpu_name="AMD Radeon HD 8600/8790M/R7 250 (Oland)";
             break;
-		case 26:
-            gpu_name="AMD Radeon HD 7790 series (Bonaire)"; 
+        case 26:
+            gpu_name="AMD Radeon HD 7790/R7 260X (Bonaire)";
             break;
-		case 27:
-			gpu_name="AMD Radeon HD (Casper)";
-			break;
-		case 28:
-			gpu_name="AMD Radeon HD (Slimer)";
-			break;
-		case 29:
-			gpu_name="AMD Radeon HD 8200/8300/8400 series (Kalindi)";
-			// GPUs inside AMD Family 16h aka Kabini/Temash
-			break;
-		case 30:
-			gpu_name="AMD Radeon HD 8600M (Hainan)";
-			break;
-		case 31:
-			gpu_name="AMD Radeon HD (Curacao)";
-			break;
+	case 27:
+	    gpu_name="AMD Radeon HD (Spectre)"; // Kaveri
+	    break;
+        case 28:
+	    gpu_name="AMD Radeon HD (Spooky)";  // Kaveri
+	    break;
+        case 29:
+	    gpu_name="AMD Radeon HD 8200/8300/8400 series (Kalindi)"; // Kabini
+	    break;
+        case 30:
+	    gpu_name="AMD Radeon HD 8600M (Hainan)";
+	    break;
+        case 31:
+	    gpu_name="AMD Radeon R9 270X (Curacao)";
+	    break;
+        case 32:
+            gpu_name="AMD Radeon R9 290 (Hawaii)";
         default:
             gpu_name="AMD Radeon HD (unknown)";
             break;
diff --git a/doc/index.php b/doc/index.php
index 4d389c6b41..1db1213dce 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -200,6 +200,23 @@ function show_nsf() {
     ";
 }
 
+require_once("../html/inc/language_names.inc");
+
+function language_select() {
+    global $language_names;
+    $supported_languages = getSupportedLanguages();
+    $bd = tra("Browser default");
+    echo "
+        <option value=auto selected=\"selected\">-- language --
+        <option value=auto>$bd
+    ";
+    if ($bd != "Browser default") echo " (Browser default)";
+    foreach ($language_names as $lang) {
+        if (!in_array($lang[0], $supported_languages)) continue;
+        echo "<option value=".$lang[0].">".$lang[1]." (".$lang[2].")";
+    }
+}
+
 // how to add language names:
 // paste into notepad++, select ANSI format,
 // then copy/paste into here
@@ -208,35 +225,9 @@ function language_form() {
         <table><tr><td>
         <form name=language method=get action=set_language.php>
         <select class=selectbox name=lang onchange=\"javascript: submit()\">
-        <option value=auto selected=\"selected\">-- language --
-        <option value=auto>".tra("Browser default")
-        //."<option value=ar>العربية (Arabic)"
-        //."<option value=be>Беларускі (Belarusian)"
-        //."<option value=bg>Българск� (Bulgarian)"
-        ."<option value=ca>Català(Catalan)"
-        ."<option value=cs>Čeština (Czech)"
-        ."<option value=de>Deutsch (German)"
-        ."<option value=en>English"
-        ."<option value=es>Espa&ntilde;ol (Spanish)"
-        ."<option value=fi>Suomi (Finnish)"
-        ."<option value=fr>Fran&ccedil;ais (French)"
-        ."<option value=el>Ελληνικά (Greek)"
-        ."<option value=he>Hebrew (עִבְרִית)"
-        ."<option value=hu>Magyar (Hungarian)"
-        ."<option value=it>Italiano (Italian)"
-        ."<option value=ja>日本語 (Japanese)"
-        ."<option value=ko>한국어 (Korean)"
-        ."<option value=lt>Lietuvių (Lithuanian)"
-        ."<option value=nl>Nederlands (Dutch)"
-        //."<option value=pl>Polski (Polish)"
-        ."<option value=pt_PT>Portugu&ecirc;s (Portuguese)"
-        //."<option value=pt_BR>Portugu&ecirc;s - Brasil (Portuguese - Brazil)"
-        ."<option value=ru>Русский (Russian)"
-        //."<option value=sk>Slovenčina (Slovakian)"
-        ."<option value=sl> Slovenščina (Slovenian)"
-        ."<option value=tr>Türkçe (Turkish)"
-        ."<option value=zh_CN>简体中文 (Chinese)"
-        ."</select>
+    ";
+    language_select();
+    echo "</select>
         </form>
         <script type=\"text/javascript\">
         document.language.lang.selectedIndex=0;
diff --git a/html/inc/language_names.inc b/html/inc/language_names.inc
new file mode 100644
index 0000000000..60c039e476
--- /dev/null
+++ b/html/inc/language_names.inc
@@ -0,0 +1,57 @@
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+$language_names = array(
+        array("ar", "العربية", "Arabic"),
+        array("be", "Беларускі", "Belarusian"),
+        array("bg", "Български", "Bulgarian"),
+        array("ca", "Català", "Catalan"),
+        array("cs", "Čeština ", "Czech"),
+        array("cy", "Cymraeg", "Welsh"),
+        array("da", "Dansk", "Danish"),
+        array("de", "Deutsch ", "German"),
+        array("el", "Ελληνικά", "Greek"),
+        array("en", "English", "English"),
+        array("es", "Espa&ntilde;ol", "Spanish"),
+        array("sa", "فارسی", "Persian"),
+        array("fi", "Suomi", "Finnish"),
+        array("fr", "Fran&ccedil;ais", "French"),
+        array("gl", "Galego", "Galician"),
+        array("he", "עִבְרִית", "Hebrew"),
+        array("hr", "Hrvatski", "Croatian"),
+        array("hu", "Magyar", "Hungarian"),
+        array("it", "Italiano", "Italian"),
+        array("ja", "日本語", "Japanese"),
+        array("ko", "한국어", "Korean"),
+        array("lt", "Lietuvių", "Lithuanian"),
+        array("lv", "Latviešu", "Latvian"),
+        array("nl", "Nederlands", "Dutch"),
+        array("pl", "Polski", "Polish"),
+        array("pt_BR", "Portugu&ecirc;s - Brasil", "Portuguese - Brazil"),
+        array("pt_PT", "Portugu&ecirc;s", "Portuguese"),
+        array("ro", "Română", "Romanian"),
+        array("ru", "Русский", "Russian"),
+        array("sk", "Slovenčina", "Slovakian"),
+        array("sl", "Slovenščina", "Slovenian"),
+        array("sv", "Svenska", "Swedish"),
+        array("tr", "Türkçe", "Turkish"),
+        array("zh_CN", "简体中文", "Chinese"),
+		array("zh_TW", "繁體中文", "Chinese (Taiwan)"),
+);
+
+?>
diff --git a/html/inc/translation.inc b/html/inc/translation.inc
index 2912770a20..6788c4386e 100644
--- a/html/inc/translation.inc
+++ b/html/inc/translation.inc
@@ -22,25 +22,24 @@ $lang_prj_translations_dir = "project_specific_translations/";
 $lang_compiled_dir = "compiled/";
 $lang_log_level = 1;
 
-// Fetches a list of compiled languages from the directory
-// set to contain such files.
+// Get a list of compiled languages by scanning the compiled/ dir
 // @returns A list of languages that have been compiled
 //
 function getSupportedLanguages(){
     global $lang_language_dir, $lang_compiled_dir;
     $list = array();
-    if (is_dir($lang_language_dir.$lang_compiled_dir)) {
-        if ($dh = opendir($lang_language_dir.$lang_compiled_dir)) {
-            while ($file = readdir($dh)) {
-                if (substr($file, -7) != ".po.inc") continue;
-                if (is_numeric(substr($file, 0, 5))) continue;
-                $list[] = substr($file,0,-7);
-            }
-        }
-    } else {
+    if (!is_dir($lang_language_dir.$lang_compiled_dir)) {
         echo "\"".$lang_language_dir.$lang_compiled_dir."\" is not a directory. Please consult the documentation for correctly setting up the translation system.";
         exit;
     }
+    $dh = opendir($lang_language_dir.$lang_compiled_dir);
+    if (!$dh) die("can't open language dir");
+
+    while ($file = readdir($dh)) {
+        if (substr($file, -7) != ".po.inc") continue;
+        if (is_numeric(substr($file, 0, 5))) continue;
+        $list[] = substr($file, 0, -7);
+    }
     return $list;
 }
 
@@ -50,59 +49,57 @@ function getSupportedLanguages(){
 // @param transdir The location of the .po files to compile relative to langdir
 // @param compdir The output location relative to langdir
 //
-function buildLanguages($langdir,$transdir,$compdir){
+function buildLanguages($langdir, $transdir, $compdir){
 
     // Run through each language and compile their lookup arrays.
-    if (is_dir($langdir.$transdir)) {
-        if ($dh = opendir($langdir.$transdir)) {
-            while (($file = readdir($dh)) !== false) {
-                if ($file==".." or $file=="."){
-                    // Skip parent and current dir
-                } else if (substr($file,-3)==".po"){
-                    // and only do files ending in .po
-                    language_log(
-                        "-------------Compiling $transdir$file------------", 0
-                    );
-                    $language = parseLanguage($langdir.$transdir.$file);
-                    if (!$language){
-                        language_log(
-                            "WARNING: Could not parse language ".$file
-                        );
-                        continue;
-                    }
-                    $path = $langdir.$compdir.$file.".inc";
-                    if (file_exists($path)) {
-                        $fh = fopen($path, "a");
-                    } else {
-                        $fh = fopen($path, "w");
-                        fwrite($fh, "<?php\n");                    
-                    }
-                    if (!$fh) {
-                        language_log(
-                            "ERROR: could not access $langdir $compdir - please check permissions", 2
-                        );
-                        exit;
-                    }
-                    foreach ($language as $key => $value){
-                        if ($value !== "") {
-                            //Skip if the msgstr is empty
-                            fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
-                        }
-                    }
-                    // don't write \?\> - may append
-
-                    fclose($fh);
-                } else {
-                    //debug("File $file with unknown extension found in $info_dir");
-                }
-            }
-            closedir($dh);
-        } else {
-            //debug("$info_dir could not be opened - check permissions?");
-        }
-    } else {
+    if (!is_dir($langdir.$transdir)) {
         //debug("$info_dir not found or is not a directory");
     }
+    $dh = opendir($langdir.$transdir);
+    if (!$dh) die("can't open translation dir");
+    while (($file = readdir($dh)) !== false) {
+        if ($file==".." || $file==".") {
+            continue;
+        }
+        // and only do files ending in .po
+        if (substr($file,-3) != ".po"){
+            //debug("File $file with unknown extension found in $info_dir");
+            continue;
+        }
+        language_log(
+            "-------------Compiling $transdir$file------------", 0
+        );
+        $language = parseLanguage($langdir.$transdir.$file);
+        if (!$language){
+            language_log(
+                "WARNING: Could not parse language ".$file
+            );
+            continue;
+        }
+        $path = $langdir.$compdir.$file.".inc";
+        if (file_exists($path)) {
+            $fh = fopen($path, "a");
+        } else {
+            $fh = fopen($path, "w");
+            fwrite($fh, "<?php\n");                    
+        }
+        if (!$fh) {
+            language_log(
+                "ERROR: could not access $langdir $compdir - please check permissions", 2
+            );
+            exit;
+        }
+        foreach ($language as $key => $value){
+            if ($value !== "") {
+                // Skip if the msgstr is empty
+                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
+            }
+        }
+        // don't write \?\> - may append
+
+        fclose($fh);
+    }
+    closedir($dh);
 }
 
 // Parses a gettext .po-file into an associative PHP array.
@@ -117,10 +114,10 @@ function parseLanguage($file){
     $parsing_token = false;
     $parsing_text = false;
     $output = array();
-    for ($i = 0;$i<sizeof($translation_file);$i++){
+    for ($i=0; $i<sizeof($translation_file); $i++){
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
-        if (substr($entry,0,1)=="#") {
+        if (substr($entry, 0, 1)=="#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
             if (!$first_entry){
@@ -185,7 +182,7 @@ function tra($text /* ...arglist... */){
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i = 1; $i<func_num_args(); $i++){
+    for ($i=1; $i<func_num_args(); $i++){
         $replacements["%".$i] = func_get_arg($i);
     }
     $text = strtr($text, $replacements);
@@ -247,6 +244,7 @@ $client_languages=explode(",",$language_string);
 $languages_in_use = array();
 
 // Loop over languages that the client requests
+//
 for ($i=0; $i<sizeof($client_languages); $i++) {
     if ((strlen($client_languages[$i])>2)
         && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-"))
diff --git a/locale/bg/BOINC-Android.po b/locale/bg/BOINC-Android.po
index 2463608b01..887d68307d 100644
--- a/locale/bg/BOINC-Android.po
+++ b/locale/bg/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-18 13:54+0000\n"
 "Last-Translator: Dimitar <mexicoman@abv.bg>\n"
 "Language-Team: bg <LL@li.org>\n"
diff --git a/locale/ca/BOINC-Android.po b/locale/ca/BOINC-Android.po
index 0c5b8a879b..4434fa9edd 100644
--- a/locale/ca/BOINC-Android.po
+++ b/locale/ca/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-08-29 15:37-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-09 23:12+0000\n"
 "Last-Translator: Xavier <xavi.mormur@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/cs/BOINC-Android.po b/locale/cs/BOINC-Android.po
index 62dabe28a0..98329500b2 100644
--- a/locale/cs/BOINC-Android.po
+++ b/locale/cs/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: cs <LL@li.org>\n"
diff --git a/locale/da/BOINC-Android.po b/locale/da/BOINC-Android.po
index 5d283f63fd..cef3d5bed1 100644
--- a/locale/da/BOINC-Android.po
+++ b/locale/da/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-12 18:57+0000\n"
 "Last-Translator: pryds <thomas@pryds.eu>\n"
 "Language-Team: da <LL@li.org>\n"
diff --git a/locale/de/BOINC-Android.po b/locale/de/BOINC-Android.po
index c22adba584..ac0c2e74e6 100644
--- a/locale/de/BOINC-Android.po
+++ b/locale/de/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-21 07:25+0000\n"
 "Last-Translator: Christian <djangofett@gmx.net>\n"
 "Language-Team: de <LL@li.org>\n"
diff --git a/locale/el/BOINC-Android.po b/locale/el/BOINC-Android.po
index cd0598ac3b..ff55638ddd 100644
--- a/locale/el/BOINC-Android.po
+++ b/locale/el/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: el <LL@li.org>\n"
diff --git a/locale/es/BOINC-Android.po b/locale/es/BOINC-Android.po
index 4e29d3cc51..7ec5cd7bb6 100644
--- a/locale/es/BOINC-Android.po
+++ b/locale/es/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: es <LL@li.org>\n"
diff --git a/locale/fi/BOINC-Android.po b/locale/fi/BOINC-Android.po
index 45679b7846..88b720f565 100644
--- a/locale/fi/BOINC-Android.po
+++ b/locale/fi/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-21 14:49+0000\n"
 "Last-Translator: Sami Nordlund <sami.nordlund@kolumbus.fi>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/fr/BOINC-Android.po b/locale/fr/BOINC-Android.po
index 52278f5b5d..5735f5269e 100644
--- a/locale/fr/BOINC-Android.po
+++ b/locale/fr/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-20 20:14+0000\n"
 "Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: fr <LL@li.org>\n"
diff --git a/locale/he/BOINC-Android.po b/locale/he/BOINC-Android.po
index bc3b89942c..81eb35137d 100644
--- a/locale/he/BOINC-Android.po
+++ b/locale/he/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: he <LL@li.org>\n"
diff --git a/locale/hr/BOINC-Android.po b/locale/hr/BOINC-Android.po
index 9c5c4675dd..94f0becab3 100644
--- a/locale/hr/BOINC-Android.po
+++ b/locale/hr/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: hr <LL@li.org>\n"
diff --git a/locale/hu/BOINC-Android.po b/locale/hu/BOINC-Android.po
index cf653b527a..62ef71c56e 100644
--- a/locale/hu/BOINC-Android.po
+++ b/locale/hu/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-09 09:26+0000\n"
 "Last-Translator: Gabor <csega@mailbox.hu>\n"
 "Language-Team: hu <LL@li.org>\n"
diff --git a/locale/it_IT/BOINC-Android.po b/locale/it_IT/BOINC-Android.po
index fa1e0c6563..6633d2a874 100644
--- a/locale/it_IT/BOINC-Android.po
+++ b/locale/it_IT/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-08-30 10:54+0000\n"
 "Last-Translator: Gianfranco <costamagnagianfranco@yahoo.it>\n"
 "Language-Team: it_IT <LL@li.org>\n"
diff --git a/locale/ja/BOINC-Android.po b/locale/ja/BOINC-Android.po
index 2d4fa0956b..7409242820 100644
--- a/locale/ja/BOINC-Android.po
+++ b/locale/ja/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <LL@li.org>\n"
diff --git a/locale/ko/BOINC-Android.po b/locale/ko/BOINC-Android.po
index 1fa8b805c7..65129a9de1 100644
--- a/locale/ko/BOINC-Android.po
+++ b/locale/ko/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC 7.2.x\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-01 00:11+0000\n"
 "Last-Translator: Kangsan Lee <treppolse@gmail.com>\n"
 "Language-Team: SETIKAH@HOME\n"
diff --git a/locale/lt/BOINC-Android.po b/locale/lt/BOINC-Android.po
index d86730d831..bfd03ae65f 100644
--- a/locale/lt/BOINC-Android.po
+++ b/locale/lt/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: lt <LL@li.org>\n"
diff --git a/locale/lv/BOINC-Android.po b/locale/lv/BOINC-Android.po
index ee3afa01ab..fc79a99f83 100644
--- a/locale/lv/BOINC-Android.po
+++ b/locale/lv/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: lv <LL@li.org>\n"
diff --git a/locale/nb/BOINC-Android.po b/locale/nb/BOINC-Android.po
index b0e5fc104a..86b4b3d77e 100644
--- a/locale/nb/BOINC-Android.po
+++ b/locale/nb/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: nb <LL@li.org>\n"
diff --git a/locale/nl/BOINC-Android.po b/locale/nl/BOINC-Android.po
index c0358c6457..745a6ed911 100644
--- a/locale/nl/BOINC-Android.po
+++ b/locale/nl/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-08-29 15:37-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-18 17:19+0000\n"
 "Last-Translator: Rene <oskamjr@ziggo.nl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/pl/BOINC-Android.po b/locale/pl/BOINC-Android.po
index 7bbabdc13a..57f42291c0 100644
--- a/locale/pl/BOINC-Android.po
+++ b/locale/pl/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: pl <LL@li.org>\n"
diff --git a/locale/pt_BR/BOINC-Android.po b/locale/pt_BR/BOINC-Android.po
index c05e0d81cf..4f1171328f 100644
--- a/locale/pt_BR/BOINC-Android.po
+++ b/locale/pt_BR/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: pt_BR <LL@li.org>\n"
diff --git a/locale/pt_PT/BOINC-Android.po b/locale/pt_PT/BOINC-Android.po
index 9fdbef6620..79f0cb6bcd 100644
--- a/locale/pt_PT/BOINC-Android.po
+++ b/locale/pt_PT/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-03 14:55+0000\n"
 "Last-Translator: Miguel Filipe Paulino de Sousa <Miguel.veig@gmail.com>\n"
 "Language-Team: pt_PT <LL@li.org>\n"
diff --git a/locale/ro/BOINC-Android.po b/locale/ro/BOINC-Android.po
index c39dbc8aff..f34191989d 100644
--- a/locale/ro/BOINC-Android.po
+++ b/locale/ro/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-08-30 08:02+0000\n"
 "Last-Translator: Marius <marius.sirbu@outlook.com>\n"
 "Language-Team: ro <LL@li.org>\n"
diff --git a/locale/ru/BOINC-Android.po b/locale/ru/BOINC-Android.po
index 18295623f1..d58adc510a 100644
--- a/locale/ru/BOINC-Android.po
+++ b/locale/ru/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-08-29 15:37-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-21 13:54+0000\n"
 "Last-Translator: Nikolay Saharov <saharovna@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/sk/BOINC-Android.po b/locale/sk/BOINC-Android.po
index 1edd34fc35..72a8c2dfa4 100644
--- a/locale/sk/BOINC-Android.po
+++ b/locale/sk/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-11 22:33+0000\n"
 "Last-Translator: aceman <acelists@atlas.sk>\n"
 "Language-Team: sk <LL@li.org>\n"
diff --git a/locale/sl/BOINC-Android.po b/locale/sl/BOINC-Android.po
index 05fbd69b6c..3107ee5b16 100644
--- a/locale/sl/BOINC-Android.po
+++ b/locale/sl/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 15:28-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sl <LL@li.org>\n"
diff --git a/locale/tr/BOINC-Android.po b/locale/tr/BOINC-Android.po
index 8d768ee992..4c600cc9cd 100644
--- a/locale/tr/BOINC-Android.po
+++ b/locale/tr/BOINC-Android.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OINC Android 7.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-22 12:02+0200\n"
 "Last-Translator: Aycan Demirel <aycandemirel@hotmail.com>\n"
 "Language-Team: Türkçe <LL@li.org>\n"
diff --git a/locale/uk/BOINC-Android.po b/locale/uk/BOINC-Android.po
index 2e9a974695..4c59417313 100644
--- a/locale/uk/BOINC-Android.po
+++ b/locale/uk/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-19 20:47+0000\n"
 "Last-Translator: Олег <pukish_oleg@ukr.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/zh_CN/BOINC-Android.po b/locale/zh_CN/BOINC-Android.po
index d95d55ce0e..66e2959ac3 100644
--- a/locale/zh_CN/BOINC-Android.po
+++ b/locale/zh_CN/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-09-21 09:50+0000\n"
 "Last-Translator: Gang <zenith.yin@gmail.com>\n"
 "Language-Team: zh_CN <LL@li.org>\n"
diff --git a/locale/zh_TW/BOINC-Android.po b/locale/zh_TW/BOINC-Android.po
index e467307bba..9986ebdce5 100644
--- a/locale/zh_TW/BOINC-Android.po
+++ b/locale/zh_TW/BOINC-Android.po
@@ -6,7 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-10-18 00:00-0700\n"
+=======
+"POT-Creation-Date: 2013-10-23 00:00-0700\n"
+>>>>>>> 1f66a554f6d807593304986267225610b901163f
 "PO-Revision-Date: 2013-10-19 05:39+0000\n"
 "Last-Translator: 宇謙 <df910105@yahoo.com.tw>\n"
 "Language-Team: zh_TW <LL@li.org>\n"
diff --git a/win_build/boinc_cli.vcxproj b/win_build/boinc_cli.vcxproj
index 43fa47841d..33f6b3c28c 100644
--- a/win_build/boinc_cli.vcxproj
+++ b/win_build/boinc_cli.vcxproj
@@ -463,6 +463,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\client\boinc.xml" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/win_build/boinc_ss.vcxproj b/win_build/boinc_ss.vcxproj
index e079134e56..31d40a331f 100644
--- a/win_build/boinc_ss.vcxproj
+++ b/win_build/boinc_ss.vcxproj
@@ -229,7 +229,7 @@
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;wsock32.lib;advapi32.lib;freetype2410_D.lib;ftgl_static_D.lib</AdditionalDependencies>
+      <AdditionalDependencies>libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;shell32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;wsock32.lib;advapi32.lib;freetype2410_D.lib;ftgl_static_D.lib</AdditionalDependencies>
       <OutputFile>.\Build\$(Platform)\$(Configuration)\boincscr.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../boinc_depends_win_vs2010/freetype/mswin/$(Platform)/$(Configuration)/lib;../../boinc_depends_win_vs2010/ftgl/mswin/$(Platform)/$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/win_build/boincsvcctrl.vcxproj b/win_build/boincsvcctrl.vcxproj
index 35d6e6246d..85429dc40f 100644
--- a/win_build/boincsvcctrl.vcxproj
+++ b/win_build/boincsvcctrl.vcxproj
@@ -135,7 +135,7 @@
       <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>MSVCRTD.LIB;MSVCPRTD.LIB;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MSVCRTD.LIB;MSVCPRTD.LIB;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/win_build/vboxwrapper.vcxproj b/win_build/vboxwrapper.vcxproj
index a24fe50b18..f25400d45c 100644
--- a/win_build/vboxwrapper.vcxproj
+++ b/win_build/vboxwrapper.vcxproj
@@ -128,12 +128,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26028_windows_intelx86.exe</OutputFile>
+      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26029_windows_intelx86.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26028_windows_intelx86.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26029_windows_intelx86.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -177,12 +177,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26028_windows_x86_64.exe</OutputFile>
+      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26029_windows_x86_64.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26028_windows_x86_64.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26029_windows_x86_64.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>