[boinc] 01/03: Imported Upstream version 7.4.37+dfsg
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Thu Dec 18 11:09:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch experimental
in repository boinc.
commit 3e9d0c11eeff939ba81011da1e66fb50e796d747
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Dec 18 11:50:16 2014 +0100
Imported Upstream version 7.4.37+dfsg
---
android/BOINC/AndroidManifest.xml | 13 +-
android/build_boinc_arm.sh | 6 +-
android/build_boinc_mips.sh | 6 +-
android/build_boinc_x86.sh | 6 +-
android/build_curl_arm.sh | 8 +-
android/build_curl_mips.sh | 8 +-
android/build_curl_x86.sh | 8 +-
android/build_libraries_arm.sh | 6 +-
android/build_libraries_mips.sh | 6 +-
android/build_libraries_x86.sh | 6 +-
android/build_openssl_arm.sh | 8 +-
android/build_openssl_mips.sh | 8 +-
android/build_openssl_x86.sh | 8 +-
api/boinc_api.cpp | 16 +-
api/boinc_api.h | 3 -
api/boinc_opencl.cpp | 125 +-
client/acct_setup.cpp | 34 +-
client/acct_setup.h | 1 -
client/app.cpp | 2 +-
client/app_config.cpp | 126 +-
client/app_config.h | 3 +-
client/app_control.cpp | 34 +-
client/boinc.xml | 2 -
client/boinc_cmd.cpp | 32 +-
client/client_msgs.cpp | 6 +-
client/client_state.cpp | 36 +-
client/client_state.h | 2 +-
client/client_types.cpp | 30 -
client/client_types.h | 10 +-
client/coproc_sched.cpp | 111 +-
client/cpu_sched.cpp | 43 +-
client/cs_notice.cpp | 43 +-
client/cs_notice.h | 2 -
client/cs_platforms.cpp | 19 +-
client/cs_prefs.cpp | 5 +-
client/cs_scheduler.cpp | 18 +-
client/cs_statefile.cpp | 10 +-
client/gpu_detect.cpp | 59 +-
client/gpu_nvidia.cpp | 15 +-
client/gpu_opencl.cpp | 25 +-
client/hostinfo_unix.cpp | 11 +-
client/hostinfo_win.cpp | 125 +-
client/log_flags.cpp | 78 +-
client/log_flags.h | 4 +-
client/makefile_sim | 2 +-
client/project.cpp | 6 +-
client/project.h | 10 +-
client/result.cpp | 7 +-
client/result.h | 8 +-
client/rr_sim.cpp | 19 +-
client/sandbox.cpp | 2 +-
client/scheduler_op.cpp | 4 +-
client/sim.cpp | 20 +-
client/sysmon_win.cpp | 4 +-
client/work_fetch.cpp | 433 ++++---
client/work_fetch.h | 41 +-
clientgui/AccountInfoPage.cpp | 20 +-
clientgui/AccountManagerInfoPage.cpp | 8 +-
clientgui/AccountManagerProcessingPage.cpp | 27 +-
clientgui/AccountManagerPropertiesPage.cpp | 27 +-
clientgui/AdvancedFrame.cpp | 50 +-
clientgui/AsyncRPC.cpp | 2 +-
clientgui/AsyncRPC.h | 4 +-
clientgui/BOINCBaseView.cpp | 69 -
clientgui/BOINCBaseView.h | 6 +-
clientgui/BOINCGUIApp.cpp | 58 +-
clientgui/BOINCTaskBar.cpp | 10 +-
clientgui/BOINCTaskCtrl.cpp | 5 +-
clientgui/CompletionPage.cpp | 2 +-
clientgui/DlgAdvPreferences.cpp | 23 +-
clientgui/DlgDiagnosticLogFlags.cpp | 22 +-
clientgui/DlgEventLog.cpp | 25 +-
clientgui/DlgItemProperties.cpp | 88 +-
clientgui/Events.h | 1 -
clientgui/MainDocument.cpp | 73 +-
clientgui/MainDocument.h | 12 -
clientgui/Makefile.am | 7 +-
clientgui/NoticeListCtrl.cpp | 7 -
clientgui/ProjectInfoPage.cpp | 134 +-
clientgui/ProjectInfoPage.h | 1 -
clientgui/ProjectProcessingPage.cpp | 28 +-
clientgui/ProjectPropertiesPage.cpp | 27 +-
clientgui/ProjectWelcomePage.cpp | 291 -----
clientgui/ProjectWelcomePage.h | 95 --
clientgui/SkinManager.cpp | 31 +-
clientgui/ViewProjects.cpp | 6 -
clientgui/ViewTransfers.cpp | 7 -
clientgui/ViewWork.cpp | 35 -
clientgui/WizardAttach.cpp | 50 +-
clientgui/WizardAttach.h | 42 +-
clientgui/browser.cpp | 108 +-
clientgui/browser.h | 29 +-
clientgui/sg_BoincSimpleFrame.cpp | 46 +-
clientgui/sg_DlgMessages.cpp | 21 +-
clientgui/sg_DlgPreferences.cpp | 67 +-
clientgui/sg_PanelBase.h | 3 +-
clientgui/sg_ProjectPanel.cpp | 49 +-
clientgui/sg_TaskPanel.cpp | 64 +-
clientgui/stdwx.h | 1 -
configure.ac | 48 +-
doc/projects.inc | 3 +-
html/languages/translations/da.po | 601 ++++-----
html/languages/translations/ja.po | 19 +-
html/languages/translations/ko.po | 877 ++++++++-----
html/languages/translations/pl.po | 16 +-
html/languages/translations/ru.po | 638 +++++-----
html/languages/translations/sl.po | 17 +-
html/user/get_project_config.php | 4 -
html/user/lookup_account.php | 80 +-
lib/Makefile.am | 4 +-
lib/Makefile.mingw | 4 +
lib/app_ipc.cpp | 21 +-
lib/cc_config.cpp | 18 +-
lib/cc_config.h | 4 +-
lib/coproc.cpp | 1 -
lib/coproc.h | 52 +-
lib/crypt.cpp | 30 +-
lib/error_numbers.h | 2 -
lib/gui_rpc_client.cpp | 6 +-
lib/gui_rpc_client.h | 6 +-
lib/gui_rpc_client_ops.cpp | 19 +-
lib/gui_rpc_client_print.cpp | 1 -
lib/{md5.cpp => md5.c} | 0
lib/network.cpp | 28 +-
lib/notice.cpp | 5 +-
lib/opencl_boinc.cpp | 19 +-
lib/opencl_boinc.h | 3 +-
lib/parse.cpp | 7 +-
lib/procinfo_mac.cpp | 18 +-
lib/str_util.cpp | 2 -
lib/url.cpp | 3 -
lib/url.h | 1 -
lib/util.cpp | 5 +-
lib/win_util.cpp | 10 +-
lib/win_util.h | 4 +-
locale/bg/BOINC-Android.po | 12 +-
locale/ca/BOINC-Setup.mo | Bin 3220 -> 3220 bytes
locale/da/BOINC-Manager.mo | Bin 73510 -> 77534 bytes
locale/da/BOINC-Manager.po | 222 ++--
locale/da/BOINC-Setup.mo | Bin 3098 -> 2882 bytes
locale/da/BOINC-Setup.po | 12 +-
locale/da/BOINC-Web.mo | Bin 20495 -> 21256 bytes
locale/da/BOINC-Web.po | 11 +-
locale/hu/BOINC-Android.po | 22 +-
locale/it_IT/BOINC-Manager.mo | Bin 76912 -> 81140 bytes
locale/it_IT/BOINC-Manager.po | 1903 ++++++++++++++--------------
locale/it_IT/BOINC-Project-Generic.po | 634 +++++----
locale/it_IT/BOINC-Setup.mo | Bin 3199 -> 2957 bytes
locale/it_IT/BOINC-Setup.po | 57 +-
locale/it_IT/BOINC-Web.mo | Bin 36748 -> 35829 bytes
locale/it_IT/BOINC-Web.po | 317 ++---
locale/ja/BOINC-Project-Generic.po | 19 +-
locale/ko/BOINC-Manager.mo | Bin 79278 -> 79278 bytes
locale/ko/BOINC-Manager.po | 1 +
locale/ko/BOINC-Project-Generic.po | 14 +-
locale/ko/BOINC-Web.mo | Bin 38853 -> 38856 bytes
locale/ko/BOINC-Web.po | 3 +
locale/lv/BOINC-Manager.mo | Bin 75675 -> 75675 bytes
locale/ms/BOINC-Client.mo | Bin 418 -> 0 bytes
locale/ms/BOINC-Manager.mo | Bin 418 -> 0 bytes
locale/ms/BOINC-Setup.mo | Bin 418 -> 0 bytes
locale/ms/BOINC-Web.mo | Bin 24728 -> 0 bytes
locale/nb/BOINC-Android.po | 549 ++++----
locale/nb/BOINC-Client.mo | Bin 4835 -> 4401 bytes
locale/nb/BOINC-Client.po | 43 +-
locale/nb/BOINC-Manager.mo | Bin 73317 -> 42831 bytes
locale/nb/BOINC-Manager.po | 816 ++++++------
locale/nb/BOINC-Project-Generic.po | 1251 +++++++++---------
locale/nb/BOINC-Setup.mo | Bin 3584 -> 554 bytes
locale/nb/BOINC-Setup.po | 60 +-
locale/nb/BOINC-Web.mo | Bin 7946 -> 1679 bytes
locale/nb/BOINC-Web.po | 221 +---
locale/nl/BOINC-Manager.mo | Bin 73561 -> 74048 bytes
locale/nl/BOINC-Manager.po | 214 ++--
locale/nl/BOINC-Setup.mo | Bin 2880 -> 2880 bytes
locale/nl/BOINC-Web.mo | Bin 36813 -> 36888 bytes
locale/nl/BOINC-Web.po | 213 ++--
locale/pl/BOINC-Project-Generic.po | 16 +-
locale/ro/BOINC-Project-Generic.po | 64 +-
locale/ru/BOINC-Manager.mo | Bin 102199 -> 104507 bytes
locale/ru/BOINC-Manager.po | 14 +-
locale/ru/BOINC-Project-Generic.po | 12 +-
locale/ru/BOINC-Setup.mo | Bin 4058 -> 3748 bytes
locale/ru/BOINC-Setup.po | 9 +-
locale/ru/BOINC-Web.mo | Bin 50326 -> 50013 bytes
locale/ru/BOINC-Web.po | 10 +-
locale/sk/BOINC-Manager.mo | Bin 74529 -> 80015 bytes
locale/sk/BOINC-Setup.mo | Bin 554 -> 554 bytes
locale/sk/BOINC-Web.mo | Bin 3607 -> 3607 bytes
locale/sl/BOINC-Android.po | 11 +-
locale/sl/BOINC-Project-Generic.po | 17 +-
locale/sl/BOINC-Web.mo | Bin 7070 -> 7041 bytes
locale/sl/BOINC-Web.po | 8 +-
locale/tr/BOINC-Web.mo | Bin 25051 -> 24698 bytes
locale/tr/BOINC-Web.po | 10 +-
locale/zh_CN/BOINC-Web.mo | Bin 33431 -> 33428 bytes
locale/zh_CN/BOINC-Web.po | 6 +-
py/Boinc/boinc_db.py | 6 -
sched/handle_request.cpp | 5 -
sched/hr.cpp | 2 +-
sched/hr_info.h | 7 -
sched/sched_send.cpp | 2 +-
sched/script_validator.cpp | 128 --
version.log | 2 +-
zip/unzip/ttyio.c | 4 -
205 files changed, 5701 insertions(+), 7166 deletions(-)
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 0b5594d..04b9715 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -2,7 +2,7 @@
<!--
This file is part of BOINC.
http://boinc.berkeley.edu
- Copyright (C) 2014 University of California
+ Copyright (C) 2012 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
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.berkeley.boinc"
android:installLocation="internalOnly"
- android:versionCode="108"
- android:versionName="7.4.35" > <!-- installation on SD card would break boot receiver -->
+ android:versionCode="110"
+ android:versionName="7.4.37" > <!-- installation on SD card would break boot receiver -->
<!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
@@ -32,8 +32,9 @@
android:smallScreens="true"
android:xlargeScreens="true" />
+ <!-- CAUTION: increasing targetSDK to >9 removes menu button on new devices -->
<uses-sdk
- android:minSdkVersion="16"
+ android:minSdkVersion="9"
android:targetSdkVersion="19" />
<!-- Required Permissions -->
@@ -48,8 +49,8 @@
android:allowBackup="true"
android:icon="@drawable/boinc"
android:label="@string/app_name"
- android:theme="@style/Theme.Styled"
- android:largeHeap="true">
+ android:theme="@style/Theme.Styled" > <!-- android:largeHeap="true" , possible api level > 10. grants application larger dalvik vm heap. better performance when showing many slideshow pictures. -->
+
<activity
android:name="edu.berkeley.boinc.SplashActivity"
diff --git a/android/build_boinc_arm.sh b/android/build_boinc_arm.sh
index fe26b12..52183cc 100755
--- a/android/build_boinc_arm.sh
+++ b/android/build_boinc_arm.sh
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=arm-linux-androideabi-gcc
export CXX=arm-linux-androideabi-g++
export LD=arm-linux-androideabi-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
diff --git a/android/build_boinc_mips.sh b/android/build_boinc_mips.sh
index 9b30558..c2bf21a 100755
--- a/android/build_boinc_mips.sh
+++ b/android/build_boinc_mips.sh
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=mipsel-linux-android-gcc
export CXX=mipsel-linux-android-g++
export LD=mipsel-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh
index 079e78a..ff9c78d 100755
--- a/android/build_boinc_x86.sh
+++ b/android/build_boinc_x86.sh
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=i686-linux-android-gcc
export CXX=i686-linux-android-g++
export LD=i686-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
diff --git a/android/build_curl_arm.sh b/android/build_curl_arm.sh
index 5e6f0bd..8145344 100755
--- a/android/build_curl_arm.sh
+++ b/android/build_curl_arm.sh
@@ -10,7 +10,7 @@ COMPILECURL="yes"
CONFIGURE="yes"
MAKECLEAN="yes"
-CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC
+CURL="/home/boincadm/src/curl-7.39.0" #CURL sources, required by BOINC
export ANDROIDTC="$HOME/androidarm-tc"
export TCBINARIES="$ANDROIDTC/bin"
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=arm-linux-androideabi-gcc
export CXX=arm-linux-androideabi-g++
export LD=arm-linux-androideabi-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
# Prepare android toolchain and environment
diff --git a/android/build_curl_mips.sh b/android/build_curl_mips.sh
index ca24267..be4189f 100755
--- a/android/build_curl_mips.sh
+++ b/android/build_curl_mips.sh
@@ -10,7 +10,7 @@ COMPILECURL="yes"
CONFIGURE="yes"
MAKECLEAN="yes"
-CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC
+CURL="/home/boincadm/src/curl-7.39.0" #CURL sources, required by BOINC
export ANDROIDTC="$HOME/androidmips-tc"
export TCBINARIES="$ANDROIDTC/bin"
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=mipsel-linux-android-gcc
export CXX=mipsel-linux-android-g++
export LD=mipsel-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
# Prepare android toolchain and environment
diff --git a/android/build_curl_x86.sh b/android/build_curl_x86.sh
index 6de24cf..6aef435 100755
--- a/android/build_curl_x86.sh
+++ b/android/build_curl_x86.sh
@@ -10,7 +10,7 @@ COMPILECURL="yes"
CONFIGURE="yes"
MAKECLEAN="yes"
-CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC
+CURL="/home/boincadm/src/curl-7.39.0" #CURL sources, required by BOINC
export ANDROIDTC="$HOME/androidx86-tc"
export TCBINARIES="$ANDROIDTC/bin"
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=i686-linux-android-gcc
export CXX=i686-linux-android-g++
export LD=i686-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
# Prepare android toolchain and environment
diff --git a/android/build_libraries_arm.sh b/android/build_libraries_arm.sh
index 1e3c9d0..94d7a91 100755
--- a/android/build_libraries_arm.sh
+++ b/android/build_libraries_arm.sh
@@ -23,9 +23,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=arm-linux-androideabi-gcc
export CXX=arm-linux-androideabi-g++
export LD=arm-linux-androideabi-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
diff --git a/android/build_libraries_mips.sh b/android/build_libraries_mips.sh
index 34b9a15..50973e7 100755
--- a/android/build_libraries_mips.sh
+++ b/android/build_libraries_mips.sh
@@ -23,9 +23,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=mipsel-linux-android-gcc
export CXX=mipsel-linux-android-g++
export LD=mipsel-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
diff --git a/android/build_libraries_x86.sh b/android/build_libraries_x86.sh
index 23a4b1f..de9deb9 100755
--- a/android/build_libraries_x86.sh
+++ b/android/build_libraries_x86.sh
@@ -23,9 +23,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=i686-linux-android-gcc
export CXX=i686-linux-android-g++
export LD=i686-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -DDECLARE_TIMEZONE -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
export PKG_CONFIG_SYSROOT_DIR=$TCSYSROOT
diff --git a/android/build_openssl_arm.sh b/android/build_openssl_arm.sh
index 89a55c5..5225a96 100755
--- a/android/build_openssl_arm.sh
+++ b/android/build_openssl_arm.sh
@@ -10,7 +10,7 @@ COMPILEOPENSSL="yes"
CONFIGURE="yes"
MAKECLEAN="yes"
-OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC
+OPENSSL="/home/boincadm/src/openssl-1.0.1j" #openSSL sources, requiered by BOINC
export ANDROIDTC="$HOME/androidarm-tc"
export TCBINARIES="$ANDROIDTC/bin"
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=arm-linux-androideabi-gcc
export CXX=arm-linux-androideabi-g++
export LD=arm-linux-androideabi-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
# Prepare android toolchain and environment
diff --git a/android/build_openssl_mips.sh b/android/build_openssl_mips.sh
index 758596a..df4ca31 100755
--- a/android/build_openssl_mips.sh
+++ b/android/build_openssl_mips.sh
@@ -10,7 +10,7 @@ COMPILEOPENSSL="yes"
CONFIGURE="yes"
MAKECLEAN="yes"
-OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC
+OPENSSL="/home/boincadm/src/openssl-1.0.1j" #openSSL sources, requiered by BOINC
export ANDROIDTC="$HOME/androidmips-tc"
export TCBINARIES="$ANDROIDTC/bin"
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=mipsel-linux-android-gcc
export CXX=mipsel-linux-android-g++
export LD=mipsel-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
# Prepare android toolchain and environment
diff --git a/android/build_openssl_x86.sh b/android/build_openssl_x86.sh
index f28b4e4..76c8a4b 100755
--- a/android/build_openssl_x86.sh
+++ b/android/build_openssl_x86.sh
@@ -10,7 +10,7 @@ COMPILEOPENSSL="yes"
CONFIGURE="yes"
MAKECLEAN="yes"
-OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC
+OPENSSL="/home/boincadm/src/openssl-1.0.1j" #openSSL sources, requiered by BOINC
export ANDROIDTC="$HOME/androidx86-tc"
export TCBINARIES="$ANDROIDTC/bin"
@@ -22,9 +22,9 @@ export PATH="$PATH:$TCBINARIES:$TCINCLUDES/bin"
export CC=i686-linux-android-gcc
export CXX=i686-linux-android-g++
export LD=i686-linux-android-ld
-export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer -fPIE"
-export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer -fPIE"
-export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie"
+export CFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -I$TCINCLUDES/include -O3 -fomit-frame-pointer"
+export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall -funroll-loops -fexceptions -O3 -fomit-frame-pointer"
+export LDFLAGS="-L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog"
export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
# Prepare android toolchain and environment
diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index dea49f9..f24f8c2 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -682,7 +682,7 @@ static void send_trickle_up_msg() {
// an "unrecoverable error", which will be reported back to server.
// A zero exit-status tells the client we've successfully finished the result.
//
-int boinc_finish_message(int status, const char* msg, bool is_notice) {
+int boinc_finish(int status) {
char buf[256];
fraction_done = 1;
fprintf(stderr,
@@ -693,15 +693,9 @@ int boinc_finish_message(int status, const char* msg, bool is_notice) {
boinc_sleep(2.0); // let the timer thread send final messages
boinc_disable_timer_thread = true; // then disable it
- if (options.main_program) {
+ if (options.main_program && status==0) {
FILE* f = fopen(BOINC_FINISH_CALLED_FILE, "w");
- if (f) {
- fprintf(f, "%d\n", status);
- if (msg) {
- fprintf(f, "%s\n%s\n", msg, is_notice?"notice":"");
- }
- fclose(f);
- }
+ if (f) fclose(f);
}
boinc_exit(status);
@@ -709,10 +703,6 @@ int boinc_finish_message(int status, const char* msg, bool is_notice) {
return 0; // never reached
}
-int boinc_finish(int status) {
- return boinc_finish_message(status, NULL, false);
-}
-
int boinc_temporary_exit(int delay, const char* reason, bool is_notice) {
FILE* f = fopen(TEMPORARY_EXIT_FILE, "w");
if (!f) {
diff --git a/api/boinc_api.h b/api/boinc_api.h
index f34d8d1..9c56df3 100644
--- a/api/boinc_api.h
+++ b/api/boinc_api.h
@@ -145,9 +145,6 @@ extern int boinc_report_app_status_aux(
extern int boinc_temporary_exit(
int delay, const char* reason=NULL, bool is_notice=false
);
-extern int boinc_finish_message(
- int status, const char* message, bool is_notice
-);
/////////// API ENDS HERE
diff --git a/api/boinc_opencl.cpp b/api/boinc_opencl.cpp
index 908bdf8..7b0fa9a 100644
--- a/api/boinc_opencl.cpp
+++ b/api/boinc_opencl.cpp
@@ -41,8 +41,6 @@
#include "boinc_opencl.h"
-static int compareBOINCVersionTo(int toMajor, int toMinor, int toRelease);
-
// A few complicating factors:
// Windows & Linux have a separate OpenCL platform for each vendor
// (NVIDIA, AMD, Intel).
@@ -97,7 +95,7 @@ int boinc_get_opencl_ids_aux(
int device_num_for_type = -1;
int device_index;
- if ((!type) || (!strlen(type))) return CL_INVALID_DEVICE_TYPE;
+ if ((!type) || (!strlen(type))) return CL_DEVICE_NOT_FOUND;
retval = clGetPlatformIDs(MAX_OPENCL_PLATFORMS, platforms, &num_platforms);
if (num_platforms == 0) return CL_DEVICE_NOT_FOUND;
@@ -112,23 +110,25 @@ int boinc_get_opencl_ids_aux(
// Use gpu_opencl_dev_index if available
if (opencl_device_index >= 0) {
- if (opencl_device_index < (int)num_devices) {
- device_id = devices[opencl_device_index];
- retval = get_vendor(device_id, vendor, sizeof(vendor));
- if (retval != CL_SUCCESS) continue;
+ if (opencl_device_index >= (int)num_devices) {
+ fprintf(stderr, "Invalid OpenCL GPU index: %d \n", opencl_device_index);
+ return CL_INVALID_DEVICE;
+ }
- if (!strcmp(vendor, type)) {
- *device = device_id;
- *platform = platforms[platform_index];
- return 0;
- }
+ device_id = devices[opencl_device_index];
+ retval = get_vendor(device_id, vendor, sizeof(vendor));
+ if (retval != CL_SUCCESS) continue;
+
+ if (!strcmp(vendor, type)) {
+ *device = device_id;
+ *platform = platforms[platform_index];
+ return 0;
}
-
+
continue;
}
- // Older versions of init_data.xml don't have the gpu_opencl_dev_index
- // field so use the value of gpu_device_num.
+ // Older versions of init_data.xml don't have gpu_opencl_dev_index field
// NOTE: This may return the wrong device on older versions of BOINC if
// OpenCL does not recognize all GPU models detected by CUDA or CAL
for (device_index=0; device_index<(int)num_devices; ++device_index) {
@@ -147,9 +147,6 @@ int boinc_get_opencl_ids_aux(
}
}
- fprintf(stderr, "GPU not found: type=%s, opencl_device_index=%d, device_num=%d\n",
- type, opencl_device_index, device_num);
-
return CL_DEVICE_NOT_FOUND;
}
@@ -160,15 +157,14 @@ int boinc_get_opencl_ids_aux(
// type: may be PROC_TYPE_NVIDIA_GPU, PROC_TYPE_AMD_GPU or PROC_TYPE_INTEL_GPU
// (it may also be 0, but then it will fail on older clients.)
//
-// The argc, argv and type arguments are ignored for 6.13.3 or later clients.
+// The argc, argv and type arguments are ignored for 7.0.12 or later clients.
//
// returns
// - 0 if success
// - ERR_FOPEN if init_data.xml missing
// - ERR_XML_PARSE if can't parse init_data.xml
// - CL_INVALID_DEVICE_TYPE if unable to get gpu_type information
-// - CL_INVALID_DEVICE if unable to get opencl_device_index or gpu device_num
-// - CL_DEVICE_NOT_FOUND if the requested device was not found
+// - ERR_NOT_FOUND if unable to get opencl_device_index or gpu device_num
// - an OpenCL error number if OpenCL error
//
int boinc_get_opencl_ids(
@@ -207,39 +203,24 @@ int boinc_get_opencl_ids(
}
if (aid.gpu_opencl_dev_index < 0) {
- if (compareBOINCVersionTo(7,0,12) >= 0) {
- // gpu_opencl_dev_index was added in BOINC version 7.0.12.
- // A gpu_opencl_dev_index value of -1 in version 7.0.12 or later
- // means BOINC client did not assign an OpenCL GPU to this task.
- fprintf(stderr, "Illegal value for gpu_opencl_dev_index: %d in BOINC Client %d.%d.%d\n",
- aid.gpu_opencl_dev_index, aid.major_version, aid.minor_version, aid.release);
- return CL_INVALID_DEVICE;
- }
-
- // Older versions of init_data.xml don't have the gpu_opencl_dev_index
- // field so use the value of gpu_device_num if available.
+ // Older versions of init_data.xml don't have gpu_opencl_dev_index field
+ //
gpu_device_num = aid.gpu_device_num;
if (gpu_device_num < 0) {
- if (compareBOINCVersionTo(6,13,3) < 0) {
- // gpu_device_num and gpu_type fields were added in BOINC version 6.13.3.
- // Very old versions of init_data.xml don't have gpu_device_num field
- // but instead pass the device number as a command-line argument.
- for (i=0; i<argc-1; i++) {
- if ((!strcmp(argv[i], "--device")) || (!strcmp(argv[i], "-device"))) {
- gpu_device_num = atoi(argv[i+1]);
- break;
- }
+ // Even older versions of init_data.xml don't have gpu_device_num field
+ for (i=0; i<argc-1; i++) {
+ if ((!strcmp(argv[i], "--device")) || (!strcmp(argv[i], "-device"))) {
+ gpu_device_num = atoi(argv[i+1]);
+ break;
}
}
-
- if (gpu_device_num < 0) {
- // BOINC client apparently did not assign a GPU to this task.
- fprintf(stderr, "Illegal value for gpu_device_num: %d in BOINC Client %d.%d.%d\n",
- aid.gpu_device_num, aid.major_version, aid.minor_version, aid.release);
- return CL_INVALID_DEVICE;
- }
}
- } // End if (aid.gpu_opencl_dev_index < 0)
+ }
+
+ if ((aid.gpu_opencl_dev_index < 0) && (gpu_device_num < 0)) {
+ fprintf(stderr, "GPU device # not found in %s\n", INIT_DATA_FILE);
+ return ERR_NOT_FOUND;
+ }
retval = boinc_get_opencl_ids_aux(
gpu_type, aid.gpu_opencl_dev_index, gpu_device_num, device, platform
@@ -255,9 +236,7 @@ int boinc_get_opencl_ids(
// - 0 if success
// - ERR_FOPEN if init_data.xml missing
// - ERR_XML_PARSE if can't parse init_data.xml
-// - CL_INVALID_DEVICE_TYPE if unable to get gpu_type information
-// - CL_INVALID_DEVICE if unable to get opencl_device_index or gpu device_num
-// - CL_DEVICE_NOT_FOUND if the requested device was not found
+// - ERR_NOT_FOUND if missing <gpu_type> or <gpu_device_num> fields
// - an OpenCL error number if OpenCL error
//
int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
@@ -270,29 +249,12 @@ int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
if (!strlen(aid.gpu_type)) {
fprintf(stderr, "GPU type not found in %s\n", INIT_DATA_FILE);
- return CL_INVALID_DEVICE_TYPE;
+ return ERR_NOT_FOUND;
}
- if (aid.gpu_opencl_dev_index < 0) {
- if (compareBOINCVersionTo(7,0,12) >= 0) {
- // gpu_opencl_dev_index was added in BOINC version 7.0.12.
- // A gpu_opencl_dev_index value of -1 in version 7.0.12 or
- // later means BOINC did not assign an OpenCL GPU to this task.
- fprintf(stderr, "Illegal value for gpu_opencl_dev_index: %d in BOINC Client %d.%d.%d\n",
- aid.gpu_opencl_dev_index, aid.major_version, aid.minor_version, aid.release);
- return CL_INVALID_DEVICE;
- }
-
- if (aid.gpu_device_num < 0) {
- if (compareBOINCVersionTo(6,13,3) >= 0) {
- // gpu_device_num and gpu_type fields were added in BOINC version 6.13.3.
- // A gpu_device_num value of -1 in version 6.13.3 or later means
- // BOINC did not assign a GPU to this task.
- fprintf(stderr, "Illegal value for gpu_device_num: %d in BOINC Client %d.%d.%d\n",
- aid.gpu_device_num, aid.major_version, aid.minor_version, aid.release);
- return CL_INVALID_DEVICE;
- }
- }
+ if ((aid.gpu_opencl_dev_index < 0) && (aid.gpu_device_num < 0)) {
+ fprintf(stderr, "GPU device # not found in %s\n", INIT_DATA_FILE);
+ return ERR_NOT_FOUND;
}
retval = boinc_get_opencl_ids_aux(
@@ -301,20 +263,3 @@ int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
return retval;
}
-
-static int compareBOINCVersionTo(int toMajor, int toMinor, int toRelease) {
- APP_INIT_DATA aid;
-
- boinc_get_init_data(aid);
-
- if (aid.major_version < toMajor) return -1;
- if (aid.major_version > toMajor) return 1;
- if (aid.minor_version < toMinor) return -1;
- if (aid.minor_version > toMinor) return 1;
- if (aid.release < toRelease) return -1;
- if (aid.release > toRelease) return 1;
- return 0;
-}
-
-
-
diff --git a/client/acct_setup.cpp b/client/acct_setup.cpp
index 79da0a7..5faaff4 100644
--- a/client/acct_setup.cpp
+++ b/client/acct_setup.cpp
@@ -82,7 +82,6 @@ void ACCOUNT_IN::parse(XML_PARSER& xp) {
passwd_hash = "";
user_name = "";
team_name = "";
- ldap_auth = false;
while (!xp.get_tag()) {
if (xp.parse_string("url", url)) continue;
@@ -90,7 +89,6 @@ void ACCOUNT_IN::parse(XML_PARSER& xp) {
if (xp.parse_string("passwd_hash", passwd_hash)) continue;
if (xp.parse_string("user_name", user_name)) continue;
if (xp.parse_string("team_name", team_name)) continue;
- if (xp.parse_bool("ldap_auth", ldap_auth)) continue;
}
canonicalize_master_url(url);
}
@@ -134,32 +132,16 @@ int LOOKUP_ACCOUNT_OP::do_rpc(ACCOUNT_IN& ai) {
url = ai.url;
canonicalize_master_url(url);
- url += "lookup_account.php";
-
- if (ai.ldap_auth && !strchr(ai.email_addr.c_str(), '@')) {
- // LDAP case
- //
- if (!is_https(ai.url.c_str())) return ERR_NEED_HTTPS;
- url += "?ldap_auth=1&ldap_uid=";
- parameter = ai.email_addr;
- escape_url(parameter);
- url += parameter;
- url += "&passwd=";
- parameter = ai.passwd_hash;
- escape_url(parameter);
- url += parameter;
- } else {
- url += "?email_addr=";
- parameter = ai.email_addr;
- escape_url(parameter);
- url += parameter;
+ url += "lookup_account.php?email_addr=";
+ parameter = ai.email_addr;
+ escape_url(parameter);
+ url += parameter;
- url += "&passwd_hash=";
- parameter = ai.passwd_hash;
- escape_url(parameter);
- url += parameter;
- }
+ url += "&passwd_hash=";
+ parameter = ai.passwd_hash;
+ escape_url(parameter);
+ url += parameter;
retval = gui_http->do_rpc(
this, url.c_str(), LOOKUP_ACCOUNT_FILENAME, false
diff --git a/client/acct_setup.h b/client/acct_setup.h
index 6bc8be7..10f8f75 100644
--- a/client/acct_setup.h
+++ b/client/acct_setup.h
@@ -43,7 +43,6 @@ struct ACCOUNT_IN {
// the suggested friendly name for the user during account creation.
std::string team_name;
std::string passwd_hash;
- bool ldap_auth;
void parse(XML_PARSER&);
};
diff --git a/client/app.cpp b/client/app.cpp
index f721d40..3c85200 100644
--- a/client/app.cpp
+++ b/client/app.cpp
@@ -166,7 +166,7 @@ int ACTIVE_TASK::preempt(int preempt_type, int reason) {
case REMOVE_MAYBE_SCHED:
// GPU jobs: always remove from mem, since it's tying up GPU RAM
//
- if (result->uses_gpu()) {
+ if (result->uses_coprocs()) {
remove = true;
break;
}
diff --git a/client/app_config.cpp b/client/app_config.cpp
index cb031f5..5e01e7e 100644
--- a/client/app_config.cpp
+++ b/client/app_config.cpp
@@ -27,49 +27,9 @@
bool have_max_concurrent = false;
-int APP_CONFIG::parse_gpu_versions(XML_PARSER& xp, PROJECT* p) {
- double x;
- while (!xp.get_tag()) {
- if (xp.match_tag("/gpu_versions")) return 0;
- else if (xp.parse_double("gpu_usage", x)) {
- if (x <= 0) {
- msg_printf(p, MSG_USER_ALERT,
- "gpu_usage must be positive in app_config.xml"
- );
- } else {
- gpu_gpu_usage = x;
- }
- continue;
- }
- else if (xp.parse_double("cpu_usage", x)) {
- if (x < 0) {
- msg_printf(p, MSG_USER_ALERT,
- "cpu_usage must be non-negative in app_config.xml"
- );
- } else {
- gpu_cpu_usage = x;
- }
- continue;
- }
- if (log_flags.unparsed_xml) {
- msg_printf(p, MSG_INFO,
- "Unparsed line in app_config.xml: %s",
- xp.parsed_tag
- );
- }
- }
- msg_printf_notice(p, false, NULL,
- "missing </gpu_versions> in app_config.xml"
- );
- return ERR_XML_PARSE;
-}
-
-// In these parsing functions, if there's an error you must
-// - generate a notice containing the string "app_config.xml"
-// - return an error code
-//
int APP_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
memset(this, 0, sizeof(APP_CONFIG));
+ double x;
while (!xp.get_tag()) {
if (xp.match_tag("/app")) return 0;
@@ -79,16 +39,34 @@ int APP_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
continue;
}
if (xp.match_tag("gpu_versions")) {
- int retval = parse_gpu_versions(xp, p);
- if (retval) return retval;
+ while (!xp.get_tag()) {
+ if (xp.match_tag("/gpu_versions")) break;
+ if (xp.parse_double("gpu_usage", x)) {
+ if (x <= 0) {
+ msg_printf(p, MSG_USER_ALERT,
+ "gpu_usage must be positive in app_config.xml"
+ );
+ } else {
+ gpu_gpu_usage = x;
+ }
+ continue;
+ }
+ if (xp.parse_double("cpu_usage", x)) {
+ if (x < 0) {
+ msg_printf(p, MSG_USER_ALERT,
+ "cpu_usage must be non-negative in app_config.xml"
+ );
+ } else {
+ gpu_cpu_usage = x;
+ }
+ continue;
+ }
+ }
continue;
}
if (xp.parse_bool("fraction_done_exact", fraction_done_exact)) {
continue;
}
-
- // unparsed XML not considered an error; maybe it should be?
- //
if (log_flags.unparsed_xml) {
msg_printf(p, MSG_INFO,
"Unparsed line in app_config.xml: %s",
@@ -97,9 +75,6 @@ int APP_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
}
xp.skip_unexpected(log_flags.unparsed_xml, "APP_CONFIG::parse");
}
- msg_printf(p, MSG_USER_ALERT,
- "missing </app> in app_config.xml"
- );
return ERR_XML_PARSE;
}
@@ -107,12 +82,6 @@ int APP_VERSION_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
memset(this, 0, sizeof(APP_VERSION_CONFIG));
while (!xp.get_tag()) {
- if (!xp.is_tag) {
- msg_printf_notice(p, false, NULL,
- "unexpected text '%s' in app_config.xml", xp.parsed_tag
- );
- return ERR_XML_PARSE;
- }
if (xp.match_tag("/app_version")) return 0;
if (xp.parse_str("app_name", app_name, 256)) continue;
if (xp.parse_str("plan_class", plan_class, 256)) continue;
@@ -127,36 +96,29 @@ int APP_VERSION_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
}
xp.skip_unexpected(log_flags.unparsed_xml, "APP_VERSION_CONFIG::parse");
}
- msg_printf(p, MSG_USER_ALERT,
- "missing </app_version> in app_config.xml"
- );
return ERR_XML_PARSE;
}
int APP_CONFIGS::parse(XML_PARSER& xp, PROJECT* p) {
int n;
- clear();
+ app_configs.clear();
if (!xp.parse_start("app_config")) return ERR_XML_PARSE;
while (!xp.get_tag()) {
- if (!xp.is_tag) {
- msg_printf_notice(p, false, NULL,
- "unexpected text '%s' in app_config.xml", xp.parsed_tag
- );
- return ERR_XML_PARSE;
- }
if (xp.match_tag("/app_config")) return 0;
if (xp.match_tag("app")) {
APP_CONFIG ac;
int retval = ac.parse(xp, p);
- if (retval) return retval;
- app_configs.push_back(ac);
+ if (!retval) {
+ app_configs.push_back(ac);
+ }
continue;
}
if (xp.match_tag("app_version")) {
APP_VERSION_CONFIG avc;
int retval = avc.parse(xp, p);
- if (retval) return retval;
- app_version_configs.push_back(avc);
+ if (!retval) {
+ app_version_configs.push_back(avc);
+ }
continue;
}
if (xp.parse_int("project_max_concurrent", n)) {
@@ -174,9 +136,6 @@ int APP_CONFIGS::parse(XML_PARSER& xp, PROJECT* p) {
}
xp.skip_unexpected(log_flags.unparsed_xml, "APP_CONFIGS::parse");
}
- msg_printf(p, MSG_USER_ALERT,
- "missing </app_config> in app_config.xml"
- );
return ERR_XML_PARSE;
}
@@ -184,7 +143,8 @@ int APP_CONFIGS::parse_file(FILE* f, PROJECT* p) {
MIOFILE mf;
XML_PARSER xp(&mf);
mf.init_file(f);
- return parse(xp, p);
+ int retval = parse(xp, p);
+ return retval;
}
static void show_warning(PROJECT* p, char* name) {
@@ -194,17 +154,13 @@ static void show_warning(PROJECT* p, char* name) {
);
}
-int APP_CONFIGS::config_app_versions(PROJECT* p, bool show_warnings) {
+void APP_CONFIGS::config_app_versions(PROJECT* p, bool show_warnings) {
unsigned int i;
- bool showed_notice = false;
for (i=0; i<app_configs.size(); i++) {
APP_CONFIG& ac = app_configs[i];
APP* app = gstate.lookup_app(p, ac.name);
if (!app) {
- if (show_warnings) {
- show_warning(p, ac.name);
- showed_notice = true;
- }
+ if (show_warnings) show_warning(p, ac.name);
continue;
}
app->max_concurrent = ac.max_concurrent;
@@ -223,10 +179,7 @@ int APP_CONFIGS::config_app_versions(PROJECT* p, bool show_warnings) {
APP_VERSION_CONFIG& avc = app_version_configs[i];
APP* app = gstate.lookup_app(p, avc.app_name);
if (!app) {
- if (show_warnings) {
- show_warning(p, avc.app_name);
- showed_notice = true;
- }
+ if (show_warnings) show_warning(p, avc.app_name);
continue;
}
bool found = false;
@@ -251,8 +204,6 @@ int APP_CONFIGS::config_app_versions(PROJECT* p, bool show_warnings) {
);
}
}
- if (showed_notice) return ERR_XML_PARSE;
- return 0;
}
void max_concurrent_init() {
@@ -296,10 +247,7 @@ void check_app_config() {
msg_printf(p, MSG_INFO, "Found %s", APP_CONFIG_FILE_NAME);
int retval = p->app_configs.parse_file(f, p);
if (!retval) {
- retval = p->app_configs.config_app_versions(p, true);
- if (!retval) {
- notices.remove_notices(p, REMOVE_APP_CONFIG_MSG);
- }
+ p->app_configs.config_app_versions(p, true);
}
fclose(f);
}
diff --git a/client/app_config.h b/client/app_config.h
index 0bb198f..3d54570 100644
--- a/client/app_config.h
+++ b/client/app_config.h
@@ -35,7 +35,6 @@ struct APP_CONFIG {
bool fraction_done_exact;
int parse(XML_PARSER&, PROJECT*);
- int parse_gpu_versions(XML_PARSER&, PROJECT*);
};
struct APP_VERSION_CONFIG {
@@ -55,7 +54,7 @@ struct APP_CONFIGS {
int parse(XML_PARSER&, PROJECT*);
int parse_file(FILE*, PROJECT*);
- int config_app_versions(PROJECT*, bool show_warnings);
+ void config_app_versions(PROJECT*, bool show_warnings);
void clear() {
app_configs.clear();
app_version_configs.clear();
diff --git a/client/app_control.cpp b/client/app_control.cpp
index fb1df52..ee64e5a 100644
--- a/client/app_control.cpp
+++ b/client/app_control.cpp
@@ -371,12 +371,12 @@ void ACTIVE_TASK::handle_temporary_exit(
} else {
if (is_notice) {
msg_printf(result->project, MSG_USER_ALERT,
- "Task postponed: %s", reason
+ "Can't run task: %s", reason
);
} else {
- if (log_flags.task) {
+ if (log_flags.task_debug) {
msg_printf(result->project, MSG_INFO,
- "task postponed %f sec: %s", backoff, reason
+ "[task] task called temporary_exit(%f, %s)", backoff, reason
);
}
}
@@ -587,30 +587,10 @@ void ACTIVE_TASK::handle_exited_app(int stat) {
gstate.request_work_fetch("application exited");
}
-// structure of a finish file (see boinc_api.cpp)):
-// exit status (int)
-// message
-// "notice" or blank line
-// ... or empty
-//
bool ACTIVE_TASK::finish_file_present() {
- char path[MAXPATHLEN], buf[1024], buf2[256];
- strcpy(buf, "");
- strcpy(buf2, "");
+ char path[MAXPATHLEN];
sprintf(path, "%s/%s", slot_dir, BOINC_FINISH_CALLED_FILE);
- FILE* f = fopen(path, "r");
- if (!f) return false;
- fgets(buf, sizeof(buf), f);
- fgets(buf, sizeof(buf), f);
- fgets(buf2, sizeof(buf2), f);
- if (strlen(buf)) {
- msg_printf(result->project,
- strstr(buf2, "notice")?MSG_USER_ALERT:MSG_INFO,
- "Message from task: %s", buf
- );
- }
- fclose(f);
- return true;
+ return (boinc_file_exists(path) != 0);
}
bool ACTIVE_TASK::temporary_exit_file_present(
@@ -1491,9 +1471,7 @@ void ACTIVE_TASK_SET::get_msgs() {
if (!atp->process_exists()) continue;
old_time = atp->checkpoint_cpu_time;
if (atp->scheduler_state == CPU_SCHED_SCHEDULED) {
- double x = atp->result->dont_throttle()?et_diff:et_diff_throttle;
- atp->elapsed_time += x;
- atp->wup->project->elapsed_time += x;
+ atp->elapsed_time += atp->result->dont_throttle()?et_diff:et_diff_throttle;
}
if (atp->get_app_status_msg()) {
if (old_time != atp->checkpoint_cpu_time) {
diff --git a/client/boinc.xml b/client/boinc.xml
index 1612f66..0e7903a 100644
--- a/client/boinc.xml
+++ b/client/boinc.xml
@@ -11,8 +11,6 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
- <!-- Windows 10 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
</assembly>
diff --git a/client/boinc_cmd.cpp b/client/boinc_cmd.cpp
index f578aff..652aa09 100644
--- a/client/boinc_cmd.cpp
+++ b/client/boinc_cmd.cpp
@@ -127,7 +127,7 @@ int main(int argc, char** argv) {
MESSAGES messages;
NOTICES notices;
char passwd_buf[256], hostname_buf[256], *hostname=0;
- char* passwd = passwd_buf, *p, *q;
+ char* passwd = passwd_buf, *p;
bool unix_domain = false;
#ifdef _WIN32
@@ -154,33 +154,11 @@ int main(int argc, char** argv) {
if (!strcmp(argv[i], "--host")) {
if (++i == argc) usage();
strlcpy(hostname_buf, argv[i], sizeof(hostname_buf));
-
- // see if port is specified.
- // syntax:
- // [a:b:..]:port for IPv6
- // a.b.c.d:port for IPv4
- // hostname:port for domain names
- //
- p = strchr(hostname_buf, '[');
+ hostname = hostname_buf;
+ p = strchr(hostname, ':');
if (p) {
- q = strchr(p, ']');
- if (!q) {
- fprintf(stderr, "invalid IPv6 syntax: %s\n", hostname_buf);
- exit(1);
- }
- hostname = p+1;
- *q = 0;
- port = atoi(q+1);
- } else {
- hostname = hostname_buf;
- p = strchr(hostname, ':');
- if (p) {
- q = strchr(p+1, ':');
- if (!q) {
- port = atoi(p+1);
- *p=0;
- }
- }
+ port = atoi(p+1);
+ *p=0;
}
i++;
}
diff --git a/client/client_msgs.cpp b/client/client_msgs.cpp
index 024898f..30c5a69 100644
--- a/client/client_msgs.cpp
+++ b/client/client_msgs.cpp
@@ -93,9 +93,11 @@ void show_message(
case MSG_SCHEDULER_ALERT:
char buf[1024];
if (is_html) {
- strcpy(buf, message);
- } else {
xml_escape(message, buf, 1024);
+ } else {
+ char buf2[1024];
+ xml_escape(message, buf2, 1024);
+ xml_escape(buf2, buf, 1024);
}
NOTICE n;
n.description = buf;
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 45bd9bd..dc803b7 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -246,8 +246,11 @@ void CLIENT_STATE::show_host_info() {
} else {
#if defined (_WIN32) && !defined(_WIN64)
if (!strcmp(get_primary_platform(), "windows_x86_64")) {
- msg_printf(NULL, MSG_USER_ALERT,
- "Can't detect VirtualBox because this is a 32-bit version of BOINC; to fix, please install a 64-bit version."
+ msg_printf(NULL, MSG_INFO,
+ "VirtualBox: can't detect because this is a 32-bit client"
+ );
+ msg_printf(NULL, MSG_INFO,
+ " (to use VirtualBox, install a 64-bit BOINC client)."
);
}
#endif
@@ -418,7 +421,12 @@ int CLIENT_STATE::init() {
// check for GPUs.
//
- coprocs.bound_counts(); // show GPUs described in cc_config.xml
+ for (int j=1; j<coprocs.n_rsc; j++) {
+ msg_printf(NULL, MSG_INFO, "GPU specified in cc_config.xml: %d %s",
+ coprocs.coprocs[j].count,
+ coprocs.coprocs[j].type
+ );
+ }
if (!cc_config.no_gpus
#ifdef _WIN32
&& !executing_as_daemon
@@ -868,7 +876,7 @@ bool CLIENT_STATE::poll_slow_events() {
#endif
if (user_active != old_user_active) {
- request_schedule_cpus(user_active?"Not idle":"Idle");
+ request_schedule_cpus("Idle state change");
}
#if 0
@@ -966,7 +974,6 @@ bool CLIENT_STATE::poll_slow_events() {
} else {
msg_printf(NULL, MSG_INFO, "Resuming file transfers");
}
- request_schedule_cpus("network resumed");
}
// if we're emerging from a bandwidth quota suspension,
@@ -1151,6 +1158,8 @@ int CLIENT_STATE::link_file_info(PROJECT* p, FILE_INFO* fip) {
int CLIENT_STATE::link_app_version(PROJECT* p, APP_VERSION* avp) {
APP* app;
+ FILE_INFO* fip;
+ unsigned int i;
avp->project = p;
app = lookup_app(p, avp->app_name);
@@ -1178,9 +1187,9 @@ int CLIENT_STATE::link_app_version(PROJECT* p, APP_VERSION* avp) {
strcpy(avp->graphics_exec_path, "");
strcpy(avp->graphics_exec_file, "");
- for (unsigned int i=0; i<avp->app_files.size(); i++) {
+ for (i=0; i<avp->app_files.size(); i++) {
FILE_REF& file_ref = avp->app_files[i];
- FILE_INFO* fip = lookup_file_info(p, file_ref.file_name);
+ fip = lookup_file_info(p, file_ref.file_name);
if (!fip) {
msg_printf(p, MSG_INTERNAL_ERROR,
"State file error: missing application file %s",
@@ -1593,10 +1602,6 @@ bool CLIENT_STATE::garbage_collect_always() {
for (fi_iter = file_infos.begin(); fi_iter!=file_infos.end(); fi_iter++) {
fip = *fi_iter;
- if (fip->sticky_expire_time && now > fip->sticky_expire_time) {
- fip->sticky = false;
- fip->sticky_expire_time = 0;
- }
if (!fip->sticky) continue;
if (fip->status < 0) continue;
fip->ref_cnt++;
@@ -1952,15 +1957,6 @@ int CLIENT_STATE::reset_project(PROJECT* project, bool detaching) {
}
garbage_collect_always();
}
-#ifdef ANDROID
- // space is likely to be an issue on Android, so clean out project dir
- // If we did this on other platforms we'd need to avoid deleting
- // app_config.xml, but this isn't likely to exist on Android.
- //
- if (!project->anonymous_platform) {
- client_clean_out_dir(project->project_dir(), "reset project");
- }
-#endif
// force refresh of scheduler URLs
//
diff --git a/client/client_state.h b/client/client_state.h
index bd2e6b4..8d6d3ad 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -111,7 +111,7 @@ struct CLIENT_STATE {
char language[16]; // ISO language code reported by GUI
char client_brand[256];
- // contents of client_brand.txt, e.g. "HTC Power to Give"
+ // contents of client_brand.txt, e.g. "HTP Power to Give"
// reported to scheduler
VERSION_INFO core_client_version;
string statefile_platform_name;
diff --git a/client/client_types.cpp b/client/client_types.cpp
index 400d121..28036ab 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -188,8 +188,6 @@ FILE_INFO::FILE_INFO() {
executable = false;
uploaded = false;
sticky = false;
- sticky_lifetime = 0;
- sticky_expire_time = 0;
gzip_when_done = false;
download_gzipped = false;
signature_required = false;
@@ -281,8 +279,6 @@ int FILE_INFO::set_permissions(const char* path) {
}
#endif
-// parse a <file_info>, from state file or scheduler RPC reply
-//
int FILE_INFO::parse(XML_PARSER& xp) {
char buf2[1024];
std::string url;
@@ -370,10 +366,6 @@ int FILE_INFO::parse(XML_PARSER& xp) {
if (xp.parse_bool("executable", executable)) continue;
if (xp.parse_bool("uploaded", uploaded)) continue;
if (xp.parse_bool("sticky", sticky)) continue;
- if (xp.parse_double("sticky_expire_time", sticky_expire_time)) continue;
- // state file has this
- if (xp.parse_double("sticky_lifetime", sticky_lifetime)) continue;
- // scheduler RPC reply has this
if (xp.parse_bool("gzip_when_done", gzip_when_done)) continue;
if (xp.parse_bool("download_gzipped", download_gzipped)) continue;
if (xp.parse_bool("signature_required", signature_required)) continue;
@@ -458,11 +450,6 @@ int FILE_INFO::write(MIOFILE& out, bool to_server) {
if (is_user_file) out.printf(" <is_user_file/>\n");
if (strlen(file_signature)) out.printf(" <file_signature>\n%s\n</file_signature>\n", file_signature);
}
- if (sticky_expire_time) {
- out.printf(" <sticky_expire_time>%f</sticky_expire_time>\n",
- sticky_expire_time
- );
- }
for (i=0; i<download_urls.urls.size(); i++) {
xml_escape(download_urls.urls[i].c_str(), buf, sizeof(buf));
out.printf(" <download_url>%s</download_url>\n", buf);
@@ -631,23 +618,6 @@ int FILE_INFO::merge_info(FILE_INFO& new_info) {
return retval;
}
- // sticky attributes
- //
- if (new_info.sticky) {
- sticky = true;
- if (new_info.sticky_lifetime) {
- double x = gstate.now + new_info.sticky_lifetime;
- if (x > sticky_expire_time) {
- sticky_expire_time = x;
- }
- } else {
- sticky_expire_time = 0;
- }
- } else {
- sticky = false;
- sticky_expire_time = 0;
- }
-
return 0;
}
diff --git a/client/client_types.h b/client/client_types.h
index b299a7f..908b21e 100644
--- a/client/client_types.h
+++ b/client/client_types.h
@@ -105,12 +105,6 @@ struct FILE_INFO {
bool executable; // change file protections to make executable
bool uploaded; // file has been uploaded
bool sticky; // don't delete unless instructed to do so
- double sticky_lifetime;
- // how long file should stay sticky.
- // passed from the server;
- // used by client to calculate sticky_expire_time.
- double sticky_expire_time;
- // if nonzero, when sticky status expires
bool signature_required; // true iff associated with app version
bool is_user_file;
bool is_project_file;
@@ -258,7 +252,7 @@ struct APP {
// Can also specify in client_state.xml (for client emulator)
int n_concurrent;
// temp during job scheduling, to enforce max_concurrent
- COPROC_INSTANCE_BITMAP non_excluded_instances[MAX_RSC];
+ int non_excluded_instances[MAX_RSC];
// for each resource type, bitmap of the non-excluded instances
#ifdef SIM
double latency_bound;
@@ -276,7 +270,7 @@ struct APP {
};
struct GPU_USAGE {
- int rsc_type; // index into COPROCS array
+ int rsc_type;
double usage;
};
diff --git a/client/coproc_sched.cpp b/client/coproc_sched.cpp
index 34d6956..14babce 100644
--- a/client/coproc_sched.cpp
+++ b/client/coproc_sched.cpp
@@ -120,8 +120,9 @@ static inline void increment_pending_usage(
// if the app is still running, it has enough RAM
//
static inline bool current_assignment_ok(
- RESULT* rp, double usage, COPROC* cp
+ RESULT* rp, double usage, COPROC* cp, bool& defer_sched
) {
+ defer_sched = false;
double x = (usage<1)?usage:1;
for (int i=0; i<usage; i++) {
int j = rp->coproc_indices[i];
@@ -152,11 +153,17 @@ static inline void confirm_current_assignment(
cp->type, j, x, rp->name
);
}
+#if DEFER_ON_GPU_AVAIL_RAM
+ cp->available_ram_temp[j] -= rp->avp->gpu_ram;
+#endif
}
}
-static inline bool get_fractional_assignment(RESULT* rp, double usage, COPROC* cp) {
+static inline bool get_fractional_assignment(
+ RESULT* rp, double usage, COPROC* cp, bool& defer_sched
+) {
int i;
+ defer_sched = false;
// try to assign an instance that's already fractionally assigned
//
@@ -167,6 +174,13 @@ static inline bool get_fractional_assignment(RESULT* rp, double usage, COPROC* c
if ((cp->usage[i] || cp->pending_usage[i])
&& (cp->usage[i] + cp->pending_usage[i] + usage <= 1)
) {
+#if DEFER_ON_GPU_AVAIL_RAM
+ if (rp->avp->gpu_ram > cp->available_ram_temp[i]) {
+ defer_sched = true;
+ continue;
+ }
+ cp->available_ram_temp[i] -= rp->avp->gpu_ram;
+#endif
rp->coproc_indices[0] = i;
cp->usage[i] += usage;
if (log_flags.coproc_debug) {
@@ -186,6 +200,13 @@ static inline bool get_fractional_assignment(RESULT* rp, double usage, COPROC* c
continue;
}
if (!cp->usage[i]) {
+#if DEFER_ON_GPU_AVAIL_RAM
+ if (rp->avp->gpu_ram > cp->available_ram_temp[i]) {
+ defer_sched = true;
+ continue;
+ }
+ cp->available_ram_temp[i] -= rp->avp->gpu_ram;
+#endif
rp->coproc_indices[0] = i;
cp->usage[i] += usage;
if (log_flags.coproc_debug) {
@@ -208,9 +229,10 @@ static inline bool get_fractional_assignment(RESULT* rp, double usage, COPROC* c
}
static inline bool get_integer_assignment(
- RESULT* rp, double usage, COPROC* cp
+ RESULT* rp, double usage, COPROC* cp, bool& defer_sched
) {
int i;
+ defer_sched = false;
// make sure we have enough free instances
//
@@ -220,6 +242,18 @@ static inline bool get_integer_assignment(
continue;
}
if (!cp->usage[i]) {
+#if DEFER_ON_GPU_AVAIL_RAM
+ if (rp->avp->gpu_ram > cp->available_ram_temp[i]) {
+ defer_sched = true;
+ if (log_flags.coproc_debug) {
+ msg_printf(rp->project, MSG_INFO,
+ "[coproc] task %s needs %.0fMB RAM, %s GPU %d has %.0fMB available",
+ rp->name, rp->avp->gpu_ram/MEGA, cp->type, i, cp->available_ram_temp[i]/MEGA
+ );
+ }
+ continue;
+ };
+#endif
nfree++;
}
}
@@ -229,6 +263,11 @@ static inline bool get_integer_assignment(
"[coproc] Insufficient %s for %s; need %d, available %d",
cp->type, rp->name, (int)usage, nfree
);
+ if (defer_sched) {
+ msg_printf(rp->project, MSG_INFO,
+ "[coproc] some instances lack available memory"
+ );
+ }
}
return false;
}
@@ -241,8 +280,16 @@ static inline bool get_integer_assignment(
if (!can_use_gpu(rp, cp, i)) {
continue;
}
- if (!cp->usage[i] && !cp->pending_usage[i]) {
+ if (!cp->usage[i]
+ && !cp->pending_usage[i]
+#if DEFER_ON_GPU_AVAIL_RAM
+ && (rp->avp->gpu_ram <= cp->available_ram_temp[i])
+#endif
+ ) {
cp->usage[i] = 1;
+#if DEFER_ON_GPU_AVAIL_RAM
+ cp->available_ram_temp[i] -= rp->avp->gpu_ram;
+#endif
rp->coproc_indices[n++] = i;
if (log_flags.coproc_debug) {
msg_printf(rp->project, MSG_INFO,
@@ -260,8 +307,15 @@ static inline bool get_integer_assignment(
if (!can_use_gpu(rp, cp, i)) {
continue;
}
- if (!cp->usage[i]) {
+ if (!cp->usage[i]
+#if DEFER_ON_GPU_AVAIL_RAM
+ && (rp->avp->gpu_ram <= cp->available_ram_temp[i])
+#endif
+ ) {
cp->usage[i] = 1;
+#if DEFER_ON_GPU_AVAIL_RAM
+ cp->available_ram_temp[i] -= rp->avp->gpu_ram;
+#endif
rp->coproc_indices[n++] = i;
if (log_flags.coproc_debug) {
msg_printf(rp->project, MSG_INFO,
@@ -281,12 +335,43 @@ static inline bool get_integer_assignment(
return false;
}
+static inline void mark_as_defer_sched(RESULT* rp) {
+ int i = rp->avp->gpu_usage.rsc_type;
+ if (i) {
+ rp->project->rsc_defer_sched[i] = true;
+ }
+ rp->schedule_backoff = gstate.now + 300; // try again in 5 minutes
+ gstate.request_schedule_cpus("insufficient GPU RAM");
+}
+
+#if DEFER_ON_GPU_AVAIL_RAM
+static void copy_available_ram(COPROC& cp, const char* name) {
+ int rt = rsc_index(name);
+ if (rt > 0) {
+ for (int i=0; i<MAX_COPROC_INSTANCES; i++) {
+ coprocs.coprocs[rt].available_ram_temp[i] = cp.available_ram;
+ }
+ }
+}
+#endif
+
void assign_coprocs(vector<RESULT*>& jobs) {
unsigned int i;
COPROC* cp;
double usage;
coprocs.clear_usage();
+#if DEFER_ON_GPU_AVAIL_RAM
+ if (coprocs.have_nvidia()) {
+ copy_available_ram(coprocs.nvidia, GPU_TYPE_NVIDIA);
+ }
+ if (coprocs.have_ati()) {
+ copy_available_ram(coprocs.ati, GPU_TYPE_ATI);
+ }
+ if (coprocs.have_intel()) {
+ copy_available_ram(coprocs.intel_gpu, GPU_TYPE_INTEL);
+ }
+#endif
// fill in pending usage
//
@@ -322,24 +407,34 @@ void assign_coprocs(vector<RESULT*>& jobs) {
}
ACTIVE_TASK* atp = gstate.lookup_active_task_by_result(rp);
+ bool defer_sched;
if (atp && atp->is_gpu_task_running()) {
- if (current_assignment_ok(rp, usage, cp)) {
+ if (current_assignment_ok(rp, usage, cp, defer_sched)) {
confirm_current_assignment(rp, usage, cp);
job_iter++;
} else {
+ if (defer_sched) {
+ mark_as_defer_sched(rp);
+ }
job_iter = jobs.erase(job_iter);
}
} else {
if (usage < 1) {
- if (get_fractional_assignment(rp, usage, cp)) {
+ if (get_fractional_assignment(rp, usage, cp, defer_sched)) {
job_iter++;
} else {
+ if (defer_sched) {
+ mark_as_defer_sched(rp);
+ }
job_iter = jobs.erase(job_iter);
}
} else {
- if (get_integer_assignment(rp, usage, cp)) {
+ if (get_integer_assignment(rp, usage, cp, defer_sched)) {
job_iter++;
} else {
+ if (defer_sched) {
+ mark_as_defer_sched(rp);
+ }
job_iter = jobs.erase(job_iter);
}
}
diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp
index b8e40b7..b54a515 100644
--- a/client/cpu_sched.cpp
+++ b/client/cpu_sched.cpp
@@ -151,17 +151,14 @@ struct PROC_RESOURCES {
}
}
if (rp->schedule_backoff > gstate.now) return false;
- if (rp->uses_gpu()) {
- if (gpu_suspend_reason) return false;
- }
if (rp->uses_coprocs()) {
+ if (gpu_suspend_reason) return false;
if (sufficient_coprocs(*rp)) {
return true;
} else {
return false;
}
} else if (rp->avp->avg_ncpus > 1) {
- if (ncpus_used_mt == 0) return true;
return (ncpus_used_mt + rp->avp->avg_ncpus <= ncpus);
} else {
return (ncpus_used_st < ncpus);
@@ -528,6 +525,13 @@ static RESULT* earliest_deadline_result(int rsc_type) {
}
if (!best_result) return NULL;
+ if (log_flags.cpu_sched_debug) {
+ msg_printf(best_result->project, MSG_INFO,
+ "[cpu_sched_debug] earliest deadline: %.0f %s",
+ best_result->report_deadline, best_result->name
+ );
+ }
+
return best_result;
}
@@ -1047,7 +1051,7 @@ void CLIENT_STATE::append_unfinished_time_slice(vector<RESULT*> &run_list) {
ACTIVE_TASK* atp = active_tasks.active_tasks[i];
atp->overdue_checkpoint = false;
if (!atp->result->runnable()) continue;
- if (atp->result->uses_gpu() && gpu_suspend_reason) continue;
+ if (atp->result->uses_coprocs() && gpu_suspend_reason) continue;
if (atp->result->non_cpu_intensive()) continue;
if (atp->scheduler_state != CPU_SCHED_SCHEDULED) continue;
if (finished_time_slice(atp)) continue;
@@ -1143,6 +1147,12 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
);
}
+ for (i=0; i<projects.size(); i++) {
+ for (int j=1; j<coprocs.n_rsc; j++) {
+ projects[i]->rsc_defer_sched[j] = false;
+ }
+ }
+
// schedule non-CPU-intensive tasks,
// and look for backed-off GPU jobs
//
@@ -1164,6 +1174,17 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
//ram_left -= atp->procinfo.working_set_size_smoothed;
swap_left -= atp->procinfo.swap_size;
}
+ if (rp->schedule_backoff) {
+ if (rp->schedule_backoff > gstate.now) {
+ int r = rp->avp->gpu_usage.rsc_type;
+ if (r) {
+ rp->project->rsc_defer_sched[r] = true;
+ }
+ } else {
+ rp->schedule_backoff = 0;
+ request_schedule_cpus("schedule backoff finished");
+ }
+ }
}
// assign coprocessors to coproc jobs,
@@ -1192,7 +1213,7 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
// if we're already using all the CPUs,
// don't allow additional CPU jobs;
- // allow coproc jobs if the resulting CPU load is at most ncpus+1
+ // allow GPU jobs if the resulting CPU load is at most ncpus+1
//
if (ncpus_used >= ncpus) {
if (rp->uses_coprocs()) {
@@ -1219,7 +1240,7 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
#if 0
// Don't overcommit CPUs by > 1 if a MT job is scheduled.
- // Skip this check for coproc jobs.
+ // Skip this check for GPU jobs.
//
if (!rp->uses_coprocs()
&& (scheduled_mt || (rp->avp->avg_ncpus > 1))
@@ -1257,9 +1278,7 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
if (log_flags.cpu_sched_debug) {
msg_printf(rp->project, MSG_INFO,
- "[cpu_sched_debug] scheduling %s%s",
- rp->name,
- rp->edf_scheduled?" (high priority)":""
+ "[cpu_sched_debug] scheduling %s", rp->name
);
}
@@ -1304,7 +1323,6 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
bool coproc_quit_pending = false;
for (i=0; i<active_tasks.active_tasks.size(); i++) {
atp = active_tasks.active_tasks[i];
-#if 0
if (log_flags.cpu_sched_debug) {
msg_printf(atp->result->project, MSG_INFO,
"[cpu_sched_debug] %s sched state %d next %d task state %d",
@@ -1312,7 +1330,6 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
atp->next_scheduler_state, atp->task_state()
);
}
-#endif
int preempt_type = REMOVE_MAYBE_SCHED;
switch (atp->next_scheduler_state) {
case CPU_SCHED_PREEMPTED:
@@ -1341,7 +1358,7 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
// remove from memory GPU jobs that were suspended by CPU throttling
// and are now unscheduled.
//
- if (atp->result->uses_gpu()) {
+ if (atp->result->uses_coprocs()) {
atp->preempt(REMOVE_ALWAYS);
request_schedule_cpus("removed suspended GPU task");
break;
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index f24f44f..416d01c 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -286,12 +286,8 @@ static inline bool string_equal_nodigits(string& s1, string& s2) {
}
static inline bool same_text(NOTICE& n1, NOTICE& n2) {
- if (strcmp(n1.title, n2.title)) {
- return false;
- }
- if (!string_equal_nodigits(n1.description, n2.description)) {
- return false;
- }
+ if (strcmp(n1.title, n2.title)) return false;
+ if (!string_equal_nodigits(n1.description, n2.description)) return false;
return true;
}
@@ -344,24 +340,11 @@ bool NOTICES::remove_dups(NOTICE& n) {
double min_time = gstate.now - 30*86400;
while (i != notices.end()) {
NOTICE& n2 = *i;
-
- if (log_flags.notice_debug) {
- msg_printf(0, MSG_INFO,
- "[notice] scanning old notice %d: %s",
- n2.seqno, strlen(n2.title)?n2.title:n2.description.c_str()
- );
- }
if (n2.arrival_time < min_time
|| (n2.create_time && n2.create_time < min_time)
) {
i = notices.erase(i);
removed_something = true;
- if (log_flags.notice_debug) {
- msg_printf(0, MSG_INFO,
- "[notice] removing old notice %d: %s",
- n2.seqno, strlen(n2.title)?n2.title:n2.description.c_str()
- );
- }
#if 0
// this check prevents news item edits from showing; skip it
} else if (same_guid(n, n2)) {
@@ -380,20 +363,10 @@ bool NOTICES::remove_dups(NOTICE& n) {
if (n.create_time > n2.create_time + min_diff) {
i = notices.erase(i);
removed_something = true;
- if (log_flags.notice_debug) {
- msg_printf(0, MSG_INFO,
- "[notice] replacing identical older notice %d", n2.seqno
- );
- }
} else {
n2.keep = true;
retval = false;
++i;
- if (log_flags.notice_debug) {
- msg_printf(0, MSG_INFO,
- "[notice] keeping identical older notice %d", n2.seqno
- );
- }
}
} else {
++i;
@@ -410,12 +383,6 @@ bool NOTICES::remove_dups(NOTICE& n) {
// add a notice.
//
bool NOTICES::append(NOTICE& n) {
- if (log_flags.notice_debug) {
- msg_printf(0, MSG_INFO,
- "[notice] processing notice: %s",
- strlen(n.title)?n.title:n.description.c_str()
- );
- }
if (!remove_dups(n)) {
return false;
}
@@ -426,7 +393,8 @@ bool NOTICES::append(NOTICE& n) {
}
if (log_flags.notice_debug) {
msg_printf(0, MSG_INFO,
- "[notice] adding notice %d", n.seqno
+ "[notice] appending notice %d: %s",
+ n.seqno, strlen(n.title)?n.title:n.description.c_str()
);
}
notices.push_front(n);
@@ -544,9 +512,6 @@ void NOTICES::remove_notices(PROJECT* p, int which) {
case REMOVE_APP_INFO_MSG:
remove = (strstr(n.description.c_str(), "app_info.xml") != NULL);
break;
- case REMOVE_APP_CONFIG_MSG:
- remove = (strstr(n.description.c_str(), "app_config.xml") != NULL);
- break;
}
if (remove) {
i = notices.erase(i);
diff --git a/client/cs_notice.h b/client/cs_notice.h
index 8d6384f..1ba59e8 100644
--- a/client/cs_notice.h
+++ b/client/cs_notice.h
@@ -94,8 +94,6 @@ struct NOTICES {
// notices about cc_config.xml
#define REMOVE_APP_INFO_MSG 4
// notices about project/app_info.xml
-#define REMOVE_APP_CONFIG_MSG 5
- // notices about project/app_config.xml
extern NOTICES notices;
diff --git a/client/cs_platforms.cpp b/client/cs_platforms.cpp
index 91bad0b..bd257b5 100644
--- a/client/cs_platforms.cpp
+++ b/client/cs_platforms.cpp
@@ -98,11 +98,24 @@ void CLIENT_STATE::detect_platforms() {
#elif defined(__APPLE__)
-#ifdef __x86_64__
- add_platform("x86_64-apple-darwin");
+#if defined(__i386__) || defined(__x86_64__)
+ int response = 0;
+ int retval = 0;
+ size_t len = sizeof(response);
+
+ retval = sysctlbyname("hw.optional.x86_64", &response, &len, NULL, 0);
+ if (!retval) {
+ add_platform("x86_64-apple-darwin");
+ }
+
+ // Supported on both Mac Intel architectures
add_platform("i686-apple-darwin");
#else
-#error Mac client now requires a 64-bit system
+ // We no longer request PowerPC applications on Intel Macs
+ // because all projects supporting Macs should have Intel
+ // applications by now, and PowerPC emulation ("Rosetta")
+ // is not always supported in newer versions of OS X.
+ add_platform("powerpc-apple-darwin");
#endif
#elif defined(__linux__) && ( defined(__i386__) || defined(__x86_64__) )
diff --git a/client/cs_prefs.cpp b/client/cs_prefs.cpp
index 2b83a49..df7e1d4 100644
--- a/client/cs_prefs.cpp
+++ b/client/cs_prefs.cpp
@@ -463,9 +463,8 @@ void CLIENT_STATE::check_suspend_network() {
}
#ifndef ANDROID
- // allow network transfers while user active, i.e. screen on.
- // otherwise nothing (visible to the user) happens after initial attach
- //
+// allow network transfers while user active, i.e. screen on.
+// otherwise nothing (visible to the user) happens after intial attach
if (!global_prefs.run_if_user_active && user_active) {
file_xfers_suspended = true;
if (!recent_rpc) network_suspended = true;
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index fb44134..9fbdf57 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -811,9 +811,6 @@ int CLIENT_STATE::handle_scheduler_reply(
} else {
fip = new FILE_INFO;
*fip = sr.file_infos[i];
- if (fip->sticky_lifetime) {
- fip->sticky_expire_time = now + fip->sticky_lifetime;
- }
retval = link_file_info(project, fip);
if (retval) {
msg_printf(project, MSG_INTERNAL_ERROR,
@@ -919,17 +916,10 @@ int CLIENT_STATE::handle_scheduler_reply(
est_rsc_runtime[j] = 0;
}
for (i=0; i<sr.results.size(); i++) {
- RESULT* rp2 = lookup_result(project, sr.results[i].name);
- if (rp2) {
- // see if project wants to change the job's deadline
- //
- if (sr.results[i].report_deadline != rp2->report_deadline) {
- rp2->report_deadline = sr.results[i].report_deadline;
- } else {
- msg_printf(project, MSG_INTERNAL_ERROR,
- "Already have task %s\n", sr.results[i].name
- );
- }
+ if (lookup_result(project, sr.results[i].name)) {
+ msg_printf(project, MSG_INTERNAL_ERROR,
+ "Already have task %s\n", sr.results[i].name
+ );
continue;
}
RESULT* rp = new RESULT;
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index 10c4c74..34e3737 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -116,6 +116,7 @@ int CLIENT_STATE::parse_state_file() {
int CLIENT_STATE::parse_state_file_aux(const char* fname) {
PROJECT *project=NULL;
int retval=0;
+ int failnum;
string stemp;
FILE* f = fopen(fname, "r");
@@ -223,7 +224,6 @@ int CLIENT_STATE::parse_state_file_aux(const char* fname) {
// If the file had a failure before,
// don't start another file transfer
//
- int failnum;
if (fip->had_failure(failnum)) {
if (fip->pers_file_xfer) {
delete fip->pers_file_xfer;
@@ -402,7 +402,6 @@ int CLIENT_STATE::parse_state_file_aux(const char* fname) {
#ifdef SIM
retval = host_info.parse(xp, false);
coprocs = host_info.coprocs;
- coprocs.bound_counts();
#else
retval = host_info.parse(xp, true);
#endif
@@ -900,13 +899,6 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) {
delete avp;
continue;
}
- if (cc_config.dont_use_vbox && strstr(avp->plan_class, "vbox")) {
- msg_printf(p, MSG_INFO,
- "skipping vbox app in app_info.xml; vbox disabled in cc_config.xml"
- );
- delete avp;
- continue;
- }
if (strlen(avp->platform) == 0) {
safe_strcpy(avp->platform, get_primary_platform());
}
diff --git a/client/gpu_detect.cpp b/client/gpu_detect.cpp
index 0d6cb28..f17380f 100644
--- a/client/gpu_detect.cpp
+++ b/client/gpu_detect.cpp
@@ -200,17 +200,6 @@ void COPROCS::correlate_gpus(
"CUDA: NVIDIA GPU %d (not used): %s",
nvidia_gpus[i].device_num, buf
);
-
-#ifdef __APPLE__
- if ((nvidia_gpus[i].cuda_version >= 6050) &&
- nvidia_gpus[i].prop.major < 2) {
- // This will be called only if CUDA recognized and reported the GPU
- msg_printf(NULL, MSG_USER_ALERT, "NVIDIA GPU %d: %s %s",
- nvidia_gpus[i].device_num, nvidia_gpus[i].prop.name,
- _("cannot be used for CUDA or OpenCL computation with CUDA driver 6.5 or later")
- );
- }
-#endif
break;
}
descs.push_back(string(buf2));
@@ -246,13 +235,6 @@ void COPROCS::correlate_gpus(
// Create descriptions for OpenCL NVIDIA GPUs
//
for (i=0; i<nvidia_opencls.size(); i++) {
- if (nvidia_opencls[i].warn_bad_cuda) {
- // This will be called only if CUDA did _not_ recognize and report the GPU
- msg_printf(NULL, MSG_USER_ALERT, "NVIDIA GPU %d: %s %s",
- nvidia_opencls[i].device_num, nvidia_opencls[i].name,
- _("cannot be used for CUDA or OpenCL computation with CUDA driver 6.5 or later")
- );
- }
nvidia_opencls[i].description(buf, sizeof(buf), proc_type_name(PROC_TYPE_NVIDIA_GPU));
descs.push_back(string(buf));
}
@@ -304,11 +286,9 @@ void COPROCS::correlate_gpus(
cpu_opencls.clear();
}
-// This is called from CLIENT_STATE::init()
-// after adding NVIDIA, ATI and Intel GPUs
+// This is called from CLIENT_STATE::init() after adding NVIDIA, ATI and Intel GPUs
// If we don't care about the order of GPUs in COPROCS::coprocs[],
// this code could be included at the end of COPROCS::correlate_gpus().
-//
int COPROCS::add_other_coproc_types() {
int retval = 0;
@@ -320,10 +300,8 @@ int COPROCS::add_other_coproc_types() {
}
COPROC c;
- // For device types other than NVIDIA, ATI or Intel GPU.
- // we put each instance into a separate other_opencls element,
- // so count=1.
- //
+ // For other device types other than NVIDIA, ATI or Intel GPU coprocessor.
+ // we put each instance into a separate other_opencls element, so count=1.
c.count = 1;
c.opencl_device_count = 1;
c.opencl_prop = other_opencls[i];
@@ -371,11 +349,6 @@ int COPROCS::write_coproc_info_file(vector<string> &warnings) {
mf.printf(" <coprocs>\n");
- if (nvidia.have_cuda) {
- mf.printf(" <have_cuda>1</have_cuda>\n");
- mf.printf(" <cuda_version>%d</cuda_version>\n", nvidia.cuda_version);
- }
-
for (i=0; i<ati_gpus.size(); ++i) {
ati_gpus[i].write_xml(mf, false);
}
@@ -452,11 +425,6 @@ int COPROCS::read_coproc_info_file(vector<string> &warnings) {
return 0;
}
- if (xp.parse_bool("have_cuda", nvidia.have_cuda)) continue;
- if (xp.parse_int("cuda_version", nvidia.cuda_version)) {
- continue;
- }
-
if (xp.match_tag("coproc_ati")) {
retval = my_ati_gpu.parse(xp);
if (retval) {
@@ -662,24 +630,3 @@ int COPROCS::launch_child_process_to_detect_gpus() {
return 0;
}
-
-// print descriptions of coprocs specified in cc_config.xml,
-// and make sure counts are <= 64
-//
-void COPROCS::bound_counts() {
- for (int j=1; j<n_rsc; j++) {
- msg_printf(NULL, MSG_INFO, "Coprocessor specified in cc_config.xml: type %s count %d",
- coprocs[j].type,
- coprocs[j].count
- );
- if (coprocs[j].count > MAX_COPROC_INSTANCES) {
- msg_printf(NULL, MSG_USER_ALERT,
- "%d instances of %s specified in cc_config.xml; max is %d",
- coprocs[j].count,
- coprocs[j].type,
- MAX_COPROC_INSTANCES
- );
- coprocs[j].count = MAX_COPROC_INSTANCES;
- }
- }
-}
diff --git a/client/gpu_nvidia.cpp b/client/gpu_nvidia.cpp
index cff103b..9f20296 100644
--- a/client/gpu_nvidia.cpp
+++ b/client/gpu_nvidia.cpp
@@ -351,8 +351,6 @@ void COPROC_NVIDIA::get(
return;
}
- have_cuda = true;
-
retval = (*__cuDeviceGetCount)(&cuda_ndevs);
if (retval) {
sprintf(buf, "cuDeviceGetCount() returned %d", retval);
@@ -416,6 +414,7 @@ void COPROC_NVIDIA::get(
#else
cc.display_driver_version = nvidia_driver_version();
#endif
+ have_cuda = true;
cc.have_cuda = true;
cc.cuda_version = cuda_version;
cc.device_num = j;
@@ -442,13 +441,6 @@ void COPROC_NVIDIA::correlate(
bool first = true;
for (i=0; i<nvidia_gpus.size(); i++) {
if (in_vector(nvidia_gpus[i].device_num, ignore_devs)) continue;
-#ifdef __APPLE__
- if ((nvidia_gpus[i].cuda_version >= 6050) && nvidia_gpus[i].prop.major < 2) {
- // Can't use GPUs with compute capability < 2 with CUDA drivers >= 6.5.x
- nvidia_gpus[i].is_used = COPROC_UNUSED;
- continue;
- }
-#endif
if (first) {
*this = nvidia_gpus[i];
first = false;
@@ -468,11 +460,6 @@ void COPROC_NVIDIA::correlate(
nvidia_gpus[i].is_used = COPROC_UNUSED;
} else if (this->have_cuda && !nvidia_gpus[i].have_cuda) {
nvidia_gpus[i].is_used = COPROC_UNUSED;
-#ifdef __APPLE__
- } else if (nvidia_gpus[i].is_used == COPROC_UNUSED) {
- // Can't use GPUs with compute capability < 2 with CUDA drivers >= 6.5.x
- continue;
-#endif
} else if (use_all || !nvidia_compare(nvidia_gpus[i], *this, true)) {
device_nums[count] = nvidia_gpus[i].device_num;
pci_infos[count] = nvidia_gpus[i].pci_info;
diff --git a/client/gpu_opencl.cpp b/client/gpu_opencl.cpp
index 9eddf7b..2ba3a14 100644
--- a/client/gpu_opencl.cpp
+++ b/client/gpu_opencl.cpp
@@ -385,7 +385,6 @@ void COPROCS::get_opencl(
//////////// NVIDIA //////////////
if (is_NVIDIA(prop.vendor)) {
- bool cuda_match_found = false;
if (nvidia.have_cuda) {
// Mac OpenCL does not recognize all NVIDIA GPUs returned by
// CUDA but we assume that OpenCL and CUDA return devices
@@ -395,8 +394,6 @@ void COPROCS::get_opencl(
// On other systems, assume OpenCL and CUDA return devices
// in the same order.
//
- int saved_CUDA_index = current_CUDA_index;
-
while (1) {
if (current_CUDA_index >= (int)(nvidia_gpus.size())) {
snprintf(buf, sizeof(buf),
@@ -404,22 +401,11 @@ void COPROCS::get_opencl(
device_index
);
warnings.push_back(buf);
- // Newer versions of CUDA driver don't support older NVIDIA GPUs
- if (nvidia.cuda_version >= 6050) {
- prop.device_num = (int)(nvidia_opencls.size());
- current_CUDA_index = saved_CUDA_index;
- prop.warn_bad_cuda = true;
- break;
- } else {
- // Older CUDA drivers should report all NVIDIA GPUs reported by OpenCL
- return; // Should never happen
- }
+ return; // Should never happen
}
if (!strcmp(prop.name,
nvidia_gpus[devnums_pci_slot_sort[current_CUDA_index]].prop.name)
) {
- cuda_match_found = true;
- prop.device_num = devnums_pci_slot_sort[current_CUDA_index];
break; // We have a match
}
// This CUDA GPU is not recognized by OpenCL,
@@ -427,12 +413,13 @@ void COPROCS::get_opencl(
//
++current_CUDA_index;
}
+ prop.device_num = devnums_pci_slot_sort[current_CUDA_index];
} else {
prop.device_num = (int)(nvidia_opencls.size());
}
prop.opencl_device_index = device_index;
- if (cuda_match_found) {
+ if (nvidia.have_cuda) {
prop.peak_flops = nvidia_gpus[prop.device_num].peak_flops;
} else {
COPROC_NVIDIA c;
@@ -440,7 +427,7 @@ void COPROCS::get_opencl(
c.set_peak_flops();
prop.peak_flops = c.peak_flops;
}
- if (cuda_match_found) {
+ if (nvidia_gpus.size()) {
// Assumes OpenCL device_num and CUDA device_num now match
//
prop.opencl_available_ram = nvidia_gpus[prop.device_num].available_ram;
@@ -454,7 +441,7 @@ void COPROCS::get_opencl(
}
nvidia_opencls.insert(it, prop);
- if (cuda_match_found) ++current_CUDA_index;
+ ++current_CUDA_index;
}
//////////// AMD / ATI //////////////
@@ -866,8 +853,6 @@ void COPROC::merge_opencl(
unsigned int i, j;
for (i=0; i<opencls.size(); i++) {
- opencls[i].is_used = COPROC_UNUSED;
-
if (in_vector(opencls[i].device_num, ignore_dev)) {
opencls[i].is_used = COPROC_IGNORED;
continue;
diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
index bbac65c..8a6730e 100644
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
@@ -1260,6 +1260,9 @@ int HOST_INFO::get_cpu_info() {
#if LINUX_LIKE_SYSTEM
parse_cpuinfo_linux(*this);
#elif defined( __APPLE__)
+ int mib[2];
+ size_t len;
+
get_cpu_info_mac(*this);
#elif defined(__EMX__)
CPU_INFO_t cpuInfo;
@@ -1363,9 +1366,6 @@ int HOST_INFO::get_cpu_count() {
p_ncpus = sysconf(_SC_NPROCESSORS_ONLN);
#elif defined(HAVE_SYS_SYSCTL_H) && defined(CTL_HW) && defined(HW_NCPU)
// Get number of CPUs
- int mib[2];
- size_t len;
-
mib[0] = CTL_HW;
mib[1] = HW_NCPU;
len = sizeof(p_ncpus);
@@ -1576,10 +1576,7 @@ int HOST_INFO::get_host_info(bool init) {
// a run of the client
//
- if (!cc_config.dont_use_vbox) {
- get_virtualbox_version();
- }
-
+ get_virtualbox_version();
get_cpu_info();
get_cpu_count();
get_memory_info();
diff --git a/client/hostinfo_win.cpp b/client/hostinfo_win.cpp
index 84b8332..c04bffe 100644
--- a/client/hostinfo_win.cpp
+++ b/client/hostinfo_win.cpp
@@ -23,7 +23,7 @@
#define snprintf _snprintf
#endif
-#ifndef __CYGWIN__
+#ifdef HAVE_INTRIN_H
#include <intrin.h>
#endif
@@ -140,17 +140,94 @@
#define PRODUCT_CLOUD_STORAGE_SERVER 0x0000006E
#endif
+/* HAVE_DECL__XGETBV should be set by autoconf or in boinc_win.h */
+#if !defined(HAVE_DECL__XGETBV) || !HAVE_DECL__XGETBV
+#if HAVE_DECL_XGETBV
+#define _xgetbv(x) xgetbv(x)
+#elif HAVE_DECL___XGETBV
+#define _xgetbv(x) __xgetbv(x)
+#else
+static unsigned long long _xgetbv(unsigned int index){
+ unsigned int A=0, D=0;
+
+#ifdef __GNUC__
+ #ifdef ASM_SUPPORTS_XGETBV
+ __asm__ __volatile__("xgetbv" : "=a"(A), "=d"(D) : "c"(index));
+ #else
+ __asm__ __volatile__(".byte 0x0f, 0x01, 0xd0": "=a"(A), "=d"(D) : "c"(index));
+ #endif
+#elif defined(_MSC_VER)
+ #ifdef _M_IX86
+ __asm {
+ mov ecx,index
+ __emit 00fh
+ __emit 001h
+ __emit 0d0h
+ mov D,edx
+ mov A,eax
+ }
+ #elif defined(_M_AMD64)
+ // damn Microsoft for not having inline assembler in 64-bit code
+ // so this is in an NASM compiled library
+ return asm_xgetbv(index);
+ #endif
+#endif
+ return ((unsigned long long)D << 32) | A;
+}
+#endif
+#endif
+
+/* HAVE_DECL___CPUID should be set by autoconf or in boinc_win.h */
+#if !defined(HAVE_DECL___CPUID) || !HAVE_DECL___CPUID
+#if HAVE_DECL_CPUID
+#define __cpuid(x,y) cpuid(x,y)
+#elif HAVE_DECL__CPUID
+#define __cpuid(x,y) _cpuid(x,y)
+#else
+static void __cpuid(unsigned int cpuinfo[4], unsigned int type) {
+#ifdef __GNUC__
+ #ifdef ASM_SUPPORTS_CPUID
+ __asm__ __volatile__("cpuid"
+ : "=a" (cpuinfo[0]), "=b" (cpuinfo[1]),
+ "=c" (cpuinfo[2]), "=d" (cpuinfo[3])
+ : "a" (type));
+ #else
+ __asm__ __volatile__(".byte 0x0f, 0xa2"
+ : "=a" (cpuinfo[0]), "=b" (cpuinfo[1]),
+ "=c" (cpuinfo[2]), "=d" (cpuinfo[3])
+ : "a" (type));
+ #endif
+#elif defined(_MSC_VER)
+ #ifdef _M_IX86
+ __asm {
+ mov eax,type
+ __emit 00fh
+ __emit 0a2h
+ mov cpuinfo[0],eax
+ mov cpuinfo[1],ebx
+ mov cpuinfo[2],ecx
+ mov cpuinfo[3],edx
+ }
+ #elif defined(_M_AMD64)
+ // damn Microsoft for not having inline assembler in 64-bit code
+ // so this is in an NASM compiled library
+ asm_cpuid(cpuinfo,type);
+ #endif
+#endif
+}
+#endif
+#endif
// Returns the number of seconds difference from UTC
//
-int get_timezone(int& timezone) {
+int get_timezone(int& tz) {
TIME_ZONE_INFORMATION tzi;
memset(&tzi, 0, sizeof(TIME_ZONE_INFORMATION));
DWORD result = GetTimeZoneInformation(&tzi);
if (result == TIME_ZONE_ID_DAYLIGHT) {
- timezone = -(tzi.Bias + tzi.DaylightBias) * 60;
+ tz = -(tzi.Bias + tzi.DaylightBias) * 60;
} else {
- timezone = -(tzi.Bias + tzi.StandardBias) * 60;
+ tz = -(tzi.Bias + tzi.StandardBias) * 60;
}
return 0;
}
@@ -657,13 +734,12 @@ int get_os_information(
//
int get_cpuid(unsigned int info_type, unsigned int& a, unsigned int& b, unsigned int& c, unsigned int& d) {
-#ifdef _MSC_VER
- // Microsoft compiler - use intrinsic
int retval = 1;
int CPUInfo[4] = {0,0,0,0};
-
+#ifdef _MSC_VER
__try {
+#endif
__cpuid(CPUInfo, info_type);
a = CPUInfo[0];
@@ -672,19 +748,11 @@ int get_cpuid(unsigned int info_type, unsigned int& a, unsigned int& b, unsigned
d = CPUInfo[3];
retval = 0;
+#ifdef _MSC_VER
}
__except (EXCEPTION_EXECUTE_HANDLER) {}
- return retval;
-
-#elif defined(__GNUC__)
-
- // GCC compiler
- __asm__ __volatile__ ("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (info_type));
- return 0;
-
-#else
- return 1;
#endif
+ return retval;
}
@@ -794,7 +862,9 @@ int get_processor_cache(int& cache) {
return 0;
}
-
+#ifndef _XCR_XFEATURE_ENABLED_MASK
+#define _XCR_XFEATURE_ENABLED_MASK 0
+#endif
// Returns true if the AVX instruction set is supported with the current
// combination of OS and CPU.
// see: http://insufficientlycomplicated.wordpress.com/2011/11/07/detecting-intel-advanced-vector-extensions-avx-in-visual-studio/
@@ -803,9 +873,7 @@ bool is_avx_supported() {
bool supported = false;
- // If Visual Studio 2010 SP1 or later
-#if (_MSC_FULL_VER >= 160040219)
- // Checking for AVX requires 3 things:
+ // Checking for AVX on Windows requires 3 things:
// 1) CPUID indicates that the OS uses XSAVE and XRSTORE
// instructions (allowing saving YMM registers on context
// switch)
@@ -815,11 +883,11 @@ bool is_avx_supported() {
//
// Note that XGETBV is only available on 686 or later CPUs, so
// the instruction needs to be conditionally run.
- int cpuInfo[4];
- __cpuid(cpuInfo, 1);
+ unsigned int a,b,c,d;
+ get_cpuid(1, a, b, c, d);
- bool osUsesXSAVE_XRSTORE = cpuInfo[2] & (1 << 27) || false;
- bool cpuAVXSuport = cpuInfo[2] & (1 << 28) || false;
+ bool osUsesXSAVE_XRSTORE = c & (1 << 27) || false;
+ bool cpuAVXSuport = c & (1 << 28) || false;
if (osUsesXSAVE_XRSTORE && cpuAVXSuport)
{
@@ -827,7 +895,6 @@ bool is_avx_supported() {
unsigned long long xcrFeatureMask = _xgetbv(_XCR_XFEATURE_ENABLED_MASK);
supported = (xcrFeatureMask & 0x6) || false;
}
-#endif
return supported;
}
@@ -1140,18 +1207,14 @@ int HOST_INFO::get_host_info(bool init) {
"get_filesystem_info(): %s", boincerror(retval)
);
}
-
get_local_network_info();
if (!init) return 0;
-
::get_memory_info(m_nbytes, m_swap);
get_os_information(
os_name, sizeof(os_name), os_version, sizeof(os_version)
);
- if (!cc_config.dont_use_vbox) {
- get_virtualbox_version();
- }
+ get_virtualbox_version();
get_processor_info(
p_vendor, sizeof(p_vendor),
p_model, sizeof(p_model),
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index bcf5096..433c07d 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -159,9 +159,6 @@ void CC_CONFIG::show() {
if (no_gpus) {
msg_printf(NULL, MSG_INFO, "Config: don't use coprocessors");
}
- if (dont_use_vbox) {
- msg_printf(NULL, MSG_INFO, "Config: don't use VirtualBox");
- }
if (no_info_fetch) {
msg_printf(NULL, MSG_INFO, "Config: don't fetch project list or client version info");
}
@@ -248,6 +245,7 @@ void CC_CONFIG::show() {
// (It's separate so that we can write messages in it)
int CC_CONFIG::parse_options_client(XML_PARSER& xp) {
+ char path[MAXPATHLEN];
string s;
int n, retval;
@@ -301,7 +299,6 @@ int CC_CONFIG::parse_options_client(XML_PARSER& xp) {
msg_printf_notice(NULL, false, NULL,
"Can't parse <coproc> element in cc_config.xml"
);
- continue;
}
retval = config_coprocs.add(c);
if (retval) {
@@ -311,10 +308,16 @@ int CC_CONFIG::parse_options_client(XML_PARSER& xp) {
}
continue;
}
+ if (xp.parse_str("data_dir", path, sizeof(path))) {
+ if (chdir(path)) {
+ perror("chdir");
+ exit(1);
+ }
+ continue;
+ }
if (xp.parse_bool("disallow_attach", disallow_attach)) continue;
if (xp.parse_bool("dont_check_file_sizes", dont_check_file_sizes)) continue;
if (xp.parse_bool("dont_contact_ref_site", dont_contact_ref_site)) continue;
- if (xp.parse_bool("dont_use_vbox", dont_use_vbox)) continue;
if (xp.match_tag("exclude_gpu")) {
EXCLUDE_GPU eg;
retval = eg.parse(xp);
@@ -518,6 +521,19 @@ int read_config_file(bool init, const char* fname) {
if (init) {
coprocs = cc_config.config_coprocs;
+ if (strlen(cc_config.data_dir)) {
+#ifdef _WIN32
+ _chdir(cc_config.data_dir);
+#else
+ if (chdir(cc_config.data_dir)) {
+ msg_printf(NULL, MSG_INFO,
+ "Couldn't change to directory specified in cc_config.xml: %s",
+ cc_config.data_dir
+ );
+ return ERR_OPENDIR;
+ }
+#endif
+ }
} else {
select_proxy_info(); // in case added or removed proxy info
}
@@ -593,9 +609,7 @@ void process_gpu_exclusions() {
APP* app = gstate.apps[i];
for (int k=1; k<coprocs.n_rsc; k++) {
COPROC& cp = coprocs.coprocs[k];
- for (int h=0; h<cp.count; h++) {
- app->non_excluded_instances[k] |= ((COPROC_INSTANCE_BITMAP)1)<<h;
- }
+ app->non_excluded_instances[k] = (1<<cp.count)-1; // all 1's
}
}
@@ -603,23 +617,18 @@ void process_gpu_exclusions() {
p = gstate.projects[i];
for (int k=1; k<coprocs.n_rsc; k++) {
COPROC& cp = coprocs.coprocs[k];
- COPROC_INSTANCE_BITMAP all_instances = 0;
- // bitmap of 1 for all instances
- //
- for (int h=0; h<cp.count; h++) {
- all_instances |= ((COPROC_INSTANCE_BITMAP)1)<<h;
- }
+ int all_instances = (1<<cp.count)-1; // bitmap of 1 for all inst
for (j=0; j<cc_config.exclude_gpus.size(); j++) {
EXCLUDE_GPU& eg = cc_config.exclude_gpus[j];
if (!eg.type.empty() && (eg.type != cp.type)) continue;
if (strcmp(eg.url.c_str(), p->master_url)) continue;
- COPROC_INSTANCE_BITMAP mask;
+ int mask;
if (eg.device_num >= 0) {
int index = cp.device_num_index(eg.device_num);
// exclusion may refer to nonexistent GPU
//
if (index < 0) continue;
- mask = ((COPROC_INSTANCE_BITMAP)1)<<index;
+ mask = 1<<index;
} else {
mask = all_instances;
}
@@ -660,7 +669,7 @@ void process_gpu_exclusions() {
//
p->rsc_pwf[k].ncoprocs_excluded = 0;
for (int b=0; b<cp.count; b++) {
- COPROC_INSTANCE_BITMAP mask = ((COPROC_INSTANCE_BITMAP)1)<<b;
+ int mask = 1<<b;
for (a=0; a<gstate.apps.size(); a++) {
APP* app = gstate.apps[a];
if (app->project != p) continue;
@@ -714,38 +723,3 @@ bool gpu_excluded(APP* app, COPROC& cp, int ind) {
}
return false;
}
-
-// if the configuration file disallows the use of a GPU type
-// for a project, set a flag to that effect
-//
-void set_no_rsc_config() {
- for (unsigned int i=0; i<gstate.projects.size(); i++) {
- PROJECT& p = *gstate.projects[i];
- for (int j=1; j<coprocs.n_rsc; j++) {
- bool allowed[MAX_COPROC_INSTANCES];
- memset(allowed, 0, sizeof(allowed));
- COPROC& c = coprocs.coprocs[j];
- for (int k=0; k<c.count; k++) {
- allowed[c.device_nums[k]] = true;
- }
- for (unsigned int k=0; k<cc_config.exclude_gpus.size(); k++) {
- EXCLUDE_GPU& e = cc_config.exclude_gpus[k];
- if (strcmp(e.url.c_str(), p.master_url)) continue;
- if (!e.type.empty() && strcmp(e.type.c_str(), c.type)) continue;
- if (!e.appname.empty()) continue;
- if (e.device_num < 0) {
- memset(allowed, 0, sizeof(allowed));
- break;
- }
- allowed[e.device_num] = false;
- }
- p.no_rsc_config[j] = true;
- for (int k=0; k<c.count; k++) {
- if (allowed[c.device_nums[k]]) {
- p.no_rsc_config[j] = false;
- break;
- }
- }
- }
- }
-}
diff --git a/client/log_flags.h b/client/log_flags.h
index 8b001a0..9eeb47a 100644
--- a/client/log_flags.h
+++ b/client/log_flags.h
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2014 University of California
+// Copyright (C) 2008 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
@@ -39,6 +39,6 @@ extern CC_CONFIG cc_config;
extern int read_config_file(bool init, const char* fname=CONFIG_FILE);
extern void process_gpu_exclusions();
extern bool gpu_excluded(APP* app, COPROC& cp, int ind);
-extern void set_no_rsc_config();
+
#endif
diff --git a/client/makefile_sim b/client/makefile_sim
index 6af9d01..f504d9d 100644
--- a/client/makefile_sim
+++ b/client/makefile_sim
@@ -1,7 +1,7 @@
# makefile for client simulator
# DO MAKE CLEAN IN CLIENT/ and LIB/ FIRST
-CXXFLAGS = -g -DSIM -Wall \
+CXXFLAGS = -g -DSIM \
-I ../lib \
-I ..
diff --git a/client/project.cpp b/client/project.cpp
index 2710146..555a0d7 100644
--- a/client/project.cpp
+++ b/client/project.cpp
@@ -49,6 +49,7 @@ void PROJECT::init() {
no_rsc_config[i] = false;
no_rsc_apps[i] = false;
no_rsc_ams[i] = false;
+ rsc_defer_sched[i] = false;
}
strcpy(host_venue, "");
using_venue_specific_prefs = false;
@@ -106,7 +107,6 @@ void PROJECT::init() {
too_many_uploading_results = false;
njobs_success = 0;
njobs_error = 0;
- elapsed_time = 0;
app_configs.clear();
#ifdef SIM
@@ -317,7 +317,6 @@ int PROJECT::parse_state(XML_PARSER& xp) {
if (xp.parse_double("desired_disk_usage", desired_disk_usage)) continue;
if (xp.parse_int("njobs_success", njobs_success)) continue;
if (xp.parse_int("njobs_error", njobs_error)) continue;
- if (xp.parse_double("elapsed_time", elapsed_time)) continue;
#ifdef SIM
if (xp.match_tag("available")) {
available.parse(xp, "/available");
@@ -382,7 +381,6 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) {
" <send_job_log>%d</send_job_log>\n"
" <njobs_success>%d</njobs_success>\n"
" <njobs_error>%d</njobs_error>\n"
- " <elapsed_time>%f</elapsed_time>\n"
"%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
master_url,
project_name,
@@ -418,7 +416,6 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) {
send_job_log,
njobs_success,
njobs_error,
- elapsed_time,
anonymous_platform?" <anonymous_platform/>\n":"",
master_url_fetch_pending?" <master_url_fetch_pending/>\n":"",
trickle_up_pending?" <trickle_up_pending/>\n":"",
@@ -576,7 +573,6 @@ void PROJECT::copy_state_fields(PROJECT& p) {
use_symlinks = p.use_symlinks;
njobs_success = p.njobs_success;
njobs_error = p.njobs_error;
- elapsed_time = p.elapsed_time;
}
// Write project statistic to GUI RPC reply
diff --git a/client/project.h b/client/project.h
index 16de165..1b42f90 100644
--- a/client/project.h
+++ b/client/project.h
@@ -71,6 +71,12 @@ struct PROJECT : PROJ_AM {
//
bool no_rsc_ams[MAX_RSC];
+ // the following set dynamically
+ //
+ bool rsc_defer_sched[MAX_RSC];
+ // This project has a GPU job for which there's insuff. video RAM.
+ // Don't fetch more jobs of this type; they might have same problem
+
char host_venue[256];
// logically, this belongs in the client state file
// rather than the account file.
@@ -298,10 +304,6 @@ struct PROJECT : PROJ_AM {
int njobs_success;
int njobs_error;
- // total elapsed time of this project's jobs (for export to GUI)
- //
- double elapsed_time;
-
PROJECT();
~PROJECT(){}
void init();
diff --git a/client/result.cpp b/client/result.cpp
index 8a27848..0f223ad 100644
--- a/client/result.cpp
+++ b/client/result.cpp
@@ -532,12 +532,7 @@ bool RESULT::runnable() {
if (state() != RESULT_FILES_DOWNLOADED) return false;
if (coproc_missing) return false;
if (schedule_backoff > gstate.now) return false;
- if (avp->needs_network && gstate.file_xfers_suspended) {
- // check file_xfers_suspended rather than network_suspended;
- // the latter remains false for a period after GUI RPCs
- //
- return false;
- }
+ if (avp->needs_network && gstate.network_suspended) return false;
return true;
}
diff --git a/client/result.h b/client/result.h
index c96cddb..aa39d88 100644
--- a/client/result.h
+++ b/client/result.h
@@ -144,12 +144,6 @@ struct RESULT {
inline bool uses_coprocs() {
return (avp->gpu_usage.rsc_type != 0);
}
- inline bool uses_gpu() {
- int rt = avp->gpu_usage.rsc_type;
- if (!rt) return false;
- if (coprocs.coprocs[rt].non_gpu) return false;
- return true;
- }
inline int resource_type() {
return avp->gpu_usage.rsc_type;
}
@@ -191,7 +185,7 @@ struct RESULT {
// textual description of resources used
double schedule_backoff;
// don't try to schedule until this time
- // (because the app called boinc_temporary_exit())
+ // (wait for free GPU RAM)
char schedule_backoff_reason[256];
};
diff --git a/client/rr_sim.cpp b/client/rr_sim.cpp
index a8b7e66..d0f1c0f 100644
--- a/client/rr_sim.cpp
+++ b/client/rr_sim.cpp
@@ -64,14 +64,12 @@ inline void rsc_string(RESULT* rp, char* buf) {
// set "nused" bits of the source bitmap in the dest bitmap
//
-static inline void set_bits(
- COPROC_INSTANCE_BITMAP src, double nused, COPROC_INSTANCE_BITMAP& dst
-) {
+static inline void set_bits(int src, double nused, int& dst) {
// if all bits are already set, we're done
//
if ((src&dst) == src) return;
- COPROC_INSTANCE_BITMAP bit = 1;
- for (int i=0; i<MAX_COPROC_INSTANCES; i++) {
+ int bit = 1;
+ for (int i=0; i<32; i++) {
if (nused <= 0) break;
if (bit & src) {
dst |= bit;
@@ -128,7 +126,7 @@ struct RR_SIM {
void set_rrsim_flops(RESULT* rp) {
// For coproc jobs, use app version estimate
//
- if (rp->uses_gpu()) {
+ if (rp->uses_coprocs()) {
rp->rrsim_flops = rp->avp->flops * gstate.overall_gpu_frac();
} else if (rp->avp->needs_network) {
rp->rrsim_flops = rp->avp->flops * gstate.overall_cpu_and_network_frac();
@@ -461,7 +459,7 @@ void RR_SIM::simulate() {
// update busy time of relevant processor types
//
- double frac = rpbest->uses_gpu()?gstate.overall_gpu_frac():gstate.overall_cpu_frac();
+ double frac = rpbest->uses_coprocs()?gstate.overall_gpu_frac():gstate.overall_cpu_frac();
double dur = rpbest->estimated_runtime_remaining() / frac;
rsc_work_fetch[0].update_busy_time(dur, rpbest->avp->avg_ncpus);
int rt = rpbest->avp->gpu_usage.rsc_type;
@@ -526,14 +524,11 @@ void RR_SIM::simulate() {
RSC_WORK_FETCH& rwf = rsc_work_fetch[i];
if (!rwf.has_exclusions) continue;
COPROC& cp = coprocs.coprocs[i];
- COPROC_INSTANCE_BITMAP mask = 0;
- for (int j=0; j<cp.count; j++) {
- mask |= ((COPROC_INSTANCE_BITMAP)1)<<j;
- }
+ int mask = (1<<cp.count)-1;
rwf.sim_excluded_instances = ~(rwf.sim_used_instances) & mask;
if (log_flags.rrsim_detail) {
msg_printf(0, MSG_INFO,
- "[rrsim_detail] rsc %d: sim_used_inst %lld mask %lld sim_excluded_instances %lld",
+ "[rrsim_detail] rsc %d: sim_used_inst %d mask %d sim_excluded_instances %d",
i, rwf.sim_used_instances, mask, rwf.sim_excluded_instances
);
}
diff --git a/client/sandbox.cpp b/client/sandbox.cpp
index 5a31917..df215e8 100644
--- a/client/sandbox.cpp
+++ b/client/sandbox.cpp
@@ -226,7 +226,7 @@ int set_to_project_group(const char* path) {
int get_project_gid() {
return 0;
}
-int set_to_project_group(const char*) {
+int set_to_project_group(const char* path) {
return 0;
}
#endif // ! _WIN32
diff --git a/client/scheduler_op.cpp b/client/scheduler_op.cpp
index 5ad82ec..edc39fc 100644
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
@@ -247,9 +247,9 @@ int SCHEDULER_OP::start_rpc(PROJECT* p) {
if (strlen(buf)) {
msg_printf(p, MSG_INFO, "Requesting new tasks for %s", buf);
} else {
- if (p->pwf.project_reason) {
+ if (p->pwf.cant_fetch_work_reason) {
msg_printf(p, MSG_INFO,
- "Not requesting tasks: %s", project_reason_string(p, buf)
+ "Not requesting tasks: %s", cant_fetch_work_string(p, buf)
);
} else {
msg_printf(p, MSG_INFO, "Not requesting tasks");
diff --git a/client/sim.cpp b/client/sim.cpp
index 3e4e82f..1056a64 100644
--- a/client/sim.cpp
+++ b/client/sim.cpp
@@ -342,6 +342,7 @@ double get_estimated_delay(RESULT* rp) {
bool CLIENT_STATE::simulate_rpc(PROJECT* p) {
char buf[256], buf2[256];
vector<IP_RESULT> ip_results;
+ int infeasible_count = 0;
vector<RESULT*> new_results;
bool avail;
@@ -448,8 +449,8 @@ bool CLIENT_STATE::simulate_rpc(PROJECT* p) {
}
njobs += new_results.size();
- msg_printf(0, MSG_INFO, "Got %lu tasks", new_results.size());
- sprintf(buf, "got %lu tasks<br>", new_results.size());
+ msg_printf(0, MSG_INFO, "Got %d tasks", new_results.size());
+ sprintf(buf, "got %d tasks<br>", new_results.size());
html_msg += buf;
SCHEDULER_REPLY sr;
@@ -457,8 +458,7 @@ bool CLIENT_STATE::simulate_rpc(PROJECT* p) {
work_fetch.handle_reply(p, &sr, new_results);
p->nrpc_failures = 0;
p->sched_rpc_pending = 0;
- //p->min_rpc_time = now + 900;
- p->min_rpc_time = now;
+ p->min_rpc_time = now + 900;
if (sent_something) {
request_schedule_cpus("simulate_rpc");
request_work_fetch("simulate_rpc");
@@ -583,7 +583,7 @@ bool ACTIVE_TASK_SET::poll() {
ACTIVE_TASK* atp = active_tasks[i];
if (atp->task_state() != PROCESS_EXECUTING) continue;
RESULT* rp = atp->result;
- if (rp->uses_gpu()) {
+ if (rp->uses_coprocs()) {
if (gpu_active) {
cpu_usage_gpu += rp->avp->avg_ncpus;
}
@@ -605,12 +605,12 @@ bool ACTIVE_TASK_SET::poll() {
ACTIVE_TASK* atp = active_tasks[i];
if (atp->task_state() != PROCESS_EXECUTING) continue;
RESULT* rp = atp->result;
- if (!gpu_active && rp->uses_gpu()) {
+ if (!gpu_active && rp->uses_coprocs()) {
continue;
}
atp->elapsed_time += diff;
double flops = rp->avp->flops;
- if (!rp->uses_gpu()) {
+ if (!rp->uses_coprocs()) {
flops *= cpu_scale;
}
@@ -1091,7 +1091,7 @@ void simulate() {
cc_config.rec_half_life
);
fprintf(summary_file, "Jobs\n");
- for (unsigned int i=0; i<gstate.results.size(); i++) {
+ for (int i=0; i<gstate.results.size(); i++) {
RESULT* rp = gstate.results[i];
fprintf(summary_file,
" %s time left %s deadline %s\n",
@@ -1329,6 +1329,7 @@ void cull_projects() {
for (i=0; i<gstate.app_versions.size(); i++) {
APP_VERSION* avp = gstate.app_versions[i];
if (avp->app->ignore) continue;
+ int rt = avp->gpu_usage.rsc_type;
}
for (i=0; i<gstate.apps.size(); i++) {
APP* app = gstate.apps[i];
@@ -1453,7 +1454,6 @@ void do_client_simulation() {
}
}
}
- set_no_rsc_config();
process_gpu_exclusions();
get_app_params();
@@ -1525,7 +1525,7 @@ char* next_arg(int argc, char** argv, int& i) {
}
int main(int argc, char** argv) {
- int i;
+ int i, retval;
char buf[256];
sim_results.clear();
diff --git a/client/sysmon_win.cpp b/client/sysmon_win.cpp
index 77b87fd..20a65bb 100644
--- a/client/sysmon_win.cpp
+++ b/client/sysmon_win.cpp
@@ -295,7 +295,7 @@ static void windows_detect_autoproxy_settings() {
WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A;
autoproxy_options.fAutoLogonIfChallenged = TRUE;
- network_test_url = boinc_ascii_to_wide(cc_config.network_test_url).c_str();
+ network_test_url = A2W(cc_config.network_test_url).c_str();
hWinHttp = WinHttpOpen(
L"BOINC client",
@@ -316,7 +316,7 @@ static void windows_detect_autoproxy_settings() {
// For the time being check to see if proxy_info.lpszProxy is non-null.
//
if (proxy_info.lpszProxy) {
- std::string proxy(boinc_wide_to_ascii(std::wstring(proxy_info.lpszProxy)));
+ std::string proxy(W2A(std::wstring(proxy_info.lpszProxy)));
std::string new_proxy;
if (log_flags.proxy_debug) {
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 7f73875..1fc6078 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2014 University of California
+// Copyright (C) 2008 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
@@ -46,6 +46,49 @@ using std::vector;
RSC_WORK_FETCH rsc_work_fetch[MAX_RSC];
WORK_FETCH work_fetch;
+static inline int dont_fetch(PROJECT* p, int rsc_type) {
+ if (p->no_rsc_pref[rsc_type]) return DONT_FETCH_PREFS;
+ if (p->no_rsc_config[rsc_type]) return DONT_FETCH_CONFIG;
+ if (p->no_rsc_apps[rsc_type]) return DONT_FETCH_NO_APPS;
+ if (p->no_rsc_ams[rsc_type]) return DONT_FETCH_AMS;
+ return 0;
+}
+
+// if the configuration file disallows the use of a GPU type
+// for a project, set a flag to that effect
+//
+void set_no_rsc_config() {
+ for (unsigned int i=0; i<gstate.projects.size(); i++) {
+ PROJECT& p = *gstate.projects[i];
+ for (int j=1; j<coprocs.n_rsc; j++) {
+ bool allowed[MAX_COPROC_INSTANCES];
+ memset(allowed, 0, sizeof(allowed));
+ COPROC& c = coprocs.coprocs[j];
+ for (int k=0; k<c.count; k++) {
+ allowed[c.device_nums[k]] = true;
+ }
+ for (unsigned int k=0; k<cc_config.exclude_gpus.size(); k++) {
+ EXCLUDE_GPU& e = cc_config.exclude_gpus[k];
+ if (strcmp(e.url.c_str(), p.master_url)) continue;
+ if (!e.type.empty() && strcmp(e.type.c_str(), c.type)) continue;
+ if (!e.appname.empty()) continue;
+ if (e.device_num < 0) {
+ memset(allowed, 0, sizeof(allowed));
+ break;
+ }
+ allowed[e.device_num] = false;
+ }
+ p.no_rsc_config[j] = true;
+ for (int k=0; k<c.count; k++) {
+ if (allowed[c.device_nums[k]]) {
+ p.no_rsc_config[j] = false;
+ break;
+ }
+ }
+ }
+ }
+}
+
// does the (NCI) project have a job that's running or uploading?
// (don't request another job from NCI project if so)
//
@@ -72,7 +115,14 @@ inline bool has_coproc_app(PROJECT* p, int rsc_type) {
/////////////// RSC_PROJECT_WORK_FETCH ///////////////
-void RSC_PROJECT_WORK_FETCH::rr_init() {
+bool RSC_PROJECT_WORK_FETCH::compute_may_have_work(PROJECT* p, int rsc_type) {
+ if (dont_fetch(p, rsc_type)) return false;
+ if (p->rsc_defer_sched[rsc_type]) return false;
+ return (backoff_time < gstate.now);
+}
+
+void RSC_PROJECT_WORK_FETCH::rr_init(PROJECT* p, int rsc_type) {
+ may_have_work = compute_may_have_work(p, rsc_type);
fetchable_share = 0;
n_runnable_jobs = 0;
sim_nused = 0;
@@ -96,66 +146,6 @@ void RSC_PROJECT_WORK_FETCH::resource_backoff(PROJECT* p, const char* name) {
}
}
-// checks for whether we should ask this project for work of this type.
-// check for backoff must go last, so that if that's the reason
-// we know that there are no other reasons (for piggyback)
-//
-int RSC_PROJECT_WORK_FETCH::compute_rsc_project_reason(
- PROJECT *p, int rsc_type
-) {
- RSC_WORK_FETCH& rwf = rsc_work_fetch[rsc_type];
- // see whether work fetch for this resource is banned
- // by prefs, config, project, or acct mgr
- //
- if (p->no_rsc_pref[rsc_type]) return DONT_FETCH_PREFS;
- if (p->no_rsc_config[rsc_type]) return DONT_FETCH_CONFIG;
- if (p->no_rsc_apps[rsc_type]) return DONT_FETCH_NO_APPS;
- if (p->no_rsc_ams[rsc_type]) return DONT_FETCH_AMS;
- if (p->rsc_pwf[rsc_type].has_deferred_job) return DONT_FETCH_DEFER_SCHED;
-
- // if project has zero resource share,
- // only fetch work if a device is idle
- //
- if (p->resource_share == 0 && rwf.nidle_now == 0 && rwf.sim_excluded_instances==0) {
- return DONT_FETCH_ZERO_SHARE;
- }
-
- // if project has excluded GPUs of this type,
- // we need to avoid fetching work just because there's an idle instance
- // or a shortfall;
- // fetching work might not alleviate either of these,
- // and we'd end up fetching unbounded work.
- // At the same time, we want to respect work buf params if possible.
- //
- // Current policy:
- // don't fetch work if remaining time of this project's jobs
- // exceeds work_buf_min * (#usable instances / #instances)
- //
- // TODO: THIS IS FAIRLY CRUDE. Making it smarter would require
- // computing shortfall etc. on a per-project basis
- //
- int nexcl = ncoprocs_excluded;
- if (rsc_type && nexcl) {
- int n_not_excluded = rwf.ninstances - nexcl;
- if (n_runnable_jobs >= n_not_excluded
- && queue_est > (gstate.work_buf_min() * n_not_excluded)/rwf.ninstances
- ) {
- return DONT_FETCH_BUFFER_FULL;
- }
- }
-
- if (anonymous_platform_no_apps) {
- return DONT_FETCH_NO_APPS;
- }
-
- // this must go last
- //
- if (backoff_time > gstate.now) {
- return DONT_FETCH_BACKED_OFF;
- }
- return 0;
-}
-
/////////////// RSC_WORK_FETCH ///////////////
void RSC_WORK_FETCH::copy_request(COPROC& c) {
@@ -288,27 +278,34 @@ void RSC_WORK_FETCH::print_state(const char* name) {
shortfall, nidle_now, saturated_time,
busy_time_estimator.get_busy_time()
);
-// msg_printf(0, MSG_INFO, "[work_fetch] sim used inst %d sim excl inst %d",
-// sim_used_instances, sim_excluded_instances
-// );
+ msg_printf(0, MSG_INFO, "[work_fetch] sim used inst %d sim excl inst %d",
+ sim_used_instances, sim_excluded_instances
+ );
for (unsigned int i=0; i<gstate.projects.size(); i++) {
char buf[256];
PROJECT* p = gstate.projects[i];
if (p->non_cpu_intensive) continue;
- RSC_PROJECT_WORK_FETCH& rpwf = project_state(p);
- double bt = rpwf.backoff_time>gstate.now?rpwf.backoff_time-gstate.now:0;
+ RSC_PROJECT_WORK_FETCH& pwf = project_state(p);
+ bool no_rsc_pref = p->no_rsc_pref[rsc_type];
+ bool no_rsc_config = p->no_rsc_config[rsc_type];
+ bool no_rsc_apps = p->no_rsc_apps[rsc_type];
+ bool no_rsc_ams = p->no_rsc_ams[rsc_type];
+ double bt = pwf.backoff_time>gstate.now?pwf.backoff_time-gstate.now:0;
if (bt) {
sprintf(buf, " (resource backoff: %.2f, inc %.2f)",
- bt, rpwf.backoff_interval
+ bt, pwf.backoff_interval
);
} else {
strcpy(buf, "");
}
msg_printf(p, MSG_INFO,
- "[work_fetch] share %.3f %s %s",
- rpwf.fetchable_share,
- rsc_project_reason_string(rpwf.rsc_project_reason),
- buf
+ "[work_fetch] fetch share %.3f%s%s%s%s%s",
+ pwf.fetchable_share,
+ buf,
+ no_rsc_pref?" (blocked by prefs)":"",
+ no_rsc_apps?" (no apps)":"",
+ no_rsc_ams?" (blocked by account manager)":"",
+ no_rsc_config?" (blocked by configuration file)":""
);
}
}
@@ -320,7 +317,7 @@ void RSC_WORK_FETCH::clear_request() {
/////////////// PROJECT_WORK_FETCH ///////////////
-int PROJECT_WORK_FETCH::compute_project_reason(PROJECT* p) {
+int PROJECT_WORK_FETCH::compute_cant_fetch_work_reason(PROJECT* p) {
if (p->non_cpu_intensive) return CANT_FETCH_WORK_NON_CPU_INTENSIVE;
if (p->suspended_via_gui) return CANT_FETCH_WORK_SUSPENDED_VIA_GUI;
if (p->master_url_fetch_pending) return CANT_FETCH_WORK_MASTER_URL_FETCH_PENDING;
@@ -329,8 +326,7 @@ int PROJECT_WORK_FETCH::compute_project_reason(PROJECT* p) {
if (p->some_result_suspended()) return CANT_FETCH_WORK_RESULT_SUSPENDED;
if (p->too_many_uploading_results) return CANT_FETCH_WORK_TOO_MANY_UPLOADS;
- // this goes last, so that if this is the reason we know
- // that there are no other reasons
+ // this goes last
//
if (p->min_rpc_time > gstate.now) return CANT_FETCH_WORK_MIN_RPC_TIME;
return 0;
@@ -342,64 +338,97 @@ void PROJECT_WORK_FETCH::reset(PROJECT* p) {
}
}
-void PROJECT_WORK_FETCH::rr_init(PROJECT* p) {
- project_reason = compute_project_reason(p);
- n_runnable_jobs = 0;
-}
+/////////////// WORK_FETCH ///////////////
-void PROJECT_WORK_FETCH::print_state(PROJECT* p) {
- char buf[1024], buf2[1024];
- if (project_reason) {
- sprintf(buf, "can't request work: %s", project_reason_string(p, buf2));
- } else {
- strcpy(buf, "can request work");
- }
- if (p->min_rpc_time > gstate.now) {
- sprintf(buf2, " (%.2f sec)", p->min_rpc_time - gstate.now);
- strcat(buf, buf2);
+// mark the projects from which we can fetch work
+//
+void WORK_FETCH::compute_cant_fetch_work_reason() {
+ for (unsigned int i=0; i<gstate.projects.size(); i++) {
+ PROJECT* p = gstate.projects[i];
+ p->pwf.cant_fetch_work_reason = p->pwf.compute_cant_fetch_work_reason(p);
}
- msg_printf(p, MSG_INFO, "[work_fetch] REC %.3f prio %.3f %s",
- rec,
- p->sched_priority,
- buf
- );
}
-/////////////// WORK_FETCH ///////////////
-
void WORK_FETCH::rr_init() {
- // compute PROJECT::RSC_PROJECT_WORK_FETCH::has_deferred_job
- //
+ for (int i=0; i<coprocs.n_rsc; i++) {
+ rsc_work_fetch[i].rr_init();
+ }
+ compute_cant_fetch_work_reason();
for (unsigned int i=0; i<gstate.projects.size(); i++) {
PROJECT* p = gstate.projects[i];
+ p->pwf.n_runnable_jobs = 0;
for (int j=0; j<coprocs.n_rsc; j++) {
- p->rsc_pwf[j].has_deferred_job = false;
+ p->rsc_pwf[j].rr_init(p, j);
}
}
- for (unsigned int i=0; i<gstate.results.size(); i++) {
- RESULT* rp = gstate.results[i];
- if (rp->schedule_backoff) {
- if (rp->schedule_backoff > gstate.now) {
- int rt = rp->avp->gpu_usage.rsc_type;
- rp->project->rsc_pwf[rt].has_deferred_job = true;
- } else {
- rp->schedule_backoff = 0;
- gstate.request_schedule_cpus("schedule backoff finished");
+}
+
+#if 0
+// if the given project is highest-priority among the projects
+// eligible for the resource, set request fields
+//
+void RSC_WORK_FETCH::supplement(PROJECT* pp) {
+ double x = pp->sched_priority;
+ for (unsigned i=0; i<gstate.projects.size(); i++) {
+ PROJECT* p = gstate.projects[i];
+ if (p == pp) continue;
+ if (p->pwf.cant_fetch_work_reason) continue;
+ if (!project_state(p).may_have_work) continue;
+ RSC_PROJECT_WORK_FETCH& rpwf = project_state(p);
+ if (rpwf.anon_skip) continue;
+ if (p->sched_priority > x) {
+ if (log_flags.work_fetch_debug) {
+ msg_printf(pp, MSG_INFO,
+ "[work_fetch]: not requesting work for %s: %s has higher priority",
+ rsc_name_long(rsc_type), p->get_project_name()
+ );
}
+ return;
}
}
+ // didn't find a better project; ask for work
+ //
+ set_request(pp);
+}
+// we're going to ask the given project for work of the given type.
+// (or -1 if none)
+// Set requests for this type and perhaps other types
+//
+void WORK_FETCH::set_all_requests_hyst(PROJECT* p, int rsc_type) {
for (int i=0; i<coprocs.n_rsc; i++) {
- rsc_work_fetch[i].rr_init();
+ if (i == rsc_type) {
+ rsc_work_fetch[i].set_request(p);
+ } else {
+ // don't fetch work for a resource if the buffer is above max
+ //
+ if (rsc_work_fetch[i].saturated_time > gstate.work_buf_total()) {
+ continue;
+ }
+
+ // don't fetch work if backup project and no idle instances
+ //
+ if (p->resource_share==0 && rsc_work_fetch[i].nidle_now==0) {
+ continue;
+ }
+
+ if (i>0 && !gpus_usable) {
+ continue;
+ }
+ rsc_work_fetch[i].supplement(p);
+ }
}
- for (unsigned int i=0; i<gstate.projects.size(); i++) {
- PROJECT* p = gstate.projects[i];
- p->pwf.rr_init(p);
- for (int j=0; j<coprocs.n_rsc; j++) {
- p->rsc_pwf[j].rr_init();
+}
+
+void WORK_FETCH::set_all_requests(PROJECT* p) {
+ for (int i=0; i<coprocs.n_rsc; i++) {
+ if (i==0 || gpus_usable) {
+ rsc_work_fetch[i].set_request(p);
}
}
}
+#endif
+
// copy request fields from RSC_WORK_FETCH to COPROCS
//
void WORK_FETCH::copy_requests() {
@@ -429,7 +458,21 @@ void WORK_FETCH::print_state() {
msg_printf(0, MSG_INFO, "[work_fetch] --- project states ---");
for (unsigned int i=0; i<gstate.projects.size(); i++) {
PROJECT* p = gstate.projects[i];
- p->pwf.print_state(p);
+ char buf[1024], buf2[1024];
+ if (p->pwf.cant_fetch_work_reason) {
+ sprintf(buf, "can't req work: %s", cant_fetch_work_string(p, buf2));
+ } else {
+ strcpy(buf, "can req work");
+ }
+ if (p->min_rpc_time > gstate.now) {
+ sprintf(buf2, " (backoff: %.2f sec)", p->min_rpc_time - gstate.now);
+ strcat(buf, buf2);
+ }
+ msg_printf(p, MSG_INFO, "[work_fetch] REC %.3f prio %.6f %s",
+ p->pwf.rec,
+ p->sched_priority,
+ buf
+ );
}
for (int i=0; i<coprocs.n_rsc; i++) {
rsc_work_fetch[i].print_state(rsc_name_long(i));
@@ -467,7 +510,7 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
setup();
- switch (p->pwf.project_reason) {
+ switch (p->pwf.cant_fetch_work_reason) {
case 0:
case CANT_FETCH_WORK_MIN_RPC_TIME:
break;
@@ -496,13 +539,9 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
rwf.dont_fetch_reason = DONT_FETCH_GPUS_NOT_USABLE;
continue;
}
- RSC_PROJECT_WORK_FETCH& rpwf = rwf.project_state(p);
- switch (rpwf.rsc_project_reason) {
- case 0:
- case DONT_FETCH_BACKED_OFF:
- break;
- default:
- WF_DEBUG(msg_printf(p, MSG_INFO, "piggyback: can't fetch %s: %s", rsc_name_long(i), rsc_project_reason_string(rpwf.rsc_project_reason));)
+ rwf.dont_fetch_reason = rwf.cant_fetch(p);
+ if (rwf.dont_fetch_reason) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "piggyback: can't fetch %s", rsc_name_long(i));)
continue;
}
bool buffer_low = (rwf.saturated_time < gstate.work_buf_total());
@@ -520,13 +559,12 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
for (unsigned int j=0; j<gstate.projects.size(); j++) {
p2 = gstate.projects[j];
if (p2 == p) break;
- if (p2->sched_priority == p->sched_priority) continue;
- if (p2->pwf.project_reason) {
+ if (p2->sched_priority == p->sched_priority) continue;
+ if (p2->pwf.cant_fetch_work_reason) {
WF_DEBUG(msg_printf(p, MSG_INFO, "piggyback: %s can't fetch work", p2->project_name);)
continue;
}
- RSC_PROJECT_WORK_FETCH& rpwf2 = rwf.project_state(p2);
- if (!rpwf2.rsc_project_reason) {
+ if (!rwf.cant_fetch(p2) && !rwf.backed_off(p2)) {
WF_DEBUG(msg_printf(p, MSG_INFO, "piggyback: better proj %s", p2->project_name);)
break;
}
@@ -544,7 +582,7 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
}
}
if (!requested_work()) {
- p->pwf.project_reason = CANT_FETCH_WORK_DONT_NEED;
+ p->pwf.cant_fetch_work_reason = CANT_FETCH_WORK_DONT_NEED;
}
}
@@ -568,6 +606,71 @@ static bool higher_priority(PROJECT *p1, PROJECT *p2) {
return (p1->sched_priority > p2->sched_priority);
}
+// check resource-level backoff
+//
+bool RSC_WORK_FETCH::backed_off(PROJECT* p) {
+ if (project_state(p).backoff_time > gstate.now) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "skip: backoff");)
+ return true;
+ }
+ return false;
+}
+
+// a variety of checks for whether we should ask this project
+// for work of this type
+//
+int RSC_WORK_FETCH::cant_fetch(PROJECT *p) {
+ // see whether work fetch for this resource is banned
+ // by prefs, config, project, or acct mgr
+ //
+ int reason = dont_fetch(p, rsc_type);
+ if (reason) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "skip: dont_fetch");)
+ return reason;
+ }
+
+ RSC_PROJECT_WORK_FETCH& rpwf = project_state(p);
+
+ // if project has zero resource share,
+ // only fetch work if a device is idle
+ //
+ if (p->resource_share == 0 && nidle_now == 0 && sim_excluded_instances==0) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "skip: zero share");)
+ return DONT_FETCH_ZERO_SHARE;
+ }
+
+ // if project has excluded GPUs of this type,
+ // we need to avoid fetching work just because there's an idle instance
+ // or a shortfall;
+ // fetching work might not alleviate either of these,
+ // and we'd end up fetching unbounded work.
+ // At the same time, we want to respect work buf params if possible.
+ //
+ // Current policy:
+ // don't fetch work if remaining time of this project's jobs
+ // exceeds work_buf_min * (#usable instances / #instances)
+ //
+ // TODO: THIS IS FAIRLY CRUDE. Making it smarter would require
+ // computing shortfall etc. on a per-project basis
+ //
+ int nexcl = rpwf.ncoprocs_excluded;
+ if (rsc_type && nexcl) {
+ int n_not_excluded = ninstances - nexcl;
+ if (rpwf.n_runnable_jobs >= n_not_excluded
+ && rpwf.queue_est > (gstate.work_buf_min() * n_not_excluded)/ninstances
+ ) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "skip: too much work");)
+ return DONT_FETCH_BUFFER_FULL;
+ }
+ }
+
+ if (rpwf.anon_skip) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "skip: anon");)
+ return DONT_FETCH_NO_APPS;
+ }
+ return 0;
+}
+
// return true if there is exclusion starvation
// and this project can use the starved instances
//
@@ -587,19 +690,6 @@ void WORK_FETCH::setup() {
gstate.compute_nuploading_results();
rr_simulation();
-
- // Compute rsc_project_reason.
- // Must do this after rr_simulation() because the logic for
- // zero-resource-share projects uses #idle instances
- //
- for (unsigned int i=0; i<gstate.projects.size(); i++) {
- PROJECT* p = gstate.projects[i];
- for (int j=0; j<coprocs.n_rsc; j++) {
- RSC_PROJECT_WORK_FETCH& rpwf = p->rsc_pwf[j];
- rpwf.rsc_project_reason = rpwf.compute_rsc_project_reason(p, j);
- }
- }
-
compute_shares();
project_priority_init(true);
clear_request();
@@ -622,8 +712,8 @@ void WORK_FETCH::setup() {
int job_limit = 1000;
for (unsigned int i=0; i<gstate.projects.size(); i++) {
PROJECT* p = gstate.projects[i];
- if (p->pwf.n_runnable_jobs > job_limit && !p->pwf.project_reason) {
- p->pwf.project_reason = CANT_FETCH_WORK_TOO_MANY_RUNNABLE;
+ if (p->pwf.n_runnable_jobs > job_limit && !p->pwf.cant_fetch_work_reason) {
+ p->pwf.cant_fetch_work_reason = CANT_FETCH_WORK_TOO_MANY_RUNNABLE;
}
}
@@ -645,6 +735,10 @@ void WORK_FETCH::setup() {
PROJECT* WORK_FETCH::choose_project() {
PROJECT* p;
+ if (log_flags.work_fetch_debug) {
+ msg_printf(0, MSG_INFO, "[work_fetch] entering choose_project()");
+ }
+
p = non_cpu_intensive_project_needing_work();
if (p) return p;
@@ -660,8 +754,8 @@ PROJECT* WORK_FETCH::choose_project() {
for (unsigned int j=0; j<gstate.projects.size(); j++) {
p = gstate.projects[j];
WF_DEBUG(msg_printf(p, MSG_INFO, "scanning");)
- if (p->pwf.project_reason) {
- WF_DEBUG(msg_printf(p, MSG_INFO, "skip: cfwr %d", p->pwf.project_reason);)
+ if (p->pwf.cant_fetch_work_reason) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "skip: cfwr %d", p->pwf.cant_fetch_work_reason);)
continue;
}
@@ -676,14 +770,13 @@ PROJECT* WORK_FETCH::choose_project() {
for (int i=0; i<coprocs.n_rsc; i++) {
if (i && !gpus_usable) continue;
RSC_WORK_FETCH& rwf = rsc_work_fetch[i];
- RSC_PROJECT_WORK_FETCH& rpwf = rwf.project_state(p);
- if (!rpwf.rsc_project_reason) {
+ if (!rwf.cant_fetch(p) && !rwf.backed_off(p)) {
if (!rwf.found_project) {
rwf.found_project = p;
}
WF_DEBUG(msg_printf(p, MSG_INFO, "can fetch %s", rsc_name_long(i));)
} else {
- WF_DEBUG(msg_printf(p, MSG_INFO, "can't fetch %s: %s", rsc_name_long(i), rsc_project_reason_string(rpwf.rsc_project_reason));)
+ WF_DEBUG(msg_printf(p, MSG_INFO, "can't fetch %s", rsc_name_long(i));)
continue;
}
if (rwf.saturated_time < gstate.work_buf_min()) {
@@ -728,16 +821,9 @@ PROJECT* WORK_FETCH::choose_project() {
WF_DEBUG(msg_printf(p, MSG_INFO, "%s don't need", rsc_name_long(i));)
continue;
}
- RSC_PROJECT_WORK_FETCH& rpwf = rwf.project_state(p);
- int reason = rpwf.rsc_project_reason;
- switch (reason) {
- case 0:
- case DONT_FETCH_BACKED_OFF:
- // request even if backed off - no reason not to.
- //
- break;
- default:
- WF_DEBUG(msg_printf(p, MSG_INFO, "%s can't fetch: %s", rsc_name_long(i), rsc_project_reason_string(reason));)
+ int reason = rwf.cant_fetch(p);
+ if (reason) {
+ WF_DEBUG(msg_printf(p, MSG_INFO, "%s can't fetch", rsc_name_long(i));)
continue;
}
}
@@ -793,9 +879,9 @@ void WORK_FETCH::compute_shares() {
for (i=0; i<gstate.projects.size(); i++) {
p = gstate.projects[i];
if (p->non_cpu_intensive) continue;
- if (p->pwf.project_reason) continue;
+ if (p->pwf.cant_fetch_work_reason) continue;
for (int j=0; j<coprocs.n_rsc; j++) {
- if (!p->rsc_pwf[j].rsc_project_reason) {
+ if (p->rsc_pwf[j].may_have_work) {
rsc_work_fetch[j].total_fetchable_share += p->resource_share;
}
}
@@ -803,9 +889,9 @@ void WORK_FETCH::compute_shares() {
for (i=0; i<gstate.projects.size(); i++) {
p = gstate.projects[i];
if (p->non_cpu_intensive) continue;
- if (p->pwf.project_reason) continue;
+ if (p->pwf.cant_fetch_work_reason) continue;
for (int j=0; j<coprocs.n_rsc; j++) {
- if (!p->rsc_pwf[j].rsc_project_reason) {
+ if (p->rsc_pwf[j].may_have_work) {
p->rsc_pwf[j].fetchable_share = rsc_work_fetch[j].total_fetchable_share?p->resource_share/rsc_work_fetch[j].total_fetchable_share:1;
}
}
@@ -944,12 +1030,12 @@ void WORK_FETCH::init() {
PROJECT* p = gstate.projects[i];
if (!p->anonymous_platform) continue;
for (int k=0; k<coprocs.n_rsc; k++) {
- p->rsc_pwf[k].anonymous_platform_no_apps = true;
+ p->rsc_pwf[k].anon_skip = true;
}
for (j=0; j<gstate.app_versions.size(); j++) {
APP_VERSION* avp = gstate.app_versions[j];
if (avp->project != p) continue;
- p->rsc_pwf[avp->gpu_usage.rsc_type].anonymous_platform_no_apps = false;
+ p->rsc_pwf[avp->gpu_usage.rsc_type].anon_skip = false;
}
}
}
@@ -1090,26 +1176,23 @@ void CLIENT_STATE::generate_new_host_cpid() {
}
}
-const char* rsc_project_reason_string(int reason) {
+inline const char* dont_fetch_string(int reason) {
switch (reason) {
- case 0: return "";
case DONT_FETCH_GPUS_NOT_USABLE: return "GPUs not usable";
case DONT_FETCH_PREFS: return "blocked by project preferences";
case DONT_FETCH_CONFIG: return "client configuration";
case DONT_FETCH_NO_APPS: return "no applications";
case DONT_FETCH_AMS: return "account manager prefs";
+ case DONT_FETCH_BACKOFF: return "backoff";
case DONT_FETCH_ZERO_SHARE: return "zero resource share";
case DONT_FETCH_BUFFER_FULL: return "job cache full";
case DONT_FETCH_NOT_HIGHEST_PRIO: return "not highest priority project";
- case DONT_FETCH_BACKED_OFF: return "project is backed off";
- case DONT_FETCH_DEFER_SCHED: return "a job is deferred";
}
- return "unknown project reason";
+ return "";
}
-const char* project_reason_string(PROJECT* p, char* buf) {
- switch (p->pwf.project_reason) {
- case 0: return "";
+const char* cant_fetch_work_string(PROJECT* p, char* buf) {
+ switch (p->pwf.cant_fetch_work_reason) {
case CANT_FETCH_WORK_NON_CPU_INTENSIVE:
return "non CPU intensive";
case CANT_FETCH_WORK_SUSPENDED_VIA_GUI:
@@ -1133,7 +1216,7 @@ const char* project_reason_string(PROJECT* p, char* buf) {
case CANT_FETCH_WORK_DONT_NEED:
if (coprocs.n_rsc == 1) {
sprintf(buf, "don't need (%s)",
- rsc_project_reason_string(rsc_work_fetch[0].dont_fetch_reason)
+ dont_fetch_string(rsc_work_fetch[0].dont_fetch_reason)
);
} else {
string x;
@@ -1142,7 +1225,7 @@ const char* project_reason_string(PROJECT* p, char* buf) {
char buf2[256];
sprintf(buf2, "%s: %s",
rsc_name_long(i),
- rsc_project_reason_string(rsc_work_fetch[i].dont_fetch_reason)
+ dont_fetch_string(rsc_work_fetch[i].dont_fetch_reason)
);
x += buf2;
if (i < coprocs.n_rsc-1) {
@@ -1154,5 +1237,5 @@ const char* project_reason_string(PROJECT* p, char* buf) {
}
return buf;
}
- return "unknown reason";
+ return "";
}
diff --git a/client/work_fetch.h b/client/work_fetch.h
index 6c0ece6..a2d0e23 100644
--- a/client/work_fetch.h
+++ b/client/work_fetch.h
@@ -27,7 +27,7 @@
#define RSC_TYPE_ANY -1
#define RSC_TYPE_CPU 0
-// reasons for not fetching work from a project
+// reasons for not fetching work
//
#define CANT_FETCH_WORK_NON_CPU_INTENSIVE 1
#define CANT_FETCH_WORK_SUSPENDED_VIA_GUI 2
@@ -48,11 +48,10 @@
#define DONT_FETCH_CONFIG 3
#define DONT_FETCH_NO_APPS 4
#define DONT_FETCH_AMS 5
+#define DONT_FETCH_BACKOFF 6
#define DONT_FETCH_ZERO_SHARE 7
#define DONT_FETCH_BUFFER_FULL 8
#define DONT_FETCH_NOT_HIGHEST_PRIO 9
-#define DONT_FETCH_BACKED_OFF 10
-#define DONT_FETCH_DEFER_SCHED 11
struct PROJECT;
struct RESULT;
@@ -61,9 +60,6 @@ struct RSC_WORK_FETCH;
struct SCHEDULER_REPLY;
struct APP_VERSION;
-typedef long long COPROC_INSTANCE_BITMAP;
- // should be at least MAX_COPROC_INSTANCES (64) bits
-
// state per (resource, project) pair
//
struct RSC_PROJECT_WORK_FETCH {
@@ -78,7 +74,7 @@ struct RSC_PROJECT_WORK_FETCH {
}
double queue_est;
// an estimate of instance-secs of queued work;
- bool anonymous_platform_no_apps;
+ bool anon_skip;
// set if this project is anonymous platform
// and it has no app version that uses this resource
double fetchable_share;
@@ -91,7 +87,7 @@ struct RSC_PROJECT_WORK_FETCH {
double nused_total; // sum of instances over all runnable jobs
int ncoprocs_excluded;
// number of excluded instances
- COPROC_INSTANCE_BITMAP non_excluded_instances;
+ int non_excluded_instances;
// bitmap of non-excluded instances
// (i.e. instances this project's jobs can run on)
int deadlines_missed;
@@ -99,17 +95,13 @@ struct RSC_PROJECT_WORK_FETCH {
// copy of the above used during schedule_cpus()
std::deque<RESULT*> pending;
std::deque<RESULT*>::iterator pending_iter;
- bool has_deferred_job;
- // This project has a coproc job of the given type for which
- // the job is deferred because of a temporary_exit() call.
- // Don't fetch more jobs of this type; they might have same problem
RSC_PROJECT_WORK_FETCH() {
backoff_time = 0;
backoff_interval = 0;
secs_this_rec_interval = 0;
queue_est = 0;
- anonymous_platform_no_apps = false;
+ anon_skip = false;
fetchable_share = 0;
n_runnable_jobs = 0;
sim_nused = 0;
@@ -118,7 +110,6 @@ struct RSC_PROJECT_WORK_FETCH {
non_excluded_instances = 0;
deadlines_missed = 0;
deadlines_missed_copy = 0;
- has_deferred_job = false;
}
inline void reset() {
@@ -126,10 +117,10 @@ struct RSC_PROJECT_WORK_FETCH {
backoff_interval = 0;
}
- int rsc_project_reason;
- int compute_rsc_project_reason(PROJECT*, int rsc_type);
+ bool may_have_work;
+ bool compute_may_have_work(PROJECT*, int rsc_type);
void resource_backoff(PROJECT*, const char*);
- void rr_init();
+ void rr_init(PROJECT*, int rsc_type);
void clear_backoff() {
backoff_time = 0;
backoff_interval = 0;
@@ -203,10 +194,10 @@ struct RSC_WORK_FETCH {
// seconds of idle instances between now and now+work_buf_total()
double nidle_now;
double sim_nused;
- COPROC_INSTANCE_BITMAP sim_used_instances;
+ int sim_used_instances;
// bitmap of instances used in simulation,
// taking into account GPU exclusions
- COPROC_INSTANCE_BITMAP sim_excluded_instances;
+ int sim_excluded_instances;
// bitmap of instances not used (i.e. starved because of exclusion)
double total_fetchable_share;
// total RS of projects from which we could fetch jobs for this device
@@ -281,8 +272,8 @@ struct PROJECT_WORK_FETCH {
// temporary copy used during schedule_cpus() and work fetch
double rec_temp_save;
// temporary used during RR simulation
- int project_reason;
- int compute_project_reason(PROJECT*);
+ int cant_fetch_work_reason;
+ int compute_cant_fetch_work_reason(PROJECT*);
int n_runnable_jobs;
bool request_if_idle_and_uploading;
// Set when a job finishes.
@@ -292,8 +283,6 @@ struct PROJECT_WORK_FETCH {
memset(this, 0, sizeof(*this));
}
void reset(PROJECT*);
- void rr_init(PROJECT*);
- void print_state(PROJECT*);
};
// global work fetch state
@@ -316,6 +305,7 @@ struct WORK_FETCH {
void set_all_requests_hyst(PROJECT*, int rsc_type);
void print_state();
void init();
+ void compute_cant_fetch_work_reason();
void rr_init();
void clear_request();
void compute_shares();
@@ -328,13 +318,14 @@ struct WORK_FETCH {
extern RSC_WORK_FETCH rsc_work_fetch[MAX_RSC];
extern WORK_FETCH work_fetch;
+extern void set_no_rsc_config();
+
extern void project_priority_init(bool for_work_fetch);
extern double project_priority(PROJECT*);
extern void adjust_rec_sched(RESULT*);
extern void adjust_rec_work_fetch(RESULT*);
extern double total_peak_flops();
-extern const char* project_reason_string(PROJECT* p, char* buf);
-extern const char* rsc_project_reason_string(int);
+extern const char* cant_fetch_work_string(PROJECT* p, char* buf);
#endif
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index 39e2ece..1a0ca51 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -492,11 +492,9 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
}
}
- if (!pc.ldap_auth) {
- m_pAccountEmailAddressCtrl->SetValidator(
- CValidateEmailAddress(&m_strAccountEmailAddress)
- );
- }
+ m_pAccountEmailAddressCtrl->SetValidator(
+ CValidateEmailAddress(&m_strAccountEmailAddress)
+ );
m_pAccountUsernameCtrl->SetValidator(
wxTextValidator(wxFILTER_NONE, &m_strAccountUsername)
);
@@ -506,15 +504,9 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
m_pAccountUsernameStaticCtrl->Hide();
m_pAccountUsernameCtrl->Hide();
- if (pc.ldap_auth) {
- m_pAccountEmailAddressStaticCtrl->SetLabel(
- _("&Email address or LDAP ID:")
- );
- } else {
- m_pAccountEmailAddressStaticCtrl->SetLabel(
- _("&Email address:")
- );
- }
+ m_pAccountEmailAddressStaticCtrl->SetLabel(
+ _("&Email address:")
+ );
m_pAccountEmailAddressCtrl->SetValue(m_strAccountEmailAddress);
}
diff --git a/clientgui/AccountManagerInfoPage.cpp b/clientgui/AccountManagerInfoPage.cpp
index d38e9b1..4d88ddd 100644
--- a/clientgui/AccountManagerInfoPage.cpp
+++ b/clientgui/AccountManagerInfoPage.cpp
@@ -117,8 +117,8 @@ void CAccountManagerInfoPage::CreateControls()
#define LISTBOXWIDTH 225
#define DESCRIPTIONSWIDTH 350
#else
-#define LISTBOXWIDTH ADJUSTFORXDPI(150)
-#define DESCRIPTIONSWIDTH ADJUSTFORXDPI(310)
+#define LISTBOXWIDTH 150
+#define DESCRIPTIONSWIDTH 200
#endif
CAccountManagerInfoPage* itemWizardPage23 = this;
@@ -142,7 +142,7 @@ void CAccountManagerInfoPage::CreateControls()
itemBoxSizer24->Add(itemFlexGridSizer3, 1, wxGROW|wxALL, 5);
wxArrayString m_pProjectsCtrlStrings;
- m_pProjectListCtrl = new wxListBox( itemWizardPage23, ID_PROJECTS, wxDefaultPosition, wxSize(LISTBOXWIDTH, ADJUSTFORYDPI(175)), m_pProjectsCtrlStrings, wxLB_SINGLE|wxLB_SORT );
+ m_pProjectListCtrl = new wxListBox( itemWizardPage23, ID_PROJECTS, wxDefaultPosition, wxSize(LISTBOXWIDTH, 175), m_pProjectsCtrlStrings, wxLB_SINGLE|wxLB_SORT );
itemFlexGridSizer3->Add(m_pProjectListCtrl, 0, wxGROW|wxRIGHT, 10);
wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(3, 1, 0, 0);
@@ -153,7 +153,7 @@ void CAccountManagerInfoPage::CreateControls()
m_pProjectDetailsStaticCtrl->Create( itemWizardPage23, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer4->Add(m_pProjectDetailsStaticCtrl, 0, wxBOTTOM, 5);
- m_pProjectDetailsDescriptionCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTDESCRIPTION, wxT(""), wxDefaultPosition, wxSize(DESCRIPTIONSWIDTH, ADJUSTFORYDPI(100)), wxTE_MULTILINE|wxTE_READONLY );
+ m_pProjectDetailsDescriptionCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTDESCRIPTION, wxT(""), wxDefaultPosition, wxSize(DESCRIPTIONSWIDTH, 100), wxTE_MULTILINE|wxTE_READONLY );
itemFlexGridSizer4->Add(m_pProjectDetailsDescriptionCtrl, 0, wxGROW);
m_pOpenWebSiteButton = new wxButton( this, ID_PROJECTWEBPAGECTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/clientgui/AccountManagerProcessingPage.cpp b/clientgui/AccountManagerProcessingPage.cpp
index a6b66be..5d6c40e 100644
--- a/clientgui/AccountManagerProcessingPage.cpp
+++ b/clientgui/AccountManagerProcessingPage.cpp
@@ -156,7 +156,7 @@ void CAccountManagerProcessingPage::CreateControls()
wxBitmap itemBitmap41(GetBitmapResource(wxT("res/wizprogress01.xpm")));
m_pProgressIndicator = new wxStaticBitmap;
- m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(ADJUSTFORXDPI(184), ADJUSTFORYDPI(48)), 0 );
+ m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(184, 48), 0 );
itemFlexGridSizer40->Add(m_pProgressIndicator, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxALL, 5);
@@ -421,66 +421,65 @@ void CAccountManagerProcessingPage::FinishProgress(wxStaticBitmap* pBitmap) {
wxBitmap CAccountManagerProcessingPage::GetBitmapResource( const wxString& name )
{
-// TODO: Choose from multiple size images if provided, else resize the closest one
// Bitmap retrieval
if (name == wxT("res/wizprogress01.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress01_xpm));
+ wxBitmap bitmap(wizprogress01_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress02.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress02_xpm));
+ wxBitmap bitmap(wizprogress02_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress03.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress03_xpm));
+ wxBitmap bitmap(wizprogress03_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress04.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress04_xpm));
+ wxBitmap bitmap(wizprogress04_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress05.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress05_xpm));
+ wxBitmap bitmap(wizprogress05_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress06.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress06_xpm));
+ wxBitmap bitmap(wizprogress06_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress07.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress07_xpm));
+ wxBitmap bitmap(wizprogress07_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress08.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress08_xpm));
+ wxBitmap bitmap(wizprogress08_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress09.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress09_xpm));
+ wxBitmap bitmap(wizprogress09_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress10.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress10_xpm));
+ wxBitmap bitmap(wizprogress10_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress11.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress11_xpm));
+ wxBitmap bitmap(wizprogress11_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress12.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress12_xpm));
+ wxBitmap bitmap(wizprogress12_xpm);
return bitmap;
}
return wxNullBitmap;
diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp
index 2d8c38e..ea1c070 100644
--- a/clientgui/AccountManagerPropertiesPage.cpp
+++ b/clientgui/AccountManagerPropertiesPage.cpp
@@ -163,7 +163,7 @@ void CAccountManagerPropertiesPage::CreateControls()
wxBitmap itemBitmap41(GetBitmapResource(wxT("res/wizprogress01.xpm")));
m_pProgressIndicator = new wxStaticBitmap;
- m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(ADJUSTFORXDPI(184), ADJUSTFORYDPI(48)), 0 );
+ m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(184, 48), 0 );
itemFlexGridSizer40->Add(m_pProgressIndicator, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxGROW|wxALL, 5);
@@ -483,66 +483,65 @@ void CAccountManagerPropertiesPage::FinishProgress(wxStaticBitmap* pBitmap) {
wxBitmap CAccountManagerPropertiesPage::GetBitmapResource( const wxString& name )
{
-// TODO: Choose from multiple size images if provided, else resize the closest one
// Bitmap retrieval
if (name == wxT("res/wizprogress01.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress01_xpm));
+ wxBitmap bitmap(wizprogress01_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress02.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress02_xpm));
+ wxBitmap bitmap(wizprogress02_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress03.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress03_xpm));
+ wxBitmap bitmap(wizprogress03_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress04.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress04_xpm));
+ wxBitmap bitmap(wizprogress04_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress05.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress05_xpm));
+ wxBitmap bitmap(wizprogress05_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress06.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress06_xpm));
+ wxBitmap bitmap(wizprogress06_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress07.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress07_xpm));
+ wxBitmap bitmap(wizprogress07_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress08.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress08_xpm));
+ wxBitmap bitmap(wizprogress08_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress09.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress09_xpm));
+ wxBitmap bitmap(wizprogress09_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress10.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress10_xpm));
+ wxBitmap bitmap(wizprogress10_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress11.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress11_xpm));
+ wxBitmap bitmap(wizprogress11_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress12.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress12_xpm));
+ wxBitmap bitmap(wizprogress12_xpm);
return bitmap;
}
return wxNullBitmap;
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 34d4dec..be0dae8 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -53,7 +53,6 @@
#include "DlgDiagnosticLogFlags.h"
#include "DlgGenericMessage.h"
#include "DlgEventLog.h"
-#include "browser.h"
#include "wizardex.h"
#include "BOINCBaseWizard.h"
#include "WizardAttach.h"
@@ -62,6 +61,7 @@
#include "res/connect.xpm"
#include "res/disconnect.xpm"
+
enum STATUSBARFIELDS {
STATUS_TEXT,
STATUS_CONNECTION_STATUS
@@ -355,8 +355,7 @@ bool CAdvancedFrame::CreateMenu() {
#ifdef __WXMAC__
menuFile->Append(
- wxID_PREFERENCES,
- _("Preferences…")
+ wxID_PREFERENCES
);
#endif
@@ -617,6 +616,7 @@ bool CAdvancedFrame::CreateMenu() {
_("Enable or disable various diagnostic messages")
);
+
// Help menu
wxMenu *menuHelp = new wxMenu;
@@ -719,6 +719,10 @@ bool CAdvancedFrame::CreateMenu() {
// Force a redraw of the menu under Ubuntu's new interface
SendSizeEvent();
#endif
+#ifdef __WXMAC__
+ m_pMenubar->MacInstallMenuBar();
+ MacLocalizeBOINCMenu();
+#endif
if (m_pOldMenubar) {
delete m_pOldMenubar;
}
@@ -801,12 +805,12 @@ bool CAdvancedFrame::CreateNotebookPage( CBOINCBaseView* pwndNewNotebookPage) {
pImageList = m_pNotebook->GetImageList();
if (!pImageList) {
- pImageList = new wxImageList(ADJUSTFORXDPI(16), ADJUSTFORYDPI(16), true, 0);
+ pImageList = new wxImageList(16, 16, true, 0);
wxASSERT(pImageList != NULL);
m_pNotebook->SetImageList(pImageList);
}
- iImageIndex = pImageList->Add(GetScaledBitmapFromXPMData(pwndNewNotebookPage->GetViewIcon()));
+ iImageIndex = pImageList->Add(wxBitmap(pwndNewNotebookPage->GetViewIcon()));
m_pNotebook->AddPage(pwndNewNotebookPage, pwndNewNotebookPage->GetViewDisplayName(), TRUE, iImageIndex);
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateNotebookPage - Function End"));
@@ -1665,12 +1669,6 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxString strTeamName = wxEmptyString;
wxString strDialogTitle = wxEmptyString;
wxString strDialogDescription = wxEmptyString;
- std::string strProjectName;
- std::string strProjectURL;
- std::string strProjectAuthenticator;
- std::string strProjectInstitution;
- std::string strProjectDescription;
- std::string strProjectKnown;
bool bCachedCredentials = false;
ACCT_MGR_INFO ami;
PROJECT_INIT_STATUS pis;
@@ -1728,35 +1726,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
pDoc->rpc.get_project_init_status(pis);
pDoc->rpc.acct_mgr_info(ami);
- if (detect_simple_account_credentials(
- strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown
- )
- ){
- wasShown = IsShown();
- Show();
- wasVisible = wxGetApp().IsApplicationVisible();
- if (!wasVisible) {
- wxGetApp().ShowApplication(true);
- }
-
- pWizard = new CWizardAttach(this);
-
- if (pWizard->RunSimpleProjectAttach(
- wxURI::Unescape(strProjectName),
- wxURI::Unescape(strProjectURL),
- wxURI::Unescape(strProjectAuthenticator),
- wxURI::Unescape(strProjectInstitution),
- wxURI::Unescape(strProjectDescription),
- wxURI::Unescape(strProjectKnown)
- )
- ) {
- // If successful, display the projects tab
- m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
- } else {
- // If failure, display the notices tab
- m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
- }
- } else if (ami.acct_mgr_url.size() && ami.have_credentials) {
+ if (ami.acct_mgr_url.size() && ami.have_credentials) {
// Fall through
//
// There isn't a need to bring up the attach wizard, the account manager will
diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
index c638824..dc50edb 100644
--- a/clientgui/AsyncRPC.cpp
+++ b/clientgui/AsyncRPC.cpp
@@ -256,7 +256,7 @@ int RPCThread::ProcessRPCRequest() {
case RPC_GET_SIMPLE_GUI_INFO2:
// RPC_GET_SIMPLE_GUI_INFO2 is equivalent to doing both
// RPC_GET_PROJECT_STATUS1 and RPC_GET_RESULTS
- retval = (m_pDoc->rpcClient).get_results(*(RESULTS*)(current_request->arg3), *(bool*)(current_request->arg4));
+ retval = (m_pDoc->rpcClient).get_results(*(RESULTS*)(current_request->arg3));
if (!retval) {
retval = (m_pDoc->rpcClient).get_project_status(*(PROJECTS*)(current_request->arg1));
}
diff --git a/clientgui/AsyncRPC.h b/clientgui/AsyncRPC.h
index 0788bd6..2fe79cc 100644
--- a/clientgui/AsyncRPC.h
+++ b/clientgui/AsyncRPC.h
@@ -236,8 +236,8 @@ public:
{ return RPC_Wait(RPC_GET_FILE_TRANSFERS, (void*)&arg1); }
int get_simple_gui_info(SIMPLE_GUI_INFO& arg1)
{ return RPC_Wait(RPC_GET_SIMPLE_GUI_INFO1, (void*)&arg1); }
- int get_simple_gui_info(PROJECTS& arg1, CC_STATE& ccbuf, RESULTS& rbuf, bool& activeTasksOnly)
- { return RPC_Wait(RPC_GET_SIMPLE_GUI_INFO2, (void*)&arg1, (void*)&ccbuf, (void*)&rbuf, (void*)&activeTasksOnly); }
+ int get_simple_gui_info(PROJECTS& arg1, CC_STATE& ccbuf, RESULTS& rbuf)
+ { return RPC_Wait(RPC_GET_SIMPLE_GUI_INFO2, (void*)&arg1, (void*)&ccbuf, (void*)&rbuf); }
int get_project_status(PROJECTS& arg1, CC_STATE& arg2)
{ return RPC_Wait(RPC_GET_PROJECT_STATUS1, (void*)&arg1, (void*)&arg2); }
int get_project_status(PROJECTS& arg1)
diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp
index ebf6d33..287577a 100644
--- a/clientgui/BOINCBaseView.cpp
+++ b/clientgui/BOINCBaseView.cpp
@@ -316,25 +316,6 @@ bool CBOINCBaseView::OnSaveState(wxConfigBase* pConfig) {
bReturnValue = false;
}
- // Save Column Order
-#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
- wxString strColumnOrder;
- wxString strBuffer;
- wxArrayInt aOrder(m_pListPane->GetColumnCount());
-
- aOrder = m_pListPane->GetColumnsOrder();
-
- strColumnOrder.Printf(wxT("%s"), m_aStdColNameOrder->Item(aOrder[0]));
-
- for (int i = 1; i < aOrder.Count(); ++i)
- {
- strBuffer.Printf(wxT(";%s"), m_aStdColNameOrder->Item(aOrder[i]));
- strColumnOrder += strBuffer;
- }
-
- pConfig->Write(wxT("ColumnOrder"), strColumnOrder);
-#endif
-
return bReturnValue;
}
@@ -351,16 +332,6 @@ bool CBOINCBaseView::OnRestoreState(wxConfigBase* pConfig) {
if (!m_pListPane->OnRestoreState(pConfig)) {
return false;
}
-
- // Restore Column Order
-#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
- wxString strColumnOrder;
-
- if (pConfig->Read(wxT("ColumnOrder"), &strColumnOrder)) {
- SetListColumnOrder(strColumnOrder, ";");
- }
-#endif
-
return true;
}
@@ -812,46 +783,6 @@ void CBOINCBaseView::RefreshTaskPane() {
}
-void CBOINCBaseView::TokenizedStringToArray(wxString tokenized, char * delimiters, wxArrayString* array) {
- wxString name;
-
- array->Clear();
- wxStringTokenizer tok(tokenized, delimiters);
- while (tok.HasMoreTokens())
- {
- name = tok.GetNextToken();
- if (name.IsEmpty()) continue;
- array->Add(name);
- }
-}
-
-
-void CBOINCBaseView::SetListColumnOrder(wxString tokenized, char * delimiters) {
-#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
- wxArrayString orderArray;
- int i, j, stdCount, orderCount;
- int colCount = m_pListPane->GetColumnCount();
- wxArrayInt aOrder(colCount);
-
- TokenizedStringToArray(tokenized, delimiters, &orderArray);
- stdCount = m_aStdColNameOrder->GetCount();
- wxASSERT(stdCount == colCount);
-
- orderCount = orderArray.GetCount();
- wxASSERT(orderCount == colCount); // Temporary until selective hiding implemented
-
- for (i=0; i<orderCount; ++i) {
- for (j=0; j<stdCount; ++j) {
- if (orderArray[i].IsSameAs(m_aStdColNameOrder->Item(j))) {
- aOrder[i] = j;
- }
- }
- }
- m_pListPane->SetColumnsOrder(aOrder);
-#endif
-}
-
-
#ifdef __WXMAC__
// Fix Keyboard navigation on Mac
//
diff --git a/clientgui/BOINCBaseView.h b/clientgui/BOINCBaseView.h
index d837793..0b40d84 100644
--- a/clientgui/BOINCBaseView.h
+++ b/clientgui/BOINCBaseView.h
@@ -124,9 +124,6 @@ public:
void ClearSavedSelections();
void ClearSelections();
void RefreshTaskPane();
-
- void TokenizedStringToArray(wxString tokenized, char * delimiters, wxArrayString* array);
- void SetListColumnOrder(wxString tokenized, char * delimiters);
#ifdef __WXMAC__
CBOINCListCtrl* GetListCtrl() { return m_pListPane; }
@@ -137,8 +134,7 @@ public:
int m_iSortColumn;
bool m_bReverseSort;
- wxArrayString* m_aStdColNameOrder;
-
+
private:
wxArrayString m_arrSelectedKeys1; //array for remembering the current selected rows by primary key column value
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 31dc7a6..bf55d7e 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -412,8 +412,6 @@ bool CBOINCGUIApp::OnInit() {
wxSystemOptions::SetOption(wxT("msw.staticbox.optimized-paint"), 0);
#endif
#ifdef __WXMAC__
- bool launchedFromLogin = false;
-
// In wxMac-2.8.7, default wxListCtrl::RefreshItem() does not work
// so use traditional generic implementation.
// This has been fixed in wxMac-2.8.8, but the Mac native implementation:
@@ -647,36 +645,6 @@ bool CBOINCGUIApp::OnInit() {
}
#endif
-#ifdef __WXMAC__
- ProcessSerialNumber psn;
- ProcessInfoRec pInfo;
- OSStatus err;
-
- memset(&pInfo, 0, sizeof(pInfo));
- pInfo.processInfoLength = sizeof( ProcessInfoRec );
- err = GetProcessInformation(&m_psnCurrentProcess, &pInfo);
- if (!err) {
- psn = pInfo.processLauncher;
- memset(&pInfo, 0, sizeof(pInfo));
- pInfo.processInfoLength = sizeof( ProcessInfoRec );
- err = GetProcessInformation(&psn, &pInfo);
- }
- // Don't open main window if we were started automatically at login
- if (pInfo.processSignature == 'lgnw') { // Login Window app
- launchedFromLogin = true;
-
- // Prevent a situation where wxSingleInstanceChecker lock file
- // from last login auto start (with same pid) was not deleted.
- // This path must match that in DetectDuplicateInstance()
- wxString lockFilePath = wxString(wxFileName::GetHomeDir() +
- "/Library/Application Support/BOINC/" +
- wxTheApp->GetAppName() +
- '-' + wxGetUserId()
- );
- boinc_delete_file(lockFilePath.utf8_str());
- }
-#endif
-
// Detect if BOINC Manager is already running, if so, bring it into the
// foreground and then exit.
if (DetectDuplicateInstance()) {
@@ -725,7 +693,21 @@ bool CBOINCGUIApp::OnInit() {
IdleTrackerAttach();
#ifdef __WXMAC__
- if (launchedFromLogin) {
+ ProcessSerialNumber psn;
+ ProcessInfoRec pInfo;
+ OSStatus err;
+
+ memset(&pInfo, 0, sizeof(pInfo));
+ pInfo.processInfoLength = sizeof( ProcessInfoRec );
+ err = GetProcessInformation(&m_psnCurrentProcess, &pInfo);
+ if (!err) {
+ psn = pInfo.processLauncher;
+ memset(&pInfo, 0, sizeof(pInfo));
+ pInfo.processInfoLength = sizeof( ProcessInfoRec );
+ err = GetProcessInformation(&psn, &pInfo);
+ }
+ // Don't open main window if we were started automatically at login
+ if (pInfo.processSignature == 'lgnw') { // Login Window app
m_bGUIVisible = false;
// If the system was just started, we usually get a "Connection
@@ -837,16 +819,6 @@ int CBOINCGUIApp::OnExit() {
void CBOINCGUIApp::OnEndSession(wxCloseEvent& ) {
s_bSkipExitConfirmation = true;
- // On Windows Vista with UAC turned on, we have to spawn a new process to change the
- // state of a service. When Windows is shutting down it'll prevent new processes from
- // being created. Sometimes it'll present a crash dialog for the newly spawned application.
- //
- // So, we will just let the OS shutdown the service via the service control manager.
- //
- if (m_iShutdownCoreClient && m_pDocument->m_pClientManager->IsBOINCConfiguredAsDaemon()) {
- m_iShutdownCoreClient = false;
- }
-
CBOINCBaseFrame* pFrame = wxGetApp().GetFrame();
wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, wxID_EXIT);
// The event loop has already been stopped,
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 3f226af..680347c 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -509,12 +509,10 @@ wxMenu *CTaskBarIcon::BuildContextMenu() {
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
// Prevent recursive entry of CMainDocument::RequestRPC()
- if (!pDoc->WaitingForRPC()) {
- if (pDoc->IsConnected()) {
- // Account managers have a different menu arrangement
- pDoc->rpc.acct_mgr_info(ami);
- is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
- }
+ if (!pDoc->WaitingForRPC()) {
+ // Account managers have a different menu arrangement
+ pDoc->rpc.acct_mgr_info(ami);
+ is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
}
if (is_acct_mgr_detected) {
diff --git a/clientgui/BOINCTaskCtrl.cpp b/clientgui/BOINCTaskCtrl.cpp
index 064e59b..551bbf0 100644
--- a/clientgui/BOINCTaskCtrl.cpp
+++ b/clientgui/BOINCTaskCtrl.cpp
@@ -22,10 +22,9 @@
#include "stdwx.h"
#include "BOINCBaseView.h"
#include "BOINCTaskCtrl.h"
-#include "MainDocument.h"
-#define TASKPANEWIDTH ADJUSTFORXDPI(200)
-#define TASKBUTTONWIDTH ADJUSTFORXDPI(TASKPANEWIDTH - 55)
+#define TASKPANEWIDTH 200
+#define TASKBUTTONWIDTH (TASKPANEWIDTH - 55)
IMPLEMENT_DYNAMIC_CLASS(CBOINCTaskCtrl, wxScrolledWindow)
diff --git a/clientgui/CompletionPage.cpp b/clientgui/CompletionPage.cpp
index 48550b8..354a6a5 100644
--- a/clientgui/CompletionPage.cpp
+++ b/clientgui/CompletionPage.cpp
@@ -285,7 +285,7 @@ void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
// Is this supposed to be completely automated?
// If so, then go ahead and close the wizard down now.
- if (pWAP->m_bCloseWhenCompleted) {
+ if (pWAP->close_when_completed) {
pWAP->SimulateNextButton();
}
}
diff --git a/clientgui/DlgAdvPreferences.cpp b/clientgui/DlgAdvPreferences.cpp
index 1a3ec56..715d7a3 100644
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
@@ -71,25 +71,20 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
int iImageIndex = 0;
wxImageList* pImageList = m_Notebook->GetImageList();
if (!pImageList) {
- pImageList = new wxImageList(ADJUSTFORXDPI(16), ADJUSTFORYDPI(16), true, 0);
+ pImageList = new wxImageList(16, 16, true, 0);
wxASSERT(pImageList != NULL);
m_Notebook->SetImageList(pImageList);
}
- iImageIndex = pImageList->Add(GetScaledBitmapFromXPMData(proj_xpm));
+ iImageIndex = pImageList->Add(wxBitmap(proj_xpm));
m_Notebook->SetPageImage(0,iImageIndex);
- iImageIndex = pImageList->Add(GetScaledBitmapFromXPMData(xfer_xpm));
+ iImageIndex = pImageList->Add(wxBitmap(xfer_xpm));
m_Notebook->SetPageImage(1,iImageIndex);
- iImageIndex = pImageList->Add(GetScaledBitmapFromXPMData(usage_xpm));
+ iImageIndex = pImageList->Add(wxBitmap(usage_xpm));
m_Notebook->SetPageImage(2,iImageIndex);
-#ifdef __WXMSW__
- wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
- iImageIndex = pImageList->Add(pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER));
-#else
iImageIndex = pImageList->Add(pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(wxSize(16,16)));
-#endif
m_Notebook->SetPageImage(3,iImageIndex);
//setting warning bitmap
@@ -107,17 +102,18 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
RestoreState();
#ifdef __WXMSW__
- int tabStart = 0, tabwidth = 0;
+ int margin = 0, tabwidth = 0;
RECT r;
BOOL success = TabCtrl_GetItemRect(m_Notebook->GetHWND(), 0, &r);
if (success) {
- tabStart = r.left;
+ margin = r.left;
}
success = TabCtrl_GetItemRect(m_Notebook->GetHWND(), m_Notebook->GetPageCount()-1, &r);
if (success) {
- tabwidth = r.right - tabStart + ADJUSTFORXDPI(4);
+ tabwidth += r.right;
}
+ tabwidth += margin;
wxSize sz = m_Notebook->GetBestSize();
if (sz.x < tabwidth) {
sz.x = tabwidth;
@@ -125,9 +121,8 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
}
#endif
- Layout();
+ this->Layout();
Fit();
- Centre();
}
/* destructor */
diff --git a/clientgui/DlgDiagnosticLogFlags.cpp b/clientgui/DlgDiagnosticLogFlags.cpp
index 816da45..67ca0bc 100755
--- a/clientgui/DlgDiagnosticLogFlags.cpp
+++ b/clientgui/DlgDiagnosticLogFlags.cpp
@@ -30,10 +30,8 @@
#include "SkinManager.h"
-#define DLGDIAGNOSTICS_INITIAL_WIDTH ADJUSTFORXDPI(480)
-#define DLGDIAGNOSTICS_INITIAL_HEIGHT ADJUSTFORYDPI(480)
-#define DLGDIAGNOSTICS_MIN_WIDTH ADJUSTFORXDPI(400)
-#define DLGDIAGNOSTICS_MIN_HEIGHT ADJUSTFORYDPI(400)
+#define DLGDIAGNOSTICS_INITIAL_SIZE 480
+#define DLGDIAGNOSTICS_MIN_SIZE 400
IMPLEMENT_DYNAMIC_CLASS(CDlgDiagnosticLogFlags, wxDialog)
@@ -47,7 +45,7 @@ END_EVENT_TABLE()
/* Constructor */
CDlgDiagnosticLogFlags::CDlgDiagnosticLogFlags(wxWindow* parent) :
wxDialog( parent, ID_ANYDIALOG, wxEmptyString, wxDefaultPosition,
- wxSize( DLGDIAGNOSTICS_INITIAL_WIDTH,DLGDIAGNOSTICS_INITIAL_HEIGHT ),
+ wxSize( DLGDIAGNOSTICS_INITIAL_SIZE,DLGDIAGNOSTICS_INITIAL_SIZE ),
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
) {
@@ -73,7 +71,7 @@ CDlgDiagnosticLogFlags::CDlgDiagnosticLogFlags(wxWindow* parent) :
m_cc_config.defaults();
pDoc->rpc.get_cc_config(m_cc_config, log_flags);
- SetSizeHints(DLGDIAGNOSTICS_MIN_WIDTH, DLGDIAGNOSTICS_MIN_HEIGHT);
+ SetSizeHints( wxDefaultSize, wxDefaultSize );
SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
wxBoxSizer* bSizer1 = new wxBoxSizer( wxVERTICAL );
@@ -118,6 +116,8 @@ CDlgDiagnosticLogFlags::CDlgDiagnosticLogFlags(wxWindow* parent) :
SetSizer( bSizer1 );
+ SetSizeHints(DLGDIAGNOSTICS_MIN_SIZE, DLGDIAGNOSTICS_MIN_SIZE);
+
RestoreState();
Layout();
Center( wxBOTH );
@@ -200,15 +200,15 @@ bool CDlgDiagnosticLogFlags::RestoreState() {
pConfig->SetPath("/DlgDiagnosticLogFlags/");
- pConfig->Read(wxT("Width"), &iWidth, DLGDIAGNOSTICS_INITIAL_WIDTH);
- pConfig->Read(wxT("Height"), &iHeight, DLGDIAGNOSTICS_INITIAL_HEIGHT);
+ pConfig->Read(wxT("Width"), &iWidth, DLGDIAGNOSTICS_INITIAL_SIZE);
+ pConfig->Read(wxT("Height"), &iHeight, DLGDIAGNOSTICS_INITIAL_SIZE);
// Guard against a rare situation where registry values are zero
- if ((iWidth < 50) && (iWidth != wxDefaultCoord)) iWidth = DLGDIAGNOSTICS_INITIAL_WIDTH;
- if ((iHeight < 50) && (iHeight != wxDefaultCoord)) iHeight = DLGDIAGNOSTICS_INITIAL_HEIGHT;
+ if ((iWidth < 50) && (iWidth != wxDefaultCoord)) iWidth = DLGDIAGNOSTICS_INITIAL_SIZE;
+ if ((iHeight < 50) && (iHeight != wxDefaultCoord)) iHeight = DLGDIAGNOSTICS_INITIAL_SIZE;
// Set size to saved values or defaults if no saved values
- SetSize(std::max(iWidth, DLGDIAGNOSTICS_MIN_WIDTH), std::max(iHeight, DLGDIAGNOSTICS_MIN_HEIGHT));
+ SetSize(std::max(iWidth, DLGDIAGNOSTICS_MIN_SIZE), std::max(iHeight, DLGDIAGNOSTICS_MIN_SIZE));
return true;
}
diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index 79feef7..1cdef6a 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -37,6 +37,7 @@
#include "DlgEventLog.h"
#include "AdvancedFrame.h"
#include "DlgDiagnosticLogFlags.h"
+#include <wx/display.h>
#ifdef __WXMAC__
#include <time.h>
@@ -48,10 +49,6 @@
////@begin XPM images
////@end XPM images
-#define DLGEVENTLOG_INITIAL_WIDTH ADJUSTFORXDPI(640)
-#define DLGEVENTLOG_INITIAL_HEIGHT ADJUSTFORYDPI(480)
-#define DLGEVENTLOG_MIN_WIDTH ADJUSTFORXDPI(600)
-#define DLGEVENTLOG_MIN_HEIGHT ADJUSTFORYDPI(250)
#define COLUMN_PROJECT 0
#define COLUMN_TIME 1
@@ -175,10 +172,8 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
#ifdef __WXMSW__
// Get the current display space for the current window
int iDisplay = wxNOT_FOUND;
- if ( wxGetApp().GetFrame() != NULL )
- iDisplay = wxDisplay::GetFromWindow(wxGetApp().GetFrame());
- if ( iDisplay == wxNOT_FOUND )
- iDisplay = 0;
+ if ( wxGetApp().GetFrame() != NULL ) iDisplay = wxDisplay::GetFromWindow(wxGetApp().GetFrame());
+ if ( iDisplay == wxNOT_FOUND ) iDisplay = 0;
wxDisplay *display = new wxDisplay(iDisplay);
wxRect rDisplay = display->GetClientArea();
@@ -203,6 +198,7 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
delete display;
#endif
+
#ifdef __WXMAC__
// If the user has changed the arrangement of multiple
// displays, make sure the window title bar is still on-screen.
@@ -217,7 +213,6 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
wxDialog::Create( parent, id, caption, oTempPoint, oTempSize, style );
- SetSizeHints(DLGEVENTLOG_MIN_WIDTH, DLGEVENTLOG_MIN_HEIGHT);
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
// Initialize Application Title
@@ -783,16 +778,16 @@ void CDlgEventLog::GetWindowDimensions( wxPoint& position, wxSize& size ) {
pConfig->Read(wxT("YPos"), &iTop, 30);
pConfig->Read(wxT("XPos"), &iLeft, 30);
- pConfig->Read(wxT("Width"), &iWidth, DLGEVENTLOG_INITIAL_WIDTH);
- pConfig->Read(wxT("Height"), &iHeight, DLGEVENTLOG_INITIAL_HEIGHT);
+ pConfig->Read(wxT("Width"), &iWidth, 640);
+ pConfig->Read(wxT("Height"), &iHeight, 480);
// Guard against a rare situation where registry values are zero
- if (iWidth < 50) iWidth = DLGEVENTLOG_INITIAL_WIDTH;
- if (iHeight < 50) iHeight = DLGEVENTLOG_INITIAL_HEIGHT;
+ if (iWidth < 50) iWidth = 640;
+ if (iHeight < 50) iHeight = 480;
position.y = iTop;
position.x = iLeft;
- size.x = std::max(iWidth, DLGEVENTLOG_MIN_WIDTH);
- size.y = std::max(iHeight, DLGEVENTLOG_MIN_HEIGHT);
+ size.x = iWidth;
+ size.y = iHeight;
}
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index 42724c0..791922e 100644
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -71,6 +71,8 @@ CDlgItemProperties::CDlgItemProperties(wxWindow* parent) :
SetSizer( m_bSizer1 );
Layout();
+ Centre( wxBOTH );
+
m_current_row=0;
int currentTabView = pFrame->GetCurrentViewPage();
@@ -104,87 +106,59 @@ bool CDlgItemProperties::SaveState() {
pConfig->SetPath(m_strBaseConfigLocation);
pConfig->Write(wxT("Width"), GetSize().GetWidth());
pConfig->Write(wxT("Height"), GetSize().GetHeight());
+#ifdef __WXMAC__
pConfig->Write(wxT("XPos"), GetPosition().x);
pConfig->Write(wxT("YPos"), GetPosition().y);
+#endif
pConfig->Flush();
return true;
}
-/* restores former dialog size and position */
+/* restores former dialog size and (on Mac) position */
bool CDlgItemProperties::RestoreState() {
- wxConfigBase* pConfig = wxConfigBase::Get(FALSE);
- wxPoint oTempPoint;
- wxSize oTempSize;
+ wxConfigBase* pConfig = wxConfigBase::Get(FALSE);
+ int iWidth, iHeight;
wxASSERT(pConfig);
if (!pConfig) return false;
pConfig->SetPath(m_strBaseConfigLocation);
- pConfig->Read(wxT("YPos"), &oTempPoint.y, wxDefaultCoord);
- pConfig->Read(wxT("XPos"), &oTempPoint.x, wxDefaultCoord);
- pConfig->Read(wxT("Width"), &oTempSize.x, wxDefaultCoord);
- pConfig->Read(wxT("Height"), &oTempSize.y, wxDefaultCoord);
+ pConfig->Read(wxT("Width"), &iWidth, wxDefaultCoord);
+ pConfig->Read(wxT("Height"), &iHeight, wxDefaultCoord);
// Guard against a rare situation where registry values are zero
- if ((oTempSize.x < 50) && (oTempSize.x != wxDefaultCoord)) oTempSize.x = wxDefaultCoord;
- if ((oTempSize.y < 50) && (oTempSize.y != wxDefaultCoord)) oTempSize.y = wxDefaultCoord;
-
+ if ((iWidth < 50) && (iWidth != wxDefaultCoord)) iWidth = wxDefaultCoord;
+ if ((iHeight < 50) && (iHeight != wxDefaultCoord)) iHeight = wxDefaultCoord;
+
+#ifndef __WXMAC__
+ // Set size to saved values or defaults if no saved values
+ SetSize(iWidth, iHeight);
+#else
+ int iTop, iLeft;
+
+ pConfig->Read(wxT("YPos"), &iTop, wxDefaultCoord);
+ pConfig->Read(wxT("XPos"), &iLeft, wxDefaultCoord);
+
// If either co-ordinate is less then 0 then set it equal to 0 to ensure
// it displays on the screen.
- if ((oTempPoint.x < 0) && (oTempPoint.x != wxDefaultCoord)) oTempPoint.x = wxDefaultCoord;
- if ((oTempPoint.y < 0) && (oTempPoint.y != wxDefaultCoord)) oTempPoint.y = wxDefaultCoord;
+ if ((iLeft < 0) && (iLeft != wxDefaultCoord)) iLeft = 30;
+ if ((iTop < 0) && (iTop != wxDefaultCoord)) iTop = 30;
// Set size and position to saved values or defaults if no saved values
- SetSize(oTempPoint.x, oTempPoint.y, oTempSize.x, oTempSize.y, wxSIZE_USE_EXISTING);
+ SetSize(iLeft, iTop, iWidth, iHeight, wxSIZE_USE_EXISTING);
// Now make sure window is on screen
- oTempPoint = GetScreenPosition();
- oTempSize = GetSize();
-
-#ifdef __WXMSW__
- // Get the current display space for the current window
- int iDisplay = wxNOT_FOUND;
- if ( wxGetApp().GetFrame() != NULL )
- iDisplay = wxDisplay::GetFromWindow(this);
- if ( iDisplay == wxNOT_FOUND )
- iDisplay = 0;
- wxDisplay *display = new wxDisplay(iDisplay);
- wxRect rDisplay = display->GetClientArea();
-
- // Check that the saved height and width is not larger than the displayable space.
- // If it is, then reduce the size.
- if ( oTempSize.GetWidth() > rDisplay.width ) oTempSize.SetWidth(rDisplay.width);
- if ( oTempSize.GetHeight() > rDisplay.height ) oTempSize.SetHeight(rDisplay.height);
-
- // Check if part of the display was going to be off the screen, if so, center the
- // display on that axis
- if ( oTempPoint.x < rDisplay.x ) {
- oTempPoint.x = rDisplay.x;
- } else if ( oTempPoint.x + oTempSize.GetWidth() > rDisplay.x + rDisplay.width ) {
- oTempPoint.x = rDisplay.x + rDisplay.width - oTempSize.GetWidth();
- }
-
- if ( oTempPoint.y < rDisplay.y ) {
- oTempPoint.y = rDisplay.y;
- } else if ( oTempPoint.y + oTempSize.GetHeight() > rDisplay.y + rDisplay.height ) {
- oTempPoint.y = rDisplay.y + rDisplay.height - oTempSize.GetHeight();
- }
-
- delete display;
-#endif
-#ifdef __WXMAC__
- // If the user has changed the arrangement of multiple
- // displays, make sure the window title bar is still on-screen.
- if (!IsWindowOnScreen(oTempPoint.x, oTempPoint.y, oTempSize.GetWidth(), oTempSize.GetHeight())) {
- oTempPoint.y = oTempPoint.x = 30;
- }
-#endif // ! __WXMAC__
+ GetScreenPosition(&iLeft, &iTop);
+ GetSize(&iWidth, &iHeight);
- // Set size and position to saved values or defaults if no saved values
- SetSize(oTempPoint.x, oTempPoint.y, oTempSize.x, oTempSize.y, wxSIZE_USE_EXISTING);
+ if (!IsWindowOnScreen(iLeft, iTop, iWidth, iHeight)) {
+ iTop = iLeft = 30;
+ SetSize(iLeft, iTop, iWidth, iHeight, wxSIZE_USE_EXISTING);
+ }
+#endif
return true;
}
diff --git a/clientgui/Events.h b/clientgui/Events.h
index 3927200..0e648f7 100644
--- a/clientgui/Events.h
+++ b/clientgui/Events.h
@@ -87,7 +87,6 @@
#define ID_EVENTLOG 6058
#define ID_LAUNCHNEWINSTANCE 6059
#define ID_DIAGNOSTICLOGFLAGS 6060
-#define ID_TEST1CLICKATTACH 6061
// Help Menu
#define ID_HELPBOINC 6035 // Locked: Used by manager_links.php
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 2c3845e..2f8dd65 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -1148,7 +1148,6 @@ void CMainDocument::RunPeriodicRPCs(int frameRefreshRate) {
request.arg1 = &async_projects_update_buf;
request.arg2 = &state;
request.arg3 = &async_results_buf;
- request.arg4 = &m_ActiveTasksOnly;
request.exchangeBuf = &results;
request.rpcType = RPC_TYPE_ASYNC_WITH_REFRESH_AFTER;
request.completionTime = &m_dtCachedSimpleGUITimestamp;
@@ -2391,7 +2390,7 @@ int CMainDocument::CachedSimpleGUIUpdate(bool bForce) {
if (m_dtCachedSimpleGUITimestamp.IsEqualTo(wxDateTime((time_t)0))) bForce = true;
if (bForce) {
m_dtCachedSimpleGUITimestamp = wxDateTime::Now();
- m_iGet_simple_gui2_rpc_result = rpc.get_simple_gui_info(async_projects_update_buf, state, results, m_ActiveTasksOnly);
+ m_iGet_simple_gui2_rpc_result = rpc.get_simple_gui_info(async_projects_update_buf, state, results);
}
if (m_iGet_simple_gui2_rpc_result) {
@@ -2518,7 +2517,11 @@ wxString result_description(RESULT* result, bool show_resources) {
} else if (result->needs_shmem) {
strBuffer += _("Waiting for shared memory");
} else if (result->scheduler_state == CPU_SCHED_SCHEDULED) {
- strBuffer += _("Running");
+ if (result->edf_scheduled) {
+ strBuffer += _("Running, high priority");
+ } else {
+ strBuffer += _("Running");
+ }
if (project && project->non_cpu_intensive) {
strBuffer += _(" (non-CPU-intensive)");
}
@@ -2535,14 +2538,15 @@ wxString result_description(RESULT* result, bool show_resources) {
}
if (result->scheduler_wait) {
if (strlen(result->scheduler_wait_reason)) {
- strBuffer = _("Postponed: ");
+ strBuffer += _(" (Scheduler wait: ");
strBuffer += wxString(result->scheduler_wait_reason, wxConvUTF8);
+ strBuffer += _(")");
} else {
- strBuffer = _("Postponed");
+ strBuffer += _(" (Scheduler wait)");
}
}
if (result->network_wait) {
- strBuffer = _("Waiting for network access");
+ strBuffer += _(" (Waiting for network access)");
}
break;
case RESULT_COMPUTE_ERROR:
@@ -2622,8 +2626,8 @@ static void hsv2rgb(
void color_cycle(int i, int n, wxColour& color) {
double h = (double)i/(double)n;
double r, g, b;
- double v = .75;
- if (n > 6) v = .6 + (i % 3)*.1;
+ double v = .6;
+ if (n > 6) v = .5 + (i % 3)*.125;
// cycle through 3 different brightnesses
hsv2rgb(h*6, .5, v, r, g, b);
unsigned char cr = (unsigned char) (r*256);
@@ -2631,56 +2635,3 @@ void color_cycle(int i, int n, wxColour& color) {
unsigned char cb = (unsigned char) (b*256);
color = wxColour(cr, cg, cb);
}
-
-#ifdef __WXMSW__
-static float XDPIScaleFactor = 0.0;
-static float YDPIScaleFactor = 0.0;
-
-void GetDPIScaling() {
- XDPIScaleFactor = 1.0;
- YDPIScaleFactor = 1.0;
- // SetProcessDPIAware() requires Windows Vista or later
- HMODULE hUser32 = LoadLibrary(_T("user32.dll"));
- typedef BOOL (*SetProcessDPIAwareFunc)();
- SetProcessDPIAwareFunc setDPIAware = (SetProcessDPIAwareFunc)GetProcAddress(hUser32, "SetProcessDPIAware");
- if (setDPIAware) {
- setDPIAware();
- HWND hWnd = GetForegroundWindow();
- HDC hdc = GetDC(hWnd);
- XDPIScaleFactor = GetDeviceCaps(hdc, LOGPIXELSX) / 96.0f;
- YDPIScaleFactor = GetDeviceCaps(hdc, LOGPIXELSY) / 96.0f;
- ReleaseDC(hWnd, hdc);
- }
- FreeLibrary(hUser32);
-}
-
-float GetXDPIScaling() {
- if (XDPIScaleFactor == 0.0) {
- GetDPIScaling();
- }
- return XDPIScaleFactor;
-}
-
-float GetYDPIScaling() {
- if (YDPIScaleFactor == 0.0) {
- GetDPIScaling();
- }
- return YDPIScaleFactor;
-}
-#endif
-
-// TODO: Choose from multiple size images if provided, else resize the closest one
-wxBitmap GetScaledBitmapFromXPMData(const char** XPMData) {
-#ifdef __WXMSW__
- if ((GetXDPIScaling() > 1.05) || (GetYDPIScaling() > 1.05)) {
- wxImage img = wxImage(XPMData);
- img.Rescale((int) (img.GetWidth()*GetXDPIScaling()),
- (int) (img.GetHeight()*GetYDPIScaling()),
- wxIMAGE_QUALITY_BILINEAR
- );
- wxBitmap *bm = new wxBitmap(img);
- return *bm;
- }
-#endif
- return wxBitmap(XPMData);
-}
diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h
index 028537d..0348f45 100644
--- a/clientgui/MainDocument.h
+++ b/clientgui/MainDocument.h
@@ -417,18 +417,6 @@ extern void remove_eols(wxString& strMessage);
extern void https_to_http(wxString& strMessage);
extern void color_cycle(int i, int n, wxColour& color);
-#ifdef __WXMSW__
-#define ADJUSTFORXDPI(x) (int)(x * GetXDPIScaling())
-#define ADJUSTFORYDPI(y) (int)(y * GetYDPIScaling())
-extern float GetXDPIScaling();
-extern float GetYDPIScaling();
-#else
-#define ADJUSTFORXDPI(x) x
-#define ADJUSTFORYDPI(y) y
-#endif
-
-wxBitmap GetScaledBitmapFromXPMData(const char** XPMData);
-
#ifdef SANDBOX
#define BOINC_MASTER_GROUP_NAME "boinc_master"
#endif
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
index 3fe999d..744d084 100644
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -65,7 +65,6 @@ boincmgr_SOURCES = \
ProjectInfoPage.cpp \
ProjectProcessingPage.cpp \
ProjectPropertiesPage.cpp \
- ProjectWelcomePage.cpp \
ProxyInfoPage.cpp \
ProxyPage.cpp \
sg_BoincSimpleFrame.cpp \
@@ -101,9 +100,9 @@ EXTRA_DIST = *.h \
../lib/error_numbers.h \
locale
-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CLFAGS)
-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS)
-boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS)
+boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
+boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
+boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) `pkg-config --libs gtk+-2.0` -lnotify
win_config.h: $(top_srcdir)/config.h
grep '#define.*BOINC.*VERSION' $^ > $@
diff --git a/clientgui/NoticeListCtrl.cpp b/clientgui/NoticeListCtrl.cpp
index 40903c8..251606c 100644
--- a/clientgui/NoticeListCtrl.cpp
+++ b/clientgui/NoticeListCtrl.cpp
@@ -189,13 +189,6 @@ void CNoticeListCtrl::SetItemCount(int newCount) {
strDescription.Replace(wxT("\"//"), wxT("\"http://"));
strDescription.Replace(wxT("</a>"), wxT("</a> "));
- // Apparently attempting to follow links with other targets specified
- // fails to fire our event handler. For now we will just strip out
- // the special _blank/_new target which is supposed to open a new
- // browser window anyways.
- strDescription.Replace(wxT("target=\"_blank\""), wxT(""));
- strDescription.Replace(wxT("target=\"_new\""), wxT(""));
-
dtBuffer.Set((time_t)np->create_time);
strCreateTime = dtBuffer.Format();
diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp
index 27bb9c5..ad9ae5c 100644
--- a/clientgui/ProjectInfoPage.cpp
+++ b/clientgui/ProjectInfoPage.cpp
@@ -139,8 +139,6 @@ CProjectInfoPage::~CProjectInfoPage( )
delete pEntry;
}
m_Projects.clear();
-
- delete m_apl;
}
@@ -202,31 +200,25 @@ void CProjectInfoPage::CreateControls()
{
////@begin CProjectInfoPage content construction
#ifdef __WXMAC__
+#define LISTBOXWIDTH 225
#define DESCRIPTIONSWIDTH 350
#else
-#define DESCRIPTIONSWIDTH ADJUSTFORXDPI(310)
+#define LISTBOXWIDTH 150
+#define DESCRIPTIONSWIDTH 200
#endif
- wxArrayString aCategories;
- CMainDocument* pDoc = wxGetApp().GetDocument();
- wxASSERT(pDoc);
- wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
CProjectInfoPage* itemWizardPage23 = this;
wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxVERTICAL);
itemWizardPage23->SetSizer(itemBoxSizer24);
m_pTitleStaticCtrl = new wxStaticText;
- m_pTitleStaticCtrl->Create( itemWizardPage23, wxID_STATIC, _("Choose a project"),
- wxDefaultPosition, wxDefaultSize, 0 );
+ m_pTitleStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
m_pTitleStaticCtrl->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
itemBoxSizer24->Add(m_pTitleStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
m_pDescriptionStaticCtrl = new wxStaticText;
- m_pDescriptionStaticCtrl->Create( itemWizardPage23, wxID_STATIC,
- _("To choose a project, click its name or type its URL below."),
- wxDefaultPosition, wxDefaultSize, 0 );
+ m_pDescriptionStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer24->Add(m_pDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
itemBoxSizer24->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
@@ -236,35 +228,26 @@ void CProjectInfoPage::CreateControls()
itemFlexGridSizer4->AddGrowableCol(0);
itemBoxSizer24->Add(itemFlexGridSizer4, 0, wxGROW|wxALL, 0);
- wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(2, 0, 0);
+ wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(2, 2, 0, 0);
+ itemFlexGridSizer6->AddGrowableRow(1);
+ itemFlexGridSizer6->AddGrowableCol(1);
itemFlexGridSizer4->Add(itemFlexGridSizer6, 0, wxGROW|wxALL, 0);
wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxVERTICAL);
itemFlexGridSizer6->Add(itemBoxSizer7, 0, wxALIGN_LEFT|wxALIGN_TOP, 0);
- m_pProjectCategoriesStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC,
- _("Categories:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectCategoriesStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer7->Add(m_pProjectCategoriesStaticCtrl, 0, wxALIGN_LEFT|wxRIGHT|wxBOTTOM, 5);
- // We must populate the combo box before our sizers can calculate its width.
- // The combo box will be repopulated in CProjectInfoPage::OnPageChanged(),
- // so we don't need to worry about duplicate entries here.
- // Get the project list
- m_apl = new ALL_PROJECTS_LIST;
- pDoc->rpc.get_all_projects_list(*m_apl);
- for (int i=0; i<m_apl->projects.size(); i++) {
- wxString strGeneralArea = wxGetTranslation(wxString(m_apl->projects[i]->general_area.c_str(), wxConvUTF8));
- aCategories.Add(strGeneralArea);
- }
- m_pProjectCategoriesCtrl = new wxComboBox( itemWizardPage23, ID_CATEGORIES, wxT(""), wxDefaultPosition, wxDefaultSize, aCategories, wxCB_READONLY
-#ifndef __WXMAC__ // wxCB_SORT is not available in wxCocoa 3.0
+ wxArrayString m_pProjectCategoriesCtrlStrings;
+ m_pProjectCategoriesCtrl = new wxComboBox( itemWizardPage23, ID_CATEGORIES, wxT(""), wxDefaultPosition, wxSize(LISTBOXWIDTH, -1), m_pProjectCategoriesCtrlStrings, wxCB_READONLY
+#ifndef __WXMAC__ // wxCB_SORT is not available in wxCocoa 2.9.5
|wxCB_SORT
#endif
);
itemBoxSizer7->Add(m_pProjectCategoriesCtrl, 0, wxGROW|wxLEFT|wxRIGHT, 5);
- m_pProjectsStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC,
- _("Projects:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectsStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer7->Add(m_pProjectsStaticCtrl, 0, wxALIGN_LEFT|wxTOP|wxRIGHT|wxBOTTOM, 5);
wxFlexGridSizer* itemFlexGridSizer11 = new wxFlexGridSizer(1, 0, 0);
@@ -273,22 +256,21 @@ void CProjectInfoPage::CreateControls()
itemBoxSizer7->Add(itemFlexGridSizer11, 0, wxGROW|wxALL, 0);
wxArrayString m_pProjectsCtrlStrings;
- m_pProjectsCtrl = new wxListBox( itemWizardPage23, ID_PROJECTS, wxDefaultPosition, wxSize(-1, ADJUSTFORYDPI(175)), m_pProjectsCtrlStrings, wxLB_SINGLE|wxLB_SORT );
+ m_pProjectsCtrl = new wxListBox( itemWizardPage23, ID_PROJECTS, wxDefaultPosition, wxSize(LISTBOXWIDTH, 175), m_pProjectsCtrlStrings, wxLB_SINGLE|wxLB_SORT );
itemFlexGridSizer11->Add(m_pProjectsCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 0);
- m_pProjectDetailsStaticCtrl = new wxStaticBox(itemWizardPage23, wxID_ANY, _("Project details"));
+ m_pProjectDetailsStaticCtrl = new wxStaticBox(itemWizardPage23, wxID_ANY, wxT(""));
wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(m_pProjectDetailsStaticCtrl, wxVERTICAL);
itemFlexGridSizer6->Add(itemStaticBoxSizer13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
-// wxPanel* ProjectDetailsDescriptionPanel = new wxPanel(m_pProjectDetailsStaticCtrl, wxID_ANY, wxDefaultPosition, wxSize(DESCRIPTIONSWIDTH, ADJUSTFORYDPI(100)));
- m_pProjectDetailsDescriptionCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTDESCRIPTION, wxT(""), wxDefaultPosition, wxSize(DESCRIPTIONSWIDTH, ADJUSTFORYDPI(100)), wxTE_MULTILINE|wxTE_READONLY );
+ m_pProjectDetailsDescriptionCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTDESCRIPTION, wxT(""), wxDefaultPosition, wxSize(DESCRIPTIONSWIDTH, 100), wxTE_MULTILINE|wxTE_READONLY );
itemStaticBoxSizer13->Add(m_pProjectDetailsDescriptionCtrl, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
+
wxFlexGridSizer* itemFlexGridSizer16 = new wxFlexGridSizer(2, 0, 0);
itemFlexGridSizer16->AddGrowableCol(1);
itemStaticBoxSizer13->Add(itemFlexGridSizer16, 0, wxGROW|wxALL, 0);
- m_pProjectDetailsResearchAreaStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC,
- _("Research area:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectDetailsResearchAreaStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer16->Add(m_pProjectDetailsResearchAreaStaticCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsResearchAreaCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
@@ -298,8 +280,7 @@ void CProjectInfoPage::CreateControls()
itemFlexGridSizer19->AddGrowableCol(1);
itemStaticBoxSizer13->Add(itemFlexGridSizer19, 0, wxGROW|wxALL, 0);
- m_pProjectDetailsOrganizationStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC,
- _("Organization:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectDetailsOrganizationStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer19->Add(m_pProjectDetailsOrganizationStaticCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsOrganizationCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
@@ -309,8 +290,7 @@ void CProjectInfoPage::CreateControls()
itemFlexGridSizer20->AddGrowableCol(1);
itemStaticBoxSizer13->Add(itemFlexGridSizer20, 0, wxGROW|wxALL, 0);
- m_pProjectDetailsURLStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC,
- _("Web site:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectDetailsURLStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer20->Add(m_pProjectDetailsURLStaticCtrl, 0, wxALIGN_LEFT|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsURLCtrl = new wxHyperlinkCtrl( itemWizardPage23, wxID_STATIC, wxT("BOINC"), wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxHL_CONTEXTMENU|wxHL_ALIGN_LEFT);
@@ -321,8 +301,7 @@ void CProjectInfoPage::CreateControls()
itemFlexGridSizer24->AddGrowableCol(0);
itemStaticBoxSizer13->Add(itemFlexGridSizer24, 0, wxGROW|wxALL, 0);
- m_pProjectDetailsSupportedPlatformsStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC,
- _("Supported systems:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectDetailsSupportedPlatformsStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer24->Add(m_pProjectDetailsSupportedPlatformsStaticCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5);
wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxHORIZONTAL);
@@ -359,8 +338,7 @@ void CProjectInfoPage::CreateControls()
itemFlexGridSizer33->AddGrowableCol(1);
itemFlexGridSizer4->Add(itemFlexGridSizer33, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
- m_pProjectURLStaticCtrl = new wxStaticText( itemWizardPage23, ID_PROJECTURLSTATICCTRL,
- _("Project URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_pProjectURLStaticCtrl = new wxStaticText( itemWizardPage23, ID_PROJECTURLSTATICCTRL, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer33->Add(m_pProjectURLStaticCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pProjectURLCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTURLCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
@@ -598,6 +576,7 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
CMainDocument* pDoc = wxGetApp().GetDocument();
unsigned int i = 0, j = 0, k = 0;
+ ALL_PROJECTS_LIST pl;
wxArrayString aClientPlatforms;
wxArrayString aProjectPlatforms;
wxArrayString aCategories;
@@ -632,33 +611,78 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
wxASSERT(m_pProjectURLStaticCtrl);
wxASSERT(m_pProjectURLCtrl);
+ m_pTitleStaticCtrl->SetLabel(
+ _("Choose a project")
+ );
+
+ m_pDescriptionStaticCtrl->SetLabel(
+ _("To choose a project, click its name or type its URL below.")
+ );
+
+ m_pProjectCategoriesStaticCtrl->SetLabel(
+ _("Categories:")
+ );
+
+ m_pProjectsStaticCtrl->SetLabel(
+ _("Projects:")
+ );
+
+ m_pProjectDetailsStaticCtrl->SetLabel(
+ _("Project details")
+ );
+
+ m_pProjectDetailsResearchAreaStaticCtrl->SetLabel(
+ _("Research area:")
+ );
+
+ m_pProjectDetailsOrganizationStaticCtrl->SetLabel(
+ _("Organization:")
+ );
+
+ m_pProjectDetailsURLStaticCtrl->SetLabel(
+ _("Web site:")
+ );
+
+ m_pProjectDetailsSupportedPlatformsStaticCtrl->SetLabel(
+ _("Supported systems:")
+ );
+
+ m_pProjectURLStaticCtrl->SetLabel(
+ _("Project URL:")
+ );
+
+
// Populate the ProjectInfo data structure with the list of projects we want to show and
// any other activity we need to prep the page.
if (!m_bProjectListPopulated) {
+
+ // Get the project list
+ pDoc->rpc.get_all_projects_list(pl);
+
// Convert the supported client platforms into something useful
for (i=0; i<pDoc->state.platforms.size(); i++) {
aClientPlatforms.Add(wxString(pDoc->state.platforms[i].c_str(), wxConvUTF8));
}
// Iterate through the project list and add them to the ProjectInfo data structure
- for (i=0; i<m_apl->projects.size(); i++) {
+ for (i=0; i<pl.projects.size(); i++) {
pProjectInfo = new CProjectInfo();
m_Projects.push_back(pProjectInfo);
wxLogTrace(
wxT("Function Status"),
wxT("CProjectInfoPage::OnPageChanged - Name: '%s', URL: '%s'"),
- wxString(m_apl->projects[i]->name.c_str(), wxConvUTF8).c_str(),
- wxString(m_apl->projects[i]->url.c_str(), wxConvUTF8).c_str()
+ wxString(pl.projects[i]->name.c_str(), wxConvUTF8).c_str(),
+ wxString(pl.projects[i]->url.c_str(), wxConvUTF8).c_str()
);
// Convert the easy stuff
- pProjectInfo->m_strURL = wxGetTranslation(wxString(m_apl->projects[i]->url.c_str(), wxConvUTF8));
- pProjectInfo->m_strName = wxGetTranslation(wxString(m_apl->projects[i]->name.c_str(), wxConvUTF8));
- pProjectInfo->m_strDescription = wxGetTranslation(wxString(m_apl->projects[i]->description.c_str(), wxConvUTF8));
- pProjectInfo->m_strGeneralArea = wxGetTranslation(wxString(m_apl->projects[i]->general_area.c_str(), wxConvUTF8));
- pProjectInfo->m_strSpecificArea = wxGetTranslation(wxString(m_apl->projects[i]->specific_area.c_str(), wxConvUTF8));
- pProjectInfo->m_strOrganization = wxGetTranslation(wxString(m_apl->projects[i]->home.c_str(), wxConvUTF8));
+ pProjectInfo->m_strURL = wxGetTranslation(wxString(pl.projects[i]->url.c_str(), wxConvUTF8));
+ pProjectInfo->m_strName = wxGetTranslation(wxString(pl.projects[i]->name.c_str(), wxConvUTF8));
+ pProjectInfo->m_strDescription = wxGetTranslation(wxString(pl.projects[i]->description.c_str(), wxConvUTF8));
+ pProjectInfo->m_strGeneralArea = wxGetTranslation(wxString(pl.projects[i]->general_area.c_str(), wxConvUTF8));
+ pProjectInfo->m_strSpecificArea = wxGetTranslation(wxString(pl.projects[i]->specific_area.c_str(), wxConvUTF8));
+ pProjectInfo->m_strOrganization = wxGetTranslation(wxString(pl.projects[i]->home.c_str(), wxConvUTF8));
// Add the category if it isn't already in the category list
bCategoryFound = false;
@@ -673,8 +697,8 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
// Convert the supported project platforms into something useful
aProjectPlatforms.Clear();
- for (j=0; j<m_apl->projects[i]->platforms.size(); j++) {
- aProjectPlatforms.Add(wxString(m_apl->projects[i]->platforms[j].c_str(), wxConvUTF8));
+ for (j=0; j<pl.projects[i]->platforms.size(); j++) {
+ aProjectPlatforms.Add(wxString(pl.projects[i]->platforms[j].c_str(), wxConvUTF8));
}
// Can the core client support a platform that this project supports?
diff --git a/clientgui/ProjectInfoPage.h b/clientgui/ProjectInfoPage.h
index 22757ef..d5c80e6 100644
--- a/clientgui/ProjectInfoPage.h
+++ b/clientgui/ProjectInfoPage.h
@@ -136,7 +136,6 @@ public:
wxTextCtrl* m_pProjectURLCtrl;
////@end CProjectInfoPage member variables
private:
- ALL_PROJECTS_LIST* m_apl;
wxString m_strProjectURL;
wxString m_strProjectDetailsDescription;
wxString m_strProjectDetailsResearchArea;
diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp
index ff66a76..f03f631 100644
--- a/clientgui/ProjectProcessingPage.cpp
+++ b/clientgui/ProjectProcessingPage.cpp
@@ -153,7 +153,7 @@ void CProjectProcessingPage::CreateControls()
wxBitmap itemBitmap41(GetBitmapResource(wxT("res/wizprogress01.xpm")));
m_pProgressIndicator = new wxStaticBitmap;
- m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(ADJUSTFORXDPI(184), ADJUSTFORYDPI(48)), 0 );
+ m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(184, 48), 0 );
itemFlexGridSizer40->Add(m_pProgressIndicator, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxGROW|wxALL, 5);
@@ -230,66 +230,65 @@ void CProjectProcessingPage::FinishProgress(wxStaticBitmap* pBitmap) {
wxBitmap CProjectProcessingPage::GetBitmapResource( const wxString& name )
{
-// TODO: Choose from multiple size images if provided, else resize the closest one
// Bitmap retrieval
if (name == wxT("res/wizprogress01.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress01_xpm));
+ wxBitmap bitmap(wizprogress01_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress02.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress02_xpm));
+ wxBitmap bitmap(wizprogress02_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress03.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress03_xpm));
+ wxBitmap bitmap(wizprogress03_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress04.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress04_xpm));
+ wxBitmap bitmap(wizprogress04_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress05.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress05_xpm));
+ wxBitmap bitmap(wizprogress05_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress06.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress06_xpm));
+ wxBitmap bitmap(wizprogress06_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress07.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress07_xpm));
+ wxBitmap bitmap(wizprogress07_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress08.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress08_xpm));
+ wxBitmap bitmap(wizprogress08_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress09.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress09_xpm));
+ wxBitmap bitmap(wizprogress09_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress10.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress10_xpm));
+ wxBitmap bitmap(wizprogress10_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress11.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress11_xpm));
+ wxBitmap bitmap(wizprogress11_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress12.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress12_xpm));
+ wxBitmap bitmap(wizprogress12_xpm);
return bitmap;
}
return wxNullBitmap;
@@ -412,7 +411,6 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
ai->user_name = (const char*)::wxGetUserId().mb_str();
}
//ai->team_name = (const char*)pWA->GetTeamName().mb_str();
- ai->ldap_auth = pWA->project_config.ldap_auth;
if (pWA->m_AccountInfoPage->m_pAccountCreateCtrl->GetValue()) {
creating_account = true;
diff --git a/clientgui/ProjectPropertiesPage.cpp b/clientgui/ProjectPropertiesPage.cpp
index 5fa4ad9..5a7ddc1 100644
--- a/clientgui/ProjectPropertiesPage.cpp
+++ b/clientgui/ProjectPropertiesPage.cpp
@@ -157,7 +157,7 @@ void CProjectPropertiesPage::CreateControls()
wxBitmap itemBitmap41(GetBitmapResource(wxT("res/wizprogress01.xpm")));
m_pProgressIndicator = new wxStaticBitmap;
- m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(ADJUSTFORXDPI(184), ADJUSTFORYDPI(48)), 0 );
+ m_pProgressIndicator->Create( itemWizardPage36, ID_PROGRESSCTRL, itemBitmap41, wxDefaultPosition, wxSize(184, 48), 0 );
itemFlexGridSizer40->Add(m_pProgressIndicator, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemFlexGridSizer40->Add(5, 5, 0, wxGROW|wxALL, 5);
@@ -243,66 +243,65 @@ void CProjectPropertiesPage::FinishProgress(wxStaticBitmap* pBitmap) {
wxBitmap CProjectPropertiesPage::GetBitmapResource( const wxString& name )
{
-// TODO: Choose from multiple size images if provided, else resize the closest one
// Bitmap retrieval
if (name == wxT("res/wizprogress01.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress01_xpm));
+ wxBitmap bitmap(wizprogress01_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress02.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress02_xpm));
+ wxBitmap bitmap(wizprogress02_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress03.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress03_xpm));
+ wxBitmap bitmap(wizprogress03_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress04.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress04_xpm));
+ wxBitmap bitmap(wizprogress04_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress05.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress05_xpm));
+ wxBitmap bitmap(wizprogress05_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress06.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress06_xpm));
+ wxBitmap bitmap(wizprogress06_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress07.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress07_xpm));
+ wxBitmap bitmap(wizprogress07_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress08.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress08_xpm));
+ wxBitmap bitmap(wizprogress08_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress09.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress09_xpm));
+ wxBitmap bitmap(wizprogress09_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress10.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress10_xpm));
+ wxBitmap bitmap(wizprogress10_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress11.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress11_xpm));
+ wxBitmap bitmap(wizprogress11_xpm);
return bitmap;
}
else if (name == wxT("res/wizprogress12.xpm"))
{
- wxBitmap bitmap(GetScaledBitmapFromXPMData(wizprogress12_xpm));
+ wxBitmap bitmap(wizprogress12_xpm);
return bitmap;
}
return wxNullBitmap;
diff --git a/clientgui/ProjectWelcomePage.cpp b/clientgui/ProjectWelcomePage.cpp
deleted file mode 100644
index a9c8d7e..0000000
--- a/clientgui/ProjectWelcomePage.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 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/>.
-//
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "ProjectWelcomePage.h"
-#endif
-
-#include "stdwx.h"
-#include "diagnostics.h"
-#include "util.h"
-#include "mfile.h"
-#include "miofile.h"
-#include "parse.h"
-#include "error_numbers.h"
-#include "wizardex.h"
-#include "error_numbers.h"
-#include "BOINCGUIApp.h"
-#include "SkinManager.h"
-#include "MainDocument.h"
-#include "BOINCBaseWizard.h"
-#include "WizardAttach.h"
-#include "ProjectWelcomePage.h"
-
-////@begin XPM images
-////@end XPM images
-
-
-/*!
- * CProjectWelcomePage type definition
- */
-
-IMPLEMENT_DYNAMIC_CLASS( CProjectWelcomePage, wxWizardPageEx )
-
-/*!
- * CProjectWelcomePage event table definition
- */
-
-BEGIN_EVENT_TABLE( CProjectWelcomePage, wxWizardPageEx )
-
-////@begin CProjectWelcomePage event table entries
- EVT_WIZARDEX_PAGE_CHANGED( -1, CProjectWelcomePage::OnPageChanged )
- EVT_WIZARDEX_CANCEL( -1, CProjectWelcomePage::OnCancel )
-////@end CProjectWelcomePage event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * CProjectWelcomePage constructors
- */
-
-CProjectWelcomePage::CProjectWelcomePage( )
-{
-}
-
-CProjectWelcomePage::CProjectWelcomePage( CBOINCBaseWizard* parent )
-{
- Create( parent );
-}
-
-/*!
- * WizardPage creator
- */
-
-bool CProjectWelcomePage::Create( CBOINCBaseWizard* parent )
-{
-////@begin CProjectWelcomePage member initialisation
-
-////@end CProjectWelcomePage member initialisation
-
- ((CWizardAttach*)parent)->IsFirstPass = false;
-
-////@begin CProjectWelcomePage creation
- wxWizardPageEx::Create( parent, ID_PROJECTWELCOMEPAGE );
-
- CreateControls();
- GetSizer()->Fit(this);
-////@end CProjectWelcomePage creation
-
- return TRUE;
-}
-
-/*!
- * Control creation for WizardPage
- */
-
-void CProjectWelcomePage::CreateControls()
-{
-////@begin CWelcomePage content construction
- CProjectWelcomePage* itemWizardPage2 = this;
-
- wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
- itemWizardPage2->SetSizer(itemBoxSizer3);
-
- title_ctrl = new wxStaticText;
- title_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- title_ctrl->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
- itemBoxSizer3->Add(title_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- intro_ctrl = new wxStaticText;
- intro_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer3->Add(intro_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- itemBoxSizer3->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
-
- wxFlexGridSizer* grid = new wxFlexGridSizer(5, 2, 0, 0);
- grid->AddGrowableCol(1);
- grid->SetFlexibleDirection(wxBOTH);
- itemBoxSizer3->Add(grid, 0, wxEXPAND|wxALL, 5);
-
- project_name1_ctrl = new wxStaticText;
- project_name1_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_name1_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- project_name2_ctrl = new wxStaticText;
- project_name2_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_name2_ctrl, 0, wxALIGN_LEFT|wxALL|wxEXPAND, 5);
-
- project_inst1_ctrl = new wxStaticText;
- project_inst1_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_inst1_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- project_inst2_ctrl = new wxStaticText;
- project_inst2_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_inst2_ctrl, 0, wxALIGN_LEFT|wxALL|wxEXPAND, 5);
-
- project_desc1_ctrl = new wxStaticText;
- project_desc1_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_desc1_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- project_desc2_ctrl = new wxStaticText;
- project_desc2_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_desc2_ctrl, 0, wxALIGN_LEFT|wxALL|wxEXPAND, 5);
-
- project_url1_ctrl = new wxStaticText;
- project_url1_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_url1_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- project_url2_ctrl = new wxStaticText;
- project_url2_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(project_url2_ctrl, 0, wxALIGN_LEFT|wxALL|wxEXPAND, 5);
-
- user_name1_ctrl = new wxStaticText;
- user_name1_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(user_name1_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- user_name2_ctrl = new wxStaticText;
- user_name2_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- grid->Add(user_name2_ctrl, 0, wxALIGN_LEFT|wxALL|wxEXPAND, 5);
-
- warning_ctrl = new wxStaticText;
- warning_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer3->Add(warning_ctrl, 0, wxALIGN_LEFT|wxALL|wxEXPAND, 5);
-
- continue_ctrl = new wxStaticText;
- continue_ctrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer3->Add(continue_ctrl, 0, wxALIGN_LEFT|wxALL, 5);
-
- itemWizardPage2->SetSizer(itemBoxSizer3);
-
-////@end CWelcomePage content construction
-}
-
-/*
- * Gets the previous page.
- */
-
-wxWizardPageEx* CProjectWelcomePage::GetPrev() const
-{
- return NULL;
-}
-
-/*!
- * Gets the next page.
- */
-
-wxWizardPageEx* CProjectWelcomePage::GetNext() const
-{
- CWizardAttach* pWA = ((CWizardAttach*)GetParent());
-
- wxASSERT(pWA);
-
- if (CHECK_CLOSINGINPROGRESS()) {
- // Cancel Event Detected
- return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
- } else if (pWA->GetProjectAuthenticator().IsEmpty()) {
- return PAGE_TRANSITION_NEXT(ID_ACCOUNTINFOPAGE);
- } else {
- return PAGE_TRANSITION_NEXT(ID_PROJECTPROCESSINGPAGE);
- }
- return NULL;
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool CProjectWelcomePage::ShowToolTips()
-{
- return TRUE;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap CProjectWelcomePage::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
- // Bitmap retrieval
-////@begin CWelcomePage bitmap retrieval
- return wxNullBitmap;
-////@end CWelcomePage bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon CProjectWelcomePage::GetIconResource( const wxString& WXUNUSED(name) )
-{
- // Icon retrieval
-////@begin CWelcomePage icon retrieval
- return wxNullIcon;
-////@end CWelcomePage icon retrieval
-}
-
-/*!
- * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_PROJECTWELCOMEPAGE
- */
-
-void CProjectWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
- if (event.GetDirection() == false) return;
- wxLogTrace(wxT("Function Start/End"), wxT("CProjectWelcomePage::OnPageChanged - Function Begin"));
-
- CWizardAttach* pWA = ((CWizardAttach*)GetParent());
-
- wxString buf;
- buf.Printf(_("Welcome to %s."), pWA->GetProjectName().c_str());
- title_ctrl->SetLabel(buf);
-
- intro_ctrl->SetLabel(_("You have volunteered to compute for this project:"));
- project_name1_ctrl->SetLabel(_("Name:"));
- project_name2_ctrl->SetLabel(pWA->GetProjectName());
- if (!pWA->GetProjectInstitution().IsEmpty()) {
- project_inst1_ctrl->SetLabel(_("Home:"));
- project_inst2_ctrl->SetLabel(pWA->GetProjectInstitution());
- }
- if (!pWA->GetProjectDescription().IsEmpty()) {
- project_desc1_ctrl->SetLabel(_("Description:"));
- project_desc2_ctrl->SetLabel(pWA->GetProjectDescription());
- }
- project_url1_ctrl->SetLabel(_("URL:"));
- project_url2_ctrl->SetLabel(pWA->GetProjectURL());
- if (!pWA->GetProjectUserName().IsEmpty()) {
- user_name1_ctrl->SetLabel(_("User:"));
- user_name2_ctrl->SetLabel(pWA->GetProjectUserName());
- }
-
- if (!pWA->GetProjectKnown()) {
- warning_ctrl->SetLabel(_("WARNING: This project is not registered with BOINC. Make sure you trust it before continuing."));
-
- }
- continue_ctrl->SetLabel(
- _("To continue, click Next.")
- );
-
- Layout();
- wxLogTrace(wxT("Function Start/End"), wxT("CProjectWelcomePage::OnPageChanged - Function End"));
-}
-
-
-/*!
- * wxEVT_WIZARD_CANCEL event handler for ID_PROJECTWELCOMEPAGE
- */
-
-void CProjectWelcomePage::OnCancel( wxWizardExEvent& event ) {
- PROCESS_CANCELEVENT(event);
-}
diff --git a/clientgui/ProjectWelcomePage.h b/clientgui/ProjectWelcomePage.h
deleted file mode 100644
index 2aa24e1..0000000
--- a/clientgui/ProjectWelcomePage.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 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/>.
-//
-#ifndef _WIZ_PROJECTWELCOMEPAGE_H_
-#define _WIZ_PROJECTWELCOMEPAGE_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "ProjectWelcomePage.cpp"
-#endif
-
-/*!
- * CWelcomePage class declaration
- */
-
-class CProjectWelcomePage: public wxWizardPageEx
-{
- DECLARE_DYNAMIC_CLASS( CProjectWelcomePage )
- DECLARE_EVENT_TABLE()
-
-public:
- /// Constructors
- CProjectWelcomePage( );
-
- CProjectWelcomePage( CBOINCBaseWizard* parent );
-
- /// Creation
- bool Create( CBOINCBaseWizard* parent );
-
- /// Creates the controls and sizers
- void CreateControls();
-
-////@begin CProjectWelcomePage event handler declarations
-
- /// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_PROJECTWELCOMEPAGE
- void OnPageChanged( wxWizardExEvent& event );
-
- /// wxEVT_WIZARD_CANCEL event handler for ID_PROJECTWELCOMEPAGE
- void OnCancel( wxWizardExEvent& event );
-
-////@end CProjectWelcomePage event handler declarations
-
-////@begin CProjectWelcomePage member function declarations
-
- /// Gets the previous page.
- virtual wxWizardPageEx* GetPrev() const;
-
- /// Gets the next page.
- virtual wxWizardPageEx* GetNext() const;
-
- /// Retrieves bitmap resources
- wxBitmap GetBitmapResource( const wxString& name );
-
- /// Retrieves icon resources
- wxIcon GetIconResource( const wxString& name );
-
-////@end CProjectWelcomePage member function declarations
-
- /// Should we show tooltips?
- static bool ShowToolTips();
-
-////@begin CProjectWelcomePage member variables
- wxStaticText* title_ctrl;
- wxStaticText* intro_ctrl;
- wxStaticText* project_name1_ctrl;
- wxStaticText* project_name2_ctrl;
- wxStaticText* project_inst1_ctrl;
- wxStaticText* project_inst2_ctrl;
- wxStaticText* project_desc1_ctrl;
- wxStaticText* project_desc2_ctrl;
- wxStaticText* project_url1_ctrl;
- wxStaticText* project_url2_ctrl;
- wxStaticText* user_name1_ctrl;
- wxStaticText* user_name2_ctrl;
-
- wxStaticText* warning_ctrl;
- wxStaticText* continue_ctrl;
-
-////@end CProjectWelcomePage member variables
-};
-
-#endif // _WIZ_WELCOMEPAGE_H_
diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp
index badfcaf..43fa059 100644
--- a/clientgui/SkinManager.cpp
+++ b/clientgui/SkinManager.cpp
@@ -29,7 +29,6 @@
#include "BOINCGUIApp.h"
#include "BOINCBaseFrame.h"
#include "SkinManager.h"
-#include "MainDocument.h"
#include "version.h"
@@ -153,25 +152,13 @@ bool CSkinImage::SetDefaults(wxString strComponentName, const char** ppDefaultBi
bool CSkinImage::Validate() {
if (!m_bmpBitmap.Ok()) {
if (!m_strDesiredBitmap.IsEmpty()) {
- wxImage img = wxImage(m_strDesiredBitmap, wxBITMAP_TYPE_ANY);
- if (img.IsOk()) {
-#ifdef __WXMSW__
-// TODO: Choose from multiple size images if provided, else resize the closest one
- if ((GetXDPIScaling() > 1.05) || (GetYDPIScaling() > 1.05)) {
- img.Rescale((int) (img.GetWidth()*GetXDPIScaling()),
- (int) (img.GetHeight()*GetYDPIScaling()),
- wxIMAGE_QUALITY_BILINEAR
- );
- }
-#endif
- m_bmpBitmap = wxBitmap(img);
- }
+ m_bmpBitmap = wxBitmap(wxImage(m_strDesiredBitmap, wxBITMAP_TYPE_ANY));
}
if (!m_bmpBitmap.Ok()) {
if (show_error_msgs) {
fprintf(stderr, "Skin Manager: Failed to load '%s' image. Using default.\n", (const char *)m_strComponentName.mb_str());
}
- m_bmpBitmap = GetScaledBitmapFromXPMData(m_ppDefaultBitmap);
+ m_bmpBitmap = wxBitmap(m_ppDefaultBitmap);
wxASSERT(m_bmpBitmap.Ok());
}
}
@@ -493,19 +480,7 @@ int CSkinAdvanced::Parse(MIOFILE& in) {
wxString(strBuffer.c_str(), wxConvUTF8)
);
if (boinc_file_exists(str.c_str())) {
- wxImage img = wxImage(str.c_str(), wxBITMAP_TYPE_ANY);
- if (img.IsOk()) {
-#ifdef __WXMSW__
-// TODO: Choose from multiple size images if provided, else resize the closest one
- if ((GetXDPIScaling() > 1.05) || (GetYDPIScaling() > 1.05)) {
- img.Rescale((int) (img.GetWidth()*GetXDPIScaling()),
- (int) (img.GetHeight()*GetYDPIScaling()),
- wxIMAGE_QUALITY_BILINEAR
- );
- }
-#endif
- m_bitmapApplicationLogo = wxBitmap(img);
- }
+ m_bitmapApplicationLogo = wxBitmap(wxImage(str.c_str(), wxBITMAP_TYPE_ANY));
}
}
continue;
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index f28a0fc..f978343 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -34,9 +34,6 @@
#include "res/proj.xpm"
-// This string must contain internal (non-localized) column names
-// in standard order separated by a delimiter
-static char* default_column_names = "Project;Account;Team;Done;Average;Share;Status";
#define COLUMN_PROJECT 0
#define COLUMN_ACCOUNTNAME 1
@@ -223,9 +220,6 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
// Create Task Pane Items
m_pTaskPane->UpdateControls();
- m_aStdColNameOrder = new wxArrayString;
- TokenizedStringToArray(default_column_names, ";", m_aStdColNameOrder);
-
// Create List Pane Items
m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 150);
m_pListPane->InsertColumn(COLUMN_ACCOUNTNAME, _("Account"), wxLIST_FORMAT_LEFT, 80);
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index c578f41..0737626 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -34,10 +34,6 @@
#include "res/xfer.xpm"
-// This string must contain internal (non-localized) column names
-// in standard order separated by a delimiter
-static char* default_column_names = "Project;File;Progress;Size;Elapsed;Speed;Status";
-
#define COLUMN_PROJECT 0
#define COLUMN_FILE 1
#define COLUMN_PROGRESS 2
@@ -187,9 +183,6 @@ CViewTransfers::CViewTransfers(wxNotebook* pNotebook) :
// Create Task Pane Items
m_pTaskPane->UpdateControls();
- m_aStdColNameOrder = new wxArrayString;
- TokenizedStringToArray(default_column_names, ";", m_aStdColNameOrder);
-
// Create List Pane Items
m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125);
m_pListPane->InsertColumn(COLUMN_FILE, _("File"), wxLIST_FORMAT_LEFT, 205);
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 26eb9a9..9905fd2 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -36,10 +36,6 @@
#include "res/result.xpm"
-// This string must contain internal (non-localized) column names
-// in standard order separated by a delimiter
-static char* default_column_names = "Project;Progress;Status;Elapsed;Remaining;Deadline;Application;Name";
-
#define COLUMN_PROJECT 0
#define COLUMN_PROGRESS 1
#define COLUMN_STATUS 2
@@ -237,9 +233,6 @@ CViewWork::CViewWork(wxNotebook* pNotebook) :
// Create Task Pane Items
m_pTaskPane->UpdateControls();
- m_aStdColNameOrder = new wxArrayString;
- TokenizedStringToArray(default_column_names, ";", m_aStdColNameOrder);
-
// Create List Pane Items
m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125);
m_pListPane->InsertColumn(COLUMN_PROGRESS, _("Progress"), wxLIST_FORMAT_RIGHT, 60);
@@ -567,25 +560,6 @@ bool CViewWork::OnSaveState(wxConfigBase* pConfig) {
pConfig->SetPath(strBaseConfigLocation);
pConfig->Write(wxT("ActiveTasksOnly"), (pDoc->m_ActiveTasksOnly ? 1 : 0));
- // Save Column Order
-#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
- wxString strColumnOrder;
- wxString strBuffer;
- wxArrayInt aOrder(m_pListPane->GetColumnCount());
-
- aOrder = m_pListPane->GetColumnsOrder();
-
- strColumnOrder.Printf(wxT("%s"), m_aStdColNameOrder->Item(aOrder[0]));
-
- for (int i = 1; i < aOrder.Count(); ++i)
- {
- strBuffer.Printf(wxT(";%s"), m_aStdColNameOrder->Item(aOrder[i]));
- strColumnOrder += strBuffer;
- }
-
- pConfig->Write(wxT("ColumnOrder"), strColumnOrder);
-#endif
-
return bReturnValue;
}
@@ -613,15 +587,6 @@ bool CViewWork::OnRestoreState(wxConfigBase* pConfig) {
pConfig->Read(wxT("ActiveTasksOnly"), &iTempValue, 0);
pDoc->m_ActiveTasksOnly = (iTempValue != 0);
- // Restore Column Order
-#ifdef wxHAS_LISTCTRL_COLUMN_ORDER
- wxString strColumnOrder;
-
- if (pConfig->Read(wxT("ColumnOrder"), &strColumnOrder)) {
- SetListColumnOrder(strColumnOrder, ";");
- }
-#endif
-
return true;
}
diff --git a/clientgui/WizardAttach.cpp b/clientgui/WizardAttach.cpp
index 7f5d67e..7beaa8a 100644
--- a/clientgui/WizardAttach.cpp
+++ b/clientgui/WizardAttach.cpp
@@ -39,7 +39,6 @@
#include "ProjectInfoPage.h"
#include "ProjectPropertiesPage.h"
#include "ProjectProcessingPage.h"
-#include "ProjectWelcomePage.h"
#include "AccountManagerInfoPage.h"
#include "AccountManagerPropertiesPage.h"
#include "AccountManagerProcessingPage.h"
@@ -97,7 +96,6 @@ bool CWizardAttach::Create( wxWindow* parent, wxWindowID id, const wxString& /*
m_ProjectInfoPage = NULL;
m_ProjectPropertiesPage = NULL;
m_ProjectProcessingPage = NULL;
- m_ProjectWelcomePage = NULL;
m_AccountManagerInfoPage = NULL;
m_AccountManagerPropertiesPage = NULL;
m_AccountManagerProcessingPage = NULL;
@@ -132,7 +130,7 @@ bool CWizardAttach::Create( wxWindow* parent, wxWindowID id, const wxString& /*
account_out.clear();
account_created_successfully = false;
attached_to_project_successfully = false;
- m_bCloseWhenCompleted = false;
+ close_when_completed = false;
m_strProjectName.Empty();
m_strProjectUrl.Empty();
m_strProjectAuthenticator.Empty();
@@ -208,10 +206,6 @@ void CWizardAttach::CreateControls()
m_ProjectProcessingPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectProcessingPage);
- m_ProjectWelcomePage = new CProjectWelcomePage;
- m_ProjectWelcomePage->Create( itemWizard1 );
- GetPageAreaSizer()->Add(m_ProjectWelcomePage);
-
m_AccountInfoPage = new CAccountInfoPage;
m_AccountInfoPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_AccountInfoPage);
@@ -282,11 +276,6 @@ void CWizardAttach::CreateControls()
);
wxLogTrace(
wxT("Function Status"),
- wxT("CWizardAttach::CreateControls - m_ProjectWelcomePage = id: '%d', location: '%p', height: '%d', width: '%d'"),
- m_ProjectWelcomePage->GetId(), m_ProjectWelcomePage, m_ProjectWelcomePage->GetBestSize().GetHeight(), m_ProjectWelcomePage->GetBestSize().GetWidth()
- );
- wxLogTrace(
- wxT("Function Status"),
wxT("CWizardAttach::CreateControls - m_AccountManagerInfoPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_AccountManagerInfoPage->GetId(), m_AccountManagerInfoPage, m_AccountManagerInfoPage->GetBestSize().GetHeight(), m_AccountManagerInfoPage->GetBestSize().GetWidth()
);
@@ -364,7 +353,8 @@ void CWizardAttach::CreateControls()
* Runs the wizard.
*/
bool CWizardAttach::Run(
- wxString WXUNUSED(strName), wxString strURL, wxString strTeamName, bool bCredentialsCached
+ wxString& WXUNUSED(strName), wxString& strURL, wxString& strTeamName,
+ bool bCredentialsCached
) {
m_strTeamName = strTeamName;
@@ -383,7 +373,7 @@ bool CWizardAttach::Run(
if (detect_setup_authenticator(url, authenticator)) {
m_bCredentialsDetected = true;
- m_bCloseWhenCompleted = true;
+ close_when_completed = true;
SetProjectAuthenticator(wxString(authenticator.c_str(), wxConvUTF8));
}
}
@@ -398,30 +388,6 @@ bool CWizardAttach::Run(
}
-/*!
- * Runs the wizard.
- */
-bool CWizardAttach::RunSimpleProjectAttach(
- wxString strName,
- wxString strURL,
- wxString strAuthenticator,
- wxString strInstitution,
- wxString strDescription,
- wxString strKnown
-) {
- SetProjectName(strName);
- SetProjectURL(strURL);
- SetProjectInstitution(strInstitution);
- SetProjectDescription(strDescription);
- if (strAuthenticator.size()) {
- SetProjectAuthenticator(strAuthenticator);
- }
- SetProjectKnown(strKnown.length() > 0);
-
- return RunWizard(m_ProjectWelcomePage);
-}
-
-
bool CWizardAttach::SyncToAccountManager() {
ACCT_MGR_INFO ami;
CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -539,7 +505,7 @@ bool CWizardAttach::HasNextPage( wxWizardPageEx* page )
bool CWizardAttach::HasPrevPage( wxWizardPageEx* page )
{
- if ((page == m_WelcomePage) || (page == m_ProjectWelcomePage) || (page == m_CompletionPage) || (page == m_CompletionErrorPage))
+ if ((page == m_WelcomePage) || (page == m_CompletionPage) || (page == m_CompletionErrorPage))
return false;
return true;
}
@@ -602,9 +568,6 @@ wxWizardPageEx* CWizardAttach::_PushPageTransition( wxWizardPageEx* pCurrentPage
if (ID_PROJECTPROCESSINGPAGE == ulPageID)
pPage = m_ProjectProcessingPage;
- if (ID_PROJECTWELCOMEPAGE == ulPageID)
- pPage = m_ProjectWelcomePage;
-
if (ID_ACCOUNTMANAGERINFOPAGE == ulPageID)
pPage = m_AccountManagerInfoPage;
@@ -689,8 +652,7 @@ void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
bCancelWithoutNextPage |= (page == m_ErrAlreadyExistsPage);
} else {
bCancelWithoutNextPage |= (page == m_WelcomePage);
- bCancelWithoutNextPage |= (page == m_ProjectWelcomePage);
- }
+ }
if (wxYES != iRetVal) {
event.Veto();
diff --git a/clientgui/WizardAttach.h b/clientgui/WizardAttach.h
index 3986f20..ba0f07a 100644
--- a/clientgui/WizardAttach.h
+++ b/clientgui/WizardAttach.h
@@ -50,7 +50,6 @@
#define ID_PROJECTINFOPAGE 10200
#define ID_PROJECTPROPERTIESPAGE 10201
#define ID_PROJECTPROCESSINGPAGE 10202
-#define ID_PROJECTWELCOMEPAGE 10203
// Account Manager Wizard Pages
#define ID_ACCOUNTMANAGERINFOPAGE 10300
@@ -150,7 +149,6 @@ class CErrUserDisagreesPage;
class CProjectInfoPage;
class CProjectPropertiesPage;
class CProjectProcessingPage;
-class CProjectWelcomePage;
class CAccountManagerInfoPage;
class CAccountManagerPropertiesPage;
class CAccountManagerProcessingPage;
@@ -222,23 +220,13 @@ public:
/// Runs the wizard.
bool Run(
- wxString strName,
- wxString strURL,
- wxString strTeamName,
+ wxString& strName,
+ wxString& strURL,
+ wxString& wxString,
bool bCredentialsCached = true
);
- /// Runs the wizard.
- bool RunSimpleProjectAttach(
- wxString strProjectName,
- wxString strProjectURL,
- wxString strAuthenticator,
- wxString strProjectInstitution,
- wxString strProjectDescription,
- wxString strKnown
- );
-
- /// Synchronize to Account Manager
+ // Synchronize to Account Manager
bool SyncToAccountManager();
/// Retrieves bitmap resources
@@ -246,8 +234,7 @@ public:
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
-
- ////@end CWizardAttachProject member function declarations
+////@end CWizardAttachProject member function declarations
/// Overrides
virtual bool HasNextPage( wxWizardPageEx* page );
@@ -273,21 +260,9 @@ public:
wxString GetProjectURL() const { return m_strProjectUrl ; }
void SetProjectURL(wxString value) { m_strProjectUrl = value ; }
- wxString GetProjectUserName() const { return m_strProjectUserName ; }
- void SetProjectUserName(wxString value) { m_strProjectUserName = value ; }
-
wxString GetProjectAuthenticator() const { return m_strProjectAuthenticator ; }
void SetProjectAuthenticator(wxString value) { m_strProjectAuthenticator = value ; }
- wxString GetProjectInstitution() const { return m_strProjectInstitution ; }
- void SetProjectInstitution(wxString value) { m_strProjectInstitution = value ; }
-
- wxString GetProjectDescription() const { return m_strProjectDescription ; }
- void SetProjectDescription(wxString value) { m_strProjectDescription = value ; }
-
- bool GetProjectKnown() const { return m_bProjectKnown ; }
- void SetProjectKnown(bool value) { m_bProjectKnown = value ; }
-
/// Should we show tooltips?
static bool ShowToolTips();
@@ -296,7 +271,6 @@ public:
CProjectInfoPage* m_ProjectInfoPage;
CProjectPropertiesPage* m_ProjectPropertiesPage;
CProjectProcessingPage* m_ProjectProcessingPage;
- CProjectWelcomePage* m_ProjectWelcomePage;
CAccountManagerInfoPage* m_AccountManagerInfoPage;
CAccountManagerPropertiesPage* m_AccountManagerPropertiesPage;
CAccountManagerProcessingPage* m_AccountManagerProcessingPage;
@@ -328,7 +302,7 @@ public:
ACCOUNT_OUT account_out;
bool account_created_successfully;
bool attached_to_project_successfully;
- bool m_bCloseWhenCompleted;
+ bool close_when_completed;
bool m_bCredentialsCached;
bool m_bCredentialsDetected;
wxString m_strProjectName;
@@ -338,10 +312,6 @@ public:
wxString m_strReturnURL;
bool m_bCookieRequired;
wxString m_strCookieFailureURL;
- wxString m_strProjectInstitution;
- wxString m_strProjectDescription;
- wxString m_strProjectUserName;
- bool m_bProjectKnown;
};
#endif // _WIZ_ATTACH_H_
diff --git a/clientgui/browser.cpp b/clientgui/browser.cpp
index 2d9c0cb..4ee63a8 100644
--- a/clientgui/browser.cpp
+++ b/clientgui/browser.cpp
@@ -42,7 +42,6 @@ BOOL WINAPI InternetGetCookieA( LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lps
#include <time.h>
#endif
-#include <sqlite3.h>
#include "error_numbers.h"
#include "mfile.h"
#include "miofile.h"
@@ -594,6 +593,10 @@ bool detect_cookie_mozilla_v3(
int rc;
MOZILLA_COOKIE_SQL cookie;
+#if defined(__APPLE__)
+ // sqlite3 is not available on Mac OS 10.3.9
+ if (sqlite3_open == NULL) return false;
+#endif
// determine the project hostname using the project url
parse_hostname_mozilla_compatible(project_url, hostname);
@@ -802,6 +805,10 @@ bool detect_cookie_chrome(
int rc;
CHROME_COOKIE_SQL cookie;
+#if defined(__APPLE__)
+ // sqlite3 is not available on Mac OS 10.3.9
+ if (sqlite3_open == NULL) return false;
+#endif
// determine the project hostname using the project url
parse_hostname_chrome_compatible(project_url, hostname);
@@ -812,12 +819,7 @@ bool detect_cookie_chrome(
rc = sqlite3_open(tmp.c_str(), &db);
if ( rc ) {
sqlite3_close(db);
- tmp = profile_root + "Safe Browsing Cookies";
- rc = sqlite3_open(tmp.c_str(), &db);
- if ( rc ) {
- sqlite3_close(db);
- return false;
- }
+ return false;
}
// construct SQL query to extract the desired cookie
@@ -921,7 +923,7 @@ bool detect_cookie_ie_supported(std::string& project_url, std::string& name, std
strCookieName = strCookieFragment.substr(0, uiDelimeterLocation);
strCookieValue = strCookieFragment.substr(uiDelimeterLocation + 1);
- if (0 == strcmp(name.c_str(), strCookieName.c_str())) {
+ if (name == strCookieName) {
// Now we found it! Yea - auto attach!
value = strCookieValue;
bReturnValue = true;
@@ -972,15 +974,15 @@ bool detect_cookie_ie_supported_uac(std::string& project_url, std::string& name,
}
// Convert name into wide character string
- name_w = boinc_ascii_to_wide(name);
+ name_w = A2W(name);
// if we don't find the cookie at the exact project dns name, check one higher
// (i.e. www.worldcommunitygrid.org becomes worldcommunitygrid.org
parse_hostname_ie_compatible(project_url, hostname, domainname);
// InternetGetCookie expects them in URL format
- hostname_w = std::wstring(_T("http://")) + boinc_ascii_to_wide(hostname) + std::wstring(_T("/"));
- domainname_w = std::wstring(_T("http://")) + boinc_ascii_to_wide(domainname) + std::wstring(_T("/"));
+ hostname_w = std::wstring(_T("http://")) + A2W(hostname) + std::wstring(_T("/"));
+ domainname_w = std::wstring(_T("http://")) + A2W(domainname) + std::wstring(_T("/"));
// First check to see if the desired cookie is assigned to the hostname.
rc = pIEGPMC(hostname_w.c_str(), NULL, szCookieBuffer, &dwSize, NULL) == TRUE;
@@ -1009,9 +1011,9 @@ bool detect_cookie_ie_supported_uac(std::string& project_url, std::string& name,
strCookieName = strCookieFragment.substr(0, uiDelimeterLocation);
strCookieValue = strCookieFragment.substr(uiDelimeterLocation + 1);
- if (0 == wcscmp(name_w.c_str(), strCookieName.c_str())) {
+ if (name_w == strCookieName) {
// Now we found it! Yea - auto attach!
- value = boinc_wide_to_ascii(strCookieValue);
+ value = W2A(strCookieValue);
bReturnValue = true;
}
@@ -1269,86 +1271,6 @@ END:
//
// walk through the various browsers looking up the
-// various cookies that make up the simple account creation scheme.
-//
-// give preference to the default platform specific browers first before going
-// to the platform independant browsers since most people don't switch from
-// the default.
-//
-bool detect_simple_account_credentials(
- std::string& project_name, std::string& project_url, std::string& authenticator,
- std::string& project_institution, std::string& project_description, std::string& known
-) {
- bool retval = false;
- std::string strCookieServer("http://boinc.berkeley.edu");
- std::string strCookieProjectName("attach_project_name");
- std::string strCookieProjectURL("attach_master_url");
- std::string strCookieAuthenticator("attach_auth");
- std::string strCookieProjectInstitution("attach_project_inst");
- std::string strCookieProjectDescription("attach_project_desc");
- std::string strCookieKnown("attach_known");
-
-#ifdef _WIN32
- if ( detect_cookie_ie(strCookieServer, strCookieProjectName, project_name) &&
- detect_cookie_ie(strCookieServer, strCookieProjectURL, project_url)
- ){
- detect_cookie_ie(strCookieServer, strCookieAuthenticator, authenticator);
- detect_cookie_ie(strCookieServer, strCookieProjectInstitution, project_institution);
- detect_cookie_ie(strCookieServer, strCookieProjectDescription, project_description);
- detect_cookie_ie(strCookieServer, strCookieKnown, known);
- goto END;
- }
-#endif
-#ifdef __APPLE__
- if ( detect_cookie_safari(strCookieServer, strCookieProjectName, project_name) &&
- detect_cookie_safari(strCookieServer, strCookieProjectURL, project_url)
- ){
- detect_cookie_safari(strCookieServer, strCookieAuthenticator, authenticator);
- detect_cookie_safari(strCookieServer, strCookieProjectInstitution, project_institution);
- detect_cookie_safari(strCookieServer, strCookieProjectDescription, project_description);
- detect_cookie_safari(strCookieServer, strCookieKnown, known);
- goto END;
- }
-#endif
- if ( detect_cookie_chrome(strCookieServer, strCookieProjectName, project_name) &&
- detect_cookie_chrome(strCookieServer, strCookieProjectURL, project_url)
- ){
- detect_cookie_chrome(strCookieServer, strCookieAuthenticator, authenticator);
- detect_cookie_chrome(strCookieServer, strCookieProjectInstitution, project_institution);
- detect_cookie_chrome(strCookieServer, strCookieProjectDescription, project_description);
- detect_cookie_chrome(strCookieServer, strCookieKnown, known);
- goto END;
- }
- if ( detect_cookie_firefox_3(strCookieServer, strCookieProjectName, project_name) &&
- detect_cookie_firefox_3(strCookieServer, strCookieProjectURL, project_url)
- ){
- detect_cookie_firefox_3(strCookieServer, strCookieAuthenticator, authenticator);
- detect_cookie_firefox_3(strCookieServer, strCookieProjectInstitution, project_institution);
- detect_cookie_firefox_3(strCookieServer, strCookieProjectDescription, project_description);
- detect_cookie_firefox_3(strCookieServer, strCookieKnown, known);
- goto END;
- }
- if ( detect_cookie_firefox_2(strCookieServer, strCookieProjectName, project_name) &&
- detect_cookie_firefox_2(strCookieServer, strCookieProjectURL, project_url)
- ){
- detect_cookie_firefox_2(strCookieServer, strCookieAuthenticator, authenticator);
- detect_cookie_firefox_2(strCookieServer, strCookieProjectInstitution, project_institution);
- detect_cookie_firefox_2(strCookieServer, strCookieProjectDescription, project_description);
- detect_cookie_firefox_2(strCookieServer, strCookieKnown, known);
- goto END;
- }
-
-END:
- if (!project_name.empty() && !project_url.empty()) {
- retval = true;
- }
-
- return retval;
-}
-
-
-//
-// walk through the various browsers looking up the
// account manager cookies until the account manager's 'Login' and 'Password_Hash'
// cookies are found.
//
diff --git a/clientgui/browser.h b/clientgui/browser.h
index 587a589..dac9ac3 100644
--- a/clientgui/browser.h
+++ b/clientgui/browser.h
@@ -18,6 +18,8 @@
#ifndef _BROWSER_
#define _BROWSER_
+#include <sqlite3.h>
+
//
// The BOINC client now supports the ability to lookup a users
// authenticator during automatic attachments via a browser
@@ -25,17 +27,7 @@
//
bool detect_setup_authenticator(std::string& project_url, std::string& authenticator);
-
-bool detect_simple_account_credentials(
- std::string& project_name, std::string& project_url, std::string& authenticator,
- std::string& project_institution, std::string& project_description, std::string& known
-);
-
-bool detect_account_manager_credentials(
- std::string& project_url, std::string& login, std::string& password_hash,
- std::string& return_url
-);
-
+bool detect_account_manager_credentials(std::string& project_url, std::string& login, std::string& password_hash, std::string& return_url);
bool is_authenticator_valid(const std::string authenticator);
// platform specific browsers
@@ -53,4 +45,19 @@ bool detect_cookie_firefox_2(std::string& project_url, std::string& name, std::s
bool detect_cookie_firefox_3(std::string& project_url, std::string& name, std::string& value);
bool detect_cookie_chrome(std::string& project_url, std::string& name, std::string& value);
+#if 0 //defined(__APPLE__)
+#undef sqlite3_free
+#ifdef __cplusplus
+extern "C" {
+#endif
+ // sqlite3 is not available on Mac OS 10.3.9
+ extern int sqlite3_open(const char *filename, sqlite3 **ppDb) __attribute__((weak_import));
+ extern int sqlite3_close(sqlite3 *) __attribute__((weak_import));
+ extern int sqlite3_exec(sqlite3*, const char *sql, sqlite3_callback, void *, char **errmsg) __attribute__((weak_import));
+ extern void sqlite3_free(void *z) __attribute__((weak_import));
+#ifdef __cplusplus
+}
+#endif
+#endif
+
#endif
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index 1b37b5f..9fceeae 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -32,7 +32,6 @@
#include "MainDocument.h"
#include "Events.h"
#include "BOINCBaseFrame.h"
-#include "browser.h"
#include "wizardex.h"
#include "BOINCBaseWizard.h"
#include "WizardAttach.h"
@@ -146,8 +145,7 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
#ifdef __WXMAC__
menuFile->Append(
- wxID_PREFERENCES,
- _("Preferences…")
+ wxID_PREFERENCES
);
#endif
@@ -296,6 +294,9 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
SendSizeEvent();
#endif
#ifdef __WXMAC__
+ m_pMenubar->MacInstallMenuBar();
+ MacLocalizeBOINCMenu();
+
// Mac needs a short delay to ensure that controls are
// created in proper order to allow keyboard navigation
m_iFrameRefreshRate = 1; // 1 millisecond
@@ -679,12 +680,6 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxString strName = wxEmptyString;
wxString strURL = wxEmptyString;
wxString strTeamName = wxEmptyString;
- std::string strProjectName;
- std::string strProjectURL;
- std::string strProjectAuthenticator;
- std::string strProjectInstitution;
- std::string strProjectDescription;
- std::string strProjectKnown;
bool bCachedCredentials = false;
ACCT_MGR_INFO ami;
PROJECT_INIT_STATUS pis;
@@ -710,28 +705,7 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
pDoc->rpc.get_project_init_status(pis);
pDoc->rpc.acct_mgr_info(ami);
- if (detect_simple_account_credentials(
- strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown
- )
- ){
- wasShown = IsShown();
- Show();
- wasVisible = wxGetApp().IsApplicationVisible();
- if (!wasVisible) {
- wxGetApp().ShowApplication(true);
- }
-
- pWizard = new CWizardAttach(this);
-
- pWizard->RunSimpleProjectAttach(
- wxURI::Unescape(strProjectName),
- wxURI::Unescape(strProjectURL),
- wxURI::Unescape(strProjectAuthenticator),
- wxURI::Unescape(strProjectInstitution),
- wxURI::Unescape(strProjectDescription),
- wxURI::Unescape(strProjectKnown)
- );
- } else if (ami.acct_mgr_url.size() && ami.have_credentials) {
+ if (ami.acct_mgr_url.size() && ami.have_credentials) {
// Fall through
//
// There isn't a need to bring up the attach wizard, the account manager will
@@ -854,12 +828,12 @@ CSimpleGUIPanel::CSimpleGUIPanel(wxWindow* parent) :
m_projPanel = new CSimpleProjectPanel(this);
// Box Sizer
- mainSizer = new wxBoxSizer(wxVERTICAL);
- mainSizer->AddSpacer(ADJUSTFORYDPI(68));
+ mainSizer = new wxBoxSizer(wxVERTICAL);
+ mainSizer->AddSpacer(68);
mainSizer->Add(m_taskPanel, 1, wxLEFT | wxRIGHT | wxEXPAND | wxALIGN_CENTER, SIDEMARGINS);
- mainSizer->AddSpacer(ADJUSTFORYDPI(8));
+ mainSizer->AddSpacer(8);
mainSizer->Add(m_projPanel, 0, wxLEFT | wxRIGHT | wxEXPAND | wxALIGN_CENTER, SIDEMARGINS);
- mainSizer->AddSpacer(ADJUSTFORYDPI(8));
+ mainSizer->AddSpacer(8);
wxBoxSizer* buttonsSizer;
buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -890,7 +864,7 @@ CSimpleGUIPanel::CSimpleGUIPanel(wxWindow* parent) :
m_HelpButton->SetToolTip(helpTip);
mainSizer->Add( buttonsSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, 2 * SIDEMARGINS );
- mainSizer->AddSpacer(ADJUSTFORYDPI(10));
+ mainSizer->AddSpacer(10);
SetSizer(mainSizer);
Layout();
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index 632b32d..01a748a 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -36,7 +36,7 @@
#include "sg_DlgMessages.h"
#include "NoticeListCtrl.h"
-#define TEST_BACKGROUND_WITH_MAGENTA_FILL 0
+
////@begin includes
////@end includes
@@ -125,7 +125,7 @@ void CPanelMessages::CreateControls()
wxPoint(20, 20), wxDefaultSize, 0
);
m_FetchingNoticesText->SetBackgroundColour(*wxWHITE);
- itemFlexGridSizer2->Add(m_FetchingNoticesText, 0, wxEXPAND | wxLEFT | wxRIGHT, ADJUSTFORXDPI(5));
+ itemFlexGridSizer2->Add(m_FetchingNoticesText, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
m_NoNoticesText = new wxStaticText(
this, wxID_ANY,
@@ -133,24 +133,24 @@ void CPanelMessages::CreateControls()
wxPoint(20, 20), wxDefaultSize, 0
);
m_NoNoticesText->SetBackgroundColour(*wxWHITE);
- itemFlexGridSizer2->Add(m_NoNoticesText, 0, wxEXPAND | wxLEFT | wxRIGHT, ADJUSTFORXDPI(5));
+ itemFlexGridSizer2->Add(m_NoNoticesText, 0, wxEXPAND | wxLEFT | wxRIGHT, 5);
m_pHtmlListPane = new CNoticeListCtrl(itemDialog1);
wxASSERT(m_pHtmlListPane);
- itemFlexGridSizer2->Add(m_pHtmlListPane, 0, wxGROW|wxALL, ADJUSTFORXDPI(5));
+ itemFlexGridSizer2->Add(m_pHtmlListPane, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
wxButton* itemButton44 = new wxButton(itemDialog1, wxID_OK, _("Close"), wxDefaultPosition, wxDefaultSize);
- itemBoxSizer4->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer4->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#ifdef __WXMAC__ // Don't let Close button overlap window's grow icon
- itemFlexGridSizer2->Add(itemBoxSizer4, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(12));
+ itemFlexGridSizer2->Add(itemBoxSizer4, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 12);
#else
- itemFlexGridSizer2->Add(itemBoxSizer4, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+ itemFlexGridSizer2->Add(itemBoxSizer4, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
itemDialog1->SetSizer(itemFlexGridSizer2);
@@ -190,16 +190,11 @@ void CPanelMessages::OnEraseBackground(wxEraseEvent& event){
w = bmp.GetWidth();
h = bmp.GetHeight();
-#if TEST_BACKGROUND_WITH_MAGENTA_FILL
// Fill the dialog with a magenta color so people can detect when something
// is wrong
dc.SetBrush(wxBrush(wxColour(255,0,255)));
dc.SetPen(wxPen(wxColour(255,0,255)));
dc.DrawRectangle(0, 0, sz.GetWidth(), sz.GetHeight());
-#else
- wxColour bgColor(*pSkinSimple->GetDialogBackgroundImage()->GetBackgroundColor());
- SetBackgroundColour(bgColor);
-#endif
// Is the bitmap smaller than the window?
if ( (w < sz.x) || (h < sz.y) ) {
@@ -402,7 +397,7 @@ bool CDlgMessages::Create( wxWindow* parent, wxWindowID id, const wxString& capt
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-#if TEST_BACKGROUND_WITH_MAGENTA_FILL
+#ifdef __WXDEBUG__
SetBackgroundColour(wxColour(255, 0, 255));
#endif
SetForegroundColour(*wxBLACK);
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index 2c6c8ad..2be84be 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -36,8 +36,6 @@
#include "sg_CustomControls.h"
#include "sg_DlgPreferences.h"
-#define TEST_BACKGROUND_WITH_MAGENTA_FILL 0
-
using std::string;
#ifdef __WXMAC__
@@ -265,7 +263,7 @@ void CPanelPreferences::CreateControls()
itemDialog1->SetSizer(itemBoxSizer2);
wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(1, 0, 0);
- itemBoxSizer2->Add(itemFlexGridSizer3, 0, wxGROW|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer2->Add(itemFlexGridSizer3, 0, wxGROW|wxALL, 5);
CTransparentStaticText* itemStaticText4 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("This dialog controls preferences for this computer only."), wxDefaultPosition, wxDefaultSize, 0 );
@@ -282,7 +280,7 @@ void CPanelPreferences::CreateControls()
// itemStaticText6->SetFont(wxFont(MEDIUM_FONT, wxSWISS, wxNORMAL, wxBOLD, false, _T("Arial")));
itemFlexGridSizer3->Add(itemStaticText6, 0, wxALL, 0);
- itemFlexGridSizer3->AddSpacer(ADJUSTFORYDPI(10));
+ itemFlexGridSizer3->AddSpacer(10);
CTransparentStaticText* itemStaticText7 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("For additional settings, select Computing Preferences in the Advanced View."), wxDefaultPosition, wxDefaultSize, 0 );
@@ -291,14 +289,14 @@ void CPanelPreferences::CreateControls()
CTransparentStaticLine* itemStaticLine8 = new CTransparentStaticLine( itemDialog1, wxID_ANY, wxDefaultPosition, wxSize(300, 1), wxLI_HORIZONTAL|wxNO_BORDER );
itemStaticLine8->SetLineColor(pSkinSimple->GetStaticLineColor());
- itemBoxSizer2->Add(itemStaticLine8, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, ADJUSTFORXDPI(20));
+ itemBoxSizer2->Add(itemStaticLine8, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, 20);
wxFlexGridSizer* itemFlexGridSizer9 = new wxFlexGridSizer(1, 1, 0, 0);
itemFlexGridSizer9->AddGrowableCol(0);
- itemBoxSizer2->Add(itemFlexGridSizer9, 0, wxGROW|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer2->Add(itemFlexGridSizer9, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
- itemBoxSizer2->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT, ADJUSTFORXDPI(20));
+ itemBoxSizer2->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT, 20);
wxFlexGridSizer* itemFlexGridSizer15 = new wxFlexGridSizer(7, 2, 0, 0);
itemFlexGridSizer15->AddGrowableRow(0);
@@ -315,7 +313,7 @@ void CPanelPreferences::CreateControls()
CTransparentStaticText* itemStaticText16 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Do work only between:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText16->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
itemStaticText16->Wrap(250);
- itemFlexGridSizer15->Add(itemStaticText16, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemFlexGridSizer15->Add(itemStaticText16, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer15->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0);
@@ -323,21 +321,21 @@ void CPanelPreferences::CreateControls()
wxString* m_WorkBetweenBeginCtrlStrings = NULL;
m_WorkBetweenBeginCtrl = new wxComboBox( itemDialog1, ID_WORKBETWEENBEGIN, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_WorkBetweenBeginCtrlStrings, wxCB_READONLY );
m_WorkBetweenBeginCtrl->Enable(false);
- itemBoxSizer17->Add(m_WorkBetweenBeginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer17->Add(m_WorkBetweenBeginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText19 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("and"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText19->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
- itemBoxSizer17->Add(itemStaticText19, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemBoxSizer17->Add(itemStaticText19, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxString* m_WorkBetweenEndCtrlStrings = NULL;
m_WorkBetweenEndCtrl = new wxComboBox( itemDialog1, ID_WORKBETWEENEND, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_WorkBetweenEndCtrlStrings, wxCB_READONLY );
m_WorkBetweenEndCtrl->Enable(false);
- itemBoxSizer17->Add(m_WorkBetweenEndCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer17->Add(m_WorkBetweenEndCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText21 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Connect to internet only between:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText21->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
itemStaticText21->Wrap(250);
- itemFlexGridSizer15->Add(itemStaticText21, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemFlexGridSizer15->Add(itemStaticText21, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer15->Add(itemBoxSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0);
@@ -345,21 +343,21 @@ void CPanelPreferences::CreateControls()
wxString* m_ConnectBetweenBeginCtrlStrings = NULL;
m_ConnectBetweenBeginCtrl = new wxComboBox( itemDialog1, ID_CONNECTBETWEENBEGIN, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_ConnectBetweenBeginCtrlStrings, wxCB_READONLY );
m_ConnectBetweenBeginCtrl->Enable(false);
- itemBoxSizer22->Add(m_ConnectBetweenBeginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer22->Add(m_ConnectBetweenBeginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText24 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("and"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText24->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
- itemBoxSizer22->Add(itemStaticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemBoxSizer22->Add(itemStaticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxString* m_ConnectBetweenEndCtrlStrings = NULL;
m_ConnectBetweenEndCtrl = new wxComboBox( itemDialog1, ID_CONNECTBETWEENEND, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_ConnectBetweenEndCtrlStrings, wxCB_READONLY );
m_ConnectBetweenEndCtrl->Enable(false);
- itemBoxSizer22->Add(m_ConnectBetweenEndCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer22->Add(m_ConnectBetweenEndCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText26 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Use no more than:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText26->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
itemStaticText26->Wrap(250);
- itemFlexGridSizer15->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemFlexGridSizer15->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer27 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer15->Add(itemBoxSizer27, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
@@ -367,16 +365,16 @@ void CPanelPreferences::CreateControls()
wxString* m_MaxDiskUsageCtrlStrings = NULL;
m_MaxDiskUsageCtrl = new wxComboBox( itemDialog1, ID_MAXDISKUSAGE, _T(""), wxDefaultPosition, wxSize(-1, -1), 0, m_MaxDiskUsageCtrlStrings, wxCB_READONLY );
m_MaxDiskUsageCtrl->Enable(false);
- itemBoxSizer27->Add(m_MaxDiskUsageCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer27->Add(m_MaxDiskUsageCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText29 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("of disk space"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText29->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
- itemBoxSizer27->Add(itemStaticText29, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemBoxSizer27->Add(itemStaticText29, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
CTransparentStaticText* itemStaticText30 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Use no more than:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText30->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
itemStaticText30->Wrap(250);
- itemFlexGridSizer15->Add(itemStaticText30, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemFlexGridSizer15->Add(itemStaticText30, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer31 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer15->Add(itemBoxSizer31, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
@@ -384,16 +382,16 @@ void CPanelPreferences::CreateControls()
wxString* m_MaxCPUUsageCtrlStrings = NULL;
m_MaxCPUUsageCtrl = new wxComboBox( itemDialog1, ID_MAXCPUUSAGE, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_MaxCPUUsageCtrlStrings, wxCB_READONLY );
m_MaxCPUUsageCtrl->Enable(false);
- itemBoxSizer31->Add(m_MaxCPUUsageCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer31->Add(m_MaxCPUUsageCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText33 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("of the processor"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText33->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
- itemBoxSizer31->Add(itemStaticText33, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemBoxSizer31->Add(itemStaticText33, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
CTransparentStaticText* itemStaticText37 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Do work while on battery?"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText37->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
itemStaticText37->Wrap(250);
- itemFlexGridSizer15->Add(itemStaticText37, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemFlexGridSizer15->Add(itemStaticText37, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer38 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer15->Add(itemBoxSizer38, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
@@ -401,12 +399,12 @@ void CPanelPreferences::CreateControls()
m_WorkWhileOnBatteryCtrl = new wxCheckBox( itemDialog1, ID_WORKWHILEONBATTERY, _T(""), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_WorkWhileOnBatteryCtrl->SetValue(false);
m_WorkWhileOnBatteryCtrl->Enable(false);
- itemBoxSizer38->Add(m_WorkWhileOnBatteryCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer38->Add(m_WorkWhileOnBatteryCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText40 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("Do work after idle for:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText40->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
itemStaticText40->Wrap(250);
- itemFlexGridSizer15->Add(itemStaticText40, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemFlexGridSizer15->Add(itemStaticText40, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer41 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer15->Add(itemBoxSizer41, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
@@ -414,26 +412,26 @@ void CPanelPreferences::CreateControls()
wxString* m_WorkWhenIdleCtrlStrings = NULL;
m_WorkWhenIdleCtrl = new wxComboBox( itemDialog1, ID_WORKWHENIDLE, _T(""), wxDefaultPosition, wxSize(-1, -1), 0, m_WorkWhenIdleCtrlStrings, wxCB_READONLY );
m_WorkWhenIdleCtrl->Enable(false);
- itemBoxSizer41->Add(m_WorkWhenIdleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, ADJUSTFORXDPI(5));
+ itemBoxSizer41->Add(m_WorkWhenIdleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
CTransparentStaticText* itemStaticText43 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText43->SetFont(wxFont(SMALL_FONT, wxSWISS, wxNORMAL, wxNORMAL, false, _T("Arial")));
- itemBoxSizer41->Add(itemStaticText43, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, ADJUSTFORXDPI(5));
+ itemBoxSizer41->Add(itemStaticText43, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
- itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, 5);
wxButton* itemButton44 = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer44->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer44->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_btnClear = new wxButton( this, ID_SGPREFERENCESCLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnClear->SetToolTip( _("Clear all local preferences listed above and close the dialog") );
- itemBoxSizer44->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer44->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton45 = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer44->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer44->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#ifndef __WXMSW__
@@ -447,7 +445,7 @@ void CPanelPreferences::CreateControls()
#else
wxContextHelpButton* itemButton46 = new wxContextHelpButton(this);
#endif
- itemBoxSizer44->Add(itemButton46, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+ itemBoxSizer44->Add(itemButton46, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
// Set validators
@@ -531,16 +529,11 @@ void CPanelPreferences::OnEraseBackground( wxEraseEvent& event ) {
w = bmp.GetWidth();
h = bmp.GetHeight();
-#if TEST_BACKGROUND_WITH_MAGENTA_FILL
// Fill the dialog with a magenta color so people can detect when something
// is wrong
dc.SetBrush(wxBrush(wxColour(255,0,255)));
dc.SetPen(wxPen(wxColour(255,0,255)));
dc.DrawRectangle(0, 0, sz.GetWidth(), sz.GetHeight());
-#else
- wxColour bgColor(*pSkinSimple->GetDialogBackgroundImage()->GetBackgroundColor());
- SetBackgroundColour(bgColor);
-#endif
// Is the bitmap smaller than the window?
if ( (w < sz.x) || (h < sz.y) ) {
@@ -962,7 +955,7 @@ bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& c
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
SetForegroundColour(*wxBLACK);
-#if TEST_BACKGROUND_WITH_MAGENTA_FILL
+#ifdef __WXDEBUG__
SetBackgroundColour(wxColour(255, 0, 255));
#endif
diff --git a/clientgui/sg_PanelBase.h b/clientgui/sg_PanelBase.h
index db1ae6b..c5087ea 100644
--- a/clientgui/sg_PanelBase.h
+++ b/clientgui/sg_PanelBase.h
@@ -20,7 +20,6 @@
#include "sg_CustomControls.h"
#include "sg_BoincSimpleFrame.h"
-#include "MainDocument.h"
///////////////////////////////////////////////////////////////////////////
@@ -35,7 +34,7 @@
#define LARGE_FONT 16
#endif
-#define SIDEMARGINS ADJUSTFORXDPI(30)
+#define SIDEMARGINS 30
///////////////////////////////////////////////////////////////////////////////
diff --git a/clientgui/sg_ProjectPanel.cpp b/clientgui/sg_ProjectPanel.cpp
index bc20f9b..581c05d 100644
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
@@ -55,6 +55,8 @@ static wxString tempArray[] = {_T("String1"), _T("String2"), _T("String3"), _T("
static wxBitmap bmArray[3];
#endif
+#define SIDEMARGINS 30
+
CSimpleProjectPanel::CSimpleProjectPanel() {
}
@@ -85,10 +87,10 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxHORIZONTAL );
- bSizer1->AddSpacer(ADJUSTFORYDPI(5));
+ bSizer1->AddSpacer(5);
m_myProjectsLabel = new CTransparentStaticText( this, wxID_ANY, _("Projects:"), wxDefaultPosition, wxDefaultSize, 0 );
m_myProjectsLabel->Wrap( -1 );
- bSizer2->Add( m_myProjectsLabel, 0, wxRIGHT, ADJUSTFORXDPI(5) );
+ bSizer2->Add( m_myProjectsLabel, 0, wxRIGHT, 5 );
bSizer2->AddStretchSpacer();
int addProjectWidth, synchronizeWidth, y;
@@ -100,10 +102,10 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
);
bSizer2->Add( m_TaskAddProjectButton, 0, wxRIGHT | wxEXPAND | wxALIGN_RIGHT, SIDEMARGINS );
- bSizer1->Add( bSizer2, 0, wxEXPAND | wxTOP | wxLEFT, ADJUSTFORXDPI(10) );
+ bSizer1->Add( bSizer2, 0, wxEXPAND | wxTOP | wxLEFT, 10 );
#ifndef __WXMAC__
- bSizer1->AddSpacer(ADJUSTFORYDPI(5));
+ bSizer1->AddSpacer(5);
#endif
#if TESTBIGICONPOPUP
@@ -126,7 +128,7 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
bSizer1->Add( m_ProjectSelectionCtrl, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
#ifndef __WXMAC__
- bSizer1->AddSpacer(ADJUSTFORYDPI(8));
+ bSizer1->AddSpacer(8);
#endif
// Make sure m_TotalCreditValue string is large enough
@@ -137,7 +139,7 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
bSizer1->Add( m_TotalCreditValue, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(5));
+ bSizer1->AddSpacer(5);
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxHORIZONTAL );
@@ -151,20 +153,11 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
bSizer1->Add( bSizer3, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(10));
-
- // Temporarily insert a dummy entry so sizer can
- // get correct height of m_ProjectSelectionCtrl
- CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
- wxBitmap* defaultBM = pSkinSimple->GetProjectImage()->GetBitmap();
- m_ProjectSelectionCtrl->Insert("", *defaultBM, 0, (void*)NULL);
+ bSizer1->AddSpacer(10);
this->SetSizer( bSizer1 );
this->Layout();
- // Remove the dummy entry
- m_ProjectSelectionCtrl->Delete(0);
-
m_TaskAddProjectButton->SetToolTip(wxEmptyString);
m_TaskAddProjectButton->Disable();
}
@@ -539,29 +532,11 @@ wxBitmap* CSimpleProjectPanel::GetProjectSpecificBitmap(char* project_url) {
// Only update it if project specific is found
if(boinc_resolve_filename(GetProjectIconLoc(project_url).c_str(), defaultIcnPath, sizeof(defaultIcnPath)) == 0) {
- wxBitmap* projectBM;
+ wxBitmap* projectBM = new wxBitmap();
wxString strIconPath = wxString(defaultIcnPath,wxConvUTF8);
if (wxFile::Exists(strIconPath)) {
-#ifdef __WXMSW__
- if ((GetXDPIScaling() > 1.05) || (GetYDPIScaling() > 1.05)) {
- wxImage img = wxImage(strIconPath, wxBITMAP_TYPE_ANY);
- if (img.IsOk()) {
- img.Rescale((int) (img.GetWidth()*GetXDPIScaling()),
- (int) (img.GetHeight()*GetYDPIScaling()),
- wxIMAGE_QUALITY_BILINEAR
- );
- projectBM = new wxBitmap(img);
- if (projectBM->IsOk()) {
- return projectBM;
- }
- }
- } else
-#endif
- {
- projectBM = new wxBitmap();
- if ( projectBM->LoadFile(strIconPath, wxBITMAP_TYPE_ANY) ) {
- return projectBM;
- }
+ if ( projectBM->LoadFile(strIconPath, wxBITMAP_TYPE_ANY) ) {
+ return projectBM;
}
}
}
diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp
index 6628fe2..98b931a 100644
--- a/clientgui/sg_TaskPanel.cpp
+++ b/clientgui/sg_TaskPanel.cpp
@@ -28,8 +28,8 @@
#define SORTTASKLIST 1 /* TRUE to sort task selection control alphabetically */
-#define SLIDESHOWWIDTH ADJUSTFORXDPI(290)
-#define SLIDESHOWHEIGHT ADJUSTFORYDPI(126)
+#define SLIDESHOWWIDTH 290
+#define SLIDESHOWHEIGHT 126
#define SLIDESHOWBORDER 1
#define HIDEDEFAULTSLIDE 1
#define TESTALLDESCRIPTIONS 0
@@ -70,7 +70,7 @@ CScrolledTextBox::~CScrolledTextBox() {
void CScrolledTextBox::SetValue(const wxString& s) {
- int lineHeight, totalLines, totalWidth;
+ int lineHeight, totalLines, totalWidth, usableWidth;
wxString t = s;
// Delete sizer & its children (CTransparentStaticText objects)
@@ -85,15 +85,15 @@ void CScrolledTextBox::SetValue(const wxString& s) {
totalWidth = GetSize().GetWidth();
totalLines = Wrap(t, totalWidth, &lineHeight);
m_TextSizer->FitInside(this);
- SetScrollRate(1, lineHeight);
- int scrollLines = GetScrollLines(wxVERTICAL); // Returns 0 if no scrollbar
- if (scrollLines > 0) {
- int sbwidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+ usableWidth = GetClientSize().GetWidth();
+ if (usableWidth < totalWidth) {
// It has a vertical scroll bar, so wrap again for reduced width
m_TextSizer->Clear(true);
- totalLines = Wrap(t, totalWidth - sbwidth - SCROLLBARSPACER, &lineHeight);
+ totalLines = Wrap(t, usableWidth - SCROLLBARSPACER, &lineHeight);
m_TextSizer->FitInside(this);
}
+
+ SetScrollRate(1, lineHeight);
}
@@ -355,27 +355,25 @@ numSlides = 0;
ratio = 1.0;
xRatio = (double)SLIDESHOWWIDTH / (double)m_SlideBitmap.GetWidth();
yRatio = (double)SLIDESHOWHEIGHT / (double)m_SlideBitmap.GetHeight();
- ratio = xRatio;
+ if ( xRatio < ratio ) {
+ ratio = xRatio;
+ }
if ( yRatio < ratio ) {
ratio = yRatio;
}
- if ( (ratio < 0.95) || (ratio > 1.05) ) {
+ if ( ratio < 1.0 ) {
wxImage img = m_SlideBitmap.ConvertToImage();
- img.Rescale((int) (m_SlideBitmap.GetWidth()*ratio),
- (int) (m_SlideBitmap.GetHeight()*ratio),
- (ratio > 1.0) ? wxIMAGE_QUALITY_BILINEAR : wxIMAGE_QUALITY_BOX_AVERAGE
- );
+ img.Rescale((int) (m_SlideBitmap.GetWidth()*ratio), (int) (m_SlideBitmap.GetHeight()*ratio));
wxBitmap *bm = new wxBitmap(img);
m_SlideBitmap = *bm;
delete bm;
}
-
Refresh();
}
}
-void CSlideShowPanel::OnPaint(wxPaintEvent& WXUNUSED(event))
+void CSlideShowPanel::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
#if HIDEDEFAULTSLIDE
@@ -410,10 +408,10 @@ numSlides = 0;
if(m_SlideBitmap.Ok())
{
- dc.DrawBitmap(m_SlideBitmap,
- (w - m_SlideBitmap.GetWidth())/2,
- (h - m_SlideBitmap.GetHeight())/2
- );
+ dc.DrawBitmap(m_SlideBitmap,
+ (w - m_SlideBitmap.GetWidth())/2,
+ (h - m_SlideBitmap.GetHeight())/2
+ );
}
}
@@ -479,7 +477,7 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
m_myTasksLabel = new CTransparentStaticText( this, wxID_ANY, _("Tasks:"), wxDefaultPosition, wxDefaultSize, 0 );
m_myTasksLabel->Wrap( -1 );
- bSizer2->Add( m_myTasksLabel, 0, wxRIGHT, ADJUSTFORXDPI(5) );
+ bSizer2->Add( m_myTasksLabel, 0, wxRIGHT, 5 );
m_TaskSelectionCtrl = new CBOINCBitmapComboBox( this, ID_SGTASKSELECTOR, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
// TODO: Might want better wording for Task Selection Combo Box tooltip
@@ -487,16 +485,16 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
m_TaskSelectionCtrl->SetToolTip(str);
bSizer2->Add( m_TaskSelectionCtrl, 1, wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->Add( bSizer2, 0, wxEXPAND | wxTOP | wxLEFT, ADJUSTFORXDPI(10) );
+ bSizer1->Add( bSizer2, 0, wxEXPAND | wxTOP | wxLEFT, 10 );
- bSizer1->AddSpacer(ADJUSTFORYDPI(5));
+ bSizer1->AddSpacer(5);
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxHORIZONTAL );
m_TaskProjectLabel = new CTransparentStaticText( this, wxID_ANY, _("From:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TaskProjectLabel->Wrap( -1 );
- bSizer3->Add( m_TaskProjectLabel, 0, wxRIGHT, ADJUSTFORXDPI(5) );
+ bSizer3->Add( m_TaskProjectLabel, 0, wxRIGHT, 5 );
m_TaskProjectName = new CTransparentStaticText( this, wxID_ANY, wxT("SETI at home"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TaskProjectName->Wrap( -1 );
@@ -514,7 +512,7 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
bSizer1->Add( m_TaskApplicationName, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
#endif // SELECTBYRESULTNAME
- bSizer1->AddSpacer(ADJUSTFORYDPI(10));
+ bSizer1->AddSpacer(10);
m_SlideShowArea = new CSlideShowPanel(this);
m_SlideShowArea->SetMinSize(wxSize(SLIDESHOWWIDTH+(2*SLIDESHOWBORDER), SLIDESHOWHEIGHT+(2*SLIDESHOWBORDER)));
@@ -522,19 +520,19 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
bSizer1->Add( m_SlideShowArea, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(10));
+ bSizer1->AddSpacer(10);
m_ElapsedTimeValue = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_ElapsedTimeValue->Wrap( -1 );
bSizer1->Add( m_ElapsedTimeValue, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(7));
+ bSizer1->AddSpacer(7);
m_TimeRemainingValue = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TimeRemainingValue->Wrap( -1 );
bSizer1->Add( m_TimeRemainingValue, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(7));
+ bSizer1->AddSpacer(7);
wxBoxSizer* bSizer4;
bSizer4 = new wxBoxSizer( wxHORIZONTAL );
@@ -547,9 +545,9 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
m_ipctDoneX1000 = 100000;
m_ProgressBar->SetValue( 100 );
GetTextExtent(wxT("0"), &w, &h);
- m_ProgressBar->SetMinSize(wxSize(ADJUSTFORXDPI(245), h));
+ m_ProgressBar->SetMinSize(wxSize(245, h));
m_ProgressBar->SetToolTip(_("This task's progress"));
- bSizer4->Add( m_ProgressBar, 0, wxRIGHT, ADJUSTFORXDPI(5) );
+ bSizer4->Add( m_ProgressBar, 0, wxRIGHT, 5 );
m_ProgressValueText = new CTransparentStaticText( this, wxID_ANY, wxT("100.000%"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE );
m_ProgressValueText->Wrap( -1 );
@@ -557,20 +555,20 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
bSizer1->Add( bSizer4, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(7));
+ bSizer1->AddSpacer(7);
// TODO: Can we determine the longest status string and initialize with it?
m_StatusValueText = new CTransparentStaticText( this, wxID_ANY, m_sNoProjectsString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_StatusValueText->Wrap( -1 );
bSizer1->Add( m_StatusValueText, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(7));
+ bSizer1->AddSpacer(7);
m_TaskCommandsButton = new CSimpleTaskPopupButton( this, ID_TASKSCOMMANDBUTTON, _("Task Commands"), wxDefaultPosition, wxDefaultSize, 0 );
m_TaskCommandsButton->SetToolTip(_("Pop up a menu of commands to apply to this task"));
bSizer1->Add( m_TaskCommandsButton, 0, wxLEFT | wxRIGHT | wxEXPAND | wxALIGN_CENTER_HORIZONTAL, SIDEMARGINS );
- bSizer1->AddSpacer(ADJUSTFORYDPI(10));
+ bSizer1->AddSpacer(10);
this->SetSizer( bSizer1 );
this->Layout();
diff --git a/clientgui/stdwx.h b/clientgui/stdwx.h
index 2c0bb5a..82eee92 100644
--- a/clientgui/stdwx.h
+++ b/clientgui/stdwx.h
@@ -122,7 +122,6 @@
#include <wx/snglinst.h>
#include <wx/bmpcbox.h>
#include <wx/evtloop.h>
-#include <wx/display.h>
#ifdef _WIN32
diff --git a/configure.ac b/configure.ac
index 1bb4555..f9c3a57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.4.35)
+AC_INIT(BOINC, 7.4.37)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
@@ -108,6 +108,12 @@ AC_ARG_ENABLE(install-headers,
[enable_install_headers=${enableval}],
[enable_install_headers=yes])
+AC_ARG_ENABLE(xss,
+ AS_HELP_STRING([--disable-xss],
+ [disable building the boinc client with the Xss library]),
+ [enable_xss=${enableval}],
+ [enable_xss=yes])
+
AC_ARG_ENABLE(boinczip,
AS_HELP_STRING([--enable-boinczip],
[enable building the boinc zip library]),
@@ -593,6 +599,15 @@ fi
AM_CONDITIONAL(BUILD_GRAPHICS_API, [ test "$have_glut" = yes -a "$have_jpeg" = 1])
+dnl check for X screen saver lib
+if test "$enable_xss" == yes; then
+ AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo], [have_Xss="yes"], [have_Xss="no"])
+ AC_CHECK_HEADER([X11/extensions/scrnsaver.h], [have_Xss="yes"], [have_Xss="no"])
+ if test "$have_Xss" == no; then
+ AC_MSG_WARN([libxss missing, disabling X ScreenSaver user idle detection])
+ fi
+fi
+
dnl --------------------------------------------------------------------------------
dnl put double-inclusion protection into config.h
AH_TOP([
@@ -878,14 +893,16 @@ fi
dnl ---------- libNotify --------------------------------------------------
if test "${enable_manager}" = yes ; then
- PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
-fi
-
-dnl ---------- GTK2 -------------------------------------------------------
-if test "${enable_manager}" = yes ; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+ pkg_config_args=libnotify
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ LIBNOTIFY_CFLAGS=`$PKG_CONFIG libnotify --cflags`
+ LIBNOTIFY_LIBS=`$PKG_CONFIG libnotify --libs`
+
+ AC_SUBST(LIBNOTIFY_CFLAGS)
+ AC_SUBST(LIBNOTIFY_LIBS)
fi
-
+
dnl ---------- Sqlite3 ----------------------------------------------------
if test "${enable_manager}" = yes ; then
AM_PATH_SQLITE3
@@ -986,6 +1003,19 @@ if test "${ac_cv_func_res_init}" != "yes" ; then
fi
LIBS=$svlibs
+if (test "$enable_xss" == yes) && (test "$have_Xss" == yes); then
+ SAH_CHECK_LIB([Xext],[DPMSQueryExtension],[
+ AC_DEFINE([HAVE_DPMS],[1],[Define to 1 if you have xcb-dpms library])
+ CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+ SAH_CHECK_LIB([Xss],[XScreenSaverAllocInfo],[
+ AC_DEFINE([HAVE_XSS],[1],[Define to 1 if you have xss library])
+ CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+ SAH_CHECK_LIB([X11],[XOpenDisplay],[
+ AC_DEFINE([HAVE_X11],[1],[Define to 1 if you have X11 library])
+ CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+ echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+fi
+
SAH_CHECK_LIB([resolv],[res_query],[
AC_DEFINE([HAVE_RESOLV],[1],[Define to 1 if you have the resolv library])
CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
@@ -1027,7 +1057,7 @@ AC_ARG_ENABLE(wx-debug,
],
[enable_wx_debug="no"])
-CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}"
+CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS} ${GTK_LIBS}"
if test "${enable_client_release}" = "yes" ; then
if test "x${WX_LIBS_STATIC}" = "x" ; then
diff --git a/doc/projects.inc b/doc/projects.inc
index a4350c6..0ee41e5 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -253,8 +253,7 @@ $astro_phys_chem = array(
"http://pogs.theskynet.org/pogs/",
"The International Centre for Radio Astronomy Research (Perth, Australia)",
tra("Astronomy"),
- tra("TheSkyNet POGS is an astronomy project studying 16 different properties of galaxies, including brightness, mass, amount of dust and how fast stars are forming. We are using your processing power to conduct pixel-by-pixel calculations on multi-wavelength (ultraviolet, optical and near-infrared light) images of galaxies to produce an atlas that will help astronomers to better understand the distant universe."),
-
+ tra("We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby Universe. We will measure physical parameters (such as stellar mass surface density, star formation rate surface density, attenuation, and first-order star formation history) on a resolved pixel-by-pixel basis using spectral energy distribution (SED) fitting techniques in a distributed computing mode."),
"",
"",
"Analyze images of space"
diff --git a/html/languages/translations/da.po b/html/languages/translations/da.po
index 64aad77..925f102 100644
--- a/html/languages/translations/da.po
+++ b/html/languages/translations/da.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC Project (Generic) 6.x\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
+"POT-Creation-Date: 2013-10-29 10:57 PDT\n"
"PO-Revision-Date: 2013-10-12 18:56+0000\n"
"Last-Translator: pryds <thomas at pryds.eu>\n"
"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
@@ -194,19 +194,19 @@ msgstr "Søg i forummet"
msgid "Advanced search"
msgstr "Avanceret søgning"
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:252 ../user/pm.php:69
#: ../user/pm.php:133
msgid "Private messages"
msgstr "Personlige beskeder"
#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../user/forum_forum.php:71 ../user/sample_index.php:119
msgid "Questions and Answers"
msgstr "Spørgsmål og svar (Q&A)"
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
+#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:249
+#: ../inc/user.inc:374 ../user/bs_sample_index.php:62
+#: ../user/forum_forum.php:73 ../user/sample_index.php:118
#: ../project.sample/project.inc:43
msgid "Message boards"
msgstr "Forum"
@@ -278,7 +278,7 @@ msgstr "ulæst"
msgid "Message %1"
msgstr "Meddelelse"
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:330 ../user/forum_forum.php:174
msgid "hidden"
msgstr "skjult"
@@ -478,7 +478,7 @@ msgstr ""
msgid "Thread"
msgstr "Emne"
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:127 ../user/forum_forum.php:136
#: ../user/forum_index.php:94
msgid "Posts"
msgstr "Indlæg"
@@ -487,7 +487,7 @@ msgstr "Indlæg"
msgid "Views"
msgstr "Visninger"
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:127 ../user/forum_forum.php:139
#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
msgid "Last post"
msgstr "Sidste indlæg"
@@ -528,7 +528,7 @@ msgid "Home"
msgstr ""
#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../user/server_status.php:329
msgid "Work"
msgstr ""
@@ -595,9 +595,9 @@ msgid "Created"
msgstr "Opret"
#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
+#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:214
+#: ../inc/team.inc:219 ../inc/team.inc:221 ../inc/team.inc:363
+#: ../inc/team.inc:368 ../inc/user.inc:125 ../inc/user.inc:138
#: ../user/profile_search_action.php:43
#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
@@ -689,7 +689,7 @@ msgstr ""
#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
#: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
#: ../inc/result.inc:278 ../user/explain_state.php:56
-#: ../user/host_app_versions.php:30
+#: ../user/host_app_versions.php:29
msgid "Unknown"
msgstr ""
@@ -697,7 +697,7 @@ msgstr ""
msgid "Average download rate"
msgstr ""
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:169 ../user/host_app_versions.php:64
msgid "Average turnaround time"
msgstr ""
@@ -775,7 +775,7 @@ msgstr ""
msgid "Computer info"
msgstr ""
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:356
#: ../user/top_users.php:48
msgid "Rank"
msgstr "Rang"
@@ -784,9 +784,9 @@ msgstr "Rang"
msgid "Avg. credit"
msgstr ""
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
+#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:215
+#: ../inc/team.inc:224 ../inc/team.inc:226 ../inc/team.inc:362
+#: ../inc/team.inc:367 ../inc/user.inc:139
#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
#: ../user/top_users.php:58
@@ -877,9 +877,9 @@ msgstr ""
msgid "Computer ID"
msgstr "Computere"
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
+#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:209
+#: ../inc/team.inc:357 ../inc/user.inc:199 ../user/account_finish.php:41
+#: ../user/create_account_form.php:80 ../user/team_admins.php:62
#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
#: ../user/top_users.php:49 ../user/user_search.php:139
msgid "Name"
@@ -889,7 +889,7 @@ msgstr "Navn"
msgid "BOINC<br>version"
msgstr ""
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:745 ../user/merge_by_name.php:67
msgid "Merge computers by name"
msgstr ""
@@ -914,12 +914,12 @@ msgstr "Indbakke"
msgid "Write"
msgstr "Skriv"
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:377
msgid "Send private message"
msgstr "Send personlig meddelelse"
#: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
-#: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
+#: ../user/ffmail_form.php:59 ../user/forum_edit.php:99
#: ../user/forum_edit.php:101 ../user/forum_edit.php:145
#: ../user/forum_post.php:61 ../user/forum_post.php:87
#: ../user/forum_post.php:89 ../user/forum_post.php:130
@@ -1100,7 +1100,7 @@ msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
msgstr ""
#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
+#: ../inc/util.inc:258
msgid "days"
msgstr ""
@@ -1176,7 +1176,7 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr ""
#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
+msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
msgstr ""
#: ../inc/prefs.inc:358
@@ -1286,7 +1286,7 @@ msgstr ""
msgid "Primary (default) preferences"
msgstr ""
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
+#: ../inc/prefs.inc:871 ../user/add_venue.php:43 ../user/add_venue.php:67
#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
#: ../user/prefs_edit.php:92
#, fuzzy
@@ -1345,41 +1345,41 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: ../inc/profile.inc:193
+#: ../inc/profile.inc:192
msgid ""
"To prevent spam, profiles of users with an average credit of less than %1 "
"are displayed only to logged-in users. We apologize for this inconvenience."
msgstr ""
-#: ../inc/profile.inc:197
+#: ../inc/profile.inc:196
msgid "User is banished"
msgstr ""
-#: ../inc/profile.inc:211
+#: ../inc/profile.inc:210
msgid "No profile exists for that user ID."
msgstr ""
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:218 ../user/create_profile.php:313
msgid "Edit your profile"
msgstr ""
-#: ../inc/profile.inc:262
+#: ../inc/profile.inc:261
msgid "Your feedback on this profile"
msgstr ""
-#: ../inc/profile.inc:264
+#: ../inc/profile.inc:263
msgid "Recommend this profile for User of the Day:"
msgstr ""
-#: ../inc/profile.inc:265
+#: ../inc/profile.inc:264
msgid "I %1like%2 this profile"
msgstr ""
-#: ../inc/profile.inc:268
+#: ../inc/profile.inc:267
msgid "Alert administrators to an offensive profile:"
msgstr ""
-#: ../inc/profile.inc:269
+#: ../inc/profile.inc:268
msgid "I %1do not like%2 this profile"
msgstr ""
@@ -1387,7 +1387,7 @@ msgstr ""
msgid "Anonymous platform"
msgstr ""
-#: ../inc/result.inc:53 ../user/host_app_versions.php:26
+#: ../inc/result.inc:53
msgid "NVIDIA GPU"
msgstr ""
@@ -1395,7 +1395,7 @@ msgstr ""
msgid "ATI GPU"
msgstr ""
-#: ../inc/result.inc:57 ../user/host_app_versions.php:28
+#: ../inc/result.inc:57
msgid "Intel GPU"
msgstr ""
@@ -1653,7 +1653,7 @@ msgstr ""
msgid "explain"
msgstr ""
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:376 ../user/server_status.php:256
msgid "Status"
msgstr ""
@@ -1749,17 +1749,17 @@ msgstr "Nøgleord"
msgid "Find teams with these words in their names or descriptions"
msgstr "Find hold med disse ord i deres navn eller beskrivelse"
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
+#: ../inc/team.inc:43 ../inc/team.inc:121 ../inc/team.inc:232
+#: ../inc/team.inc:372 ../inc/team.inc:456 ../inc/user.inc:205
+#: ../inc/user.inc:316 ../user/account_finish.php:45
+#: ../user/create_account_form.php:99 ../user/edit_user_info_form.php:40
#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
#: ../user/team_search.php:72 ../user/top_users.php:63
#: ../user/user_search.php:53 ../user/user_search.php:140
msgid "Country"
msgstr "Land"
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:454
msgid "Type of team"
msgstr "Holdets type"
@@ -1767,7 +1767,7 @@ msgstr "Holdets type"
msgid "Show only active teams"
msgstr "Vis kun aktive hold"
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:77 ../user/user_search.php:70
msgid "Search"
msgstr "Søg"
@@ -1787,8 +1787,8 @@ msgstr "Startet af dig"
msgid "founder response deadline is %1"
msgstr "deadline for grundlæggerens svar er %1"
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:556 ../inc/user.inc:280
+#: ../inc/user.inc:370
msgid "None"
msgstr "Ingen"
@@ -1812,28 +1812,28 @@ msgstr "Beskrivelse"
msgid "Web site"
msgstr "Website"
-#: ../inc/team.inc:120
+#: ../inc/team.inc:119
#, fuzzy
msgid "Cross-project stats"
msgstr "Cross-project statistik"
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
msgid "Type"
msgstr "Type"
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:126 ../user/team_manage.php:63
msgid "Message board"
msgstr "Forum"
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "Emner"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:135
msgid "Join this team"
msgstr "Bliv medlem"
-#: ../inc/team.inc:137
+#: ../inc/team.inc:136
msgid ""
"Note: if 'OK to email' is set in your project preferences, joining a team "
"gives its founder access to your email address."
@@ -1842,79 +1842,79 @@ msgstr ""
"lederen af det hold du bliver medlem i få adgang til din email "
"addresse."
-#: ../inc/team.inc:140
+#: ../inc/team.inc:139
msgid "Not accepting new members"
msgstr "Accepterer ikke nye medlemmer"
-#: ../inc/team.inc:147
+#: ../inc/team.inc:146
msgid "Foundership change requested"
msgstr ""
-#: ../inc/team.inc:148
+#: ../inc/team.inc:147
msgid "Respond by %1"
msgstr ""
-#: ../inc/team.inc:152
+#: ../inc/team.inc:151
msgid "Team foundership change"
msgstr ""
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:155 ../inc/team.inc:358
msgid "Members"
msgstr "Medlemmer"
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:156 ../inc/team.inc:253
msgid "Founder"
msgstr "Hold-leder"
-#: ../inc/team.inc:169
+#: ../inc/team.inc:168
msgid "Admins"
msgstr "Admins"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:183
msgid "New members in last day"
msgstr "Nye medlemmer siden igår"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:184
msgid "Total members"
msgstr "Medlemmer ialt"
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
msgid "view"
msgstr "se"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:185
msgid "Active members"
msgstr "Aktive medlemmer"
-#: ../inc/team.inc:187
+#: ../inc/team.inc:186
msgid "Members with credit"
msgstr "Medlemmer med points"
-#: ../inc/team.inc:256
+#: ../inc/team.inc:255
msgid "Admin"
msgstr "Admin"
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
#: ../user/top_hosts.php:93 ../user/top_teams.php:121
#: ../user/top_users.php:127
msgid "Previous %1"
msgstr ""
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:280 ../user/forum_user_posts.php:131
#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
#: ../user/top_teams.php:126 ../user/top_users.php:132
msgid "Next %1"
msgstr "Næste %1"
-#: ../inc/team.inc:289
+#: ../inc/team.inc:288
msgid "No such team."
msgstr "Holdet findes ikke."
-#: ../inc/team.inc:302
+#: ../inc/team.inc:301
msgid "This operation requires foundership."
msgstr "Denne funktion kræver at du er leder af holdet."
-#: ../inc/team.inc:326
+#: ../inc/team.inc:325
msgid "This operation requires team admin privileges"
msgstr "Denne funktion kræver at du har hold-administrator rettigheder"
@@ -1924,7 +1924,7 @@ msgid ""
"be overwritten. Edit the %1BOINC-wide team%2 instead."
msgstr ""
-#: ../inc/team.inc:428
+#: ../inc/team.inc:429
msgid ""
"%1Privacy note%2: if you create a team, your project preferences (resource "
"share, graphics preferences) will be visible to the public."
@@ -1933,48 +1933,48 @@ msgstr ""
"(dvs. resource-fordeling, grafik-indstillinger osv.) blive "
"tilgængelige for offentligheden."
-#: ../inc/team.inc:432
+#: ../inc/team.inc:433
msgid "Team name, text version"
msgstr "Hold navn, rentekst-udgave"
-#: ../inc/team.inc:433
+#: ../inc/team.inc:434
msgid "Don't use HTML tags."
msgstr "Brug ikke HTML tags."
-#: ../inc/team.inc:436
+#: ../inc/team.inc:437
msgid "Team name, HTML version"
msgstr "Hold navn, HTML-udgave"
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:439 ../inc/team.inc:449
msgid "You may use %1limited HTML tags%2."
msgstr "Du kan bruge %1nogle HTML tags%2."
-#: ../inc/team.inc:439
+#: ../inc/team.inc:440
msgid "If you don't know HTML, leave this box blank."
msgstr "Hvis ikke du kan HTML kan du lade feltet være tomt."
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "URL of team web page, if any"
msgstr "Holdets hjemmeside-URL, hvis den findes"
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "without \"http://\""
msgstr "uden \"http://\""
-#: ../inc/team.inc:443
+#: ../inc/team.inc:444
msgid "This URL will be linked to from the team's page on this site."
msgstr ""
"Der vil blive linket til denne URL fra holdets side på dette website."
-#: ../inc/team.inc:446
+#: ../inc/team.inc:447
msgid "Description of team"
msgstr "Beskrivelse af holdet"
-#: ../inc/team.inc:462
+#: ../inc/team.inc:463
msgid "Accept new members?"
msgstr ""
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:27
msgid "User profile"
msgstr ""
@@ -2007,7 +2007,7 @@ msgid "Computers on this account"
msgstr "Computere på denne konto"
#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
+#: ../inc/user.inc:242 ../inc/user.inc:328 ../inc/user.inc:401
#: ../user/view_profile.php:64
msgid "View"
msgstr "Se"
@@ -2024,8 +2024,8 @@ msgstr "Cross-project statistik"
msgid "Account"
msgstr ""
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:280 ../inc/user.inc:368
+#: ../inc/user.inc:370 ../user/user_search.php:139
msgid "Team"
msgstr "Hold"
@@ -2049,12 +2049,12 @@ msgstr ""
msgid "Account information"
msgstr "Konto-information"
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
+#: ../inc/user.inc:200 ../user/edit_passwd_form.php:48
#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
msgid "Email address"
msgstr "Emailaddresse"
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:203 ../inc/user.inc:321
msgid "URL"
msgstr "URL"
@@ -2062,7 +2062,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "Postboks (områdenummer)"
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:207 ../inc/user.inc:315
msgid "%1 member since"
msgstr "Medlem af %1 siden"
@@ -2082,7 +2082,7 @@ msgstr "password"
msgid "other account info"
msgstr "anden konto-information"
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:213 ../inc/user.inc:314
msgid "User ID"
msgstr "Bruger ID"
@@ -2119,180 +2119,184 @@ msgstr "Forum-indstillinger"
msgid "Preferences for this project"
msgstr ""
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:233 ../user/prefs.php:32
msgid "%1 preferences"
msgstr "%1-indstillinger"
#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../user/sample_index.php:114
msgid "Community"
msgstr ""
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "Slet"
-#: ../inc/user.inc:245
+#: ../inc/user.inc:244
msgid "Create"
msgstr "Opret"
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
+#: ../inc/user.inc:246 ../inc/user.inc:401 ../inc/util.inc:498
msgid "Profile"
msgstr "Profil"
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:249 ../inc/user.inc:374
msgid "%1 posts"
msgstr "%1 indlæg"
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "Notificering"
-#: ../inc/user.inc:269
+#: ../inc/user.inc:268
msgid "Quit team"
msgstr "Forlad holdet"
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:270 ../inc/user.inc:287
msgid "Administer"
msgstr "Administrer"
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:276 ../inc/user.inc:289
msgid "(foundership change request pending)"
msgstr ""
-#: ../inc/user.inc:279
+#: ../inc/user.inc:278
msgid "Member of team"
msgstr "Medlem af hold"
-#: ../inc/user.inc:281
+#: ../inc/user.inc:280
msgid "find a team"
msgstr "find et hold"
-#: ../inc/user.inc:292
+#: ../inc/user.inc:291
msgid "Founder but not member of"
msgstr "Leder men ikke medlem af"
-#: ../inc/user.inc:298
+#: ../inc/user.inc:297
msgid "Find friends"
msgstr "Find venner"
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
+#: ../inc/user.inc:386 ../inc/user.inc:395
msgid "Friends"
msgstr "Venner"
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
msgid "Computers"
msgstr "Computere"
-#: ../inc/user.inc:338
+#: ../inc/user.inc:337
msgid "Donor"
msgstr "Donor"
-#: ../inc/user.inc:378
+#: ../inc/user.inc:377
msgid "Contact"
msgstr "Kontakt"
-#: ../inc/user.inc:381
+#: ../inc/user.inc:380
msgid "This person is a friend"
msgstr "Denne person er en ven"
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:381 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "Afbryd venskab"
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:384 ../user/friend.php:37
msgid "Request pending"
msgstr "Forespørgsel igang"
-#: ../inc/user.inc:387
+#: ../inc/user.inc:386
msgid "Add as friend"
msgstr "Tilføj som ven"
-#: ../inc/user.inc:446
+#: ../inc/user.inc:445
msgid "user name cannot have leading or trailing white space"
msgstr ""
-#: ../inc/user.inc:450
+#: ../inc/user.inc:449
msgid "user name must be nonempty"
msgstr ""
-#: ../inc/user.inc:454
+#: ../inc/user.inc:453
msgid "user name may not contain HTML tags"
msgstr ""
-#: ../inc/util.inc:131
+#: ../inc/util.inc:116
#, fuzzy
msgid "log out"
msgstr "Log ud"
-#: ../inc/util.inc:133
+#: ../inc/util.inc:118
msgid "log in"
msgstr ""
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
+#: ../inc/util.inc:188 ../user/login_form.php:30 ../user/login_form.php:55
msgid "Log in"
msgstr ""
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:189 ../user/create_account_form.php:31
msgid "Create an account"
msgstr "Opret en konto"
-#: ../inc/util.inc:206
+#: ../inc/util.inc:190
msgid "Server status page"
msgstr ""
-#: ../inc/util.inc:248
+#: ../inc/util.inc:232
msgid ""
"A database error occurred while handling your request; please try again "
"later."
msgstr ""
-#: ../inc/util.inc:257
+#: ../inc/util.inc:241
msgid "Unable to handle request"
msgstr ""
-#: ../inc/util.inc:277
+#: ../inc/util.inc:261
msgid "hours"
msgstr ""
-#: ../inc/util.inc:280
+#: ../inc/util.inc:264
msgid "min"
msgstr ""
-#: ../inc/util.inc:283
+#: ../inc/util.inc:267
msgid "sec"
msgstr ""
-#: ../inc/util.inc:444
+#: ../inc/util.inc:428
msgid "Link has timed out. Please click Back, refresh the page, and try again."
msgstr ""
-#: ../inc/util.inc:513
+#: ../inc/util.inc:497
msgid "View the profile of %1"
msgstr ""
-#: ../inc/util.inc:569
+#: ../inc/util.inc:553
msgid "Use BBCode tags to format your text"
msgstr "Du kan bruge BBCode-tags til at formatere din tekst"
-#: ../inc/util.inc:796
+#: ../inc/util.inc:780
msgid "Project down for maintenance"
msgstr ""
-#: ../inc/util.inc:799
+#: ../inc/util.inc:783
msgid "%1 is temporarily shut down for maintenance. Please try again later."
msgstr ""
-#: ../inc/util.inc:817
+#: ../inc/util.inc:801
msgid "Unable to connect to database - please try again later"
msgstr ""
-#: ../inc/util.inc:821
+#: ../inc/util.inc:802
+msgid "Error:"
+msgstr ""
+
+#: ../inc/util.inc:806
msgid "Unable to select database - please try again later"
msgstr ""
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr ""
@@ -2300,21 +2304,21 @@ msgstr ""
msgid "Finish account setup"
msgstr ""
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
+#: ../user/account_finish.php:41 ../user/create_account_form.php:80
msgid "Identifies you on our web site. Use your real name or a nickname."
msgstr ""
"Identificerer dig på vores website. Brug dit rigtige navn eller et "
"dæknavn."
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
+#: ../user/account_finish.php:45 ../user/create_account_form.php:99
msgid "Select the country you want to represent, if any."
msgstr "Vælg det land, om noget, du gerne vil repræsentere."
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
+#: ../user/account_finish.php:51 ../user/create_account_form.php:105
msgid "Postal or ZIP Code"
msgstr "Postbox (områdenummer)"
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
+#: ../user/account_finish.php:51 ../user/create_account_form.php:105
msgid "Optional"
msgstr "Ikke påkrævet"
@@ -2327,12 +2331,12 @@ msgstr "Du skal angive en invitationskode for at oprette en konto."
msgid "HTML tags not allowed in name"
msgstr ""
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:85
msgid "Add %1 preferences for %2"
msgstr ""
#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/sample_index.php:109
msgid "Applications"
msgstr "Applikationer"
@@ -2492,17 +2496,17 @@ msgstr "Hold"
msgid "create or join a team"
msgstr ""
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
+#: ../user/bs_sample_index.php:51 ../user/sample_index.php:180
#, fuzzy
msgid "User of the day"
msgstr "Dagens Bruger"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
msgid "Server status"
msgstr ""
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
+#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:35
+#: ../user/sample_index.php:116
msgid "Profiles"
msgstr "Profiler"
@@ -2539,7 +2543,7 @@ msgid "Languages"
msgstr ""
#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
+#: ../user/sample_index.php:74
msgid "Read our rules and policies"
msgstr "Læs vores regler og politik"
@@ -2552,52 +2556,69 @@ msgstr "Opret brugerkonto"
msgid "Click your browser's <b>Back</b> button to try again."
msgstr ""
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:38 ../user/create_account_action.php:40
+#: ../user/create_account_form.php:36
+msgid "Account creation is disabled"
+msgstr "Der er lukket for oprettelse af nye brugerkonti"
+
+#: ../user/create_account_action.php:41
+msgid ""
+"Sorry, this project has disabled the creation of new accounts.\n"
+"Please try again later."
+msgstr ""
+
+#: ../user/create_account_action.php:53
msgid "Your reCAPTCHA response was not correct. Please try again."
msgstr ""
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:77
msgid "You must supply an invitation code to create an account."
msgstr "Du skal angive en invitationskode for at oprette en konto."
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:80
msgid "The invitation code you gave is not valid."
msgstr "Den invitationskode du angav var ikke korrekt."
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:91
#, fuzzy
msgid ""
"Invalid email address: you must enter a valid address of the form name at domain"
msgstr "Det skal være en gyldig adresse på formen 'navn at domain'."
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:95
msgid "There's already an account with that email address."
msgstr ""
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:33
msgid "New passwords are different"
msgstr ""
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:108 ../user/edit_passwd_action.php:41
msgid "Passwords may only include ASCII characters."
msgstr ""
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:113 ../user/edit_passwd_action.php:45
msgid "New password is too short: minimum password length is %1 characters."
msgstr ""
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:134
#, fuzzy
msgid "Couldn't create account"
msgstr "Opret brugerkonto"
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:37
+msgid "Account creation is currently disabled. Please try again later."
+msgstr ""
+"Der er midlertidigt lukket for oprettelse af nye brugerkonto, men "
+"prøv igen senere."
+
+#: ../user/create_account_form.php:46
msgid ""
"NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
"select Add Project, and enter an email address and password."
msgstr ""
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:62
msgid ""
"This account will belong to the team %1 and will have the project "
"preferences of its founder."
@@ -2605,39 +2626,39 @@ msgstr ""
"Denne brugerkonto vil blive tilmeldt holder '%1' og vil få tildelt "
"projekt-indstillingers fra dette holds leder."
-#: ../user/create_account_form.php:73
+#: ../user/create_account_form.php:74
msgid "Invitation Code"
msgstr "Invitationskode"
-#: ../user/create_account_form.php:73
+#: ../user/create_account_form.php:74
msgid "A valid invitation code is required to create an account."
msgstr "A valid invitation code is required to create an account."
-#: ../user/create_account_form.php:83
+#: ../user/create_account_form.php:84
msgid "Email Address"
msgstr "Emailaddresse"
-#: ../user/create_account_form.php:83
+#: ../user/create_account_form.php:84
msgid "Must be a valid address of the form 'name at domain'."
msgstr "Det skal være en gyldig adresse på formen 'navn at domain'."
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
+#: ../user/create_account_form.php:93 ../user/edit_email_form.php:49
msgid "Password"
msgstr "Password"
-#: ../user/create_account_form.php:93
+#: ../user/create_account_form.php:94
msgid "Must be at least %1 characters"
msgstr "Skal være på mindst %1 bogstaver"
-#: ../user/create_account_form.php:96
+#: ../user/create_account_form.php:97
msgid "Confirm password"
msgstr "Bekræft password"
-#: ../user/create_account_form.php:113
+#: ../user/create_account_form.php:114
msgid "Please enter the words shown in the image"
msgstr ""
-#: ../user/create_account_form.php:119
+#: ../user/create_account_form.php:120
msgid "Create account"
msgstr "Opret brugerkonto"
@@ -2787,7 +2808,7 @@ msgstr ""
#: ../user/delete_account.php:79 ../user/delete_profile.php:52
#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/prefs_remove.php:55 ../user/user_search.php:59
#: ../user/user_search.php:64
msgid "Yes"
msgstr ""
@@ -3003,26 +3024,26 @@ msgstr ""
"Der er midlertidigt lukket for oprettelse af nye brugerkonto, men "
"prøv igen senere."
-#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
+#: ../user/edit_email_form.php:29 ../user/edit_email_form.php:53
msgid "Change email address"
msgstr ""
-#: ../user/edit_email_form.php:36
+#: ../user/edit_email_form.php:38
#, fuzzy
msgid "Change the email address of your account"
msgstr "emailaddresse"
-#: ../user/edit_email_form.php:37
+#: ../user/edit_email_form.php:39
#, fuzzy
msgid "New email address"
msgstr "emailaddresse"
-#: ../user/edit_email_form.php:38
+#: ../user/edit_email_form.php:40
#, fuzzy
msgid "Must be a valid address of the form 'name at domain'"
msgstr "Det skal være en gyldig adresse på formen 'navn at domain'."
-#: ../user/edit_email_form.php:48
+#: ../user/edit_email_form.php:50
msgid "No password?"
msgstr ""
@@ -3244,8 +3265,8 @@ msgstr ""
msgid "Invalid password"
msgstr "Bekræft password"
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:28
+#: ../user/edit_passwd_form.php:58
msgid "Change password"
msgstr ""
@@ -3263,36 +3284,36 @@ msgstr ""
"Der er midlertidigt lukket for oprettelse af nye brugerkonto, men "
"prøv igen senere."
-#: ../user/edit_passwd_form.php:39
+#: ../user/edit_passwd_form.php:42
msgid "You can identify yourself using either"
msgstr ""
-#: ../user/edit_passwd_form.php:41
+#: ../user/edit_passwd_form.php:44
msgid "your email address and old password"
msgstr ""
-#: ../user/edit_passwd_form.php:42
+#: ../user/edit_passwd_form.php:45
#, fuzzy
msgid "your account key"
msgstr "Svag kontonøgle"
-#: ../user/edit_passwd_form.php:46
+#: ../user/edit_passwd_form.php:49
msgid "Current password"
msgstr ""
-#: ../user/edit_passwd_form.php:48
+#: ../user/edit_passwd_form.php:51
msgid "<b>OR</b>: Account key"
msgstr ""
-#: ../user/edit_passwd_form.php:49
+#: ../user/edit_passwd_form.php:52
msgid "Get account key by email"
msgstr ""
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:56
msgid "New password"
msgstr ""
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:57
msgid "New password, again"
msgstr ""
@@ -3309,24 +3330,24 @@ msgstr "Du skal angive en invitationskode for at oprette en konto."
msgid "Couldn't update user info."
msgstr ""
-#: ../user/edit_user_info_form.php:27
+#: ../user/edit_user_info_form.php:29
#, fuzzy
msgid "Edit account information"
msgstr "Konto-information"
-#: ../user/edit_user_info_form.php:32
+#: ../user/edit_user_info_form.php:34
msgid "Name %1 real name or nickname%2"
msgstr ""
-#: ../user/edit_user_info_form.php:35
+#: ../user/edit_user_info_form.php:37
msgid "URL %1 of your web page; optional%2"
msgstr ""
-#: ../user/edit_user_info_form.php:43
+#: ../user/edit_user_info_form.php:45
msgid "Postal (ZIP) code %1 Optional%2"
msgstr ""
-#: ../user/edit_user_info_form.php:47
+#: ../user/edit_user_info_form.php:49
msgid "Update info"
msgstr ""
@@ -3527,51 +3548,51 @@ msgid ""
"1return to the form%2 and enter them."
msgstr ""
-#: ../user/ffmail_form.php:30
+#: ../user/ffmail_form.php:31
msgid ""
-"This project hasn't created an email message - please notify its "
+"This project hasn\\'t created an email message - please notify its "
"administrators"
msgstr ""
-#: ../user/ffmail_form.php:33
+#: ../user/ffmail_form.php:34
msgid "Tell your friends about %1"
msgstr ""
-#: ../user/ffmail_form.php:37
+#: ../user/ffmail_form.php:38
msgid "Help us by telling your friends, family and coworkers about %1"
msgstr ""
-#: ../user/ffmail_form.php:39
+#: ../user/ffmail_form.php:40
msgid ""
"Fill in this form with the names and email addresses of people you think "
"might be interested in %1. We'll send them an email in your name, and you "
"can add your own message if you like."
msgstr ""
-#: ../user/ffmail_form.php:42
+#: ../user/ffmail_form.php:43
msgid "Your name:"
msgstr ""
-#: ../user/ffmail_form.php:42
+#: ../user/ffmail_form.php:43
#, fuzzy
msgid "Your email address:"
msgstr "emailaddresse"
-#: ../user/ffmail_form.php:48
+#: ../user/ffmail_form.php:49
#, fuzzy
msgid "Friend's name:"
msgstr "Venner"
-#: ../user/ffmail_form.php:48
+#: ../user/ffmail_form.php:49
#, fuzzy
msgid "Friend's email address:"
msgstr "emailaddresse"
-#: ../user/ffmail_form.php:56
+#: ../user/ffmail_form.php:57
msgid "Additional message (optional)"
msgstr ""
-#: ../user/ffmail_form.php:59
+#: ../user/ffmail_form.php:60
#, fuzzy
msgid "Send"
msgstr "Afsender"
@@ -4615,49 +4636,53 @@ msgstr ""
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr ""
-#: ../user/host_app_versions.php:37
+#: ../user/host_app_versions.php:26
+msgid "nvidia GPU"
+msgstr ""
+
+#: ../user/host_app_versions.php:36
msgid "Anonymous platform, missing app"
msgstr ""
-#: ../user/host_app_versions.php:40
+#: ../user/host_app_versions.php:39
msgid "anonymous platform"
msgstr ""
-#: ../user/host_app_versions.php:43
+#: ../user/host_app_versions.php:42
msgid "Missing app version"
msgstr ""
-#: ../user/host_app_versions.php:45
+#: ../user/host_app_versions.php:44
msgid "Missing app"
msgstr ""
-#: ../user/host_app_versions.php:47
+#: ../user/host_app_versions.php:46
msgid "Missing platform"
msgstr ""
-#: ../user/host_app_versions.php:56
+#: ../user/host_app_versions.php:55
msgid "Number of tasks completed"
msgstr ""
-#: ../user/host_app_versions.php:57
+#: ../user/host_app_versions.php:56
msgid "Max tasks per day"
msgstr ""
-#: ../user/host_app_versions.php:58
+#: ../user/host_app_versions.php:57
#, fuzzy
msgid "Number of tasks today"
msgstr "Dagens Bruger"
-#: ../user/host_app_versions.php:59
+#: ../user/host_app_versions.php:58
msgid "Consecutive valid tasks"
msgstr ""
-#: ../user/host_app_versions.php:63
+#: ../user/host_app_versions.php:62
#, fuzzy
msgid "Average processing rate"
msgstr "Løbende gennemsnit"
-#: ../user/host_app_versions.php:72
+#: ../user/host_app_versions.php:71
#, fuzzy
msgid "Application details for host %1"
msgstr "Applikationer"
@@ -5061,37 +5086,37 @@ msgstr "Emailaddresse"
msgid "forgot email address?"
msgstr ""
-#: ../user/login_form.php:48
+#: ../user/login_form.php:47
#, fuzzy
msgid "Password:"
msgstr "Password"
-#: ../user/login_form.php:48
+#: ../user/login_form.php:47
msgid "forgot password?"
msgstr ""
-#: ../user/login_form.php:51
+#: ../user/login_form.php:50
msgid "Stay logged in"
msgstr ""
-#: ../user/login_form.php:62
+#: ../user/login_form.php:56
msgid "or %1create an account%2."
msgstr ""
-#: ../user/merge_by_name.php:31
+#: ../user/merge_by_name.php:33
msgid "Processing %1"
msgstr ""
-#: ../user/merge_by_name.php:43
+#: ../user/merge_by_name.php:45
msgid "Merged %1 into %2"
msgstr ""
-#: ../user/merge_by_name.php:72
+#: ../user/merge_by_name.php:74
#, fuzzy
msgid "Return to the list of your computers"
msgstr "Kør kun %1 på computere hvor du har lov til det"
-#: ../user/merge_by_name.php:76
+#: ../user/merge_by_name.php:78
msgid ""
"This operation merges computers based on their domain name.\n"
" <p>\n"
@@ -5101,11 +5126,11 @@ msgid ""
" <p>"
msgstr ""
-#: ../user/merge_by_name.php:82
+#: ../user/merge_by_name.php:84
msgid "Go ahead and do this"
msgstr ""
-#: ../user/merge_by_name.php:83
+#: ../user/merge_by_name.php:85
#, fuzzy
msgid "Return to the list of computers"
msgstr "Kør kun %1 på computere hvor du har lov til det"
@@ -5320,14 +5345,14 @@ msgstr "For at genåbne adgangen, besø %1forum-indstillingerne%2"
msgid "Unknown action"
msgstr ""
-#: ../user/prefs.php:32
+#: ../user/prefs.php:35
msgid ""
"Your preferences have been updated, and\n"
" will take effect when your computer communicates with %1\n"
" or you issue the %2Update%3 command from the BOINC Manager."
msgstr ""
-#: ../user/prefs.php:41
+#: ../user/prefs.php:44
msgid ""
"Your preferences have been reset to the defaults, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5342,24 +5367,24 @@ msgstr ""
msgid "Back to preferences"
msgstr ""
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:48
msgid "Confirm delete preferences"
msgstr ""
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:51
msgid "Are you sure you want to delete your separate %1 preferences for %2?"
msgstr ""
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:55
#, fuzzy
msgid "Remove preferences"
msgstr "%1-indstillinger"
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:57
msgid "Cancel"
msgstr ""
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:38
msgid ""
"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
"community."
@@ -5367,7 +5392,7 @@ msgstr ""
"%1Profiler%2 lader brugere dele deres baggrund og synspunkter med andre %"
"3-brugere."
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:39
msgid ""
"Explore the diversity of your fellow volunteers, and contribute your own "
"views for others to enjoy."
@@ -5375,7 +5400,7 @@ msgstr ""
"Udforsk mangfoldigheden blandt de andre deltagere - og bidrag med dine egne "
"synspunkter og holdninger"
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:40
msgid ""
"If you haven't already, you can %1create your own user profile%2 for others "
"to see!"
@@ -5383,23 +5408,23 @@ msgstr ""
"Hvis du ikke allere har gjort det kan du %1oprette din egen profil%2 "
"så andre kan se den!"
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:45
msgid "User of the Day"
msgstr "Dagens Bruger"
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:58
msgid "User Profile Explorer"
msgstr "Bruger-profil Visning"
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:61
msgid "View the %1User Picture Gallery%2."
msgstr "Se %1Brugernes Billedgalleri%2."
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:62
msgid "Browse profiles %1by country%2."
msgstr "Gennemse profiler sortered %1efter land%2."
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:63
msgid ""
"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
"without pictures%2."
@@ -5407,19 +5432,19 @@ msgstr ""
"Gennemse profiler %1tilfældigt%2, %3tilfældigt med billeder%2, "
"or %4tilfældigt uden billeder%2."
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:67
msgid "Alphabetical profile listings:"
msgstr "Alfabetisk profilliste:"
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:73
msgid "Search profile text"
msgstr "Søg i profil-teksten"
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:99
msgid "No profiles"
msgstr "Ingen profiler"
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:100
msgid "No profiles matched your query."
msgstr "Ingen profiler passede med din søgning."
@@ -5505,136 +5530,136 @@ msgstr ""
msgid "Disabled"
msgstr ""
-#: ../user/server_status.php:231
+#: ../user/server_status.php:246
msgid "Project status"
msgstr ""
-#: ../user/server_status.php:233
+#: ../user/server_status.php:248
msgid "Server software version: %1"
msgstr ""
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Program"
msgstr ""
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Host"
msgstr ""
-#: ../user/server_status.php:252
+#: ../user/server_status.php:267
msgid "data-driven web pages"
msgstr ""
-#: ../user/server_status.php:258
+#: ../user/server_status.php:273
msgid "upload/download server"
msgstr ""
-#: ../user/server_status.php:261
+#: ../user/server_status.php:276
msgid "scheduler"
msgstr ""
-#: ../user/server_status.php:294
+#: ../user/server_status.php:309
msgid "Running:"
msgstr ""
-#: ../user/server_status.php:295
+#: ../user/server_status.php:310
msgid "Program is operating normally"
msgstr ""
-#: ../user/server_status.php:296
+#: ../user/server_status.php:311
msgid "Not Running:"
msgstr ""
-#: ../user/server_status.php:297
+#: ../user/server_status.php:312
msgid "Program failed or the project is down"
msgstr ""
-#: ../user/server_status.php:298
+#: ../user/server_status.php:313
msgid "Disabled:"
msgstr ""
-#: ../user/server_status.php:299
+#: ../user/server_status.php:314
msgid "Program is disabled"
msgstr ""
-#: ../user/server_status.php:303
+#: ../user/server_status.php:318
msgid "Computing status"
msgstr ""
-#: ../user/server_status.php:309
+#: ../user/server_status.php:324
msgid "The database server is not accessible"
msgstr ""
-#: ../user/server_status.php:326
+#: ../user/server_status.php:341
msgid "Tasks ready to send"
msgstr ""
-#: ../user/server_status.php:331 ../user/workunit.php:55
+#: ../user/server_status.php:346 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr ""
-#: ../user/server_status.php:336
+#: ../user/server_status.php:351
msgid "Workunits waiting for validation"
msgstr ""
-#: ../user/server_status.php:341
+#: ../user/server_status.php:356
msgid "Workunits waiting for assimilation"
msgstr ""
-#: ../user/server_status.php:346
+#: ../user/server_status.php:361
msgid "Workunits waiting for file deletion"
msgstr ""
-#: ../user/server_status.php:351
+#: ../user/server_status.php:366
msgid "Tasks waiting for file deletion"
msgstr ""
-#: ../user/server_status.php:367
+#: ../user/server_status.php:383
msgid "Transitioner backlog (hours)"
msgstr ""
-#: ../user/server_status.php:374
+#: ../user/server_status.php:390
msgid "Users"
msgstr ""
-#: ../user/server_status.php:377 ../user/server_status.php:395
+#: ../user/server_status.php:393 ../user/server_status.php:411
msgid "with recent credit"
msgstr ""
-#: ../user/server_status.php:382 ../user/server_status.php:400
+#: ../user/server_status.php:398 ../user/server_status.php:416
msgid "with credit"
msgstr ""
-#: ../user/server_status.php:387 ../user/server_status.php:405
+#: ../user/server_status.php:403 ../user/server_status.php:421
msgid "registered in past 24 hours"
msgstr ""
-#: ../user/server_status.php:411
+#: ../user/server_status.php:427
msgid "current GigaFLOPs"
msgstr ""
-#: ../user/server_status.php:420
+#: ../user/server_status.php:436
msgid "Tasks by application"
msgstr ""
-#: ../user/server_status.php:423 ../user/workunit.php:40
+#: ../user/server_status.php:439 ../user/workunit.php:40
#, fuzzy
msgid "application"
msgstr "Applikationer"
-#: ../user/server_status.php:424
+#: ../user/server_status.php:440
msgid "unsent"
msgstr ""
-#: ../user/server_status.php:425
+#: ../user/server_status.php:441
msgid "in progress"
msgstr ""
-#: ../user/server_status.php:426
+#: ../user/server_status.php:442
msgid "avg runtime of last 100 results in h (min-max)"
msgstr ""
-#: ../user/server_status.php:427
+#: ../user/server_status.php:443
msgid "users in last 24h"
msgstr ""
@@ -5814,7 +5839,7 @@ msgid "Couldn't add admin"
msgstr ""
#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:28
#, fuzzy
msgid "No such team"
msgstr "Holdet findes ikke."
@@ -5885,10 +5910,6 @@ msgstr ""
msgid "Change founder"
msgstr ""
-#: ../user/team_change_founder_form.php:108
-msgid "There are no users to transfer team to."
-msgstr ""
-
#: ../user/team_create_action.php:29
msgid "You must choose a non-blank team name"
msgstr ""
@@ -6174,7 +6195,7 @@ msgid ""
msgstr ""
#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join_form.php:31
msgid "The team %1 is not joinable."
msgstr ""
@@ -6198,23 +6219,23 @@ msgstr ""
msgid "You have joined %1."
msgstr ""
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
msgid "Join %1"
msgstr ""
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
msgid "Please note:"
msgstr ""
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
msgid "Joining a team gives its founder access to your email address."
msgstr ""
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
msgid "Joining a team does not affect your account's credit."
msgstr ""
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
msgid "Join team"
msgstr ""
@@ -6350,19 +6371,19 @@ msgstr ""
msgid "Members of %1"
msgstr ""
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
msgid "Unable to quit team"
msgstr ""
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
msgid "Team doesn't exist, or you don't belong to it."
msgstr ""
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
msgid "Quit %1"
msgstr ""
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
msgid ""
"<strong>Please note before quitting a team:</strong>\n"
" <ul>\n"
@@ -6373,7 +6394,7 @@ msgid ""
" </ul>"
msgstr ""
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
#, fuzzy
msgid "Quit Team"
msgstr "Forlad holdet"
@@ -6763,14 +6784,6 @@ msgstr ""
msgid "(all applications)"
msgstr ""
-#~ msgid "Account creation is disabled"
-#~ msgstr "Der er lukket for oprettelse af nye brugerkonti"
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Der er midlertidigt lukket for oprettelse af nye brugerkonto, men "
-#~ "prøv igen senere."
-
#, fuzzy
#~ msgid "No such task"
#~ msgstr "Holdet findes ikke."
diff --git a/html/languages/translations/ja.po b/html/languages/translations/ja.po
index 962d68e..7378ca2 100644
--- a/html/languages/translations/ja.po
+++ b/html/languages/translations/ja.po
@@ -7,18 +7,17 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2013-10-28 15:20+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"PO-Revision-Date: 2013-03-16 11:43+0200\n"
+"Last-Translator: Kai <www.carrotsoft at gmail.com>\n"
"Language-Team: \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-BOINC-UTF8-Marker: 日本語\n"
-"X-POOTLE-MTIME: 1382973625.0\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -1209,9 +1208,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "NVIDIA GPU を計算に使うか %1 Version 6.10以降で有効 %2"
#: ../inc/prefs.inc:344
-#, fuzzy
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "ATI GPU を計算に使うか %1 Version 6.10以降で有効 %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1761,9 +1759,8 @@ msgid "State"
msgstr "状態"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "タスク名"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -2117,9 +2114,8 @@ msgid "Used in community functions"
msgstr "コミュニティ機能の中で使われる ID です"
#: ../inc/user.inc:216 ../user/weak_auth.php:25
-#, fuzzy
msgid "Account keys"
-msgstr "アカウント・キー"
+msgstr ""
#: ../inc/user.inc:221
msgid "Preferences"
@@ -2568,9 +2564,8 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
-#, fuzzy
msgid "Languages"
-msgstr "言語"
+msgstr ""
# #######################################
# Rules and Policies page (info.php)
diff --git a/html/languages/translations/ko.po b/html/languages/translations/ko.po
index 114f787..a47d70e 100644
--- a/html/languages/translations/ko.po
+++ b/html/languages/translations/ko.po
@@ -1,26 +1,21 @@
-# BOINC web translation
-# Copyright (C) 2008 University of California
-# This file is distributed under the same license as BOINC.
-# FileID : $Id$
msgid ""
msgstr ""
"Project-Id-Version: 2013/12/3\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-07-27 06:45+0000\n"
-"Last-Translator: Kangsan Lee <treppolse at gmail.com>\n"
+"POT-Creation-Date: 2013-12-17 00:00 PST\n"
+"PO-Revision-Date: 2013-12-18 14:45+0900\n"
+"Last-Translator: Lee Kangsan <treppolse at gmail.com>\n"
"Language-Team: SETIKAH at KOREA\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.7\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
"X-BOINC-UTF8-Marker: 简体ä¸æ–‡, 日本語\n"
"X-Poedit-SearchPath-0: html\\user\n"
-"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1406443547.0\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -75,7 +70,9 @@ msgstr "글씨 색상"
#: ../inc/bbcode_html.inc:43
msgid ""
"Font color: [color=red]text[/color] Tip: you can also use color=#FF0000"
-msgstr "글씨 색상: [color=red]text[/color] 팁: 또한 컬러 코드(=#FF0000)도 사용할 수 있습니다"
+msgstr ""
+"글씨 색상: [color=red]text[/color] 팁: 또한 컬러 코드(=#FF0000)도 사용할 수 "
+"있습니다"
#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
msgid "Default"
@@ -193,7 +190,7 @@ msgstr "포럼 검색"
msgid "Advanced search"
msgstr "고급 검색"
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:252 ../user/pm.php:69
#: ../user/pm.php:133
msgid "Private messages"
msgstr "쪽지"
@@ -203,8 +200,8 @@ msgstr "쪽지"
msgid "Questions and Answers"
msgstr "질문과 답변"
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
+#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:249
+#: ../inc/user.inc:374 ../user/bs_sample_index.php:62
#: ../user/forum_forum.php:73 ../user/sample_index.php:129
#: ../project.sample/project.inc:43
msgid "Message boards"
@@ -270,7 +267,7 @@ msgstr "읽지 않음"
msgid "Message %1"
msgstr "메세지 %1"
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:330 ../user/forum_forum.php:174
msgid "hidden"
msgstr "숨김"
@@ -296,9 +293,11 @@ msgstr "마지막 수정: %1"
#: ../inc/forum.inc:640
msgid ""
-"This post is not shown because the sender is on your 'ignore' list. Click %"
-"1here%2 to view this post"
-msgstr "작성자가 '무시' 목록에 있으므로 이 포스트를 보여주지 않습니다. 이 포스트를 보려면 %1여기%2를 누르세요"
+"This post is not shown because the sender is on your 'ignore' list. Click "
+"%1here%2 to view this post"
+msgstr ""
+"작성자가 '무시' 목록에 있으므로 이 포스트를 보여주지 않습니다. 이 포스트를 보"
+"려면 %1여기%2를 누르세요"
#: ../inc/forum.inc:668 ../inc/forum.inc:679
msgid "Report this post as offensive"
@@ -449,7 +448,8 @@ msgid ""
"In order to create a new thread in %1 you must have a certain amount of "
"credit. This is to prevent and protect against abuse of the system."
msgstr ""
-"%1에 새로운 스레드를 만들려면 여러분은 크레딧을 어느 정도 가지고 있어야 합니다. 이 것은 시스템 남용을 막으면서 보호해줍니다. "
+"%1에 새로운 스레드를 만들려면 여러분은 크레딧을 어느 정도 가지고 있어야 합니"
+"다. 이 것은 시스템 남용을 막으면서 보호해줍니다. "
#: ../inc/forum.inc:1133
msgid ""
@@ -457,14 +457,17 @@ msgid ""
"trying again. This delay has been enforced to protect against abuse of the "
"system."
msgstr ""
-"지금은 더 이상 새로운 스레드를 만들 수 없습니다. 다시 시도하시기 전에 잠시 기다려주십시오. 이러한 지연은 시스템을 남용으로부터 "
-"보호하기 위해서 시행하고 있습니다."
+"지금은 더 이상 새로운 스레드를 만들 수 없습니다. 다시 시도하시기 전에 잠시 기"
+"다려주십시오. 이러한 지연은 시스템을 남용으로부터 보호하기 위해서 시행하고 있"
+"습니다."
#: ../inc/forum.inc:1140
msgid ""
"This thread is locked. Only forum moderators and administrators are allowed "
"to post there."
-msgstr "이 스레드는 잠겼습니다. 오직 포럼 관리자와 운영자만 여기에 글을 쓸 수 있습니다."
+msgstr ""
+"이 스레드는 잠겼습니다. 오직 포럼 관리자와 운영자만 여기에 글을 쓸 수 있습니"
+"다."
#: ../inc/forum.inc:1145
msgid "Can't post to a hidden thread."
@@ -474,7 +477,7 @@ msgstr "숨겨진 스레드에 글을 쓸 수 없습니다."
msgid "Thread"
msgstr "스레드"
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:127 ../user/forum_forum.php:136
#: ../user/forum_index.php:94
msgid "Posts"
msgstr "포스트"
@@ -483,7 +486,7 @@ msgstr "포스트"
msgid "Views"
msgstr "보기"
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:127 ../user/forum_forum.php:139
#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
msgid "Last post"
msgstr "마지막 포스트"
@@ -521,7 +524,7 @@ msgid "Home"
msgstr "집"
#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../user/server_status.php:329
msgid "Work"
msgstr "직장"
@@ -587,9 +590,9 @@ msgid "Created"
msgstr "생성 시각"
#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
+#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:214
+#: ../inc/team.inc:219 ../inc/team.inc:221 ../inc/team.inc:363
+#: ../inc/team.inc:368 ../inc/user.inc:125 ../inc/user.inc:138
#: ../user/profile_search_action.php:43
#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
@@ -765,7 +768,7 @@ msgstr "마지막 통신"
msgid "Computer info"
msgstr "컴퓨터 정보"
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:356
#: ../user/top_users.php:48
msgid "Rank"
msgstr "순위"
@@ -774,9 +777,9 @@ msgstr "순위"
msgid "Avg. credit"
msgstr "평균 크레딧"
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
+#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:215
+#: ../inc/team.inc:224 ../inc/team.inc:226 ../inc/team.inc:362
+#: ../inc/team.inc:367 ../inc/user.inc:139
#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
#: ../user/top_users.php:58
@@ -864,8 +867,8 @@ msgstr "최근 30일동안 활동한 컴퓨터만 보기"
msgid "Computer ID"
msgstr "컴퓨터 ID"
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
+#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:209
+#: ../inc/team.inc:357 ../inc/user.inc:199 ../user/account_finish.php:41
#: ../user/create_account_form.php:79 ../user/team_admins.php:62
#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
#: ../user/top_users.php:49 ../user/user_search.php:139
@@ -901,7 +904,7 @@ msgstr "목록"
msgid "Write"
msgstr "쓰기"
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:377
msgid "Send private message"
msgstr "쪽지 보내기"
@@ -951,7 +954,9 @@ msgstr "글을 작성할 수 없습니다"
msgid ""
"You are not allowed to send privates messages so often. Please wait some "
"time before sending more messages."
-msgstr "쪽지를 일정 시간 안에 일정량 이상 보낼 수 없습니다. 새로운 쪽지를 보내실려면 일정시간 기다리셔야 합니다."
+msgstr ""
+"쪽지를 일정 시간 안에 일정량 이상 보낼 수 없습니다. 새로운 쪽지를 보내실려면 "
+"일정시간 기다리셔야 합니다."
#: ../inc/pm.inc:176 ../user/forum_forum.php:186
msgid "unread"
@@ -969,7 +974,9 @@ msgstr "쪽지"
msgid ""
"Suspend work while computer is on battery power? %1 Matters only for "
"portable computers %2"
-msgstr "컴퓨터가 배터리로 작동할때 작업을 일시중지할까요? %1 휴대용 컴퓨터에만 해당됩니다 %2"
+msgstr ""
+"컴퓨터가 배터리로 작동할때 작업을 일시중지할까요? %1 휴대용 컴퓨터에만 해당됩"
+"니다 %2"
#: ../inc/prefs.inc:85
msgid "Suspend work while computer is in use?"
@@ -978,7 +985,8 @@ msgstr "컴퓨터가 사용 중일 동안 작업을 일시중지할까요?"
#: ../inc/prefs.inc:91
msgid ""
"Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr "컴퓨터가 사용 중일 동안 GPU 작업을 일시중지할까요? .6.21 이상 버전 필요%2"
+msgstr ""
+"컴퓨터가 사용 중일 동안 GPU 작업을 일시중지할까요? .6.21 이상 버전 필요%2"
#: ../inc/prefs.inc:99
msgid "'In use' means mouse/keyboard activity in last"
@@ -992,13 +1000,17 @@ msgstr "분"
msgid ""
"Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
"power mode on some computers %2"
-msgstr "마우스/키보드 입력이 다음 시간 동안 없으면 작업 일시중지 %1 특정 컴퓨터에서 저전력 모드로 들어가려면 필요합니다 %2"
+msgstr ""
+"마우스/키보드 입력이 다음 시간 동안 없으면 작업 일시중지 %1 특정 컴퓨터에서 "
+"저전력 모드로 들어가려면 필요합니다 %2"
#: ../inc/prefs.inc:114
msgid ""
"Suspend work when non-BOINC CPU usage is above %1 0 means no "
"restriction<br>Enforced by version 6.10.30+ %2"
-msgstr "비 BOINC CPU 사용량이 다음보다 높으면 작업 일시중지 %1 0은 무제한을 뜻합니다<br>6.10.30이상 버전 필요 %2"
+msgstr ""
+"비 BOINC CPU 사용량이 다음보다 높으면 작업 일시중지 %1 0은 무제한을 뜻합니다"
+"<br>6.10.30이상 버전 필요 %2"
#: ../inc/prefs.inc:122
msgid "Do work only between the hours of %1 No restriction if equal %2"
@@ -1008,7 +1020,9 @@ msgstr "이 시간 사이에만 작업 실행 %1 똑같으면 제한 없음 %2"
msgid ""
"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
"space if 'yes' %2"
-msgstr "일시중지 시에도 태스크를 메모리에 남겨둘까요? %1 '네'일 경우 일시중지된 태스크는 스왑영역을 차지합니다 %2"
+msgstr ""
+"일시중지 시에도 태스크를 메모리에 남겨둘까요? %1 '네'일 경우 일시중지된 태스"
+"크는 스왑영역을 차지합니다 %2"
#: ../inc/prefs.inc:139
msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
@@ -1095,7 +1109,8 @@ msgstr "... 추가적으로 유지할 태스크"
msgid ""
"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
"ISDN or VPN connection %2"
-msgstr "인터넷에 연결시 확인하시겠습니까? %1 모뎀, ISDN, VPN 연결에만 해당됩니다 %2"
+msgstr ""
+"인터넷에 연결시 확인하시겠습니까? %1 모뎀, ISDN, VPN 연결에만 해당됩니다 %2"
#: ../inc/prefs.inc:241
msgid ""
@@ -1133,8 +1148,9 @@ msgid ""
"modifies image files (UMTS does this, for example). %2 Skipping verification "
"reduces the security of BOINC. %3"
msgstr ""
-"이미지 파일 검증을 건너뛸까요? %1 인터넷 제공자가 이미지 파일을 변경할 경우에만 체크하세요 (대표적으로 UMTS). %2 검증을 "
-"건너뛰게 되면 BOINC의 보안이 감소하게 됩니다. %3"
+"이미지 파일 검증을 건너뛸까요? %1 인터넷 제공자가 이미지 파일을 변경할 경우에"
+"만 체크하세요 (대표적으로 UMTS). %2 검증을 건너뛰게 되면 BOINC의 보안이 감소"
+"하게 됩니다. %3"
#: ../inc/prefs.inc:287
msgid ""
@@ -1143,8 +1159,9 @@ msgid ""
"with resource shares of 100 and 200, the first will get 1/3 of your "
"resources and the second will get 2/3. %2"
msgstr ""
-"자원 공유 %1 이 프로젝트에서 사용할 자원 배분치를 결정하세요. 예: 여러분이 각각 100과 200의 자원을 공유하기로 한 BOINC "
-"프로젝트에 참여하고 계시면 첫 번째는 1/3의 자원을 쓰게 되고, 두 번째는 2/3를 쓰게 됩니다. %2"
+"자원 공유 %1 이 프로젝트에서 사용할 자원 배분치를 결정하세요. 예: 여러분이 각"
+"각 100과 200의 자원을 공유하기로 한 BOINC 프로젝트에 참여하고 계시면 첫 번째"
+"는 1/3의 자원을 쓰게 되고, 두 번째는 2/3를 쓰게 됩니다. %2"
#: ../inc/prefs.inc:298
msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
@@ -1170,12 +1187,15 @@ msgstr "Intel GPU 사용 %1 7.2 이상 버전이 필요 %2"
msgid ""
"Run test applications? %1 This helps us develop applications, but may cause "
"jobs to fail on your computer %2"
-msgstr "테스트 프로그램을 실행할까요? %1 이는 프로그램 개발에 도움을 주지만, 해당 컴퓨터에서 실행에 실패할 수도 있습니다 %2"
+msgstr ""
+"테스트 프로그램을 실행할까요? %1 이는 프로그램 개발에 도움을 주지만, 해당 컴"
+"퓨터에서 실행에 실패할 수도 있습니다 %2"
#: ../inc/prefs.inc:367
msgid ""
"Emails will be sent from %1; make sure your spam filter accepts this address."
-msgstr "email은 %1에서 보냅니다. 여러분의 스팸 필터에서 이 주소를 허용해 주세요."
+msgstr ""
+"email은 %1에서 보냅니다. 여러분의 스팸 필터에서 이 주소를 허용해 주세요."
#: ../inc/prefs.inc:374
msgid "Is it OK for %1 and your team (if any) to email you?"
@@ -1206,7 +1226,9 @@ msgstr "이 환경 설정은 여러분이 참여하는 모든 BOINC 프로젝트
msgid ""
"%1Unable to update preferences.%2 The values marked in red below were out of "
"range or not numeric."
-msgstr "%1환경 설정을 업데이트할 수 없습니다.%2 빨간 색으로 표시된 곳이 범위를 넘어서거나 숫자가 아닙니다."
+msgstr ""
+"%1환경 설정을 업데이트할 수 없습니다.%2 빨간 색으로 표시된 곳이 범위를 넘어서"
+"거나 숫자가 아닙니다."
#: ../inc/prefs.inc:445
msgid "bad venue: %1"
@@ -1285,7 +1307,9 @@ msgstr "이 값들은 여러분이 참여하는 모든 BOINC 프로젝트에 적
msgid ""
"On computers participating in multiple projects, the most recently modified "
"preferences will be used."
-msgstr "여러 프로젝트에 참여하는 컴퓨터의 경우 가장 최근에 수정된 환경 설정을 사용하게 될 것입니다."
+msgstr ""
+"여러 프로젝트에 참여하는 컴퓨터의 경우 가장 최근에 수정된 환경 설정을 사용하"
+"게 될 것입니다."
#: ../inc/prefs.inc:889
msgid "These preferences do not apply to Android devices."
@@ -1315,13 +1339,17 @@ msgstr "와"
msgid ""
"Your profile will be made visible to other people as soon as it has been "
"approved by the project. This may take up to a few days."
-msgstr "여러분의 프로필은 프로젝트에서 승인하는 순간 다른 사람들에게 공개됩니다. 이 작업은 며칠정도 소요됩니다."
+msgstr ""
+"여러분의 프로필은 프로젝트에서 승인하는 순간 다른 사람들에게 공개됩니다. 이 "
+"작업은 며칠정도 소요됩니다."
#: ../inc/profile.inc:92
msgid ""
"Your profile has been marked as unacceptable. It is not visible to other "
"people. Please change it."
-msgstr "여러분의 프로필이 승인되지 않았습니다. 다른 사람들에게 공개되지 않습니다. 다르게 바꿔 주세요."
+msgstr ""
+"여러분의 프로필이 승인되지 않았습니다. 다른 사람들에게 공개되지 않습니다. 다"
+"르게 바꿔 주세요."
#: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
msgid "Database error"
@@ -1331,7 +1359,9 @@ msgstr "데이터베이스 오류"
msgid ""
"To prevent spam, profiles of users with an average credit of less than %1 "
"are displayed only to logged-in users. We apologize for this inconvenience."
-msgstr "스팸을 방지하기 위해서 평균 크레딧이 %1 이하인 사용자의 프로필은 로그인한 사용자에게만 표시됩니다. 불편을 드려서 죄송합니다."
+msgstr ""
+"스팸을 방지하기 위해서 평균 크레딧이 %1 이하인 사용자의 프로필은 로그인한 사"
+"용자에게만 표시됩니다. 불편을 드려서 죄송합니다."
#: ../inc/profile.inc:197
msgid "User is banished"
@@ -1630,7 +1660,7 @@ msgstr "보고 시각<br />혹은 마감 시각"
msgid "explain"
msgstr "상세 정보"
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:376 ../user/server_status.php:256
msgid "Status"
msgstr "상태"
@@ -1722,9 +1752,9 @@ msgstr "키워드"
msgid "Find teams with these words in their names or descriptions"
msgstr "이름이나 개요에 있는 단어로 팀을 찾으십시오"
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
+#: ../inc/team.inc:43 ../inc/team.inc:121 ../inc/team.inc:232
+#: ../inc/team.inc:372 ../inc/team.inc:456 ../inc/user.inc:205
+#: ../inc/user.inc:316 ../user/account_finish.php:45
#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
#: ../user/team_search.php:72 ../user/top_users.php:63
@@ -1732,7 +1762,7 @@ msgstr "이름이나 개요에 있는 단어로 팀을 찾으십시오"
msgid "Country"
msgstr "국가"
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:454
msgid "Type of team"
msgstr "팀 종류"
@@ -1760,8 +1790,8 @@ msgstr "요청됨"
msgid "founder response deadline is %1"
msgstr "창설자 응답 기한은 %1입니다"
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:556 ../inc/user.inc:280
+#: ../inc/user.inc:370
msgid "None"
msgstr "없음"
@@ -1785,107 +1815,107 @@ msgstr "개요"
msgid "Web site"
msgstr "웹 사이트"
-#: ../inc/team.inc:120
+#: ../inc/team.inc:119
msgid "Cross-project stats"
msgstr "공유 프로젝트 통계"
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
msgid "Type"
msgstr "종류"
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:126 ../user/team_manage.php:63
msgid "Message board"
msgstr "게시판"
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "스레드"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:135
msgid "Join this team"
msgstr "이 팀에 가입"
-#: ../inc/team.inc:137
+#: ../inc/team.inc:136
msgid ""
"Note: if 'OK to email' is set in your project preferences, joining a team "
"gives its founder access to your email address."
msgstr ""
-"노트:만약 'OK to email\"이 프로젝트 환경설정에 설정되어 있으면, 가입한 팀의 창설자가 여러분의 email주소를 알 수 "
-"있습니다."
+"노트:만약 'OK to email\"이 프로젝트 환경설정에 설정되어 있으면, 가입한 팀의 "
+"창설자가 여러분의 email주소를 알 수 있습니다."
-#: ../inc/team.inc:140
+#: ../inc/team.inc:139
msgid "Not accepting new members"
msgstr "회원 가입을 허가하지 않습니다"
-#: ../inc/team.inc:147
+#: ../inc/team.inc:146
msgid "Foundership change requested"
msgstr "창설자 교체 요청이 있습니다"
-#: ../inc/team.inc:148
+#: ../inc/team.inc:147
msgid "Respond by %1"
msgstr "%1에 응답함"
-#: ../inc/team.inc:152
+#: ../inc/team.inc:151
msgid "Team foundership change"
msgstr "팀 창설자 변경"
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:155 ../inc/team.inc:358
msgid "Members"
msgstr "맴버들"
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:156 ../inc/team.inc:253
msgid "Founder"
msgstr "창설자"
-#: ../inc/team.inc:169
+#: ../inc/team.inc:168
msgid "Admins"
msgstr "관리자"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:183
msgid "New members in last day"
msgstr "전 날의 새로운 맴버"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:184
msgid "Total members"
msgstr "전체 맴버"
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
msgid "view"
msgstr "보기"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:185
msgid "Active members"
msgstr "활동하는 맴버"
-#: ../inc/team.inc:187
+#: ../inc/team.inc:186
msgid "Members with credit"
msgstr "크레딧을 가진 맴버"
-#: ../inc/team.inc:256
+#: ../inc/team.inc:255
msgid "Admin"
msgstr "관리"
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
#: ../user/top_hosts.php:93 ../user/top_teams.php:121
#: ../user/top_users.php:127
msgid "Previous %1"
msgstr "이전 %1"
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:280 ../user/forum_user_posts.php:131
#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
#: ../user/top_teams.php:126 ../user/top_users.php:132
msgid "Next %1"
msgstr "다음 %1"
-#: ../inc/team.inc:289
+#: ../inc/team.inc:288
msgid "No such team."
msgstr "해당 팀이 없습니다."
-#: ../inc/team.inc:302
+#: ../inc/team.inc:301
msgid "This operation requires foundership."
msgstr "이 기능은 창설자 권한이 필요합니다."
-#: ../inc/team.inc:326
+#: ../inc/team.inc:325
msgid "This operation requires team admin privileges"
msgstr "이 기능은 팀 관리자 권한이 필요합니다"
@@ -1894,56 +1924,58 @@ msgid ""
"WARNING: this is a BOINC-wide team. If you make changes here, they will soon "
"be overwritten. Edit the %1BOINC-wide team%2 instead."
msgstr ""
-"경고: 이 팀은 BOINC 광역 팀입니다. 만약 이 곳을 변경하게 되면 덮어쓰게 됩니다. 그 대신에 %1BOINC 광역 팀%2을 "
-"수정하세요."
+"경고: 이 팀은 BOINC 광역 팀입니다. 만약 이 곳을 변경하게 되면 덮어쓰게 됩니"
+"다. 그 대신에 %1BOINC 광역 팀%2을 수정하세요."
-#: ../inc/team.inc:428
+#: ../inc/team.inc:429
msgid ""
"%1Privacy note%2: if you create a team, your project preferences (resource "
"share, graphics preferences) will be visible to the public."
-msgstr "%1개인적 노트%2: 팀을 만들면, 프로젝트 환경 설정(자원 공유, 그래픽 설정)이 모든 사람에게 공개됩니다."
+msgstr ""
+"%1개인적 노트%2: 팀을 만들면, 프로젝트 환경 설정(자원 공유, 그래픽 설정)이 모"
+"든 사람에게 공개됩니다."
-#: ../inc/team.inc:432
+#: ../inc/team.inc:433
msgid "Team name, text version"
msgstr "팀 이름, 텍스트 버전"
-#: ../inc/team.inc:433
+#: ../inc/team.inc:434
msgid "Don't use HTML tags."
msgstr "HTML 태그를 사용하지 않습니다."
-#: ../inc/team.inc:436
+#: ../inc/team.inc:437
msgid "Team name, HTML version"
msgstr "팀 이름, HTML 버전"
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:439 ../inc/team.inc:449
msgid "You may use %1limited HTML tags%2."
msgstr "%1제한된 HTML 태그%2를 사용할 수 있습니다."
-#: ../inc/team.inc:439
+#: ../inc/team.inc:440
msgid "If you don't know HTML, leave this box blank."
msgstr "만약 HTML을 모른다면, 이 박스는 빈칸으로 남겨두세요."
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "URL of team web page, if any"
msgstr "팀 웹 페이지 URL(있을 경우)"
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "without \"http://\""
msgstr "\"http://\" 제외"
-#: ../inc/team.inc:443
+#: ../inc/team.inc:444
msgid "This URL will be linked to from the team's page on this site."
msgstr "이 URL은 이 사이트의 팀 페이지로 링크됩니다."
-#: ../inc/team.inc:446
+#: ../inc/team.inc:447
msgid "Description of team"
msgstr "팀 개요"
-#: ../inc/team.inc:462
+#: ../inc/team.inc:463
msgid "Accept new members?"
msgstr "회원 가입을 허가할까요?"
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
msgid "User profile"
msgstr "사용자 프로필"
@@ -1976,7 +2008,7 @@ msgid "Computers on this account"
msgstr "이 계정의 컴퓨터 목록"
#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
+#: ../inc/user.inc:242 ../inc/user.inc:328 ../inc/user.inc:412
#: ../user/view_profile.php:64
msgid "View"
msgstr "보기"
@@ -1993,8 +2025,8 @@ msgstr "공유-프로젝트 통계"
msgid "Account"
msgstr "계정"
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:280 ../inc/user.inc:368
+#: ../inc/user.inc:370 ../user/user_search.php:139
msgid "Team"
msgstr "팀"
@@ -2023,7 +2055,7 @@ msgstr "계정 정보"
msgid "Email address"
msgstr "Email 주소"
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:203 ../inc/user.inc:321
msgid "URL"
msgstr "URL"
@@ -2031,7 +2063,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "우편 번호"
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:207 ../inc/user.inc:315
msgid "%1 member since"
msgstr "%1 참여 시작일"
@@ -2051,7 +2083,7 @@ msgstr "비밀번호"
msgid "other account info"
msgstr "다른 계정 정보"
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:213 ../inc/user.inc:314
msgid "User ID"
msgstr "사용자 ID"
@@ -2096,96 +2128,96 @@ msgstr "%1 환경 설정"
msgid "Community"
msgstr "커뮤니티"
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "삭제"
-#: ../inc/user.inc:245
+#: ../inc/user.inc:244
msgid "Create"
msgstr "생성"
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
+#: ../inc/user.inc:246 ../inc/user.inc:412 ../inc/util.inc:514
msgid "Profile"
msgstr "프로필"
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:249 ../inc/user.inc:374
msgid "%1 posts"
msgstr "%1 포스트"
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "공지"
-#: ../inc/user.inc:269
+#: ../inc/user.inc:268
msgid "Quit team"
msgstr "팀 탈퇴"
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:270 ../inc/user.inc:287
msgid "Administer"
msgstr "관리자"
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:276 ../inc/user.inc:289
msgid "(foundership change request pending)"
msgstr "(창설자 변경 요청 대기중)"
-#: ../inc/user.inc:279
+#: ../inc/user.inc:278
msgid "Member of team"
msgstr "팀 구성원"
-#: ../inc/user.inc:281
+#: ../inc/user.inc:280
msgid "find a team"
msgstr "팀 찾기"
-#: ../inc/user.inc:292
+#: ../inc/user.inc:291
msgid "Founder but not member of"
msgstr "창설자 (맴버 제외)"
-#: ../inc/user.inc:298
+#: ../inc/user.inc:297
msgid "Find friends"
msgstr "친구 찾기"
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
+#: ../inc/user.inc:386 ../inc/user.inc:395
msgid "Friends"
msgstr "친구들"
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
msgid "Computers"
msgstr "컴퓨터들"
-#: ../inc/user.inc:338
+#: ../inc/user.inc:337
msgid "Donor"
msgstr "기부자"
-#: ../inc/user.inc:378
+#: ../inc/user.inc:377
msgid "Contact"
msgstr "접촉"
-#: ../inc/user.inc:381
+#: ../inc/user.inc:380
msgid "This person is a friend"
msgstr "이 사람은 친구입니다"
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:381 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "친구 관계 취소"
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:384 ../user/friend.php:37
msgid "Request pending"
msgstr "요청이 보류되었습니다"
-#: ../inc/user.inc:387
+#: ../inc/user.inc:386
msgid "Add as friend"
msgstr "친구로 추가"
-#: ../inc/user.inc:446
+#: ../inc/user.inc:456
msgid "user name cannot have leading or trailing white space"
msgstr "사용자 이름의 처음 또는 끝부분에 공백이 있습니다"
-#: ../inc/user.inc:450
+#: ../inc/user.inc:460
msgid "user name must be nonempty"
msgstr "사용자 이름에는 공백을 쓸 수 없습니다"
-#: ../inc/user.inc:454
+#: ../inc/user.inc:464
msgid "user name may not contain HTML tags"
msgstr "사용자 이름은 HTML 태그를 포함할 수 없습니다"
@@ -2213,7 +2245,9 @@ msgstr "서버 상태 페이지"
msgid ""
"A database error occurred while handling your request; please try again "
"later."
-msgstr "사용자 요청 처리 중에 데이터베이스 오류가 발생했습니다. 나중에 다시 시도하세요."
+msgstr ""
+"사용자 요청 처리 중에 데이터베이스 오류가 발생했습니다. 나중에 다시 시도하세"
+"요."
#: ../inc/util.inc:257
msgid "Unable to handle request"
@@ -2233,7 +2267,9 @@ msgstr "초"
#: ../inc/util.inc:444
msgid "Link has timed out. Please click Back, refresh the page, and try again."
-msgstr "연결 시간 초과. '뒤로 가기'를 누르신 후 페이지를 새로 고치시고 다시 시도하세요."
+msgstr ""
+"연결 시간 초과. '뒤로 가기'를 누르신 후 페이지를 새로 고치시고 다시 시도하세"
+"요."
#: ../inc/util.inc:513
msgid "View the profile of %1"
@@ -2249,7 +2285,8 @@ msgstr "정기 점검을 위해 서버가 꺼짐"
#: ../inc/util.inc:799
msgid "%1 is temporarily shut down for maintenance. Please try again later."
-msgstr "%1는 현재 정기 점검때문에 일시적으로 종료되었습니다. 나중에 다시 시도하세요."
+msgstr ""
+"%1는 현재 정기 점검때문에 일시적으로 종료되었습니다. 나중에 다시 시도하세요."
#: ../inc/util.inc:817
msgid "Unable to connect to database - please try again later"
@@ -2259,7 +2296,7 @@ msgstr "선택한 데이터베이스에 접속할 수 없습니다. 나중에
msgid "Unable to select database - please try again later"
msgstr "선택한 데이터베이스를 사용할 수 없습니다. 나중에 다시 시도해주세요"
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr "이 컴퓨터에서 로그인 유지"
@@ -2269,7 +2306,8 @@ msgstr "계정 설정 완료"
#: ../user/account_finish.php:41 ../user/create_account_form.php:79
msgid "Identifies you on our web site. Use your real name or a nickname."
-msgstr "이 웹 사이트에서 여러분을 식별합니다. 여러분의 본명이나 별명을 써주세요."
+msgstr ""
+"이 웹 사이트에서 여러분을 식별합니다. 여러분의 본명이나 별명을 써주세요."
#: ../user/account_finish.php:45 ../user/create_account_form.php:98
msgid "Select the country you want to represent, if any."
@@ -2307,9 +2345,10 @@ msgid ""
"computer. The current version of the application will be downloaded to your "
"computer. This happens automatically; you don't have to do anything."
msgstr ""
-"현재 %1(은)는 다음 응용 프로그램을 사용합니다. 여러분이 %1에 참여할 때 하나 이상의 응용 프로그램이 여러분 컴퓨터로 할당됩니다. "
-"최신 버전의 응용 프로그램이 여러분 컴퓨터로 다운로드될 것입니다. 이 것은 자동으로 처리됩니다. 여러분은 아무 것도 하실 필요가 "
-"없습니다."
+"현재 %1(은)는 다음 응용 프로그램을 사용합니다. 여러분이 %1에 참여할 때 하나 "
+"이상의 응용 프로그램이 여러분 컴퓨터로 할당됩니다. 최신 버전의 응용 프로그램"
+"이 여러분 컴퓨터로 다운로드될 것입니다. 이 것은 자동으로 처리됩니다. 여러분"
+"은 아무 것도 하실 필요가 없습니다."
#: ../user/apps.php:50
msgid "Platform"
@@ -2460,7 +2499,7 @@ msgstr "팀 생성 혹은 가입"
msgid "User of the day"
msgstr "오늘의 사용자"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
msgid "Server status"
msgstr "서버 상태"
@@ -2554,14 +2593,16 @@ msgid ""
"NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
"select Add Project, and enter an email address and password."
msgstr ""
-"비고: BOINC 관리자를 사용할 경우, 이 양식을 사용하지 마십시오. BOINC를 실행하고, 프로젝트 추가를 선택한 후 이메일 주소와 "
-"비밀번호를 입력해주세요."
+"비고: BOINC 관리자를 사용할 경우, 이 양식을 사용하지 마십시오. BOINC를 실행하"
+"고, 프로젝트 추가를 선택한 후 이메일 주소와 비밀번호를 입력해주세요."
#: ../user/create_account_form.php:61
msgid ""
"This account will belong to the team %1 and will have the project "
"preferences of its founder."
-msgstr "이 계정은 %1팀에 속하게 되며 프로젝트 환경 설정은 그 팀 창설자를 따르게 됩니다."
+msgstr ""
+"이 계정은 %1팀에 속하게 되며 프로젝트 환경 설정은 그 팀 창설자를 따르게 됩니"
+"다."
#: ../user/create_account_form.php:73
msgid "Invitation Code"
@@ -2611,7 +2652,8 @@ msgstr "%1 프로필 사진은 왼쪽에 표시됩니다."
msgid ""
"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
"or less)."
-msgstr "교체하려면 \"찾아보기\" 버튼을 누르고 JPEG나 PNG 파일을 선택하세요 (%1이하)"
+msgstr ""
+"교체하려면 \"찾아보기\" 버튼을 누르고 JPEG나 PNG 파일을 선택하세요 (%1이하)"
#: ../user/create_profile.php:69
msgid "To remove it from your profile, check this box:"
@@ -2622,8 +2664,8 @@ msgid ""
"If you would like include a picture with your profile, click the \"Browse\" "
"button and select a JPEG or PNG file. Please select images of %1 or less."
msgstr ""
-"만약 여러분 프로필에 사진을 포함시킬려면 \"찾아보기\" 버튼을 누르고 JPEG나 PNG 파일을 선택하세요. %1이하의 이미지를 "
-"선택해주세요."
+"만약 여러분 프로필에 사진을 포함시킬려면 \"찾아보기\" 버튼을 누르고 JPEG나 "
+"PNG 파일을 선택하세요. %1이하의 이미지를 선택해주세요."
#: ../user/create_profile.php:89
msgid "Language"
@@ -2653,7 +2695,8 @@ msgstr "업로드한 이미지 파일 포맷은 지원하지 않습니다."
msgid ""
"Your %1profile%2 lets you share your opinions and background with the %3 "
"community."
-msgstr "%1프로필%2은 여러분의 의견과 배경등을 %3 커뮤니티에서 공유하도록 합니다."
+msgstr ""
+"%1프로필%2은 여러분의 의견과 배경등을 %3 커뮤니티에서 공유하도록 합니다."
#: ../user/create_profile.php:213
msgid "Your ReCaptcha response was not correct. Please try again."
@@ -2663,13 +2706,17 @@ msgstr "ReCaptcha 응답이 틀렸습니다. 다시 시도해 주세요."
msgid ""
"Your first response was flagged as spam by the Akismet anti-spam system. "
"Please modify your text and try again."
-msgstr "첫번째 응답은 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수정하고 다시 시도해주세요."
+msgstr ""
+"첫번째 응답은 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수"
+"정하고 다시 시도해주세요."
#: ../user/create_profile.php:230
msgid ""
"Your second response was flagged as spam by the Akismet anti-spam system. "
"Please modify your text and try again."
-msgstr "두번째 응답은 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수정하고 다시 시도해주세요."
+msgstr ""
+"두번째 응답은 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수"
+"정하고 다시 시도해주세요."
#: ../user/create_profile.php:246
msgid "Your profile submission was empty."
@@ -2690,7 +2737,8 @@ msgstr "프로필이 저장되었습니다"
#: ../user/create_profile.php:304
msgid ""
"Congratulations! Your profile was successfully entered into our database."
-msgstr "축하합니다! 여러분의 프로필이 성공적으로 데이터베이스에 입력되었습니다."
+msgstr ""
+"축하합니다! 여러분의 프로필이 성공적으로 데이터베이스에 입력되었습니다."
#: ../user/create_profile.php:306
msgid "%1View your profile%2"
@@ -2704,7 +2752,9 @@ msgstr "프로필 만들기"
msgid ""
"To prevent spam, an average credit of %1 or greater is required to create or "
"edit a profile. We apologize for this inconvenience."
-msgstr "스팸을 방지하기 위해서 프로필을 작성하거나 수정하려면 크레딧을 평균 %1 이상 가지고 있어야 합니다. 불편을 드려서 죄송합니다."
+msgstr ""
+"스팸을 방지하기 위해서 프로필을 작성하거나 수정하려면 크레딧을 평균 %1 이상 "
+"가지고 있어야 합니다. 불편을 드려서 죄송합니다."
#: ../user/delete_account.php:57
msgid "Couldn't delete account"
@@ -2921,7 +2971,9 @@ msgstr "여러 항목의 응용 프로그램을 다운로드할 수 있습니다
#: ../user/download_network.php:31
msgid ""
"These applications are not endorsed by %1 and you use them at your own risk."
-msgstr "이들 응용 프로그램은 %1에서 승인받지 않았으며 여러분이 위험부담을 안고 사용하셔야 합니다."
+msgstr ""
+"이들 응용 프로그램은 %1에서 승인받지 않았으며 여러분이 위험부담을 안고 사용하"
+"셔야 합니다."
#: ../user/download_network.php:33
msgid ""
@@ -2931,7 +2983,8 @@ msgid ""
"If this is not enough you should contact the author."
msgstr ""
"저희는 이들 응용 프로그램을 설치하기 위한 설명서를 제공하지 않습니다.\n"
-"그러나 작성자는 응용 프로그램 설치나 삭제에 관해서 약간의 도움말을 제공할 수도 있습니다.\n"
+"그러나 작성자는 응용 프로그램 설치나 삭제에 관해서 약간의 도움말을 제공할 수"
+"도 있습니다.\n"
"그 것으로 충분하지 않다면 작성자에게 연락하세요."
#: ../user/download_network.php:36
@@ -2974,7 +3027,9 @@ msgstr "이 %1이메일 주소를 인증%2해 주세요."
msgid ""
"We can't update your email address due to a database problem. Please try "
"again later."
-msgstr "데이터베이스 문제로 이메일 주소를 업데이트할 수 없습니다. 나중에 다시 시도해주세요."
+msgstr ""
+"데이터베이스 문제로 이메일 주소를 업데이트할 수 없습니다. 나중에 다시 시도해"
+"주세요."
#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
msgid "Change email address"
@@ -3004,7 +3059,9 @@ msgstr "재설정 확인"
msgid ""
"This action will erase any changes you have made in your community "
"preferences. To cancel, click your browser's Back button."
-msgstr "이 행위는 여러분의 커뮤니티 환경설정에서 바꾼 모든 변경 사항을 지울 것입니다. 취소하려면 브라우저의 '뒤로' 버튼을 누르세요."
+msgstr ""
+"이 행위는 여러분의 커뮤니티 환경설정에서 바꾼 모든 변경 사항을 지울 것입니"
+"다. 취소하려면 브라우저의 '뒤로' 버튼을 누르세요."
#: ../user/edit_forum_preferences_action.php:38
msgid "Reset preferences"
@@ -3027,7 +3084,9 @@ msgstr "해당 사용자가 없습니다: %1"
msgid ""
"How should we notify you of new private messages, friend requests, posts in "
"subscribed threads, and other events?"
-msgstr "새로운 쪽지, 친구 요청, 구독 중인 스레드의 포스트, 기타 다른 사건을 저희가 얼마나 자주 알려주길 원하십니까?"
+msgstr ""
+"새로운 쪽지, 친구 요청, 구독 중인 스레드의 포스트, 기타 다른 사건을 저희가 얼"
+"마나 자주 알려주길 원하십니까?"
#: ../user/edit_forum_preferences_form.php:57
msgid "On my Account page (no email)"
@@ -3217,7 +3276,9 @@ msgstr "비밀번호가 변경되었습니다."
msgid ""
"We can't update your password due to a database problem. Please try again "
"later."
-msgstr "데이터베이스 문제로 비밀번호를 업데이트할 수 없습니다. 나중에 다시 시도해주세요."
+msgstr ""
+"데이터베이스 문제로 비밀번호를 업데이트할 수 없습니다. 나중에 다시 시도해주"
+"세요."
#: ../user/edit_passwd_form.php:39
msgid "You can identify yourself using either"
@@ -3293,14 +3354,16 @@ msgid ""
"computer, and if so whether the computer has finished it. Possible values "
"are:"
msgstr ""
-"태스크 <b>서버 현황</b>은 태스크가 클라이언트로 보내졌는지, 만약 그렇다면 해당 클라이언트가 작업을 마쳤는지 카르켜 줍니다. 가능한 "
-"값:"
+"태스크 <b>서버 현황</b>은 태스크가 클라이언트로 보내졌는지, 만약 그렇다면 해"
+"당 클라이언트가 작업을 마쳤는지 카르켜 줍니다. 가능한 값:"
#: ../user/explain_state.php:35
msgid ""
"The task is not ready to send (for example, because its input files are "
"unavailable)"
-msgstr "태스크 전송 준비가 되지 않았습니다(예를 들어 해당 입력 파일을 사용할 수 없습니다)"
+msgstr ""
+"태스크 전송 준비가 되지 않았습니다(예를 들어 해당 입력 파일을 사용할 수 없습"
+"니다)"
#: ../user/explain_state.php:38
msgid "The task is ready to send, but hasn't been sent yet."
@@ -3318,7 +3381,9 @@ msgstr "태스크가 전송되었습니다. 완료를 기다리는 중."
msgid ""
"The task has been sent to a computer and either it has timed out or the "
"computer has reported its completion."
-msgstr "태스크가 클라이언트로 전송되었으며 태스크의 마감이 지났거나 클라이언트에서 연산 완료를 보고했습니다."
+msgstr ""
+"태스크가 클라이언트로 전송되었으며 태스크의 마감이 지났거나 클라이언트에서 연"
+"산 완료를 보고했습니다."
#: ../user/explain_state.php:49
msgid "Outcomes"
@@ -3328,13 +3393,17 @@ msgstr "결과"
msgid ""
"A tasks's <b>outcome</b> is defined if its server state is <b>over</b>. "
"Possible values are:"
-msgstr "태스크 <b>결과</b>는 태스크 서버 현황이 <b>완료</b>됨을 정의합니다. 가능한 값:"
+msgstr ""
+"태스크 <b>결과</b>는 태스크 서버 현황이 <b>완료</b>됨을 정의합니다. 가능한 "
+"값:"
#: ../user/explain_state.php:57
msgid ""
"The task was sent to a computer, but the computer has not yet completed the "
"work and reported the outcome."
-msgstr "태스크가 클라이언트로 전송되었으나, 클라이언트에서 아직 연산이 완료되지 않았으며 결과를 보고하지 않았습니다."
+msgstr ""
+"태스크가 클라이언트로 전송되었으나, 클라이언트에서 아직 연산이 완료되지 않았"
+"으며 결과를 보고하지 않았습니다."
#: ../user/explain_state.php:60
msgid "A computer completed and reported the task successfully."
@@ -3344,7 +3413,9 @@ msgstr "클라이언트에서 연산을 완료했으며 성공적으로 보고
msgid ""
"The server wasn't able to send the task to a computer (perhaps because its "
"resource requirements were too large)"
-msgstr "서버에서 클라이언트로 태스크를 전송할 수 없습니다 (아마도 해당 자원의 요구 사항이 너무 큰 듯 합니다)"
+msgstr ""
+"서버에서 클라이언트로 태스크를 전송할 수 없습니다 (아마도 해당 자원의 요구 사"
+"항이 너무 큰 듯 합니다)"
#: ../user/explain_state.php:65
msgid "Client error"
@@ -3358,19 +3429,24 @@ msgstr "태스크가 클라이언트로 전송되었으나 오류가 발생했
msgid ""
"The task was sent to a computer and no reply was received within the time "
"limit."
-msgstr "태스크가 클라이언트로 전송되었으나 마감 시각까지 어떤 응답도 받지 못했습니다."
+msgstr ""
+"태스크가 클라이언트로 전송되었으나 마감 시각까지 어떤 응답도 받지 못했습니다."
#: ../user/explain_state.php:72
msgid ""
"The task wasn't sent to a computer because enough other tasks were completed "
"for this workunit."
-msgstr "해당 작업 유닛의 다른 태스크가 충분히 완료되었기에 클라이언트에게 태스크를 전송하지 않았습니다."
+msgstr ""
+"해당 작업 유닛의 다른 태스크가 충분히 완료되었기에 클라이언트에게 태스크를 전"
+"송하지 않았습니다."
#: ../user/explain_state.php:75
msgid ""
"The task was reported but could not be validated, typically because the "
"output files were lost on the server."
-msgstr "태스크가 보고되었으나 인정되지 않았습니다. 일반적으로 출력 파일이 서버에서 유실되었기 때문입니다."
+msgstr ""
+"태스크가 보고되었으나 인정되지 않았습니다. 일반적으로 출력 파일이 서버에서 유"
+"실되었기 때문입니다."
#: ../user/explain_state.php:80
msgid "Client states"
@@ -3380,7 +3456,8 @@ msgstr "클라이언트 상태"
msgid ""
"A result's <b>client state</b> indicates the stage of processing at which an "
"error occurred."
-msgstr "결과물의 <b>클라이언트 상황</b>은 오류가 발생한 연산 과정을 가르켜 줍니다."
+msgstr ""
+"결과물의 <b>클라이언트 상황</b>은 오류가 발생한 연산 과정을 가르켜 줍니다."
#: ../user/explain_state.php:86
msgid "The computer has not yet completed the task."
@@ -3410,7 +3487,9 @@ msgstr "보고 시각 및 마감 시각"
msgid ""
"A task's <b>Time reported or deadline</b> field depends on whether the task "
"has been reported yet:"
-msgstr "태스크 <b>보고된 시간 또는 마감 시각</b> 필드는 태스크가 이미 보고되었는지 여부에 따라 다릅니다:"
+msgstr ""
+"태스크 <b>보고된 시간 또는 마감 시각</b> 필드는 태스크가 이미 보고되었는지 여"
+"부에 따라 다릅니다:"
#: ../user/explain_state.php:110
msgid "Already reported"
@@ -3474,15 +3553,18 @@ msgstr "%1을 친구들에게 전해주어서 감사합니다"
#: ../user/ffmail_action.php:94
msgid ""
-"You forgot to enter your friends' names and/or email addresses; Please %"
-"1return to the form%2 and enter them."
-msgstr "친구의 이름 혹은 이메일 주소를 입력하지 않았습니다. 빠진 부분을 %1입력 폼으로 돌아가서 입력%2해주시기 바랍니다."
+"You forgot to enter your friends' names and/or email addresses; Please "
+"%1return to the form%2 and enter them."
+msgstr ""
+"친구의 이름 혹은 이메일 주소를 입력하지 않았습니다. 빠진 부분을 %1입력 폼으"
+"로 돌아가서 입력%2해주시기 바랍니다."
#: ../user/ffmail_form.php:30
msgid ""
"This project hasn't created an email message - please notify its "
"administrators"
-msgstr "이 프로젝트는 이메일 메세지를 생성할 수 없습니다 - 관리자에게 문의해 주세요"
+msgstr ""
+"이 프로젝트는 이메일 메세지를 생성할 수 없습니다 - 관리자에게 문의해 주세요"
#: ../user/ffmail_form.php:33
msgid "Tell your friends about %1"
@@ -3498,8 +3580,9 @@ msgid ""
"might be interested in %1. We'll send them an email in your name, and you "
"can add your own message if you like."
msgstr ""
-"%1에 흥미를 가질 것 같은 사람들의 이름과 이메일 주소를 이 양식에 채워주세요. 여러분의 이름이 들어간 이메일(원한다면 메세지를 추가할 "
-"수도 있습니다.)을 저희가 그들에게 보낼 것입니다."
+"%1에 흥미를 가질 것 같은 사람들의 이름과 이메일 주소를 이 양식에 채워주세요. "
+"여러분의 이름이 들어간 이메일(원한다면 메세지를 추가할 수도 있습니다.)을 저희"
+"가 그들에게 보낼 것입니다."
#: ../user/ffmail_form.php:42
msgid "Your name:"
@@ -3548,14 +3631,17 @@ msgid ""
"for chosen time period.<br/>It should be done only if %1 has consistently "
"exhibited trollish behavior."
msgstr ""
-"정말로 %1을 차단하시겠습니까?<br />이로써 지정된 기간 동안 %1은 포스팅을 할 수 없게 됩니다.<br />이 기능은 오직 %1이 "
-"유해한 행동을 일관되게 저지를 경우에만 사용하십시오."
+"정말로 %1을 차단하시겠습니까?<br />이로써 지정된 기간 동안 %1은 포스팅을 할 "
+"수 없게 됩니다.<br />이 기능은 오직 %1이 유해한 행동을 일관되게 저지를 경우에"
+"만 사용하십시오."
#: ../user/forum_banishment_vote.php:61
msgid ""
"Select the reason category, optionally write a longer description of why the "
"user should be banished."
-msgstr "이유 카테고리를 선택하세요. 추가적으로 왜 이 사용자가 차단되어야 하는지 보다 긴 설명을 쓸 수 있습니다."
+msgstr ""
+"이유 카테고리를 선택하세요. 추가적으로 왜 이 사용자가 차단되어야 하는지 보다 "
+"긴 설명을 쓸 수 있습니다."
#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
msgid "Category"
@@ -3607,7 +3693,9 @@ msgstr "행동을 지정해야 합니다..."
msgid ""
"You can no longer edit this post.<br/>Posts can only be edited at most %1 "
"minutes after they have been created."
-msgstr "더 이상 이 포스트를 편집할 수 없습니다.<br />포스트는 생성되고나서 %1 분 후에 편집할 수 있습니다."
+msgstr ""
+"더 이상 이 포스트를 편집할 수 없습니다.<br />포스트는 생성되고나서 %1 분 후"
+"에 편집할 수 있습니다."
#: ../user/forum_edit.php:47
msgid "You are not authorized to edit this post."
@@ -3721,9 +3809,11 @@ msgstr "질문과 답변"
#: ../user/forum_help_desk.php:30
msgid ""
-"Talk live via Skype with a volunteer, in any of several languages. Go to %"
-"1BOINC Online Help%2."
-msgstr "Skype를 통해서 여러 언어로 기여자들과 실시간으로 이야기하세요. %1BOINC 온라인 도움말%2로 가세요."
+"Talk live via Skype with a volunteer, in any of several languages. Go to "
+"%1BOINC Online Help%2."
+msgstr ""
+"Skype를 통해서 여러 언어로 기여자들과 실시간으로 이야기하세요. %1BOINC 온라"
+"인 도움말%2로 가세요."
#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
msgid "Topic"
@@ -3745,7 +3835,8 @@ msgstr "%1 게시판"
msgid ""
"If you have a question or problem, please use the %1Questions & Answers%2 "
"section of the message boards."
-msgstr "질문이 있거나 문제가 생기면 게시판에서 %1질문 & 답변%2 섹션을 이용해 주세요."
+msgstr ""
+"질문이 있거나 문제가 생기면 게시판에서 %1질문 & 답변%2 섹션을 이용해 주세요."
#: ../user/forum_index.php:123
msgid "Subscribed threads"
@@ -3858,7 +3949,9 @@ msgstr "스레드 '%1' 관리하기"
msgid ""
"Select the reason category, or write a longer description of why you're "
"hiding or locking the thread; then press OK."
-msgstr "이유 카테고리를 선택하세요. 아니면 왜 이 스레드를 숨기거나 잠겨야 하는지 보다 긴 설명을 쓸 수 있습니다. 확인을 누르세요."
+msgstr ""
+"이유 카테고리를 선택하세요. 아니면 왜 이 스레드를 숨기거나 잠겨야 하는지 보"
+"다 긴 설명을 쓸 수 있습니다. 확인을 누르세요."
#: ../user/forum_moderate_thread.php:72
msgid "Current forum"
@@ -3876,13 +3969,17 @@ msgstr "새 제목:"
msgid ""
"Only project admins may create a thread here. However, you may reply to "
"existing threads."
-msgstr "오직 프로젝트 관리자만 이곳에 스레드를 생성할 수 있습니다. 그러나 기존 스레드에 리플은 달 수 있습니다."
+msgstr ""
+"오직 프로젝트 관리자만 이곳에 스레드를 생성할 수 있습니다. 그러나 기존 스레드"
+"에 리플은 달 수 있습니다."
#: ../user/forum_post.php:60
msgid ""
"Your message was flagged as spam by the Akismet anti-spam system. Please "
"modify your text and try again."
-msgstr "여러분의 글을 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수정하고 다시 시도해주세요."
+msgstr ""
+"여러분의 글을 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수"
+"정하고 다시 시도해주세요."
#: ../user/forum_post.php:70
msgid "Create new thread"
@@ -3951,7 +4048,9 @@ msgstr "해결 의뢰할 문제를 투표하기"
msgid ""
"Your post has been flagged as spam by the Akismet anti-spam system. Please "
"modify your text and try again."
-msgstr "여러분의 글을 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수정하고 다시 시도해주세요."
+msgstr ""
+"여러분의 글을 Akismet 스팸방어 시스템이 스팸으로 분류하였습니다. 텍스트를 수"
+"정하고 다시 시도해주세요."
#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
#: ../user/forum_thread.php:274
@@ -3990,7 +4089,9 @@ msgstr "여러분의 응답이 기록되었습니다. 입력해주셔서 감사
msgid ""
"A moderator will now look at your report and decide what will happen - this "
"may take a little while, so please be patient"
-msgstr "관리자가 여러분의 보고서를 보고 다음에 어떻게 할지 결정합니다. 이는 시간이 꽤 걸립니다. 그러므로 기다려 주세요."
+msgstr ""
+"관리자가 여러분의 보고서를 보고 다음에 어떻게 할지 결정합니다. 이는 시간이 "
+"꽤 걸립니다. 그러므로 기다려 주세요."
#: ../user/forum_report_post.php:71
msgid "Report a forum post"
@@ -4002,8 +4103,9 @@ msgid ""
"enough users rate a post negatively it will eventually be hidden.<br />You "
"can find the rating system at the bottom of the post."
msgstr ""
-"이 포스트를 신고하기 전에 +/- 등급 시스템 사용을 고려해 보세요. 만약 충분한 사용자들이 포스트에 부정적인 등급을 매겼다면 결국 숨김 "
-"처리될 것입니다.<br />포스트 하단부에서 등급 시스템을 찾을 수 있습니다."
+"이 포스트를 신고하기 전에 +/- 등급 시스템 사용을 고려해 보세요. 만약 충분한 "
+"사용자들이 포스트에 부정적인 등급을 매겼다면 결국 숨김 처리될 것입니다.<br />"
+"포스트 하단부에서 등급 시스템을 찾을 수 있습니다."
#: ../user/forum_report_post.php:80
msgid "Report post"
@@ -4015,7 +4117,8 @@ msgid ""
"that a person that\n"
"has not yet read the thread will quickly be able to identify the issue.%2"
msgstr ""
-"왜 불쾌한 포스트를 찾습니까?: %1충분한 정보를 제공하세요. 그렇게 함으로써 사람들이 아직 읽지\n"
+"왜 불쾌한 포스트를 찾습니까?: %1충분한 정보를 제공하세요. 그렇게 함으로써 사"
+"람들이 아직 읽지\n"
"않은 스레드에서 신속하게 문제 사항을 식별할 수 있게 됩니다.%2"
#: ../user/forum_report_post.php:90
@@ -4140,8 +4243,8 @@ msgid ""
"Sorry, couldn't find anything matching your search query. You can try to "
"broaden your search by using less words (or less specific words)."
msgstr ""
-"죄송합니다. 검색 큐와 일치하는 어떤 것도 찾을 수 없습니다. 더 적은 단어(또는 더 적은 특정 단어)를 사용해서 검색 범위를 넓힐 수 "
-"있습니다."
+"죄송합니다. 검색 큐와 일치하는 어떤 것도 찾을 수 없습니다. 더 적은 단어(또는 "
+"더 적은 특정 단어)를 사용해서 검색 범위를 넓힐 수 있습니다."
#: ../user/forum_search_action.php:219
msgid "You can also %1try the same search on Google.%2"
@@ -4178,7 +4281,9 @@ msgstr "구독 해제에 성공했습니다"
msgid ""
"You are no longer subscribed to %1. You will no longer receive notifications "
"for this thread."
-msgstr "더 이상 %1을 구독하지 않기로 했습니다. 더 이상 이 스레드에 관한 알림을 받지 못할 것입니다."
+msgstr ""
+"더 이상 %1을 구독하지 않기로 했습니다. 더 이상 이 스레드에 관한 알림을 받지 "
+"못할 것입니다."
#: ../user/forum_subscribe.php:66
msgid "Unsubscription failed"
@@ -4223,7 +4328,8 @@ msgstr "구독 취소"
#: ../user/forum_thread.php:172
msgid "You are subscribed to this thread. Click here to unsubscribe."
-msgstr "여러분은 이 스레드를 구독하고 계십니다. 구독을 취소하려면 여기를 누르세요."
+msgstr ""
+"여러분은 이 스레드를 구독하고 계십니다. 구독을 취소하려면 여기를 누르세요."
#: ../user/forum_thread.php:178
msgid "Subscribe"
@@ -4231,7 +4337,8 @@ msgstr "구독하기"
#: ../user/forum_thread.php:179
msgid "Click to get email when there are new posts in this thread"
-msgstr "이 스레드에 새로운 포스트가 올라올 때 이메일로 보내주길 원하면 클릭하세요"
+msgstr ""
+"이 스레드에 새로운 포스트가 올라올 때 이메일로 보내주길 원하면 클릭하세요"
#: ../user/forum_thread.php:190
msgid "Unhide this thread"
@@ -4341,7 +4448,9 @@ msgstr "친구로 추가"
msgid ""
"You have asked to add %1 as a friend. We will notify %1 and will ask him/her "
"to confirm that you are friends."
-msgstr "%1을 친구로 추가하길 요청했습니다. %1에게 알리고 그에게 당신을 친구로 할지 확인하도록 요청할 것입니다."
+msgstr ""
+"%1을 친구로 추가하길 요청했습니다. %1에게 알리고 그에게 당신을 친구로 할지 확"
+"인하도록 요청할 것입니다."
#: ../user/friend.php:77
msgid "Add an optional message here:"
@@ -4446,19 +4555,23 @@ msgstr "계정 정보를 잊었습니까?"
#: ../user/get_passwd.php:28
msgid ""
"1) If you know your account's email address, and you can receive email there:"
-msgstr "1) 만약 해당 계정의 이메일 주소를 알고 있으며, 이메일을 받을 수 있는 경우:"
+msgstr ""
+"1) 만약 해당 계정의 이메일 주소를 알고 있으며, 이메일을 받을 수 있는 경우:"
#: ../user/get_passwd.php:29
msgid ""
"Enter the email address below, and click OK. You will be sent email "
"instructions for resetting your password."
-msgstr "하단에 이메일 주소를 입력하고 확인을 누르세요. 비밀번호를 초기화하기 위한 절차가 이메일로 전송됩니다."
+msgstr ""
+"하단에 이메일 주소를 입력하고 확인을 누르세요. 비밀번호를 초기화하기 위한 절"
+"차가 이메일로 전송됩니다."
#: ../user/get_passwd.php:46
msgid ""
"2) If you forgot your account's email address, or you can't receive email "
"there:"
-msgstr "2) 만약 해당 계정의 이메일 주소를 잊었거나, 이메일을 받을 수 없는 경우:"
+msgstr ""
+"2) 만약 해당 계정의 이메일 주소를 잊었거나, 이메일을 받을 수 없는 경우:"
#: ../user/get_passwd.php:47
msgid ""
@@ -4470,7 +4583,9 @@ msgstr "해당 계정으로 BOINC를 실행하고 있다면 계속 접근할 수
msgid ""
"Go to the BOINC data directory on your computer (its location is written to "
"the Event Log at startup)."
-msgstr "컴퓨터상의 BOINC 데이터 디렉토리로 이동하세요.(해당 디렉토리 위치는 BOINC 관리자의 이벤트 기록에 쓰여져 있습니다.)"
+msgstr ""
+"컴퓨터상의 BOINC 데이터 디렉토리로 이동하세요.(해당 디렉토리 위치는 BOINC 관"
+"리자의 이벤트 기록에 쓰여져 있습니다.)"
#: ../user/get_passwd.php:51
msgid "Find your account file for this project; it will be named <b>%1</b>."
@@ -4492,7 +4607,9 @@ msgstr "하단의 입력란에 문자열을 붙여넣고 확인을 누르세요.
msgid ""
"You will now be logged in to your account; update the email and password of "
"your account."
-msgstr "여러분 계정은 로그인 상태를 유지할 것입니다. 여러분 계정의 메일 주소와 비밀번호를 업데이트하세요."
+msgstr ""
+"여러분 계정은 로그인 상태를 유지할 것입니다. 여러분 계정의 메일 주소와 비밀번"
+"호를 업데이트하세요."
#: ../user/get_passwd.php:71
msgid "Log in with authenticator"
@@ -4506,7 +4623,9 @@ msgstr "보고된 GPU 태스크가 없습니다"
msgid ""
"The following lists show the most productive GPU models on different "
"platforms. Relative speeds are shown in parentheses."
-msgstr "다음 목록은 다른 플랫폼에서 가장 효율성이 높은 GPU 종류를 보여줍니다. 괄호 안 내용은 상대적인 속도를 나타냅니다."
+msgstr ""
+"다음 목록은 다른 플랫폼에서 가장 효율성이 높은 GPU 종류를 보여줍니다. 괄호 "
+"안 내용은 상대적인 속도를 나타냅니다."
#: ../user/home.php:42
msgid "Welcome to %1"
@@ -4514,11 +4633,13 @@ msgstr "%1에 오신 걸 환영합니다"
#: ../user/home.php:43
msgid "View and edit your account preferences using the links below."
-msgstr "하단에 표시된 링크를 사용해서 계정 환경 설정을 보고 수정할 수 있습니다."
+msgstr ""
+"하단에 표시된 링크를 사용해서 계정 환경 설정을 보고 수정할 수 있습니다."
#: ../user/home.php:46
msgid "If you have not already done so, %1download BOINC client software%2."
-msgstr "만약 아직 그렇지 않다면 %1BOINC 클라이언트 소프트웨어를 다운로드하세요%2."
+msgstr ""
+"만약 아직 그렇지 않다면 %1BOINC 클라이언트 소프트웨어를 다운로드하세요%2."
#: ../user/host_app_versions.php:37
msgid "Anonymous platform, missing app"
@@ -4574,8 +4695,9 @@ msgid ""
"contains work for it. You must wait a few days until the work for this "
"computer has been deleted from the project database."
msgstr ""
-"이 컴퓨터의 저희 기록을 삭제할 수 없습니다. 왜냐하면 저희 DB는 여전히 그 것을 포함한 채 작동하기 때문입니다. 프로젝트 DB에서 "
-"해당 컴퓨터의 작업이 삭제되기 전까지 며칠간 기다려야 합니다."
+"이 컴퓨터의 저희 기록을 삭제할 수 없습니다. 왜냐하면 저희 DB는 여전히 그 것"
+"을 포함한 채 작동하기 때문입니다. 프로젝트 DB에서 해당 컴퓨터의 작업이 삭제되"
+"기 전까지 며칠간 기다려야 합니다."
#: ../user/host_delete.php:40
msgid "Delete record of computer"
@@ -4602,8 +4724,8 @@ msgid ""
"Sometimes BOINC assigns separate identities to the same computer by mistake. "
"You can correct this by merging old identities with the newest one."
msgstr ""
-"때때로 BOINC는 실수로 같은 컴퓨터를 개별적인 존재로 인정합니다. 여러분은 오래된 것을 새로운 것으로 통합시켜서 바로잡을 수 "
-"있습니다."
+"때때로 BOINC는 실수로 같은 컴퓨터를 개별적인 존재로 인정합니다. 여러분은 오래"
+"된 것을 새로운 것으로 통합시켜서 바로잡을 수 있습니다."
#: ../user/host_edit_form.php:56
msgid "No hosts are eligible for merging with this one."
@@ -4658,7 +4780,9 @@ msgstr "이 호스트의 위치가 %1로 설정되었습니다."
msgid ""
"This change will take effect the next time the host communicates with this "
"project."
-msgstr "이 변화는 다음 번에 해당 호스트가 이 프로젝트 서버와 통신할 경우 적용될 것입니다."
+msgstr ""
+"이 변화는 다음 번에 해당 호스트가 이 프로젝트 서버와 통신할 경우 적용될 것입"
+"니다."
#: ../user/host_venue_action.php:50
msgid "Return to host page"
@@ -4717,7 +4841,9 @@ msgstr "사전 정의됨"
msgid ""
"image; height cannot exceed 450 pixels. Please do not link to images without "
"permission of the web site where the image is hosted."
-msgstr "이미지: 높이는 450 픽셀을 초과할 수 없습니다. 이미지가 올려진, 권한없는 웹 사이트에 이미지를 링크하지 마십시오."
+msgstr ""
+"이미지: 높이는 450 픽셀을 초과할 수 없습니다. 이미지가 올려진, 권한없는 웹 사"
+"이트에 이미지를 링크하지 마십시오."
#: ../user/html.php:35
msgid "You can also use ampersand notation for special characters."
@@ -4733,8 +4859,9 @@ msgid ""
"owner's permission. Some companies and schools have policies that prohibit "
"using their computers for projects such as %1."
msgstr ""
-"%1(은)는 여러분이 가진 컴퓨터 또는 소유자의 허락을 얻은 컴퓨터로 수행하십시오. 어떤 회사와 학교는 %1(과)와 같은 프로젝트를 "
-"수행하지 못하게 하려고 그들의 컴퓨터를 사용하지 못하게 하는 정책을 가지고 있습니다."
+"%1(은)는 여러분이 가진 컴퓨터 또는 소유자의 허락을 얻은 컴퓨터로 수행하십시"
+"오. 어떤 회사와 학교는 %1(과)와 같은 프로젝트를 수행하지 못하게 하려고 그들"
+"의 컴퓨터를 사용하지 못하게 하는 정책을 가지고 있습니다."
#: ../user/info.php:38
msgid "How %1 will use your computer"
@@ -4746,16 +4873,17 @@ msgid ""
"power, disk space, and network bandwidth. You can control how much of your "
"resources are used by %1, and when it uses them."
msgstr ""
-"%1(을)를 실행하실 경우 여러분 컴퓨터의 CPU, 디스크 공간, 네트워크 대역폭 중 일부를 사용하게 됩니다. 여러분은 언제, 얼마만큼 "
-"%1이 여러분의 컴퓨터 자원을 사용할지 제어할 수 있습니다."
+"%1(을)를 실행하실 경우 여러분 컴퓨터의 CPU, 디스크 공간, 네트워크 대역폭 중 "
+"일부를 사용하게 됩니다. 여러분은 언제, 얼마만큼 %1이 여러분의 컴퓨터 자원을 "
+"사용할지 제어할 수 있습니다."
#: ../user/info.php:40
msgid ""
"The work done by your computer contributes to the goals of %1, as described "
"on its web site. The application programs may change from time to time."
msgstr ""
-"여러분이 가진 컴퓨터로 한 작업은 %1 웹 사이트에 설명된 목표에 도달하는데 공헌하고 있습니다. 응용 프로그램은 시간이 지나면 바뀔 수 "
-"있습니다."
+"여러분이 가진 컴퓨터로 한 작업은 %1 웹 사이트에 설명된 목표에 도달하는데 공헌"
+"하고 있습니다. 응용 프로그램은 시간이 지나면 바뀔 수 있습니다."
#: ../user/info.php:42
msgid "Privacy policy"
@@ -4768,8 +4896,9 @@ msgid ""
"done for %1. If you want to be anonymous, choose a name that doesn't reveal "
"your identity."
msgstr ""
-"%1(은)는 여러분이 선택한 이름을 바탕으로 여러분을 식별합니다. 이 이름은 %1 웹 사이트에서 여러분의 컴퓨터로 %1(을)를 수행한 "
-"결과와 함께 보여질 것입니다. 만약 익명으로 남길 원한다면 여러분의 이름을 밝히지 않도록 선택하십시오."
+"%1(은)는 여러분이 선택한 이름을 바탕으로 여러분을 식별합니다. 이 이름은 %1 "
+"웹 사이트에서 여러분의 컴퓨터로 %1(을)를 수행한 결과와 함께 보여질 것입니"
+"다. 만약 익명으로 남길 원한다면 여러분의 이름을 밝히지 않도록 선택하십시오."
#: ../user/info.php:44
msgid ""
@@ -4779,19 +4908,22 @@ msgid ""
"also be shown on %1's web site. Nothing that reveals your computer's "
"location (e.g. its domain name or network address) will be shown."
msgstr ""
-"만약 여러분이 %1에 참여한다면 여러분의 컴퓨터 정보(프로세서 종류, 메모리 용량, 기타)가 %1 서버에 기록됩니다. 이 것은 여러분 "
-"컴퓨터로 어떤 작업을 할당할지 결정하기 위해 사용됩니다. 이 정보는 또한 %1 웹 사이트에 공개됩니다. 여러분 컴퓨터의 위치를 알 수 "
-"있는 정보(예를 들어 도메인 네임이나 네트워크 주소)는 아무 것도 공개되지 않습니다."
+"만약 여러분이 %1에 참여한다면 여러분의 컴퓨터 정보(프로세서 종류, 메모리 용"
+"량, 기타)가 %1 서버에 기록됩니다. 이 것은 여러분 컴퓨터로 어떤 작업을 할당할"
+"지 결정하기 위해 사용됩니다. 이 정보는 또한 %1 웹 사이트에 공개됩니다. 여러"
+"분 컴퓨터의 위치를 알 수 있는 정보(예를 들어 도메인 네임이나 네트워크 주소)"
+"는 아무 것도 공개되지 않습니다."
#: ../user/info.php:45
msgid ""
"To participate in %1, you must give an address where you receive email. This "
-"address will not be shown on the %1 web site or shared with organizations. %"
-"1 may send you periodic newsletters; however, you can opt out at any time."
+"address will not be shown on the %1 web site or shared with organizations. "
+"%1 may send you periodic newsletters; however, you can opt out at any time."
msgstr ""
-"%1에 참여하려면 여러분이 실제로 받아볼 수 있는 email 주소를 제공해야 합니다. 이 주소는 %1 웹 사이트에 공개되지 않으며, 다른 "
-"기관과 공유하지도 않습니다. %1(은)는 여러분에게 주기적으로 소식지를 보낼 수도 있습니다. 그러나 이 것은 언제든지 거부할 수 "
-"있습니다."
+"%1에 참여하려면 여러분이 실제로 받아볼 수 있는 email 주소를 제공해야 합니다. "
+"이 주소는 %1 웹 사이트에 공개되지 않으며, 다른 기관과 공유하지도 않습니다. %1"
+"(은)는 여러분에게 주기적으로 소식지를 보낼 수도 있습니다. 그러나 이 것은 언제"
+"든지 거부할 수 있습니다."
#: ../user/info.php:46
msgid ""
@@ -4801,9 +4933,11 @@ msgid ""
"them to your %2message filter%3. This will prevent you from seeing any "
"public or private messages from that user."
msgstr ""
-"%1 웹 사이트를 통해 보낸 쪽지는 송신자와 수신자만 볼 수 있습니다. %1은 쪽지 내용을 검사하거나 감시하지 않습니다. 만약 여러분이 "
-"다른 %1 사용자에게서 쪽지를 받길 원하지 않는다면 그 것들을 %2메세지 필터%3에 추가할 수 있습니다. 이 것은 불특정 다수에게 "
-"보여지거나 혹은 다른 사용자에게서 온 쪽지로부터 원하지 않는 메세지를 막아줍니다."
+"%1 웹 사이트를 통해 보낸 쪽지는 송신자와 수신자만 볼 수 있습니다. %1은 쪽지 "
+"내용을 검사하거나 감시하지 않습니다. 만약 여러분이 다른 %1 사용자에게서 쪽지"
+"를 받길 원하지 않는다면 그 것들을 %2메세지 필터%3에 추가할 수 있습니다. 이 것"
+"은 불특정 다수에게 보여지거나 혹은 다른 사용자에게서 온 쪽지로부터 원하지 않"
+"는 메세지를 막아줍니다."
#: ../user/info.php:47
msgid ""
@@ -4812,8 +4946,10 @@ msgid ""
"members. By posting to the forums, you are granting irrevocable license for "
"anyone to view and copy your posts."
msgstr ""
-"만약 우리 웹사이트 포럼을 이용하려면 %2글 쓰기 가이드라인%3을 따라야 합니다. %1 포럼에 작성된 게시물은 멤버가 아닌 사람을 포함한 "
-"누구나 볼 수 있습니다. 포럼에 글을 쓰면 여러분의 포스트들은 누구나 볼 수 있고 복사할 수 있는 권리를 부여받게 됩니다."
+"만약 우리 웹사이트 포럼을 이용하려면 %2글 쓰기 가이드라인%3을 따라야 합니다. "
+"%1 포럼에 작성된 게시물은 멤버가 아닌 사람을 포함한 누구나 볼 수 있습니다. 포"
+"럼에 글을 쓰면 여러분의 포스트들은 누구나 볼 수 있고 복사할 수 있는 권리를 부"
+"여받게 됩니다."
#: ../user/info.php:48
msgid "Is it safe to run %1?"
@@ -4829,23 +4965,28 @@ msgid ""
"all executable files are digitally signed on a secure computer not connected "
"to the Internet."
msgstr ""
-"언제든지 여러분은 인터넷을 통해서 프로그램을 다운로드할 수 있습니다. 어떤 때는 프로그램이 위험한 오류를 가지고 있을 수 도 있고 "
-"다운로드 서버가 해킹당했을 수도 있습니다. %1(은)는 이러한 위험을 최소화하기 위해 노력합니다. 우리는 우리의 응용 프로그램을 조심히 "
-"테스트합니다. 우리 서버는 높은 보안성을 위해서 방화벽 뒤에 두고 있습니다. 프로그램 다운로드를 안전하게 하기 위해서 모든 실행가능한 "
-"파일은 인터넷에 연결되지 않은 안전한 컴퓨터로 디지털 서명을 하고 있습니다."
+"언제든지 여러분은 인터넷을 통해서 프로그램을 다운로드할 수 있습니다. 어떤 때"
+"는 프로그램이 위험한 오류를 가지고 있을 수 도 있고 다운로드 서버가 해킹당했"
+"을 수도 있습니다. %1(은)는 이러한 위험을 최소화하기 위해 노력합니다. 우리는 "
+"우리의 응용 프로그램을 조심히 테스트합니다. 우리 서버는 높은 보안성을 위해서 "
+"방화벽 뒤에 두고 있습니다. 프로그램 다운로드를 안전하게 하기 위해서 모든 실행"
+"가능한 파일은 인터넷에 연결되지 않은 안전한 컴퓨터로 디지털 서명을 하고 있습"
+"니다."
#: ../user/info.php:50
msgid ""
"The applications run by %1 may cause some computers to overheat. If this "
"happens, stop running %1 or use a %2utility program%3 that limits CPU usage."
msgstr ""
-"%1 응용을 수행 중에 어떤 컴퓨터는 과부하가 걸릴 수 있습니다. 만약 그렇게 되었다면 %1 수행을 중지하시거나 CPU사용량을 제한하기 "
-"위해 %2유틸리티 프로그램%3(을)를 사용하십시오."
+"%1 응용을 수행 중에 어떤 컴퓨터는 과부하가 걸릴 수 있습니다. 만약 그렇게 되었"
+"다면 %1 수행을 중지하시거나 CPU사용량을 제한하기 위해 %2유틸리티 프로그램%3"
+"(을)를 사용하십시오."
#: ../user/info.php:51
msgid ""
"%1 was developed by %2. BOINC was developed at the University of California."
-msgstr "%1(은)는 %2에서 개발했습니다. BOINC는 California 대학에서 개발했습니다."
+msgstr ""
+"%1(은)는 %2에서 개발했습니다. BOINC는 California 대학에서 개발했습니다."
#: ../user/info.php:53
msgid "Liability"
@@ -4854,11 +4995,11 @@ msgstr "책임"
#: ../user/info.php:54
msgid ""
"%1 and %2 assume no liability for damage to your computer, loss of data, or "
-"any other event or condition that may occur as a result of participating in %"
-"1."
+"any other event or condition that may occur as a result of participating in "
+"%1."
msgstr ""
-"%1(과)와 %2(은)는 %1에 참여한 결과로 인해 발생할지도 모르는 컴퓨터가 입은 충격, 데이터 손실, 혹은 어떤 사건이나 손해도 "
-"책임지지 않습니다."
+"%1(과)와 %2(은)는 %1에 참여한 결과로 인해 발생할지도 모르는 컴퓨터가 입은 충"
+"격, 데이터 손실, 혹은 어떤 사건이나 손해도 책임지지 않습니다."
#: ../user/info.php:56
msgid "Other BOINC projects"
@@ -4870,8 +5011,9 @@ msgid ""
"participating in one or more of these projects. By doing so, your computer "
"will do useful work even when %1 has no work available for it."
msgstr ""
-"다른 프로젝트도 %1처럼 BOINC 플랫폼을 사용합니다. 여러분이 이들 프로젝트에 하나 이상 참여할 생각이 들지도 모릅니다. 그렇게 "
-"함으로서 %1에서 수행할 작업이 없어도 여러분 컴퓨터는 유용한 작업을 수행할 수 있습니다. "
+"다른 프로젝트도 %1처럼 BOINC 플랫폼을 사용합니다. 여러분이 이들 프로젝트에 하"
+"나 이상 참여할 생각이 들지도 모릅니다. 그렇게 함으로서 %1에서 수행할 작업이 "
+"없어도 여러분 컴퓨터는 유용한 작업을 수행할 수 있습니다. "
#: ../user/info.php:58
msgid ""
@@ -4879,8 +5021,9 @@ msgid ""
"their security practices or the nature of their research. Join them at your "
"own risk."
msgstr ""
-"다른 프로젝트는 %1(과)와 아무 관련이 없으며, 그들의 보안 상태나 그들이 하는 연구의 성격을 보증할 수 없습니다. 여러분은 위험을 "
-"감수하고서 그 것에 참여하셔야 합니다."
+"다른 프로젝트는 %1(과)와 아무 관련이 없으며, 그들의 보안 상태나 그들이 하는 "
+"연구의 성격을 보증할 수 없습니다. 여러분은 위험을 감수하고서 그 것에 참여하셔"
+"야 합니다."
#: ../user/language_select.php:47
msgid "Language selection"
@@ -4896,7 +5039,9 @@ msgstr "이 웹 사이트는 다양한 언어로 이용할 수 있습니다. 현
msgid ""
"Normally the choice of language is determined by your browser's language "
"setting, which is: %1. You can change this setting using:"
-msgstr "보통 언어 설정은 여러분의 브라우저 언어 설정을 따릅니다. 현재 언어: %1 이 언어로 바꾸기: "
+msgstr ""
+"보통 언어 설정은 여러분의 브라우저 언어 설정을 따릅니다. 현재 언어: %1 이 언"
+"어로 바꾸기: "
#: ../user/language_select.php:83
msgid "Firefox: Tools/Options/General"
@@ -4912,8 +5057,9 @@ msgid ""
"send your browser a cookie; make sure your browser accepts cookies from our "
"domain."
msgstr ""
-"또는 다음 링크 중 하나를 클릭해서 언어를 선택할 수 있습니다. 이 사항은 브라우저에 쿠키로 저장됩니다. 브라우저가 이 도메인의 쿠키를 "
-"허용하도록 해야 합니다"
+"또는 다음 링크 중 하나를 클릭해서 언어를 선택할 수 있습니다. 이 사항은 브라"
+"우저에 쿠키로 저장됩니다. 브라우저가 이 도메인의 쿠키를 허용하도록 해야 합니"
+"다"
#: ../user/language_select.php:95
msgid "Language name (click to select)"
@@ -4925,9 +5071,11 @@ msgstr "브라우저 언어 설정 사용"
#: ../user/language_select.php:113
msgid ""
-"Translations are done by volunteers. If your native language is not here, %"
-"1you can provide a translation%2."
-msgstr "번역은 자원봉사로 이루어 집니다. 만약 여러분의 언어가 여기에 없다면 %1번역을 할 수도 있습니다%2."
+"Translations are done by volunteers. If your native language is not here, "
+"%1you can provide a translation%2."
+msgstr ""
+"번역은 자원봉사로 이루어 집니다. 만약 여러분의 언어가 여기에 없다면 %1번역을 "
+"할 수도 있습니다%2."
#: ../user/login_form.php:45
msgid "Email address:"
@@ -5044,7 +5192,8 @@ msgstr ""
"관리자는 이 규정을 위반한 포스트를 삭제할 것입니다.\n"
"삭제된 포스트는 작성자에게 이메일로 통보됩니다.\n"
"상습적인 위반자는 일시적으로 글을 쓸 권한을 잃게 될 것입니다.\n"
-"(그렇지만 남용을 방지하기 위해서 오직 프로젝트 운영자만 그럴 권한을 갖습니다.)\n"
+"(그렇지만 남용을 방지하기 위해서 오직 프로젝트 운영자만 그럴 권한을 갖습니"
+"다.)\n"
"추가적으로 안 좋은 행동(다른 참여자들의 IP 주소를 수집하기 위한 함정을\n"
"놓는 \"도청\" 포스트, 포럼 내에 과도한 스레드를 생성해서 도배하는\n"
"행위, 기타)은 공식 규정에 명시되지 않았지만 유사한 패널티를\n"
@@ -5198,7 +5347,8 @@ msgstr "제한된 숫자의 사용자를 차단할 수 있다는 걸 알아두
msgid ""
"Once the user has been blocked you can unblock it using forum preferences "
"page."
-msgstr "사용자가 차단되었습니다. 포럼 환경 설정 페이지에서 차단을 해제할 수 있습니다."
+msgstr ""
+"사용자가 차단되었습니다. 포럼 환경 설정 페이지에서 차단을 해제할 수 있습니다."
#: ../user/pm.php:252
msgid "No, cancel"
@@ -5272,19 +5422,24 @@ msgstr "취소"
msgid ""
"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
"community."
-msgstr "%1프로필%2은 배경 지식과 의견을 %3 커뮤니티에서 개별적으로 공유하도록 합니다."
+msgstr ""
+"%1프로필%2은 배경 지식과 의견을 %3 커뮤니티에서 개별적으로 공유하도록 합니다."
#: ../user/profile_menu.php:36
msgid ""
"Explore the diversity of your fellow volunteers, and contribute your own "
"views for others to enjoy."
-msgstr "여러분과 같은 기여자들의 다양성을 경험하고, 다른 사람과 즐기기 위해서 공헌할 수 있습니다."
+msgstr ""
+"여러분과 같은 기여자들의 다양성을 경험하고, 다른 사람과 즐기기 위해서 공헌할 "
+"수 있습니다."
#: ../user/profile_menu.php:37
msgid ""
"If you haven't already, you can %1create your own user profile%2 for others "
"to see!"
-msgstr "만약 아직 만들지 않았다면, 다른 사람에게 보여주기위해 %1사용자 프로필을 생성%2할 수 있습니다!"
+msgstr ""
+"만약 아직 만들지 않았다면, 다른 사람에게 보여주기위해 %1사용자 프로필을 생"
+"성%2할 수 있습니다!"
#: ../user/profile_menu.php:42
msgid "User of the Day"
@@ -5306,7 +5461,9 @@ msgstr "%1 국가%2로 프로필 탐색"
msgid ""
"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
"without pictures%2."
-msgstr "%1 무작위%2, %3 무작위 사진 있음%2, 혹은 %4 무작위 사진 없음%2으로 프로필 탐색."
+msgstr ""
+"%1 무작위%2, %3 무작위 사진 있음%2, 혹은 %4 무작위 사진 없음%2으로 프로필 탐"
+"색."
#: ../user/profile_menu.php:66
msgid "Alphabetical profile listings:"
@@ -5404,135 +5561,135 @@ msgstr "미실행중"
msgid "Disabled"
msgstr "비활성화"
-#: ../user/server_status.php:231
+#: ../user/server_status.php:246
msgid "Project status"
msgstr "프로젝트 상태"
-#: ../user/server_status.php:233
+#: ../user/server_status.php:248
msgid "Server software version: %1"
msgstr "서버 소프트웨어 버전: %1"
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Program"
msgstr "프로그램"
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Host"
msgstr "호스트"
-#: ../user/server_status.php:252
+#: ../user/server_status.php:267
msgid "data-driven web pages"
msgstr "데이터 웹 페이지 서버"
-#: ../user/server_status.php:258
+#: ../user/server_status.php:273
msgid "upload/download server"
msgstr "업로드/다운로드 서버"
-#: ../user/server_status.php:261
+#: ../user/server_status.php:276
msgid "scheduler"
msgstr "스케쥴러"
-#: ../user/server_status.php:294
+#: ../user/server_status.php:309
msgid "Running:"
msgstr "가동 중:"
-#: ../user/server_status.php:295
+#: ../user/server_status.php:310
msgid "Program is operating normally"
msgstr "프로그램이 정상적으로 작동합니다"
-#: ../user/server_status.php:296
+#: ../user/server_status.php:311
msgid "Not Running:"
msgstr "미가동 중:"
-#: ../user/server_status.php:297
+#: ../user/server_status.php:312
msgid "Program failed or the project is down"
msgstr "프로그램 실행 실패 혹은 프로젝트 서버 다운됨"
-#: ../user/server_status.php:298
+#: ../user/server_status.php:313
msgid "Disabled:"
msgstr "비활성화:"
-#: ../user/server_status.php:299
+#: ../user/server_status.php:314
msgid "Program is disabled"
msgstr "프로그램이 꺼졌습니다"
-#: ../user/server_status.php:303
+#: ../user/server_status.php:318
msgid "Computing status"
msgstr "컴퓨팅 현황"
-#: ../user/server_status.php:309
+#: ../user/server_status.php:324
msgid "The database server is not accessible"
msgstr "DB 서버에 접근할 수 없습니다"
-#: ../user/server_status.php:326
+#: ../user/server_status.php:341
msgid "Tasks ready to send"
msgstr "전송 준비된 태스크"
-#: ../user/server_status.php:331 ../user/workunit.php:55
+#: ../user/server_status.php:346 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr "진행 중인 태스크"
-#: ../user/server_status.php:336
+#: ../user/server_status.php:351
msgid "Workunits waiting for validation"
msgstr "검증 대기 중인 작업 유닛"
-#: ../user/server_status.php:341
+#: ../user/server_status.php:356
msgid "Workunits waiting for assimilation"
msgstr "통합 대기 중인 작업 유닛"
-#: ../user/server_status.php:346
+#: ../user/server_status.php:361
msgid "Workunits waiting for file deletion"
msgstr "삭제 대기 중인 작업 유닛"
-#: ../user/server_status.php:351
+#: ../user/server_status.php:366
msgid "Tasks waiting for file deletion"
msgstr "파일 삭제 대기 중인 태스크"
-#: ../user/server_status.php:367
+#: ../user/server_status.php:383
msgid "Transitioner backlog (hours)"
msgstr "변환기 처리 목록 (시간)"
-#: ../user/server_status.php:374
+#: ../user/server_status.php:390
msgid "Users"
msgstr "사용자"
-#: ../user/server_status.php:377 ../user/server_status.php:395
+#: ../user/server_status.php:393 ../user/server_status.php:411
msgid "with recent credit"
msgstr "최근 크레딧 소유"
-#: ../user/server_status.php:382 ../user/server_status.php:400
+#: ../user/server_status.php:398 ../user/server_status.php:416
msgid "with credit"
msgstr "크레딧 소유"
-#: ../user/server_status.php:387 ../user/server_status.php:405
+#: ../user/server_status.php:403 ../user/server_status.php:421
msgid "registered in past 24 hours"
msgstr "최근 24시간 이내에 등록"
-#: ../user/server_status.php:411
+#: ../user/server_status.php:427
msgid "current GigaFLOPs"
msgstr "현재 GFLOPs"
-#: ../user/server_status.php:420
+#: ../user/server_status.php:436
msgid "Tasks by application"
msgstr "태스크 수행 프로그램"
-#: ../user/server_status.php:423 ../user/workunit.php:40
+#: ../user/server_status.php:439 ../user/workunit.php:40
msgid "application"
msgstr "응용 프로그램"
-#: ../user/server_status.php:424
+#: ../user/server_status.php:440
msgid "unsent"
msgstr "미전송"
-#: ../user/server_status.php:425
+#: ../user/server_status.php:441
msgid "in progress"
msgstr "진행 중"
-#: ../user/server_status.php:426
+#: ../user/server_status.php:442
msgid "avg runtime of last 100 results in h (min-max)"
msgstr "평균 100개의 결과물 실행 시간 (시, 최소-최대)"
-#: ../user/server_status.php:427
+#: ../user/server_status.php:443
msgid "users in last 24h"
msgstr "최근 24시간 내 사용자"
@@ -5552,7 +5709,9 @@ msgstr "통계 %1"
msgid ""
"More detailed statistics for %1 and other BOINC-based projects are available "
"at several web sites:"
-msgstr "%1에 대한 더 자세한 통계와 다른 BOINC 기반 프로젝트들은 여러 웹사이트에서 이용 가능합니다:"
+msgstr ""
+"%1에 대한 더 자세한 통계와 다른 BOINC 기반 프로젝트들은 여러 웹사이트에서 이"
+"용 가능합니다:"
#: ../user/stats.php:40
msgid ""
@@ -5565,7 +5724,8 @@ msgid ""
"Additionally you can get your individual statistics summed across all BOINC "
"projects from several sites; see your %1home page%2."
msgstr ""
-"거기다 모든 BOINC 프로젝트들을 통틀어서 정리된 개인별 통계는 여러 사이트에서 얻을 수 있습니다. %1홈 페이지%2를 봅니다."
+"거기다 모든 BOINC 프로젝트들을 통틀어서 정리된 개인별 통계는 여러 사이트에서 "
+"얻을 수 있습니다. %1홈 페이지%2를 봅니다."
#: ../user/team.php:27
msgid "%1 participants may form %2teams%3."
@@ -5574,7 +5734,9 @@ msgstr "%1 참여자는 %2팀%3 형식을 띄고 있습니다."
#: ../user/team.php:29
msgid ""
"You may belong to only one team. You can join or quit a team at any time."
-msgstr "여러분은 오직 한 팀에만 소속될 수 있습니다. 언제든지 팀에 가입하거나 탈퇴할 수 있습니다."
+msgstr ""
+"여러분은 오직 한 팀에만 소속될 수 있습니다. 언제든지 팀에 가입하거나 탈퇴할 "
+"수 있습니다."
#: ../user/team.php:31
msgid "Each team has a %1founder%2 who may:"
@@ -5623,7 +5785,9 @@ msgstr "새로운 팀 만들기"
#: ../user/team.php:59
msgid ""
"If you cannot find a team that is right for you, you can %1create a team%2."
-msgstr "만약 여러분에게 맞는 팀을 찾지 못하셨다면 여러분은 %1팀을 만들 수도 있습니다%2."
+msgstr ""
+"만약 여러분에게 맞는 팀을 찾지 못하셨다면 여러분은 %1팀을 만들 수도 있습니"
+"다%2."
#: ../user/team_admins.php:34
msgid "Remove Team Admin status from this member"
@@ -5649,7 +5813,9 @@ msgstr "팀 가입/탈퇴 기록 보기"
msgid ""
"Moderate the team forum, if any (admins get email notification of moderation "
"events and red X reports)"
-msgstr "모든 팀 포럼 관리 (관리자는 관리 기록 사항 또는 빨간 X 보고서 등을 이메일로 받아볼 수 있습니다)"
+msgstr ""
+"모든 팀 포럼 관리 (관리자는 관리 기록 사항 또는 빨간 X 보고서 등을 이메일로 "
+"받아볼 수 있습니다)"
#: ../user/team_admins.php:47
msgid "Team Admins cannot:"
@@ -5671,7 +5837,9 @@ msgstr "만약 팀 관리자가 팀을 탈퇴하면 팀 관리자도 그만두
msgid ""
"We recommend that you select only people you know and trust very well as "
"Team Admins."
-msgstr "우리는 여러분이 잘 알고 있고 신뢰할 수 있는 사람을 팀 관리자로 선택하기를 추천합니다."
+msgstr ""
+"우리는 여러분이 잘 알고 있고 신뢰할 수 있는 사람을 팀 관리자로 선택하기를 추"
+"천합니다."
#: ../user/team_admins.php:59
msgid "There are currently no Team Admins"
@@ -5741,14 +5909,17 @@ msgstr "%1 창설자 변경"
msgid ""
"Team member %1 requested this team's foundership on %2, but left the team, "
"thus canceling the request."
-msgstr "팀원 %1은 %2의 팀 창설자로 요청되었습니다. 그러나 팀을 떠나게 되면 요청은 취소됩니다."
+msgstr ""
+"팀원 %1은 %2의 팀 창설자로 요청되었습니다. 그러나 팀을 떠나게 되면 요청은 취"
+"소됩니다."
#: ../user/team_change_founder_form.php:49
msgid ""
"Team member %1 has requested this team's foundership. This may be because "
"you left the team or haven't had contact with the team for a long time."
msgstr ""
-"팀원 %1은 이 팀의 창설자로 요청되었습니다. 그 것은 당신이 팀을 떠났거나 오랜 시간동안 팀에 접촉하지 않았기 때문일 것입니다."
+"팀원 %1은 이 팀의 창설자로 요청되었습니다. 그 것은 당신이 팀을 떠났거나 오랜 "
+"시간동안 팀에 접촉하지 않았기 때문일 것입니다."
#: ../user/team_change_founder_form.php:55
msgid "decline request"
@@ -5761,8 +5932,10 @@ msgid ""
" To accept the request, assign foundership to %3 using the "
"form below."
msgstr ""
-"%1의 요구를 거부하지 않는다면 %2는 팀 창설자에 취임할 선택권을 가지게 됩니다.<br /><br />\n"
-" 요청을 수락하려면 하단에 양식을 이용해서 %3을 창설자로 임명하세요."
+"%1의 요구를 거부하지 않는다면 %2는 팀 창설자에 취임할 선택권을 가지게 됩니다."
+"<br /><br />\n"
+" 요청을 수락하려면 하단에 양식을 이용해서 %3을 창설자로 임명"
+"하세요."
#: ../user/team_change_founder_form.php:66
msgid "No transfer request is pending."
@@ -5773,8 +5946,8 @@ msgid ""
"To assign foundership of this team to another member, check the box next to "
"member name and click <strong>Change founder</strong> below."
msgstr ""
-"이 팀의 다른 사람을 창설자로 임명하려면 멤버 이름 옆 상자에 체크하고 하단에 있는 <strong>창설자 변경</strong>을 "
-"클릭하세요."
+"이 팀의 다른 사람을 창설자로 임명하려면 멤버 이름 옆 상자에 체크하고 하단에 "
+"있는 <strong>창설자 변경</strong>을 클릭하세요."
#: ../user/team_change_founder_form.php:76
msgid "New founder?"
@@ -5784,10 +5957,6 @@ msgstr "새 창설자로 바꿀까요?"
msgid "Change founder"
msgstr "창설자 변경"
-#: ../user/team_change_founder_form.php:108
-msgid "There are no users to transfer team to."
-msgstr "팀에서 인계받을 사용자를 찾지 못했습니다."
-
#: ../user/team_create_action.php:29
msgid "You must choose a non-blank team name"
msgstr "공백없이 팀 이름을 입력하셔야 합니다"
@@ -5807,7 +5976,9 @@ msgstr "팀을 만듭니다"
#: ../user/team_create_form.php:30
msgid ""
"You belong to %1. You must %2quit this team%3 before creating a new one."
-msgstr "%1에 소속되었습니다. 새로운 팀을 만들려면, 그 전에 %2이 팀을 탈퇴%3하셔야 됩니다."
+msgstr ""
+"%1에 소속되었습니다. 새로운 팀을 만들려면, 그 전에 %2이 팀을 탈퇴%3하셔야 됩"
+"니다."
#: ../user/team_delta.php:65
msgid "Not founder or admin"
@@ -5931,7 +6102,8 @@ msgid ""
"posts will be permanently removed. (You may, however, create a new message "
"board later)."
msgstr ""
-"정말로 팀 게시판을 제거하시겠습니까? 모든 스레드와 포스트는 즉각 삭제됩니다. (그러나 이후에 새로 게시판을 만들 수도 있습니다)"
+"정말로 팀 게시판을 제거하시겠습니까? 모든 스레드와 포스트는 즉각 삭제됩니다. "
+"(그러나 이후에 새로 게시판을 만들 수도 있습니다)"
#: ../user/team_forum.php:100
msgid "Yes - remove message board"
@@ -5944,7 +6116,8 @@ msgstr "게시판이 제거되었습니다"
#: ../user/team_forum.php:124
msgid ""
"Your team's message board has been removed. You may now %1create a new one%2."
-msgstr "팀 게시판이 삭제되었습니다. 지금부터 %1새로운 게시판을 만들 수 있습니다%2."
+msgstr ""
+"팀 게시판이 삭제되었습니다. 지금부터 %1새로운 게시판을 만들 수 있습니다%2."
#: ../user/team_forum.php:143
msgid "Team Message Board Updated"
@@ -5978,7 +6151,8 @@ msgid ""
"will be allowed to become the founder."
msgstr ""
"현 창설자에게 당신의 요청 사항을 email과 쪽지로 알렸습니다.<br /><br />\n"
-" 창설자가 60일 이내에 응답이 없으면 당신이 창설자가 되는 것이 허용됩니다."
+" 창설자가 60일 이내에 응답이 없으면 당신이 창설자가 되"
+"는 것이 허용됩니다."
#: ../user/team_founder_transfer_action.php:102
#: ../user/team_founder_transfer_action.php:113
@@ -5993,7 +6167,9 @@ msgstr "%1의 창설자로 임명되었습니다"
msgid ""
"Congratulations, you are now the founder of team %1. Go to %2Your Account "
"page%3 to find the Team Admin options."
-msgstr "축하합니다. 당신은 지금부터 %1 팀의 창설자입니다. %2계정 관리%3에 가서 팀 관리자 옵션을 찾아보세요."
+msgstr ""
+"축하합니다. 당신은 지금부터 %1 팀의 창설자입니다. %2계정 관리%3에 가서 팀 관"
+"리자 옵션을 찾아보세요."
#: ../user/team_founder_transfer_action.php:120
msgid "Decline founder change request"
@@ -6036,7 +6212,9 @@ msgstr "%2의 %1에게 창설자 변경를 신청했습니다."
msgid ""
"60 days have elapsed since your request, and the founder has not responded. "
"You may now assume foundership by clicking here:"
-msgstr "요청이 있은지 60일이 지났습니다. 그리고 창설자는 응답하지 않았습니다. 여기를 클릭하면 창설자에 임명됩니다:"
+msgstr ""
+"요청이 있은지 60일이 지났습니다. 그리고 창설자는 응답하지 않았습니다. 여기를 "
+"클릭하면 창설자에 임명됩니다:"
#: ../user/team_founder_transfer_form.php:50
msgid "Assume foundership"
@@ -6046,7 +6224,9 @@ msgstr "창설자 취임"
msgid ""
"The founder was notified of your request. If he/she does not respond by %1 "
"you will be given an option to become founder."
-msgstr "창설자에게 요청 사항을 알렸습니다. 만약 그가 %1에 응답하지 않으면 당신은 창설자가 될 권한을 얻습니다."
+msgstr ""
+"창설자에게 요청 사항을 알렸습니다. 만약 그가 %1에 응답하지 않으면 당신은 창설"
+"자가 될 권한을 얻습니다."
#: ../user/team_founder_transfer_form.php:60
msgid ""
@@ -6057,9 +6237,10 @@ msgid ""
"will be allowed to become the founder.<br /><br />\n"
" Are you sure you want to request foundership?"
msgstr ""
-"만약 팀 창설자가 활동을 안 하고 있고 당신이 창설자에 임명되길 원하면, 하단에 있는 버튼을 누르세요. 현 창설자에게 당신의 요청 사항이 "
-"이메일로 전송되고 당신에게 창설자 권한을 주거나 요청을 거부할 수 있습니다. 만약 창설자가 60일 동안 응답이 없으면 창설자가 되도록 "
-"허용됩니다.<br /><br />\n"
+"만약 팀 창설자가 활동을 안 하고 있고 당신이 창설자에 임명되길 원하면, 하단에 "
+"있는 버튼을 누르세요. 현 창설자에게 당신의 요청 사항이 이메일로 전송되고 당신"
+"에게 창설자 권한을 주거나 요청을 거부할 수 있습니다. 만약 창설자가 60일 동안 "
+"응답이 없으면 창설자가 되도록 허용됩니다.<br /><br />\n"
" 정말로 창설권 요청을 하시겠습니까?"
#: ../user/team_founder_transfer_form.php:65
@@ -6074,7 +6255,9 @@ msgstr "%2의 %1가 창설자 교체 요청을 이미 했습니다."
msgid ""
"A foundership change was requested during the last 90 days, so new requests "
"are not allowed. Please try again later."
-msgstr "최근 90일 이내에 창설자 교체 요청이 있었기 때문에 새 요청은 허용되지 않습니다. 나중에 다시 시도해 주세요."
+msgstr ""
+"최근 90일 이내에 창설자 교체 요청이 있었기 때문에 새 요청은 허용되지 않습니"
+"다. 나중에 다시 시도해 주세요."
#: ../user/team_join.php:32 ../user/team_join_action.php:32
#: ../user/team_join_form.php:29
@@ -6139,9 +6322,11 @@ msgstr "100개 이상의 팀이 검색 조건을 만족합니다. 상위 100개
#: ../user/team_lookup.php:104
msgid ""
-"End of results. %1 If you cannot find the team you are looking for, you may %"
-"2create a team%3 yourself."
-msgstr "검색 종료. %1 만약 여러분에게 맞는 팀을 찾지 못하셨다면 여러분은 스스로 %2팀을 만들 수도%3 있습니다."
+"End of results. %1 If you cannot find the team you are looking for, you may "
+"%2create a team%3 yourself."
+msgstr ""
+"검색 종료. %1 만약 여러분에게 맞는 팀을 찾지 못하셨다면 여러분은 스스로 %2팀"
+"을 만들 수도%3 있습니다."
#: ../user/team_manage.php:26
msgid "Team administration for %1"
@@ -6224,19 +6409,24 @@ msgid ""
"To have this team created on all BOINC projects (current and future) you can "
"make it into a %1BOINC-wide team%2."
msgstr ""
-"이 팀이 모든 BOINC 프로젝트에 생성되길 원하시면 (현재 및 미래에) 여러분은 %1BOINC 광역 팀으로 만들 수 있습니다%2."
+"이 팀이 모든 BOINC 프로젝트에 생성되길 원하시면 (현재 및 미래에) 여러분은 "
+"%1BOINC 광역 팀으로 만들 수 있습니다%2."
#: ../user/team_manage.php:73
msgid ""
"Team admins are encouraged to join and participate in the Google %1boinc-"
"team-founders%2 group."
-msgstr "팀 관리자들은 구글 %1boinc-team-founders%2 그룹에 가입하고 참여하길 권장합니다."
+msgstr ""
+"팀 관리자들은 구글 %1boinc-team-founders%2 그룹에 가입하고 참여하길 권장합니"
+"다."
#: ../user/team_manage.php:75
msgid ""
"Other resources for BOINC team admins are available from a third-party site, "
"%1www.boincteams.com%2."
-msgstr "BOINC 팀 관리자들을 위한 다른 자원은 써드 파티 사이트에서 이용 가능합니다. %1www.boincteams.com%2"
+msgstr ""
+"BOINC 팀 관리자들을 위한 다른 자원은 써드 파티 사이트에서 이용 가능합니다. "
+"%1www.boincteams.com%2"
#: ../user/team_manage.php:91
msgid "Can't delete non-empty team"
@@ -6278,8 +6468,10 @@ msgid ""
msgstr ""
"<strong>팀을 탈퇴하기 전에 읽어주세요:</strong>\n"
" <ul>\n"
-" <li>팀을 탈퇴하게 되면 나중에 재가입하거나 원하는 다른 팀으로 가입할 수 있습니다\n"
-" <li>팀 탈퇴는 어떤 방식으로든 개인의 크레딧에 어떤 영향도 주지 않습니다.\n"
+" <li>팀을 탈퇴하게 되면 나중에 재가입하거나 원하는 다른 팀으로 가입"
+"할 수 있습니다\n"
+" <li>팀 탈퇴는 어떤 방식으로든 개인의 크레딧에 어떤 영향도 주지 않습"
+"니다.\n"
" </ul>"
#: ../user/team_quit_form.php:40
@@ -6352,7 +6544,9 @@ msgstr "검색 변경"
msgid ""
"You can team up with other people with similar interests, or from the same "
"country, company, or school."
-msgstr "여러분은 유사한 흥미를 가졌거나 같은 국가, 회사, 학교등의 다른 사람들과 팀을 이룰 수 있습니다."
+msgstr ""
+"여러분은 유사한 흥미를 가졌거나 같은 국가, 회사, 학교등의 다른 사람들과 팀을 "
+"이룰 수 있습니다."
#: ../user/team_search.php:183
msgid "Use this form to find teams that might be right for you."
@@ -6489,7 +6683,9 @@ msgstr "인증 email 발송"
msgid ""
"An email has been sent to %1. Visit the link it contains to validate your "
"email address."
-msgstr "%1에게 이메일이 전송되었습니다. 여러분 이메일 주소를 인증하기 위한 링크를 방문해 주세요."
+msgstr ""
+"%1에게 이메일이 전송되었습니다. 여러분 이메일 주소를 인증하기 위한 링크를 방"
+"문해 주세요."
#: ../user/validate_email_addr.php:44
msgid "No such user."
@@ -6530,7 +6726,8 @@ msgid ""
" or by using an assigned 'account key'.\n"
" Your account key is:"
msgstr ""
-"여러분은 여러분의 이메일 주소와 비밀번호를 사용해서 계정에 접근할 수도 있지만\n"
+"여러분은 여러분의 이메일 주소와 비밀번호를 사용해서 계정에 접근할 수도 있지"
+"만\n"
" 한편으로 서명된 '계정 키'를 이용할 수도 있습니다.\n"
" 여러분의 계정 키:"
@@ -6567,8 +6764,10 @@ msgid ""
" do so using your weak account key.\n"
" Your weak account key is:"
msgstr ""
-"'약한 계정 키'는 위에서 설명한 대로 여러분이 가진 계정을 컴퓨터에 추가할 수 있게\n"
-" 해줍니다. 그러나 어떠한 방법으로든 계정에 로그인하거나 정보를 변경할 수는 없습니다.\n"
+"'약한 계정 키'는 위에서 설명한 대로 여러분이 가진 계정을 컴퓨터에 추가할 수 "
+"있게\n"
+" 해줍니다. 그러나 어떠한 방법으로든 계정에 로그인하거나 정보를 변경할 수"
+"는 없습니다.\n"
" 만약 신뢰할 수 없거나 안전하지 않은 컴퓨터에 계정을 추가하고 싶다면\n"
" 약한 계정 키를 사용해 주시기 바랍니다.\n"
" 여러분의 약한 계정 키:"
@@ -6577,7 +6776,9 @@ msgstr ""
msgid ""
"If you change your password, your weak account key changes, and your "
"previous weak account key becomes invalid."
-msgstr "만약 비밀번호를 바꾸면, 약한 계정 키도 바뀝니다. 또한 기존에 있던 약한 계정 키로는 인증이 되지 않습니다."
+msgstr ""
+"만약 비밀번호를 바꾸면, 약한 계정 키도 바뀝니다. 또한 기존에 있던 약한 계정 "
+"키로는 인증이 되지 않습니다."
#: ../user/workunit.php:32
msgid "can't find workunit"
@@ -6643,7 +6844,9 @@ msgstr "자기 소개"
msgid ""
"Tell us about yourself. You could tell us where you're from, your age, "
"occupation, hobbies, or anything else about yourself."
-msgstr "당신에 대해 얘기해보세요. 당신이 어디에서 왔는지, 나이, 직업, 취미, 기타 당신에 관한 것들을 얘기할 수 있습니다."
+msgstr ""
+"당신에 대해 얘기해보세요. 당신이 어디에서 왔는지, 나이, 직업, 취미, 기타 당신"
+"에 관한 것들을 얘기할 수 있습니다."
#: ../project.sample/project.inc:87
msgid "Your opinions about %1"
@@ -6679,7 +6882,9 @@ msgstr "선택된 응용 프로그램만 실행"
msgid ""
"If no work for selected applications is available, accept work from other "
"applications?"
-msgstr "선택된 응용 프로그램용 작업이 없을 경우에 다른 프로그램 실행을 허용하시겠습니까?"
+msgstr ""
+"선택된 응용 프로그램용 작업이 없을 경우에 다른 프로그램 실행을 허용하시겠습니"
+"까?"
#: ../project.sample/project_specific_prefs.inc:91
msgid "(all applications)"
diff --git a/html/languages/translations/pl.po b/html/languages/translations/pl.po
index cc26564..c546307 100644
--- a/html/languages/translations/pl.po
+++ b/html/languages/translations/pl.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2013-01-20 16:11+0000\n"
+"PO-Revision-Date: 2013-01-20 16:11+0200\n"
"Last-Translator: Pawel <pawel.pbm at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: pl\n"
@@ -16,12 +16,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-0: html\\user\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1358698319.0\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -1219,9 +1218,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "Używaj karty graficznej NVIDIA %1 Egzekwowane od wersji 6.10+ %2"
#: ../inc/prefs.inc:344
-#, fuzzy
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Używaj karty graficznej ATI %1 Egzekwowane od wersji 6.10+ %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1785,9 +1783,8 @@ msgid "State"
msgstr "Stan"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "Nazwa zadania"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -2605,9 +2602,8 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
-#, fuzzy
msgid "Languages"
-msgstr "Język"
+msgstr ""
# #######################################
# Rules and Policies page (info.php)
diff --git a/html/languages/translations/ru.po b/html/languages/translations/ru.po
index e5e9889..926ae5e 100644
--- a/html/languages/translations/ru.po
+++ b/html/languages/translations/ru.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-08-17 17:09+0000\n"
-"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
+"POT-Creation-Date: 2013-10-29 10:57 PDT\n"
+"PO-Revision-Date: 2013-11-20 16:46+0000\n"
+"Last-Translator: akuloboy <oleg_kras at rambler.ru>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1408295381.0\n"
+"X-POOTLE-MTIME: 1384965965.0\n"
# The name of this language in this language
# Имя языка в этом файле
@@ -196,19 +196,19 @@ msgstr "Найти в форумах"
msgid "Advanced search"
msgstr "Расширенный поиск"
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:252 ../user/pm.php:69
#: ../user/pm.php:133
msgid "Private messages"
msgstr "Личные сообщения"
#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../user/forum_forum.php:71 ../user/sample_index.php:119
msgid "Questions and Answers"
msgstr "Вопросы и ответы"
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
+#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:249
+#: ../inc/user.inc:374 ../user/bs_sample_index.php:62
+#: ../user/forum_forum.php:73 ../user/sample_index.php:118
#: ../project.sample/project.inc:43
msgid "Message boards"
msgstr "Доска сообщений"
@@ -273,7 +273,7 @@ msgstr "Непрочитанный"
msgid "Message %1"
msgstr "Сообщение %1"
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:330 ../user/forum_forum.php:174
msgid "hidden"
msgstr "скрыто"
@@ -491,7 +491,7 @@ msgstr "Нельзя написать сообщение в скрытом об
msgid "Thread"
msgstr "Обсуждение"
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:127 ../user/forum_forum.php:136
#: ../user/forum_index.php:94
msgid "Posts"
msgstr "Сообщения"
@@ -500,7 +500,7 @@ msgstr "Сообщения"
msgid "Views"
msgstr "Просмотры"
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:127 ../user/forum_forum.php:139
#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
msgid "Last post"
msgstr "Последнее сообщение"
@@ -538,7 +538,7 @@ msgid "Home"
msgstr "Дом"
#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../user/server_status.php:329
msgid "Work"
msgstr "Работа"
@@ -604,9 +604,9 @@ msgid "Created"
msgstr "Создан"
#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
+#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:214
+#: ../inc/team.inc:219 ../inc/team.inc:221 ../inc/team.inc:363
+#: ../inc/team.inc:368 ../inc/user.inc:125 ../inc/user.inc:138
#: ../user/profile_search_action.php:43
#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
@@ -698,7 +698,7 @@ msgstr "%1 Кб/с"
#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
#: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
#: ../inc/result.inc:278 ../user/explain_state.php:56
-#: ../user/host_app_versions.php:30
+#: ../user/host_app_versions.php:29
msgid "Unknown"
msgstr "Неизвестно"
@@ -706,7 +706,7 @@ msgstr "Неизвестно"
msgid "Average download rate"
msgstr "Средняя скорость загрузки данных"
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:169 ../user/host_app_versions.php:64
msgid "Average turnaround time"
msgstr "Среднее время обработки"
@@ -782,7 +782,7 @@ msgstr "Последний контакт"
msgid "Computer info"
msgstr "Информация о компьютере"
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:356
#: ../user/top_users.php:48
msgid "Rank"
msgstr "Позиция"
@@ -791,9 +791,9 @@ msgstr "Позиция"
msgid "Avg. credit"
msgstr "В среднем за день"
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
+#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:215
+#: ../inc/team.inc:224 ../inc/team.inc:226 ../inc/team.inc:362
+#: ../inc/team.inc:367 ../inc/user.inc:139
#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
#: ../user/top_users.php:58
@@ -881,9 +881,9 @@ msgstr "Только компьютеры, активные за последн
msgid "Computer ID"
msgstr "ID компьютера"
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
+#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:209
+#: ../inc/team.inc:357 ../inc/user.inc:199 ../user/account_finish.php:41
+#: ../user/create_account_form.php:80 ../user/team_admins.php:62
#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
#: ../user/top_users.php:49 ../user/user_search.php:139
msgid "Name"
@@ -893,7 +893,7 @@ msgstr "Имя"
msgid "BOINC<br>version"
msgstr "Версия<br>BOINC"
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:745 ../user/merge_by_name.php:67
msgid "Merge computers by name"
msgstr "Объединить компьютеры по имени"
@@ -918,12 +918,12 @@ msgstr "Входящие"
msgid "Write"
msgstr "Написать"
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:377
msgid "Send private message"
msgstr "Отправить личное сообщение"
#: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
-#: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
+#: ../user/ffmail_form.php:59 ../user/forum_edit.php:99
#: ../user/forum_edit.php:101 ../user/forum_edit.php:145
#: ../user/forum_post.php:61 ../user/forum_post.php:87
#: ../user/forum_post.php:89 ../user/forum_post.php:130
@@ -1126,7 +1126,7 @@ msgstr ""
"менее%1(максимум 10 дней).%2"
#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
+#: ../inc/util.inc:258
msgid "days"
msgstr "дней"
@@ -1215,8 +1215,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "Использовать ГП NVIDIA %1 Начиная с версии 6.10+ %2"
#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Использовать ГП Intel %1 начиная с версии 7.2+ %2"
+msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
+msgstr "Использовать ГП Intel %1 начиная с версии 7.0+ %2"
#: ../inc/prefs.inc:358
msgid ""
@@ -1330,7 +1330,7 @@ msgstr "Определённые параметры проекта"
msgid "Primary (default) preferences"
msgstr "Основные настройки (по умолчанию)"
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
+#: ../inc/prefs.inc:871 ../user/add_venue.php:43 ../user/add_venue.php:67
#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
#: ../user/prefs_edit.php:92
msgid "Edit %1 preferences"
@@ -1394,7 +1394,7 @@ msgstr ""
msgid "Database error"
msgstr "Ошибка базы данных"
-#: ../inc/profile.inc:193
+#: ../inc/profile.inc:192
msgid ""
"To prevent spam, profiles of users with an average credit of less than %1 "
"are displayed only to logged-in users. We apologize for this inconvenience."
@@ -1403,35 +1403,35 @@ msgstr ""
"меньше чем %1 показываются только вошедшим пользователям. Мы приносим "
"извинения за это неудобство."
-#: ../inc/profile.inc:197
+#: ../inc/profile.inc:196
msgid "User is banished"
msgstr "Пользователь заблокирован"
-#: ../inc/profile.inc:211
+#: ../inc/profile.inc:210
msgid "No profile exists for that user ID."
msgstr "Профиль не существует для пользователя с этим ID."
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:218 ../user/create_profile.php:313
msgid "Edit your profile"
msgstr "Редактировать профиль"
-#: ../inc/profile.inc:262
+#: ../inc/profile.inc:261
msgid "Your feedback on this profile"
msgstr "Ваш отзыв на этот профиль"
-#: ../inc/profile.inc:264
+#: ../inc/profile.inc:263
msgid "Recommend this profile for User of the Day:"
msgstr "Рекомендовать этот профиль в качестве Пользователя дня:"
-#: ../inc/profile.inc:265
+#: ../inc/profile.inc:264
msgid "I %1like%2 this profile"
msgstr "Мне %1нравится%2 этот профиль"
-#: ../inc/profile.inc:268
+#: ../inc/profile.inc:267
msgid "Alert administrators to an offensive profile:"
msgstr "Предупредить администраторов об оскорбительном профиле:"
-#: ../inc/profile.inc:269
+#: ../inc/profile.inc:268
msgid "I %1do not like%2 this profile"
msgstr "Мне %1не нравится%2 этот профиль"
@@ -1439,7 +1439,7 @@ msgstr "Мне %1не нравится%2 этот профиль"
msgid "Anonymous platform"
msgstr "Анонимная платформа"
-#: ../inc/result.inc:53 ../user/host_app_versions.php:26
+#: ../inc/result.inc:53
msgid "NVIDIA GPU"
msgstr "ГП NVIDIA"
@@ -1447,7 +1447,7 @@ msgstr "ГП NVIDIA"
msgid "ATI GPU"
msgstr "ГП ATI"
-#: ../inc/result.inc:57 ../user/host_app_versions.php:28
+#: ../inc/result.inc:57
msgid "Intel GPU"
msgstr "ГП Intel"
@@ -1701,7 +1701,7 @@ msgstr "Время подтверждения<br />или крайний сро
msgid "explain"
msgstr "объяснить"
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:376 ../user/server_status.php:256
msgid "Status"
msgstr "Статус"
@@ -1793,17 +1793,17 @@ msgstr "Ключевые слова"
msgid "Find teams with these words in their names or descriptions"
msgstr "Найти команды с этими словами в их названиях или описаниях"
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
+#: ../inc/team.inc:43 ../inc/team.inc:121 ../inc/team.inc:232
+#: ../inc/team.inc:372 ../inc/team.inc:456 ../inc/user.inc:205
+#: ../inc/user.inc:316 ../user/account_finish.php:45
+#: ../user/create_account_form.php:99 ../user/edit_user_info_form.php:40
#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
#: ../user/team_search.php:72 ../user/top_users.php:63
#: ../user/user_search.php:53 ../user/user_search.php:140
msgid "Country"
msgstr "Страна"
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:454
msgid "Type of team"
msgstr "Тип команды"
@@ -1811,7 +1811,7 @@ msgstr "Тип команды"
msgid "Show only active teams"
msgstr "Показать только активные команды"
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:77 ../user/user_search.php:70
msgid "Search"
msgstr "Найти"
@@ -1831,8 +1831,8 @@ msgstr "Запрошен Вами"
msgid "founder response deadline is %1"
msgstr "крайний срок ответа основателя %1"
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:556 ../inc/user.inc:280
+#: ../inc/user.inc:370
msgid "None"
msgstr "Нет"
@@ -1856,27 +1856,27 @@ msgstr "Описание"
msgid "Web site"
msgstr "Вебсайт"
-#: ../inc/team.inc:120
+#: ../inc/team.inc:119
msgid "Cross-project stats"
msgstr "Объединенная статистика по проектам"
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
msgid "Type"
msgstr "Тип"
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:126 ../user/team_manage.php:63
msgid "Message board"
msgstr "Доска сообщений"
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "Обсуждения"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:135
msgid "Join this team"
msgstr "Присоединиться к этой команде"
-#: ../inc/team.inc:137
+#: ../inc/team.inc:136
msgid ""
"Note: if 'OK to email' is set in your project preferences, joining a team "
"gives its founder access to your email address."
@@ -1885,79 +1885,79 @@ msgstr ""
"уведомления по электронной почте', присоединение к команде дает доступ ее "
"основателя к Вашему адресу электронной почты."
-#: ../inc/team.inc:140
+#: ../inc/team.inc:139
msgid "Not accepting new members"
msgstr "Не принимать новых участников"
-#: ../inc/team.inc:147
+#: ../inc/team.inc:146
msgid "Foundership change requested"
msgstr "Запрошена смена основателя"
-#: ../inc/team.inc:148
+#: ../inc/team.inc:147
msgid "Respond by %1"
msgstr "Ответить до %1"
-#: ../inc/team.inc:152
+#: ../inc/team.inc:151
msgid "Team foundership change"
msgstr "Смена основателя команды"
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:155 ../inc/team.inc:358
msgid "Members"
msgstr "Участники"
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:156 ../inc/team.inc:253
msgid "Founder"
msgstr "Основатель"
-#: ../inc/team.inc:169
+#: ../inc/team.inc:168
msgid "Admins"
msgstr "Администраторы"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:183
msgid "New members in last day"
msgstr "Новые участники за последний день"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:184
msgid "Total members"
msgstr "Всего участников"
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
msgid "view"
msgstr "просмотр"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:185
msgid "Active members"
msgstr "Активных участников"
-#: ../inc/team.inc:187
+#: ../inc/team.inc:186
msgid "Members with credit"
msgstr "Участников с заработанными очками"
-#: ../inc/team.inc:256
+#: ../inc/team.inc:255
msgid "Admin"
msgstr "Администратор"
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
#: ../user/top_hosts.php:93 ../user/top_teams.php:121
#: ../user/top_users.php:127
msgid "Previous %1"
msgstr "Предыдущие %1"
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:280 ../user/forum_user_posts.php:131
#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
#: ../user/top_teams.php:126 ../user/top_users.php:132
msgid "Next %1"
msgstr "Следующие %1"
-#: ../inc/team.inc:289
+#: ../inc/team.inc:288
msgid "No such team."
msgstr "Нет такой команды."
-#: ../inc/team.inc:302
+#: ../inc/team.inc:301
msgid "This operation requires foundership."
msgstr "Эта операция требует прав основателя."
-#: ../inc/team.inc:326
+#: ../inc/team.inc:325
msgid "This operation requires team admin privileges"
msgstr "Эта операция требует прав администратора команды"
@@ -1970,7 +1970,7 @@ msgstr ""
"здесь, то они будут скоро перезаписаны. Поэтому редактируйте %1глобальную "
"команду BOINC%2."
-#: ../inc/team.inc:428
+#: ../inc/team.inc:429
msgid ""
"%1Privacy note%2: if you create a team, your project preferences (resource "
"share, graphics preferences) will be visible to the public."
@@ -1978,47 +1978,47 @@ msgstr ""
"%1Примечание безопасности%2: если Вы создадите команду, то Ваши настройки "
"проекта (доля ресурсов, графические настройки) будут видны всем."
-#: ../inc/team.inc:432
+#: ../inc/team.inc:433
msgid "Team name, text version"
msgstr "Название команды, текстовая версия"
-#: ../inc/team.inc:433
+#: ../inc/team.inc:434
msgid "Don't use HTML tags."
msgstr "Не использовать тэги HTML."
-#: ../inc/team.inc:436
+#: ../inc/team.inc:437
msgid "Team name, HTML version"
msgstr "Название команды, HTML версия"
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:439 ../inc/team.inc:449
msgid "You may use %1limited HTML tags%2."
msgstr "Вы можете использовать %1ограниченные тэги HTML%2."
-#: ../inc/team.inc:439
+#: ../inc/team.inc:440
msgid "If you don't know HTML, leave this box blank."
msgstr "Если Вы не знаете HTML, оставьте это поле пустым."
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "URL of team web page, if any"
msgstr "URL веб-страницы команды, если есть"
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "without \"http://\""
msgstr "без \"http://\""
-#: ../inc/team.inc:443
+#: ../inc/team.inc:444
msgid "This URL will be linked to from the team's page on this site."
msgstr "Этот URL будет вызываться со страницы команды на этом сайте."
-#: ../inc/team.inc:446
+#: ../inc/team.inc:447
msgid "Description of team"
msgstr "Описание команды"
-#: ../inc/team.inc:462
+#: ../inc/team.inc:463
msgid "Accept new members?"
msgstr "Принимать новых участников?"
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:27
msgid "User profile"
msgstr "Профиль пользователя"
@@ -2051,7 +2051,7 @@ msgid "Computers on this account"
msgstr "Компьютеры в этой учётной записи"
#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
+#: ../inc/user.inc:242 ../inc/user.inc:328 ../inc/user.inc:401
#: ../user/view_profile.php:64
msgid "View"
msgstr "Просмотр"
@@ -2068,8 +2068,8 @@ msgstr "Объединенная статистика по проектам"
msgid "Account"
msgstr "Учётная запись"
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:280 ../inc/user.inc:368
+#: ../inc/user.inc:370 ../user/user_search.php:139
msgid "Team"
msgstr "Команда"
@@ -2093,12 +2093,12 @@ msgstr "Неизвестный тип уведомления: %1"
msgid "Account information"
msgstr "Учётная информация"
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
+#: ../inc/user.inc:200 ../user/edit_passwd_form.php:48
#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
msgid "Email address"
msgstr "Адрес email"
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:203 ../inc/user.inc:321
msgid "URL"
msgstr "URL"
@@ -2106,7 +2106,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "Почтовый индекс"
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:207 ../inc/user.inc:315
msgid "%1 member since"
msgstr "Участник %1 с"
@@ -2126,7 +2126,7 @@ msgstr "пароль"
msgid "other account info"
msgstr "другая учётная информация"
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:213 ../inc/user.inc:314
msgid "User ID"
msgstr "ID пользователя"
@@ -2162,129 +2162,129 @@ msgstr "Настройки сообщества"
msgid "Preferences for this project"
msgstr "Настройки для этого проекта"
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:233 ../user/prefs.php:32
msgid "%1 preferences"
msgstr "Настройки %1"
#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../user/sample_index.php:114
msgid "Community"
msgstr "Сообщество"
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "Удалить"
-#: ../inc/user.inc:245
+#: ../inc/user.inc:244
msgid "Create"
msgstr "Создать"
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
+#: ../inc/user.inc:246 ../inc/user.inc:401 ../inc/util.inc:498
msgid "Profile"
msgstr "Профиль"
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:249 ../inc/user.inc:374
msgid "%1 posts"
msgstr "%1 сообщений"
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "Уведомления"
-#: ../inc/user.inc:269
+#: ../inc/user.inc:268
msgid "Quit team"
msgstr "Выйти из команды"
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:270 ../inc/user.inc:287
msgid "Administer"
msgstr "Управление"
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:276 ../inc/user.inc:289
msgid "(foundership change request pending)"
msgstr "(запрос на смену основателя в ожидании)"
-#: ../inc/user.inc:279
+#: ../inc/user.inc:278
msgid "Member of team"
msgstr "Участник команды"
-#: ../inc/user.inc:281
+#: ../inc/user.inc:280
msgid "find a team"
msgstr "найти команду"
-#: ../inc/user.inc:292
+#: ../inc/user.inc:291
msgid "Founder but not member of"
msgstr "Основатель, но не участник"
-#: ../inc/user.inc:298
+#: ../inc/user.inc:297
msgid "Find friends"
msgstr "Найти друзей"
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
+#: ../inc/user.inc:386 ../inc/user.inc:395
msgid "Friends"
msgstr "Друзья"
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
msgid "Computers"
msgstr "Компьютеры"
-#: ../inc/user.inc:338
+#: ../inc/user.inc:337
msgid "Donor"
msgstr "Донор"
-#: ../inc/user.inc:378
+#: ../inc/user.inc:377
msgid "Contact"
msgstr "Контакт"
-#: ../inc/user.inc:381
+#: ../inc/user.inc:380
msgid "This person is a friend"
msgstr "Персона является другом"
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:381 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "Прекратить дружбу"
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:384 ../user/friend.php:37
msgid "Request pending"
msgstr "Запрос в ожидании"
-#: ../inc/user.inc:387
+#: ../inc/user.inc:386
msgid "Add as friend"
msgstr "Добавить друга"
-#: ../inc/user.inc:446
+#: ../inc/user.inc:445
msgid "user name cannot have leading or trailing white space"
msgstr "имя пользователя не может иметь начальные или конечные пробелы"
-#: ../inc/user.inc:450
+#: ../inc/user.inc:449
msgid "user name must be nonempty"
msgstr "имя пользователя не может быть пустым"
-#: ../inc/user.inc:454
+#: ../inc/user.inc:453
msgid "user name may not contain HTML tags"
msgstr "имя пользователя не должно содержать тэги HTML"
-#: ../inc/util.inc:131
+#: ../inc/util.inc:116
msgid "log out"
msgstr "выйти"
-#: ../inc/util.inc:133
+#: ../inc/util.inc:118
msgid "log in"
msgstr "войти"
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
+#: ../inc/util.inc:188 ../user/login_form.php:30 ../user/login_form.php:55
msgid "Log in"
msgstr "Войти"
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:189 ../user/create_account_form.php:31
msgid "Create an account"
msgstr "Создание учётной записи"
-#: ../inc/util.inc:206
+#: ../inc/util.inc:190
msgid "Server status page"
msgstr "Информация о состоянии сервера"
-#: ../inc/util.inc:248
+#: ../inc/util.inc:232
msgid ""
"A database error occurred while handling your request; please try again "
"later."
@@ -2292,56 +2292,60 @@ msgstr ""
"Произошла ошибка базы данных во время обработки вашего запроса; пожалуйста "
"попробуйте ещё раз позже."
-#: ../inc/util.inc:257
+#: ../inc/util.inc:241
msgid "Unable to handle request"
msgstr "Невозможно обработать запрос"
-#: ../inc/util.inc:277
+#: ../inc/util.inc:261
msgid "hours"
msgstr "часов"
-#: ../inc/util.inc:280
+#: ../inc/util.inc:264
msgid "min"
msgstr "мин."
-#: ../inc/util.inc:283
+#: ../inc/util.inc:267
msgid "sec"
msgstr "сек."
-#: ../inc/util.inc:444
+#: ../inc/util.inc:428
msgid "Link has timed out. Please click Back, refresh the page, and try again."
msgstr ""
"Ссылка просрочена. Пожалуйста щёлкните Назад, обновите страницу, и "
"попробуйте ещё раз."
-#: ../inc/util.inc:513
+#: ../inc/util.inc:497
msgid "View the profile of %1"
msgstr "Посмотреть профиль участника %1"
-#: ../inc/util.inc:569
+#: ../inc/util.inc:553
msgid "Use BBCode tags to format your text"
msgstr "Используйте тэги BBCode для форматирования Вашего текста"
-#: ../inc/util.inc:796
+#: ../inc/util.inc:780
msgid "Project down for maintenance"
msgstr "Проект остановлен для обслуживания"
-#: ../inc/util.inc:799
+#: ../inc/util.inc:783
msgid "%1 is temporarily shut down for maintenance. Please try again later."
msgstr ""
"%1 временно остановлен для обслуживания. Пожалуйста попробуйте ещё раз "
"позже."
-#: ../inc/util.inc:817
+#: ../inc/util.inc:801
msgid "Unable to connect to database - please try again later"
msgstr ""
"Невозможно подключиться к базе данных - пожалуйста попробуйте ещё раз позже"
-#: ../inc/util.inc:821
+#: ../inc/util.inc:802
+msgid "Error:"
+msgstr "Ошибка:"
+
+#: ../inc/util.inc:806
msgid "Unable to select database - please try again later"
msgstr "Невозможно выбрать базу данных - пожалуйста попробуйте ещё раз позже"
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr "Оставаться авторизованным на этом компьютере"
@@ -2349,21 +2353,21 @@ msgstr "Оставаться авторизованным на этом комп
msgid "Finish account setup"
msgstr "Завершение настройки учётной записи"
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
+#: ../user/account_finish.php:41 ../user/create_account_form.php:80
msgid "Identifies you on our web site. Use your real name or a nickname."
msgstr ""
"Идентифицирует Вас на нашем web-сайте. Введите Ваше настоящее имя или "
"псевдоним."
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
+#: ../user/account_finish.php:45 ../user/create_account_form.php:99
msgid "Select the country you want to represent, if any."
msgstr "Выберите страну, которую представляете, если хотите."
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
+#: ../user/account_finish.php:51 ../user/create_account_form.php:105
msgid "Postal or ZIP Code"
msgstr "Почтовый индекс или ZIP-код"
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
+#: ../user/account_finish.php:51 ../user/create_account_form.php:105
msgid "Optional"
msgstr "Необязательно"
@@ -2375,12 +2379,12 @@ msgstr "Вы должны указать имя для вашей учётной
msgid "HTML tags not allowed in name"
msgstr "Тэги HTML недопустимы в Вашем имени"
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:85
msgid "Add %1 preferences for %2"
msgstr "Добавить настройки %1 для конфигурации %2"
#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/sample_index.php:109
msgid "Applications"
msgstr "Приложения"
@@ -2544,16 +2548,16 @@ msgstr "Команды"
msgid "create or join a team"
msgstr "создать или присоединиться к команде"
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
+#: ../user/bs_sample_index.php:51 ../user/sample_index.php:180
msgid "User of the day"
msgstr "Пользователь Дня"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
msgid "Server status"
msgstr "Статус сервера"
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
+#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:35
+#: ../user/sample_index.php:116
msgid "Profiles"
msgstr "Профили"
@@ -2588,7 +2592,7 @@ msgid "Languages"
msgstr "Языки"
#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
+#: ../user/sample_index.php:74
msgid "Read our rules and policies"
msgstr "Прочтите наши правила и политику"
@@ -2600,46 +2604,65 @@ msgstr "Не удалось создать учётную запись"
msgid "Click your browser's <b>Back</b> button to try again."
msgstr "Нажмите кнопку <b>Назад</b> вашего браузера, чтобы попытаться ещё раз."
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:38 ../user/create_account_action.php:40
+#: ../user/create_account_form.php:36
+msgid "Account creation is disabled"
+msgstr "Создание учётной записи запрещено"
+
+#: ../user/create_account_action.php:41
+msgid ""
+"Sorry, this project has disabled the creation of new accounts.\n"
+"Please try again later."
+msgstr ""
+"Извините, но этот проект запретил создание новых учётных записей.\n"
+"Пожалуйста попробуйте ещё раз позже."
+
+#: ../user/create_account_action.php:53
msgid "Your reCAPTCHA response was not correct. Please try again."
msgstr "Ваш ответ reCAPTCHA был неправилен. Пожалуйста попробуйте ещё раз."
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:77
msgid "You must supply an invitation code to create an account."
msgstr "Чтобы создать учётную запись, Вы должны указать пригласительный код."
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:80
msgid "The invitation code you gave is not valid."
msgstr "Указанный Вами пригласительный код не действителен."
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:91
msgid ""
"Invalid email address: you must enter a valid address of the form name at domain"
msgstr ""
"Неправильный адрес электронной почты: Вы должны указать правильный адрес в "
"форме name at domain"
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:95
msgid "There's already an account with that email address."
msgstr "Уже имеется учётная запись с таким же адресом электронной почты."
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:33
msgid "New passwords are different"
msgstr "Новые пароли отличаются"
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:108 ../user/edit_passwd_action.php:41
msgid "Passwords may only include ASCII characters."
msgstr "Пароли могут содержать только ASCII-символы."
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:113 ../user/edit_passwd_action.php:45
msgid "New password is too short: minimum password length is %1 characters."
msgstr "Новый пароль слишком короткий: минимальная длина пароля - %1 символов."
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:134
msgid "Couldn't create account"
msgstr "Не удалось создать учётную запись"
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:37
+msgid "Account creation is currently disabled. Please try again later."
+msgstr ""
+"Создание учётной записи в данный момент запрещено. Пожалуйста, попробуйте "
+"ещё раз немного позднее."
+
+#: ../user/create_account_form.php:46
msgid ""
"NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
"select Add Project, and enter an email address and password."
@@ -2648,7 +2671,7 @@ msgstr ""
"этого запустите BOINC, выберите Добавить проект, и введите свой e-mail и "
"пароль."
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:62
msgid ""
"This account will belong to the team %1 and will have the project "
"preferences of its founder."
@@ -2656,40 +2679,40 @@ msgstr ""
"Эта учётная запись будет относиться к команде '%1' и будет иметь настройки "
"проекта как у её основателя."
-#: ../user/create_account_form.php:73
+#: ../user/create_account_form.php:74
msgid "Invitation Code"
msgstr "Пригласительный код"
-#: ../user/create_account_form.php:73
+#: ../user/create_account_form.php:74
msgid "A valid invitation code is required to create an account."
msgstr ""
"Для создания учётной записи необходим действительный пригласительный код."
-#: ../user/create_account_form.php:83
+#: ../user/create_account_form.php:84
msgid "Email Address"
msgstr "Адрес электронной почты"
-#: ../user/create_account_form.php:83
+#: ../user/create_account_form.php:84
msgid "Must be a valid address of the form 'name at domain'."
msgstr "Должен быть действительным адресом в форме 'name at domain'."
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
+#: ../user/create_account_form.php:93 ../user/edit_email_form.php:49
msgid "Password"
msgstr "Пароль"
-#: ../user/create_account_form.php:93
+#: ../user/create_account_form.php:94
msgid "Must be at least %1 characters"
msgstr "Должно быть по крайней мере %1 символов"
-#: ../user/create_account_form.php:96
+#: ../user/create_account_form.php:97
msgid "Confirm password"
msgstr "Подтвердите пароль"
-#: ../user/create_account_form.php:113
+#: ../user/create_account_form.php:114
msgid "Please enter the words shown in the image"
msgstr "Пожалуйста, введите слова, показанные на картинке"
-#: ../user/create_account_form.php:119
+#: ../user/create_account_form.php:120
msgid "Create account"
msgstr "Создать учётную запись"
@@ -2856,7 +2879,7 @@ msgstr "Вы уверены, что хотите удалить вашу учё
#: ../user/delete_account.php:79 ../user/delete_profile.php:52
#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/prefs_remove.php:55 ../user/user_search.php:59
#: ../user/user_search.php:64
msgid "Yes"
msgstr "Да"
@@ -3090,23 +3113,23 @@ msgstr ""
"Невозможно обновить ваш адрес электронной почты из-за проблем с базой "
"данных. Пожалуйста попробуйте ещё раз позже."
-#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
+#: ../user/edit_email_form.php:29 ../user/edit_email_form.php:53
msgid "Change email address"
msgstr "Поменять адрес email"
-#: ../user/edit_email_form.php:36
+#: ../user/edit_email_form.php:38
msgid "Change the email address of your account"
msgstr "Изменение адреса электронной почты вашей учётной записи"
-#: ../user/edit_email_form.php:37
+#: ../user/edit_email_form.php:39
msgid "New email address"
msgstr "Новый адрес email"
-#: ../user/edit_email_form.php:38
+#: ../user/edit_email_form.php:40
msgid "Must be a valid address of the form 'name at domain'"
msgstr "Должен быть действительным адресом в форме 'name at domain'"
-#: ../user/edit_email_form.php:48
+#: ../user/edit_email_form.php:50
msgid "No password?"
msgstr "Нет пароля?"
@@ -3327,8 +3350,8 @@ msgstr "Не найдена учётная запись с таким адрес
msgid "Invalid password"
msgstr "Неправильный пароль"
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:28
+#: ../user/edit_passwd_form.php:58
msgid "Change password"
msgstr "Поменять пароль"
@@ -3344,35 +3367,35 @@ msgstr ""
"Невозможно обновить ваш пароль из-за проблем с базой данных. Пожалуйста "
"попробуйте ещё раз позже."
-#: ../user/edit_passwd_form.php:39
+#: ../user/edit_passwd_form.php:42
msgid "You can identify yourself using either"
msgstr "Вы можете идентифицировать себя используя"
-#: ../user/edit_passwd_form.php:41
+#: ../user/edit_passwd_form.php:44
msgid "your email address and old password"
msgstr "Ваш адрес email и старый пароль"
-#: ../user/edit_passwd_form.php:42
+#: ../user/edit_passwd_form.php:45
msgid "your account key"
msgstr "Ваш ключ учётной записи"
-#: ../user/edit_passwd_form.php:46
+#: ../user/edit_passwd_form.php:49
msgid "Current password"
msgstr "Текущий пароль"
-#: ../user/edit_passwd_form.php:48
+#: ../user/edit_passwd_form.php:51
msgid "<b>OR</b>: Account key"
msgstr "<b>ИЛИ</b>: Ключ учётной записи"
-#: ../user/edit_passwd_form.php:49
+#: ../user/edit_passwd_form.php:52
msgid "Get account key by email"
msgstr "Получить ключ учётной записи по электронной почте"
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:56
msgid "New password"
msgstr "Новый пароль"
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:57
msgid "New password, again"
msgstr "Новый пароль, ещё раз"
@@ -3388,23 +3411,23 @@ msgstr "Вы должны указать имя для вашей учётной
msgid "Couldn't update user info."
msgstr "Невозможно обновить информацию о пользователе."
-#: ../user/edit_user_info_form.php:27
+#: ../user/edit_user_info_form.php:29
msgid "Edit account information"
msgstr "Редактировать учётную информацию"
-#: ../user/edit_user_info_form.php:32
+#: ../user/edit_user_info_form.php:34
msgid "Name %1 real name or nickname%2"
msgstr "Имя %1 настоящее имя или псевдоним%2"
-#: ../user/edit_user_info_form.php:35
+#: ../user/edit_user_info_form.php:37
msgid "URL %1 of your web page; optional%2"
msgstr "URL %1 вашей веб-страницы; необязательно%2"
-#: ../user/edit_user_info_form.php:43
+#: ../user/edit_user_info_form.php:45
msgid "Postal (ZIP) code %1 Optional%2"
msgstr "Почтовый (ZIP) индекс %1 необязательно%2"
-#: ../user/edit_user_info_form.php:47
+#: ../user/edit_user_info_form.php:49
msgid "Update info"
msgstr "Обновить информацию"
@@ -3628,23 +3651,23 @@ msgstr ""
"Вы забыли ввести имена и/или адреса электронной почты ваших друзей; "
"пожалуйста %1вернитесь в форму%2 и введите их."
-#: ../user/ffmail_form.php:30
+#: ../user/ffmail_form.php:31
msgid ""
-"This project hasn't created an email message - please notify its "
+"This project hasn\\'t created an email message - please notify its "
"administrators"
msgstr ""
-"Этот проект не создал электронное сообщение - пожалуйста, сообщите об этом "
-"администраторам проекта"
+"Этот проект не создал электронное письмо - пожалуйста, сообщите об этом "
+"администраторам"
-#: ../user/ffmail_form.php:33
+#: ../user/ffmail_form.php:34
msgid "Tell your friends about %1"
msgstr "Расскажите своим друзьям о %1"
-#: ../user/ffmail_form.php:37
+#: ../user/ffmail_form.php:38
msgid "Help us by telling your friends, family and coworkers about %1"
msgstr "Окажите нам помощь, расскажите своим друзьям, семье и сотрудникам о %1"
-#: ../user/ffmail_form.php:39
+#: ../user/ffmail_form.php:40
msgid ""
"Fill in this form with the names and email addresses of people you think "
"might be interested in %1. We'll send them an email in your name, and you "
@@ -3654,27 +3677,27 @@ msgstr ""
"вашему мнению, могут быть заинтересованы в %1. Мы отправим им письмо от "
"вашего имени, и если Вы пожелаете, Вы можете добавить своё сообщение."
-#: ../user/ffmail_form.php:42
+#: ../user/ffmail_form.php:43
msgid "Your name:"
msgstr "Ваше имя:"
-#: ../user/ffmail_form.php:42
+#: ../user/ffmail_form.php:43
msgid "Your email address:"
msgstr "Ваш адрес электронной почты:"
-#: ../user/ffmail_form.php:48
+#: ../user/ffmail_form.php:49
msgid "Friend's name:"
msgstr "Имя друга:"
-#: ../user/ffmail_form.php:48
+#: ../user/ffmail_form.php:49
msgid "Friend's email address:"
msgstr "Адрес электронной почты друга:"
-#: ../user/ffmail_form.php:56
+#: ../user/ffmail_form.php:57
msgid "Additional message (optional)"
msgstr "Дополнительное сообщение (необязательно)"
-#: ../user/ffmail_form.php:59
+#: ../user/ffmail_form.php:60
msgid "Send"
msgstr "Отправить"
@@ -4744,47 +4767,51 @@ msgstr ""
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr "Если Вы этого ещё не сделали, %1загрузите клиентское ПО BOINC%2."
-#: ../user/host_app_versions.php:37
+#: ../user/host_app_versions.php:26
+msgid "nvidia GPU"
+msgstr "ГП NVIDIA"
+
+#: ../user/host_app_versions.php:36
msgid "Anonymous platform, missing app"
msgstr "анонимная платформа, приложение отсутствует"
-#: ../user/host_app_versions.php:40
+#: ../user/host_app_versions.php:39
msgid "anonymous platform"
msgstr "анонимная платформа"
-#: ../user/host_app_versions.php:43
+#: ../user/host_app_versions.php:42
msgid "Missing app version"
msgstr "Версия приложения отсутствует"
-#: ../user/host_app_versions.php:45
+#: ../user/host_app_versions.php:44
msgid "Missing app"
msgstr "Приложение отсутствует"
-#: ../user/host_app_versions.php:47
+#: ../user/host_app_versions.php:46
msgid "Missing platform"
msgstr "Платформа отсутствует"
-#: ../user/host_app_versions.php:56
+#: ../user/host_app_versions.php:55
msgid "Number of tasks completed"
msgstr "Число завершённых заданий"
-#: ../user/host_app_versions.php:57
+#: ../user/host_app_versions.php:56
msgid "Max tasks per day"
msgstr "Максимум заданий в день"
-#: ../user/host_app_versions.php:58
+#: ../user/host_app_versions.php:57
msgid "Number of tasks today"
msgstr "Число заданий сегодня"
-#: ../user/host_app_versions.php:59
+#: ../user/host_app_versions.php:58
msgid "Consecutive valid tasks"
msgstr "Правильные задания завершённые подряд"
-#: ../user/host_app_versions.php:63
+#: ../user/host_app_versions.php:62
msgid "Average processing rate"
msgstr "Средняя скорость обработки"
-#: ../user/host_app_versions.php:72
+#: ../user/host_app_versions.php:71
msgid "Application details for host %1"
msgstr "Подробная информация о приложениях для компьютера %1"
@@ -5202,35 +5229,35 @@ msgstr "Адрес email:"
msgid "forgot email address?"
msgstr "забыли адрес email?"
-#: ../user/login_form.php:48
+#: ../user/login_form.php:47
msgid "Password:"
msgstr "Пароль:"
-#: ../user/login_form.php:48
+#: ../user/login_form.php:47
msgid "forgot password?"
msgstr "забыли пароль?"
-#: ../user/login_form.php:51
+#: ../user/login_form.php:50
msgid "Stay logged in"
msgstr "Оставаться авторизованным"
-#: ../user/login_form.php:62
+#: ../user/login_form.php:56
msgid "or %1create an account%2."
msgstr "или %1создать учётную запись%2."
-#: ../user/merge_by_name.php:31
+#: ../user/merge_by_name.php:33
msgid "Processing %1"
msgstr "Обработка %1"
-#: ../user/merge_by_name.php:43
+#: ../user/merge_by_name.php:45
msgid "Merged %1 into %2"
msgstr "%1 объединён с %2"
-#: ../user/merge_by_name.php:72
+#: ../user/merge_by_name.php:74
msgid "Return to the list of your computers"
msgstr "Вернуться к списку ваших компьютеров"
-#: ../user/merge_by_name.php:76
+#: ../user/merge_by_name.php:78
msgid ""
"This operation merges computers based on their domain name.\n"
" <p>\n"
@@ -5246,11 +5273,11 @@ msgstr ""
"Несовместимые компьютеры не будут объединены.\n"
"<p>"
-#: ../user/merge_by_name.php:82
+#: ../user/merge_by_name.php:84
msgid "Go ahead and do this"
msgstr "Вперёд, сделать это"
-#: ../user/merge_by_name.php:83
+#: ../user/merge_by_name.php:85
msgid "Return to the list of computers"
msgstr "Вернуться к списку компьютеров"
@@ -5500,7 +5527,7 @@ msgstr "Чтобы разблокировать, посетите %1настро
msgid "Unknown action"
msgstr "Неизвестное действие"
-#: ../user/prefs.php:32
+#: ../user/prefs.php:35
msgid ""
"Your preferences have been updated, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5510,7 +5537,7 @@ msgstr ""
" будут задействованы, когда ваш компьютер свяжется с %1,\n"
" или Вы выполните команду %2Обновить%3 из Менеджера BOINC."
-#: ../user/prefs.php:41
+#: ../user/prefs.php:44
msgid ""
"Your preferences have been reset to the defaults, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5528,25 +5555,25 @@ msgstr "%1 для конфигурации %2"
msgid "Back to preferences"
msgstr "Назад к настройкам"
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:48
msgid "Confirm delete preferences"
msgstr "Подтверждение удаления настроек"
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:51
msgid "Are you sure you want to delete your separate %1 preferences for %2?"
msgstr ""
"Вы уверены, что хотите удалить ваши отдельные настройки %1 для конфигурации "
"%2?"
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:55
msgid "Remove preferences"
msgstr "Удалить настройки"
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:57
msgid "Cancel"
msgstr "Отмена"
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:38
msgid ""
"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
"community."
@@ -5554,7 +5581,7 @@ msgstr ""
"%1Профили%2 позволяют людям разделять биографические данные и личные мнения "
"с сообществом %3."
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:39
msgid ""
"Explore the diversity of your fellow volunteers, and contribute your own "
"views for others to enjoy."
@@ -5562,7 +5589,7 @@ msgstr ""
"Исследуйте разнообразие ваших единомышленников-добровольцев, и представьте "
"вашу собственную точку зрения другим."
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:40
msgid ""
"If you haven't already, you can %1create your own user profile%2 for others "
"to see!"
@@ -5570,23 +5597,23 @@ msgstr ""
"Если Вы этого еще не сделали, Вы можете %1создать свой собственный профиль "
"пользователя%2, чтобы другие смогли его увидеть!"
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:45
msgid "User of the Day"
msgstr "Пользователь Дня"
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:58
msgid "User Profile Explorer"
msgstr "Обозреватель профилей пользователей"
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:61
msgid "View the %1User Picture Gallery%2."
msgstr "Посмотреть %1Галерею картинок пользователей%2."
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:62
msgid "Browse profiles %1by country%2."
msgstr "Просмотреть профили %1по странам%2."
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:63
msgid ""
"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
"without pictures%2."
@@ -5594,19 +5621,19 @@ msgstr ""
"Просмотреть профили %1в случайном порядке%2, %3в случайном порядке с "
"картинками%2, или %4в случайном порядке без картинок%2."
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:67
msgid "Alphabetical profile listings:"
msgstr "Алфавитные списки профилей:"
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:73
msgid "Search profile text"
msgstr "Поиск по тексту профиля"
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:99
msgid "No profiles"
msgstr "Нет профилей"
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:100
msgid "No profiles matched your query."
msgstr "Нет профилей, соответствующих Вашему запросу."
@@ -5690,135 +5717,135 @@ msgstr "Не работает"
msgid "Disabled"
msgstr "Отключен"
-#: ../user/server_status.php:231
+#: ../user/server_status.php:246
msgid "Project status"
msgstr "Статус проекта"
-#: ../user/server_status.php:233
+#: ../user/server_status.php:248
msgid "Server software version: %1"
msgstr "Версия серверного ПО: %1"
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Program"
msgstr "Программа"
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Host"
msgstr "Имя сервера"
-#: ../user/server_status.php:252
+#: ../user/server_status.php:267
msgid "data-driven web pages"
msgstr "Веб-страницы, управляемые данными"
-#: ../user/server_status.php:258
+#: ../user/server_status.php:273
msgid "upload/download server"
msgstr "Сервер загрузки/выгрузки"
-#: ../user/server_status.php:261
+#: ../user/server_status.php:276
msgid "scheduler"
msgstr "Планировщик"
-#: ../user/server_status.php:294
+#: ../user/server_status.php:309
msgid "Running:"
msgstr "Работает:"
-#: ../user/server_status.php:295
+#: ../user/server_status.php:310
msgid "Program is operating normally"
msgstr "Программа работает нормально"
-#: ../user/server_status.php:296
+#: ../user/server_status.php:311
msgid "Not Running:"
msgstr "Не работает:"
-#: ../user/server_status.php:297
+#: ../user/server_status.php:312
msgid "Program failed or the project is down"
msgstr "Программа завершилась с ошибкой или проект выключен"
-#: ../user/server_status.php:298
+#: ../user/server_status.php:313
msgid "Disabled:"
msgstr "Отключен:"
-#: ../user/server_status.php:299
+#: ../user/server_status.php:314
msgid "Program is disabled"
msgstr "Программа была остановлена"
-#: ../user/server_status.php:303
+#: ../user/server_status.php:318
msgid "Computing status"
msgstr "Статус вычислений"
-#: ../user/server_status.php:309
+#: ../user/server_status.php:324
msgid "The database server is not accessible"
msgstr "Сервер базы данных не доступен"
-#: ../user/server_status.php:326
+#: ../user/server_status.php:341
msgid "Tasks ready to send"
msgstr "Задания, готовые к отправке"
-#: ../user/server_status.php:331 ../user/workunit.php:55
+#: ../user/server_status.php:346 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr "Задания обрабатываются"
-#: ../user/server_status.php:336
+#: ../user/server_status.php:351
msgid "Workunits waiting for validation"
msgstr "Задачи, ожидающие проверки"
-#: ../user/server_status.php:341
+#: ../user/server_status.php:356
msgid "Workunits waiting for assimilation"
msgstr "Задачи, ожидающие слияния"
-#: ../user/server_status.php:346
+#: ../user/server_status.php:361
msgid "Workunits waiting for file deletion"
msgstr "Задачи, ожидающие удаления"
-#: ../user/server_status.php:351
+#: ../user/server_status.php:366
msgid "Tasks waiting for file deletion"
msgstr "Задания, ожидающие удаления"
-#: ../user/server_status.php:367
+#: ../user/server_status.php:383
msgid "Transitioner backlog (hours)"
msgstr "Отставание в обработке (часы)"
-#: ../user/server_status.php:374
+#: ../user/server_status.php:390
msgid "Users"
msgstr "Участников"
-#: ../user/server_status.php:377 ../user/server_status.php:395
+#: ../user/server_status.php:393 ../user/server_status.php:411
msgid "with recent credit"
msgstr "с недавними очками"
-#: ../user/server_status.php:382 ../user/server_status.php:400
+#: ../user/server_status.php:398 ../user/server_status.php:416
msgid "with credit"
msgstr "с очками"
-#: ../user/server_status.php:387 ../user/server_status.php:405
+#: ../user/server_status.php:403 ../user/server_status.php:421
msgid "registered in past 24 hours"
msgstr "зарегистрировались за последние 24 ч."
-#: ../user/server_status.php:411
+#: ../user/server_status.php:427
msgid "current GigaFLOPs"
msgstr "текущая скорость (гигафлопс)"
-#: ../user/server_status.php:420
+#: ../user/server_status.php:436
msgid "Tasks by application"
msgstr "Распределение заданий по приложениям"
-#: ../user/server_status.php:423 ../user/workunit.php:40
+#: ../user/server_status.php:439 ../user/workunit.php:40
msgid "application"
msgstr "приложение"
-#: ../user/server_status.php:424
+#: ../user/server_status.php:440
msgid "unsent"
msgstr "неотправленных"
-#: ../user/server_status.php:425
+#: ../user/server_status.php:441
msgid "in progress"
msgstr "в обработке"
-#: ../user/server_status.php:426
+#: ../user/server_status.php:442
msgid "avg runtime of last 100 results in h (min-max)"
msgstr "среднее время обработки последних 100 результатов (в ч.) (мин.-макс.)"
-#: ../user/server_status.php:427
+#: ../user/server_status.php:443
msgid "users in last 24h"
msgstr "пользователей за последние 24ч."
@@ -6015,7 +6042,7 @@ msgid "Couldn't add admin"
msgstr "Невозможно добавить администратора"
#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:28
msgid "No such team"
msgstr "Нет такой команды"
@@ -6096,10 +6123,6 @@ msgstr "Новый основатель?"
msgid "Change founder"
msgstr "Поменять основателя"
-#: ../user/team_change_founder_form.php:108
-msgid "There are no users to transfer team to."
-msgstr "Нет участников, которым можно передать команду."
-
#: ../user/team_create_action.php:29
msgid "You must choose a non-blank team name"
msgstr "Вы должны выбрать непустое название команды"
@@ -6412,7 +6435,7 @@ msgstr ""
"запросы не разрешены. Пожалуйста, попробуйте ещё раз позже."
#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join_form.php:31
msgid "The team %1 is not joinable."
msgstr "Команда %1 не допускает присоединений."
@@ -6437,25 +6460,25 @@ msgstr "Присоединение к команде %1."
msgid "You have joined %1."
msgstr "Вы присоединились к команде %1."
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
msgid "Join %1"
msgstr "Присоединение к команде %1."
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
msgid "Please note:"
msgstr "Пожалуйста, примите во внимание:"
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
msgid "Joining a team gives its founder access to your email address."
msgstr ""
"Присоединение к команде дает доступ её основателю к вашему адресу "
"электронной почты."
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
msgid "Joining a team does not affect your account's credit."
msgstr "Присоединение к команде не повлияет на очки вашей учётной записи."
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
msgid "Join team"
msgstr "Присоединиться к команде"
@@ -6603,19 +6626,19 @@ msgstr "Предел превышен: Можно показать только
msgid "Members of %1"
msgstr "Участники команды %1"
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
msgid "Unable to quit team"
msgstr "Невозможно выйти из команды"
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
msgid "Team doesn't exist, or you don't belong to it."
msgstr "Команда не существует, или Вы не принадлежите ей."
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
msgid "Quit %1"
msgstr "Выход из команды %1"
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
msgid ""
"<strong>Please note before quitting a team:</strong>\n"
" <ul>\n"
@@ -6632,7 +6655,7 @@ msgstr ""
" <li>Выход из команды никак не повлияет на вашу личную статистику.\n"
" </ul>"
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
msgid "Quit Team"
msgstr "Выйти из команды"
@@ -7056,37 +7079,6 @@ msgstr ""
msgid "(all applications)"
msgstr "(все приложения)"
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Использовать ГП Intel %1 начиная с версии 7.0+ %2"
-
-#~ msgid "Error:"
-#~ msgstr "Ошибка:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "Создание учётной записи запрещено"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Извините, но этот проект запретил создание новых учётных записей.\n"
-#~ "Пожалуйста попробуйте ещё раз позже."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "Создание учётной записи в данный момент запрещено. Пожалуйста, попробуйте "
-#~ "ещё раз немного позднее."
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Этот проект не создал электронное письмо - пожалуйста, сообщите об этом "
-#~ "администраторам"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "ГП NVIDIA"
-
#~ msgid ""
#~ "These apply to all BOINC projects in which you participate.<br>\n"
#~ " On computers participating in multiple projects, the most "
diff --git a/html/languages/translations/sl.po b/html/languages/translations/sl.po
index e7e039d..1017ed9 100644
--- a/html/languages/translations/sl.po
+++ b/html/languages/translations/sl.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-08-07 14:54+0000\n"
+"PO-Revision-Date: 2013-06-05 20:02+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: sl\n"
@@ -16,9 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1407423277.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "Slovenščina"
@@ -1201,9 +1200,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "Uporabi NVIDIA grafični procesor %1 Velja za različice od 6.10 dalje %2"
#: ../inc/prefs.inc:344
-#, fuzzy
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Uporabi ATI grafični procesor %1 Velja za različice od 6.10 dalje %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1764,9 +1762,8 @@ msgid "State"
msgstr "Status"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "Ime opravila"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -2121,9 +2118,8 @@ msgid "Used in community functions"
msgstr "Uporabljeno v funkcijah skupnosti"
#: ../inc/user.inc:216 ../user/weak_auth.php:25
-#, fuzzy
msgid "Account keys"
-msgstr "Ključ računa"
+msgstr ""
#: ../inc/user.inc:221
msgid "Preferences"
@@ -2570,9 +2566,8 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
-#, fuzzy
msgid "Languages"
-msgstr "Jezik"
+msgstr ""
#: ../user/bs_sample_index.php:149 ../user/info.php:24
#: ../user/sample_index.php:79
diff --git a/html/user/get_project_config.php b/html/user/get_project_config.php
index 0dbfc3c..793bf58 100644
--- a/html/user/get_project_config.php
+++ b/html/user/get_project_config.php
@@ -107,10 +107,6 @@ if (file_exists($tou_file)) {
}
}
-if (LDAP_HOST) {
- echo "<ldap_auth/>\n";
-}
-
echo "</project_config>";
?>
diff --git a/html/user/lookup_account.php b/html/user/lookup_account.php
index 67e53c6..f86a83a 100644
--- a/html/user/lookup_account.php
+++ b/html/user/lookup_account.php
@@ -22,65 +22,45 @@ require_once("../inc/boinc_db.inc");
require_once("../inc/util.inc");
require_once("../inc/email.inc");
require_once("../inc/xml.inc");
-require_once("../inc/ldap.inc");
xml_header();
$retval = db_init_xml();
if ($retval) xml_error($retval);
-$ldap_auth = get_str("ldap_auth", true);
+$email_addr = get_str("email_addr");
+$passwd_hash = get_str("passwd_hash", true);
-if (LDAP_HOST && $ldap_auth) {
- // LDAP case.
- //
- $ldap_uid = get_str("ldap_uid");
- $passwd = get_str("passwd");
- list ($ldap_user, $error_msg) = ldap_auth($ldap_uid, $passwd);
- if ($error_msg) {
- xml_error(ERR_BAD_USER_NAME, $error_msg);
- }
- $x = ldap_email_string($ldap_uid);
- $user = BoincUser::lookup_email_addr($x);
- if (!$user) {
- $user = make_user_ldap($x, $ldap_user->name);
- if (!$user) {
- xml_error(-1, "user record creation failed");
- }
- }
-} else {
- // normal (non-LDAP) case
- $email_addr = get_str("email_addr");
- $passwd_hash = get_str("passwd_hash", true);
-
- $email_addr = BoincDb::escape_string($email_addr);
- $user = BoincUser::lookup("email_addr='$email_addr'");
- if (!$user) {
- xml_error(ERR_DB_NOT_FOUND);
- }
+$email_addr = BoincDb::escape_string($email_addr);
+$user = BoincUser::lookup("email_addr='$email_addr'");
+if (!$user) {
+ xml_error(ERR_DB_NOT_FOUND);
+}
- if (!$passwd_hash) {
- echo "<account_out>\n";
- echo " <success/>\n";
- echo "</account_out>\n";
- exit();
- }
+if (!$passwd_hash) {
+ echo "<account_out>
+ <success/>
+</account_out>
+";
+ exit();
+}
- $auth_hash = md5($user->authenticator.$user->email_addr);
+$auth_hash = md5($user->authenticator.$user->email_addr);
- // if no password set, set password to account key
- //
- if (!strlen($user->passwd_hash)) {
- $user->passwd_hash = $auth_hash;
- $user->update("passwd_hash='$user->passwd_hash'");
- }
+// if no password set, set password to account key
+//
+if (!strlen($user->passwd_hash)) {
+ $user->passwd_hash = $auth_hash;
+ $user->update("passwd_hash='$user->passwd_hash'");
+}
- // if the given password hash matches (auth+email), accept it
- //
- if ($user->passwd_hash != $passwd_hash && $auth_hash != $passwd_hash) {
- xml_error(ERR_BAD_PASSWD);
- }
+// if the given password hash matches (auth+email), accept it
+//
+if ($user->passwd_hash == $passwd_hash || $auth_hash == $passwd_hash) {
+ echo "<account_out>\n";
+ echo "<authenticator>$user->authenticator</authenticator>\n";
+ echo "</account_out>\n";
+} else {
+ xml_error(ERR_BAD_PASSWD);
}
-echo "<account_out>\n";
-echo "<authenticator>$user->authenticator</authenticator>\n";
-echo "</account_out>\n";
+
?>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a153948..28ec1c7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,7 @@ libfcgi_sources = \
coproc.cpp \
filesys.cpp \
hostinfo.cpp \
- md5.cpp \
+ md5.c \
md5_file.cpp \
mfile.cpp \
miofile.cpp \
@@ -47,7 +47,7 @@ generic_sources = \
gui_rpc_client_ops.cpp \
gui_rpc_client_print.cpp \
hostinfo.cpp \
- md5.cpp \
+ md5.c \
md5_file.cpp \
mem_usage.cpp \
mfile.cpp \
diff --git a/lib/Makefile.mingw b/lib/Makefile.mingw
index 0ce05c6..6ddf11a 100644
--- a/lib/Makefile.mingw
+++ b/lib/Makefile.mingw
@@ -205,6 +205,10 @@ wrapper.o: $(BOINC_SRC)/samples/wrapper/wrapper.cpp
%.o: $(BOINC_SRC)/samples/wrapper/%.c
$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
+# C-mode file
+md5.o: $(BOINC_SRC)/lib/md5.c
+ $(CXX) -c $(BOINC_SRC)/lib/md5.c -o md5.o $(CPPFLAGS) $(CXXFLAGS)
+
# for boinc_zip. Don't change the order!
zip:
mkdir -p $@
diff --git a/lib/app_ipc.cpp b/lib/app_ipc.cpp
index f012732..3aa6066 100644
--- a/lib/app_ipc.cpp
+++ b/lib/app_ipc.cpp
@@ -32,11 +32,10 @@
#include "str_replace.h"
#include "str_util.h"
#include "url.h"
-#include "util.h"
#include "app_ipc.h"
-#if (!defined(HAVE_STRDUP) && defined(HAVE__STRDUP)) || defined(_MSC_VER)
+#ifdef _MSC_VER
#define strdup _strdup
#endif
@@ -282,14 +281,9 @@ void APP_INIT_DATA::clear() {
fraction_done_start = 0;
fraction_done_end = 0;
checkpoint_period = 0;
- // gpu_type is an empty string for client versions before 6.13.3 without this
- // field or (on newer clients) if BOINC did not assign an OpenCL GPU to task.
strcpy(gpu_type, "");
- // gpu_device_num < 0 for client versions before 6.13.3 without this field
- // or (on newer clients) if BOINC did not assign an OpenCL GPU to task.
gpu_device_num = -1;
- // gpu_opencl_dev_index < 0 for client versions before 7.0.12 without this
- // field or (on newer clients) if BOINC did not assign any GPU to task.
+ // -1 means an older version without gpu_opencl_dev_index field
gpu_opencl_dev_index = -1;
gpu_usage = 0;
ncpus = 0;
@@ -307,9 +301,7 @@ int parse_init_data_file(FILE* f, APP_INIT_DATA& ai) {
XML_PARSER xp(&mf);
if (!xp.parse_start("app_init_data")) {
- fprintf(stderr, "%s: no start tag in app init data\n",
- time_to_string(dtime())
- );
+ fprintf(stderr, "no start tag in app init data\n");
return ERR_XML_PARSE;
}
@@ -324,8 +316,7 @@ int parse_init_data_file(FILE* f, APP_INIT_DATA& ai) {
while (!xp.get_tag()) {
if (!xp.is_tag) {
fprintf(stderr,
- "%s: unexpected text in init_data.xml: %s\n",
- time_to_string(dtime()), xp.parsed_tag
+ "unexpected text in init_data.xml: %s\n", xp.parsed_tag
);
continue;
}
@@ -404,9 +395,7 @@ int parse_init_data_file(FILE* f, APP_INIT_DATA& ai) {
if (xp.parse_bool("vbox_window", ai.vbox_window)) continue;
xp.skip_unexpected(false, "parse_init_data_file");
}
- fprintf(stderr, "%s: parse_init_data_file: no end tag\n",
- time_to_string(dtime())
- );
+ fprintf(stderr, "parse_init_data_file: no end tag\n");
return ERR_XML_PARSE;
}
diff --git a/lib/cc_config.cpp b/lib/cc_config.cpp
index 2aa644d..efe486a 100644
--- a/lib/cc_config.cpp
+++ b/lib/cc_config.cpp
@@ -205,10 +205,10 @@ void CC_CONFIG::defaults() {
client_new_version_text = "";
client_version_check_url = "http://boinc.berkeley.edu/download.php?xml=1";
config_coprocs.clear();
+ data_dir[0] = 0;
disallow_attach = false;
dont_check_file_sizes = false;
dont_contact_ref_site = false;
- dont_use_vbox = false;
exclude_gpus.clear();
exclusive_apps.clear();
exclusive_gpu_apps.clear();
@@ -335,10 +335,12 @@ int CC_CONFIG::parse_options(XML_PARSER& xp) {
config_coprocs.add(c);
continue;
}
+ if (xp.parse_str("data_dir", data_dir, sizeof(data_dir))) {
+ continue;
+ }
if (xp.parse_bool("disallow_attach", disallow_attach)) continue;
if (xp.parse_bool("dont_check_file_sizes", dont_check_file_sizes)) continue;
if (xp.parse_bool("dont_contact_ref_site", dont_contact_ref_site)) continue;
- if (xp.parse_bool("dont_use_vbox", dont_use_vbox)) continue;
if (xp.match_tag("exclude_gpu")) {
EXCLUDE_GPU eg;
retval = eg.parse(xp);
@@ -537,15 +539,19 @@ int CC_CONFIG::write(MIOFILE& out, LOG_FLAGS& log_flags) {
);
}
+ // Older versions of BOINC choke on empty data_dir string
+ //
+ if (strlen(data_dir)) {
+ out.printf(" <data_dir>%s</data_dir>\n", data_dir);
+ }
+
out.printf(
" <disallow_attach>%d</disallow_attach>\n"
" <dont_check_file_sizes>%d</dont_check_file_sizes>\n"
- " <dont_contact_ref_site>%d</dont_contact_ref_site>\n"
- " <dont_use_vbox>%d</dont_use_vbox>\n",
+ " <dont_contact_ref_site>%d</dont_contact_ref_site>\n",
disallow_attach,
dont_check_file_sizes,
- dont_contact_ref_site,
- dont_use_vbox
+ dont_contact_ref_site
);
for (i=0; i<exclude_gpus.size(); i++) {
diff --git a/lib/cc_config.h b/lib/cc_config.h
index be8406c..5b1eb50 100644
--- a/lib/cc_config.h
+++ b/lib/cc_config.h
@@ -146,10 +146,11 @@ struct CC_CONFIG {
std::string client_new_version_text;
std::string client_version_check_url;
COPROCS config_coprocs;
+ char data_dir[256];
bool disallow_attach;
bool dont_check_file_sizes;
+ int max_event_log_lines;
bool dont_contact_ref_site;
- bool dont_use_vbox;
std::vector<EXCLUDE_GPU> exclude_gpus;
std::vector<std::string> exclusive_apps;
std::vector<std::string> exclusive_gpu_apps;
@@ -163,7 +164,6 @@ struct CC_CONFIG {
int http_transfer_timeout_bps;
int http_transfer_timeout;
std::vector<int> ignore_gpu_instance[NPROC_TYPES];
- int max_event_log_lines;
int max_file_xfers;
int max_file_xfers_per_project;
int max_stderr_file_size;
diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index e017aa2..9f581f0 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -157,7 +157,6 @@ int COPROC::parse(XML_PARSER& xp) {
}
continue;
}
- if (xp.parse_bool("non_gpu", non_gpu)) continue;
}
return ERR_XML_PARSE;
}
diff --git a/lib/coproc.h b/lib/coproc.h
index b68c814..2d699df 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -89,18 +89,31 @@
#include "cl_boinc.h"
#include "opencl_boinc.h"
+#define DEFER_ON_GPU_AVAIL_RAM 0
+
#define MAX_COPROC_INSTANCES 64
#define MAX_RSC 8
// max # of processing resources types
// arguments to proc_type_name() and proc_type_name_xml().
//
-#define PROC_TYPE_CPU 0
-#define PROC_TYPE_NVIDIA_GPU 1
-#define PROC_TYPE_AMD_GPU 2
-#define PROC_TYPE_INTEL_GPU 3
-#define PROC_TYPE_MINER_ASIC 4
-#define NPROC_TYPES 5
+enum {
+ PROC_TYPE_CPU=0,
+ PROC_TYPE_NVIDIA_GPU,
+ PROC_TYPE_AMD_GPU,
+ PROC_TYPE_INTEL_GPU,
+ PROC_TYPE_A,
+ PROC_TYPE_B,
+ PROC_TYPE_C,
+ PROC_TYPE_D,
+ PROC_TYPE_E,
+ PROC_TYPE_F,
+ PROC_TYPE_G,
+ NPROC_TYPES
+};
+
+extern const char* proc_type_names_xml[NPROC_TYPES];
+extern const char* proc_type_names[NPROC_TYPES];
extern const char* proc_type_name(int);
// user-readable name
@@ -112,6 +125,13 @@ extern int coproc_type_name_to_num(const char* name);
#define GPU_TYPE_NVIDIA proc_type_name_xml(PROC_TYPE_NVIDIA_GPU)
#define GPU_TYPE_ATI proc_type_name_xml(PROC_TYPE_AMD_GPU)
#define GPU_TYPE_INTEL proc_type_name_xml(PROC_TYPE_INTEL_GPU)
+#define COPROC_TYPE_A proc_type_name_xml(PROC_TYPE_A)
+#define COPROC_TYPE_B proc_type_name_xml(PROC_TYPE_B)
+#define COPROC_TYPE_C proc_type_name_xml(PROC_TYPE_C)
+#define COPROC_TYPE_D proc_type_name_xml(PROC_TYPE_D)
+#define COPROC_TYPE_E proc_type_name_xml(PROC_TYPE_E)
+#define COPROC_TYPE_F proc_type_name_xml(PROC_TYPE_F)
+#define COPROC_TYPE_G proc_type_name_xml(PROC_TYPE_G)
// represents a requirement for a coproc.
// This is a parsed version of the <coproc> elements in an <app_version>
@@ -142,7 +162,6 @@ struct PCI_INFO {
struct COPROC {
char type[256]; // must be unique
int count; // how many are present
- bool non_gpu; // coproc is not a GPU
double peak_flops;
double used; // how many are in use (used by client)
bool have_cuda; // True if this GPU supports CUDA on this computer
@@ -183,6 +202,10 @@ struct COPROC {
bool running_graphics_app[MAX_COPROC_INSTANCES];
// is this GPU running a graphics app (NVIDIA only)
+#if DEFER_ON_GPU_AVAIL_RAM
+ double available_ram_temp[MAX_COPROC_INSTANCES];
+ // used during job scheduling
+#endif
double last_print_time;
@@ -198,7 +221,6 @@ struct COPROC {
// can't just memcpy() - trashes vtable
type[0] = 0;
count = 0;
- non_gpu = false;
peak_flops = 0;
used = 0;
have_cuda = false;
@@ -471,23 +493,11 @@ struct COPROCS {
coprocs[n_rsc++] = c;
return 0;
}
- void bound_counts();
- // make sure instance counts are within legal range
-
- COPROC* lookup_type(const char* t) {
- for (int i=1; i<n_rsc; i++) {
- if (!strcmp(t, coprocs[i].type)) {
- return &coprocs[i];
- }
- }
- return NULL;
- }
- COPROC* proc_type_to_coproc(int t) {
+ COPROC* type_to_coproc(int t) {
switch(t) {
case PROC_TYPE_NVIDIA_GPU: return &nvidia;
case PROC_TYPE_AMD_GPU: return &ati;
case PROC_TYPE_INTEL_GPU: return &intel_gpu;
- case PROC_TYPE_MINER_ASIC: return lookup_type("miner_asic");
}
return NULL;
}
diff --git a/lib/crypt.cpp b/lib/crypt.cpp
index 208d925..d1a0e1b 100644
--- a/lib/crypt.cpp
+++ b/lib/crypt.cpp
@@ -52,7 +52,6 @@
#include "cert_sig.h"
#include "filesys.h"
#include "error_numbers.h"
-#include "util.h"
#include "crypt.h"
@@ -162,10 +161,7 @@ static int sscan_hex_data(const char* p, DATA_BLOCK& x) {
n = sscanf(p, "%2x", &m);
if (n <= 0) break;
if (nleft<=0) {
- fprintf(stderr,
- "%s: sscan_hex_data: buffer overflow\n",
- time_to_string(dtime())
- );
+ fprintf(stderr, "sscan_hex_data: buffer overflow\n");
return ERR_BAD_HEX_FORMAT;
}
x.data[x.len++] = m;
@@ -353,8 +349,7 @@ int check_file_signature(
retval = decrypt_public(key, signature, clear_signature);
if (retval) {
fprintf(stderr,
- "%s: check_file_signature: decrypt_public error %d\n",
- time_to_string(dtime()), retval
+ "check_file_signature: decrypt_public error %d\n", retval
);
return retval;
}
@@ -375,9 +370,7 @@ int check_file_signature2(
retval = sscan_key_hex(key_text, (KEY*)&key, sizeof(key));
if (retval) {
- fprintf(stderr, "%s: check_file_signature2: sscan_key_hex failed\n",
- time_to_string(dtime())
- );
+ fprintf(stderr, "check_file_signature2: sscan_key_hex failed\n");
return retval;
}
signature.data = signature_buf;
@@ -435,16 +428,13 @@ int read_key_file(const char* keyfile, R_RSA_PRIVATE_KEY& key) {
FCGI_FILE* fkey = FCGI::fopen(keyfile, "r");
#endif
if (!fkey) {
- fprintf(stderr,
- "%s: can't open key file (%s)\n",
- time_to_string(dtime()), keyfile
- );
+ fprintf(stderr, "can't open key file (%s)\n", keyfile);
return ERR_FOPEN;
}
retval = scan_key_hex(fkey, (KEY*)&key, sizeof(key));
fclose(fkey);
if (retval) {
- fprintf(stderr, "%s: can't parse key\n", time_to_string(dtime()));
+ fprintf(stderr, "can't parse key\n");
return retval;
}
return 0;
@@ -554,10 +544,7 @@ int check_validity_of_cert(
X509_STORE_free(store);
if (retval != 1) {
- fprintf(stderr,
- "%s: ERROR: Cannot verify certificate ('%s')\n",
- time_to_string(dtime()), cFile
- );
+ fprintf(stderr,"ERROR: Cannot verify certificate ('%s')\n", cFile);
return 0;
}
pubKey = X509_get_pubkey(cert);
@@ -586,10 +573,7 @@ int check_validity_of_cert(
BN_CTX_free(c);
}
if (pubKey->type == EVP_PKEY_DSA) {
- fprintf(stderr,
- "%s: ERROR: DSA keys are not supported.\n",
- time_to_string(dtime())
- );
+ fprintf(stderr, "ERROR: DSA keys are not supported.\n");
return 0;
}
EVP_PKEY_free(pubKey);
diff --git a/lib/error_numbers.h b/lib/error_numbers.h
index f6e3033..fc7d14e 100644
--- a/lib/error_numbers.h
+++ b/lib/error_numbers.h
@@ -95,7 +95,6 @@
#define ERR_BENCHMARK_FAILED -133
#define ERR_BAD_HEX_FORMAT -134
// hex-format key data is bad
-#define ERR_GETADDRINFO -135
#define ERR_DB_NOT_FOUND -136
// no rows found in lookup() or enumerate()
#define ERR_DB_NOT_UNIQUE -137
@@ -204,7 +203,6 @@
#define ERR_PROC_PARSE -235
#define ERR_STATFS -236
#define ERR_PIPE -237
-#define ERR_NEED_HTTPS -238
// PLEASE: add a text description of your error to
// the text description function boincerror() in str_util.cpp.
diff --git a/lib/gui_rpc_client.cpp b/lib/gui_rpc_client.cpp
index a6c2a15..bedb3dd 100644
--- a/lib/gui_rpc_client.cpp
+++ b/lib/gui_rpc_client.cpp
@@ -95,7 +95,7 @@ int RPC_CLIENT::get_ip_addr(const char* host, int port) {
//printf("trying port %d\n", htons(addr.sin_port));
int retval;
if (host) {
- retval = resolve_hostname_or_ip_addr(host, addr);
+ retval = resolve_hostname(host, addr);
if (retval) {
return ERR_GETHOSTBYNAME;
}
@@ -383,9 +383,7 @@ int RPC::parse_reply() {
return n;
}
if (parse_str(buf, "<error>", error_msg, sizeof(error_msg))) {
- fprintf(stderr, "%s: GUI RPC error: %s\n",
- time_to_string(dtime()), error_msg
- );
+ fprintf(stderr, "RPC error: %s\n", error_msg);
if (strstr(error_msg, "unauthorized")) return ERR_AUTHENTICATOR;
if (strstr(error_msg, "Missing authenticator")) return ERR_AUTHENTICATOR;
if (strstr(error_msg, "Missing URL")) return ERR_INVALID_URL;
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 2004efd..757aab4 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -170,7 +170,6 @@ struct PROJECT {
char venue[256];
int njobs_success;
int njobs_error;
- double elapsed_time;
char external_cpid[64];
// NOTE: if you add any data items above,
@@ -559,8 +558,6 @@ struct PROJECT_CONFIG {
// before allowing attachment to continue.
std::vector<std::string> platforms;
// platforms supported by project, or empty
- bool ldap_auth;
- // project supports LDAP authentication
PROJECT_CONFIG();
~PROJECT_CONFIG();
@@ -574,11 +571,10 @@ struct ACCOUNT_IN {
std::string url;
// URL prefix for web RPCs
std::string email_addr;
- // the account identifier (email address, user name, or LDAP uid)
+ // the account identifier (email address or user name)
std::string user_name;
std::string passwd;
std::string team_name;
- bool ldap_auth;
ACCOUNT_IN();
~ACCOUNT_IN();
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 228cd17..2a90055 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -459,7 +459,6 @@ int PROJECT::parse(XML_PARSER& xp) {
if (xp.parse_str("venue", venue, sizeof(venue))) continue;
if (xp.parse_int("njobs_success", njobs_success)) continue;
if (xp.parse_int("njobs_error", njobs_error)) continue;
- if (xp.parse_double("elapsed_time", elapsed_time)) continue;
if (xp.parse_str("external_cpid", external_cpid, sizeof(external_cpid))) continue;
}
return ERR_XML_PARSE;
@@ -514,7 +513,6 @@ void PROJECT::clear() {
strcpy(venue, "");
njobs_success = 0;
njobs_error = 0;
- elapsed_time = 0;
strcpy(external_cpid, "");
}
@@ -1346,7 +1344,6 @@ int PROJECT_CONFIG::parse(XML_PARSER& xp) {
platforms.push_back(msg);
continue;
}
- if (xp.parse_bool("ldap_auth", ldap_auth)) continue;
}
return ERR_XML_PARSE;
}
@@ -1367,7 +1364,6 @@ void PROJECT_CONFIG::clear() {
sched_stopped = false;
web_stopped = false;
min_client_version = 0;
- ldap_auth = false;
}
ACCOUNT_IN::ACCOUNT_IN() {
@@ -2305,27 +2301,18 @@ int RPC_CLIENT::lookup_account(ACCOUNT_IN& ai) {
SET_LOCALE sl;
char buf[1024];
RPC rpc(this);
- string passwd_hash;
- if (ai.ldap_auth && !strchr(ai.email_addr.c_str(), '@')) {
- // LDAP case
- //
- passwd_hash = ai.passwd;
- } else {
- downcase_string(ai.email_addr);
- passwd_hash = get_passwd_hash(ai.passwd, ai.email_addr);
- }
+ downcase_string(ai.email_addr);
+ string passwd_hash = get_passwd_hash(ai.passwd, ai.email_addr);
snprintf(buf, sizeof(buf),
"<lookup_account>\n"
" <url>%s</url>\n"
" <email_addr>%s</email_addr>\n"
" <passwd_hash>%s</passwd_hash>\n"
- " <ldap_auth>%d</ldap_auth>\n"
"</lookup_account>\n",
ai.url.c_str(),
ai.email_addr.c_str(),
- passwd_hash.c_str(),
- ai.ldap_auth?1:0
+ passwd_hash.c_str()
);
buf[sizeof(buf)-1] = 0;
diff --git a/lib/gui_rpc_client_print.cpp b/lib/gui_rpc_client_print.cpp
index b03c117..4f576c1 100644
--- a/lib/gui_rpc_client_print.cpp
+++ b/lib/gui_rpc_client_print.cpp
@@ -108,7 +108,6 @@ void PROJECT::print() {
}
printf(" jobs succeeded: %d\n", njobs_success);
printf(" jobs failed: %d\n", njobs_error);
- printf(" elapsed time: %f\n", elapsed_time);
printf(" cross-project ID: %s\n", external_cpid);
}
diff --git a/lib/md5.cpp b/lib/md5.c
similarity index 100%
rename from lib/md5.cpp
rename to lib/md5.c
diff --git a/lib/network.cpp b/lib/network.cpp
index a479270..cb7444a 100644
--- a/lib/network.cpp
+++ b/lib/network.cpp
@@ -39,8 +39,6 @@
#endif
#include "error_numbers.h"
-#include "str_util.h"
-#include "util.h"
#include "network.h"
@@ -148,12 +146,8 @@ int resolve_hostname(const char* hostname, sockaddr_storage &ip_addr) {
if (!hep) {
return ERR_GETHOSTBYNAME;
}
- for (int i=0; ; i++) {
- if (!hep->h_addr_list[i]) break;
- ip_addr.sin_family = AF_INET;
- ip_addr.sin_addr.s_addr = *(int*)hep->h_addr_list[i];
- if ((ip_addr.sin_addr.s_addr&0xff) != 0x7f) return 0; // look for non-loopback addr
- }
+ ip_addr.sin_family = AF_INET;
+ ip_addr.sin_addr.s_addr = *(int*)hep->h_addr_list[0];
return 0;
#else
@@ -165,18 +159,10 @@ int resolve_hostname(const char* hostname, sockaddr_storage &ip_addr) {
hints.ai_protocol = IPPROTO_TCP;
int retval = getaddrinfo(hostname, NULL, &hints, &res);
if (retval) {
- char buf[256];
- sprintf(buf, "%s: getaddrinfo", time_to_string(dtime()));
- perror(buf);
- return ERR_GETADDRINFO;
- }
- struct addrinfo* aip = res;
- while (aip) {
- memcpy(&ip_addr, aip->ai_addr, aip->ai_addrlen);
- sockaddr_in* sin = (sockaddr_in*)&ip_addr;
- if ((sin->sin_addr.s_addr&0xff) != 0x7f) break;
- aip = aip->ai_next;
+ perror("getaddrinfo");
+ return retval;
}
+ memcpy(&ip_addr, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
return 0;
#endif
@@ -219,9 +205,7 @@ int resolve_hostname_or_ip_addr(
int boinc_socket(int& fd, int protocol) {
fd = (int)socket(protocol, SOCK_STREAM, 0);
if (fd < 0) {
- char buf[256];
- sprintf(buf, "%s: socket", time_to_string(dtime()));
- perror("buf");
+ perror("socket");
return ERR_SOCKET;
}
#ifndef _WIN32
diff --git a/lib/notice.cpp b/lib/notice.cpp
index f26e591..5f907e9 100644
--- a/lib/notice.cpp
+++ b/lib/notice.cpp
@@ -49,7 +49,10 @@ int NOTICE::parse(XML_PARSER& xp) {
}
if (xp.parse_int("seqno", seqno)) continue;
if (xp.parse_str("title", title, sizeof(title))) continue;
- if (xp.parse_string("description", description)) continue;
+ if (xp.parse_string("description", description)) {
+ xml_unescape(description); // 2nd pass
+ continue;
+ }
if (xp.parse_double("create_time", create_time)) continue;
if (xp.parse_double("arrival_time", arrival_time)) continue;
if (xp.parse_bool("is_private", is_private)) continue;
diff --git a/lib/opencl_boinc.cpp b/lib/opencl_boinc.cpp
index 4efd376..c4d0982 100644
--- a/lib/opencl_boinc.cpp
+++ b/lib/opencl_boinc.cpp
@@ -66,7 +66,7 @@ void OPENCL_DEVICE_PROP::write_xml(MIOFILE& f, const char* tag, bool temp_file)
tag,
name,
vendor,
- (unsigned long)vendor_id,
+ vendor_id,
available ? 1 : 0,
half_fp_config,
single_fp_config,
@@ -76,24 +76,24 @@ void OPENCL_DEVICE_PROP::write_xml(MIOFILE& f, const char* tag, bool temp_file)
extensions,
global_mem_size,
local_mem_size,
- (unsigned long)max_clock_frequency,
- (unsigned long)max_compute_units,
+ max_clock_frequency,
+ max_compute_units,
opencl_platform_version,
opencl_device_version,
opencl_driver_version
);
if (temp_file) {
f.printf(
+ " <is_used>%d</is_used>\n"
" <device_num>%d</device_num>\n"
" <peak_flops>%f</peak_flops>\n"
" <opencl_available_ram>%f</opencl_available_ram>\n"
- " <opencl_device_index>%d</opencl_device_index>\n"
- " <warn_bad_cuda>%d</warn_bad_cuda>\n",
+ " <opencl_device_index>%d</opencl_device_index>\n",
+ is_used,
device_num,
peak_flops,
opencl_available_ram,
- opencl_device_index,
- warn_bad_cuda
+ opencl_device_index
);
}
f.printf(" </%s>\n", tag);
@@ -182,6 +182,10 @@ int OPENCL_DEVICE_PROP::parse(XML_PARSER& xp, const char* end_tag) {
// The following are used only in the
// COPROC_INFO_FILENAME temporary file
+ if (xp.parse_int("is_used", n)) {
+ is_used = (COPROC_USAGE)n;
+ continue;
+ }
if (xp.parse_int("device_num", n)) {
device_num = n;
continue;
@@ -192,7 +196,6 @@ int OPENCL_DEVICE_PROP::parse(XML_PARSER& xp, const char* end_tag) {
opencl_device_index = n;
continue;
}
- if (xp.parse_bool("warn_bad_cuda", warn_bad_cuda)) continue;
}
return ERR_XML_PARSE;
}
diff --git a/lib/opencl_boinc.h b/lib/opencl_boinc.h
index aaf490e..7e16aa6 100644
--- a/lib/opencl_boinc.h
+++ b/lib/opencl_boinc.h
@@ -63,8 +63,7 @@ struct OPENCL_DEVICE_PROP {
double peak_flops; // temp used in scan process
COPROC_USAGE is_used; // temp used in scan process
double opencl_available_ram; // temp used in scan process
- int opencl_device_index; // zero-based device number within this OpenCL platform
- bool warn_bad_cuda; // If true, warn we can't use GPU due to CUDA version
+ int opencl_device_index; // zero-based device number within this COPROC type
void write_xml(MIOFILE&, const char* tag, bool temp_file=false);
int parse(XML_PARSER&, const char* end_tag);
diff --git a/lib/parse.cpp b/lib/parse.cpp
index 91b3a06..0e965e1 100644
--- a/lib/parse.cpp
+++ b/lib/parse.cpp
@@ -48,9 +48,8 @@
#endif
#include "error_numbers.h"
-#include "str_replace.h"
#include "str_util.h"
-#include "util.h"
+#include "str_replace.h"
#include "parse.h"
@@ -835,8 +834,8 @@ void XML_PARSER::skip_unexpected(
if (verbose) {
fprintf(stderr,
- "%s: Unrecognized XML tag '<%s>' in %s; skipping\n",
- time_to_string(dtime()), start_tag, where
+ "Unrecognized XML tag '<%s>' in %s; skipping\n",
+ start_tag, where
);
}
if (strchr(start_tag, '/')) return;
diff --git a/lib/procinfo_mac.cpp b/lib/procinfo_mac.cpp
index cfe05ec..639a463 100644
--- a/lib/procinfo_mac.cpp
+++ b/lib/procinfo_mac.cpp
@@ -51,6 +51,7 @@ int procinfo_setup(PROC_MAP& pm) {
int c, real_mem, virtual_mem, hours;
char* lf;
static long iBrandID = -1;
+ int priority;
if (iBrandID < 0) {
iBrandID = BOINC_BRAND_ID;
@@ -104,7 +105,7 @@ int procinfo_setup(PROC_MAP& pm) {
// from a process that has the DYLD_LIBRARY_PATH environment variable set.
// "env -i command" prevents the command from inheriting the caller's
// environment, which avoids the spurious warning.
- fd = popen("env -i ps -axcopid,ppid,rss,vsz,pagein,time,command", "r");
+ fd = popen("env -i ps -axcopid,ppid,rss,vsz,pagein,pri,time,command", "r");
if (!fd) return ERR_FOPEN;
// Skip over the header line
@@ -118,12 +119,13 @@ int procinfo_setup(PROC_MAP& pm) {
while (1) {
p.clear();
- c = fscanf(fd, "%d%d%d%d%lu%d:%lf ",
+ c = fscanf(fd, "%d%d%d%d%lu%d%d:%lf ",
&p.id,
&p.parentid,
&real_mem,
&virtual_mem,
&p.page_fault_count,
+ &priority,
&hours,
&p.user_time
);
@@ -135,17 +137,7 @@ int procinfo_setup(PROC_MAP& pm) {
p.swap_size = (double)virtual_mem * 1024.;
p.user_time += 60. * (float)hours;
p.is_boinc_app = (p.id == pid || strcasestr(p.command, "boinc"));
- // Ideally, we should count ScreenSaverEngine.app as a BOINC process
- // only if BOINC is set as the screensaver. We could set a flag in
- // the client when the get_screensaver_tasks rpc is called, but that
- // would not be 100% reliable for several reasons.
- if (strcasestr(p.command, "screensaverengine")) p.is_boinc_app = true;
-
- // We do not mark Mac processes as low priority because some processes
- // (e.g., Finder) change priority frequently, which would cause
- // procinfo_non_boinc() and ACTIVE_TASK_SET::get_memory_usage() to get
- // incorrect results for the % CPU used.
- p.is_low_priority = false;
+ p.is_low_priority = (priority <= 12);
switch (iBrandID) {
case GRIDREPUBLIC_BRAND_ID:
diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index 54c97e5..041a57b 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -441,7 +441,6 @@ const char* boincerror(int which_error) {
case ERR_GETRUSAGE: return "getrusage() failed";
case ERR_BENCHMARK_FAILED: return "benchmark failed";
case ERR_BAD_HEX_FORMAT: return "hex format key data bad";
- case ERR_GETADDRINFO: return "getaddrinfo() failed";
case ERR_DB_NOT_FOUND: return "no database rows found in lookup/enumerate";
case ERR_DB_NOT_UNIQUE: return "database lookup not unique";
case ERR_DB_CANT_CONNECT: return "can't connect to database";
@@ -529,7 +528,6 @@ const char* boincerror(int which_error) {
case ERR_ABORTED_ON_EXIT: return "job was aborted on client exit";
case ERR_PROC_PARSE: return "a /proc entry was not parsed correctly";
case ERR_PIPE: return "pipe() failed";
- case ERR_NEED_HTTPS: return "HTTPS needed";
case 404: return "HTTP file not found";
case 407: return "HTTP proxy authentication failure";
case 416: return "HTTP range request error";
diff --git a/lib/url.cpp b/lib/url.cpp
index a1a2e35..6b093bf 100644
--- a/lib/url.cpp
+++ b/lib/url.cpp
@@ -290,6 +290,3 @@ void escape_project_url(char *in, char* out) {
}
}
-bool is_https(const char* url) {
- return (strncmp(url, "https://", 8) == 0);
-}
diff --git a/lib/url.h b/lib/url.h
index c687554..32b715b 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -45,6 +45,5 @@ extern void escape_project_url(char *in, char* out);
extern bool valid_master_url(char*);
extern void canonicalize_master_url(char *url, int len);
extern void canonicalize_master_url(std::string&);
-extern bool is_https(const char*);
#endif
diff --git a/lib/util.cpp b/lib/util.cpp
index 66c4f37..5ec56a3 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -413,10 +413,7 @@ int run_program(
);
if (!retval) {
windows_format_error_string(GetLastError(), error_msg, sizeof(error_msg));
- fprintf(stderr,
- "%s: CreateProcess failed: '%s'\n",
- time_to_string(dtime()), error_msg
- );
+ fprintf(stderr, "CreateProcess failed: '%s'\n", error_msg);
return -1; // CreateProcess returns 1 if successful, false if it failed.
}
diff --git a/lib/win_util.cpp b/lib/win_util.cpp
index fe4b15f..1916ce5 100644
--- a/lib/win_util.cpp
+++ b/lib/win_util.cpp
@@ -121,7 +121,7 @@ void chdir_to_data_dir() {
if (lpszExpandedValue) free(lpszExpandedValue);
}
-std::wstring boinc_ascii_to_wide(const std::string& str) {
+std::wstring A2W(const std::string& str) {
int length_wide = MultiByteToWideChar(CP_ACP, 0, str.data(), -1, NULL, 0);
wchar_t *string_wide = static_cast<wchar_t*>(_alloca((length_wide * sizeof(wchar_t)) + sizeof(wchar_t)));
MultiByteToWideChar(CP_ACP, 0, str.data(), -1, string_wide, length_wide);
@@ -129,7 +129,7 @@ std::wstring boinc_ascii_to_wide(const std::string& str) {
return result;
}
-std::string boinc_wide_to_ascii(const std::wstring& str) {
+std::string W2A(const std::wstring& str) {
int length_ansi = WideCharToMultiByte(CP_UTF8, 0, str.data(), -1, NULL, 0, NULL, NULL);
char* string_ansi = static_cast<char*>(_alloca(length_ansi + sizeof(char)));
WideCharToMultiByte(CP_UTF8, 0, str.data(), -1, string_ansi, length_ansi, NULL, NULL);
@@ -158,8 +158,12 @@ char* windows_format_error_string(
);
if (dwRet != 0) {
+ // convert from current character encoding into UTF8
+ std::string encoded_message = W2A(std::wstring(lpszTemp));
+
// include the hex error code as well
- snprintf(pszBuf, iSize, "%S (0x%x)", lpszTemp, dwError);
+ snprintf(pszBuf, iSize, "%s (0x%x)", encoded_message.c_str(), dwError);
+
if (lpszTemp) {
LocalFree((HLOCAL) lpszTemp);
}
diff --git a/lib/win_util.h b/lib/win_util.h
index 4830a8b..5c58f2f 100644
--- a/lib/win_util.h
+++ b/lib/win_util.h
@@ -21,8 +21,8 @@
extern BOOL TerminateProcessById(DWORD dwProcessId);
extern void chdir_to_data_dir();
-extern std::wstring boinc_ascii_to_wide(const std::string& str);
-extern std::string boinc_wide_to_ascii(const std::wstring& str);
+extern std::wstring A2W(const std::string& str);
+extern std::string W2A(const std::wstring& str);
extern char* windows_format_error_string(
unsigned long dwError, char* pszBuf, int iSize
diff --git a/locale/bg/BOINC-Android.po b/locale/bg/BOINC-Android.po
index 24e8fc0..e503d48 100644
--- a/locale/bg/BOINC-Android.po
+++ b/locale/bg/BOINC-Android.po
@@ -14,10 +14,9 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
"Generated-By: Babel 1.0dev\n"
-"X-POOTLE-MTIME: 1379512450.0\n"
#. app global
msgctxt "app_name"
@@ -212,11 +211,11 @@ msgstr ""
msgctxt "attachproject_acctmgr_header_pwd"
msgid "Password:"
-msgstr "Парола:"
+msgstr ""
msgctxt "attachproject_acctmgr_header_pwd_confirm"
msgid "… Retype:"
-msgstr "… Напишете отново:"
+msgstr ""
msgctxt "attachproject_acctmgr_button"
msgid "Add"
@@ -341,10 +340,9 @@ msgid "Synchronize"
msgstr ""
#. main activity
-#, fuzzy
msgctxt "main_noproject_warning"
msgid "Tab here to choose a project."
-msgstr "Етикирайте тук за да изберете проект."
+msgstr ""
msgctxt "main_error"
msgid "Whooops"
diff --git a/locale/ca/BOINC-Setup.mo b/locale/ca/BOINC-Setup.mo
index ba86fb5..85cde98 100644
Binary files a/locale/ca/BOINC-Setup.mo and b/locale/ca/BOINC-Setup.mo differ
diff --git a/locale/da/BOINC-Manager.mo b/locale/da/BOINC-Manager.mo
index 01f5252..82452b8 100644
Binary files a/locale/da/BOINC-Manager.mo and b/locale/da/BOINC-Manager.mo differ
diff --git a/locale/da/BOINC-Manager.po b/locale/da/BOINC-Manager.po
index 62a8049..b5bec6e 100644
--- a/locale/da/BOINC-Manager.po
+++ b/locale/da/BOINC-Manager.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: BOINC Manager 6.x\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2014-08-30 09:57+0000\n"
+"PO-Revision-Date: 2013-11-07 18:12+0000\n"
"Last-Translator: pryds <thomas at pryds.eu>\n"
"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
"Language: da\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-POOTLE-MTIME: 1409392636.0\n"
+"X-POOTLE-MTIME: 1383847933.0\n"
#: AccountInfoPage.cpp:387
#, c-format
@@ -70,7 +70,7 @@ msgstr ""
"Vi kunne ikke opsætte din kontoinformation\n"
"automatisk.\n"
"\n"
-"Klik venligst på linket \"Find loginoplysninger\"\n"
+"Klik venligst på linket 'Find loginoplysninger'\n"
"herunder for at finde ud af, hvad du skal skrive i emailadresse- og\n"
"kodeord-felterne."
@@ -124,7 +124,7 @@ msgstr ""
#: AccountInfoPage.cpp:532
msgid "Account manager web site"
-msgstr "Hjemmeside for kontohåndtering"
+msgstr ""
#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
msgid "Add project"
@@ -172,19 +172,19 @@ msgstr ""
#: AccountManagerInfoPage.cpp:279
msgid "Account manager details:"
-msgstr "Detaljer for kontohåndtering:"
+msgstr ""
#: AccountManagerInfoPage.cpp:283
msgid "Account manager &URL:"
-msgstr "&URL for kontohåndtering:"
+msgstr ""
#: AccountManagerInfoPage.cpp:287
msgid "Open web page"
-msgstr "Åbn hjemmeside"
+msgstr ""
#: AccountManagerInfoPage.cpp:290
msgid "Visit this account manager's web site"
-msgstr "Besøg hjemmesiden for denne kontohåndtering"
+msgstr ""
#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
#, c-format
@@ -197,7 +197,7 @@ msgstr "Kommunikerer med server."
#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
msgid "Please wait..."
-msgstr "Vent venligst …"
+msgstr "Vent venligst…"
#: AccountManagerProcessingPage.cpp:326
msgid "An internal server error has occurred.\n"
@@ -275,7 +275,7 @@ msgstr "Vis diskforbrug"
#: AdvancedFrame.cpp:409
msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "Simpel &visning …\tCtrl+Shift+V"
+msgstr "Simpel &visning…\tCtrl+Shift+V"
#: AdvancedFrame.cpp:410
msgid "Display the simple graphical interface."
@@ -283,7 +283,7 @@ msgstr "Vis den simple grafiske grænseflade."
#: AdvancedFrame.cpp:424
msgid "&Add project or account manager..."
-msgstr "&Tilføj projekt eller kontohåndtering …"
+msgstr "&Tilføj projekt eller kontohåndtering…"
#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
msgid "Volunteer for any or all of 30+ projects in many areas of science"
@@ -299,11 +299,11 @@ msgstr "&Synkronisér med %s"
#: AdvancedFrame.cpp:433
#, c-format
msgid "Get current settings from %s"
-msgstr "Hent nuværende opsætning fra %s"
+msgstr "Hent nuværende indstillinger fra %s"
#: AdvancedFrame.cpp:443
msgid "&Add project..."
-msgstr "Tilføj &projekt …"
+msgstr "Tilføj &projekt…"
#: AdvancedFrame.cpp:444
msgid "Add a project"
@@ -313,7 +313,7 @@ msgstr "Tilføj et projekt"
#, c-format
#, c-format, c-format
msgid "S&top using %s..."
-msgstr "S&top med at bruge %s …"
+msgstr "S&top med at bruge %s…"
#: AdvancedFrame.cpp:453
msgid "Remove this computer from account manager control."
@@ -321,15 +321,15 @@ msgstr "Fjern denne computer fra kontohåndtering."
#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
msgid "&Options..."
-msgstr "&Indstillinger …"
+msgstr "&Indstillinger…"
#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
msgid "Configure display options and proxy settings"
-msgstr "Konfigurér visningsvalgmuligheder og proxy-opsætning"
+msgstr "Konfigurér visningsvalgmuligheder og proxy-indstillinger"
#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
msgid "Computing &preferences..."
-msgstr "&Beregningsindstillinger …"
+msgstr "&Beregningsindstillinger…"
#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
msgid "Configure computing preferences"
@@ -414,11 +414,11 @@ msgstr "Forbind til en anden computer, der kører %s"
#: AdvancedFrame.cpp:569
msgid "Select computer..."
-msgstr "Vælg computer …"
+msgstr "Vælg computer…"
#: AdvancedFrame.cpp:574
msgid "Shut down connected client..."
-msgstr "Stop den forbundne klient …"
+msgstr "Stop den forbundne klient…"
#: AdvancedFrame.cpp:575
msgid "Shut down the currently connected client"
@@ -461,7 +461,7 @@ msgstr "Læs indstillinger fra global_prefs_override.xml."
#: AdvancedFrame.cpp:600
#, c-format
msgid "Launch another instance of %s..."
-msgstr "Kør endnu en instans af %s …"
+msgstr "Kør endnu en instans af %s…"
#: AdvancedFrame.cpp:604
#, c-format
@@ -470,7 +470,7 @@ msgstr "Kør endnu en %s"
#: AdvancedFrame.cpp:614
msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Hændelseslog …\tCtrl+Shift+E"
+msgstr "Hændelseslog\tCtrl+Shift+E"
#: AdvancedFrame.cpp:615
msgid "Display diagnostic messages."
@@ -500,7 +500,7 @@ msgstr "Vis information om %s"
#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
#, c-format
msgid "%s &web site"
-msgstr "%s hjemmeside"
+msgstr ""
#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
#, c-format
@@ -510,7 +510,7 @@ msgstr "Vis information om BOINC og %s"
#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
#, c-format
msgid "&About %s..."
-msgstr "&Om %s …"
+msgstr "&Om %s…"
#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
msgid "Licensing and copyright information."
@@ -544,7 +544,7 @@ msgstr "&Hjælp"
#: AdvancedFrame.cpp:1199
#, c-format
msgid "%s - Stop using %s"
-msgstr "%s – Stop med at bruge %s"
+msgstr "%s - Stop med at bruge %s"
#: AdvancedFrame.cpp:1204
#, c-format
@@ -565,7 +565,7 @@ msgstr ""
#, c-format
#, c-format, c-format
msgid "%s - Shut down the current client..."
-msgstr "%s – Luk den nuværende klient ned …"
+msgstr "%s - Luk den nuværende klient ned…"
#: AdvancedFrame.cpp:1410
#, c-format
@@ -591,7 +591,7 @@ msgstr "%s har tilføjet %s med succes"
#: AdvancedFrame.cpp:1893
#, c-format
msgid "%s - (%s)"
-msgstr "%s – (%s)"
+msgstr "%s - (%s)"
#: AdvancedFrame.cpp:1897
#, c-format
@@ -637,7 +637,7 @@ msgstr ""
#: AsyncRPC.cpp:1031
msgid "Communicating with BOINC client. Please wait ..."
-msgstr "Kommunikerer med BOINC-klienten. Vent venligst …"
+msgstr "Kommunikerer med BOINC-klienten. Vent venligst…"
#: AsyncRPC.cpp:1034
#, c-format
@@ -652,7 +652,7 @@ msgstr "&Afslut %s"
#: AsyncRPC.cpp:1040
#, c-format
msgid "%s - Communication"
-msgstr "%s – Kommunikation"
+msgstr "%s - Kommunikation"
#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
msgid "Cancel"
@@ -661,7 +661,7 @@ msgstr "&Annullér"
#: BOINCBaseFrame.cpp:505
#, c-format
msgid "%s - Connection Error"
-msgstr "%s – Forbindelsesfejl"
+msgstr "%s - Forbindelsesfejl"
#: BOINCBaseFrame.cpp:514
msgid ""
@@ -671,7 +671,7 @@ msgid ""
msgstr ""
"Du er i øjeblikket ikke autoriseret til at styre klienten.\n"
"Kontakt venligst din administrator for at tilføje dig til den lokale "
-"\"boinc_users\" brugergruppe."
+"'boinc_users' brugergruppe."
#: BOINCBaseFrame.cpp:523
msgid ""
@@ -692,7 +692,7 @@ msgstr "Det angivne kodeord er ikke korrekt. Prøv venligst igen."
#: BOINCBaseFrame.cpp:577
#, c-format
msgid "%s - Connection Failed"
-msgstr "%s – Forbindelsen mislykkedes"
+msgstr "%s - Forbindelsen mislykkedes"
#: BOINCBaseFrame.cpp:586
#, c-format
@@ -706,7 +706,7 @@ msgstr ""
#: BOINCBaseFrame.cpp:622
#, c-format
msgid "%s - Daemon Start Failed"
-msgstr "%s – Start af dæmon mislykkedes"
+msgstr "%s - Start af dæmon mislykkedes"
#: BOINCBaseFrame.cpp:632
#, c-format
@@ -731,7 +731,7 @@ msgstr ""
#: BOINCBaseFrame.cpp:689
#, c-format
msgid "%s - Connection Status"
-msgstr "%s – Forbindelsesstatus"
+msgstr "%s - Forbindelsesstatus"
#: BOINCBaseFrame.cpp:700
#, c-format
@@ -742,9 +742,9 @@ msgid ""
"To connect up to your local computer please use 'localhost' as the host name."
msgstr ""
"%s er ikke forbundet til en %s-klient lige nu.\n"
-"Brug \"Avanceret\\Vælg computer …\"-menupunktet for at forbinde til en %"
+"Brug 'Avanceret\\Vælg computer…'-menupunktet for at forbinde til en %"
"s-klient.\n"
-"For at forbinde til din lokale computer, brug \"localhost\" som værtsnavn."
+"For at forbinde til din lokale computer, brug 'localhost' som værtsnavn."
#: BOINCBaseView.cpp:779
msgid "Project web pages"
@@ -753,7 +753,7 @@ msgstr "Projekt-hjemmesider"
#: BOINCClientManager.cpp:575
#, c-format
msgid "%s - Unexpected Exit"
-msgstr "%s – Uventet afslutning"
+msgstr "%s - Uventet afslutning"
#: BOINCClientManager.cpp:585
#, c-format
@@ -768,7 +768,7 @@ msgstr ""
#: BOINCDialupManager.cpp:61
#, c-format
msgid "%s - Network Status"
-msgstr "%s – Netværksstatus"
+msgstr "%s - Netværksstatus"
#: BOINCDialupManager.cpp:241
#, c-format
@@ -833,7 +833,7 @@ msgstr ""
" ikke-administrative brugere\n"
" eller\n"
" - kontakt din administrator for at tilføje dig til brugergruppen\n"
-" \"boinc_master\"."
+" 'boinc_master'."
#: BOINCGUIApp.cpp:345
#, c-format
@@ -847,7 +847,7 @@ msgstr ""
#: BOINCGUIApp.cpp:351
msgid " at "
-msgstr " – "
+msgstr " - "
#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
#: MainDocument.cpp:2554 ViewTransfers.cpp:803
@@ -930,12 +930,12 @@ msgstr "(Brugerdefineret)"
#: BOINCTaskBar.cpp:508
#, c-format
msgid "Open %s Web..."
-msgstr "Åbn %s web …"
+msgstr "Åbn %s web…"
#: BOINCTaskBar.cpp:515
#, c-format
msgid "Open %s..."
-msgstr "Åbn %s …"
+msgstr "Åbn %s…"
#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
msgid "Snooze"
@@ -965,7 +965,7 @@ msgstr "Beregning er slået til"
#: BOINCTaskBar.cpp:717
msgid "Computing is suspended - "
-msgstr "Beregning er suspenderet – "
+msgstr "Beregning er suspenderet - "
#: BOINCTaskBar.cpp:727
msgid "GPU computing is enabled"
@@ -973,7 +973,7 @@ msgstr "GPU-beregning er slået til"
#: BOINCTaskBar.cpp:730
msgid "GPU computing is suspended - "
-msgstr "GPU-beregning er suspenderet – "
+msgstr "GPU-beregning er suspenderet - "
#: BOINCTaskBar.cpp:739
msgid "Network is enabled"
@@ -981,7 +981,7 @@ msgstr "Netværksadgang er slået til"
#: BOINCTaskBar.cpp:742
msgid "Network is suspended - "
-msgstr "Netværksadgang er suspenderet – "
+msgstr "Netværksadgang er suspenderet - "
#: BOINCTaskBar.cpp:750
msgid "Reconnecting to client."
@@ -998,7 +998,7 @@ msgstr "%s-meddelelser"
#: BOINCTaskBar.cpp:811
msgid "There are new notices - click to view."
-msgstr "Der er nye meddelelser – klik for at se."
+msgstr "Der er nye meddelelser - klik for at se."
#: CompletionErrorPage.cpp:199
msgid "Failed to add project"
@@ -1115,7 +1115,7 @@ msgstr "&O.k."
#: DlgAdvPreferences.cpp:544
msgid "invalid number"
-msgstr "ugyldigt tal"
+msgstr ""
#: DlgAdvPreferences.cpp:545
msgid "invalid time, format is HH:MM"
@@ -1141,7 +1141,7 @@ msgstr "Applikationer, der skal tilføjes"
#: DlgAdvPreferences.cpp:914
#, c-format
msgid "'%s' is not an executable application."
-msgstr "\"%s\" er ikke en eksekverbar applikation."
+msgstr "'%s' er ikke en eksekverbar applikation."
#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
#: DlgAdvPreferences.cpp:986
@@ -1159,12 +1159,12 @@ msgstr "Tilføj eksklusiv app"
#: DlgAdvPreferences.cpp:961
#, c-format
msgid "Application names must end with '%s'"
-msgstr "Applikationsnavne skal ende med \"%s\""
+msgstr "Applikationsnavne skal ende med '%s'"
#: DlgAdvPreferences.cpp:985
#, c-format
msgid "'%s' is already in the list."
-msgstr "\"%s\" er allerede på listen"
+msgstr "'%s' er allerede på listen"
#: DlgAdvPreferences.cpp:1077
msgid ""
@@ -1181,7 +1181,7 @@ msgstr "Bekræftelse"
#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
#, c-format
msgid "%s - Preferences"
-msgstr "%s – Indstillinger"
+msgstr "%s - Indstillinger"
#: DlgAdvPreferencesBase.cpp:62
msgid ""
@@ -1191,7 +1191,7 @@ msgid ""
msgstr ""
"Denne dialogboks styrer indstillinger der udelukkende gælder denne computer.\n"
"Klik O.k. for at sætte indstillingerne.\n"
-"Klik på Nulstil for at genskabe den webbaserede opsætning (undtaget for "
+"Klik på Nulstil for at genskabe de web-baserede indstillinger (undtaget for "
"eksklusive apps)."
#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
@@ -1554,7 +1554,7 @@ msgstr "Efterlad applikationer i hukommelsen under suspendering"
#: DlgAdvPreferencesBase.cpp:693
msgid "if checked, suspended work units are left in memory"
-msgstr "markeres dette vil suspenderede arbejdsenheder blive gemt i hukommelsen"
+msgstr "markeres dette vil suspenderede arbejdsenheder blive gemt i hukkomelsen"
#: DlgAdvPreferencesBase.cpp:713
msgid ""
@@ -1563,7 +1563,7 @@ msgstr "Suspendér processor- og netværksforbrug, når disse applikationer kør
#: DlgAdvPreferencesBase.cpp:722
msgid "Add..."
-msgstr "Tilføj …"
+msgstr "Tilføj…"
#: DlgAdvPreferencesBase.cpp:723
msgid "Add an application to this list"
@@ -1585,7 +1585,7 @@ msgstr "For avancerede valgmuligheder, se"
#: DlgEventLog.cpp:219
#, c-format
msgid "%s - Event Log"
-msgstr "%s – Begivenhedslog"
+msgstr "%s - Begivenhedslog"
#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
@@ -1657,7 +1657,7 @@ msgstr "Vis kun beskeder for det valgte projekt"
#: DlgExitMessage.cpp:82
#, c-format
msgid "%s - Exit Confirmation"
-msgstr "%s – Afslutningsbekræftelse"
+msgstr "%s - Afslutningsbekræftelse"
#: DlgExitMessage.cpp:130
#, c-format
@@ -1801,7 +1801,7 @@ msgstr "nej"
#: DlgItemProperties.cpp:237
msgid "Don't request more work"
-msgstr "Forespørg ikke mere arbejde"
+msgstr "Efterspørg ikke mere arbejde"
#: DlgItemProperties.cpp:239
msgid "Scheduler call in progress"
@@ -1969,7 +1969,7 @@ msgstr "Vis afslutningsdialogboksen når manageren lukkes."
#: DlgOptions.cpp:226
msgid "Dial-up and Virtual Private Network settings"
-msgstr "Opsætning for opkald og virtuelle private netværk"
+msgstr "Indstillinger for opkald og virtuelle private netværk"
#: DlgOptions.cpp:240
msgid "&Set Default"
@@ -2063,7 +2063,7 @@ msgstr "aldrig"
#: DlgOptions.cpp:688
#, c-format
msgid "%s - Language Selection"
-msgstr "%s – Sprogvalg"
+msgstr "%s - Sprogvalg"
#: DlgOptions.cpp:695
#, c-format
@@ -2077,7 +2077,7 @@ msgstr ""
#: DlgSelectComputer.cpp:91
#, c-format
msgid "%s - Select Computer"
-msgstr "%s – Vælg computer"
+msgstr "%s - Vælg computer"
#: DlgSelectComputer.cpp:125
#, c-format
@@ -2263,7 +2263,7 @@ msgstr "Mit grid"
#: Localization.cpp:149
msgid "Your statistics and settings"
-msgstr "Dine statistikker og opsætning"
+msgstr "Dine statistikker og indstillinger"
#: Localization.cpp:151
msgid "Device Profiles"
@@ -2271,7 +2271,7 @@ msgstr "Enhedsprofiler"
#: Localization.cpp:153
msgid "Update your device settings"
-msgstr "Opdatér din enhedsopsætning"
+msgstr "Opdatér dine enhedsindstillinger"
#: Localization.cpp:155
msgid "Research"
@@ -2291,7 +2291,7 @@ msgstr "Forbinder til klient"
#: MainDocument.cpp:1195
msgid "Retrieving system state; please wait..."
-msgstr "Henter systemtilstand; vent venligst …"
+msgstr "Henter systemtilstand; vent venligst…"
#: MainDocument.cpp:1816
msgid "Missing application"
@@ -2327,7 +2327,7 @@ msgstr "kører CPU-ydelsesmåling"
#: MainDocument.cpp:2437
msgid "need disk space - check preferences"
-msgstr "behøver diskplads – check indstillinger"
+msgstr "behøver diskplads - check indstillinger"
#: MainDocument.cpp:2438
msgid "computer is not in use"
@@ -2375,7 +2375,7 @@ msgstr "Downloader"
#: MainDocument.cpp:2482 MainDocument.cpp:2552
msgid " (suspended - "
-msgstr "(suspenderet – "
+msgstr "(suspenderet - "
#: MainDocument.cpp:2490
msgid "Project suspended by user"
@@ -2387,12 +2387,12 @@ msgstr "Opgave suspenderet af bruger"
#: MainDocument.cpp:2494
msgid "Suspended - "
-msgstr "Suspenderet – "
+msgstr "Suspenderet - "
# 75%
#: MainDocument.cpp:2500
msgid "GPU suspended - "
-msgstr "GPU suspenderet – "
+msgstr "GPU suspenderet - "
#: MainDocument.cpp:2507
msgid "Waiting for memory"
@@ -2485,7 +2485,7 @@ msgstr "Klar til rapportering"
#: MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
-msgstr "Fejl: Ugydig tilstand \"%d\""
+msgstr "Fejl: Ugydig tilstand '%d'"
#: NoInternetConnectionPage.cpp:179
msgid "No Internet connection"
@@ -2539,7 +2539,7 @@ msgstr "Check emailadresse og kodeord, og prøv igen."
#: NoticeListCtrl.cpp:222
msgid "more..."
-msgstr "mere …"
+msgstr "mere…"
#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
msgid "All"
@@ -2617,7 +2617,7 @@ msgid ""
"Please wait..."
msgstr ""
"Kommunikerer med projekt\n"
-"Vent venligst …"
+"Vent venligst…"
#: ProxyInfoPage.cpp:195
msgid "Network communication failure"
@@ -2639,19 +2639,19 @@ msgid ""
"3) You are using a proxy server.\n"
"Click Next to configure BOINC's proxy settings."
msgstr ""
-"World Community Grid – BOINC software kunne ikke kommunikere\n"
+"World Community Grid - BOINC software kunne ikke kommunikere\n"
"via Internet. De mest almindelige grunde er:\n"
"\n"
"1) Forbindelsesproblem. Check dit netværk eller\n"
"modemforbindelse og klik på Tilbage for at prøve igen.\n"
"\n"
"2) Din personlige firewall blokerer World Community\n"
-"Grid – BOINC software. Konfigurér din personlige firewall til at\n"
+"Grid - BOINC software. Konfigurér din personlige firewall til at\n"
"lade BOINC og BOINC-manageren kommunikere på port 80 og port 443.\n"
"Derefter, klik på Tilbage for at prøve igen.\n"
"\n"
"3) Du bruger en proxy-server.\n"
-"Klik Næste for at konfigurere BOINC's proxy-opsætning."
+"Klik Næste for at konfigurere BOINC's proxy-indstillinger."
#: ProxyInfoPage.cpp:203
msgid ""
@@ -2681,7 +2681,7 @@ msgstr ""
"Derefter, klik på Tilbage for at prøve igen.\n"
"\n"
"3) Du bruger en proxy-server.\n"
-"Klik Næste for at konfigurere BOINC's proxy-opsætning."
+"Klik Næste for at konfigurere BOINC's proxy-indstillinger."
#: ProxyPage.cpp:331
msgid "Proxy configuration"
@@ -2717,7 +2717,7 @@ msgstr "Jeg er enig i brugsvilkårene."
#: TermsOfUsePage.cpp:237
msgid "I do not agree to the terms of use."
-msgstr "Jeg er ikke enig i brugsvilkårene."
+msgstr ""
#: UnavailablePage.cpp:183
msgid "Project temporarily unavailable"
@@ -2799,12 +2799,12 @@ msgstr ""
#: ValidateURL.cpp:104 ValidateURL.cpp:108
#, c-format
msgid "'%s' does not contain a valid host name."
-msgstr "\"%s\" indeholder ikke et gyldigt værtsnavn."
+msgstr "'%s' indeholder ikke et gyldigt værtsnavn."
#: ValidateURL.cpp:111
#, c-format
msgid "'%s' does not contain a valid path."
-msgstr "\"%s\" indeholder ikke en gyldig sti."
+msgstr "'%s' indeholder ikke en gyldig sti."
#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
#: ViewTransfers.cpp:160 ViewWork.cpp:183
@@ -2833,15 +2833,15 @@ msgstr "Beskeder"
#: ViewMessages.cpp:187
msgid "Copying all messages to the clipboard..."
-msgstr "Kopierer alle beskeder til udklipsholderen …"
+msgstr "Kopierer alle beskeder til udklipsholderen…"
#: ViewMessages.cpp:223
msgid "Copying selected messages to the clipboard..."
-msgstr "Kopierer de valgte beskeder til udklipsholderen …"
+msgstr "Kopierer de valgte beskeder til udklipsholderen…"
#: ViewMessages.cpp:286
msgid "Filtering messages..."
-msgstr "Filtrerer beskeder …"
+msgstr "Filtrerer beskeder…"
#: ViewMessages.cpp:494
msgid "Show all messages"
@@ -2853,7 +2853,7 @@ msgstr "Vis beskeder fra alle projekter."
#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
msgid "Fetching notices; please wait..."
-msgstr "Henter meddelelser; vent venligst …"
+msgstr "Henter meddelelser; vent venligst…"
#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
msgid "There are no notices at this time."
@@ -2914,7 +2914,7 @@ msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
msgstr ""
-"Fjerner dette projekt. Igangværende opgaver vil blive tabt (brug \"Opdatér\" "
+"Fjerner dette projekt. Igangværende opgaver vil blive tabt (brug 'Opdatér' "
"først for at rapportere eventuelle færdige opgaver)."
#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
@@ -2948,32 +2948,32 @@ msgstr "Projekter"
#: ViewProjects.cpp:302
msgid "Updating project..."
-msgstr "Opdaterer projekt …"
+msgstr "Opdaterer projekt…"
#: ViewProjects.cpp:344
msgid "Resuming project..."
-msgstr "Genoptager projekt …"
+msgstr "Genoptager projekt…"
#: ViewProjects.cpp:348
msgid "Suspending project..."
-msgstr "Suspenderer projekt …"
+msgstr "Suspenderer projekt…"
#: ViewProjects.cpp:385
msgid "Telling project to allow additional task downloads..."
-msgstr "Tillader projektet at sende flere opgaver …"
+msgstr "Tillader projektet at sende flere opgaver…"
#: ViewProjects.cpp:389
msgid "Telling project to not fetch any additional tasks..."
-msgstr "Beder projektet om ikke at sende flere opgaver …"
+msgstr "Beder projektet om ikke at sende flere opgaver…"
#: ViewProjects.cpp:425
msgid "Resetting project..."
-msgstr "Nulstiller projekt …"
+msgstr "Nulstiller projekt…"
#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
#, c-format
msgid "Are you sure you want to reset project '%s'?"
-msgstr "Er du sikker på, at du vil nulstille projektet \"%s\"?"
+msgstr "Er du sikker på, at du vil nulstille projektet '%s'?"
#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
msgid "Reset Project"
@@ -2981,13 +2981,13 @@ msgstr "Nulstil projekt"
#: ViewProjects.cpp:483
msgid "Removing project..."
-msgstr "Fjerner projekt …"
+msgstr "Fjerner projekt…"
#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
#, c-format
#, c-format, c-format
msgid "Are you sure you want to remove project '%s'?"
-msgstr "Er du sikker på, at du vil fjerne projektet \"%s\"?"
+msgstr "Er du sikker på, at du vil fjerne projektet '%s'?"
#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
msgid "Remove Project"
@@ -2995,7 +2995,7 @@ msgstr "Fjern projekt"
#: ViewProjects.cpp:543 ViewWork.cpp:599
msgid "Launching browser..."
-msgstr "Starter browser …"
+msgstr "Starter browser…"
#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
msgid "Resume tasks for this project."
@@ -3055,7 +3055,7 @@ msgstr "Henter ikke nye opgaver"
#: ViewProjects.cpp:1085
msgid "Project ended - OK to remove"
-msgstr "Projektet er slut – det er OK af fjerne"
+msgstr "Projektet er slut - det er OK af fjerne"
#: ViewProjects.cpp:1088
msgid "Will remove when tasks done"
@@ -3235,7 +3235,7 @@ msgstr "Statistik"
#: ViewStatistics.cpp:2230 ViewStatistics.cpp:2251 ViewStatistics.cpp:2272
#: ViewStatistics.cpp:2296
msgid "Updating charts..."
-msgstr "Opdaterer grafer …"
+msgstr "Opdaterer grafer…"
#: ViewStatistics.cpp:2420
msgid "Show project list"
@@ -3287,7 +3287,7 @@ msgstr "Overførsler"
#: ViewTransfers.cpp:280
msgid "Network activity is suspended - "
-msgstr "Netværksaktivitet er suspenderet – "
+msgstr "Netværksaktivitet er suspenderet - "
#: ViewTransfers.cpp:282
msgid ""
@@ -3303,11 +3303,11 @@ msgstr "BOINC"
#: ViewTransfers.cpp:292
msgid "Retrying transfer now..."
-msgstr "Prøver overførsel igen nu …"
+msgstr "Prøver overførsel igen nu…"
#: ViewTransfers.cpp:330
msgid "Aborting transfer..."
-msgstr "Afbryder overførsel …"
+msgstr "Afbryder overførsel…"
#: ViewTransfers.cpp:343
#, c-format
@@ -3316,7 +3316,7 @@ msgid ""
"NOTE: Aborting a transfer will invalidate a task and you\n"
"will not receive credit for it."
msgstr ""
-"Er du sikker på du vil afbryde denne filoverførsel \"%s\"?\n"
+"Er du sikker på du vil afbryde denne filoverførsel '%s'?\n"
"BEMÆRK: Hvis du afbryder en overførsel, vil opgaven\n"
"invalideres, og du vil ikke få points for den."
@@ -3414,19 +3414,19 @@ msgstr "Opgaver"
#: ViewWork.cpp:357
msgid "Resuming task..."
-msgstr "Genoptager opgave …"
+msgstr "Genoptager opgave…"
#: ViewWork.cpp:360
msgid "Suspending task..."
-msgstr "Suspenderer opgave …"
+msgstr "Suspenderer opgave…"
#: ViewWork.cpp:389
msgid "Showing graphics for task..."
-msgstr "Viser grafik for opgave …"
+msgstr "Viser grafik for opgave…"
#: ViewWork.cpp:426
msgid "Showing VM console for task..."
-msgstr "Viser VM-konsol for opgave …"
+msgstr "Viser VM-konsol for opgave…"
#: ViewWork.cpp:479
#, c-format
@@ -3434,7 +3434,7 @@ msgid ""
"Are you sure you want to abort this task '%s'?\n"
"(Progress: %s, Status: %s)"
msgstr ""
-"Er du sikker på, at du vil afbryde denne opgave \"%s\"?\n"
+"Er du sikker på, at du vil afbryde denne opgave '%s'?\n"
"(Udført: %s, Status: %s)"
#: ViewWork.cpp:485
@@ -3449,7 +3449,7 @@ msgstr "Afbryd opgave"
# 75%
#: ViewWork.cpp:499
msgid "Aborting task..."
-msgstr "Afbryder opgave …"
+msgstr "Afbryder opgave…"
#: ViewWork.cpp:771
msgid "Show all tasks"
@@ -3564,7 +3564,7 @@ msgstr "Spørgsmål"
#: sg_BoincSimpleFrame.cpp:149
msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Avanceret visning …\tCtrl+Shift+A"
+msgstr "Avanceret visning…\tCtrl+Shift+A"
#: sg_BoincSimpleFrame.cpp:150
msgid "Display the advanced graphical interface."
@@ -3606,7 +3606,7 @@ msgstr "Luk"
#: sg_DlgMessages.cpp:389
#, c-format
msgid "%s - Notices"
-msgstr "%s – Meddelelser"
+msgstr "%s - Meddelelser"
#: sg_DlgPreferences.cpp:268
msgid "This dialog controls preferences for this computer only."
@@ -3620,15 +3620,11 @@ msgstr "Klik O.k. for at sætte indstillinger."
msgid ""
"Click Clear to restore web-based settings for all preferences listed below."
msgstr ""
-"Klik Nulstil for at genskabe den webbaserede opsætning for alle "
-"indstillinger herunder."
#: sg_DlgPreferences.cpp:285
msgid ""
"For additional settings, select Computing Preferences in the Advanced View."
msgstr ""
-"For yderligere opsætning, vælg Beregningsindstillinger under Avanceret "
-"visning."
#: sg_DlgPreferences.cpp:313
msgid "Do work only between:"
@@ -3660,7 +3656,7 @@ msgstr "Udfør arbejde efter computeren har været ubrugt i:"
#: sg_DlgPreferences.cpp:429
msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Nulstil alle lokale indstillinger herover og luk dialogboksen"
+msgstr ""
#: sg_DlgPreferences.cpp:602 sg_DlgPreferences.cpp:605
#: sg_DlgPreferences.cpp:681 sg_DlgPreferences.cpp:685
@@ -3769,7 +3765,7 @@ msgstr "Projektkommandoer"
#: sg_ProjectPanel.cpp:267
#, c-format
msgid "Pop up a menu of web sites for project %s"
-msgstr "Vis en pop op-menu med hjemmesider for projektet %s"
+msgstr ""
#: sg_ProjectPanel.cpp:269
#, c-format
@@ -3791,7 +3787,7 @@ msgid ""
"Are you sure you want to abort this task '%s'?\n"
"(Progress: %.1lf%%, Status: %s)"
msgstr ""
-"Er du sikker på, at du vil afbryde denne opgave \"%s\"?\n"
+"Er du sikker på, at du vil afbryde denne opgave '%s'?\n"
"(Udført: %.1lf%%, Status: %s)"
#: sg_TaskPanel.cpp:464
@@ -3924,7 +3920,7 @@ msgstr "&Afslut"
#: mac/Mac_GUI.cpp:110
msgid "Preferences…"
-msgstr "Indstillinger …"
+msgstr "Indstillinger…"
#: mac/Mac_GUI.cpp:122
msgid "Services"
diff --git a/locale/da/BOINC-Setup.mo b/locale/da/BOINC-Setup.mo
index 966325a..a001ec4 100644
Binary files a/locale/da/BOINC-Setup.mo and b/locale/da/BOINC-Setup.mo differ
diff --git a/locale/da/BOINC-Setup.po b/locale/da/BOINC-Setup.po
index dffef92..a3a3fce 100644
--- a/locale/da/BOINC-Setup.po
+++ b/locale/da/BOINC-Setup.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2014-08-29 15:04+0000\n"
+"PO-Revision-Date: 2013-10-07 20:03+0000\n"
"Last-Translator: pryds <thomas at pryds.eu>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: da\n"
@@ -15,17 +15,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Poedit 1.5.5\n"
"X-Poedit-SearchPath-0: mac_installer\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1409324665.0\n"
+"X-POOTLE-MTIME: 1381176195.0\n"
"X-Poedit-KeywordsList: _\n"
#: Installer.cpp:124
#, c-format
msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr "Desværre, denne version af %s kræver system 10.5 eller nyere."
+msgstr ""
#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
msgid "Yes"
@@ -105,8 +105,6 @@ msgid ""
"Do you also want to remove VirtualBox from your computer?\n"
"(VirtualBox was installed along with BOINC.)"
msgstr ""
-"Vil du også fjerne VirtualBox fra din computer?\n"
-"(VirtualBox blev installeret sammen med BOINC.)"
#: uninstall.cpp:312
#, c-format
@@ -144,7 +142,7 @@ msgstr "Annuller"
#: uninstall.cpp:1617
msgid "Continue..."
-msgstr "Fortsæt …"
+msgstr "Fortsæt..."
#, c-format
#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
diff --git a/locale/da/BOINC-Web.mo b/locale/da/BOINC-Web.mo
index 1a50d3d..62930f5 100644
Binary files a/locale/da/BOINC-Web.mo and b/locale/da/BOINC-Web.mo differ
diff --git a/locale/da/BOINC-Web.po b/locale/da/BOINC-Web.po
index 6e746a5..0b20737 100644
--- a/locale/da/BOINC-Web.po
+++ b/locale/da/BOINC-Web.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: BOINC Web 6.x\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-08-29 14:53+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"PO-Revision-Date: 2013-11-07 18:18+0000\n"
+"Last-Translator: pryds <thomas at pryds.eu>\n"
"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
"Language: da\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-0: doc\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1409324007.0\n"
+"X-POOTLE-MTIME: 1383848313.0\n"
"X-Poedit-KeywordsList: tra\n"
#: docutil.php:21
@@ -47,9 +47,8 @@ msgid "Learn more about VirtualBox."
msgstr ""
#: download.php:51
-#, fuzzy
msgid "Download BOINC + VirtualBox"
-msgstr "Download BOINC + Virtualbox"
+msgstr ""
#: download.php:54 download.php:69
#, php-format
@@ -402,7 +401,7 @@ msgstr "BOINC har base på The University of California, Berkeley"
#: projects.inc:14
msgid "Distributed sensing"
-msgstr "Distribueret føling"
+msgstr ""
#: projects.inc:19
msgid "Stanford University"
diff --git a/locale/hu/BOINC-Android.po b/locale/hu/BOINC-Android.po
index ec2d683..5ac8c3a 100644
--- a/locale/hu/BOINC-Android.po
+++ b/locale/hu/BOINC-Android.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2013-10-18 00:00-0700\n"
-"PO-Revision-Date: 2014-07-12 10:42+0000\n"
+"PO-Revision-Date: 2014-02-22 14:58+0000\n"
"Last-Translator: Gabor <csega at mailbox.hu>\n"
"Language-Team: hu <LL at li.org>\n"
"Language: hu\n"
@@ -17,7 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n !=1);\n"
"X-Generator: Pootle 2.5.0\n"
"Generated-By: Babel 1.0dev\n"
-"X-POOTLE-MTIME: 1405161756.0\n"
+"X-POOTLE-MTIME: 1393081112.0\n"
#. app global
msgctxt "app_name"
@@ -139,11 +139,10 @@ msgstr "A részvételhez hozzon létre egy fiókot:"
msgctxt "attachproject_login_header_creation_client_disabled"
msgid "Visit project website to create an account:"
msgstr ""
-"Látogassa meg a projekt weboldalát egy felhasználói fiók létrehozásához:"
msgctxt "attachproject_login_header_creation_disabled"
msgid "Project does currently now allow creation of new accounts!"
-msgstr "A projekt jelenleg engedélyezi az új felhasználói fiókok létrehozását!"
+msgstr ""
msgctxt "attachproject_login_button_registration"
msgid "Register"
@@ -157,18 +156,19 @@ msgctxt "attachproject_login_button_forgotpw"
msgid "Forgot Password"
msgstr "Elfelejtett jelszó"
+#, fuzzy
msgctxt "attachproject_login_error_toast"
msgid "Contacting project failed!"
-msgstr "A kapcsolódás a projekthez sikertelen!"
+msgstr "Kapcsolódás a projekt szerverhez..."
msgctxt "attachproject_login_attached"
msgid "Attached"
-msgstr "Csatolva"
+msgstr ""
#. project registration
msgctxt "attachproject_registration_header"
msgid "Account registration for"
-msgstr "Felhsználói fiók regsiztrálása"
+msgstr ""
msgctxt "attachproject_registration_header_url"
msgid "Project:"
@@ -192,7 +192,7 @@ msgstr "Jelszó:"
msgctxt "attachproject_registration_header_pwd_confirm"
msgid "… Retype:"
-msgstr "...Írja be újra:"
+msgstr ""
msgctxt "attachproject_registration_button"
msgid "Create"
@@ -217,7 +217,7 @@ msgstr "Jelszó:"
msgctxt "attachproject_acctmgr_header_pwd_confirm"
msgid "… Retype:"
-msgstr "...Írja be újra:"
+msgstr ""
msgctxt "attachproject_acctmgr_button"
msgid "Add"
@@ -226,7 +226,7 @@ msgstr "Hozzáad"
#. error strings
msgctxt "attachproject_error_wrong_name"
msgid "User not found"
-msgstr "A felhasználó nem található"
+msgstr ""
msgctxt "attachproject_error_short_pwd"
msgid "Password too short"
@@ -242,7 +242,7 @@ msgstr "A jelszavak nem egyeznek"
msgctxt "attachproject_error_no_url"
msgid "Please enter URL"
-msgstr "Kérjük, adja meg az URL címet"
+msgstr ""
msgctxt "attachproject_error_no_email"
msgid "Please enter eMail address"
diff --git a/locale/it_IT/BOINC-Manager.mo b/locale/it_IT/BOINC-Manager.mo
index a866da6..65d26f8 100644
Binary files a/locale/it_IT/BOINC-Manager.mo and b/locale/it_IT/BOINC-Manager.mo differ
diff --git a/locale/it_IT/BOINC-Manager.po b/locale/it_IT/BOINC-Manager.po
index 75b9af6..1649566 100644
--- a/locale/it_IT/BOINC-Manager.po
+++ b/locale/it_IT/BOINC-Manager.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC Manager 6.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2014-06-27 14:52+0000\n"
+"POT-Creation-Date: 2013-10-15 22:26-0700\n"
+"PO-Revision-Date: 2013-11-07 08:16+0000\n"
"Last-Translator: Gianfranco <costamagnagianfranco at yahoo.it>\n"
"Language-Team: BOINC.Italy team <contact at boincitaly.org>\n"
"Language: it_IT\n"
@@ -16,14 +16,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.0\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-1: clientgui/msw\n"
"X-Poedit-SearchPath-2: clientgui/gtk\n"
"X-Poedit-SearchPath-3: clientgui/mac\n"
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-POOTLE-MTIME: 1403880735.0\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
+"X-POOTLE-MTIME: 1383812210.0\n"
# 81%
#: AccountInfoPage.cpp:387
@@ -79,11 +79,11 @@ msgstr ""
msgid "Find login information"
msgstr "Recupera le informazioni di accesso"
-#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:642
msgid "&Password:"
msgstr "&Password:"
-#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:666
msgid "Choose a &password:"
msgstr "Scegli una &password:"
@@ -124,7 +124,7 @@ msgstr ""
"per registrarti o per recuperare la password dimenticata."
#: AccountInfoPage.cpp:532
-msgid "Account manager web site"
+msgid "Account manager website"
msgstr "Sito web dell'account manager"
#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
@@ -152,18 +152,18 @@ msgstr "Inserire il proprio indirizzo email."
msgid "Please enter a password of at least %d characters."
msgstr "Per favore inserisci una password di almeno %d caratteri."
-#: AccountInfoPage.cpp:607
+#: AccountInfoPage.cpp:608
msgid ""
"The password and confirmation password do not match. Please type them again."
msgstr ""
"La password e la password di conferma non corrispondono. Prova a scriverle "
"di nuovo."
-#: AccountManagerInfoPage.cpp:272
+#: AccountManagerInfoPage.cpp:248
msgid "Choose an account manager"
msgstr "Scegli un account manager"
-#: AccountManagerInfoPage.cpp:275
+#: AccountManagerInfoPage.cpp:251
msgid ""
"To choose an account manager, click its name or \n"
"type its URL below."
@@ -171,36 +171,24 @@ msgstr ""
"Per selezionare un account manager, clicca sul suo nome o \n"
"digita il suo indirizzo (URL) in basso."
-#: AccountManagerInfoPage.cpp:279
-msgid "Account manager details:"
-msgstr "Sito web dell'account manager:"
-
-#: AccountManagerInfoPage.cpp:283
-msgid "Account manager &URL:"
-msgstr "&URL dell'account manager:"
-
-#: AccountManagerInfoPage.cpp:287
-msgid "Open web page"
-msgstr "Apri la pagina web"
+#: AccountManagerInfoPage.cpp:254
+msgid "Account Manager &URL:"
+msgstr "&URL dell'Account Manager:"
-#: AccountManagerInfoPage.cpp:290
-msgid "Visit this account manager's web site"
-msgstr "Visita il sito web del gestore account"
-
-#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
+#: AccountManagerProcessingPage.cpp:188 AccountManagerPropertiesPage.cpp:194
#, c-format
msgid "Communicating with %s."
msgstr "In comunicazione con %s."
-#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
+#: AccountManagerProcessingPage.cpp:195 AccountManagerPropertiesPage.cpp:201
msgid "Communicating with server."
msgstr "In comunicazione con il server."
-#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
+#: AccountManagerProcessingPage.cpp:200 AccountManagerPropertiesPage.cpp:206
msgid "Please wait..."
msgstr "Si prega di attendere..."
-#: AccountManagerProcessingPage.cpp:326
+#: AccountManagerProcessingPage.cpp:327
msgid "An internal server error has occurred.\n"
msgstr "Si è verificato un errore interno del server.\n"
@@ -212,343 +200,343 @@ msgstr "Connesso"
msgid "Disconnected"
msgstr "Disconnesso"
-#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
+#: AdvancedFrame.cpp:315 sg_BoincSimpleFrame.cpp:112 sg_BoincSimpleGUI.cpp:103
#, c-format
msgid "Close the %s window"
msgstr "Chiudi la finestra di %s"
-#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
+#: AdvancedFrame.cpp:318 sg_BoincSimpleFrame.cpp:115 sg_BoincSimpleGUI.cpp:106
msgid "&Close Window"
msgstr "&Chiudi finestra"
-#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
+#: AdvancedFrame.cpp:329 AdvancedFrame.cpp:336 AdvancedFrame.cpp:343
#, c-format
msgid "Exit %s"
msgstr "Esci da %s"
-#: AdvancedFrame.cpp:371
+#: AdvancedFrame.cpp:358
msgid "&Notices\tCtrl+Shift+N"
msgstr "&Avvisi\tCtrl+Shift+N"
-#: AdvancedFrame.cpp:372
+#: AdvancedFrame.cpp:359
msgid "Display notices"
msgstr "Visualizza avvisi"
-#: AdvancedFrame.cpp:377
+#: AdvancedFrame.cpp:364
msgid "&Projects\tCtrl+Shift+P"
msgstr "&Progetti\tCtrl+Shift+P"
-#: AdvancedFrame.cpp:378
+#: AdvancedFrame.cpp:365
msgid "Display projects"
msgstr "Visualizza i progetti"
-#: AdvancedFrame.cpp:383
+#: AdvancedFrame.cpp:370
msgid "&Tasks\tCtrl+Shift+T"
msgstr "&Elaborazioni\tCtrl+Shift+T"
-#: AdvancedFrame.cpp:384
+#: AdvancedFrame.cpp:371
msgid "Display tasks"
msgstr "Visualizza le elaborazioni"
-#: AdvancedFrame.cpp:389
+#: AdvancedFrame.cpp:376
msgid "Trans&fers\tCtrl+Shift+X"
msgstr "Tras&ferimenti\tCtrl+Shift+X"
-#: AdvancedFrame.cpp:390
+#: AdvancedFrame.cpp:377
msgid "Display transfers"
msgstr "Visualizza i trasferimenti"
-#: AdvancedFrame.cpp:395
+#: AdvancedFrame.cpp:382
msgid "&Statistics\tCtrl+Shift+S"
msgstr "&Statistiche\tCtrl+Shift+S"
-#: AdvancedFrame.cpp:396
+#: AdvancedFrame.cpp:383
msgid "Display statistics"
msgstr "Visualizza le statistiche"
-#: AdvancedFrame.cpp:401
+#: AdvancedFrame.cpp:388
msgid "&Disk usage\tCtrl+Shift+D"
msgstr "Utilizzo del &disco\tCtrl+Shift+D"
-#: AdvancedFrame.cpp:402
+#: AdvancedFrame.cpp:389
msgid "Display disk usage"
msgstr "Visualizza l'utilizzo del disco"
-#: AdvancedFrame.cpp:409
+#: AdvancedFrame.cpp:396
msgid "Simple &View...\tCtrl+Shift+V"
msgstr "&Visualizzazione Semplice...\tCtrl+Shift+V"
-#: AdvancedFrame.cpp:410
+#: AdvancedFrame.cpp:397
msgid "Display the simple graphical interface."
msgstr "Visualizza l'interfaccia grafica semplice di BOINC"
-#: AdvancedFrame.cpp:424
+#: AdvancedFrame.cpp:411
msgid "&Add project or account manager..."
msgstr "Connessione ad un &progetto o ad un account manager..."
-#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
+#: AdvancedFrame.cpp:412 sg_ProjectPanel.cpp:76 sg_ProjectsComponent.cpp:106
msgid "Volunteer for any or all of 30+ projects in many areas of science"
msgstr ""
"Diventa un volontario di uno o di tutti gli oltre 30 progetti nelle varie "
"aree scientifiche"
-#: AdvancedFrame.cpp:429
+#: AdvancedFrame.cpp:416
#, c-format
msgid "&Synchronize with %s"
msgstr "&Sincronizza con %s"
-#: AdvancedFrame.cpp:433
+#: AdvancedFrame.cpp:420
#, c-format
msgid "Get current settings from %s"
msgstr "Preleva le impostazioni correnti da %s"
-#: AdvancedFrame.cpp:443
+#: AdvancedFrame.cpp:430
msgid "&Add project..."
msgstr "&Connessione ad un progetto..."
-#: AdvancedFrame.cpp:444
+#: AdvancedFrame.cpp:431
msgid "Add a project"
msgstr "Connessione ad un progetto"
-#: AdvancedFrame.cpp:447
+#: AdvancedFrame.cpp:434
#, c-format
msgid "S&top using %s..."
msgstr "&Smetti di utilizzare %s..."
-#: AdvancedFrame.cpp:453
+#: AdvancedFrame.cpp:440
msgid "Remove this computer from account manager control."
msgstr "Rimuovi questo computer dal controllo dell'account manager."
-#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
+#: AdvancedFrame.cpp:445 sg_BoincSimpleFrame.cpp:165
msgid "&Options..."
msgstr "&Opzioni..."
-#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
+#: AdvancedFrame.cpp:446 sg_BoincSimpleFrame.cpp:166
msgid "Configure display options and proxy settings"
msgstr "Configura le opzioni dell'interfaccia grafica e del proxy"
-#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
+#: AdvancedFrame.cpp:450 sg_BoincSimpleFrame.cpp:159
msgid "Computing &preferences..."
msgstr "&Preferenze di elaborazione..."
-#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
+#: AdvancedFrame.cpp:451 sg_BoincSimpleFrame.cpp:160
msgid "Configure computing preferences"
msgstr "Configura le preferenze locali di elaborazione"
-#: AdvancedFrame.cpp:472
+#: AdvancedFrame.cpp:459
msgid "&Run always"
msgstr "Elabo&razione continua"
-#: AdvancedFrame.cpp:473
+#: AdvancedFrame.cpp:460
msgid "Allow work regardless of preferences"
msgstr "Elabora senza interruzioni e indipendentemente dalle preferenze"
-#: AdvancedFrame.cpp:477
+#: AdvancedFrame.cpp:464
msgid "Run based on &preferences"
msgstr "Elaborazione secondo le &preferenze"
-#: AdvancedFrame.cpp:478
+#: AdvancedFrame.cpp:465
msgid "Allow work according to preferences"
msgstr "Consenti l'invio di lavoro secondo le preferenze"
-#: AdvancedFrame.cpp:482
+#: AdvancedFrame.cpp:469
msgid "&Suspend"
msgstr "&Sospendi"
-#: AdvancedFrame.cpp:483
+#: AdvancedFrame.cpp:470
msgid "Stop work regardless of preferences"
msgstr "Sospendi l'elaborazione indipendentemente dalle preferenze"
-#: AdvancedFrame.cpp:508
+#: AdvancedFrame.cpp:495
msgid "Use GPU always"
msgstr "E&laborazione GPU continua"
-#: AdvancedFrame.cpp:509
+#: AdvancedFrame.cpp:496
msgid "Allow GPU work regardless of preferences"
msgstr ""
"Elabora con la GPU senza interruzioni e indipendentemente dalle preferenze"
-#: AdvancedFrame.cpp:513
+#: AdvancedFrame.cpp:500
msgid "Use GPU based on preferences"
msgstr "Ela&borazione GPU secondo le preferenze"
-#: AdvancedFrame.cpp:514
+#: AdvancedFrame.cpp:501
msgid "Allow GPU work according to preferences"
msgstr "consenti l'invio di lavoro per la GPU secondo le preferenze"
-#: AdvancedFrame.cpp:518
+#: AdvancedFrame.cpp:505
msgid "Suspend GPU"
msgstr "Sospendi l'uso della GPU"
-#: AdvancedFrame.cpp:519
+#: AdvancedFrame.cpp:506
msgid "Stop GPU work regardless of preferences"
msgstr "Sospendi l'elaborazione della GPU indipendentemente dalle preferenze"
-#: AdvancedFrame.cpp:543
+#: AdvancedFrame.cpp:530
msgid "Network activity always available"
msgstr "Attività di rete sempre disponibile"
-#: AdvancedFrame.cpp:544
+#: AdvancedFrame.cpp:531
msgid "Allow network activity regardless of preferences"
msgstr ""
"Permetti l'attività di rete senza interruzioni e indipendentemente dalle "
"preferenze"
-#: AdvancedFrame.cpp:548
+#: AdvancedFrame.cpp:535
msgid "Network activity based on preferences"
msgstr "Attività di rete secondo le pr&eferenze"
-#: AdvancedFrame.cpp:549
+#: AdvancedFrame.cpp:536
msgid "Allow network activity according to preferences"
msgstr "Permetti l'attività di rete secondo le preferenze"
-#: AdvancedFrame.cpp:553
+#: AdvancedFrame.cpp:540
msgid "Network activity suspended"
msgstr "Attività di rete s&ospesa"
-#: AdvancedFrame.cpp:554
+#: AdvancedFrame.cpp:541
msgid "Stop BOINC network activity"
msgstr "Sospendi l'attività di rete indipendentemente dalle preferenze"
-#: AdvancedFrame.cpp:564
+#: AdvancedFrame.cpp:551
#, c-format
msgid "Connect to another computer running %s"
msgstr "Stabilisce una connessione ad un altro computer in cui è attivo %s"
-#: AdvancedFrame.cpp:569
+#: AdvancedFrame.cpp:556
msgid "Select computer..."
msgstr "Seleziona un computer..."
-#: AdvancedFrame.cpp:574
+#: AdvancedFrame.cpp:561
msgid "Shut down connected client..."
msgstr "Arresta il client attualmente connesso..."
-#: AdvancedFrame.cpp:575
+#: AdvancedFrame.cpp:562
msgid "Shut down the currently connected client"
msgstr "Arresta tutte le elaborazioni in corso"
-#: AdvancedFrame.cpp:579
+#: AdvancedFrame.cpp:566
msgid "Run CPU &benchmarks"
msgstr "Esegui i &benchmark per la CPU"
-#: AdvancedFrame.cpp:580
+#: AdvancedFrame.cpp:567
msgid "Runs BOINC CPU benchmarks"
msgstr "Esegue i benchmark di BOINC per la CPU"
-#: AdvancedFrame.cpp:584
+#: AdvancedFrame.cpp:571
msgid "Do network communication"
msgstr "Ritenta le &comunicazioni di rete"
-#: AdvancedFrame.cpp:585
+#: AdvancedFrame.cpp:572
msgid "Do all pending network communication"
msgstr "Ritenta tutte le comunicazioni di rete rinviate"
# 94%
-#: AdvancedFrame.cpp:589
+#: AdvancedFrame.cpp:576
msgid "Read config files"
msgstr "Leggi i file di configurazione"
-#: AdvancedFrame.cpp:590
+#: AdvancedFrame.cpp:577
msgid "Read configuration info from cc_config.xml and any app_config.xml files"
msgstr ""
"Leggi la configurazione dal file cc_config.xml e dai file app_config.xml"
-#: AdvancedFrame.cpp:594
+#: AdvancedFrame.cpp:581
msgid "Read local prefs file"
msgstr "Leggi il file delle preferenze locali"
-#: AdvancedFrame.cpp:595
+#: AdvancedFrame.cpp:582
msgid "Read preferences from global_prefs_override.xml."
msgstr "Leggi le preferenze dal file global_prefs_override.xml"
-#: AdvancedFrame.cpp:600
+#: AdvancedFrame.cpp:587
#, c-format
msgid "Launch another instance of %s..."
msgstr "Avvio delle altre istanze di %s..."
-#: AdvancedFrame.cpp:604
+#: AdvancedFrame.cpp:591
#, c-format
msgid "Launch another %s"
msgstr "Avvio di un altro %s"
-#: AdvancedFrame.cpp:614
+#: AdvancedFrame.cpp:601
msgid "Event Log...\tCtrl+Shift+E"
msgstr "Lista degli eventi...\t Ctrl+Shift+E"
-#: AdvancedFrame.cpp:615
+#: AdvancedFrame.cpp:602
msgid "Display diagnostic messages."
msgstr "Visualizza i messaggi di diagnostica del client."
-#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
+#: AdvancedFrame.cpp:612 sg_BoincSimpleFrame.cpp:175 sg_BoincSimpleGUI.cpp:129
#, c-format
msgid "%s &help"
msgstr "&Aiuto su %s"
-#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
+#: AdvancedFrame.cpp:618 sg_BoincSimpleFrame.cpp:181 sg_BoincSimpleGUI.cpp:135
#, c-format
msgid "Show information about %s"
msgstr "Mostra le informazioni su %s"
-#: AdvancedFrame.cpp:643
+#: AdvancedFrame.cpp:630
#, c-format
msgid "&%s help"
msgstr "Aiuto sul &%s"
-#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
+#: AdvancedFrame.cpp:636 sg_BoincSimpleFrame.cpp:199 sg_BoincSimpleGUI.cpp:153
#, c-format
msgid "Show information about the %s"
msgstr "Mostra le informazioni sul %s"
-#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
+#: AdvancedFrame.cpp:648 sg_BoincSimpleFrame.cpp:211 sg_BoincSimpleGUI.cpp:165
#, c-format
-msgid "%s &web site"
-msgstr "sito &web di %s"
+msgid "%s &website"
+msgstr "Sito &web di %s"
-#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
+#: AdvancedFrame.cpp:654 sg_BoincSimpleFrame.cpp:217 sg_BoincSimpleGUI.cpp:171
#, c-format
msgid "Show information about BOINC and %s"
msgstr "Mostra le informazioni su BOINC e sul %s"
-#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
+#: AdvancedFrame.cpp:666 BOINCTaskBar.cpp:533 sg_BoincSimpleFrame.cpp:229
#, c-format
msgid "&About %s..."
msgstr "&Informazioni sul %s..."
-#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
+#: AdvancedFrame.cpp:672 sg_BoincSimpleFrame.cpp:235
msgid "Licensing and copyright information."
msgstr "Mostra le informazioni sulla licenza e sul copyright"
-#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
+#: AdvancedFrame.cpp:679 sg_BoincSimpleFrame.cpp:242 sg_BoincSimpleGUI.cpp:194
msgid "&File"
msgstr "&File"
-#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
+#: AdvancedFrame.cpp:683 sg_BoincSimpleFrame.cpp:246 sg_BoincSimpleGUI.cpp:199
msgid "&View"
msgstr "&Visualizza"
-#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
+#: AdvancedFrame.cpp:687 sg_BoincSimpleFrame.cpp:250
msgid "&Tools"
msgstr "&Strumenti"
-#: AdvancedFrame.cpp:704
+#: AdvancedFrame.cpp:691
msgid "&Activity"
msgstr "&Attività"
-#: AdvancedFrame.cpp:708
+#: AdvancedFrame.cpp:695
msgid "A&dvanced"
msgstr "Ava&nzate"
-#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
-#: wizardex.cpp:374 wizardex.cpp:381
+#: AdvancedFrame.cpp:699 DlgEventLog.cpp:329 sg_BoincSimpleFrame.cpp:254
+#: sg_BoincSimpleGUI.cpp:184 wizardex.cpp:374 wizardex.cpp:381
msgid "&Help"
msgstr "A&iuto"
-#: AdvancedFrame.cpp:1199
+#: AdvancedFrame.cpp:1178
#, c-format
msgid "%s - Stop using %s"
msgstr "%s - Arresto nell'uso di %s"
-#: AdvancedFrame.cpp:1204
+#: AdvancedFrame.cpp:1183
#, c-format
msgid ""
"If you stop using %s,\n"
@@ -563,12 +551,12 @@ msgstr ""
"\n"
"Vuoi finire di usare %s?"
-#: AdvancedFrame.cpp:1401
+#: AdvancedFrame.cpp:1381
#, c-format
msgid "%s - Shut down the current client..."
msgstr "%s - Chiudi il client corrente..."
-#: AdvancedFrame.cpp:1410
+#: AdvancedFrame.cpp:1390
#, c-format
msgid ""
"%s will shut down the current client\n"
@@ -577,27 +565,27 @@ msgstr ""
"%s chiuderà il client attualmente connesso,\n"
"e ti chiederà di indicarne un altro a cui connettersi."
-#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
+#: AdvancedFrame.cpp:1709 DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: AdvancedFrame.cpp:1754
+#: AdvancedFrame.cpp:1718
#, c-format
msgid "%s has successfully added %s"
msgstr "%s ha aggiunto con successo %s"
-#: AdvancedFrame.cpp:1893
+#: AdvancedFrame.cpp:1860
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: AdvancedFrame.cpp:1897
+#: AdvancedFrame.cpp:1864
#, c-format
msgid "Connecting to %s"
msgstr "Connessione a %s in corso"
-#: AdvancedFrame.cpp:1900
+#: AdvancedFrame.cpp:1867
#, c-format
msgid "Connected to %s (%s)"
msgstr "Connesso a %s (%s)"
@@ -634,26 +622,26 @@ msgstr ""
"\n"
"Visita il sito web del progetto e segui le istruzioni riportate."
-#: AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1238
msgid "Communicating with BOINC client. Please wait ..."
msgstr "In comunicazione con il client BOINC. Attendere prego ..."
-#: AsyncRPC.cpp:1034
+#: AsyncRPC.cpp:1241
#, c-format
msgid "&Quit %s"
msgstr "&Abbandona %s"
-#: AsyncRPC.cpp:1036
+#: AsyncRPC.cpp:1243
#, c-format
msgid "E&xit %s"
msgstr "&Esci da %s"
-#: AsyncRPC.cpp:1040
+#: AsyncRPC.cpp:1247
#, c-format
msgid "%s - Communication"
msgstr "%s - Comunicazione"
-#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
+#: AsyncRPC.cpp:1263 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:452
msgid "Cancel"
msgstr "Annulla"
@@ -746,16 +734,16 @@ msgstr ""
"al client %s.\n"
"Per connetterti al computer locale usa 'localhost' come host name."
-#: BOINCBaseView.cpp:779
+#: BOINCBaseView.cpp:774
msgid "Project web pages"
msgstr "Siti web del progetto"
-#: BOINCClientManager.cpp:575
+#: BOINCClientManager.cpp:573
#, c-format
msgid "%s - Unexpected Exit"
msgstr "%s - Disconnessione Inaspettata "
-#: BOINCClientManager.cpp:585
+#: BOINCClientManager.cpp:583
#, c-format
msgid ""
"The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -814,7 +802,7 @@ msgstr "%s è riuscito a disconnettersi da Internet."
msgid "%s failed to disconnected from the Internet."
msgstr "%s non è riuscito a disconnettersi da Internet."
-#: BOINCGUIApp.cpp:339
+#: BOINCGUIApp.cpp:345
#, c-format
msgid ""
"You currently are not authorized to manage the client.\n"
@@ -835,7 +823,7 @@ msgstr ""
" - contatta l'amministratore del computer per aggiungere il tuo \n"
" account al gruppo 'boinc_master'."
-#: BOINCGUIApp.cpp:345
+#: BOINCGUIApp.cpp:351
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
@@ -845,16 +833,16 @@ msgstr ""
"risolvere il problema installa nuovamente %s.\n"
"(Codice errore %d)"
-#: BOINCGUIApp.cpp:351
+#: BOINCGUIApp.cpp:357
msgid " at "
msgstr "a"
-#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
-#: MainDocument.cpp:2554 ViewTransfers.cpp:803
+#: BOINCGUIApp.cpp:360 MainDocument.cpp:2472 MainDocument.cpp:2522
+#: MainDocument.cpp:2542 ViewTransfers.cpp:792
msgid ")"
msgstr ")"
-#: BOINCGUIApp.cpp:384
+#: BOINCGUIApp.cpp:393
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
@@ -862,143 +850,143 @@ msgstr ""
"Per un corretto funzionamento di BOINC è necessario riavviare il sistema.\n"
"Riavvia e prova nuovamente."
-#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
+#: BOINCGUIApp.cpp:394 DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC Manager"
-#: BOINCGUIApp.cpp:572
+#: BOINCGUIApp.cpp:561
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC Manager è stato avviato dal sistema operativo in modo automatico"
-#: BOINCGUIApp.cpp:574
+#: BOINCGUIApp.cpp:563
msgid "Startup BOINC so only the system tray icon is visible"
msgstr ""
"Avvia BOINC in modo che sia visibile solo l'icona nella barra di sistema"
-#: BOINCGUIApp.cpp:576
+#: BOINCGUIApp.cpp:565
msgid "Directory containing the BOINC Client executable"
msgstr "Cartella contenente file eseguibili del client BOINC"
-#: BOINCGUIApp.cpp:577
+#: BOINCGUIApp.cpp:566
msgid "BOINC data directory"
msgstr "Cartella dei dati di BOINC"
-#: BOINCGUIApp.cpp:579
+#: BOINCGUIApp.cpp:568
msgid "Host name or IP address"
msgstr "Nome del host o indirizzo IP"
-#: BOINCGUIApp.cpp:580
+#: BOINCGUIApp.cpp:569
msgid "GUI RPC port number"
msgstr "Numero della porta GUI RPC"
-#: BOINCGUIApp.cpp:581
+#: BOINCGUIApp.cpp:570
msgid "Password"
msgstr "Chiave d'accesso"
-#: BOINCGUIApp.cpp:582
+#: BOINCGUIApp.cpp:571
msgid "Startup BOINC with these optional arguments"
msgstr "Avvia BOINC con questi parametri opzionali"
-#: BOINCGUIApp.cpp:583
+#: BOINCGUIApp.cpp:572
msgid "disable BOINC security users and permissions"
msgstr "disabilita la sicurezza utenti e i permessi di BOINC"
-#: BOINCGUIApp.cpp:584
+#: BOINCGUIApp.cpp:573
msgid "set skin debugging mode to enable skin manager error messages"
msgstr ""
"imposta la modalità di debug per la visualizzazione per abilitarne i "
"messaggi di errore del gestore"
-#: BOINCGUIApp.cpp:585
+#: BOINCGUIApp.cpp:574
msgid "multiple instances of BOINC Manager allowed"
msgstr "Sono consentite istanze multiple del BOINC Manager"
-#: BOINCGUIApp.cpp:587
+#: BOINCGUIApp.cpp:576
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Non utilizzato: workaround per il bug in XCode 4.2"
-#: BOINCGUIApp.cpp:814
+#: BOINCGUIApp.cpp:794
msgid "(Automatic Detection)"
msgstr "(Rilevazione automatica)"
-#: BOINCGUIApp.cpp:815
+#: BOINCGUIApp.cpp:795
msgid "(Unknown)"
msgstr "(Sconosciuto)"
-#: BOINCGUIApp.cpp:816
+#: BOINCGUIApp.cpp:796
msgid "(User Defined)"
msgstr "(Stabilito dall'utente)"
-#: BOINCTaskBar.cpp:508
+#: BOINCTaskBar.cpp:511
#, c-format
msgid "Open %s Web..."
msgstr "Apri %s Web..."
-#: BOINCTaskBar.cpp:515
+#: BOINCTaskBar.cpp:518
#, c-format
msgid "Open %s..."
msgstr "Apri %s..."
-#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
+#: BOINCTaskBar.cpp:525 BOINCTaskBar.cpp:621 BOINCTaskBar.cpp:629
msgid "Snooze"
msgstr "Sospendi tutto"
-#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
+#: BOINCTaskBar.cpp:527 BOINCTaskBar.cpp:648 BOINCTaskBar.cpp:656
msgid "Snooze GPU"
msgstr "Ferma GPU"
-#: BOINCTaskBar.cpp:542
+#: BOINCTaskBar.cpp:543 mac/MacSysMenu.cpp:225
msgid "E&xit"
msgstr "&Esci"
-#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
-#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
+#: BOINCTaskBar.cpp:614 ViewProjects.cpp:708 ViewWork.cpp:784
+#: sg_BoincSimpleFrame.cpp:738 sg_ProjectCommandPopup.cpp:110
#: sg_TaskCommandPopup.cpp:102
msgid "Resume"
msgstr "Riprendi"
-#: BOINCTaskBar.cpp:639
+#: BOINCTaskBar.cpp:641
msgid "Resume GPU"
msgstr "Riprendi GPU"
-#: BOINCTaskBar.cpp:713
+#: BOINCTaskBar.cpp:715
msgid "Computing is enabled"
msgstr "L'elaborazione è abilitata"
-#: BOINCTaskBar.cpp:717
+#: BOINCTaskBar.cpp:719
msgid "Computing is suspended - "
msgstr "L'elaborazione è sospesa -"
-#: BOINCTaskBar.cpp:727
+#: BOINCTaskBar.cpp:729
msgid "GPU computing is enabled"
msgstr "L'elaborazione della GPU è abilitata"
-#: BOINCTaskBar.cpp:730
+#: BOINCTaskBar.cpp:732
msgid "GPU computing is suspended - "
msgstr "L'elaborazione della GPU è sospesa -."
-#: BOINCTaskBar.cpp:739
+#: BOINCTaskBar.cpp:741
msgid "Network is enabled"
msgstr "La rete è abilitata"
-#: BOINCTaskBar.cpp:742
+#: BOINCTaskBar.cpp:744
msgid "Network is suspended - "
msgstr "L'attività di rete è sospesa -"
-#: BOINCTaskBar.cpp:750
+#: BOINCTaskBar.cpp:752
msgid "Reconnecting to client."
msgstr "Riconnessione al client in corso."
-#: BOINCTaskBar.cpp:752
+#: BOINCTaskBar.cpp:754
msgid "Not connected to a client."
msgstr "Non connesso ad un client."
-#: BOINCTaskBar.cpp:805
+#: BOINCTaskBar.cpp:807
#, c-format
msgid "%s Notices"
msgstr "Avvisi di %s"
-#: BOINCTaskBar.cpp:811
+#: BOINCTaskBar.cpp:813
msgid "There are new notices - click to view."
msgstr "Ci sono nuovi avvisi - clicca per vederli."
@@ -1081,7 +1069,7 @@ msgstr "Stai utilizzando %s per gestire gli account."
msgid "You are now using this account manager."
msgstr "Ora stai utilizzando questo account manager."
-#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:95
#, c-format
msgid "About %s"
msgstr "Informazioni su %s"
@@ -1115,65 +1103,65 @@ msgstr ""
"Berkeley Open Infrastructure for Network Computing"
#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
-#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:162
msgid "&OK"
msgstr "&OK"
-#: DlgAdvPreferences.cpp:544
-msgid "invalid number"
-msgstr "numero non valido"
+#: DlgAdvPreferences.cpp:542
+msgid "invalid float"
+msgstr "numero decimale non valido"
-#: DlgAdvPreferences.cpp:545
+#: DlgAdvPreferences.cpp:543
msgid "invalid time, format is HH:MM"
msgstr "orario non valido, il formato deve essere HH:MM"
-#: DlgAdvPreferences.cpp:546
+#: DlgAdvPreferences.cpp:544
msgid "invalid time interval, format is HH:MM-HH:MM"
msgstr "intervallo di tempo non valido, il formato deve essere HH:MM-HH:MM"
-#: DlgAdvPreferences.cpp:751
+#: DlgAdvPreferences.cpp:664
msgid "invalid input value detected"
msgstr "trovato un valore inserito non valido"
-#: DlgAdvPreferences.cpp:753
+#: DlgAdvPreferences.cpp:666
msgid "Validation Error"
msgstr "Errore di validazione"
-#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
-#: DlgAdvPreferences.cpp:897
+#: DlgAdvPreferences.cpp:797 DlgAdvPreferences.cpp:803
+#: DlgAdvPreferences.cpp:809
msgid "Applications to add"
msgstr "Applicazioni da aggiungere"
-#: DlgAdvPreferences.cpp:914
+#: DlgAdvPreferences.cpp:826
#, c-format
msgid "'%s' is not an executable application."
msgstr "%s non è un'applicazione eseguibile"
-#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
-#: DlgAdvPreferences.cpp:986
+#: DlgAdvPreferences.cpp:827 DlgAdvPreferences.cpp:874
+#: DlgAdvPreferences.cpp:898
msgid "Add Exclusive App"
msgstr "Aggiungi Applicazione Esclusiva"
-#: DlgAdvPreferences.cpp:927
+#: DlgAdvPreferences.cpp:839
msgid "Name of application to add?"
msgstr "Nome dell'applicazione da aggiungere?"
# 88%
-#: DlgAdvPreferences.cpp:927
+#: DlgAdvPreferences.cpp:839
msgid "Add exclusive app"
msgstr "Aggiungi applicazioni esclusive"
-#: DlgAdvPreferences.cpp:961
+#: DlgAdvPreferences.cpp:873
#, c-format
msgid "Application names must end with '%s'"
msgstr "I nomi delle applicazioni devono finire con '%s'"
-#: DlgAdvPreferences.cpp:985
+#: DlgAdvPreferences.cpp:897
#, c-format
msgid "'%s' is already in the list."
msgstr "'%s' è già nella lista."
-#: DlgAdvPreferences.cpp:1077
+#: DlgAdvPreferences.cpp:989
msgid ""
"Do you really want to clear all local preferences?\n"
"(This will not affect exclusive applications.)"
@@ -1181,11 +1169,11 @@ msgstr ""
"Vuoi veramente cancellare tutte le tue preferenze locali?\n"
"(Questo non modificherà le applicazioni esclusive.)"
-#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
+#: DlgAdvPreferences.cpp:990 sg_DlgPreferences.cpp:1032
msgid "Confirmation"
msgstr "Conferma"
-#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:948
#, c-format
msgid "%s - Preferences"
msgstr "%s - Preferenze"
@@ -1201,11 +1189,11 @@ msgstr ""
"Clicca sul pulsante Rimuovi per ripristinare l'uso delle impostazioni via "
"web (tranne per le applicazioni esclusive)."
-#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:447
msgid "Clear"
msgstr "Rimuovi"
-#: DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:66 sg_DlgPreferences.cpp:448
msgid "clear all local preferences and close the dialog"
msgstr "rimuovi tutte le preferenze locali e chiudi la finestra"
@@ -1225,7 +1213,7 @@ msgstr "uso del disco e della memoria"
msgid "exclusive applications"
msgstr "applicazioni esclusive"
-#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:443
msgid "OK"
msgstr "OK"
@@ -1238,7 +1226,7 @@ msgid "close the dialog without saving"
msgstr "chiudi la finestra senza salvare"
#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
-#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:774 sg_DlgPreferences.cpp:458
msgid "Help"
msgstr "Aiuto"
@@ -1296,7 +1284,7 @@ msgstr ""
"minuti"
#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
-#: sg_DlgPreferences.cpp:417
+#: sg_DlgPreferences.cpp:436
msgid "minutes"
msgstr "minuti"
@@ -1312,7 +1300,7 @@ msgstr "sospendere i lavori se l'utilizzo del processore supera questo livello"
msgid "percent (0 means no restriction)"
msgstr "percento (0 indica nessuna restrizione)"
-#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:495
msgid "Every day between hours of"
msgstr "Ogni giorno tra le"
@@ -1320,8 +1308,8 @@ msgstr "Ogni giorno tra le"
msgid "start work at this time"
msgstr "inizia l'elaborazione a quest'ora"
-#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
-#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:503
+#: sg_DlgPreferences.cpp:345 sg_DlgPreferences.cpp:367
msgid "and"
msgstr "e le"
@@ -1329,45 +1317,45 @@ msgstr "e le"
msgid "stop work at this time"
msgstr "sospende l'elaborazione a quest'ora"
-#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:511
msgid "(no restriction if equal)"
msgstr "(nessuna restrizione se sono uguali)"
-#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:516
msgid "Day-of-week override:"
msgstr "Impostazioni speciali per alcuni giorni della settimana:"
-#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:521
msgid "check box to specify hours for this day of week"
msgstr ""
"spunta la voce del giorno della settimana per specificare le ore di "
"funzionamento"
-#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:527
msgid "Monday"
msgstr "Lunedì"
-#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:534
msgid "Tuesday"
msgstr "Martedì"
-#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:541
msgid "Wednesday"
msgstr "Mercoledì"
-#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:548
msgid "Thursday"
msgstr "Giovedì"
-#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:555
msgid "Friday"
msgstr "Venerdì"
-#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:562
msgid "Saturday"
msgstr "Sabato"
-#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:569
msgid "Sunday"
msgstr "Domenica"
@@ -1388,9 +1376,9 @@ msgstr "Sui sistemi multiprocessore, usa al massimo"
msgid "% of the processors (0 means ignore this setting)"
msgstr "% dei processori (0 significa ignora questa impostazione)"
-#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
-#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
-#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:604
+#: DlgAdvPreferencesBase.cpp:626 DlgAdvPreferencesBase.cpp:647
+#: DlgAdvPreferencesBase.cpp:668 DlgAdvPreferencesBase.cpp:678
msgid "Use at most"
msgstr "Usa al massimo"
@@ -1399,74 +1387,74 @@ msgstr "Usa al massimo"
msgid "% CPU time"
msgstr "% della CPU"
-#: DlgAdvPreferencesBase.cpp:378
+#: DlgAdvPreferencesBase.cpp:377
msgid "General options"
msgstr "Opzioni generali"
-#: DlgAdvPreferencesBase.cpp:386
+#: DlgAdvPreferencesBase.cpp:385
msgid "Maximum download rate"
msgstr "Velocità massima di scaricamento"
-#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
+#: DlgAdvPreferencesBase.cpp:391 DlgAdvPreferencesBase.cpp:400
msgid "KBytes/sec."
msgstr "KBytes/sec."
-#: DlgAdvPreferencesBase.cpp:395
+#: DlgAdvPreferencesBase.cpp:394
msgid "Maximum upload rate"
msgstr "Velocità massima di invio"
-#: DlgAdvPreferencesBase.cpp:406
+#: DlgAdvPreferencesBase.cpp:405
msgid "Transfer at most"
msgstr "Trasferisci al massimo"
-#: DlgAdvPreferencesBase.cpp:412
+#: DlgAdvPreferencesBase.cpp:411
msgid "Mbytes"
msgstr "Mbytes"
-#: DlgAdvPreferencesBase.cpp:415
+#: DlgAdvPreferencesBase.cpp:414
msgid "every"
msgstr "ogni"
-#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
-#: DlgAdvPreferencesBase.cpp:463
+#: DlgAdvPreferencesBase.cpp:420 DlgAdvPreferencesBase.cpp:443
+#: DlgAdvPreferencesBase.cpp:462
msgid "days"
msgstr "giorni"
-#: DlgAdvPreferencesBase.cpp:429
+#: DlgAdvPreferencesBase.cpp:428
msgid "Minimum work buffer"
msgstr "Riserva di lavoro addizionale minima"
-#: DlgAdvPreferencesBase.cpp:438
+#: DlgAdvPreferencesBase.cpp:437
msgid "Try to maintain enough tasks to keep busy for this many days"
msgstr ""
"Cerca di mantenere sufficienti lavori per rimanere occupato per questi "
"giorni"
-#: DlgAdvPreferencesBase.cpp:450
+#: DlgAdvPreferencesBase.cpp:449
msgid "Max additional work buffer"
msgstr "Riserva di lavoro addizionale massima"
-#: DlgAdvPreferencesBase.cpp:459
+#: DlgAdvPreferencesBase.cpp:458
msgid "In addition, maintain enough tasks for up to this many days"
msgstr "In aggiunta, mantieni lavori sufficienti per per questi giorni"
-#: DlgAdvPreferencesBase.cpp:466
+#: DlgAdvPreferencesBase.cpp:465
msgid "Skip image file verification"
msgstr "Salta la verifica dei file immagine"
-#: DlgAdvPreferencesBase.cpp:468
+#: DlgAdvPreferencesBase.cpp:467
msgid "check this if your Internet provider modifies image files"
msgstr "spunta questa voce se il tuo provider Internet modifica i file immagine"
-#: DlgAdvPreferencesBase.cpp:476
+#: DlgAdvPreferencesBase.cpp:475
msgid "Connect options"
msgstr "Opzioni di connessione"
-#: DlgAdvPreferencesBase.cpp:478
+#: DlgAdvPreferencesBase.cpp:477
msgid "Confirm before connecting to internet"
msgstr "Chiede conferma prima di connettersi ad Internet"
-#: DlgAdvPreferencesBase.cpp:480
+#: DlgAdvPreferencesBase.cpp:479
msgid ""
"if checked, a confirmation dialog will be displayed before trying to connect "
"to the Internet"
@@ -1474,11 +1462,11 @@ msgstr ""
"se la voce è spuntata, sarà chiesta una conferma prima di effettuare una "
"connessione ad Internet"
-#: DlgAdvPreferencesBase.cpp:484
+#: DlgAdvPreferencesBase.cpp:483
msgid "Disconnect when done"
msgstr "Disconnetti al termine delle operazioni"
-#: DlgAdvPreferencesBase.cpp:486
+#: DlgAdvPreferencesBase.cpp:485
msgid ""
"if checked, BOINC hangs up when network usage is done\n"
"(only relevant for dialup-connection)"
@@ -1486,152 +1474,152 @@ msgstr ""
"se la voce è spuntata, BOINC riaggancia al termine delle operazioni\n"
"(rilevante solo per connessioni dialup)"
-#: DlgAdvPreferencesBase.cpp:492
+#: DlgAdvPreferencesBase.cpp:491
msgid "Network usage allowed"
msgstr "Uso della rete"
-#: DlgAdvPreferencesBase.cpp:500
+#: DlgAdvPreferencesBase.cpp:499
msgid "network usage start hour"
msgstr "ora di inizio dell'uso della rete"
-#: DlgAdvPreferencesBase.cpp:508
+#: DlgAdvPreferencesBase.cpp:507
msgid "network usage stop hour"
msgstr "ora di interruzione dell'uso della rete"
-#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
+#: DlgAdvPreferencesBase.cpp:597 DlgItemProperties.cpp:226
msgid "Disk usage"
msgstr "Uso del disco"
-#: DlgAdvPreferencesBase.cpp:609
+#: DlgAdvPreferencesBase.cpp:608
msgid "the maximum disk space used by BOINC (in Gigabytes)"
msgstr "il massimo spazio su disco usato da BOINC (in Gigabytes)"
-#: DlgAdvPreferencesBase.cpp:613
+#: DlgAdvPreferencesBase.cpp:612
msgid "Gigabytes disk space"
msgstr "Gigabytes di spazio sul disco"
-#: DlgAdvPreferencesBase.cpp:616
+#: DlgAdvPreferencesBase.cpp:615
msgid "Leave at least"
msgstr "Lascia come minimo"
-#: DlgAdvPreferencesBase.cpp:620
+#: DlgAdvPreferencesBase.cpp:619
msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
msgstr ""
"BOINC lascia almeno questa quantità di spazio libero su disco (in Gigabytes)"
-#: DlgAdvPreferencesBase.cpp:624
+#: DlgAdvPreferencesBase.cpp:623
msgid "Gigabytes disk space free"
msgstr "Gigabytes di spazio libero sul disco"
-#: DlgAdvPreferencesBase.cpp:631
+#: DlgAdvPreferencesBase.cpp:630
msgid "BOINC uses at most this percentage of total disk space"
msgstr "BOINC usa al massimo questa percentuale di spazio del disco"
-#: DlgAdvPreferencesBase.cpp:636
+#: DlgAdvPreferencesBase.cpp:635
#, no-c-format
msgid "% of total disk space"
msgstr "% dello spazio totale del disco"
-#: DlgAdvPreferencesBase.cpp:639
+#: DlgAdvPreferencesBase.cpp:638
msgid "Tasks checkpoint to disk at most every"
msgstr "Scrivi su disco al massimo ogni"
-#: DlgAdvPreferencesBase.cpp:645
+#: DlgAdvPreferencesBase.cpp:644
msgid "seconds"
msgstr "secondi"
-#: DlgAdvPreferencesBase.cpp:655
+#: DlgAdvPreferencesBase.cpp:654
#, no-c-format
msgid "% of page file (swap space)"
msgstr "% del file di paging (spazio di swap)"
-#: DlgAdvPreferencesBase.cpp:662
+#: DlgAdvPreferencesBase.cpp:661
msgid "Memory usage"
msgstr "Uso della memoria"
-#: DlgAdvPreferencesBase.cpp:676
+#: DlgAdvPreferencesBase.cpp:675
#, no-c-format
msgid "% when computer is in use"
msgstr "% quando il computer è in uso"
-#: DlgAdvPreferencesBase.cpp:686
+#: DlgAdvPreferencesBase.cpp:685
#, no-c-format
msgid "% when computer is idle"
msgstr "% quando il computer non è in uso"
-#: DlgAdvPreferencesBase.cpp:691
+#: DlgAdvPreferencesBase.cpp:690
msgid "Leave applications in memory while suspended"
msgstr " Lascia le applicazioni in memoria quando sono sospese"
-#: DlgAdvPreferencesBase.cpp:693
+#: DlgAdvPreferencesBase.cpp:692
msgid "if checked, suspended work units are left in memory"
msgstr ""
"se la voce è spuntata, le elaborazioni sospese vengono lasciate in memoria"
-#: DlgAdvPreferencesBase.cpp:713
+#: DlgAdvPreferencesBase.cpp:712
msgid ""
"Suspend processor and network usage when these applications are running:"
msgstr ""
"Sospendi il processore e l'utilizzo della rete quando queste applicazioni "
"sono in esecuzione:"
-#: DlgAdvPreferencesBase.cpp:722
+#: DlgAdvPreferencesBase.cpp:721
msgid "Add..."
msgstr "Aggiungi..."
-#: DlgAdvPreferencesBase.cpp:723
+#: DlgAdvPreferencesBase.cpp:722
msgid "Add an application to this list"
msgstr "Aggiungi un'applicazione alla lista"
-#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
+#: DlgAdvPreferencesBase.cpp:727 ViewProjects.cpp:201
#: sg_ProjectCommandPopup.cpp:85
msgid "Remove"
msgstr "Rimuovi"
-#: DlgAdvPreferencesBase.cpp:729
+#: DlgAdvPreferencesBase.cpp:728
msgid "Remove an application from this list"
msgstr "Rimuovi applicazione dalla lista"
-#: DlgAdvPreferencesBase.cpp:738
+#: DlgAdvPreferencesBase.cpp:737
msgid "For advanced options, refer to "
msgstr "Per le opzioni avanzate, vai su"
-#: DlgEventLog.cpp:219
+#: DlgEventLog.cpp:217
#, c-format
msgid "%s - Event Log"
msgstr "%s - Log Eventi"
-#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
-#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
-#: ViewWork.cpp:232
+#: DlgEventLog.cpp:230 ViewMessages.cpp:117 ViewProjects.cpp:218
+#: ViewStatistics.cpp:427 ViewStatistics.cpp:1996 ViewTransfers.cpp:181
+#: ViewWork.cpp:231
msgid "Project"
msgstr "Progetto"
-#: DlgEventLog.cpp:233 ViewMessages.cpp:118
+#: DlgEventLog.cpp:231 ViewMessages.cpp:118
msgid "Time"
msgstr "Ora"
-#: DlgEventLog.cpp:234 ViewMessages.cpp:119
+#: DlgEventLog.cpp:232 ViewMessages.cpp:119
msgid "Message"
msgstr "Messaggio"
-#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
+#: DlgEventLog.cpp:287 DlgEventLog.cpp:351
msgid "&Show only this project"
msgstr "Mostra &solo questo progetto"
-#: DlgEventLog.cpp:294
+#: DlgEventLog.cpp:291
msgid "Copy &All"
msgstr "Copi&a Tutto"
-#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
+#: DlgEventLog.cpp:293 DlgEventLog.cpp:297 ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr "Copia tutti i messaggi negli appunti."
-#: DlgEventLog.cpp:305
+#: DlgEventLog.cpp:302
msgid "Copy &Selected"
msgstr "Copia &Selezionati"
-#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 ViewMessages.cpp:97
+#: DlgEventLog.cpp:305 DlgEventLog.cpp:313 ViewMessages.cpp:97
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or command key while clicking on messages."
@@ -1640,7 +1628,7 @@ msgstr ""
"insieme tenendo premuto il tasto Shift o command mentre clicchi sui "
"messaggi."
-#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 ViewMessages.cpp:99
+#: DlgEventLog.cpp:307 DlgEventLog.cpp:315 ViewMessages.cpp:99
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or control key while clicking on messages."
@@ -1648,24 +1636,25 @@ msgstr ""
"Copia i messaggi selezionati negli appunti. Puoi selezionare più messaggi "
"insieme tenendo premuto il tasto Shift o Ctrl mentre clicchi sui messaggi."
-#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:322 DlgItemProperties.cpp:66
msgid "&Close"
msgstr "&Chiudi"
-#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
+#: DlgEventLog.cpp:331 sg_BoincSimpleFrame.cpp:778 sg_DlgPreferences.cpp:461
+#: sg_ProjectsComponent.cpp:142
#, c-format
msgid "Get help with %s"
msgstr "Ottieni aiuto con %s"
-#: DlgEventLog.cpp:348
+#: DlgEventLog.cpp:345
msgid "Show all &messages"
msgstr "Mostra tutti i &messaggi"
-#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
+#: DlgEventLog.cpp:346 DlgEventLog.cpp:348
msgid "Show messages for all projects"
msgstr "Mostra i messaggi di tutti i progetti"
-#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
+#: DlgEventLog.cpp:352 DlgEventLog.cpp:354
msgid "Show only the messages for the selected project"
msgstr "Mostra solamente i messaggi del progetto selezionato"
@@ -1718,7 +1707,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "Ricorda la scelta e non visualizzare più questo messaggio."
#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
-#: DlgSelectComputer.cpp:168 wizardex.cpp:378
+#: DlgSelectComputer.cpp:167 wizardex.cpp:378
msgid "&Cancel"
msgstr "&Annulla"
@@ -1726,223 +1715,223 @@ msgstr "&Annulla"
msgid "Don't show this dialog again."
msgstr "Non visualizzare piu questo messaggio."
-#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
-#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
+#: DlgItemProperties.cpp:163 DlgItemProperties.cpp:166
+#: DlgItemProperties.cpp:169 DlgItemProperties.cpp:172
msgid "Don't fetch tasks for "
msgstr "Non richiedere nuovo lavoro per"
-#: DlgItemProperties.cpp:168
+#: DlgItemProperties.cpp:163
msgid "Project preference"
msgstr "Preferenze per il progetto"
-#: DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:166
msgid "Account manager preference"
msgstr "Preferenze dell'account manager"
-#: DlgItemProperties.cpp:174
+#: DlgItemProperties.cpp:169
msgid "Project has no apps for "
msgstr "Il progetto non ha applicazioni per"
-#: DlgItemProperties.cpp:177
+#: DlgItemProperties.cpp:172
msgid "Client configuration excludes "
msgstr "La configurazione client esclude"
-#: DlgItemProperties.cpp:181
+#: DlgItemProperties.cpp:176
msgid " work fetch deferred for"
msgstr " richiesta di nuovo lavoro rinviata di"
-#: DlgItemProperties.cpp:182
+#: DlgItemProperties.cpp:177
msgid " work fetch deferral interval"
msgstr " intervallo di rinvio per la richiesta di nuovi lavori"
-#: DlgItemProperties.cpp:213
+#: DlgItemProperties.cpp:208
msgid "Properties of project "
msgstr "Proprietà del progetto "
-#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
+#: DlgItemProperties.cpp:212 DlgOptions.cpp:218
msgid "General"
msgstr "Dati generali"
-#: DlgItemProperties.cpp:218
+#: DlgItemProperties.cpp:213
msgid "Master URL"
msgstr "URL principale"
-#: DlgItemProperties.cpp:219
+#: DlgItemProperties.cpp:214
msgid "User name"
msgstr "Nome utente"
-#: DlgItemProperties.cpp:220
+#: DlgItemProperties.cpp:215
msgid "Team name"
msgstr "Nome del team"
-#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
+#: DlgItemProperties.cpp:216 ViewProjects.cpp:223
msgid "Resource share"
msgstr "Allocazione risorse"
-#: DlgItemProperties.cpp:223
+#: DlgItemProperties.cpp:218
msgid "Scheduler RPC deferred for"
msgstr "Scheduler RPC rimandato di"
-#: DlgItemProperties.cpp:226
+#: DlgItemProperties.cpp:221
msgid "File downloads deferred for"
msgstr "Scaricamento dei file rimandato di"
-#: DlgItemProperties.cpp:229
+#: DlgItemProperties.cpp:224
msgid "File uploads deferred for"
msgstr "Invio dei file rimandato di"
-#: DlgItemProperties.cpp:232
+#: DlgItemProperties.cpp:227
msgid "Computer ID"
msgstr "Computer ID"
-#: DlgItemProperties.cpp:234
+#: DlgItemProperties.cpp:229
msgid "Non CPU intensive"
msgstr "Non intensivo per la CPU"
-#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
-#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
-#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
-#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
+#: DlgItemProperties.cpp:229 DlgItemProperties.cpp:231
+#: DlgItemProperties.cpp:232 DlgItemProperties.cpp:234
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:249 DlgItemProperties.cpp:252
msgid "yes"
msgstr "si"
-#: DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:231
msgid "Suspended via GUI"
msgstr "Sospeso dall'utente"
-#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
+#: DlgItemProperties.cpp:231 DlgItemProperties.cpp:232
msgid "no"
msgstr "no"
-#: DlgItemProperties.cpp:237
+#: DlgItemProperties.cpp:232
msgid "Don't request more work"
msgstr "Non richiedere nuovo lavoro"
-#: DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:234
msgid "Scheduler call in progress"
msgstr "Richiesta allo scheduler in corso"
-#: DlgItemProperties.cpp:242
+#: DlgItemProperties.cpp:237
msgid "Trickle-up pending"
msgstr "Messaggio istantaneo in attesa"
-#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:240 DlgItemProperties.cpp:242
msgid "Host location"
msgstr "Posizione dell'host"
-#: DlgItemProperties.cpp:247
+#: DlgItemProperties.cpp:242
msgid "default"
msgstr "predefinito"
-#: DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:246
msgid "Added via account manager"
msgstr "Aggiunto mediante account manager"
-#: DlgItemProperties.cpp:254
+#: DlgItemProperties.cpp:249
msgid "Remove when tasks done"
msgstr "Rimuovi il progetto al termine dell'elaborazione"
-#: DlgItemProperties.cpp:257
+#: DlgItemProperties.cpp:252
msgid "Ended"
msgstr "Terminato"
-#: DlgItemProperties.cpp:259
+#: DlgItemProperties.cpp:254
msgid "Credit"
msgstr "Crediti"
-#: DlgItemProperties.cpp:260
+#: DlgItemProperties.cpp:255
msgid "User"
msgstr "Utente"
-#: DlgItemProperties.cpp:267
+#: DlgItemProperties.cpp:262
msgid "Host"
msgstr "Computer"
-#: DlgItemProperties.cpp:276
+#: DlgItemProperties.cpp:271
msgid "Scheduling"
msgstr "Programmazione del lavoro"
-#: DlgItemProperties.cpp:277
+#: DlgItemProperties.cpp:272
msgid "Scheduling priority"
msgstr "Priorità di scheduling"
-#: DlgItemProperties.cpp:278
+#: DlgItemProperties.cpp:273
msgid "CPU"
msgstr "CPU"
-#: DlgItemProperties.cpp:302
+#: DlgItemProperties.cpp:297
msgid "Duration correction factor"
msgstr "Fattore di correzione del tempo di elaborazione"
-#: DlgItemProperties.cpp:316
+#: DlgItemProperties.cpp:311
msgid "Properties of task "
msgstr "Proprietà dell'unità di lavoro "
-#: DlgItemProperties.cpp:328 ViewWork.cpp:238
+#: DlgItemProperties.cpp:323 ViewWork.cpp:237
msgid "Application"
msgstr "Applicazione"
-#: DlgItemProperties.cpp:329 ViewWork.cpp:239
-msgid "Name"
-msgstr "Nome"
+#: DlgItemProperties.cpp:324
+msgid "Workunit name"
+msgstr "Nome dell'unità di lavoro"
-#: DlgItemProperties.cpp:330
+#: DlgItemProperties.cpp:325
msgid "State"
msgstr "Stato"
-#: DlgItemProperties.cpp:333
+#: DlgItemProperties.cpp:328
msgid "Received"
msgstr "Ricevuta"
-#: DlgItemProperties.cpp:336
+#: DlgItemProperties.cpp:331
msgid "Report deadline"
msgstr "Scadenza"
-#: DlgItemProperties.cpp:338
+#: DlgItemProperties.cpp:333
msgid "Resources"
msgstr "Risorse in uso"
-#: DlgItemProperties.cpp:341
+#: DlgItemProperties.cpp:336
msgid "Estimated computation size"
msgstr "Durata stimata lavoro"
-#: DlgItemProperties.cpp:344
+#: DlgItemProperties.cpp:339
msgid "CPU time at last checkpoint"
msgstr "Tempo CPU all'ultimo checkpoint"
-#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
+#: DlgItemProperties.cpp:340 DlgItemProperties.cpp:355
msgid "CPU time"
msgstr "Tempo CPU"
-#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
+#: DlgItemProperties.cpp:342 DlgItemProperties.cpp:356
msgid "Elapsed time"
msgstr "Tempo trascorso"
-#: DlgItemProperties.cpp:349
+#: DlgItemProperties.cpp:344
msgid "Estimated time remaining"
msgstr "Stima del tempo rimanente"
-#: DlgItemProperties.cpp:350
+#: DlgItemProperties.cpp:345
msgid "Fraction done"
msgstr "Frazione già eseguita"
-#: DlgItemProperties.cpp:351
+#: DlgItemProperties.cpp:346
msgid "Virtual memory size"
msgstr "Dimensioni della memoria virtuale"
-#: DlgItemProperties.cpp:352
+#: DlgItemProperties.cpp:347
msgid "Working set size"
msgstr "Dimensioni della memoria di lavoro"
-#: DlgItemProperties.cpp:354
+#: DlgItemProperties.cpp:349
msgid "Directory"
msgstr "Cartella"
-#: DlgItemProperties.cpp:357
+#: DlgItemProperties.cpp:352
msgid "Process ID"
msgstr "ID processo"
-#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
+#: DlgItemProperties.cpp:426 ViewWork.cpp:1021 sg_TaskPanel.cpp:807
msgid "Local: "
msgstr "Locale:"
@@ -2030,7 +2019,7 @@ msgstr "Lascia questi spazi vuoti se non necessari"
msgid "User Name:"
msgstr "Nome utente:"
-#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:151
#: ProxyPage.cpp:346 ProxyPage.cpp:366
msgid "Password:"
msgstr "Password:"
@@ -2089,12 +2078,12 @@ msgstr ""
"La lingua di %s è stata cambiata. Per rendere effettive le modifiche, devi "
"riavviare %s."
-#: DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:90
#, c-format
msgid "%s - Select Computer"
msgstr "%s - Seleziona un computer"
-#: DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:124
#, c-format
msgid ""
"Another instance of %s is already running \n"
@@ -2103,7 +2092,7 @@ msgstr ""
"Un'altra istanza di %s sta già elaborando \n"
"su questo computer. Per favore seleziona quale client seguire. "
-#: DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:142
msgid "Host name:"
msgstr "Nome del computer:"
@@ -2239,8 +2228,8 @@ msgstr "Progetto GEO-600"
msgid "The home page of the GEO-600 project"
msgstr "Pagina iniziale del progetto GEO-600"
-#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
-#: ViewStatistics.cpp:465
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:220
+#: ViewStatistics.cpp:457
msgid "Team"
msgstr "Team"
@@ -2306,23 +2295,23 @@ msgstr "Ricerca"
msgid "Learn about the projects hosted at World Community Grid"
msgstr "Informati sui progetti ospitati nel World Community Grid"
-#: MainDocument.cpp:583
+#: MainDocument.cpp:586
msgid "Starting client"
msgstr "Avvio client"
-#: MainDocument.cpp:591
+#: MainDocument.cpp:594
msgid "Connecting to client"
msgstr "Connessione al client in corso"
-#: MainDocument.cpp:1195
+#: MainDocument.cpp:1183
msgid "Retrieving system state; please wait..."
msgstr "Recupero dello stato del sistema in corso; attendere per favore..."
-#: MainDocument.cpp:1816
+#: MainDocument.cpp:1804
msgid "Missing application"
msgstr "Applicazione mancante"
-#: MainDocument.cpp:1817
+#: MainDocument.cpp:1805
msgid ""
"Please download and install the CoRD application from http://cord."
"sourceforge.net"
@@ -2330,184 +2319,184 @@ msgstr ""
"Per favore scarica e installa l'applicazione CoRd da "
"http://cord.sourceforge.net"
-#: MainDocument.cpp:2432
+#: MainDocument.cpp:2420
msgid "on batteries"
msgstr "alimentazione a batterie"
-#: MainDocument.cpp:2433
+#: MainDocument.cpp:2421
msgid "computer is in use"
msgstr "Anche quando il computer è in uso"
-#: MainDocument.cpp:2434
+#: MainDocument.cpp:2422
msgid "user request"
msgstr "Richiesta dell'utente"
-#: MainDocument.cpp:2435
+#: MainDocument.cpp:2423
msgid "time of day"
msgstr "limiti di orario"
-#: MainDocument.cpp:2436
+#: MainDocument.cpp:2424
msgid "CPU benchmarks in progress"
msgstr "benchmark della CPU in corso"
-#: MainDocument.cpp:2437
+#: MainDocument.cpp:2425
msgid "need disk space - check preferences"
msgstr "E' necessario spazio su disco - controlla le preferenze"
-#: MainDocument.cpp:2438
+#: MainDocument.cpp:2426
msgid "computer is not in use"
msgstr "Anche quando il computer non è in uso"
-#: MainDocument.cpp:2439
+#: MainDocument.cpp:2427
msgid "starting up"
msgstr "Avvio del client"
-#: MainDocument.cpp:2440
+#: MainDocument.cpp:2428
msgid "an exclusive app is running"
msgstr "l'applicazione è in modalità esclusiva"
-#: MainDocument.cpp:2441
+#: MainDocument.cpp:2429
msgid "CPU is busy"
msgstr "La CPU è occupata"
-#: MainDocument.cpp:2442
+#: MainDocument.cpp:2430
msgid "network bandwidth limit exceeded"
msgstr "Limite della banda di connessione della rete superato"
-#: MainDocument.cpp:2443
+#: MainDocument.cpp:2431
msgid "requested by operating system"
msgstr "richiesta dal sistema operativo"
-#: MainDocument.cpp:2445
+#: MainDocument.cpp:2433
msgid "unknown reason"
msgstr "motivo sconosciuto"
-#: MainDocument.cpp:2467
+#: MainDocument.cpp:2455
msgid "GPU missing, "
msgstr "Manca la GPU,"
-#: MainDocument.cpp:2474
+#: MainDocument.cpp:2462
msgid "New"
msgstr "Nuovo"
-#: MainDocument.cpp:2478
+#: MainDocument.cpp:2466
msgid "Download failed"
msgstr "Scaricamento fallito"
-#: MainDocument.cpp:2480
+#: MainDocument.cpp:2468
msgid "Downloading"
msgstr "Scaricamento in corso"
-#: MainDocument.cpp:2482 MainDocument.cpp:2552
+#: MainDocument.cpp:2470 MainDocument.cpp:2540
msgid " (suspended - "
msgstr "(sospesa-"
-#: MainDocument.cpp:2490
+#: MainDocument.cpp:2478
msgid "Project suspended by user"
msgstr "Progetto sospeso dall'utente"
-#: MainDocument.cpp:2492
+#: MainDocument.cpp:2480
msgid "Task suspended by user"
msgstr "Elaborazione sospesa dall'utente"
-#: MainDocument.cpp:2494
+#: MainDocument.cpp:2482
msgid "Suspended - "
msgstr "Sospesa -"
# 75%
-#: MainDocument.cpp:2500
+#: MainDocument.cpp:2488
msgid "GPU suspended - "
msgstr "GPU sospesa - "
-#: MainDocument.cpp:2507
+#: MainDocument.cpp:2495
msgid "Waiting for memory"
msgstr "In attesa di memoria"
-#: MainDocument.cpp:2509
+#: MainDocument.cpp:2497
msgid "Waiting for shared memory"
msgstr "In attesa di memoria condivisa"
-#: MainDocument.cpp:2512
+#: MainDocument.cpp:2500
msgid "Running, high priority"
msgstr "In elaborazione, priorità alta"
-#: MainDocument.cpp:2514
+#: MainDocument.cpp:2502 sg_ImageButton.cpp:88
msgid "Running"
msgstr "In elaborazione"
-#: MainDocument.cpp:2517
+#: MainDocument.cpp:2505
msgid " (non-CPU-intensive)"
msgstr "(non intensivo per la CPU)"
-#: MainDocument.cpp:2520
+#: MainDocument.cpp:2508
msgid "Waiting to run"
msgstr "In attesa di esecuzione"
-#: MainDocument.cpp:2522 MainDocument.cpp:2528
+#: MainDocument.cpp:2510 MainDocument.cpp:2516
msgid "Ready to start"
msgstr "Pronto per l'elaborazione"
-#: MainDocument.cpp:2532
+#: MainDocument.cpp:2520
msgid " (Scheduler wait: "
msgstr " (In attesa dello Scheduler:"
-#: MainDocument.cpp:2536
+#: MainDocument.cpp:2524
msgid " (Scheduler wait)"
msgstr " (Attesa dello scheduler)"
-#: MainDocument.cpp:2540
+#: MainDocument.cpp:2528
msgid " (Waiting for network access)"
msgstr " (In attesa di accesso alla rete)"
-#: MainDocument.cpp:2544
+#: MainDocument.cpp:2532
msgid "Computation error"
msgstr "Errore di calcolo"
-#: MainDocument.cpp:2548
+#: MainDocument.cpp:2536
msgid "Upload failed"
msgstr "Invio non riuscito"
-#: MainDocument.cpp:2550
+#: MainDocument.cpp:2538
msgid "Uploading"
msgstr "Invio in corso"
-#: MainDocument.cpp:2561
+#: MainDocument.cpp:2549
msgid "Aborted by user"
msgstr "Annullato dall'utente"
-#: MainDocument.cpp:2564
+#: MainDocument.cpp:2552
msgid "Aborted by project"
msgstr "Annullato dal progetto"
-#: MainDocument.cpp:2567
+#: MainDocument.cpp:2555
msgid "Aborted: not started by deadline"
msgstr "Annullato: non è partito a causa della scadenza"
-#: MainDocument.cpp:2570
+#: MainDocument.cpp:2558
msgid "Aborted: disk limit exceeded"
msgstr "Annullato: limite disco superato"
-#: MainDocument.cpp:2573
+#: MainDocument.cpp:2561
msgid "Aborted: run time limit exceeded"
msgstr "Annullato: limite di elaborazione superato"
-#: MainDocument.cpp:2576
+#: MainDocument.cpp:2564
msgid "Aborted: memory limit exceeded"
msgstr "Annullato: limite di memoria superato"
-#: MainDocument.cpp:2579
+#: MainDocument.cpp:2567
msgid "Aborted"
msgstr "Annullato"
-#: MainDocument.cpp:2584
+#: MainDocument.cpp:2572
msgid "Acknowledged"
msgstr "Riconosciuto"
-#: MainDocument.cpp:2586
+#: MainDocument.cpp:2574
msgid "Ready to report"
msgstr "Pronto per il report"
-#: MainDocument.cpp:2588
+#: MainDocument.cpp:2576
#, c-format
msgid "Error: invalid state '%d'"
msgstr "Errore: stato non valido '%d'"
@@ -2562,57 +2551,75 @@ msgstr "Controlla nome utente e password poi riprova."
msgid "Check the email address and password, and try again."
msgstr "Controlla l'indirizzo e-mail e la password poi riprova"
-#: NoticeListCtrl.cpp:222
+#: NoticeListCtrl.cpp:63
+msgid "Notice List"
+msgstr "Lista degli avvisi"
+
+#: NoticeListCtrl.cpp:185
+#, c-format
+msgid "%s; received on %s"
+msgstr "%s; ricevuto su %s"
+
+#: NoticeListCtrl.cpp:187
+#, c-format
+msgid "%s; received from %s; on %s"
+msgstr "%s: ricevuto da %s; su %s"
+
+#: NoticeListCtrl.cpp:284 ProjectListCtrl.cpp:282
+msgid "Click"
+msgstr "Clicca"
+
+#: NoticeListCtrl.cpp:569
msgid "more..."
msgstr "ancora..."
-#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
+#: ProjectInfoPage.cpp:451 ProjectInfoPage.cpp:739 ProjectInfoPage.cpp:743
msgid "All"
msgstr "Tutto"
-#: ProjectInfoPage.cpp:615
+#: ProjectInfoPage.cpp:582
msgid "Choose a project"
msgstr "Scegli un progetto"
-#: ProjectInfoPage.cpp:619
+#: ProjectInfoPage.cpp:586
msgid "To choose a project, click its name or type its URL below."
msgstr ""
"Per selezionare un progetto, clicca sul nome o digita il suo indirizzo "
"sotto."
-#: ProjectInfoPage.cpp:623
+#: ProjectInfoPage.cpp:590
msgid "Categories:"
msgstr "Categorie:"
-#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
+#: ProjectInfoPage.cpp:594 sg_ProjectPanel.cpp:89
msgid "Projects:"
msgstr "Progetti:"
-#: ProjectInfoPage.cpp:631
+#: ProjectInfoPage.cpp:598
msgid "Project details"
msgstr "Dettagli progetto"
-#: ProjectInfoPage.cpp:635
+#: ProjectInfoPage.cpp:602
msgid "Research area:"
msgstr "Area di ricerca:"
-#: ProjectInfoPage.cpp:639
+#: ProjectInfoPage.cpp:606
msgid "Organization:"
msgstr "Organizzazione:"
-#: ProjectInfoPage.cpp:643
+#: ProjectInfoPage.cpp:610
msgid "Web site:"
msgstr "Sito web:"
-#: ProjectInfoPage.cpp:647
+#: ProjectInfoPage.cpp:614
msgid "Supported systems:"
msgstr "Sistemi supportati:"
-#: ProjectInfoPage.cpp:651
+#: ProjectInfoPage.cpp:618
msgid "Project URL:"
msgstr "URL del progetto:"
-#: ProjectInfoPage.cpp:826
+#: ProjectInfoPage.cpp:787
msgid ""
"This project may not have work for your type of computer. Do you want to "
"add it anyway?"
@@ -2620,19 +2627,35 @@ msgstr ""
"Questo progetto potrebbe non avere lavoro per il tuo tipo di computer. Sei "
"sicuro di volerlo aggiungere comunque?"
-#: ProjectInfoPage.cpp:850
+#: ProjectInfoPage.cpp:811
msgid "You already added this project. Please choose a different project."
msgstr "Sei già connesso a questo progetto. Scegli un progetto diverso."
+#: ProjectListCtrl.cpp:66
+msgid "Project List"
+msgstr "Lista dei Progetti"
+
+#: ProjectListCtrl.cpp:507
+msgid "Nvidia GPU Supported"
+msgstr "GPU Nvidia Supportata"
+
+#: ProjectListCtrl.cpp:509
+msgid "ATI GPU Supported"
+msgstr "GPU ATI Supportata"
+
+#: ProjectListCtrl.cpp:511
+msgid "Project Website"
+msgstr "Sito web progetto"
+
#: ProjectProcessingPage.cpp:321
msgid "Communicating with project."
msgstr "In comunicazione con il progetto."
-#: ProjectProcessingPage.cpp:509
+#: ProjectProcessingPage.cpp:507
msgid "Required files not found on the server."
msgstr "I file richiesti non sono stati trovati sul server del progetto."
-#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
+#: ProjectProcessingPage.cpp:510 ProjectProcessingPage.cpp:572
msgid "An internal server error has occurred."
msgstr "Si è verificato un errore interno del server."
@@ -2740,7 +2763,7 @@ msgid "I agree to the terms of use."
msgstr "Accetto le condizioni d'uso."
#: TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
+msgid "I do not agree with the terms of use."
msgstr "Non accetto le condizioni d'uso."
#: UnavailablePage.cpp:183
@@ -2830,8 +2853,8 @@ msgstr "'%s' non contiene un nome di computer valido."
msgid "'%s' does not contain a valid path."
msgstr "'%s' non contiene un percorso valido."
-#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
-#: ViewTransfers.cpp:160 ViewWork.cpp:183
+#: ViewMessages.cpp:84 ViewProjects.cpp:169 ViewStatistics.cpp:1965
+#: ViewTransfers.cpp:159 ViewWork.cpp:182
msgid "Commands"
msgstr "Comandi"
@@ -2875,23 +2898,32 @@ msgstr "Mostra tutti i messaggi"
msgid "Show messages for all projects."
msgstr "Mostra i messaggi di tutti i progetti."
-#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+#: ViewNotices.cpp:60 sg_DlgMessages.cpp:130
+msgid "One or more items failed to load from the Internet."
+msgstr "Lo scaricamento di uno o più elementi da Internet è fallito."
+
+# 88%
+#: ViewNotices.cpp:68 sg_DlgMessages.cpp:138
+msgid "Retry now"
+msgstr "Ritenta ora"
+
+#: ViewNotices.cpp:91 sg_DlgMessages.cpp:171
msgid "Fetching notices; please wait..."
msgstr "Scaricamento notizie; attendere prego..."
-#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+#: ViewNotices.cpp:97 sg_DlgMessages.cpp:178
msgid "There are no notices at this time."
msgstr "Non ci sono avvisi al momento"
-#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+#: ViewNotices.cpp:120 sg_BoincSimpleFrame.cpp:756
msgid "Notices"
msgstr "Avvisi"
-#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
+#: ViewProjects.cpp:173 sg_ProjectCommandPopup.cpp:61
msgid "Update"
msgstr "Aggiorna"
-#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:62
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
@@ -2899,32 +2931,32 @@ msgstr ""
"Riporta il lavoro completato, aggiorna il totale dei crediti e le "
"preferenze, e possibilmente ottiene altro lavoro."
-#: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
-#: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
+#: ViewProjects.cpp:180 ViewProjects.cpp:712 ViewWork.cpp:207 ViewWork.cpp:790
+#: sg_BoincSimpleFrame.cpp:737 sg_ProjectCommandPopup.cpp:67
#: sg_ProjectCommandPopup.cpp:113 sg_TaskCommandPopup.cpp:66
#: sg_TaskCommandPopup.cpp:106
msgid "Suspend"
msgstr "Sospendi"
-#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
+#: ViewProjects.cpp:181 ViewProjects.cpp:712 sg_ProjectCommandPopup.cpp:68
#: sg_ProjectCommandPopup.cpp:114
msgid "Suspend tasks for this project."
msgstr "Sospendi il lavoro per questo progetto."
-#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
+#: ViewProjects.cpp:187 ViewProjects.cpp:731 sg_ProjectCommandPopup.cpp:73
#: sg_ProjectCommandPopup.cpp:121
msgid "No new tasks"
msgstr "Blocca la richiesta di lavoro"
-#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
+#: ViewProjects.cpp:188 sg_ProjectCommandPopup.cpp:74
msgid "Don't get new tasks for this project."
msgstr "Non scaricare nuovo lavoro per questo progetto."
-#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
+#: ViewProjects.cpp:194 sg_ProjectCommandPopup.cpp:79
msgid "Reset project"
msgstr "Reset del progetto"
-#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:80
msgid ""
"Delete all files and tasks associated with this project, and get new tasks. "
"You can update the project first to report any completed tasks."
@@ -2933,7 +2965,7 @@ msgstr ""
"scarica nuovo lavoro. Puoi aggiornare il progetto prima di eseguire il "
"reset per riportare le elaborazioni già completate."
-#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+#: ViewProjects.cpp:202 sg_ProjectCommandPopup.cpp:86
msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
@@ -2941,165 +2973,167 @@ msgstr ""
"Rimuovi questo progetto dal computer. Il lavoro in corso andrà perso (usa "
"prima 'Aggiorna' per inviare il lavoro già completato)."
-#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
+#: ViewProjects.cpp:208 ViewWork.cpp:221 sg_ProjectCommandPopup.cpp:91
#: sg_TaskCommandPopup.cpp:78
msgid "Properties"
msgstr "Proprietà"
-#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+#: ViewProjects.cpp:209 sg_ProjectCommandPopup.cpp:92
msgid "Show project details."
msgstr "Visualizza i dettagli del progetto."
-#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+#: ViewProjects.cpp:219 ViewStatistics.cpp:442
msgid "Account"
msgstr "Account"
-#: ViewProjects.cpp:222
+#: ViewProjects.cpp:221
msgid "Work done"
msgstr "Crediti totali"
-#: ViewProjects.cpp:223
+#: ViewProjects.cpp:222
msgid "Avg. work done"
msgstr "Media dei crediti"
-#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+#: ViewProjects.cpp:224 ViewTransfers.cpp:187 ViewWork.cpp:233
msgid "Status"
msgstr "Stato"
-#: ViewProjects.cpp:250
+#: ViewProjects.cpp:249
msgid "Projects"
msgstr "Progetti"
-#: ViewProjects.cpp:302
+#: ViewProjects.cpp:301
msgid "Updating project..."
msgstr "Aggiornamento del progetto in corso..."
-#: ViewProjects.cpp:344
+#: ViewProjects.cpp:343
msgid "Resuming project..."
msgstr "Riavvio del progetto in corso..."
-#: ViewProjects.cpp:348
+#: ViewProjects.cpp:347
msgid "Suspending project..."
msgstr "Sospensione del progetto in corso..."
-#: ViewProjects.cpp:385
+#: ViewProjects.cpp:384
msgid "Telling project to allow additional task downloads..."
msgstr ""
"Comunicazione con il progetto per abilitare lo scaricamento di ulteriore "
"lavoro in corso..."
-#: ViewProjects.cpp:389
+#: ViewProjects.cpp:388
msgid "Telling project to not fetch any additional tasks..."
msgstr ""
"Comunicazione con il progetto per non ottenere ulteriore lavoro in corso..."
-#: ViewProjects.cpp:425
+#: ViewProjects.cpp:424
msgid "Resetting project..."
msgstr "Reset del progetto in corso..."
-#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#: ViewProjects.cpp:437 sg_ProjectCommandPopup.cpp:214
#, c-format
msgid "Are you sure you want to reset project '%s'?"
msgstr "Vuoi davvero fare il reset del progetto '%s'?"
-#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
+#: ViewProjects.cpp:443 sg_ProjectCommandPopup.cpp:220
msgid "Reset Project"
msgstr "Reset del progetto"
-#: ViewProjects.cpp:483
+#: ViewProjects.cpp:482
msgid "Removing project..."
msgstr "Rimozione del progetto in corso..."
-#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#: ViewProjects.cpp:495 sg_ProjectCommandPopup.cpp:251
+#: sg_StatImageLoader.cpp:192
#, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "Vuoi davvero rimuovere il progetto '%s'?"
-#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
+#: ViewProjects.cpp:501 sg_ProjectCommandPopup.cpp:257
+#: sg_StatImageLoader.cpp:138 sg_StatImageLoader.cpp:198
msgid "Remove Project"
msgstr "Disconnettiti dal progetto"
-#: ViewProjects.cpp:543 ViewWork.cpp:599
+#: ViewProjects.cpp:542 ViewWork.cpp:598
msgid "Launching browser..."
msgstr "Avvio del browser in corso..."
-#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+#: ViewProjects.cpp:708 sg_ProjectCommandPopup.cpp:111
msgid "Resume tasks for this project."
msgstr "Riprendi il lavoro per questo progetto."
-#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+#: ViewProjects.cpp:727 sg_ProjectCommandPopup.cpp:118
msgid "Allow new tasks"
msgstr "Abilita richiesta lavoro"
-#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+#: ViewProjects.cpp:727 sg_ProjectCommandPopup.cpp:119
msgid "Allow fetching new tasks for this project."
msgstr "Permetti a questo progetto di richiedere nuovo lavoro."
-#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+#: ViewProjects.cpp:731 sg_ProjectCommandPopup.cpp:122
msgid "Don't fetch new tasks for this project."
msgstr "Non richiedere nuovo lavoro per questo progetto."
-#: ViewProjects.cpp:1058
+#: ViewProjects.cpp:1048
msgid "Requested by user"
msgstr "Richiesto dall'utente"
-#: ViewProjects.cpp:1059
+#: ViewProjects.cpp:1049
msgid "To fetch work"
msgstr "Per ottenere lavoro"
-#: ViewProjects.cpp:1060
+#: ViewProjects.cpp:1050
msgid "To report completed tasks"
msgstr "Per riportare attività completate"
-#: ViewProjects.cpp:1061
+#: ViewProjects.cpp:1051
msgid "To send trickle-up message"
msgstr "Per mandare un messaggio istantaneo al server"
-#: ViewProjects.cpp:1062
+#: ViewProjects.cpp:1052
msgid "Requested by account manager"
msgstr "Richiesto dall'account manager"
-#: ViewProjects.cpp:1063
+#: ViewProjects.cpp:1053
msgid "Project initialization"
msgstr "Inizializzazione del progetto"
-#: ViewProjects.cpp:1064
+#: ViewProjects.cpp:1054
msgid "Requested by project"
msgstr "Richiesto dal progetto"
-#: ViewProjects.cpp:1065
+#: ViewProjects.cpp:1055
msgid "Unknown reason"
msgstr "Motivo sconosciuto"
-#: ViewProjects.cpp:1079
+#: ViewProjects.cpp:1069
msgid "Suspended by user"
msgstr "Sospeso dall'utente"
-#: ViewProjects.cpp:1082
+#: ViewProjects.cpp:1072
msgid "Won't get new tasks"
msgstr "Non richiedere nuovo lavoro"
-#: ViewProjects.cpp:1085
+#: ViewProjects.cpp:1075
msgid "Project ended - OK to remove"
msgstr "Progetto concluso. E' possibile rimuoverlo senza conseguenze."
-#: ViewProjects.cpp:1088
+#: ViewProjects.cpp:1078
msgid "Will remove when tasks done"
msgstr "Rimuovi il progetto al termine dell'elaborazione"
-#: ViewProjects.cpp:1091
+#: ViewProjects.cpp:1081
msgid "Scheduler request pending"
msgstr "Richiesta allo scheduler in attesa"
-#: ViewProjects.cpp:1097
+#: ViewProjects.cpp:1087
msgid "Scheduler request in progress"
msgstr "Richiesta allo scheduler in corso"
-#: ViewProjects.cpp:1100
+#: ViewProjects.cpp:1090
msgid "Trickle up message pending"
msgstr "attesa su messaggio trickle"
-#: ViewProjects.cpp:1106
+#: ViewProjects.cpp:1096
msgid "Communication deferred "
msgstr "Comunicazione rinviata "
@@ -3139,185 +3173,185 @@ msgstr "libero:"
msgid "used by other programs: "
msgstr "utilizzato da altri programmi:"
-#: ViewStatistics.cpp:1205
+#: ViewStatistics.cpp:1195
msgid "User Total"
msgstr "Totale utente"
-#: ViewStatistics.cpp:1206
+#: ViewStatistics.cpp:1196
msgid "User Average"
msgstr "Media dell'utente"
-#: ViewStatistics.cpp:1207
+#: ViewStatistics.cpp:1197
msgid "Host Total"
msgstr "Totale del computer"
-#: ViewStatistics.cpp:1208
+#: ViewStatistics.cpp:1198
msgid "Host Average"
msgstr "Media del computer"
-#: ViewStatistics.cpp:1355
+#: ViewStatistics.cpp:1345
#, c-format
msgid "Last update: %.0f days ago"
msgstr "Ultimo aggiornamento: %.0f giorni fa"
-#: ViewStatistics.cpp:1982
+#: ViewStatistics.cpp:1969
msgid "Show user total"
msgstr "Mostra il totale dell'utente"
-#: ViewStatistics.cpp:1983
+#: ViewStatistics.cpp:1970
msgid "Show total credit for user"
msgstr "Mostra i crediti totali dell'utente"
-#: ViewStatistics.cpp:1989
+#: ViewStatistics.cpp:1976
msgid "Show user average"
msgstr "Mostra la media dell'utente"
-#: ViewStatistics.cpp:1990
+#: ViewStatistics.cpp:1977
msgid "Show average credit for user"
msgstr "Mostra la media dei crediti dell'utente"
-#: ViewStatistics.cpp:1996
+#: ViewStatistics.cpp:1983
msgid "Show host total"
msgstr "Mostra il totale del computer"
-#: ViewStatistics.cpp:1997
+#: ViewStatistics.cpp:1984
msgid "Show total credit for host"
msgstr "Mostra i crediti totali del computer"
-#: ViewStatistics.cpp:2003
+#: ViewStatistics.cpp:1990
msgid "Show host average"
msgstr "Mostra la media del computer"
-#: ViewStatistics.cpp:2004
+#: ViewStatistics.cpp:1991
msgid "Show average credit for host"
msgstr "Mostra la media dei crediti del computer"
-#: ViewStatistics.cpp:2013
+#: ViewStatistics.cpp:2000
msgid "< &Previous project"
msgstr "< Progetto &precedente"
-#: ViewStatistics.cpp:2014
+#: ViewStatistics.cpp:2001
msgid "Show chart for previous project"
msgstr "Mostra il grafico per il progetto precedente"
-#: ViewStatistics.cpp:2019
+#: ViewStatistics.cpp:2006
msgid "&Next project >"
msgstr "Progetto &successivo >"
-#: ViewStatistics.cpp:2020
+#: ViewStatistics.cpp:2007
msgid "Show chart for next project"
msgstr "Mostra il grafico per il progetto successivo"
-#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+#: ViewStatistics.cpp:2013 ViewStatistics.cpp:2410
msgid "Hide project list"
msgstr "Nascondi la lista dei progetti"
-#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+#: ViewStatistics.cpp:2014 ViewStatistics.cpp:2410
msgid "Use entire area for graphs"
msgstr "Utilizza l'intera area per i grafici"
-#: ViewStatistics.cpp:2032
+#: ViewStatistics.cpp:2019
msgid "Mode view"
msgstr "Tipo di visualizzazione"
-#: ViewStatistics.cpp:2036
+#: ViewStatistics.cpp:2023
msgid "One project"
msgstr "Un progetto"
-#: ViewStatistics.cpp:2037
+#: ViewStatistics.cpp:2024
msgid "Show one chart with selected project"
msgstr "Mostra il grafico del progetto selezionato"
-#: ViewStatistics.cpp:2043
+#: ViewStatistics.cpp:2030
msgid "All projects (separate)"
msgstr "Tutti i progetti (separati)"
-#: ViewStatistics.cpp:2044
+#: ViewStatistics.cpp:2031
msgid "Show all projects, one chart per project"
msgstr "Mostra tutti i progetti, un grafico per progetto"
-#: ViewStatistics.cpp:2050
+#: ViewStatistics.cpp:2037
msgid "All projects (together)"
msgstr "Tutti i progetti (insieme)"
-#: ViewStatistics.cpp:2051
+#: ViewStatistics.cpp:2038
msgid "Show one chart with all projects"
msgstr "Mostra tutti i progetti in un unico grafico"
-#: ViewStatistics.cpp:2057
+#: ViewStatistics.cpp:2044
msgid "All projects (sum)"
msgstr "Tutti i progetti (somma)"
-#: ViewStatistics.cpp:2058
+#: ViewStatistics.cpp:2045
msgid "Show one chart with sum of projects"
msgstr "Mostrala somma dei progetti in un unico grafico"
-#: ViewStatistics.cpp:2079
+#: ViewStatistics.cpp:2073
msgid "Statistics"
msgstr "Statistiche"
-#: ViewStatistics.cpp:2103 ViewStatistics.cpp:2124 ViewStatistics.cpp:2145
-#: ViewStatistics.cpp:2167 ViewStatistics.cpp:2188 ViewStatistics.cpp:2209
-#: ViewStatistics.cpp:2230 ViewStatistics.cpp:2251 ViewStatistics.cpp:2272
-#: ViewStatistics.cpp:2296
+#: ViewStatistics.cpp:2097 ViewStatistics.cpp:2118 ViewStatistics.cpp:2139
+#: ViewStatistics.cpp:2161 ViewStatistics.cpp:2182 ViewStatistics.cpp:2203
+#: ViewStatistics.cpp:2224 ViewStatistics.cpp:2245 ViewStatistics.cpp:2266
+#: ViewStatistics.cpp:2290
msgid "Updating charts..."
msgstr "Aggiornamento dei grafici in corso..."
-#: ViewStatistics.cpp:2420
+#: ViewStatistics.cpp:2414
msgid "Show project list"
msgstr "Mostra la lista dei progetti"
-#: ViewStatistics.cpp:2420
+#: ViewStatistics.cpp:2414
msgid "Uses smaller area for graphs"
msgstr "Utilizza un'area minore per i grafici"
-#: ViewTransfers.cpp:164
+#: ViewTransfers.cpp:163
msgid "Retry Now"
msgstr "Ritenta il trasferimento"
-#: ViewTransfers.cpp:165
+#: ViewTransfers.cpp:164
msgid "Retry the file transfer now"
msgstr "Riprova il trasferimento del file ora"
-#: ViewTransfers.cpp:171
+#: ViewTransfers.cpp:170
msgid "Abort Transfer"
msgstr "Annulla il trasferimento"
-#: ViewTransfers.cpp:172
+#: ViewTransfers.cpp:171
msgid "Abort this file transfer. You won't get credit for the task."
msgstr ""
"Annulla il trasferimento di questo file. Non otterrai crediti per il "
"lavoro."
-#: ViewTransfers.cpp:183
+#: ViewTransfers.cpp:182
msgid "File"
msgstr "File"
-#: ViewTransfers.cpp:184 ViewWork.cpp:233
+#: ViewTransfers.cpp:183 ViewWork.cpp:232
msgid "Progress"
msgstr "Avanzamento"
-#: ViewTransfers.cpp:185
+#: ViewTransfers.cpp:184
msgid "Size"
msgstr "Dimensione"
-#: ViewTransfers.cpp:186
+#: ViewTransfers.cpp:185
msgid "Elapsed Time"
msgstr "Tempo trascorso"
-#: ViewTransfers.cpp:187
+#: ViewTransfers.cpp:186
msgid "Speed"
msgstr "Velocità"
-#: ViewTransfers.cpp:213
+#: ViewTransfers.cpp:212
msgid "Transfers"
msgstr "Trasferimenti"
-#: ViewTransfers.cpp:280
+#: ViewTransfers.cpp:279
msgid "Network activity is suspended - "
msgstr "L'attività di rete è sospesa -"
-#: ViewTransfers.cpp:282
+#: ViewTransfers.cpp:281
msgid ""
".\n"
"You can enable it using the Activity menu."
@@ -3325,19 +3359,19 @@ msgstr ""
".\n"
"Puoi attivarlo utlizzando il menù Attività"
-#: ViewTransfers.cpp:285
+#: ViewTransfers.cpp:284
msgid "BOINC"
msgstr "BOINC"
-#: ViewTransfers.cpp:292
+#: ViewTransfers.cpp:291
msgid "Retrying transfer now..."
msgstr "Tentativo di trasferimento in corso..."
-#: ViewTransfers.cpp:330
+#: ViewTransfers.cpp:329
msgid "Aborting transfer..."
msgstr "Interruzione del trasferimento in corso..."
-#: ViewTransfers.cpp:343
+#: ViewTransfers.cpp:342
#, c-format
msgid ""
"Are you sure you want to abort this file transfer '%s'?\n"
@@ -3348,116 +3382,120 @@ msgstr ""
"NOTA: Annullando il trasferimento, invaliderai l'elaborazione e\n"
"non otterrai i relativi crediti."
-#: ViewTransfers.cpp:349
+#: ViewTransfers.cpp:348
msgid "Abort File Transfer"
msgstr "Annulla il trasferimento del file"
-#: ViewTransfers.cpp:780
+#: ViewTransfers.cpp:769
msgid "Upload"
msgstr "Invio"
-#: ViewTransfers.cpp:780
+#: ViewTransfers.cpp:769
msgid "Download"
msgstr "Ricezione"
-#: ViewTransfers.cpp:784
+#: ViewTransfers.cpp:773
msgid "retry in "
msgstr "Riprova tra "
-#: ViewTransfers.cpp:786
+#: ViewTransfers.cpp:775
msgid "failed"
msgstr "fallito"
-#: ViewTransfers.cpp:789
+#: ViewTransfers.cpp:778
msgid "suspended"
msgstr "sospeso"
-#: ViewTransfers.cpp:794
+#: ViewTransfers.cpp:783
msgid "active"
msgstr "attivo"
-#: ViewTransfers.cpp:796
+#: ViewTransfers.cpp:785
msgid "pending"
msgstr "in attesa"
-#: ViewTransfers.cpp:803
+#: ViewTransfers.cpp:792
msgid " (project backoff: "
msgstr "(rinvio causa progetto: "
-#: ViewWork.cpp:187 ViewWork.cpp:777
+#: ViewWork.cpp:186 ViewWork.cpp:766
msgid "Show active tasks"
msgstr "Mostra le elaborazioni in corso"
-#: ViewWork.cpp:188 ViewWork.cpp:778
+#: ViewWork.cpp:187 ViewWork.cpp:767
msgid "Show only active tasks."
msgstr "Mostra solo le elaborazioni in corso."
-#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+#: ViewWork.cpp:193 sg_TaskCommandPopup.cpp:60 sg_ViewTabPage.cpp:424
msgid "Show graphics"
msgstr "Mostra la grafica"
-#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:61
msgid "Show application graphics in a window."
msgstr "Mostra la grafica dell'applicazione in una finestra."
-#: ViewWork.cpp:201
+#: ViewWork.cpp:200
msgid "Show VM Console"
msgstr "Mostra la Console VM"
-#: ViewWork.cpp:202
+#: ViewWork.cpp:201
msgid "Show VM Console in a window."
msgstr "Mostra la console VM in una finestra."
-#: ViewWork.cpp:209
+#: ViewWork.cpp:208
msgid "Suspend work for this result."
msgstr "Sospende l'elaborazione selezionata."
-#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+#: ViewWork.cpp:214 sg_TaskCommandPopup.cpp:72
msgid "Abort"
msgstr "Annulla"
-#: ViewWork.cpp:216
+#: ViewWork.cpp:215
msgid "Abandon work on the result. You will get no credit for it."
msgstr ""
"Abbandona l'elaborazione selezionata. In questo modo non otterai crediti."
-#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+#: ViewWork.cpp:222 sg_TaskCommandPopup.cpp:79
msgid "Show task details."
msgstr "Visualizza i dettagli dell'elaborazione."
-#: ViewWork.cpp:235
+#: ViewWork.cpp:234
msgid "Elapsed"
msgstr "Tempo"
-#: ViewWork.cpp:236
+#: ViewWork.cpp:235
msgid "Remaining (estimated)"
msgstr "Tempo mancante (stimato)"
-#: ViewWork.cpp:237
+#: ViewWork.cpp:236
msgid "Deadline"
msgstr "Scadenza"
-#: ViewWork.cpp:264
+#: ViewWork.cpp:238
+msgid "Name"
+msgstr "Nome"
+
+#: ViewWork.cpp:263
msgid "Tasks"
msgstr "Elaborazioni"
-#: ViewWork.cpp:357
+#: ViewWork.cpp:356
msgid "Resuming task..."
msgstr "Avvio dell'elaborazione..."
-#: ViewWork.cpp:360
+#: ViewWork.cpp:359
msgid "Suspending task..."
msgstr "Sospensione dell'elaborazione..."
-#: ViewWork.cpp:389
+#: ViewWork.cpp:388
msgid "Showing graphics for task..."
msgstr "Mostra la grafica dell'applicazione..."
-#: ViewWork.cpp:426
+#: ViewWork.cpp:425
msgid "Showing VM console for task..."
msgstr "Mostra la console VM per il lavoro..."
-#: ViewWork.cpp:479
+#: ViewWork.cpp:478
#, c-format
msgid ""
"Are you sure you want to abort this task '%s'?\n"
@@ -3466,33 +3504,33 @@ msgstr ""
"Sei sicuro di voler annullare l'elaborazione di '%s'?\n"
"(Avanzamento: %s, Stato: %s)"
-#: ViewWork.cpp:485
+#: ViewWork.cpp:484
#, c-format
msgid "Are you sure you want to abort these %d tasks?"
msgstr "Sei sicuro di voler annullare queste %d elaborazioni?"
-#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+#: ViewWork.cpp:489 sg_TaskCommandPopup.cpp:256
msgid "Abort task"
msgstr "Annulla l'elaborazione"
# 75%
-#: ViewWork.cpp:499
+#: ViewWork.cpp:498
msgid "Aborting task..."
msgstr "Interruzione del lavoro in corso..."
-#: ViewWork.cpp:771
+#: ViewWork.cpp:760
msgid "Show all tasks"
msgstr "Mostra tutte le elaborazioni"
-#: ViewWork.cpp:772
+#: ViewWork.cpp:761
msgid "Show all tasks."
msgstr "Mostra tutte le elaborazioni."
-#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+#: ViewWork.cpp:785 sg_TaskCommandPopup.cpp:103
msgid "Resume work for this task."
msgstr "Riprendi l'elaborazione selezionata."
-#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+#: ViewWork.cpp:791 sg_TaskCommandPopup.cpp:107
msgid "Suspend work for this task."
msgstr "Sospendi l'elaborazione selezionata."
@@ -3585,189 +3623,344 @@ msgstr "Aggiungi o cambia i tuoi progetti World Community Grid"
msgid "Add projects run by other researchers or organizations"
msgstr "Aggiungi progetti gestiti da altri istituti di ricerca o organizzazioni"
-#: WizardAttach.cpp:634
+#: WizardAttach.cpp:635
msgid "Do you really want to cancel?"
msgstr "Sei certo di voler annullare?"
-#: WizardAttach.cpp:635
+#: WizardAttach.cpp:636
msgid "Question"
msgstr "Domanda"
-#: sg_BoincSimpleFrame.cpp:149
+#: sg_BoincSimpleFrame.cpp:136 sg_BoincSimpleGUI.cpp:119
msgid "Advanced View...\tCtrl+Shift+A"
msgstr "Visualizzazione Avanzata...\tCtrl+Shift+A"
-#: sg_BoincSimpleFrame.cpp:150
+#: sg_BoincSimpleFrame.cpp:137
msgid "Display the advanced graphical interface."
msgstr "Visualizza l'interfaccia grafica avanzata di BOINC"
-#: sg_BoincSimpleFrame.cpp:157
+#: sg_BoincSimpleFrame.cpp:144
msgid "Skin"
msgstr "Interfaccia"
-#: sg_BoincSimpleFrame.cpp:159
+#: sg_BoincSimpleFrame.cpp:146
msgid "Select the appearance of the user interface."
msgstr "Seleziona la grafica dell'interfaccia utente."
-#: sg_BoincSimpleFrame.cpp:206
+#: sg_BoincSimpleFrame.cpp:193 sg_BoincSimpleGUI.cpp:147
#, c-format
msgid "&%s"
msgstr "&%s"
-#: sg_BoincSimpleFrame.cpp:390
+#: sg_BoincSimpleFrame.cpp:369
msgid "Default"
msgstr "Predefinito"
-#: sg_BoincSimpleFrame.cpp:759
+#: sg_BoincSimpleFrame.cpp:739
msgid "Suspend Computing"
msgstr "Sospendi Lavoro"
-#: sg_BoincSimpleFrame.cpp:760
+#: sg_BoincSimpleFrame.cpp:740
msgid "Resume Computing"
msgstr "Riprendi Lavoro"
-#: sg_BoincSimpleFrame.cpp:777
+#: sg_BoincSimpleFrame.cpp:757
msgid "Open a window to view notices from projects or BOINC"
msgstr "Apri una finestra per visualizzare gli avvisi dai progetti o dal BOINC"
-#: sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Chiudi"
+#: sg_BoincSimpleGUI.cpp:120
+msgid "Display the advanced (accessible) graphical interface."
+msgstr "Visualizza l'interfaccia grafica avanzata."
-#: sg_DlgMessages.cpp:389
-#, c-format
-msgid "%s - Notices"
-msgstr "Avvisi di %s"
+#: sg_ClientStateIndicator.cpp:288 sg_TaskPanel.cpp:1207
+msgid "Retrieving current status."
+msgstr "Ricezione dello stato corrente in corso."
-#: sg_DlgPreferences.cpp:268
-msgid "This dialog controls preferences for this computer only."
-msgstr "Questa finestra controlla le preferenze solo di questo computer."
+#: sg_ClientStateIndicator.cpp:291 sg_TaskPanel.cpp:448
+msgid "You don't have any projects. Please Add a Project."
+msgstr "Non sei connesso ad alcun progetto. Prima connettiti ad un progetto."
-#: sg_DlgPreferences.cpp:273
-msgid "Click OK to set preferences."
-msgstr "Clicca OK per salvare le preferenze."
+#: sg_ClientStateIndicator.cpp:294 sg_TaskPanel.cpp:1213
+msgid "Downloading work from the server."
+msgstr "Scaricamento del lavoro dal server in corso."
-#: sg_DlgPreferences.cpp:278
-msgid ""
-"Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
-"Clicca \"Cancella\" per ripristinare le impostazioni basate sul web per tutte "
-"le preferenze elencate sotto."
+#: sg_ClientStateIndicator.cpp:299 sg_TaskPanel.cpp:1218
+msgid "Processing Suspended: Running On Batteries."
+msgstr "Elaborazione sospesa: alimentazione a batterie."
-#: sg_DlgPreferences.cpp:285
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
-"Per impostazioni aggiuntive, seleziona Preferenze di elaborazione nella "
-"Vista Avanzata."
+#: sg_ClientStateIndicator.cpp:301 sg_TaskPanel.cpp:1220
+msgid "Processing Suspended: User Active."
+msgstr "Elaborazione sospesa: l'utente è attivo."
-#: sg_DlgPreferences.cpp:313
-msgid "Do work only between:"
-msgstr "Elabora solamente tra:"
+#: sg_ClientStateIndicator.cpp:303 sg_TaskPanel.cpp:1222
+msgid "Processing Suspended: User paused processing."
+msgstr "Elaborazione sospesa: l'utente ha sospeso l'elaborazione."
-#: sg_DlgPreferences.cpp:335
-msgid "Connect to internet only between:"
-msgstr "Connetti ad internet solamente tra:"
+#: sg_ClientStateIndicator.cpp:305 sg_TaskPanel.cpp:1224
+msgid "Processing Suspended: Time of Day."
+msgstr "Elaborazione sospesa: superati i limiti di orario."
-#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
-msgid "Use no more than:"
-msgstr "Non utilizzare più di:"
+#: sg_ClientStateIndicator.cpp:307 sg_TaskPanel.cpp:1226
+msgid "Processing Suspended: Benchmarks Running."
+msgstr "Elaborazione sospesa: esecuzione dei benchmark."
-#: sg_DlgPreferences.cpp:370
-msgid "of disk space"
-msgstr "di spazio sul disco"
+#: sg_ClientStateIndicator.cpp:309 sg_TaskPanel.cpp:1228
+msgid "Processing Suspended."
+msgstr "Elaborazione sospesa."
-#: sg_DlgPreferences.cpp:387
-msgid "of the processor"
-msgstr "del processore"
+#: sg_ClientStateIndicator.cpp:313 sg_TaskPanel.cpp:1232
+msgid "Waiting to contact project servers."
+msgstr "In attesa di contattare i server dei progetti."
-#: sg_DlgPreferences.cpp:391
-msgid "Do work while on battery?"
-msgstr "Elabora quando il pc è alimentato a batterie?"
+#: sg_ClientStateIndicator.cpp:317 sg_ClientStateIndicator.cpp:325
+#: sg_TaskPanel.cpp:1236 sg_TaskPanel.cpp:1245
+msgid "Retrieving current status"
+msgstr "Ricezione dello stato corrente in corso"
-#: sg_DlgPreferences.cpp:404
-msgid "Do work after idle for:"
-msgstr "Elabora dopo che il PC è inutilizzato da:"
+#: sg_ClientStateIndicator.cpp:320 sg_TaskPanel.cpp:1240
+msgid "No work available to process"
+msgstr "Nessun lavoro disponibile da elaborare"
-#: sg_DlgPreferences.cpp:429
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Rimuovi tutte le preferenze locali e chiudi la finestra"
+#: sg_ClientStateIndicator.cpp:322 sg_TaskPanel.cpp:1242
+msgid "Unable to connect to the core client"
+msgstr "Impossibile connettersi al client BOINC"
-#: sg_DlgPreferences.cpp:602 sg_DlgPreferences.cpp:605
-#: sg_DlgPreferences.cpp:681 sg_DlgPreferences.cpp:685
-#: sg_DlgPreferences.cpp:697 sg_DlgPreferences.cpp:701
-#: sg_DlgPreferences.cpp:844 sg_DlgPreferences.cpp:855
-msgid "Anytime"
-msgstr "Qualunque momento"
+#: sg_DlgMessages.cpp:164
+msgid "Close"
+msgstr "Chiudi"
+
+#: sg_DlgMessages.cpp:463
+#, c-format
+msgid "%s - Notices"
+msgstr "Avvisi di %s"
-#: sg_DlgPreferences.cpp:638
+#: sg_DlgPreferences.cpp:94
msgid "100 MB"
msgstr "100 MB"
-#: sg_DlgPreferences.cpp:639
+#: sg_DlgPreferences.cpp:95
msgid "200 MB"
msgstr "200 MB"
-#: sg_DlgPreferences.cpp:640
+#: sg_DlgPreferences.cpp:96
msgid "500 MB"
msgstr "500 MB"
-#: sg_DlgPreferences.cpp:641
+#: sg_DlgPreferences.cpp:97
msgid "1 GB"
msgstr "1 GB"
-#: sg_DlgPreferences.cpp:642
+#: sg_DlgPreferences.cpp:98
msgid "2 GB"
msgstr "2 GB"
-#: sg_DlgPreferences.cpp:643
+#: sg_DlgPreferences.cpp:99
msgid "5 GB"
msgstr "5 GB"
-#: sg_DlgPreferences.cpp:644
+#: sg_DlgPreferences.cpp:100
msgid "10 GB"
msgstr "10 GB"
-#: sg_DlgPreferences.cpp:645
+#: sg_DlgPreferences.cpp:101
msgid "20 GB"
msgstr "20 GB"
-#: sg_DlgPreferences.cpp:646
+#: sg_DlgPreferences.cpp:102
msgid "50 GB"
msgstr "50 GB"
-#: sg_DlgPreferences.cpp:647
+#: sg_DlgPreferences.cpp:103
msgid "100 GB"
msgstr "100 GB"
-#: sg_DlgPreferences.cpp:717
+#: sg_DlgPreferences.cpp:134
+msgid "10%"
+msgstr "10%"
+
+#: sg_DlgPreferences.cpp:135
+msgid "20%"
+msgstr "20%"
+
+#: sg_DlgPreferences.cpp:136
+msgid "30%"
+msgstr "30%"
+
+#: sg_DlgPreferences.cpp:137
+msgid "40%"
+msgstr "40%"
+
+#: sg_DlgPreferences.cpp:138
+msgid "50%"
+msgstr "50%"
+
+#: sg_DlgPreferences.cpp:139
+msgid "60%"
+msgstr "60%"
+
+#: sg_DlgPreferences.cpp:140
+msgid "70%"
+msgstr "70%"
+
+#: sg_DlgPreferences.cpp:141
+msgid "80%"
+msgstr "80%"
+
+#: sg_DlgPreferences.cpp:142
+msgid "90%"
+msgstr "90%"
+
+#: sg_DlgPreferences.cpp:143
+msgid "100%"
+msgstr "100%"
+
+#: sg_DlgPreferences.cpp:168
+msgid "1"
+msgstr "1"
+
+#: sg_DlgPreferences.cpp:169
+msgid "3"
+msgstr "3"
+
+#: sg_DlgPreferences.cpp:170
+msgid "5"
+msgstr "5"
+
+#: sg_DlgPreferences.cpp:171
+msgid "10"
+msgstr "10"
+
+#: sg_DlgPreferences.cpp:172
+msgid "15"
+msgstr "15"
+
+#: sg_DlgPreferences.cpp:173
+msgid "30"
+msgstr "30"
+
+#: sg_DlgPreferences.cpp:174
+msgid "60"
+msgstr "60"
+
+#: sg_DlgPreferences.cpp:282
+msgid "This dialog controls preferences for this computer only."
+msgstr "Questa finestra controlla le preferenze solo di questo computer."
+
+#: sg_DlgPreferences.cpp:287
+msgid "Click OK to set preferences."
+msgstr "Clicca OK per salvare le preferenze."
+
+#: sg_DlgPreferences.cpp:292
+msgid "Click Clear to restore web-based settings."
+msgstr "Clicca Cancella per ripristinare le preferenze web."
+
+#: sg_DlgPreferences.cpp:299
+msgid "For additional settings, select Computing Preferences in "
+msgstr "Per impostazioni aggiuntive, seleziona Preferenze di elaborazione nel "
+
+#: sg_DlgPreferences.cpp:304
+msgid "the Advanced View."
+msgstr "la Visualizzazione Avanzata."
+
+#: sg_DlgPreferences.cpp:332
+msgid "Do work only between:"
+msgstr "Elabora solamente tra:"
+
+#: sg_DlgPreferences.cpp:354
+msgid "Connect to internet only between:"
+msgstr "Connetti ad internet solamente tra:"
+
+#: sg_DlgPreferences.cpp:376 sg_DlgPreferences.cpp:393
+msgid "Use no more than:"
+msgstr "Non utilizzare più di:"
+
+#: sg_DlgPreferences.cpp:389
+msgid "of disk space"
+msgstr "di spazio sul disco"
+
+#: sg_DlgPreferences.cpp:406
+msgid "of the processor"
+msgstr "del processore"
+
+#: sg_DlgPreferences.cpp:410
+msgid "Do work while on battery?"
+msgstr "Elabora quando il pc è alimentato a batterie?"
+
+#: sg_DlgPreferences.cpp:423
+msgid "Do work after idle for:"
+msgstr "Elabora dopo che il PC è inutilizzato da:"
+
+#: sg_DlgPreferences.cpp:621 sg_DlgPreferences.cpp:624
+#: sg_DlgPreferences.cpp:683 sg_DlgPreferences.cpp:687
+#: sg_DlgPreferences.cpp:699 sg_DlgPreferences.cpp:703
+#: sg_DlgPreferences.cpp:846 sg_DlgPreferences.cpp:857
+msgid "Anytime"
+msgstr "Qualunque momento"
+
+#: sg_DlgPreferences.cpp:719
#, c-format
msgid "%d MB"
msgstr "%d MB"
-#: sg_DlgPreferences.cpp:719
+#: sg_DlgPreferences.cpp:721
#, c-format
msgid "%4.2f GB"
msgstr "%4.2f GB"
-#: sg_DlgPreferences.cpp:760
+#: sg_DlgPreferences.cpp:762
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: sg_DlgPreferences.cpp:796
+#: sg_DlgPreferences.cpp:798
msgid "0 (Run Always)"
msgstr "0 (Elabora sempre)"
-#: sg_DlgPreferences.cpp:799
+#: sg_DlgPreferences.cpp:801
#, c-format
msgid "%d"
msgstr "%d"
-#: sg_DlgPreferences.cpp:1029
+#: sg_DlgPreferences.cpp:1031
msgid "Do you really want to clear all local preferences?\n"
msgstr "Vuoi veramente cancellare tutte le preferenze locali?\n"
+#: sg_ImageButton.cpp:90
+msgid "Paused: Other work running"
+msgstr "In pausa: altre elaborazioni in corso"
+
+#: sg_ImageButton.cpp:92
+msgid "Paused: User initiated. Click 'Resume' to continue"
+msgstr "In pausa: impostato dall'utente. Clicca su 'Riprendi' per continuare"
+
+#: sg_ImageButton.cpp:94
+msgid "Paused: User active"
+msgstr "In pausa: utente attivo"
+
+#: sg_ImageButton.cpp:96
+msgid "Paused: Computer on battery"
+msgstr "In pausa: alimentazione a batteria"
+
+#: sg_ImageButton.cpp:98
+msgid "Paused: Time of Day"
+msgstr "In pausa: superati i limiti di orario"
+
+#: sg_ImageButton.cpp:100
+msgid "Paused: Benchmarks running"
+msgstr "In pausa: esecuzione dei benchmark"
+
+#: sg_ImageButton.cpp:102
+msgid "Paused"
+msgstr "Sospeso"
+
+#: sg_ImageButton.cpp:104
+msgid "Paused: Application start delayed"
+msgstr "Sospeso: l'avvio dell'applicazione è stato rimandato"
+
+#: sg_ImageButton.cpp:132
+msgid "Click to show project graphics"
+msgstr "Clicca per visualizzare la grafica del progetto"
+
#: sg_ProjectPanel.cpp:72
msgid "Add Project"
msgstr "Aggiungi un progetto"
@@ -3780,7 +3973,7 @@ msgstr "Sincronizza"
msgid "Work done for this project"
msgstr "Lavoro svolto per questo progetto"
-#: sg_ProjectPanel.cpp:77
+#: sg_ProjectPanel.cpp:77 sg_ProjectsComponent.cpp:123
msgid "Synchronize projects with account manager system"
msgstr "Sincronizza i progetti con il sistema dell'account manager"
@@ -3799,7 +3992,7 @@ msgstr "Comandi del Progetto"
#: sg_ProjectPanel.cpp:267
#, c-format
-msgid "Pop up a menu of web sites for project %s"
+msgid "Pop up a menu of websites for project %s"
msgstr "Apri una finestra con i siti web per il progetto %s"
#: sg_ProjectPanel.cpp:269
@@ -3807,6 +4000,35 @@ msgstr "Apri una finestra con i siti web per il progetto %s"
msgid "Pop up a menu of commands to apply to project %s"
msgstr "Apri una finestra di menù dei comandi da applicare al progetto %s"
+#: sg_ProjectsComponent.cpp:196 sg_ProjectsComponent.cpp:207
+msgid "Open a window to view messages"
+msgstr "Apri la finestra per visualizzare i messaggi"
+
+#: sg_ProjectsComponent.cpp:225
+msgid "Stop all activity"
+msgstr "Ferma tutte le attività"
+
+#: sg_ProjectsComponent.cpp:237
+msgid "Resume activity"
+msgstr "Riprendi le attività"
+
+#: sg_ProjectsComponent.cpp:254
+msgid "Open a window to set your preferences"
+msgstr "Apri la finestra per impostare le tue preferenze"
+
+#: sg_ProjectsComponent.cpp:271
+msgid "Switch to the BOINC advanced view"
+msgstr "Passa alla visualizzazione avanzata di BOINC"
+
+#: sg_ProjectsComponent.cpp:298
+msgid "My Projects:"
+msgstr "I miei progetti:"
+
+#: sg_StatImageLoader.cpp:101
+#, c-format
+msgid "%s. Work done by %s: %0.2f"
+msgstr "%s. Crediti ottenuti da %s: %0.2f"
+
#: sg_TaskCommandPopup.cpp:67
msgid "Suspend this task."
msgstr "Sospendi questo lavoro."
@@ -3824,118 +4046,92 @@ msgstr ""
"Sei sicuro di voler annullare l'elaborazione di '%s'?\n"
"(Avanzamento: %.1lf%%, Stato: %s)"
-#: sg_TaskPanel.cpp:464
-msgid "You don't have any projects. Please Add a Project."
-msgstr "Non sei connesso ad alcun progetto. Prima connettiti ad un progetto."
-
-#: sg_TaskPanel.cpp:465
+#: sg_TaskPanel.cpp:449
msgid "Not available"
msgstr "Non disponibile"
-#: sg_TaskPanel.cpp:476
+#: sg_TaskPanel.cpp:460
msgid "Tasks:"
msgstr "Elaborazioni:"
-#: sg_TaskPanel.cpp:482
+#: sg_TaskPanel.cpp:466
msgid "Select a task to access"
msgstr "Seleziona un'attività alla quale acccedere"
-#: sg_TaskPanel.cpp:493
+#: sg_TaskPanel.cpp:477
msgid "From:"
msgstr "Da:"
-#: sg_TaskPanel.cpp:547
+#: sg_TaskPanel.cpp:531
msgid "This task's progress"
msgstr "Avanzamento di questa attività"
-#: sg_TaskPanel.cpp:565
+#: sg_TaskPanel.cpp:549
msgid "Task Commands"
msgstr "Comandi dell'attività"
-#: sg_TaskPanel.cpp:566
+#: sg_TaskPanel.cpp:550
msgid "Pop up a menu of commands to apply to this task"
msgstr "Apri una finestra di menù dei comandi da applicare a questo lavoro"
-#: sg_TaskPanel.cpp:701
+#: sg_TaskPanel.cpp:685
#, c-format
msgid "Application: %s"
msgstr "Applicazione: %s"
-#: sg_TaskPanel.cpp:724
+#: sg_TaskPanel.cpp:708
#, c-format
msgid "%.3f%%"
msgstr "%.3f%%"
-#: sg_TaskPanel.cpp:732
+#: sg_TaskPanel.cpp:716
msgid "Application: Not available"
msgstr "Applicazione: Non disponibile"
-#: sg_TaskPanel.cpp:832
+#: sg_TaskPanel.cpp:816
msgid "Not Available"
msgstr "Non disponibile"
-#: sg_TaskPanel.cpp:847
+#: sg_TaskPanel.cpp:831
#, c-format
msgid "Elapsed: %s"
msgstr "Trascorso: %s"
-#: sg_TaskPanel.cpp:861
+#: sg_TaskPanel.cpp:845
#, c-format
msgid "Remaining (estimated): %s"
msgstr "Tempo mancante: %s"
-#: sg_TaskPanel.cpp:876
+#: sg_TaskPanel.cpp:860
#, c-format
msgid "Status: %s"
msgstr "Stato: %s"
-#: sg_TaskPanel.cpp:1223
-msgid "Retrieving current status."
-msgstr "Ricezione dello stato corrente in corso."
-
-#: sg_TaskPanel.cpp:1229
-msgid "Downloading work from the server."
-msgstr "Scaricamento del lavoro dal server in corso."
-
-#: sg_TaskPanel.cpp:1234
-msgid "Processing Suspended: Running On Batteries."
-msgstr "Elaborazione sospesa: alimentazione a batterie."
-
-#: sg_TaskPanel.cpp:1236
-msgid "Processing Suspended: User Active."
-msgstr "Elaborazione sospesa: l'utente è attivo."
-
-#: sg_TaskPanel.cpp:1238
-msgid "Processing Suspended: User paused processing."
-msgstr "Elaborazione sospesa: l'utente ha sospeso l'elaborazione."
-
-#: sg_TaskPanel.cpp:1240
-msgid "Processing Suspended: Time of Day."
-msgstr "Elaborazione sospesa: superati i limiti di orario."
-
-#: sg_TaskPanel.cpp:1242
-msgid "Processing Suspended: Benchmarks Running."
-msgstr "Elaborazione sospesa: esecuzione dei benchmark."
+#: sg_ViewTabPage.cpp:140 sg_ViewTabPage.cpp:280
+#, c-format
+msgid "%.1lf"
+msgstr "%.1lf"
-#: sg_TaskPanel.cpp:1244
-msgid "Processing Suspended."
-msgstr "Elaborazione sospesa."
+#: sg_ViewTabPage.cpp:409
+#, c-format
+msgid "%d hr %d min %d sec"
+msgstr "%d ore %d min %d sec"
-#: sg_TaskPanel.cpp:1248
-msgid "Waiting to contact project servers."
-msgstr "In attesa di contattare i server dei progetti."
+#: sg_ViewTabPage.cpp:423
+msgid "Are you sure you want to display graphics on a remote machine?"
+msgstr "Sei sicuro di voler mostrare la grafica in remoto?"
-#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
-msgid "Retrieving current status"
-msgstr "Ricezione dello stato corrente in corso"
+#: sg_ViewTabPage.cpp:446
+msgid "Application: "
+msgstr "Applicazione:"
-#: sg_TaskPanel.cpp:1256
-msgid "No work available to process"
-msgstr "Nessun lavoro disponibile da elaborare"
+#: sg_ViewTabPage.cpp:449 sg_ViewTabPage.cpp:453
+msgid "Time Remaining: "
+msgstr "Tempo mancante:"
-#: sg_TaskPanel.cpp:1258
-msgid "Unable to connect to the core client"
-msgstr "Impossibile connettersi al client BOINC"
+#: sg_ViewTabPage.cpp:452
+msgid "Elapsed Time: "
+msgstr "Tempo trascorso:"
#: wizardex.cpp:377 wizardex.cpp:553
msgid "&Next >"
@@ -3949,293 +4145,124 @@ msgstr "< &Indietro"
msgid "&Finish"
msgstr "&Fine"
-#: mac/Mac_GUI.cpp:110
-msgid "Preferences…"
-msgstr "Preferenze..."
+#: mac/MacAccessiblity.cpp:257
+msgid ""
+"for accessibility support, please select advanced from the view menu or type "
+"command shift a"
+msgstr ""
+"per il supporto accessibilità, per favore seleziona avanzate dal menu "
+"visualizza oppure premi command shift a"
-#: mac/Mac_GUI.cpp:122
-msgid "Services"
-msgstr "Servizi"
+#: mac/MacAccessiblity.cpp:302
+msgid "This panel contains graphs showing user totals for projects"
+msgstr ""
+"Questo pannello contiene grafici che visualizzano il totale utente per i "
+"progetti"
-#: mac/Mac_GUI.cpp:144
-#, c-format
-msgid "Hide %s"
-msgstr "Nascondi %s"
+#: mac/MacAccessiblity.cpp:726
+msgid "list headers"
+msgstr "intestazioni della lista"
-#: mac/Mac_GUI.cpp:158
-msgid "Hide Others"
-msgstr "Nascondi gli altri"
+#: mac/MacAccessiblity.cpp:732
+msgid "list of events"
+msgstr "lista degli eventi"
-#: mac/Mac_GUI.cpp:172
-msgid "Show All"
-msgstr "Mostra tutti"
+#: mac/MacAccessiblity.cpp:734
+msgid "list of events is empty"
+msgstr "la lista degli eventi è vuota"
-#: mac/Mac_GUI.cpp:186
+#: mac/MacAccessiblity.cpp:739
#, c-format
-msgid "Quit %s"
-msgstr "Esci da %s"
-
-#~ msgid "Account manager website"
-#~ msgstr "Sito web dell'account manager"
-
-#~ msgid "Account Manager &URL:"
-#~ msgstr "&URL dell'Account Manager:"
+msgid "list of %s"
+msgstr "lista di %s"
+#: mac/MacAccessiblity.cpp:741
#, c-format
-#~ msgid "%s &website"
-#~ msgstr "Sito &web di %s"
-
-#~ msgid "invalid float"
-#~ msgstr "numero decimale non valido"
-
-#~ msgid "Workunit name"
-#~ msgstr "Nome dell'unità di lavoro"
-
-#~ msgid "Notice List"
-#~ msgstr "Lista degli avvisi"
+msgid "list of %s is empty"
+msgstr "la lista di %s è vuota"
+#: mac/MacAccessiblity.cpp:843
#, c-format
-#~ msgid "%s; received on %s"
-#~ msgstr "%s; ricevuto su %s"
+msgid "; current sort column %d of %d; descending order; "
+msgstr "; ordinamento corrente della colonna %d di %d; ordine discendente;"
+#: mac/MacAccessiblity.cpp:845
#, c-format
-#~ msgid "%s; received from %s; on %s"
-#~ msgstr "%s: ricevuto da %s; su %s"
-
-#~ msgid "Click"
-#~ msgstr "Clicca"
-
-#~ msgid "Project List"
-#~ msgstr "Lista dei Progetti"
-
-#~ msgid "Nvidia GPU Supported"
-#~ msgstr "GPU Nvidia Supportata"
-
-#~ msgid "ATI GPU Supported"
-#~ msgstr "GPU ATI Supportata"
-
-#~ msgid "Project Website"
-#~ msgstr "Sito web progetto"
-
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Non accetto le condizioni d'uso."
-
-#~ msgid "One or more items failed to load from the Internet."
-#~ msgstr "Lo scaricamento di uno o più elementi da Internet è fallito."
-
-# 88%
-#~ msgid "Retry now"
-#~ msgstr "Ritenta ora"
-
-#~ msgid "Display the advanced (accessible) graphical interface."
-#~ msgstr "Visualizza l'interfaccia grafica avanzata."
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "100%"
-#~ msgstr "100%"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "10"
-#~ msgstr "10"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "30"
-#~ msgstr "30"
-
-#~ msgid "60"
-#~ msgstr "60"
-
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Clicca Cancella per ripristinare le preferenze web."
-
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Per impostazioni aggiuntive, seleziona Preferenze di elaborazione nel "
-
-#~ msgid "the Advanced View."
-#~ msgstr "la Visualizzazione Avanzata."
-
-#~ msgid "Paused: Other work running"
-#~ msgstr "In pausa: altre elaborazioni in corso"
-
-#~ msgid "Paused: User initiated. Click 'Resume' to continue"
-#~ msgstr "In pausa: impostato dall'utente. Clicca su 'Riprendi' per continuare"
-
-#~ msgid "Paused: User active"
-#~ msgstr "In pausa: utente attivo"
-
-#~ msgid "Paused: Computer on battery"
-#~ msgstr "In pausa: alimentazione a batteria"
-
-#~ msgid "Paused: Time of Day"
-#~ msgstr "In pausa: superati i limiti di orario"
-
-#~ msgid "Paused: Benchmarks running"
-#~ msgstr "In pausa: esecuzione dei benchmark"
-
-#~ msgid "Paused"
-#~ msgstr "Sospeso"
-
-#~ msgid "Paused: Application start delayed"
-#~ msgstr "Sospeso: l'avvio dell'applicazione è stato rimandato"
-
-#~ msgid "Click to show project graphics"
-#~ msgstr "Clicca per visualizzare la grafica del progetto"
+msgid "; current sort column %d of %d; ascending order; "
+msgstr "; ordinamento corrente della colonna %d di %d; ordinamento ascendente;"
+#: mac/MacAccessiblity.cpp:848
#, c-format
-#~ msgid "Pop up a menu of websites for project %s"
-#~ msgstr "Apri una finestra con i siti web per il progetto %s"
-
-#~ msgid "Open a window to view messages"
-#~ msgstr "Apri la finestra per visualizzare i messaggi"
-
-#~ msgid "Stop all activity"
-#~ msgstr "Ferma tutte le attività"
+msgid "; column %d of %d; "
+msgstr "; colonna %d di %d"
-#~ msgid "Resume activity"
-#~ msgstr "Riprendi le attività"
-
-#~ msgid "Open a window to set your preferences"
-#~ msgstr "Apri la finestra per impostare le tue preferenze"
-
-#~ msgid "Switch to the BOINC advanced view"
-#~ msgstr "Passa alla visualizzazione avanzata di BOINC"
-
-#~ msgid "My Projects:"
-#~ msgstr "I miei progetti:"
+#: mac/MacAccessiblity.cpp:855
+msgid "list is empty"
+msgstr "la lista è vuota"
+#: mac/MacAccessiblity.cpp:858 mac/MacAccessiblity.cpp:870
#, c-format
-#~ msgid "%s. Work done by %s: %0.2f"
-#~ msgstr "%s. Crediti ottenuti da %s: %0.2f"
+msgid "; row %d; "
+msgstr "; riga %d;"
+#: mac/MacAccessiblity.cpp:862
#, c-format
-#~ msgid "%.1lf"
-#~ msgstr "%.1lf"
+msgid "; selected row %d of %d; "
+msgstr "; riga selezionara %d di %d"
+#: mac/MacAccessiblity.cpp:864
#, c-format
-#~ msgid "%d hr %d min %d sec"
-#~ msgstr "%d ore %d min %d sec"
-
-#~ msgid "Are you sure you want to display graphics on a remote machine?"
-#~ msgstr "Sei sicuro di voler mostrare la grafica in remoto?"
-
-#~ msgid "Application: "
-#~ msgstr "Applicazione:"
-
-#~ msgid "Time Remaining: "
-#~ msgstr "Tempo mancante:"
-
-#~ msgid "Elapsed Time: "
-#~ msgstr "Tempo trascorso:"
-
-#~ msgid ""
-#~ "for accessibility support, please select advanced from the view menu or type "
-#~ "command shift a"
-#~ msgstr ""
-#~ "per il supporto accessibilità, per favore seleziona avanzate dal menu "
-#~ "visualizza oppure premi command shift a"
-
-#~ msgid "This panel contains graphs showing user totals for projects"
-#~ msgstr ""
-#~ "Questo pannello contiene grafici che visualizzano il totale utente per i "
-#~ "progetti"
-
-#~ msgid "list headers"
-#~ msgstr "intestazioni della lista"
-
-#~ msgid "list of events"
-#~ msgstr "lista degli eventi"
-
-#~ msgid "list of events is empty"
-#~ msgstr "la lista degli eventi è vuota"
+msgid "; selected row %d ; "
+msgstr "; riga selezionata %d ;"
+#: mac/MacAccessiblity.cpp:868
#, c-format
-#~ msgid "list of %s"
-#~ msgstr "lista di %s"
+msgid "; row %d of %d; "
+msgstr "riga %d di %d "
-#, c-format
-#~ msgid "list of %s is empty"
-#~ msgstr "la lista di %s è vuota"
-
-#, c-format
-#~ msgid "; current sort column %d of %d; descending order; "
-#~ msgstr "; ordinamento corrente della colonna %d di %d; ordine discendente;"
+#: mac/MacAccessiblity.cpp:881
+msgid "blank"
+msgstr "vuota"
-#, c-format
-#~ msgid "; current sort column %d of %d; ascending order; "
-#~ msgstr "; ordinamento corrente della colonna %d di %d; ordinamento ascendente;"
+#: mac/MacAccessiblity.cpp:1523
+msgid "list of projects or account managers"
+msgstr "Elenco dei progetti o degli account manager"
+#: mac/MacAccessiblity.cpp:1575
#, c-format
-#~ msgid "; column %d of %d; "
-#~ msgstr "; colonna %d di %d"
-
-#~ msgid "list is empty"
-#~ msgstr "la lista è vuota"
+msgid "selected row %d of %d; "
+msgstr "riga selezionata %d di %d;"
+#: mac/MacAccessiblity.cpp:1577
#, c-format
-#~ msgid "; row %d; "
-#~ msgstr "; riga %d;"
+msgid "row %d of %d; "
+msgstr "riga %d di %d "
-#, c-format
-#~ msgid "; selected row %d of %d; "
-#~ msgstr "; riga selezionara %d di %d"
+#: mac/Mac_GUI.cpp:109
+msgid "Preferences…"
+msgstr "Preferenze..."
-#, c-format
-#~ msgid "; selected row %d ; "
-#~ msgstr "; riga selezionata %d ;"
+#: mac/Mac_GUI.cpp:121
+msgid "Services"
+msgstr "Servizi"
+#: mac/Mac_GUI.cpp:143
#, c-format
-#~ msgid "; row %d of %d; "
-#~ msgstr "riga %d di %d "
-
-#~ msgid "blank"
-#~ msgstr "vuota"
+msgid "Hide %s"
+msgstr "Nascondi %s"
-#~ msgid "list of projects or account managers"
-#~ msgstr "Elenco dei progetti o degli account manager"
+#: mac/Mac_GUI.cpp:157
+msgid "Hide Others"
+msgstr "Nascondi gli altri"
-#, c-format
-#~ msgid "selected row %d of %d; "
-#~ msgstr "riga selezionata %d di %d;"
+#: mac/Mac_GUI.cpp:171
+msgid "Show All"
+msgstr "Mostra tutti"
+#: mac/Mac_GUI.cpp:185
#, c-format
-#~ msgid "row %d of %d; "
-#~ msgstr "riga %d di %d "
+msgid "Quit %s"
+msgstr "Esci da %s"
#~ msgid "The minimum username length for this project is 1. Please enter a different username."
#~ msgstr ""
diff --git a/locale/it_IT/BOINC-Project-Generic.po b/locale/it_IT/BOINC-Project-Generic.po
index 8b2bb94..e0184df 100644
--- a/locale/it_IT/BOINC-Project-Generic.po
+++ b/locale/it_IT/BOINC-Project-Generic.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-06-27 14:55+0000\n"
+"POT-Creation-Date: 2013-10-29 10:57 PDT\n"
+"PO-Revision-Date: 2013-11-07 08:22+0000\n"
"Last-Translator: Gianfranco <costamagnagianfranco at yahoo.it>\n"
"Language-Team: \n"
"Language: it_IT\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-0: html\\user\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1403880903.0\n"
+"X-POOTLE-MTIME: 1383812552.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "Italiano"
@@ -196,7 +196,7 @@ msgstr "Ricerca avanzata"
# ########################################
# Private messages
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:252 ../user/pm.php:69
#: ../user/pm.php:133
msgid "Private messages"
msgstr "Messaggi privati"
@@ -204,13 +204,13 @@ msgstr "Messaggi privati"
# ########################################
# Links from the main page
#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../user/forum_forum.php:71 ../user/sample_index.php:119
msgid "Questions and Answers"
msgstr "Domande e risposte"
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
+#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:249
+#: ../inc/user.inc:374 ../user/bs_sample_index.php:62
+#: ../user/forum_forum.php:73 ../user/sample_index.php:118
#: ../project.sample/project.inc:43
msgid "Message boards"
msgstr "Indice del forum"
@@ -281,7 +281,7 @@ msgstr "Non letto"
msgid "Message %1"
msgstr "Messaggio %1"
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:330 ../user/forum_forum.php:174
msgid "hidden"
msgstr "nascosto"
@@ -500,7 +500,7 @@ msgstr "Argomento"
# ########################################
# Forum
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:127 ../user/forum_forum.php:136
#: ../user/forum_index.php:94
msgid "Posts"
msgstr "Messaggi"
@@ -509,7 +509,7 @@ msgstr "Messaggi"
msgid "Views"
msgstr "Visite"
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:127 ../user/forum_forum.php:139
#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
msgid "Last post"
msgstr "Ultimo messaggio"
@@ -547,7 +547,7 @@ msgid "Home"
msgstr "Casa"
#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../user/server_status.php:329
msgid "Work"
msgstr "Lavoro"
@@ -613,9 +613,9 @@ msgid "Created"
msgstr "Creato"
#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
+#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:214
+#: ../inc/team.inc:219 ../inc/team.inc:221 ../inc/team.inc:363
+#: ../inc/team.inc:368 ../inc/user.inc:125 ../inc/user.inc:138
#: ../user/profile_search_action.php:43
#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
@@ -707,7 +707,7 @@ msgstr "%1 KB/sec"
#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
#: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
#: ../inc/result.inc:278 ../user/explain_state.php:56
-#: ../user/host_app_versions.php:30
+#: ../user/host_app_versions.php:29
msgid "Unknown"
msgstr "Sconosciuto"
@@ -715,7 +715,7 @@ msgstr "Sconosciuto"
msgid "Average download rate"
msgstr "Velocità media di download"
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:169 ../user/host_app_versions.php:64
msgid "Average turnaround time"
msgstr "Tempo medio di completamento"
@@ -794,7 +794,7 @@ msgstr "Ultimo contatto"
msgid "Computer info"
msgstr "Informazioni computer"
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:356
#: ../user/top_users.php:48
msgid "Rank"
msgstr "Posizione"
@@ -803,9 +803,9 @@ msgstr "Posizione"
msgid "Avg. credit"
msgstr "Media dei crediti"
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
+#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:215
+#: ../inc/team.inc:224 ../inc/team.inc:226 ../inc/team.inc:362
+#: ../inc/team.inc:367 ../inc/user.inc:139
#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
#: ../user/top_users.php:58
@@ -893,9 +893,9 @@ msgstr "Solo i computer attivi negli ultimi 30 giorni"
msgid "Computer ID"
msgstr "ID Computer"
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
+#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:209
+#: ../inc/team.inc:357 ../inc/user.inc:199 ../user/account_finish.php:41
+#: ../user/create_account_form.php:80 ../user/team_admins.php:62
#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
#: ../user/top_users.php:49 ../user/user_search.php:139
msgid "Name"
@@ -905,7 +905,7 @@ msgstr "Nome"
msgid "BOINC<br>version"
msgstr "versione <br>BOINC"
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:745 ../user/merge_by_name.php:67
msgid "Merge computers by name"
msgstr "Unisci i computer dal nome"
@@ -932,12 +932,12 @@ msgstr "Scrivi"
# ########################################
# Private messages
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:377
msgid "Send private message"
msgstr "Spedisci un messaggio privato"
#: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
-#: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
+#: ../user/ffmail_form.php:59 ../user/forum_edit.php:99
#: ../user/forum_edit.php:101 ../user/forum_edit.php:145
#: ../user/forum_post.php:61 ../user/forum_post.php:87
#: ../user/forum_post.php:89 ../user/forum_post.php:130
@@ -1137,7 +1137,7 @@ msgstr ""
"giorni).%2"
#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
+#: ../inc/util.inc:258
msgid "days"
msgstr "giorni"
@@ -1224,8 +1224,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "Usa la GPU NVIDIA %1 Si applica dalla versione 6.10+ %2"
#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Usa la GPU Intel %1 Si applica dalla versione 7.2+ %2"
+msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
+msgstr "Usa la GPU Intel %1 Si applica dalla versione 7.0+ %2"
#: ../inc/prefs.inc:358
msgid ""
@@ -1340,7 +1340,7 @@ msgstr "Impostazioni specifiche per il progetto"
msgid "Primary (default) preferences"
msgstr "Impostazioni principali (predefinite)"
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
+#: ../inc/prefs.inc:871 ../user/add_venue.php:43 ../user/add_venue.php:67
#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
#: ../user/prefs_edit.php:92
msgid "Edit %1 preferences"
@@ -1402,7 +1402,7 @@ msgstr ""
msgid "Database error"
msgstr "Errore del database"
-#: ../inc/profile.inc:193
+#: ../inc/profile.inc:192
msgid ""
"To prevent spam, profiles of users with an average credit of less than %1 "
"are displayed only to logged-in users. We apologize for this inconvenience."
@@ -1411,35 +1411,35 @@ msgstr ""
"%1 vengono mostrati solo agli utenti connessi. Ci scusiamo per questo "
"inconveniente."
-#: ../inc/profile.inc:197
+#: ../inc/profile.inc:196
msgid "User is banished"
msgstr "L'utente è stato bannato."
-#: ../inc/profile.inc:211
+#: ../inc/profile.inc:210
msgid "No profile exists for that user ID."
msgstr "Non esiste alcun profilo con questo ID utente."
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:218 ../user/create_profile.php:313
msgid "Edit your profile"
msgstr "Modifica il tuo profilo"
-#: ../inc/profile.inc:262
+#: ../inc/profile.inc:261
msgid "Your feedback on this profile"
msgstr "Feedback ricevuti dal tuo profilo"
-#: ../inc/profile.inc:264
+#: ../inc/profile.inc:263
msgid "Recommend this profile for User of the Day:"
msgstr "Raccomanda questo profilo come Utente del Giorno:"
-#: ../inc/profile.inc:265
+#: ../inc/profile.inc:264
msgid "I %1like%2 this profile"
msgstr "Questo profilo %1mi piace%2"
-#: ../inc/profile.inc:268
+#: ../inc/profile.inc:267
msgid "Alert administrators to an offensive profile:"
msgstr "Avvisa gli amministratori del profilo offensivo:"
-#: ../inc/profile.inc:269
+#: ../inc/profile.inc:268
msgid "I %1do not like%2 this profile"
msgstr "Questo profilo %1non mi piace%2"
@@ -1447,7 +1447,7 @@ msgstr "Questo profilo %1non mi piace%2"
msgid "Anonymous platform"
msgstr "Piattaforma anonima"
-#: ../inc/result.inc:53 ../user/host_app_versions.php:26
+#: ../inc/result.inc:53
msgid "NVIDIA GPU"
msgstr "GPU NVIDIA"
@@ -1455,7 +1455,7 @@ msgstr "GPU NVIDIA"
msgid "ATI GPU"
msgstr "GPU ATI"
-#: ../inc/result.inc:57 ../user/host_app_versions.php:28
+#: ../inc/result.inc:57
msgid "Intel GPU"
msgstr "GPU Intel"
@@ -1708,7 +1708,7 @@ msgstr "Tempo riportato<br />o scadenza"
msgid "explain"
msgstr "spiega"
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:376 ../user/server_status.php:256
msgid "Status"
msgstr "Stato"
@@ -1803,17 +1803,17 @@ msgid "Find teams with these words in their names or descriptions"
msgstr ""
"Trova i team che hanno queste parole nel loro nome o nella loro descrizione"
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
+#: ../inc/team.inc:43 ../inc/team.inc:121 ../inc/team.inc:232
+#: ../inc/team.inc:372 ../inc/team.inc:456 ../inc/user.inc:205
+#: ../inc/user.inc:316 ../user/account_finish.php:45
+#: ../user/create_account_form.php:99 ../user/edit_user_info_form.php:40
#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
#: ../user/team_search.php:72 ../user/top_users.php:63
#: ../user/user_search.php:53 ../user/user_search.php:140
msgid "Country"
msgstr "Nazionalità"
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:454
msgid "Type of team"
msgstr "Tipo di team"
@@ -1821,7 +1821,7 @@ msgstr "Tipo di team"
msgid "Show only active teams"
msgstr "Mostra solo i team attivi"
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:77 ../user/user_search.php:70
msgid "Search"
msgstr "Cerca"
@@ -1841,8 +1841,8 @@ msgstr "Richiesto da te"
msgid "founder response deadline is %1"
msgstr "il limite massimo per una risposta del fondatore è %1"
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:556 ../inc/user.inc:280
+#: ../inc/user.inc:370
msgid "None"
msgstr "Nessuno"
@@ -1866,27 +1866,27 @@ msgstr "Descrizione"
msgid "Web site"
msgstr "Sito web"
-#: ../inc/team.inc:120
+#: ../inc/team.inc:119
msgid "Cross-project stats"
msgstr "Statistiche di tutti i progetti"
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
msgid "Type"
msgstr "Tipo"
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:126 ../user/team_manage.php:63
msgid "Message board"
msgstr "Forum"
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "Argomenti"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:135
msgid "Join this team"
msgstr "Unisciti a questo team"
-#: ../inc/team.inc:137
+#: ../inc/team.inc:136
msgid ""
"Note: if 'OK to email' is set in your project preferences, joining a team "
"gives its founder access to your email address."
@@ -1895,79 +1895,79 @@ msgstr ""
"spuntata, unendosi al team, si dà il consenso al fondatore ad inviare "
"messaggi al tuo indirizzo di posta elettronica."
-#: ../inc/team.inc:140
+#: ../inc/team.inc:139
msgid "Not accepting new members"
msgstr "Non accetta nuovi membri"
-#: ../inc/team.inc:147
+#: ../inc/team.inc:146
msgid "Foundership change requested"
msgstr "Richiesta di cambio del fondatore"
-#: ../inc/team.inc:148
+#: ../inc/team.inc:147
msgid "Respond by %1"
msgstr "Risposta di %1"
-#: ../inc/team.inc:152
+#: ../inc/team.inc:151
msgid "Team foundership change"
msgstr "Cambio di fondatore del team"
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:155 ../inc/team.inc:358
msgid "Members"
msgstr "Membri"
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:156 ../inc/team.inc:253
msgid "Founder"
msgstr "Fondatore"
-#: ../inc/team.inc:169
+#: ../inc/team.inc:168
msgid "Admins"
msgstr "Amministratori"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:183
msgid "New members in last day"
msgstr "Nuovi membri nell'ultimo giorno"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:184
msgid "Total members"
msgstr "Totale dei membri"
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
msgid "view"
msgstr "visualizza"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:185
msgid "Active members"
msgstr "Membri attivi"
-#: ../inc/team.inc:187
+#: ../inc/team.inc:186
msgid "Members with credit"
msgstr "Membri con credito"
-#: ../inc/team.inc:256
+#: ../inc/team.inc:255
msgid "Admin"
msgstr "Amministratore"
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
#: ../user/top_hosts.php:93 ../user/top_teams.php:121
#: ../user/top_users.php:127
msgid "Previous %1"
msgstr "Precedente %1"
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:280 ../user/forum_user_posts.php:131
#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
#: ../user/top_teams.php:126 ../user/top_users.php:132
msgid "Next %1"
msgstr "Successivi %1"
-#: ../inc/team.inc:289
+#: ../inc/team.inc:288
msgid "No such team."
msgstr "Nessun team."
-#: ../inc/team.inc:302
+#: ../inc/team.inc:301
msgid "This operation requires foundership."
msgstr "Per fare questa operazione devi essere il fondatore."
-#: ../inc/team.inc:326
+#: ../inc/team.inc:325
msgid "This operation requires team admin privileges"
msgstr "Per fare questa operazione devi avere i privilegi da amministratore"
@@ -1979,7 +1979,7 @@ msgstr ""
"ATTENZIONE: questo è un grosso team di BOINC. Se fai delle modifiche qui, "
"saranno presto sovrascritte. Modifica al suo posto il %1BOINC-wide team%2."
-#: ../inc/team.inc:428
+#: ../inc/team.inc:429
msgid ""
"%1Privacy note%2: if you create a team, your project preferences (resource "
"share, graphics preferences) will be visible to the public."
@@ -1988,47 +1988,47 @@ msgstr ""
"del tuo progetto (allocazione delle risorse, preferenze grafiche) saranno "
"visibili a tutti."
-#: ../inc/team.inc:432
+#: ../inc/team.inc:433
msgid "Team name, text version"
msgstr "Nome del team, versione testuale"
-#: ../inc/team.inc:433
+#: ../inc/team.inc:434
msgid "Don't use HTML tags."
msgstr "Non usare i tag HTML."
-#: ../inc/team.inc:436
+#: ../inc/team.inc:437
msgid "Team name, HTML version"
msgstr "Nome del team, versione HTML"
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:439 ../inc/team.inc:449
msgid "You may use %1limited HTML tags%2."
msgstr "Puoi usare %1un numero limitato di tag HTML%2."
-#: ../inc/team.inc:439
+#: ../inc/team.inc:440
msgid "If you don't know HTML, leave this box blank."
msgstr "Se non conosci l'HTML, lascia questo campo vuoto."
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "URL of team web page, if any"
msgstr "URL del sito web del gruppo, se esiste"
-#: ../inc/team.inc:442
+#: ../inc/team.inc:443
msgid "without \"http://\""
msgstr "senza \"http://\""
-#: ../inc/team.inc:443
+#: ../inc/team.inc:444
msgid "This URL will be linked to from the team's page on this site."
msgstr "Questo indirizzo sarà linkato nella pagina del team su questo sito."
-#: ../inc/team.inc:446
+#: ../inc/team.inc:447
msgid "Description of team"
msgstr "Descrizione del team"
-#: ../inc/team.inc:462
+#: ../inc/team.inc:463
msgid "Accept new members?"
msgstr "Accetare nuovi membri?"
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:27
msgid "User profile"
msgstr "Profilo utente"
@@ -2063,7 +2063,7 @@ msgid "Computers on this account"
msgstr "Computer di questo account"
#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
+#: ../inc/user.inc:242 ../inc/user.inc:328 ../inc/user.inc:401
#: ../user/view_profile.php:64
msgid "View"
msgstr "Visualizza"
@@ -2080,8 +2080,8 @@ msgstr "Statistiche di tutti i progetti"
msgid "Account"
msgstr "Account"
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:280 ../inc/user.inc:368
+#: ../inc/user.inc:370 ../user/user_search.php:139
msgid "Team"
msgstr "Team"
@@ -2105,12 +2105,12 @@ msgstr "Tipo sconosciuto di notifica: %1"
msgid "Account information"
msgstr "Informazioni sull'account"
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
+#: ../inc/user.inc:200 ../user/edit_passwd_form.php:48
#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
msgid "Email address"
msgstr "E-mail"
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:203 ../inc/user.inc:321
msgid "URL"
msgstr "URL"
@@ -2118,7 +2118,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "Codice postale"
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:207 ../inc/user.inc:315
msgid "%1 member since"
msgstr "membro dal %1"
@@ -2138,7 +2138,7 @@ msgstr "password"
msgid "other account info"
msgstr "altre informazioni sull'account"
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:213 ../inc/user.inc:314
msgid "User ID"
msgstr "ID dell'utente"
@@ -2175,135 +2175,135 @@ msgstr "Preferenze per la comunità"
msgid "Preferences for this project"
msgstr "Preferenze per questo progetto"
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:233 ../user/prefs.php:32
msgid "%1 preferences"
msgstr "Preferenze per %1"
#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../user/sample_index.php:114
msgid "Community"
msgstr "Comunità"
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "Cancella"
-#: ../inc/user.inc:245
+#: ../inc/user.inc:244
msgid "Create"
msgstr "Crea"
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
+#: ../inc/user.inc:246 ../inc/user.inc:401 ../inc/util.inc:498
msgid "Profile"
msgstr "Profilo"
# ########################################
# Forum
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:249 ../inc/user.inc:374
msgid "%1 posts"
msgstr "%1 messaggi"
# ########################################<br />
# Apps page (apps.php)
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "Notifiche"
-#: ../inc/user.inc:269
+#: ../inc/user.inc:268
msgid "Quit team"
msgstr "Abbandona il team"
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:270 ../inc/user.inc:287
msgid "Administer"
msgstr "Amministra"
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:276 ../inc/user.inc:289
msgid "(foundership change request pending)"
msgstr "(richiesta per cambio del fondatore in corso)"
-#: ../inc/user.inc:279
+#: ../inc/user.inc:278
msgid "Member of team"
msgstr "Membro del team"
-#: ../inc/user.inc:281
+#: ../inc/user.inc:280
msgid "find a team"
msgstr "trova un team"
-#: ../inc/user.inc:292
+#: ../inc/user.inc:291
msgid "Founder but not member of"
msgstr "Fondatore ma non membro di"
-#: ../inc/user.inc:298
+#: ../inc/user.inc:297
msgid "Find friends"
msgstr "Trova degli amici"
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
+#: ../inc/user.inc:386 ../inc/user.inc:395
msgid "Friends"
msgstr "Amici"
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
msgid "Computers"
msgstr "Computer"
-#: ../inc/user.inc:338
+#: ../inc/user.inc:337
msgid "Donor"
msgstr "Donatore"
-#: ../inc/user.inc:378
+#: ../inc/user.inc:377
msgid "Contact"
msgstr "Contatta"
-#: ../inc/user.inc:381
+#: ../inc/user.inc:380
msgid "This person is a friend"
msgstr "Questa persona è un amico"
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:381 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "Cancella l'amicizia"
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:384 ../user/friend.php:37
msgid "Request pending"
msgstr "Richiesta in corso"
-#: ../inc/user.inc:387
+#: ../inc/user.inc:386
msgid "Add as friend"
msgstr "Aggiungi come amico"
-#: ../inc/user.inc:446
+#: ../inc/user.inc:445
msgid "user name cannot have leading or trailing white space"
msgstr "lo username non può iniziare o terminare con uno spazio"
-#: ../inc/user.inc:450
+#: ../inc/user.inc:449
msgid "user name must be nonempty"
msgstr "lo username non può essere vuoto"
-#: ../inc/user.inc:454
+#: ../inc/user.inc:453
msgid "user name may not contain HTML tags"
msgstr "lo username non può contenere tag HTML"
-#: ../inc/util.inc:131
+#: ../inc/util.inc:116
msgid "log out"
msgstr "Esci"
-#: ../inc/util.inc:133
+#: ../inc/util.inc:118
msgid "log in"
msgstr "accedi"
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
+#: ../inc/util.inc:188 ../user/login_form.php:30 ../user/login_form.php:55
msgid "Log in"
msgstr "Entra"
# ########################################
# Create account form (create_account_form.php)
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:189 ../user/create_account_form.php:31
msgid "Create an account"
msgstr "Crea un account"
-#: ../inc/util.inc:206
+#: ../inc/util.inc:190
msgid "Server status page"
msgstr "Stato del server"
-#: ../inc/util.inc:248
+#: ../inc/util.inc:232
msgid ""
"A database error occurred while handling your request; please try again "
"later."
@@ -2311,54 +2311,58 @@ msgstr ""
"Si è verificato un errore del database mentre si gestiva la tua richiesta; "
"per favore riprova più tardi."
-#: ../inc/util.inc:257
+#: ../inc/util.inc:241
msgid "Unable to handle request"
msgstr "Impossibile gestire la richiesta"
-#: ../inc/util.inc:277
+#: ../inc/util.inc:261
msgid "hours"
msgstr "ore"
-#: ../inc/util.inc:280
+#: ../inc/util.inc:264
msgid "min"
msgstr "minuti"
-#: ../inc/util.inc:283
+#: ../inc/util.inc:267
msgid "sec"
msgstr "secondi"
-#: ../inc/util.inc:444
+#: ../inc/util.inc:428
msgid "Link has timed out. Please click Back, refresh the page, and try again."
msgstr ""
"Tempo di connessione al link scaduto. Per favore clicca Indietro, aggiorna "
"la pagina e prova ancora."
-#: ../inc/util.inc:513
+#: ../inc/util.inc:497
msgid "View the profile of %1"
msgstr "Mostra il profilo di %1"
-#: ../inc/util.inc:569
+#: ../inc/util.inc:553
msgid "Use BBCode tags to format your text"
msgstr "Usa i tag BBCode per formattare il testo"
-#: ../inc/util.inc:796
+#: ../inc/util.inc:780
msgid "Project down for maintenance"
msgstr "Progetto sospeso per manutenzione"
-#: ../inc/util.inc:799
+#: ../inc/util.inc:783
msgid "%1 is temporarily shut down for maintenance. Please try again later."
msgstr ""
"%1 è temporaneamente fuori servizio per manutenzione. Riprova più tardi."
-#: ../inc/util.inc:817
+#: ../inc/util.inc:801
msgid "Unable to connect to database - please try again later"
msgstr "Impossibile connettersi al database - per favore riprova più tardi"
-#: ../inc/util.inc:821
+#: ../inc/util.inc:802
+msgid "Error:"
+msgstr "Errore:"
+
+#: ../inc/util.inc:806
msgid "Unable to select database - please try again later"
msgstr "Impossibile selezionare il database - per favore riprova più tardi"
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr "Rimani loggato su questo computer"
@@ -2366,21 +2370,21 @@ msgstr "Rimani loggato su questo computer"
msgid "Finish account setup"
msgstr "Completa la configurazione dell'account"
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
+#: ../user/account_finish.php:41 ../user/create_account_form.php:80
msgid "Identifies you on our web site. Use your real name or a nickname."
msgstr "Identificati sul nostro sito. Usa il tuo nome reale oppure un alias."
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
+#: ../user/account_finish.php:45 ../user/create_account_form.php:99
msgid "Select the country you want to represent, if any."
msgstr "Seleziona la nazione che vuoi rappresentare, se lo desideri."
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
+#: ../user/account_finish.php:51 ../user/create_account_form.php:105
msgid "Postal or ZIP Code"
msgstr "CAP"
# ########################################<br />
# General stuff (create_account_form.php and others)
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
+#: ../user/account_finish.php:51 ../user/create_account_form.php:105
msgid "Optional"
msgstr "Dati facoltativi"
@@ -2392,14 +2396,14 @@ msgstr "Devi fornire un nome per il tuo account"
msgid "HTML tags not allowed in name"
msgstr "I tag HTML non sono ammessi nel nome"
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:85
msgid "Add %1 preferences for %2"
msgstr "Aggiungi %1 preferenze per %2"
# ########################################
# Apps page (apps.php)
#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/sample_index.php:109
msgid "Applications"
msgstr "Applicazioni"
@@ -2568,16 +2572,16 @@ msgstr "Team"
msgid "create or join a team"
msgstr "crea o unisciti ad un team"
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
+#: ../user/bs_sample_index.php:51 ../user/sample_index.php:180
msgid "User of the day"
msgstr "Utente del giorno"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
msgid "Server status"
msgstr "Stato del server"
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
+#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:35
+#: ../user/sample_index.php:116
msgid "Profiles"
msgstr "Profili"
@@ -2616,7 +2620,7 @@ msgstr "Lingue"
# ########################################<br />
# Rules and Policies page (info.php)
#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
+#: ../user/sample_index.php:74
msgid "Read our rules and policies"
msgstr "Leggi le nostre regole e linee di condotta"
@@ -2628,47 +2632,66 @@ msgstr "Non è possibile creare l'account"
msgid "Click your browser's <b>Back</b> button to try again."
msgstr "Fai click sul tasto <b>Indietro</b> del tuo browser per riprovare."
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:38 ../user/create_account_action.php:40
+#: ../user/create_account_form.php:36
+msgid "Account creation is disabled"
+msgstr "La creazione degli account è disabilitata"
+
+#: ../user/create_account_action.php:41
+msgid ""
+"Sorry, this project has disabled the creation of new accounts.\n"
+"Please try again later."
+msgstr ""
+"Spiacente, questo progetto ha disabilitato la creazione di nuovi account.\n"
+"Per favore riprova più tardi."
+
+#: ../user/create_account_action.php:53
msgid "Your reCAPTCHA response was not correct. Please try again."
msgstr "La tua risposta al ReCaptcha non è corretta. Prova di nuovo."
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:77
msgid "You must supply an invitation code to create an account."
msgstr "Devi fornire un codice d'invito per creare un account."
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:80
msgid "The invitation code you gave is not valid."
msgstr "Il codice d'invito inserito non è valido."
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:91
msgid ""
"Invalid email address: you must enter a valid address of the form name at domain"
msgstr ""
"Indirizzo email non valido: deve essere un indirizzo email valido del tipo "
"nome at dominio"
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:95
msgid "There's already an account with that email address."
msgstr "Esiste già un account associato a questo indirizzo email."
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:33
msgid "New passwords are different"
msgstr "Le nuove password sono diverse"
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:108 ../user/edit_passwd_action.php:41
msgid "Passwords may only include ASCII characters."
msgstr "Le password possono comprendere solo caratteri ASCII."
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:113 ../user/edit_passwd_action.php:45
msgid "New password is too short: minimum password length is %1 characters."
msgstr ""
"La nuova password è troppo corta: la lunghezza minima è di %1 caratteri."
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:134
msgid "Couldn't create account"
msgstr "Non è stato possibile creare l'account"
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:37
+msgid "Account creation is currently disabled. Please try again later."
+msgstr ""
+"La creazione degli account è stata momentaneamente disabilitata. Riprova più "
+"tardi."
+
+#: ../user/create_account_form.php:46
msgid ""
"NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
"select Add Project, and enter an email address and password."
@@ -2676,7 +2699,7 @@ msgstr ""
"NOTA: Se utilizzi il BOINC Manager, non usare questo form. Avvia BOINC, "
"seleziona Aggiungi Progetto, e inserisci una email e una password."
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:62
msgid ""
"This account will belong to the team %1 and will have the project "
"preferences of its founder."
@@ -2684,39 +2707,39 @@ msgstr ""
"Questo account apparterrà al team %1 ed avrà le preferenze del progetto "
"decise dal suo fondatore."
-#: ../user/create_account_form.php:73
+#: ../user/create_account_form.php:74
msgid "Invitation Code"
msgstr "Codice d'invito"
-#: ../user/create_account_form.php:73
+#: ../user/create_account_form.php:74
msgid "A valid invitation code is required to create an account."
msgstr "E' necessario un codice d'invito valido per poter creare un account."
-#: ../user/create_account_form.php:83
+#: ../user/create_account_form.php:84
msgid "Email Address"
msgstr "Email"
-#: ../user/create_account_form.php:83
+#: ../user/create_account_form.php:84
msgid "Must be a valid address of the form 'name at domain'."
msgstr "Devi inserire un indirizzo email valido nella forma 'nome at dominio'."
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
+#: ../user/create_account_form.php:93 ../user/edit_email_form.php:49
msgid "Password"
msgstr "Password"
-#: ../user/create_account_form.php:93
+#: ../user/create_account_form.php:94
msgid "Must be at least %1 characters"
msgstr "Deve essere di almeno %1 caratteri"
-#: ../user/create_account_form.php:96
+#: ../user/create_account_form.php:97
msgid "Confirm password"
msgstr "Conferma la password"
-#: ../user/create_account_form.php:113
+#: ../user/create_account_form.php:114
msgid "Please enter the words shown in the image"
msgstr "Per favore inserisci le parole visualizzate nell'immagine"
-#: ../user/create_account_form.php:119
+#: ../user/create_account_form.php:120
msgid "Create account"
msgstr "Crea un account"
@@ -2884,7 +2907,7 @@ msgstr "Sei sicuro di voler cancellare il tuo account?"
#: ../user/delete_account.php:79 ../user/delete_profile.php:52
#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/prefs_remove.php:55 ../user/user_search.php:59
#: ../user/user_search.php:64
msgid "Yes"
msgstr "Si"
@@ -3128,23 +3151,23 @@ msgstr ""
"Non possiamo aggiornare il tuo indirizzo email a causa di un problema del "
"database. Per favore riprova più tardi."
-#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
+#: ../user/edit_email_form.php:29 ../user/edit_email_form.php:53
msgid "Change email address"
msgstr "Cambia l'indirizzo email"
-#: ../user/edit_email_form.php:36
+#: ../user/edit_email_form.php:38
msgid "Change the email address of your account"
msgstr "Cambia l'indirizzo email del tuo account"
-#: ../user/edit_email_form.php:37
+#: ../user/edit_email_form.php:39
msgid "New email address"
msgstr "Nuovo indirizzo email"
-#: ../user/edit_email_form.php:38
+#: ../user/edit_email_form.php:40
msgid "Must be a valid address of the form 'name at domain'"
msgstr "Deve essere un indirizzo email valido del tipo 'nome at dominio'"
-#: ../user/edit_email_form.php:48
+#: ../user/edit_email_form.php:50
msgid "No password?"
msgstr "Non hai la password?"
@@ -3365,8 +3388,8 @@ msgstr "Non è stato trovato un account con questo indirizzo e-mail"
msgid "Invalid password"
msgstr "Password non valida"
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
+#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:28
+#: ../user/edit_passwd_form.php:58
msgid "Change password"
msgstr "Cambia password"
@@ -3382,35 +3405,35 @@ msgstr ""
"Impossibile aggiornare la password a causa di un problema al database. Per "
"favore riprova più tardi."
-#: ../user/edit_passwd_form.php:39
+#: ../user/edit_passwd_form.php:42
msgid "You can identify yourself using either"
msgstr "Puoi identificarti usando"
-#: ../user/edit_passwd_form.php:41
+#: ../user/edit_passwd_form.php:44
msgid "your email address and old password"
msgstr "il tuo indirizzo mail e la vecchia password"
-#: ../user/edit_passwd_form.php:42
+#: ../user/edit_passwd_form.php:45
msgid "your account key"
msgstr "la tua chiave di accesso"
-#: ../user/edit_passwd_form.php:46
+#: ../user/edit_passwd_form.php:49
msgid "Current password"
msgstr "Password corrente"
-#: ../user/edit_passwd_form.php:48
+#: ../user/edit_passwd_form.php:51
msgid "<b>OR</b>: Account key"
msgstr "<b>OPPURE</b>: Chiave account"
-#: ../user/edit_passwd_form.php:49
+#: ../user/edit_passwd_form.php:52
msgid "Get account key by email"
msgstr "Ottieni una chiave account via email"
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:56
msgid "New password"
msgstr "Nuova password"
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:57
msgid "New password, again"
msgstr "Ripeti nuova password"
@@ -3426,23 +3449,23 @@ msgstr "Devi dare un nome per il tuo account."
msgid "Couldn't update user info."
msgstr "Non posso aggiornare le informazioni utente."
-#: ../user/edit_user_info_form.php:27
+#: ../user/edit_user_info_form.php:29
msgid "Edit account information"
msgstr "Modifica le informazioni account"
-#: ../user/edit_user_info_form.php:32
+#: ../user/edit_user_info_form.php:34
msgid "Name %1 real name or nickname%2"
msgstr "Nome %1 nome reale o nickname%2"
-#: ../user/edit_user_info_form.php:35
+#: ../user/edit_user_info_form.php:37
msgid "URL %1 of your web page; optional%2"
msgstr "URL %1 della tua pagina web; opzionale%2"
-#: ../user/edit_user_info_form.php:43
+#: ../user/edit_user_info_form.php:45
msgid "Postal (ZIP) code %1 Optional%2"
msgstr "Codice postale (ZIP) %1 Opzionale%2"
-#: ../user/edit_user_info_form.php:47
+#: ../user/edit_user_info_form.php:49
msgid "Update info"
msgstr "Aggiorna informazioni"
@@ -3667,23 +3690,23 @@ msgstr ""
"Hai dimenticato di inserire nomi e/o indirizzi e-mail dei tuoi amici; per "
"favore, %1torna al modulo%2 e inseriscili."
-#: ../user/ffmail_form.php:30
+#: ../user/ffmail_form.php:31
msgid ""
-"This project hasn't created an email message - please notify its "
+"This project hasn\\'t created an email message - please notify its "
"administrators"
msgstr ""
-"Questo progetto non ha creato un messaggio email - per favore notificalo ai "
+"Questo progetto non ha creato un messaggio e-mail - per favore segnalalo ai "
"suoi amministratori"
-#: ../user/ffmail_form.php:33
+#: ../user/ffmail_form.php:34
msgid "Tell your friends about %1"
msgstr "Consiglia %1 ai tuoi amici"
-#: ../user/ffmail_form.php:37
+#: ../user/ffmail_form.php:38
msgid "Help us by telling your friends, family and coworkers about %1"
msgstr "Aiutaci segnalando %1 ai tuoi amici, familiari e colleghi"
-#: ../user/ffmail_form.php:39
+#: ../user/ffmail_form.php:40
msgid ""
"Fill in this form with the names and email addresses of people you think "
"might be interested in %1. We'll send them an email in your name, and you "
@@ -3693,27 +3716,27 @@ msgstr ""
"pensi possano essere interessate a %1. Invieremo una e-mail a tuo nome, e se "
"ti va puoi aggiungere il tuo messaggio."
-#: ../user/ffmail_form.php:42
+#: ../user/ffmail_form.php:43
msgid "Your name:"
msgstr "Il tuo nome:"
-#: ../user/ffmail_form.php:42
+#: ../user/ffmail_form.php:43
msgid "Your email address:"
msgstr "Il tuo indirizzo email:"
-#: ../user/ffmail_form.php:48
+#: ../user/ffmail_form.php:49
msgid "Friend's name:"
msgstr "Nome dell'amico:"
-#: ../user/ffmail_form.php:48
+#: ../user/ffmail_form.php:49
msgid "Friend's email address:"
msgstr "Indirizzo email dell'amico:"
-#: ../user/ffmail_form.php:56
+#: ../user/ffmail_form.php:57
msgid "Additional message (optional)"
msgstr "Aggiungi un messaggio (facoltativo):"
-#: ../user/ffmail_form.php:59
+#: ../user/ffmail_form.php:60
msgid "Send"
msgstr "Invia"
@@ -4797,49 +4820,53 @@ msgstr ""
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr "Se non lo hai ancora fatto, %1scarica il client di BOINC%2."
-#: ../user/host_app_versions.php:37
+#: ../user/host_app_versions.php:26
+msgid "nvidia GPU"
+msgstr "GPU nvidia"
+
+#: ../user/host_app_versions.php:36
msgid "Anonymous platform, missing app"
msgstr "Piattaforma anonima, applicazione mancante"
-#: ../user/host_app_versions.php:40
+#: ../user/host_app_versions.php:39
msgid "anonymous platform"
msgstr "piattaforma anonima"
-#: ../user/host_app_versions.php:43
+#: ../user/host_app_versions.php:42
msgid "Missing app version"
msgstr "Versione applicazione mancante"
-#: ../user/host_app_versions.php:45
+#: ../user/host_app_versions.php:44
msgid "Missing app"
msgstr "Applicazione mancante"
-#: ../user/host_app_versions.php:47
+#: ../user/host_app_versions.php:46
msgid "Missing platform"
msgstr "Piattaforma mancante"
-#: ../user/host_app_versions.php:56
+#: ../user/host_app_versions.php:55
msgid "Number of tasks completed"
msgstr "Numero di lavori completati"
-#: ../user/host_app_versions.php:57
+#: ../user/host_app_versions.php:56
msgid "Max tasks per day"
msgstr "Massimo numero di lavori giornalieri"
-#: ../user/host_app_versions.php:58
+#: ../user/host_app_versions.php:57
msgid "Number of tasks today"
msgstr "Numero di lavori giornaliero"
-#: ../user/host_app_versions.php:59
+#: ../user/host_app_versions.php:58
msgid "Consecutive valid tasks"
msgstr "Lavori validi consecutivi"
-#: ../user/host_app_versions.php:63
+#: ../user/host_app_versions.php:62
msgid "Average processing rate"
msgstr "Velocità di processamento media"
# ########################################
# Apps page (apps.php)
-#: ../user/host_app_versions.php:72
+#: ../user/host_app_versions.php:71
msgid "Application details for host %1"
msgstr "Dettagli applicazione per l'host %1"
@@ -5255,35 +5282,35 @@ msgstr "Indirizzo E-mail:"
msgid "forgot email address?"
msgstr "hai dimenticato l'indirizzo mail?"
-#: ../user/login_form.php:48
+#: ../user/login_form.php:47
msgid "Password:"
msgstr "Chiave d'accesso"
-#: ../user/login_form.php:48
+#: ../user/login_form.php:47
msgid "forgot password?"
msgstr "hai dimenticato la password?"
-#: ../user/login_form.php:51
+#: ../user/login_form.php:50
msgid "Stay logged in"
msgstr "Rimani autenticato"
-#: ../user/login_form.php:62
+#: ../user/login_form.php:56
msgid "or %1create an account%2."
msgstr "oppure %1crea un account%2."
-#: ../user/merge_by_name.php:31
+#: ../user/merge_by_name.php:33
msgid "Processing %1"
msgstr "Elaborazione %1"
-#: ../user/merge_by_name.php:43
+#: ../user/merge_by_name.php:45
msgid "Merged %1 into %2"
msgstr "Unito %1 con %2"
-#: ../user/merge_by_name.php:72
+#: ../user/merge_by_name.php:74
msgid "Return to the list of your computers"
msgstr "Ritorna alla lista dei tuoi computer"
-#: ../user/merge_by_name.php:76
+#: ../user/merge_by_name.php:78
msgid ""
"This operation merges computers based on their domain name.\n"
" <p>\n"
@@ -5299,11 +5326,11 @@ msgstr ""
" Computer non compatibili non saranno uniti.\n"
" <p>"
-#: ../user/merge_by_name.php:82
+#: ../user/merge_by_name.php:84
msgid "Go ahead and do this"
msgstr "Vai avanti e fai questo"
-#: ../user/merge_by_name.php:83
+#: ../user/merge_by_name.php:85
msgid "Return to the list of computers"
msgstr "Ritorna alla lista dei computer"
@@ -5552,7 +5579,7 @@ msgstr "Per sboccare un utente, visita la pagina %1preferenze del forum%2"
msgid "Unknown action"
msgstr "Azione sconosciuta"
-#: ../user/prefs.php:32
+#: ../user/prefs.php:35
msgid ""
"Your preferences have been updated, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5562,7 +5589,7 @@ msgstr ""
"avranno effetto quando il tuo computer comunicherà con %1\n"
"oppure quando lancerai il comando %2Aggiorna%3 dal BOINC manager."
-#: ../user/prefs.php:41
+#: ../user/prefs.php:44
msgid ""
"Your preferences have been reset to the defaults, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5580,23 +5607,23 @@ msgstr "%1 per %2"
msgid "Back to preferences"
msgstr "Ritorna alle preferenze"
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:48
msgid "Confirm delete preferences"
msgstr "Conferma la cancellazione delle preferenze"
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:51
msgid "Are you sure you want to delete your separate %1 preferences for %2?"
msgstr "Sei sicuro di voler cancellare le tue preferenze separate %1 per %2?"
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:55
msgid "Remove preferences"
msgstr "Rimuovi preferenze"
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:57
msgid "Cancel"
msgstr "Cancella"
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:38
msgid ""
"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
"community."
@@ -5604,7 +5631,7 @@ msgstr ""
"I %1profili%2 permettono agli utenti di condividere le proprie esperienze "
"con la comunità di %3."
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:39
msgid ""
"Explore the diversity of your fellow volunteers, and contribute your own "
"views for others to enjoy."
@@ -5612,7 +5639,7 @@ msgstr ""
"Guarda la diversità dei volontari tuoi compagni e contribuisci con le tue "
"opinioni. "
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:40
msgid ""
"If you haven't already, you can %1create your own user profile%2 for others "
"to see!"
@@ -5620,23 +5647,23 @@ msgstr ""
"Se non l'hai ancora fatto, puoi %1creare un tuo profilo%2 da far vedere agli "
"altri!"
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:45
msgid "User of the Day"
msgstr "Utente del giorno"
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:58
msgid "User Profile Explorer"
msgstr "Guarda i profili degli utenti"
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:61
msgid "View the %1User Picture Gallery%2."
msgstr "Guarda la %1Galleria delle Immagini degli utenti%2."
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:62
msgid "Browse profiles %1by country%2."
msgstr "Visualizza i profili %1per nazionalità%2."
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:63
msgid ""
"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
"without pictures%2."
@@ -5644,19 +5671,19 @@ msgstr ""
"Visualizza i profili %1casualmente%2, %3casualmente con immagine%2 o %"
"4casualmente senza immagine%2."
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:67
msgid "Alphabetical profile listings:"
msgstr "Profili in ordine alfabetico:"
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:73
msgid "Search profile text"
msgstr "Ricerca profilo mediante testo"
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:99
msgid "No profiles"
msgstr "Nessun profilo"
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:100
msgid "No profiles matched your query."
msgstr "Nessun profilo corrisponde ai tuoi criteri di ricerca."
@@ -5740,137 +5767,137 @@ msgstr "Non in esecuzione"
msgid "Disabled"
msgstr "Disabilitato"
-#: ../user/server_status.php:231
+#: ../user/server_status.php:246
msgid "Project status"
msgstr "Stato del progetto"
-#: ../user/server_status.php:233
+#: ../user/server_status.php:248
msgid "Server software version: %1"
msgstr "Versione software del server: %1"
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Program"
msgstr "Programma"
-#: ../user/server_status.php:241
+#: ../user/server_status.php:256
msgid "Host"
msgstr "Ospite"
-#: ../user/server_status.php:252
+#: ../user/server_status.php:267
msgid "data-driven web pages"
msgstr "pagine web generate dal database"
-#: ../user/server_status.php:258
+#: ../user/server_status.php:273
msgid "upload/download server"
msgstr "server di upload/download"
-#: ../user/server_status.php:261
+#: ../user/server_status.php:276
msgid "scheduler"
msgstr "schedulatore"
-#: ../user/server_status.php:294
+#: ../user/server_status.php:309
msgid "Running:"
msgstr "In esecuzione:"
-#: ../user/server_status.php:295
+#: ../user/server_status.php:310
msgid "Program is operating normally"
msgstr "Il programma sta funzionando normalmente"
-#: ../user/server_status.php:296
+#: ../user/server_status.php:311
msgid "Not Running:"
msgstr "Non in esecuzione:"
-#: ../user/server_status.php:297
+#: ../user/server_status.php:312
msgid "Program failed or the project is down"
msgstr "Il programma non ha funzionato e il progetto è sospeso"
-#: ../user/server_status.php:298
+#: ../user/server_status.php:313
msgid "Disabled:"
msgstr "Disabilitato: "
-#: ../user/server_status.php:299
+#: ../user/server_status.php:314
msgid "Program is disabled"
msgstr "Il programma è disabilitato"
-#: ../user/server_status.php:303
+#: ../user/server_status.php:318
msgid "Computing status"
msgstr "Stato di elaborazione"
-#: ../user/server_status.php:309
+#: ../user/server_status.php:324
msgid "The database server is not accessible"
msgstr "Il database del server è inaccessibile"
-#: ../user/server_status.php:326
+#: ../user/server_status.php:341
msgid "Tasks ready to send"
msgstr "Attività pronte per essere spedite"
-#: ../user/server_status.php:331 ../user/workunit.php:55
+#: ../user/server_status.php:346 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr "Attività in corso"
-#: ../user/server_status.php:336
+#: ../user/server_status.php:351
msgid "Workunits waiting for validation"
msgstr "Unità di lavoro in attesa di essere validate"
-#: ../user/server_status.php:341
+#: ../user/server_status.php:356
msgid "Workunits waiting for assimilation"
msgstr "Workunits in attesa di essere recepite"
-#: ../user/server_status.php:346
+#: ../user/server_status.php:361
msgid "Workunits waiting for file deletion"
msgstr "Unità di lavoro in attesa di cancellazione"
-#: ../user/server_status.php:351
+#: ../user/server_status.php:366
msgid "Tasks waiting for file deletion"
msgstr "Attività in attesa di cancellazione"
-#: ../user/server_status.php:367
+#: ../user/server_status.php:383
msgid "Transitioner backlog (hours)"
msgstr "Backlog del Transitioner (ore)"
-#: ../user/server_status.php:374
+#: ../user/server_status.php:390
msgid "Users"
msgstr "Utenti"
-#: ../user/server_status.php:377 ../user/server_status.php:395
+#: ../user/server_status.php:393 ../user/server_status.php:411
msgid "with recent credit"
msgstr "con crediti recenti"
-#: ../user/server_status.php:382 ../user/server_status.php:400
+#: ../user/server_status.php:398 ../user/server_status.php:416
msgid "with credit"
msgstr "con credito"
-#: ../user/server_status.php:387 ../user/server_status.php:405
+#: ../user/server_status.php:403 ../user/server_status.php:421
msgid "registered in past 24 hours"
msgstr "registrati nelle scorse 24 ore"
-#: ../user/server_status.php:411
+#: ../user/server_status.php:427
msgid "current GigaFLOPs"
msgstr "GigaFLOPs correnti"
-#: ../user/server_status.php:420
+#: ../user/server_status.php:436
msgid "Tasks by application"
msgstr "Attività dall'applicazione"
# ########################################
# Apps page (apps.php)
-#: ../user/server_status.php:423 ../user/workunit.php:40
+#: ../user/server_status.php:439 ../user/workunit.php:40
msgid "application"
msgstr "applicazione"
-#: ../user/server_status.php:424
+#: ../user/server_status.php:440
msgid "unsent"
msgstr "non inviato"
-#: ../user/server_status.php:425
+#: ../user/server_status.php:441
msgid "in progress"
msgstr "in corso"
-#: ../user/server_status.php:426
+#: ../user/server_status.php:442
msgid "avg runtime of last 100 results in h (min-max)"
msgstr "Tempo medio di esecuzione degli ultimi 100 risultati in ore (min-max)"
-#: ../user/server_status.php:427
+#: ../user/server_status.php:443
msgid "users in last 24h"
msgstr "utenti nelle ultime 24 ore"
@@ -6067,7 +6094,7 @@ msgid "Couldn't add admin"
msgstr "Impossibile aggiungere l'amministratore"
#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:28
msgid "No such team"
msgstr "Nessun team"
@@ -6149,10 +6176,6 @@ msgstr "Nuovo fondatore?"
msgid "Change founder"
msgstr "Cambia fondatore"
-#: ../user/team_change_founder_form.php:108
-msgid "There are no users to transfer team to."
-msgstr "Non ci sono utenti su cui trasferire il team."
-
#: ../user/team_create_action.php:29
msgid "You must choose a non-blank team name"
msgstr "Non puoi lasciare in bianco il nome del team"
@@ -6460,7 +6483,7 @@ msgstr ""
"quindi ne nuove richieste non sono permesse. Per favore riprova più tardi."
#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join_form.php:31
msgid "The team %1 is not joinable."
msgstr "Non si può entrare nel team %1."
@@ -6484,23 +6507,23 @@ msgstr "Entrato in %1"
msgid "You have joined %1."
msgstr "Sei entrato in %1."
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
msgid "Join %1"
msgstr "Entra in %1"
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
msgid "Please note:"
msgstr "Si prega di notare:"
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
msgid "Joining a team gives its founder access to your email address."
msgstr "Entrare in un team da al fondatore accesso al tuo indirizzo e-mail."
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
msgid "Joining a team does not affect your account's credit."
msgstr "Entrare in un team non influisce sui crediti del tuo account."
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
msgid "Join team"
msgstr "Entra in un team"
@@ -6646,19 +6669,19 @@ msgstr "Limite superato: Puoi solo visualizzare i primi 1000 membri."
msgid "Members of %1"
msgstr "Membri di %1"
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
msgid "Unable to quit team"
msgstr "Impossibile uscire dal team"
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
msgid "Team doesn't exist, or you don't belong to it."
msgstr "Il team non esiste, oppure non gli appartieni"
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
msgid "Quit %1"
msgstr "Esci da %1"
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
msgid ""
"<strong>Please note before quitting a team:</strong>\n"
" <ul>\n"
@@ -6676,7 +6699,7 @@ msgstr ""
"personali in nessun modo.\n"
" </ul>"
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
msgid "Quit Team"
msgstr "Abbandona il Team"
@@ -7093,37 +7116,6 @@ msgstr ""
msgid "(all applications)"
msgstr "(tutte le applicazioni)"
-#~ msgid "Use Intel GPU %1 Enforced by version 7.0+ %2"
-#~ msgstr "Usa la GPU Intel %1 Si applica dalla versione 7.0+ %2"
-
-#~ msgid "Error:"
-#~ msgstr "Errore:"
-
-#~ msgid "Account creation is disabled"
-#~ msgstr "La creazione degli account è disabilitata"
-
-#~ msgid ""
-#~ "Sorry, this project has disabled the creation of new accounts.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Spiacente, questo progetto ha disabilitato la creazione di nuovi account.\n"
-#~ "Per favore riprova più tardi."
-
-#~ msgid "Account creation is currently disabled. Please try again later."
-#~ msgstr ""
-#~ "La creazione degli account è stata momentaneamente disabilitata. Riprova più "
-#~ "tardi."
-
-#~ msgid ""
-#~ "This project hasn\\'t created an email message - please notify its "
-#~ "administrators"
-#~ msgstr ""
-#~ "Questo progetto non ha creato un messaggio e-mail - per favore segnalalo ai "
-#~ "suoi amministratori"
-
-#~ msgid "nvidia GPU"
-#~ msgstr "GPU nvidia"
-
#~ msgid ""
#~ "These apply to all BOINC projects in which you participate.<br>\n"
#~ " On computers participating in multiple projects, the most "
diff --git a/locale/it_IT/BOINC-Setup.mo b/locale/it_IT/BOINC-Setup.mo
index d21e0d3..c4b2c11 100644
Binary files a/locale/it_IT/BOINC-Setup.mo and b/locale/it_IT/BOINC-Setup.mo differ
diff --git a/locale/it_IT/BOINC-Setup.po b/locale/it_IT/BOINC-Setup.po
index f8aa527..3028909 100644
--- a/locale/it_IT/BOINC-Setup.po
+++ b/locale/it_IT/BOINC-Setup.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2014-06-27 14:54+0000\n"
+"POT-Creation-Date: 2013-10-15 22:27-0700\n"
+"PO-Revision-Date: 2013-08-08 15:43+0200\n"
"Last-Translator: Gianfranco <costamagnagianfranco at yahoo.it>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: it_IT\n"
@@ -15,31 +15,30 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Poedit 1.5.5\n"
"X-Poedit-SearchPath-0: mac_installer\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1403880893.0\n"
"X-Poedit-KeywordsList: _\n"
-#: Installer.cpp:124
+#: Installer.cpp:132
#, c-format
-msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr "Scusa, questa versione di %s richiede un sistema 10.5 o superiore."
+msgid "Sorry, this version of %s requires system 10.4 or higher."
+msgstr "Scusa, questa versione di %s richiede un sistema 10.4 o superiore."
-#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
+#: PostInstall.cpp:131 PostInstall.cpp:1211
msgid "Yes"
msgstr "Si"
-#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
+#: PostInstall.cpp:132 PostInstall.cpp:1212
msgid "No"
msgstr "No"
-#: PostInstall.cpp:133
+#: PostInstall.cpp:134
msgid "Should BOINC run even when no user is logged in?"
msgstr "BOINC deve lavorare quando non ci sono utenti connessi?"
-#: PostInstall.cpp:1416
+#: PostInstall.cpp:1491
#, c-format
msgid ""
"Users who are permitted to administer this computer will automatically be "
@@ -54,21 +53,21 @@ msgstr ""
"Vuoi anche dare agli utenti non amministrativi i permessi per avviare e "
"controllare %s in questo Mac?"
-#: PostInstall.cpp:1444
+#: PostInstall.cpp:1519
#, c-format
msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
msgstr ""
"Vuoi impostare %s come screensaver per tutti gli utenti %s di questo Mac?"
-#: uninstall.cpp:82
+#: uninstall.cpp:80
msgid "OK"
msgstr "OK"
-#: uninstall.cpp:136
+#: uninstall.cpp:130
msgid "Permission error after relaunch"
msgstr "Errore di permessi dopo il riavvio"
-#: uninstall.cpp:141
+#: uninstall.cpp:135
msgid ""
"Removal may take several minutes.\n"
"Please be patient."
@@ -76,7 +75,7 @@ msgstr ""
"La rimozione può richiedere alcuni minuti.\n"
"Si prega di attendere."
-#: uninstall.cpp:156
+#: uninstall.cpp:150
#, c-format
msgid ""
"Are you sure you want to completely remove %s from your computer?\n"
@@ -87,29 +86,21 @@ msgstr ""
"\n"
"Questo rimuoverà anche gli eseguibili ma non toccherà i file di dati di %s."
-#: uninstall.cpp:163
+#: uninstall.cpp:157
#, c-format
msgid "Canceled: %s has not been touched."
msgstr "Annullato: %s non è stato toccato."
-#: uninstall.cpp:174
+#: uninstall.cpp:168
#, c-format
msgid "An error occurred: error code %d"
msgstr "Errore non previsto: codice errore %d"
-#: uninstall.cpp:230
+#: uninstall.cpp:224
msgid "name of user"
msgstr "nome utente"
-#: uninstall.cpp:272
-msgid ""
-"Do you also want to remove VirtualBox from your computer?\n"
-"(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Vuoi anche rimuovere VirtualBox dal tuo computer?\n"
-"(VirtualBox è stato installato con BOINC.)"
-
-#: uninstall.cpp:312
+#: uninstall.cpp:261
#, c-format
msgid ""
"Removal completed.\n"
@@ -128,7 +119,7 @@ msgstr ""
"per ogni utente, il file\n"
"\"%s\"."
-#: uninstall.cpp:840
+#: uninstall.cpp:796
#, c-format
msgid ""
"Enter your administrator password to completely remove %s from you "
@@ -139,18 +130,14 @@ msgstr ""
"dal tuo computer.\n"
"\n"
-#: uninstall.cpp:1616
+#: uninstall.cpp:1555
msgid "Cancel"
msgstr "Annulla"
-#: uninstall.cpp:1617
+#: uninstall.cpp:1556
msgid "Continue..."
msgstr "Continua..."
-#, c-format
-#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
-#~ msgstr "Scusa, questa versione di %s richiede un sistema 10.4 o superiore."
-
#~ msgid ""
#~ "Removal completed.\n"
#~ "\n"
diff --git a/locale/it_IT/BOINC-Web.mo b/locale/it_IT/BOINC-Web.mo
index fb50863..512f701 100644
Binary files a/locale/it_IT/BOINC-Web.mo and b/locale/it_IT/BOINC-Web.mo differ
diff --git a/locale/it_IT/BOINC-Web.po b/locale/it_IT/BOINC-Web.po
index be10b9b..8e64a72 100644
--- a/locale/it_IT/BOINC-Web.po
+++ b/locale/it_IT/BOINC-Web.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
-"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-06-27 14:58+0000\n"
+"POT-Creation-Date: 2013-10-29 11:10 PDT\n"
+"PO-Revision-Date: 2013-11-07 08:15+0000\n"
"Last-Translator: Gianfranco <costamagnagianfranco at yahoo.it>\n"
"Language-Team: \n"
"Language: it_IT\n"
@@ -17,11 +17,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-0: doc\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1403881135.0\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-KeywordsList: tra\n"
+"X-POOTLE-MTIME: 1383812111.0\n"
#: docutil.php:21
msgid "Search"
@@ -36,65 +36,37 @@ msgstr "Torna alla pagina principale del BOINC"
msgid "This page is %stranslatable%s."
msgstr "Questa pagina %spuò essere tradotta%s."
-#: download.php:39
-msgid ""
-"We recommend that you also install VirtualBox, so your computer can work on "
-"science projects that require it."
-msgstr ""
-"Raccomandiamo l'installazione di VirtualBox, cosicché il tuo computer possa "
-"elaborare su progetti scientifici che lo richiedono"
-
-#: download.php:41
-msgid "Learn more about VirtualBox."
-msgstr "Leggi di più su VirtualBox."
-
-#: download.php:51
-msgid "Download BOINC + VirtualBox"
+#: download.php:44
+msgid "Download BOINC + Virtualbox"
msgstr "Scarica BOINC + Virtualbox"
-#: download.php:54 download.php:69
-#, php-format
-msgid "for %s"
-msgstr "per %s"
-
-#: download.php:57 download.php:72
+#: download.php:46 download.php:56
#, php-format
-msgid "BOINC version %s"
-msgstr "versione BOINC %s"
-
-#: download.php:59
-#, php-format
-msgid "VirtualBox version %s"
-msgstr "versione VirtualBox %s"
+msgid "%s for %s (%s MB)"
+msgstr "%s per %s (%s MB)"
# ######################################<br />
# download.php<br />
# ######################################<br /><br />
# <br /><br />
# download.php<br />
-#: download.php:67
+#: download.php:54
msgid "Download BOINC"
msgstr "Scarica BOINC"
-#: download.php:123
+#: download.php:107
msgid ""
"BOINC is a program that lets you donate your idle computer time to science "
"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-"Community Grid, and many others."
-msgstr ""
-"BOINC è un programma che ti permette di donare il tempo inutilizzato del tuo "
-"computer per progetti come SETI at home, Climateprediction.net, Rosetta at home, "
-"World Community Grid, e molti altri."
-
-#: download.php:125
-msgid ""
-"After installing BOINC on your computer, you can connect it to as many of "
-"these projects as you like."
+"Community Grid, and many others. <p> After installing BOINC on your "
+"computer, you can connect it to as many of these projects as you like."
msgstr ""
-"Dopo l'installazione di BOINC sul tuo computer, puoi connetterti a tutti i "
-"progetti che preferisci."
+"BOINC è un programma che permette di donare il tempo in cui il computer non "
+"lavora a progetti come SETI at home, Climateprediction.net, Rosetta at home, World "
+"Community Grid, e molti altri. <p> Dopo l'installazione di BOINC sul tuo "
+"computer, puoi connetterlo a quanti progetti vuoi."
-#: download.php:127
+#: download.php:109
msgid ""
"You may run this software on a computer only if you own the computer or have "
"the permission of its owner."
@@ -102,39 +74,31 @@ msgstr ""
"Puoi eseguire questo software su un computer solo se possiedi il computer o "
"se hai il permesso del suo padrone."
-#: download.php:132
-msgid ""
-"We recommend that you download BOINC from the Google Play Store or Amazon "
-"Appstore, not from here."
-msgstr ""
-"Raccomandiamo che tu scarichi BOINC dal Google Play Store oppure dall'Amazon "
-"Appstore, non da qui."
-
-#: download.php:167
+#: download.php:151
msgid "System requirements"
msgstr "Requisiti di sistema"
-#: download.php:168
+#: download.php:152
msgid "Release notes"
msgstr "Note di rilascio"
-#: download.php:169 index.php:86
+#: download.php:153 index.php:86
msgid "Help"
msgstr "Aiuto"
-#: download.php:170
+#: download.php:154
msgid "All versions"
msgstr "Tutte le versioni"
-#: download.php:171
+#: download.php:155
msgid "Version history"
msgstr "Storia delle versioni"
-#: download.php:172
+#: download.php:156
msgid "GPU computing"
msgstr "elaborazione GPU"
-#: download.php:190
+#: download.php:174
msgid "BOINC: compute for science"
msgstr "BOINC: elabora per la scienza"
@@ -466,16 +430,16 @@ msgstr ""
msgid "Cognitive science and artifical intelligence"
msgstr "Scienze cognitive e intelligenza artificiale"
-#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
-#: projects.inc:464 projects.inc:511
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
msgid "Private"
msgstr "Privato"
-#: projects.inc:61
+#: projects.inc:51
msgid "Artificial intelligence"
msgstr "Intelligenza artificiale"
-#: projects.inc:62
+#: projects.inc:52
msgid ""
"Parse and convert semantic nets for use in FreeHAL, an artificial "
"intelligence that uses semantic networks, stemmers, part of speech "
@@ -487,19 +451,19 @@ msgstr ""
"database linguistici, e parti di analizzatori grammaticali allo scopo di "
"imitare il comportamento umano nelle conversazioni."
-#: projects.inc:69
+#: projects.inc:58
msgid "Biology and Medicine"
msgstr "Biologia e Medicina"
-#: projects.inc:82
+#: projects.inc:71
msgid "University College Dublin"
msgstr "College Universitario di Dublino"
-#: projects.inc:83
+#: projects.inc:72
msgid "Antimalarial drug discovery"
msgstr "Scoperta di cure contro la malaria"
-#: projects.inc:84
+#: projects.inc:73
msgid ""
"The parasite that causes malaria continues to evolve resistance to available "
"medication. We therefore urgently need to discover new drugs to replace "
@@ -513,15 +477,15 @@ msgstr ""
"destinazione le NUOVE proteine del parassita. Il progetto FightMalaria at Home "
"serve a trovare queste nuove destinazioni."
-#: projects.inc:90
+#: projects.inc:79
msgid "University of Karlsruhe (Germany)"
msgstr "Università di Karlsruhe (Germania)"
-#: projects.inc:91
+#: projects.inc:80
msgid "Protein structure prediction"
msgstr "Predizione della struttura delle proteine"
-#: projects.inc:92
+#: projects.inc:81
msgid ""
"POEM at HOME uses a computational approach to predict the biologically active "
"structure of proteins, to understand the signal-processing mechanisms when "
@@ -536,15 +500,15 @@ msgstr ""
"all'aggregazione delle proteine, e sviluppare nuovi farmaci sulla base della "
"struttura tridimensionale delle proteine biologicamente importanti."
-#: projects.inc:98
+#: projects.inc:87
msgid "University of Delaware"
msgstr "Università del Delaware"
-#: projects.inc:99
+#: projects.inc:88
msgid "Study of protein - ligand interactions"
msgstr "Studio delle interazioni proteina - ligando"
-#: projects.inc:100
+#: projects.inc:89
msgid ""
"Docking at Home has both bioscience and computer science goals. The project "
"aims to further knowledge of the atomic details of protein-ligand "
@@ -556,15 +520,15 @@ msgstr ""
"conoscenza delle interazioni proteina-ligando su scala atomica e, di "
"conseguenza, ricercare intuizioni utili alla scoperta di nuovi farmaci."
-#: projects.inc:114
+#: projects.inc:103
msgid "Barcelona Biomedical Research Park (PRBB)"
msgstr "Barcelona Biomedical Research Park (PRBB)"
-#: projects.inc:115
+#: projects.inc:104
msgid "Molecular simulations of proteins"
msgstr "Simulazioni molecolari di proteine"
-#: projects.inc:116
+#: projects.inc:105
msgid ""
"GPUGrid.net opens novel computational scenarios by the first full-atom "
"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
@@ -577,15 +541,15 @@ msgstr ""
"applicazioni biomediche le quali conferiscono un nuovo ruolo alla biologia "
"computazionale per la ricerca biomedica."
-#: projects.inc:122
+#: projects.inc:111
msgid "Technion, Israel"
msgstr "Technion, Israele"
-#: projects.inc:123
+#: projects.inc:112
msgid "Genetic linkage analysis"
msgstr "Analisi di connessioni genetiche"
-#: projects.inc:124
+#: projects.inc:113
msgid ""
"Superlink at Technion helps geneticists all over the world find disease-"
"provoking genes causing some types of diabetes, hypertension (high blood "
@@ -595,18 +559,18 @@ msgstr ""
"provocano disfunzioni quali ipertensione (elevata pressione sangiugna), "
"alcuni tipi di diabete, cancro, schizofrenia e molte altre."
-#: projects.inc:138
+#: projects.inc:127
msgid ""
"University of Maryland Center for Bioinformatics and Computational Biology"
msgstr ""
"Centro per la bioinformatica e la biologia computazionale dell'Università "
"del Maryland"
-#: projects.inc:139
+#: projects.inc:128
msgid "Life science research"
msgstr "Scienze naturali"
-#: projects.inc:140
+#: projects.inc:129
msgid ""
"The Lattice Project supplies computing power to scientists at the University "
"of Maryland studying evolutionary relationships based on DNA sequence data; "
@@ -618,15 +582,15 @@ msgstr ""
"su dati di sequenze di DNA, su sequenze proteiche di batteri, plasmidi e "
"virus, e sulla diversità biologica nelle aree naturali protette."
-#: projects.inc:146
+#: projects.inc:135
msgid "The Swiss Tropical Institute"
msgstr "The Swiss Tropical Institute"
-#: projects.inc:147
+#: projects.inc:136
msgid "Epidemiology"
msgstr "Epidemiologia"
-#: projects.inc:148
+#: projects.inc:137
msgid ""
"Simulation models of the transmission dynamics and health effects of malaria "
"are an important tool for malaria control. They can be used to determine "
@@ -645,15 +609,15 @@ msgstr ""
"simulazione di popolazioni umane con un diverso gruppo di parametri legati a "
"fattori biologici e sociali che influenzano la diffusione della malattia."
-#: projects.inc:170
+#: projects.inc:159
msgid "University of Washington"
msgstr "Università di Washington"
-#: projects.inc:171 projects.inc:179
+#: projects.inc:160 projects.inc:168
msgid "Biology"
msgstr "Biologia"
-#: projects.inc:172
+#: projects.inc:161
msgid ""
"Determine the 3-dimensional shapes of proteins in research that may "
"ultimately lead to finding cures for some major human diseases. By running "
@@ -669,11 +633,11 @@ msgstr ""
"possibili. Aiuterai anche i nostri sforzi nel progettare nuove proteine per "
"combattere malattie come l'HIV, la malaria, il cancro, e l'Alzheimer."
-#: projects.inc:178
+#: projects.inc:167
msgid "University of Vienna"
msgstr "Università di Vienna"
-#: projects.inc:180
+#: projects.inc:169
msgid ""
"Calculate similarities between proteins. SIMAP provides a public database of "
"the resulting data, which plays a key role in many bioinformatics research "
@@ -683,19 +647,19 @@ msgstr ""
"dei dati risultanti, il quale gioca un ruolo chiave in molti progetti di "
"ricerca bioinformatica. "
-#: projects.inc:186
+#: projects.inc:175
msgid "Earth Sciences"
msgstr "Scienze della Terra"
-#: projects.inc:198
+#: projects.inc:187
msgid "Oxford University"
msgstr "Università di Oxford"
-#: projects.inc:199
+#: projects.inc:188
msgid "Climate study"
msgstr "Studi climatici"
-#: projects.inc:200
+#: projects.inc:189
msgid ""
"Investigate the approximations that have to be made in state-of-the-art "
"climate models. By running the model thousands of times we hope to find out "
@@ -717,27 +681,16 @@ msgstr ""
"potrà cambiare nel prossimo secolo, sotto un ampio ventaglio di scenari "
"diversi."
-#: projects.inc:207
-msgid "Physical Science"
-msgstr "Fisica"
-
-#: projects.inc:213
-msgid "Mechanical engineering"
-msgstr "Ingegneria meccanica"
-
-#: projects.inc:214
-msgid ""
-"Currently we are calculating the optimum design of a structure call the 52 "
-"bar truss"
-msgstr ""
-"Al momento stiamo calcolando il design migliore per una struttura con 52 "
-"barre di traliccio"
+# 75%
+#: projects.inc:196
+msgid "Astronomy, Physics, and Chemistry"
+msgstr "Astronomia, Fisica e Chimica"
-#: projects.inc:224 projects.inc:263 projects.inc:271
+#: projects.inc:202 projects.inc:241 projects.inc:249
msgid "Astronomy"
msgstr "Astronomia"
-#: projects.inc:225
+#: projects.inc:203
msgid ""
"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
@@ -754,15 +707,15 @@ msgstr ""
"base risolta pixel per pixel utilizzando la distribuzione di energia "
"spettrale (SED) con tecniche di calcolo distribuito."
-#: projects.inc:247
+#: projects.inc:225
msgid "University of Texas at Austin"
msgstr "Università del Texas di Austin"
-#: projects.inc:248 projects.inc:279
+#: projects.inc:226 projects.inc:257
msgid "Chemistry"
msgstr "Chimica"
-#: projects.inc:249
+#: projects.inc:227
msgid ""
"A common problem in theoretical chemistry, condensed matter physics and "
"materials science is the calculation of the time evolution of an atomic "
@@ -786,11 +739,11 @@ msgstr ""
"calcolo della dinamica a lungo termine dei sistemi."
# 95%
-#: projects.inc:262
+#: projects.inc:240
msgid "University of Illinois at Urbana-Champaign"
msgstr "Università dell'Illinois di Urbana-Champaign"
-#: projects.inc:264
+#: projects.inc:242
msgid ""
"The goal of Cosmology at Home is to search for the model that best describes "
"our Universe and to find the range of models that agree with the available "
@@ -800,11 +753,11 @@ msgstr ""
"nostro Universo e trovare l'intervallo di modelli che concordano con i dati "
"disponibili dalla fisica delle particelle astronomiche."
-#: projects.inc:270
+#: projects.inc:248
msgid "Rensselaer Polytechnic Institute"
msgstr "Rensselaer Polytechnic Institute"
-#: projects.inc:272
+#: projects.inc:250
msgid ""
"The goal of Milkyway at Home is to create a highly accurate three dimensional "
"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
@@ -814,11 +767,11 @@ msgstr ""
"accurato possibile della Via Lattea usando i dati raccolti dal Sloan Digital "
"Sky Survey."
-#: projects.inc:278
+#: projects.inc:256
msgid "Leiden University, The Netherlands"
msgstr "Università di Leiden, Paesi Bassi"
-#: projects.inc:280
+#: projects.inc:258
msgid ""
"Surface science calculations using Classical Dynamics. Leiden Classical "
"allows volunteers, students and other scientist to submit their personal "
@@ -835,15 +788,15 @@ msgstr ""
"validità della legge dei gas ideali (equazione di stato dei gas perfetti) "
"effettuando le simulazioni tramite la grid."
-#: projects.inc:294
+#: projects.inc:272
msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
msgstr "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
-#: projects.inc:295
+#: projects.inc:273
msgid "Astrophysics"
msgstr "Astrofisica"
-#: projects.inc:296
+#: projects.inc:274
msgid ""
"Search for spinning neutron stars (also called pulsars) using data from the "
"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
@@ -857,15 +810,15 @@ msgstr ""
"supportato dall'American Physical Society (APS) e da un certo numero di "
"organizzazioni internazionali."
-#: projects.inc:310 projects.inc:318
+#: projects.inc:288 projects.inc:296
msgid "CERN (European Organization for Nuclear Research)"
msgstr "CERN (Organizzazione Europea per la Ricerca Nucleare)"
-#: projects.inc:311 projects.inc:319
+#: projects.inc:289 projects.inc:297
msgid "Physics"
msgstr "Fisica"
-#: projects.inc:312
+#: projects.inc:290
msgid ""
"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
"European Organization for Nuclear Research, the world's largest particle "
@@ -879,7 +832,7 @@ msgstr ""
"costruito per investigare le proprietà delle particelle. LHC at home elabora "
"simulazioni per migliorare la progettazione di LHC e dei suoi rivelatori."
-#: projects.inc:320
+#: projects.inc:298
msgid ""
"This project uses CERN-developed virtual machine technology for full-fledged "
"LHC event physics simulation on volunteer computers. Requires that you "
@@ -889,15 +842,15 @@ msgstr ""
"eventi fisici dell'LHC sui computer dei volontari. Richiede che venga "
"installato VirtualBox sul tuo computer"
-#: projects.inc:326
+#: projects.inc:304
msgid "University of California, Berkeley"
msgstr "Università di Berkeley, California"
-#: projects.inc:327
+#: projects.inc:305
msgid "Astrophysics, astrobiology"
msgstr "Astrofisica, astrobiologia"
-#: projects.inc:328
+#: projects.inc:306
msgid ""
"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
"goal is to detect intelligent life outside Earth. One approach, known as "
@@ -913,15 +866,15 @@ msgstr ""
"naturale, quindi la loro rilevazione fornirebbe prova di tecnologia "
"extraterrestre."
-#: projects.inc:342
+#: projects.inc:320
msgid "Bielefeld University of Applied Sciences"
msgstr "Università delle Scienze Applicate di Bielefeld"
-#: projects.inc:343
+#: projects.inc:321
msgid "Chemical engineering and nanotechnology"
msgstr "Ingegneria chimica e nanotecnologia"
-#: projects.inc:344
+#: projects.inc:322
msgid ""
"The study of molecular magnets and controlled nanoscale magnetism. These "
"magnetic molecules may be used to develop tiny magnetic switches, with "
@@ -933,19 +886,19 @@ msgstr ""
"minuscoli interruttori magnetici, con applicazioni in medicina (come "
"chemioterapia locale) e biotecnologia."
-#: projects.inc:351
+#: projects.inc:329
msgid "Multiple applications"
msgstr "Applicazioni multiple"
-#: projects.inc:356
+#: projects.inc:334
msgid "Chinese Academy of Sciences"
msgstr "Chinese Academy of Sciences"
-#: projects.inc:357
+#: projects.inc:335
msgid "Physics, biochemistry, and others"
msgstr "Fisica, biochimica, ed altre"
-#: projects.inc:358
+#: projects.inc:336
msgid ""
"The objective of CAS at home is to encourage and assist scientists in China to "
"adopt the technologies of volunteer computing and volunteer thinking for "
@@ -955,11 +908,11 @@ msgstr ""
"ad adottare le tecnologie del calcolo distribuito volontario pensando alle "
"loro ricerche."
-#: projects.inc:365
+#: projects.inc:343
msgid "Mathematics, physics, evolution"
msgstr "Matematica, fisica, evoluzione"
-#: projects.inc:366
+#: projects.inc:344
msgid ""
"Yoyo at home is an adapter between BOINC and several existing volunteer "
"computing projects: ECM, Muon, Evolution at home, and distributed.net"
@@ -967,15 +920,15 @@ msgstr ""
"Yoyo at home è un adattatore tra BOINC e vari altri progetti di calcolo "
"volontario esistenti: ECM, Muon, Evolution at home, e distributed.net"
-#: projects.inc:371 projects.inc:527
+#: projects.inc:349 projects.inc:505
msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-#: projects.inc:372
+#: projects.inc:350
msgid "European research projects"
msgstr "Progetti di ricerca europei"
-#: projects.inc:373
+#: projects.inc:351
msgid ""
"The EDGeS at Home Beta project integrates volunteer computing into the service "
"grid network of Europe by allowing service grids to send workunits to be "
@@ -987,27 +940,27 @@ msgstr ""
"elaborare ai volontari di questo progetto. I progetti scientifici coperti "
"dal progetto includono matematica, fisica, biologia, ecc."
-#: projects.inc:379
+#: projects.inc:357
msgid "Spanish universities and research centers"
msgstr "Università e centri di ricerca spagnoli"
-#: projects.inc:380
+#: projects.inc:358
msgid "Various Spanish research projects"
msgstr "Diversi progetti di ricerca spagnoli"
-#: projects.inc:381
+#: projects.inc:359
msgid "Research in physics, material science, and biomedicine"
msgstr "Ricerca in fisica, scienza dei materiali e biomedicina"
-#: projects.inc:387
+#: projects.inc:365
msgid "IBM Corporate Citizenship"
msgstr "Cittadinanza IBM Corporate"
-#: projects.inc:388
+#: projects.inc:366
msgid "Medical, environmental and other humanitarian research"
msgstr "Medica, dell'ambiente e altre ricerche umanitarie"
-#: projects.inc:389
+#: projects.inc:367
msgid ""
"To further critical non-profit research on some of humanity's most pressing "
"problems by creating the world's largest volunteer computing grid. Research "
@@ -1019,27 +972,27 @@ msgstr ""
"Le ricerche includono HIV-AIDS, cancro, malattie tropicali e dimenticate, "
"energia solare, acqua pulita e molte altre."
-#: projects.inc:395
+#: projects.inc:373
msgid "Mathematics, computing, and games"
msgstr "Matematica, calcolo computazionale, e giochi"
-#: projects.inc:401
+#: projects.inc:379
msgid "Computer Science"
msgstr "Informatica"
-#: projects.inc:409
+#: projects.inc:387
msgid "Mathematics, Physics, Artificial Intelligence"
msgstr "Matematica, Fisica, Intelligenza Artificiale"
-#: projects.inc:410
+#: projects.inc:388
msgid "Simulation of quantum computing; Goldbach's conjecture."
msgstr "Simulazione dell'elaborazione quantica; congettura di Goldbach."
-#: projects.inc:450 projects.inc:458
+#: projects.inc:428 projects.inc:436
msgid "Cryptography"
msgstr "Crittografia"
-#: projects.inc:459
+#: projects.inc:437
msgid ""
"Attempt to decode 3 original Enigma messages. The signals were intercepted "
"in the North Atlantic in 1942 and are believed to be unbroken."
@@ -1047,24 +1000,24 @@ msgstr ""
"Tentare di decodificare 3 messaggi Enigma originali. I segnali vennero "
"intercettati nell'Atlantico del nord nel 1942 e si crede siano intatti."
-#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
-#: projects.inc:528 projects.inc:568
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
msgid "Mathematics"
msgstr "Matematica"
-#: projects.inc:466
+#: projects.inc:444
msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
msgstr "Studiare la Congettura di Collatz, una congettura matematica irrisolta"
-#: projects.inc:471
+#: projects.inc:449
msgid "California State University Fullerton"
msgstr "California State University Fullerton"
-#: projects.inc:472
+#: projects.inc:450
msgid "Factorization of large integers"
msgstr "Fattorizzazione di grandi numeri interi"
-#: projects.inc:473
+#: projects.inc:451
msgid ""
"NFS at Home is a research project that uses Internet-connected computers to do "
"the lattice sieving step in the Number Field Sieve factorization of large "
@@ -1081,7 +1034,7 @@ msgstr ""
"7. NFS at Home è una continuazione di quell'esperienza, solo con interi lunghi "
"centinaia di cifre."
-#: projects.inc:479
+#: projects.inc:457
msgid ""
"Vilnius Gediminas Technical University and Kaunas University of Technology "
"(Lithuania)"
@@ -1089,11 +1042,11 @@ msgstr ""
"Vilnius Gediminas Technical University and Kaunas University of Technology "
"(Lithuania)"
-#: projects.inc:480
+#: projects.inc:458
msgid "Software testing"
msgstr "Testing del software"
-#: projects.inc:481
+#: projects.inc:459
msgid ""
"The aim of this project is to provide a powerful distributed computing "
"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
@@ -1105,11 +1058,11 @@ msgstr ""
"(VGTU) e ad altre università della Lituania. Le applicazioni correnti "
"riguardano lo studio delle applicazioni basate sul software Monte-Carlo."
-#: projects.inc:503
+#: projects.inc:481
msgid "Mathematical Institute of Leiden University / Kennislink"
msgstr "Mathematical Institute of Leiden University / Kennislink"
-#: projects.inc:505
+#: projects.inc:483
msgid ""
"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
@@ -1127,7 +1080,7 @@ msgstr ""
"più grandi problemi aperti della matematica. Se venisse provata, molti altri "
"problemi aperti verrebbero risolti direttamente da essa."
-#: projects.inc:513
+#: projects.inc:491
msgid ""
"Primegrid has multiple projects searching for different forms of very large "
"prime numbers, including searching for the largest known prime number."
@@ -1135,11 +1088,11 @@ msgstr ""
"Primegrid ha progetti multipli che cercano differenti forme di grandi numeri "
"primi, inclusa la ricerca del più grande numero primo conosciuto."
-#: projects.inc:519
+#: projects.inc:497
msgid "Hochschule RheinMain University of Applied Sciences"
msgstr "Hochschule RheinMain University of Applied Sciences"
-#: projects.inc:521
+#: projects.inc:499
msgid ""
"Search for counterexamples to two conjectures related to the identification "
"of prime numbers"
@@ -1147,7 +1100,7 @@ msgstr ""
"Cercare controesempi a due congetture riguardanti l'identificazione di "
"numeri primi"
-#: projects.inc:529
+#: projects.inc:507
msgid ""
"Find all the generalized binary number systems (in which bases are matrices "
"and digits are vectors) up to dimension 11."
@@ -1165,28 +1118,6 @@ msgstr "Commenta"
msgid "News is available as an %sRSS feed%s"
msgstr "Le news sono disponibili come %sRSS feed%s"
-#~ msgid "Download BOINC + Virtualbox"
-#~ msgstr "Scarica BOINC + Virtualbox"
-
-#, php-format
-#~ msgid "%s for %s (%s MB)"
-#~ msgstr "%s per %s (%s MB)"
-
-#~ msgid ""
-#~ "BOINC is a program that lets you donate your idle computer time to science "
-#~ "projects like SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, and many others. <p> After installing BOINC on your "
-#~ "computer, you can connect it to as many of these projects as you like."
-#~ msgstr ""
-#~ "BOINC è un programma che permette di donare il tempo in cui il computer non "
-#~ "lavora a progetti come SETI at home, Climateprediction.net, Rosetta at home, World "
-#~ "Community Grid, e molti altri. <p> Dopo l'installazione di BOINC sul tuo "
-#~ "computer, puoi connetterlo a quanti progetti vuoi."
-
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomia, Fisica e Chimica"
-
#~ msgid "Browser default"
#~ msgstr "Pagina di default del browser"
diff --git a/locale/ja/BOINC-Project-Generic.po b/locale/ja/BOINC-Project-Generic.po
index 962d68e..7378ca2 100644
--- a/locale/ja/BOINC-Project-Generic.po
+++ b/locale/ja/BOINC-Project-Generic.po
@@ -7,18 +7,17 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2013-10-28 15:20+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"PO-Revision-Date: 2013-03-16 11:43+0200\n"
+"Last-Translator: Kai <www.carrotsoft at gmail.com>\n"
"Language-Team: \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-BOINC-UTF8-Marker: 日本語\n"
-"X-POOTLE-MTIME: 1382973625.0\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -1209,9 +1208,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "NVIDIA GPU を計算に使うか %1 Version 6.10以降で有効 %2"
#: ../inc/prefs.inc:344
-#, fuzzy
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "ATI GPU を計算に使うか %1 Version 6.10以降で有効 %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1761,9 +1759,8 @@ msgid "State"
msgstr "状態"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "タスク名"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -2117,9 +2114,8 @@ msgid "Used in community functions"
msgstr "コミュニティ機能の中で使われる ID です"
#: ../inc/user.inc:216 ../user/weak_auth.php:25
-#, fuzzy
msgid "Account keys"
-msgstr "アカウント・キー"
+msgstr ""
#: ../inc/user.inc:221
msgid "Preferences"
@@ -2568,9 +2564,8 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
-#, fuzzy
msgid "Languages"
-msgstr "言語"
+msgstr ""
# #######################################
# Rules and Policies page (info.php)
diff --git a/locale/ko/BOINC-Manager.mo b/locale/ko/BOINC-Manager.mo
index 6d47e56..489ef48 100644
Binary files a/locale/ko/BOINC-Manager.mo and b/locale/ko/BOINC-Manager.mo differ
diff --git a/locale/ko/BOINC-Manager.po b/locale/ko/BOINC-Manager.po
index 4182c98..1ff1717 100644
--- a/locale/ko/BOINC-Manager.po
+++ b/locale/ko/BOINC-Manager.po
@@ -2,6 +2,7 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
msgid ""
msgstr ""
"Project-Id-Version: BOINC Manager 7.2.x\n"
diff --git a/locale/ko/BOINC-Project-Generic.po b/locale/ko/BOINC-Project-Generic.po
index 114f787..c57ddbd 100644
--- a/locale/ko/BOINC-Project-Generic.po
+++ b/locale/ko/BOINC-Project-Generic.po
@@ -1,26 +1,28 @@
# BOINC web translation
# Copyright (C) 2008 University of California
+#
# This file is distributed under the same license as BOINC.
+#
# FileID : $Id$
+#
msgid ""
msgstr ""
"Project-Id-Version: 2013/12/3\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-07-27 06:45+0000\n"
-"Last-Translator: Kangsan Lee <treppolse at gmail.com>\n"
+"PO-Revision-Date: 2013-12-18 14:45+0900\n"
+"Last-Translator: Lee Kangsan <treppolse at gmail.com>\n"
"Language-Team: SETIKAH at KOREA\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Poedit 1.5.7\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体ä¸æ–‡, 日本語\n"
"X-Poedit-SearchPath-0: html\\user\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1406443547.0\n"
+"X-BOINC-UTF8-Marker: 简体ä¸æ–‡, 日本語\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -5786,7 +5788,7 @@ msgstr "창설자 변경"
#: ../user/team_change_founder_form.php:108
msgid "There are no users to transfer team to."
-msgstr "팀에서 인계받을 사용자를 찾지 못했습니다."
+msgstr ""
#: ../user/team_create_action.php:29
msgid "You must choose a non-blank team name"
diff --git a/locale/ko/BOINC-Web.mo b/locale/ko/BOINC-Web.mo
index 8d4d0f8..351991d 100644
Binary files a/locale/ko/BOINC-Web.mo and b/locale/ko/BOINC-Web.mo differ
diff --git a/locale/ko/BOINC-Web.po b/locale/ko/BOINC-Web.po
index 0ca2ec0..5be6f3a 100644
--- a/locale/ko/BOINC-Web.po
+++ b/locale/ko/BOINC-Web.po
@@ -1,7 +1,10 @@
# BOINC web translation
# Copyright (C) 2008-2009 University of California
+#
# This file is distributed under the same license as BOINC.
+#
# FileID : $Id$
+#
msgid ""
msgstr ""
"Project-Id-Version: BOINC web 2014/2/7\n"
diff --git a/locale/lv/BOINC-Manager.mo b/locale/lv/BOINC-Manager.mo
index a12cc35..9ed9c87 100644
Binary files a/locale/lv/BOINC-Manager.mo and b/locale/lv/BOINC-Manager.mo differ
diff --git a/locale/ms/BOINC-Client.mo b/locale/ms/BOINC-Client.mo
deleted file mode 100644
index 00cc482..0000000
Binary files a/locale/ms/BOINC-Client.mo and /dev/null differ
diff --git a/locale/ms/BOINC-Manager.mo b/locale/ms/BOINC-Manager.mo
deleted file mode 100644
index c1217e7..0000000
Binary files a/locale/ms/BOINC-Manager.mo and /dev/null differ
diff --git a/locale/ms/BOINC-Setup.mo b/locale/ms/BOINC-Setup.mo
deleted file mode 100644
index 6b90fe4..0000000
Binary files a/locale/ms/BOINC-Setup.mo and /dev/null differ
diff --git a/locale/ms/BOINC-Web.mo b/locale/ms/BOINC-Web.mo
deleted file mode 100644
index 032b02f..0000000
Binary files a/locale/ms/BOINC-Web.mo and /dev/null differ
diff --git a/locale/nb/BOINC-Android.po b/locale/nb/BOINC-Android.po
index 42a1985..b0e5fc1 100644
--- a/locale/nb/BOINC-Android.po
+++ b/locale/nb/BOINC-Android.po
@@ -7,1129 +7,1108 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2013-10-18 00:00-0700\n"
-"PO-Revision-Date: 2014-09-02 04:11+0000\n"
-"Last-Translator: Jan <jan at sherdahl.com>\n"
+"PO-Revision-Date: 2013-10-22 15:28-0700\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: nb <LL at li.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
"Generated-By: Babel 1.0dev\n"
-"X-POOTLE-MTIME: 1409631108.0\n"
#. app global
msgctxt "app_name"
msgid "BOINC"
-msgstr "BOINC"
+msgstr ""
#. generic. used by multiple Activities/tabs
msgctxt "generic_loading"
msgid "Loading! Please wait…"
-msgstr "Laster! Vennligst vent..."
+msgstr ""
#. attach project
#. project list
msgctxt "attachproject_list_header"
msgid "Choose a project:"
-msgstr "Velg et prosjekt:"
+msgstr ""
msgctxt "attachproject_list_manual_button"
msgid "Add project by URL"
-msgstr "Legg til prosjekt fra URL"
+msgstr ""
msgctxt "attachproject_list_manual_dialog_title"
msgid "Enter project URL:"
-msgstr "Tast inn URL til prosjekt:"
+msgstr ""
msgctxt "attachproject_list_manual_dialog_button"
msgid "Add project"
-msgstr "Legg til prosjekt"
+msgstr ""
msgctxt "attachproject_list_manual_no_url"
msgid "Please enter project URL"
-msgstr "Vennligst tast inn URL til prosjektet"
+msgstr ""
msgctxt "attachproject_list_acctmgr_button"
msgid "Add account manager"
-msgstr "Legg til kontobehandler"
+msgstr ""
msgctxt "attachproject_list_no_internet"
msgid "No Internet connection"
-msgstr "Ingen Internett-tilkobling"
+msgstr ""
#. project login
msgctxt "attachproject_login_loading"
msgid "Contacting project server…"
-msgstr "Kontakter prosjektserver..."
+msgstr ""
msgctxt "attachproject_login_image_description"
msgid "Project logo."
-msgstr "Prosjektlogo."
+msgstr ""
msgctxt "attachproject_login_header_general_area"
msgid "General area:"
-msgstr "Generelt område:"
+msgstr ""
msgctxt "attachproject_login_header_specific_area"
msgid "Specific area:"
-msgstr "Spesifikt område:"
+msgstr ""
msgctxt "attachproject_login_header_description"
msgid "Description:"
-msgstr "Beskrivelse:"
+msgstr ""
msgctxt "attachproject_login_header_home"
msgid "Home:"
-msgstr "Hjem:"
+msgstr ""
msgctxt "attachproject_login_header_url"
msgid "Website:"
-msgstr "Nettsted:"
+msgstr ""
msgctxt "attachproject_login_header_platform"
msgid "Android:"
-msgstr "Android:"
+msgstr ""
msgctxt "attachproject_login_platform_supported"
msgid "This project supports Android devices"
-msgstr "Dette prosjektet støtter Android enheter"
+msgstr ""
msgctxt "attachproject_login_platform_not_supported"
msgid "This project does not support Android devices"
-msgstr "Dette prosjektet støtter ikke Android enheter"
+msgstr ""
msgctxt "attachproject_login_category_terms_of_use"
msgid "Terms of use for"
-msgstr "Vilkår for bruk av"
+msgstr ""
msgctxt "attachproject_login_accept_terms_of_use"
msgid ""
"By creating an account with this project, you accept the terms of use as "
"shown above."
msgstr ""
-"Ved å opprette en konto i dette prosjektet, aksepterer du vilkårene for bruk "
-"som vist ovenfor."
msgctxt "attachproject_login_category_login"
msgid "Sign in with existing account"
-msgstr "Logg inn med eksisterende konto"
+msgstr ""
msgctxt "attachproject_login_header_id_email"
msgid "eMail:"
-msgstr "Epost:"
+msgstr ""
msgctxt "attachproject_login_header_id_name"
msgid "Name:"
-msgstr "Navn:"
+msgstr ""
msgctxt "attachproject_login_header_pwd"
msgid "Password:"
-msgstr "Passord:"
+msgstr ""
msgctxt "attachproject_login_category_creation"
msgid "New to"
-msgstr "Ny i"
+msgstr ""
msgctxt "attachproject_login_header_creation_enabled"
msgid "Register an account to participate:"
-msgstr "Registrer en konto for å delta:"
+msgstr ""
msgctxt "attachproject_login_header_creation_client_disabled"
msgid "Visit project website to create an account:"
-msgstr "Gå til prosjektets nettside for å opprette en konto:"
+msgstr ""
msgctxt "attachproject_login_header_creation_disabled"
msgid "Project does currently now allow creation of new accounts!"
-msgstr "Prosjektet tillater nå opprettelse av nye konti!"
+msgstr ""
msgctxt "attachproject_login_button_registration"
msgid "Register"
-msgstr "Registrer"
+msgstr ""
msgctxt "attachproject_login_button_login"
msgid "Sign in"
-msgstr "Logg inn"
+msgstr ""
msgctxt "attachproject_login_button_forgotpw"
msgid "Forgot Password"
-msgstr "Glemt passord"
+msgstr ""
msgctxt "attachproject_login_error_toast"
msgid "Contacting project failed!"
-msgstr "Kontakt med prosjektet feilet!"
+msgstr ""
msgctxt "attachproject_login_attached"
msgid "Attached"
-msgstr "Tilkoblet"
+msgstr ""
#. project registration
msgctxt "attachproject_registration_header"
msgid "Account registration for"
-msgstr "Kontoregistrering for"
+msgstr ""
msgctxt "attachproject_registration_header_url"
msgid "Project:"
-msgstr "Prosjekt:"
+msgstr ""
msgctxt "attachproject_registration_header_email"
msgid "eMail:"
-msgstr "Epost:"
+msgstr ""
msgctxt "attachproject_registration_header_username"
msgid "Name:"
-msgstr "Navn:"
+msgstr ""
msgctxt "attachproject_registration_header_teamname"
msgid "Team:"
-msgstr "Team:"
+msgstr ""
msgctxt "attachproject_registration_header_pwd"
msgid "Password:"
-msgstr "Passord:"
+msgstr ""
msgctxt "attachproject_registration_header_pwd_confirm"
msgid "… Retype:"
-msgstr "... Tast inn på nytt:"
+msgstr ""
msgctxt "attachproject_registration_button"
msgid "Create"
-msgstr "Opprett"
+msgstr ""
#. account manager
msgctxt "attachproject_acctmgr_header"
msgid "Add account manager"
-msgstr "Legg til kontobehandler"
+msgstr ""
msgctxt "attachproject_acctmgr_header_url"
msgid "URL"
-msgstr "URL"
+msgstr ""
msgctxt "attachproject_acctmgr_header_name"
msgid "User:"
-msgstr "Bruker:"
+msgstr ""
msgctxt "attachproject_acctmgr_header_pwd"
msgid "Password:"
-msgstr "Passord:"
+msgstr ""
msgctxt "attachproject_acctmgr_header_pwd_confirm"
msgid "… Retype:"
-msgstr "... Tast inn på nytt:"
+msgstr ""
msgctxt "attachproject_acctmgr_button"
msgid "Add"
-msgstr "Legg til"
+msgstr ""
#. error strings
msgctxt "attachproject_error_wrong_name"
msgid "User not found"
-msgstr "Bruker ikke funnet"
+msgstr ""
msgctxt "attachproject_error_short_pwd"
msgid "Password too short"
-msgstr "Passord for kort"
+msgstr ""
msgctxt "attachproject_error_no_internet"
msgid "Connection failure"
-msgstr "Tilkoblingsfeil"
+msgstr ""
msgctxt "attachproject_error_pwd_no_match"
msgid "Passwords do not match"
-msgstr "Passordene samsvarer ikke"
+msgstr ""
msgctxt "attachproject_error_no_url"
msgid "Please enter URL"
-msgstr "Vennligst tast inn URL"
+msgstr ""
msgctxt "attachproject_error_no_email"
msgid "Please enter eMail address"
-msgstr "Vennligst tast inn epostadresse"
+msgstr ""
msgctxt "attachproject_error_no_pwd"
msgid "Please enter a password"
-msgstr "Vennligst tast inn et passord"
+msgstr ""
msgctxt "attachproject_error_no_name"
msgid "Please enter user name"
-msgstr "Vennligst tast inn brukernavn"
+msgstr ""
msgctxt "attachproject_error_unknown"
msgid "failed"
-msgstr "mislyktes"
+msgstr ""
msgctxt "attachproject_error_bad_username"
msgid "User name refused"
-msgstr "Brukernavn ikke akseptert"
+msgstr ""
msgctxt "attachproject_error_email_in_use"
msgid "eMail is already in use"
-msgstr "Epostadressen er allerede i bruk"
+msgstr ""
msgctxt "attachproject_error_project_down"
msgid "Project is offline"
-msgstr "Prosjektet er offline"
+msgstr ""
msgctxt "attachproject_error_email_bad_syntax"
msgid "eMail refused"
-msgstr "Epostadresse ikke akseptert"
+msgstr ""
msgctxt "attachproject_error_bad_pwd"
msgid "Password refused"
-msgstr "Passord ikke akseptert"
+msgstr ""
msgctxt "attachproject_error_creation_disabled"
msgid "Account creation is disabled on this project"
-msgstr "Opprettelse av konto er deaktivert for dette prosjektet"
+msgstr ""
msgctxt "attachproject_error_invalid_url"
msgid "Invalid URL"
-msgstr "Ugyldig URL"
+msgstr ""
#. working activity
msgctxt "attachproject_working_back_button"
msgid "Back"
-msgstr "Tilbake"
+msgstr ""
msgctxt "attachproject_working_finish_button"
msgid "Finish"
-msgstr "Ferdig"
+msgstr ""
msgctxt "attachproject_working_check_desc"
msgid "Successful"
-msgstr "Vellykket"
+msgstr ""
msgctxt "attachproject_working_failed_desc"
msgid "Failed"
-msgstr "Mislyktes"
+msgstr ""
msgctxt "attachproject_working_ongoing"
msgid "…"
-msgstr "..."
+msgstr ""
msgctxt "attachproject_working_finished"
msgid "."
-msgstr "."
+msgstr ""
msgctxt "attachproject_working_description"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "attachproject_working_connect"
msgid "Connect"
-msgstr "Koble til"
+msgstr ""
msgctxt "attachproject_working_verify"
msgid "Verify account"
-msgstr "Verifiser konto"
+msgstr ""
msgctxt "attachproject_working_register"
msgid "Register account"
-msgstr "Registrer konto"
+msgstr ""
msgctxt "attachproject_working_login"
msgid "Log in"
-msgstr "Logg inn"
+msgstr ""
msgctxt "attachproject_working_acctmgr"
msgid "Add account manager"
-msgstr "Legg til kontobehandler"
+msgstr ""
msgctxt "attachproject_working_acctmgr_sync"
msgid "Synchronize"
-msgstr "Synkroniser"
+msgstr ""
#. main activity
msgctxt "main_noproject_warning"
msgid "Tab here to choose a project."
-msgstr "Klikk her for å velge et prosjekt."
+msgstr ""
msgctxt "main_error"
msgid "Whooops"
-msgstr "Ooops"
+msgstr ""
msgctxt "main_error_long"
msgid ""
"…this should not happen!\n"
"Click on the icon to try again."
msgstr ""
-"...dette skulle ikke skje!\n"
-" Klikk på ikonet for å prøve igjen."
msgctxt "main_title_icon_desc"
msgid "BOINC icon"
-msgstr "BOINC ikon"
+msgstr ""
#. tab names
msgctxt "tab_status"
msgid "Status"
-msgstr "Status"
+msgstr ""
msgctxt "tab_projects"
msgid "Projects"
-msgstr "Prosjekter"
+msgstr ""
msgctxt "tab_tasks"
msgid "Tasks"
-msgstr "Oppgaver"
+msgstr ""
msgctxt "tab_transfers"
msgid "Transfers"
-msgstr "Overføringer"
+msgstr ""
msgctxt "tab_preferences"
msgid "Preferences"
-msgstr "Alternativer"
+msgstr ""
msgctxt "tab_notices"
msgid "Notices"
-msgstr "Varsler"
+msgstr ""
msgctxt "tab_desc"
msgid "Navigation"
-msgstr "Navigasjon"
+msgstr ""
#. status strings
msgctxt "status_running"
msgid "Computing"
-msgstr "Beregner"
+msgstr ""
msgctxt "status_running_long"
msgid "Thank you for participating."
-msgstr "Takk for at du deltar."
+msgstr ""
msgctxt "status_paused"
msgid "Suspended"
-msgstr "Suspendert"
+msgstr ""
msgctxt "status_idle"
msgid "Nothing to do"
-msgstr "Ingenting å gjøre"
+msgstr ""
msgctxt "status_idle_long"
msgid "Waiting for tasks…"
-msgstr "Venter på oppgaver..."
+msgstr ""
msgctxt "status_computing_disabled"
msgid "Suspended"
-msgstr "Suspendert"
+msgstr ""
-#, fuzzy
msgctxt "status_computing_disabled_long"
msgid "Press play to resume network and computation."
-msgstr "Trykk spill av for å gjenoppta nettverkskommunikasjon og beregning."
+msgstr ""
msgctxt "status_launching"
msgid "Starting…"
-msgstr "Starter..."
+msgstr ""
msgctxt "status_noproject"
msgid "Choose a project to participate in."
-msgstr "Velg et prosjekt å delta i."
+msgstr ""
msgctxt "status_closing"
msgid "Closing…"
-msgstr "Lukker..."
+msgstr ""
msgctxt "status_benchmarking"
msgid "Benchmarking…"
-msgstr "Tester ytelsen…"
+msgstr ""
msgctxt "status_image_description"
msgid "project image"
-msgstr "prosjektavbilding"
+msgstr ""
#. preferences tab strings
msgctxt "prefs_loading"
msgid "Reading preferences…"
-msgstr "Leser alternativer..."
+msgstr ""
msgctxt "prefs_submit_button"
msgid "Save"
-msgstr "Lagre"
+msgstr ""
msgctxt "prefs_dialog_title"
msgid "Enter new value:"
-msgstr "Tast inn ny verdi:"
+msgstr ""
msgctxt "prefs_dialog_title_selection"
msgid "Select:"
-msgstr "Velg:"
+msgstr ""
msgctxt "prefs_category_general"
msgid "General"
-msgstr "Generelt"
+msgstr ""
msgctxt "prefs_category_network"
msgid "Network"
-msgstr "Nettverk"
+msgstr ""
msgctxt "prefs_category_power"
msgid "Power"
-msgstr "Strøm"
+msgstr ""
msgctxt "prefs_category_cpu"
msgid "CPU"
-msgstr "Prosessor"
+msgstr ""
msgctxt "prefs_category_storage"
msgid "Storage"
-msgstr "Lagring"
+msgstr ""
msgctxt "prefs_category_memory"
msgid "Memory"
-msgstr "Minne"
+msgstr ""
msgctxt "prefs_category_debug"
msgid "Debug"
-msgstr "Feilsøk"
+msgstr ""
msgctxt "prefs_show_advanced_header"
msgid "Show advanced preferences and controls…"
-msgstr "Vis avanserte alternativer og kontrolltavle..."
+msgstr ""
msgctxt "prefs_run_on_battery_header"
msgid "Compute on Battery"
-msgstr "Beregne på batteridrift"
+msgstr ""
msgctxt "battery_charge_min_pct_header"
msgid "Min. battery level"
-msgstr "Min. batterinivå"
+msgstr ""
msgctxt "battery_charge_min_pct_description"
msgid "BOINC suspends computation below defined battery charge level."
-msgstr "BOINC suspenderer beregningen under definert batterinivå."
+msgstr ""
msgctxt "battery_temperature_max_header"
msgid "Max. battery temperature"
-msgstr "Maks batteritemperatur"
+msgstr ""
msgctxt "battery_temperature_max_description"
msgid ""
"BOINC suspends computation above defined battery temperature. It is not "
"recommended to change this value."
msgstr ""
-"BOINC suspenderer beregning over definert batteritemperatur. Det er ikke "
-"anbefalt å endre denne verdien."
msgctxt "prefs_disk_max_pct_header"
msgid "Max. used storage space"
-msgstr "Maks benyttet lagrinsplass"
+msgstr ""
msgctxt "prefs_disk_max_pct_description"
msgid "How many percent of your device's storage space is BOINC allowed to use?"
-msgstr "Hvor mange prosent av din enhets lagringsplass kan BOINC benytte?"
+msgstr ""
msgctxt "prefs_disk_min_free_gb_header"
msgid "Min. spare storage"
-msgstr "Min. ledig lagrinsplass"
+msgstr ""
msgctxt "prefs_disk_min_free_gb_description"
msgid "How much of your device's storage space shall stay free?"
-msgstr "Hvor mye av din enhets lagringsplass skal forbli ledig?"
+msgstr ""
msgctxt "prefs_network_daily_xfer_limit_mb_header"
msgid "Daily transfer limit"
-msgstr "Daglig overføringsgrense"
+msgstr ""
msgctxt "prefs_network_daily_xfer_limit_mb_description"
msgid "Limits the daily data traffic caused by BOINC."
-msgstr "Begrenser den daglige datatrafikken forårsaket av BOINC."
+msgstr ""
msgctxt "prefs_network_wifi_only_header"
msgid "Transfer tasks on WiFi only"
-msgstr "Overfør oppgaver kun når tilkoblet WiFi"
+msgstr ""
msgctxt "prefs_autostart_header"
msgid "Autostart"
-msgstr "Autostart"
+msgstr ""
msgctxt "prefs_show_notification_header"
msgid "Show notification when suspended"
-msgstr "Vis varsler når suspendert"
+msgstr ""
msgctxt "prefs_cpu_number_cpus_header"
msgid "Used CPU cores"
-msgstr "Prosessorkjerner i bruk"
+msgstr ""
msgctxt "prefs_cpu_number_cpus_description"
msgid "Limits the number of CPU cores BOINC uses for computation."
-msgstr "Begrenser antall prosessorkjerner BOINC benytter til beregning."
+msgstr ""
msgctxt "prefs_cpu_other_load_suspension_header"
msgid "Pause at CPU usage above"
-msgstr "Pause når prosessorbruk overstiger"
+msgstr ""
-#, fuzzy
msgctxt "prefs_cpu_other_load_suspension_description"
msgid "Determines when BOINC pauses computation due to other app's CPU usage."
msgstr ""
-"Avgjør når BOINC pauser beregning på grunn av andre applikasjoners "
-"prosessorbruk."
-#, fuzzy
msgctxt "prefs_cpu_time_max_header"
msgid "CPU limit"
-msgstr "Prosessorterskel"
+msgstr ""
-#, fuzzy
msgctxt "prefs_cpu_time_max_description"
msgid "Limits the CPU time BOINC uses for computation."
-msgstr "Begrenser prosessortid BOINC bruker til beregning."
+msgstr ""
-#, fuzzy
msgctxt "prefs_memory_max_idle_header"
msgid "RAM limit"
-msgstr "Minneterskel"
+msgstr ""
msgctxt "prefs_memory_max_idle_description"
msgid "Limits the amount of RAM tasks are allowed to occupy."
-msgstr "Begrenser mengden minne oppgaver kan benytte."
+msgstr ""
-#, fuzzy
msgctxt "prefs_client_log_flags_header"
msgid "BOINC Client log flags"
-msgstr "BOINC klient loggflagg"
+msgstr ""
msgctxt "prefs_gui_log_level_header"
msgid "GUI log level"
-msgstr "Loggnivå GUI"
+msgstr ""
msgctxt "prefs_gui_log_level_description"
msgid "Specifies verbosity of GUI log messages."
-msgstr "Spesifiserer detaljnivå på GUI loggmeldinger."
+msgstr ""
msgctxt "prefs_unit_mb"
msgid "MB"
-msgstr "MB"
+msgstr ""
msgctxt "prefs_unit_gb"
msgid "GB"
-msgstr "GB"
+msgstr ""
#, c-format
msgctxt "prefs_unit_pct"
msgid "%"
-msgstr "%"
+msgstr ""
msgctxt "prefs_unit_celcius"
msgid "°C"
-msgstr "°C"
+msgstr ""
#. projects tab strings
msgctxt "projects_loading"
msgid "Reading projects…"
-msgstr "Leser prosjekter..."
+msgstr ""
msgctxt "projects_add"
msgid "Add project"
-msgstr "Legg til prosjekt"
+msgstr ""
msgctxt "projects_icon"
msgid "Project icon"
-msgstr "Prosjektikon"
+msgstr ""
msgctxt "projects_credits_header"
msgid "Credit:"
-msgstr "Arbeid utført:"
+msgstr ""
msgctxt "projects_credits_host_header"
msgid "(on this device)"
-msgstr "(på denne enheten)"
+msgstr ""
msgctxt "projects_credits_user_header"
msgid "(total)"
-msgstr "(total)"
+msgstr ""
#. project status strings
msgctxt "projects_status_suspendedviagui"
msgid "Suspended by user"
-msgstr "Suspendert av bruker"
+msgstr ""
msgctxt "projects_status_dontrequestmorework"
msgid "Won't get new tasks"
-msgstr "Ikke tillat nye oppgaver"
+msgstr ""
msgctxt "projects_status_ended"
msgid "Project ended - OK to remove"
-msgstr "Prosjekt avsluttet - OK å fjerne"
+msgstr ""
msgctxt "projects_status_detachwhendone"
msgid "Will remove when tasks done"
-msgstr "Vil bli fjernet når oppgaver er utført"
+msgstr ""
msgctxt "projects_status_schedrpcpending"
msgid "Scheduler request pending"
-msgstr "Forespørsel fra planleggeren venter"
+msgstr ""
msgctxt "projects_status_schedrpcinprogress"
msgid "Scheduler request in progress"
-msgstr "Forespørsel fra planleggeren pågår"
+msgstr ""
msgctxt "projects_status_trickleuppending"
msgid "Trickle up message pending"
-msgstr "Godskriv andelsmelding venter"
+msgstr ""
msgctxt "projects_status_backoff"
msgid "Communication scheduled in:"
-msgstr "Kommunikasjon planlagt om:"
+msgstr ""
#. project controls
msgctxt "projects_control_dialog_title"
msgid "Project commands:"
-msgstr "Prosjektkommandoer:"
+msgstr ""
msgctxt "projects_control_visit_website"
msgid "Visit website"
-msgstr "Besøk nettsiden"
+msgstr ""
msgctxt "projects_control_update"
msgid "Update"
-msgstr "Oppdater"
+msgstr ""
msgctxt "projects_control_remove"
msgid "Remove"
-msgstr "Fjern"
+msgstr ""
msgctxt "projects_control_suspend"
msgid "Suspend"
-msgstr "Suspender"
+msgstr ""
msgctxt "projects_control_resume"
msgid "Resume"
-msgstr "Gjenoppta"
+msgstr ""
msgctxt "projects_control_nonewtasks"
msgid "No new tasks"
-msgstr "Ingen nye oppgaver"
+msgstr ""
msgctxt "projects_control_allownewtasks"
msgid "Allow new tasks"
-msgstr "Tillat nye oppgaver"
+msgstr ""
msgctxt "projects_control_reset"
msgid "Reset"
-msgstr "Nullstill"
+msgstr ""
msgctxt "projects_control_dialog_title_acctmgr"
msgid "Account manager commands:"
-msgstr "Kontobehandlerkommandoer:"
+msgstr ""
msgctxt "projects_control_sync_acctmgr"
msgid "Synchronize"
-msgstr "Synkroniser"
+msgstr ""
msgctxt "projects_control_remove_acctmgr"
msgid "Disable"
-msgstr "Deaktiver"
+msgstr ""
#. project confirm dialog
msgctxt "projects_confirm_detach_title"
msgid "Remove project?"
-msgstr "Fjerne prosjekt?"
+msgstr ""
msgctxt "projects_confirm_detach_message"
msgid "Are you sure you want to remove"
-msgstr "Er du sikker på at du ønsker å fjerne"
+msgstr ""
msgctxt "projects_confirm_detach_message2"
msgid "from BOINC?"
-msgstr "fra BOINC?"
+msgstr ""
msgctxt "projects_confirm_detach_confirm"
msgid "Remove"
-msgstr "Fjern"
+msgstr ""
msgctxt "projects_confirm_reset_title"
msgid "Reset project"
-msgstr "Nullstill prosjekt"
+msgstr ""
msgctxt "projects_confirm_reset_message"
msgid "Are you sure you want to reset"
-msgstr "Er du sikker på at du ønsker å nullstille"
+msgstr ""
msgctxt "projects_confirm_reset_confirm"
msgid "Reset"
-msgstr "Nullstill"
+msgstr ""
msgctxt "projects_confirm_remove_acctmgr_title"
msgid "Disable account manager"
-msgstr "Deaktiver kontobehandler"
+msgstr ""
-#, fuzzy
msgctxt "projects_confirm_remove_acctmgr_message"
msgid "Are you sure you want to stop using"
-msgstr "Er du sikker på at du ikke ønsker å bruke"
+msgstr ""
msgctxt "projects_confirm_remove_acctmgr_confirm"
msgid "Disable"
-msgstr "Deaktiver"
+msgstr ""
#. tasks tab strings
msgctxt "tasks_header_name"
msgid "Task Name:"
-msgstr "Oppgavenavn:"
+msgstr ""
msgctxt "tasks_header_elapsed_time"
msgid "Elapsed time:"
-msgstr "Medgått tid:"
+msgstr ""
msgctxt "tasks_header_project_paused"
msgid "(suspended)"
-msgstr "(suspendert)"
+msgstr ""
msgctxt "tasks_header_deadline"
msgid "Deadline:"
-msgstr "Tidsfrist:"
+msgstr ""
msgctxt "tasks_result_new"
msgid "new"
-msgstr "ny"
+msgstr ""
msgctxt "tasks_result_files_downloading"
msgid "waiting for download"
-msgstr "venter på nedlasting"
+msgstr ""
msgctxt "tasks_result_files_downloaded"
msgid "download complete"
-msgstr "nedlasting ferdig"
+msgstr ""
msgctxt "tasks_result_compute_error"
msgid "computation error"
-msgstr "beregningsfeil"
+msgstr ""
msgctxt "tasks_result_files_uploading"
msgid "uploading"
-msgstr "laster opp"
+msgstr ""
msgctxt "tasks_result_files_uploaded"
msgid "upload complete"
-msgstr "opplasting ferdig"
+msgstr ""
msgctxt "tasks_result_aborted"
msgid "aborted"
-msgstr "avbrutt"
+msgstr ""
msgctxt "tasks_result_upload_failed"
msgid "upload failed"
-msgstr "opplasting feilet"
+msgstr ""
msgctxt "tasks_active_uninitialized"
msgid "ready"
-msgstr "klar"
+msgstr ""
msgctxt "tasks_active_executing"
msgid "running"
-msgstr "kjører"
+msgstr ""
msgctxt "tasks_active_suspended"
msgid "suspended"
-msgstr "suspendert"
+msgstr ""
msgctxt "tasks_active_abort_pending"
msgid "suspending"
-msgstr "suspenderer"
+msgstr ""
msgctxt "tasks_active_quit_pending"
msgid "suspending"
-msgstr "suspenderer"
+msgstr ""
msgctxt "tasks_custom_suspended_via_gui"
msgid "suspended"
-msgstr "suspendert"
+msgstr ""
msgctxt "tasks_custom_project_suspended_via_gui"
msgid "project suspended"
-msgstr "prosjekt suspendert"
+msgstr ""
msgctxt "tasks_custom_ready_to_report"
msgid "ready to report"
-msgstr "klar til å rapportere"
+msgstr ""
#. confirmation dialog
msgctxt "confirm_abort_task_title"
msgid "Abort task?"
-msgstr "Avbryt oppgave?"
+msgstr ""
msgctxt "confirm_abort_task_message"
msgid "Abort task:"
-msgstr "Avbryt oppgave:"
+msgstr ""
msgctxt "confirm_abort_task_confirm"
msgid "Abort"
-msgstr "Avbryt"
+msgstr ""
msgctxt "confirm_cancel"
msgid "Cancel"
-msgstr "Avbryt"
+msgstr ""
msgctxt "confirm_image_desc"
msgid "Confirmation dialog"
-msgstr "Bekreftelsesdialogboks"
+msgstr ""
#. transfers tab strings
msgctxt "trans_loading"
msgid "Reading transfers…"
-msgstr "Leser overføringer..."
+msgstr ""
msgctxt "trans_upload"
msgid "Upload"
-msgstr "Last opp"
+msgstr ""
msgctxt "trans_download"
msgid "Download"
-msgstr "Last ned"
+msgstr ""
msgctxt "trans_retryin"
msgid "retry in"
-msgstr "prøver igjen om"
+msgstr ""
msgctxt "trans_failed"
msgid "failed"
-msgstr "mislyktes"
+msgstr ""
msgctxt "trans_suspended"
msgid "suspended"
-msgstr "suspendert"
+msgstr ""
msgctxt "trans_active"
msgid "active"
-msgstr "aktiv"
+msgstr ""
msgctxt "trans_pending"
msgid "pending"
-msgstr "venter"
+msgstr ""
-#, fuzzy
msgctxt "trans_projectbackoff"
msgid "project backoff"
-msgstr "prosjektet holder igjen"
+msgstr ""
msgctxt "trans_header_name"
msgid "File:"
-msgstr "Fil:"
+msgstr ""
-#, fuzzy
msgctxt "trans_control_retry"
msgid "Retry transfers"
-msgstr "Prøv overføring på nytt"
+msgstr ""
msgctxt "confirm_abort_trans_title"
msgid "Abort transfer?"
-msgstr "Avbryte overføring?"
+msgstr ""
msgctxt "confirm_abort_trans_message"
msgid "Abort File:"
-msgstr "Avbryt fil:"
+msgstr ""
msgctxt "confirm_abort_trans_confirm"
msgid "Abort"
-msgstr "Avbryt"
+msgstr ""
#. notices tab strings
msgctxt "notices_loading"
msgid "Reading notices…"
-msgstr "Leser merknader..."
+msgstr ""
#. eventlog tab strings
msgctxt "eventlog_loading"
msgid "Loading log messages…"
-msgstr "Laster loggmeldinger..."
+msgstr ""
msgctxt "eventlog_client_header"
msgid "Client Messages"
-msgstr "Klientmeldinger"
+msgstr ""
-#, fuzzy
msgctxt "eventlog_gui_header"
msgid "GUI Messages"
-msgstr "GUI meldinger"
+msgstr ""
msgctxt "eventlog_copy_toast"
msgid "Log copied to clipboard."
-msgstr "Logg kopiert til utklippstavle."
+msgstr ""
msgctxt "eventlog_email_subject"
msgid "Event Log for BOINC on Android:"
-msgstr "Hendelseslogg for BOINC på Android:"
+msgstr ""
#. suspend reasons
msgctxt "suspend_unknown"
msgid "Computation suspended."
-msgstr "Beregning suspendert."
+msgstr ""
msgctxt "suspend_batteries"
msgid "Connect your device to a charger to continue computing."
-msgstr "Koble din enhet til en lader for å fortsette beregning."
+msgstr ""
msgctxt "suspend_useractive"
msgid "User is active."
-msgstr "Bruker er aktiv."
+msgstr ""
msgctxt "suspend_tod"
msgid "Out of computation time-frame."
-msgstr "Utenfor beregningens tidsramme."
+msgstr ""
msgctxt "suspend_bm"
msgid "BOINC is benchmarking your device…"
-msgstr "BOINC tester ytelsen på din enhet..."
+msgstr ""
msgctxt "suspend_disksize"
msgid "Out of disk space."
-msgstr "Tom for lagringsplass."
+msgstr ""
msgctxt "suspend_cputhrottle"
msgid "Scheduled CPU throttle."
-msgstr "Planlagt CPU begrensning."
+msgstr ""
msgctxt "suspend_noinput"
msgid "No recent user activity."
-msgstr "Ingen nylig brukeraktivitet."
+msgstr ""
msgctxt "suspend_delay"
msgid "Initialization delay."
-msgstr "Utsatt initialisering."
+msgstr ""
msgctxt "suspend_exclusiveapp"
msgid "An exclusive app is running."
-msgstr "En applikasjon med enerett kjører."
+msgstr ""
msgctxt "suspend_cpu"
msgid "Your device is busy with other apps."
-msgstr "Din enhet er opptatt med andre applikasjoner."
+msgstr ""
msgctxt "suspend_network_quota"
msgid "BOINC reached network transfer limit."
-msgstr "BOINC nådde overføringsgrense for nettverkstrafikk."
+msgstr ""
msgctxt "suspend_os"
msgid "Stopped by Android."
-msgstr "Stoppet av Android."
+msgstr ""
msgctxt "suspend_wifi"
msgid "Not connected to WiFi."
-msgstr "Ikke tilkoblet trådløst nett."
+msgstr ""
msgctxt "suspend_battery_charging"
msgid "Battery needs to charge before resuming computation."
-msgstr "Batteriet må lades før beregning gjenopptas."
+msgstr ""
msgctxt "suspend_battery_charging_long"
msgid "Computing will resume when battery charge reaches"
-msgstr "Beregning gjenopptas når batterinivå når"
+msgstr ""
msgctxt "suspend_battery_charging_current"
msgid "currently"
-msgstr "nåværende"
+msgstr ""
msgctxt "suspend_battery_overheating"
msgid "Waiting for battery to cool down"
-msgstr "Venter på at batteriet skal kjøle seg ned"
+msgstr ""
msgctxt "suspend_user_req"
msgid "Resuming computation…"
-msgstr "Gjenopptar beregning..."
+msgstr ""
msgctxt "suspend_network_user_req"
msgid "manually."
-msgstr "manuelt."
+msgstr ""
#. rpc reasons
msgctxt "rpcreason_userreq"
msgid "Requested by user"
-msgstr "Anmodet av bruker"
+msgstr ""
msgctxt "rpcreason_needwork"
msgid "To fetch work"
-msgstr "Å hente arbeid"
+msgstr ""
msgctxt "rpcreason_resultsdue"
msgid "To report completed tasks"
-msgstr "Å rapportere utførte oppgaver"
+msgstr ""
msgctxt "rpcreason_trickleup"
msgid "To send trickle-up message"
-msgstr "Å sende godskriv andelsmelding"
+msgstr ""
msgctxt "rpcreason_acctmgrreq"
msgid "Requested by account manager"
-msgstr "Anmodet av kontobehandler"
+msgstr ""
msgctxt "rpcreason_init"
msgid "Project initialization"
-msgstr "Initialisering av prosjekt"
+msgstr ""
msgctxt "rpcreason_projectreq"
msgid "Requested by project"
-msgstr "Anmodet av prosjekt"
+msgstr ""
msgctxt "rpcreason_unknown"
msgid "Unknown reason"
-msgstr "Ukjent årsak"
+msgstr ""
#. menu
msgctxt "menu_refresh"
msgid "Refresh"
-msgstr "Oppdater"
+msgstr ""
msgctxt "menu_emailto"
msgid "Send as Email"
-msgstr "Send som epost"
+msgstr ""
msgctxt "menu_copy"
msgid "Copy to Clipboard"
-msgstr "Kopier til utklippstavle"
+msgstr ""
msgctxt "menu_eventlog"
msgid "Event Log"
-msgstr "Hendelseslogg"
+msgstr ""
msgctxt "menu_exit"
msgid "Exit BOINC"
-msgstr "Avslutt BOINC"
+msgstr ""
msgctxt "menu_run_mode_disable"
msgid "Suspend"
-msgstr "Suspender"
+msgstr ""
msgctxt "menu_run_mode_enable"
msgid "Resume"
-msgstr "Gjenoppta"
+msgstr ""
msgctxt "menu_about"
msgid "About"
-msgstr "Om"
+msgstr ""
msgctxt "menu_help"
msgid "Help"
-msgstr "Hjelp"
+msgstr ""
#. about dialog
msgctxt "about_button"
msgid "Return"
-msgstr "Tilbake"
+msgstr ""
msgctxt "about_title"
msgid "About"
-msgstr "Om"
+msgstr ""
msgctxt "about_name"
msgid "BOINC"
-msgstr "BOINC"
+msgstr ""
msgctxt "about_version"
msgid "Version"
-msgstr "Versjon"
+msgstr ""
msgctxt "about_name_long"
msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "Berkeley Open Infrastructure for Network Computing"
+msgstr ""
msgctxt "about_copyright"
msgid ""
"© 2003–2013 University of California, Berkeley.\n"
"All Rights Reserved."
msgstr ""
-"© 2003–2013 University of California, Berkeley.\n"
-"Alle rettigheter er forbeholdt."
diff --git a/locale/nb/BOINC-Client.mo b/locale/nb/BOINC-Client.mo
index cde6597..825b603 100644
Binary files a/locale/nb/BOINC-Client.mo and b/locale/nb/BOINC-Client.mo differ
diff --git a/locale/nb/BOINC-Client.po b/locale/nb/BOINC-Client.po
index 0784bb1..27a3713 100644
--- a/locale/nb/BOINC-Client.po
+++ b/locale/nb/BOINC-Client.po
@@ -7,32 +7,31 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2014-09-02 03:54+0000\n"
-"Last-Translator: Jan <jan at sherdahl.com>\n"
+"PO-Revision-Date: 2012-09-16 13:49+0200\n"
+"Last-Translator: Kenneth <kenneth at skjold.biz>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1409630049.0\n"
+"X-Generator: Pootle 2.1.6\n"
#: acct_mgr.cpp:450 acct_mgr.cpp:459
msgid "Message from account manager"
-msgstr "Melding fra kontobehandler"
+msgstr "Melding fra konto manager"
#: client_msgs.cpp:81
msgid "Message from server"
-msgstr "Melding fra tjener"
+msgstr "Melding fra server"
#: client_state.cpp:258
msgid ""
"Some tasks need more memory than allowed by your preferences. Please check "
"the preferences."
msgstr ""
-"Noen oppgaver trenger mer minne enn tillatt utfra dine innstillinger. "
-"Vennligst kontroller innstillinger."
+"Noen oppgaver trenger mer minne enn du tillater i dine innstillinger. "
+"Vennligst sjekk dine innstillinger."
#: client_state.cpp:520
msgid "Couldn't write state file; check directory permissions"
@@ -65,7 +64,7 @@ msgstr "En ny versjon av BOINC er tilgjengelig."
#: current_version.cpp:94 current_version.cpp:102
msgid "Download"
-msgstr "Last ned"
+msgstr ""
#: log_flags.cpp:269 log_flags.cpp:449
msgid "Unexpected text in cc_config.xml"
@@ -90,22 +89,22 @@ msgstr "Manglende stopptagg i cc_config.xml"
#: ../sched/handle_request.cpp:307
msgid "Invalid or missing account key. To fix, remove and add this project."
msgstr ""
-"Ugyldig eller manglende kontonøkkel. For å fikse, fjern og legg til dette "
-"prosjektet på nytt."
+"Ugyldig eller manglende kontonøkkel. For å fikse dette, fjern og legg til "
+"dette prosjektet"
#: ../sched/handle_request.cpp:849
msgid "Invalid code signing key. To fix, remove and add this project."
msgstr ""
-"Ugyldig signeringskodenøkkel. For å fikse, fjern og legg til dette "
-"prosjektet på nytt."
+"Ugyldig signeringskodenøkkel. For å fikse dette, fjern og legg til dette "
+"prosjektet."
#: ../sched/handle_request.cpp:859
msgid ""
"The project has changed its security key. Please remove and add this "
"project."
msgstr ""
-"Sikkerhetsnøkkelen til prosjektet er endret. Fjern og legg til dette "
-"prosjektet på nytt."
+"Sikkerhetsnøkkelen til prosjektet er endret. Fjern og legg til dette "
+"prosjektet."
#: ../sched/handle_request.cpp:943
msgid "This project doesn't support operating system"
@@ -150,31 +149,29 @@ msgstr ""
# 94%
#: ../sched/sched_send.cpp:1146
#, c-format
-#, c-format, c-format
+#, c-format, fuzzy
msgid "An %s GPU is required to run tasks for this project"
msgstr ""
-"En %s grafikkprosessor (GPU) er påkrevd for å kjøre oppgaver til dette "
-"prosjektet"
+"For å utføre oppgaver til dette prosjektet trenger du en ATI "
+"grafikkprosessor (GPU)"
#: ../sched/sched_send.cpp:1262
msgid "No tasks are available for the applications you have selected."
-msgstr "Ingen oppgaver er tilgjengelig for applikasjonene du har valgt."
+msgstr "Det er ikke tilgjengelig noe arbeid for programmene du har valgt."
#: ../sched/sched_send.cpp:1288
msgid "Your computer type is not supported by this project"
-msgstr "Din datamaskintype støttes ikke av dette prosjektet"
+msgstr "Din datamaskintype er ikke støttet av dette prosjektet"
#: ../sched/sched_send.cpp:1294
msgid "Newer BOINC version required; please install current version"
-msgstr "Krav om nyere versjon av BOINC; Installer siste versjon"
+msgstr "Det kreves nyere versjon av BOINC. Installer siste versjon"
#: ../sched/sched_send.cpp:1305
#, c-format
msgid ""
"Tasks for %s are available, but your preferences are set to not accept them"
msgstr ""
-"Oppgaver til %s er tilgjengelig, men dine alternativer er satt opp til å "
-"ikke godkjenne disse"
#: ../sched/sched_types.cpp:254
msgid "Unknown app name in app_info.xml"
diff --git a/locale/nb/BOINC-Manager.mo b/locale/nb/BOINC-Manager.mo
index 4764d03..9a1ef2f 100644
Binary files a/locale/nb/BOINC-Manager.mo and b/locale/nb/BOINC-Manager.mo differ
diff --git a/locale/nb/BOINC-Manager.po b/locale/nb/BOINC-Manager.po
index 215aa22..9a6ba41 100644
--- a/locale/nb/BOINC-Manager.po
+++ b/locale/nb/BOINC-Manager.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2014-09-03 03:24+0000\n"
-"Last-Translator: Jan <jan at sherdahl.com>\n"
+"PO-Revision-Date: 2012-09-16 13:49+0000\n"
+"Last-Translator: Kenneth <kenneth at skjold.biz>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
@@ -23,14 +23,14 @@ msgstr ""
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-POOTLE-MTIME: 1409714660.0\n"
+"X-POOTLE-MTIME: 1347803390.0\n"
# 81%
#: AccountInfoPage.cpp:387
#, c-format
-#, c-format, c-format
+#, fuzzy, c-format
msgid "Identify your account at %s"
-msgstr "Identifiser din konto hos %s"
+msgstr "Identifiser kontoen din"
#: AccountInfoPage.cpp:393
msgid ""
@@ -102,7 +102,7 @@ msgstr "&Brukernavn:"
#: AccountInfoPage.cpp:508
msgid "&Email address:"
-msgstr "&Epostadresse:"
+msgstr "&E-post adresse:"
#: AccountInfoPage.cpp:515
#, c-format
@@ -124,8 +124,9 @@ msgstr ""
"for å registrere eller hente et glemt passord"
#: AccountInfoPage.cpp:532
+#, fuzzy
msgid "Account manager web site"
-msgstr "Nettside for kontobehandler"
+msgstr "Kontostyring nettside"
#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
msgid "Add project"
@@ -141,21 +142,22 @@ msgstr "Bruk kontobehandler"
#: AccountInfoPage.cpp:585
msgid "Please enter a user name."
-msgstr "Vennligst tast inn et brukernavn."
+msgstr ""
#: AccountInfoPage.cpp:587
+#, fuzzy
msgid "Please enter an email address."
-msgstr "Vennligst tast inn en epostadresse."
+msgstr "Vennligst spesifiser en e-post adresse"
#: AccountInfoPage.cpp:597
#, c-format
msgid "Please enter a password of at least %d characters."
-msgstr "Vennligst tast inn et passord som inneholder minimum %d tegn."
+msgstr ""
#: AccountInfoPage.cpp:607
msgid ""
"The password and confirmation password do not match. Please type them again."
-msgstr "Passordene samsvarer ikke. Vennligst tast inn på nytt."
+msgstr "Passordene er ikke like. Vennligst skriv dem igjen."
#: AccountManagerInfoPage.cpp:272
msgid "Choose an account manager"
@@ -170,20 +172,22 @@ msgstr ""
"angi nettadressen under."
#: AccountManagerInfoPage.cpp:279
+#, fuzzy
msgid "Account manager details:"
-msgstr "Detaljer for kontobehandler:"
+msgstr "Kontostyring nettside"
#: AccountManagerInfoPage.cpp:283
+#, fuzzy
msgid "Account manager &URL:"
-msgstr "&URL kontobehandler:"
+msgstr "&Nettadresse til kontobehandler:"
#: AccountManagerInfoPage.cpp:287
msgid "Open web page"
-msgstr "Åpne nettside"
+msgstr ""
#: AccountManagerInfoPage.cpp:290
msgid "Visit this account manager's web site"
-msgstr "Besøk nettsiden til denne kontobehandleren"
+msgstr ""
#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
#, c-format
@@ -204,11 +208,11 @@ msgstr "Det har oppstått en intern tjenerfeil.\n"
#: AdvancedFrame.cpp:95
msgid "Connected"
-msgstr "Tilkoblet"
+msgstr "Koblet til"
#: AdvancedFrame.cpp:103
msgid "Disconnected"
-msgstr "Frakoblet"
+msgstr "Koblet fra"
#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
#, c-format
@@ -349,7 +353,7 @@ msgstr "Tillat arbeid ifølge innstillinger"
#: AdvancedFrame.cpp:482
msgid "&Suspend"
-msgstr "&Suspender"
+msgstr "&Hvilemodus"
#: AdvancedFrame.cpp:483
msgid "Stop work regardless of preferences"
@@ -397,7 +401,7 @@ msgstr "Tillat nettverksaktivitet ifølge innstillinger"
#: AdvancedFrame.cpp:553
msgid "Network activity suspended"
-msgstr "Nettverksaktivitet suspendert"
+msgstr "Nettverksaktivitet satt i hvilemodus"
#: AdvancedFrame.cpp:554
msgid "Stop BOINC network activity"
@@ -414,7 +418,7 @@ msgstr "Velg datamaskin..."
#: AdvancedFrame.cpp:574
msgid "Shut down connected client..."
-msgstr "Slå av tilkoblet klient..."
+msgstr "Slå av tilkoblede klienter..."
#: AdvancedFrame.cpp:575
msgid "Shut down the currently connected client"
@@ -438,12 +442,13 @@ msgstr "Gjør alle ventende nettverkskommunikasjoner"
# 94%
#: AdvancedFrame.cpp:589
+#, fuzzy
msgid "Read config files"
-msgstr "Les konfigurasjonsfiler"
+msgstr "Les konfigurasjonsfil"
#: AdvancedFrame.cpp:590
msgid "Read configuration info from cc_config.xml and any app_config.xml files"
-msgstr "Les konfigurasjonsinformasjon fra cc_config.xml og app_config.xml filer"
+msgstr ""
#: AdvancedFrame.cpp:594
msgid "Read local prefs file"
@@ -493,7 +498,7 @@ msgstr "Vis informasjon om %s"
#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
#, c-format
-#, c-format, c-format
+#, c-format, fuzzy
msgid "%s &web site"
msgstr "%s &nettside"
@@ -597,7 +602,7 @@ msgstr "Koblet til %s (%s)"
#: AlreadyExistsPage.cpp:184
msgid "Username already in use"
-msgstr "Brukernavn allerede i bruk"
+msgstr "Brukernavn er allerede i bruk"
#: AlreadyExistsPage.cpp:187
msgid ""
@@ -612,7 +617,7 @@ msgstr ""
#: AlreadyExistsPage.cpp:191
msgid "Email address already in use"
-msgstr "Epostadressen allerede i bruk"
+msgstr "E-postadressen er allerede i bruk"
#: AlreadyExistsPage.cpp:194
msgid ""
@@ -627,7 +632,7 @@ msgstr ""
#: AsyncRPC.cpp:1031
msgid "Communicating with BOINC client. Please wait ..."
-msgstr "Kommuniserer med BOINC klienten. Vennligst vent ..."
+msgstr "Kommuniserer med BOINC klient. Vennligst vent.."
#: AsyncRPC.cpp:1034
#, c-format
@@ -676,7 +681,7 @@ msgstr "Autoriseringen kunne ikke koble til klienten som kjører."
#: BOINCBaseFrame.cpp:533
msgid "The password you have provided is incorrect, please try again."
-msgstr "Passordet du har oppgitt er feil, vennligst prøv igjen."
+msgstr "Passordet er ikke riktig, vennligst prøv igjen."
#: BOINCBaseFrame.cpp:577
#, c-format
@@ -731,9 +736,8 @@ msgid ""
"To connect up to your local computer please use 'localhost' as the host name."
msgstr ""
"%s er ikke tilkoblet til en %s klient.\n"
-"Bruk 'Avansert\\Velg datamaskin...' menyvalg for å koble til en %s klient.\n"
-"For å koble til din lokale datamaskin vennligst bruk 'localhost' som "
-"vertsnavn."
+"Bruk 'Avansert/Velg datamaskin...' menyvalg for å koble til en %s klient\n"
+"For å koble til lokaldatamaskin vennligst bruk 'localhost' som vertsnavn."
#: BOINCBaseView.cpp:779
msgid "Project web pages"
@@ -833,7 +837,7 @@ msgstr ""
#: BOINCGUIApp.cpp:351
msgid " at "
-msgstr " ved "
+msgstr "ved "
#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
#: MainDocument.cpp:2554 ViewTransfers.cpp:803
@@ -891,12 +895,11 @@ msgstr "Deaktiver BOINC sikkerhet brukere og rettigheter"
#: BOINCGUIApp.cpp:584
msgid "set skin debugging mode to enable skin manager error messages"
msgstr ""
-"sett skallmodus for feilsøking for å aktivere feilmeldinger fra "
-"skallbehandleren"
+"sett skin feilsøkingsmodus for å aktivere skin behandlerens feilbeskjeder."
#: BOINCGUIApp.cpp:585
msgid "multiple instances of BOINC Manager allowed"
-msgstr "flere forekomster av BOINC behandleren er tillatt"
+msgstr "Flere eksemplarer av BOINC behandleren er tillatt"
#: BOINCGUIApp.cpp:587
msgid "Not used: workaround for bug in XCode 4.2"
@@ -952,23 +955,23 @@ msgstr "Databehandling er slått på"
#: BOINCTaskBar.cpp:717
msgid "Computing is suspended - "
-msgstr "Beregning er suspendert - "
+msgstr "Databehandling er suspendert -"
#: BOINCTaskBar.cpp:727
msgid "GPU computing is enabled"
-msgstr "GPU beregning er aktivert"
+msgstr "GPU databehandling er slått på"
#: BOINCTaskBar.cpp:730
msgid "GPU computing is suspended - "
-msgstr "GPU databehandling er suspendert - "
+msgstr "GPU databehandling er suspendert -"
#: BOINCTaskBar.cpp:739
msgid "Network is enabled"
-msgstr "Nettverk er aktivert"
+msgstr "Nettverk er slått på"
#: BOINCTaskBar.cpp:742
msgid "Network is suspended - "
-msgstr "Nettverk er suspendert - "
+msgstr "Nettverk er suspendert -"
#: BOINCTaskBar.cpp:750
msgid "Reconnecting to client."
@@ -981,29 +984,29 @@ msgstr "Ikke tilkoblet til en klient"
#: BOINCTaskBar.cpp:805
#, c-format
msgid "%s Notices"
-msgstr "%s Varsler"
+msgstr "%s Meldinger"
#: BOINCTaskBar.cpp:811
msgid "There are new notices - click to view."
-msgstr "Det er nye varsler - klikk for å vise."
+msgstr "Det er nye meldinger - klikk for å se."
#: CompletionErrorPage.cpp:199
msgid "Failed to add project"
-msgstr "Kunne ikke legge til prosjekt"
+msgstr "Legg til prosjekt har feilet"
#: CompletionErrorPage.cpp:204
msgid "Failed to update account manager"
-msgstr "Kunne ikke oppdatere kontobehandler"
+msgstr "Oppdatering av konto manager har feilet"
# 84%
#: CompletionErrorPage.cpp:208
msgid "Failed to remove account manager"
-msgstr "Kunne ikke fjerne kontobehandler"
+msgstr "Fjerning av konto manager har feilet"
# 84%
#: CompletionErrorPage.cpp:212
msgid "Failed to add account manager"
-msgstr "Kunne ikke legge til kontobehandler"
+msgstr "Klarte ikke å legge til konto manager"
#: CompletionErrorPage.cpp:221
msgid ""
@@ -1011,9 +1014,6 @@ msgid ""
"\n"
"Click Finish to close."
msgstr ""
-"Vennligst prøv igjen senere.\n"
-"\n"
-"Klikk Ferdig for å lukke."
#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
#: CompletionPage.cpp:273
@@ -1030,7 +1030,7 @@ msgstr "Prosjekt lagt til"
#: CompletionPage.cpp:213
msgid "This project has been successfully added."
-msgstr "Dette prosjektet har blitt lagt til korrekt."
+msgstr "Dette prosjektet har suksessfullt blitt lagt til."
#: CompletionPage.cpp:218
msgid ""
@@ -1038,7 +1038,7 @@ msgid ""
"you can set your account name and preferences."
msgstr ""
"Når du klikker Ferdig, vil nettleseren din gå til en side der\n"
-"du kan oppgi ditt kontonavn og innstillinger."
+"du kan sette inn ditt konto navn og innstillinger."
#: CompletionPage.cpp:232
#, c-format
@@ -1051,7 +1051,7 @@ msgstr "Oppdatering ferdig."
#: CompletionPage.cpp:247
msgid "Now using account manager"
-msgstr "Bruker kontobehandler nå"
+msgstr "Bruker nå konto manager"
#: CompletionPage.cpp:252
#, c-format
@@ -1065,7 +1065,7 @@ msgstr "Du bruker nå %s for å håndtere kontoer."
#: CompletionPage.cpp:267
msgid "You are now using this account manager."
-msgstr "Du bruker nå denne kontobehandleren."
+msgstr "Du bruker nå konto manager"
#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
#, c-format
@@ -1086,11 +1086,12 @@ msgstr "Copyright:"
# 98%
#: DlgAbout.cpp:192
+#, fuzzy
msgid ""
"(C) 2003-2013 University of California, Berkeley.\n"
"All Rights Reserved."
msgstr ""
-"(C) 2003-2013 University of California, Berkeley.\n"
+"(C) 2003-2011 University of California, Berkeley.\n"
"All Rights Reserved."
#: DlgAbout.cpp:196
@@ -1104,7 +1105,7 @@ msgstr "&OK"
#: DlgAdvPreferences.cpp:544
msgid "invalid number"
-msgstr "ugyldig nummer"
+msgstr ""
#: DlgAdvPreferences.cpp:545
msgid "invalid time, format is HH:MM"
@@ -1120,7 +1121,7 @@ msgstr "ugyldig inndata verdi oppdaget"
#: DlgAdvPreferences.cpp:753
msgid "Validation Error"
-msgstr "Valideringsfeil"
+msgstr "Validerings feil"
#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
#: DlgAdvPreferences.cpp:897
@@ -1135,7 +1136,7 @@ msgstr "'%s' er ikke en kjørbar applikasjon."
#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
#: DlgAdvPreferences.cpp:986
msgid "Add Exclusive App"
-msgstr "Legg til app med enerett"
+msgstr ""
#: DlgAdvPreferences.cpp:927
msgid "Name of application to add?"
@@ -1143,7 +1144,7 @@ msgstr "Navn på program å legge til?"
#: DlgAdvPreferences.cpp:927
msgid "Add exclusive app"
-msgstr "Legg til app med enerett"
+msgstr ""
#: DlgAdvPreferences.cpp:961
#, c-format
@@ -1153,15 +1154,13 @@ msgstr "Applikasjon navn må slutte med \"%s\""
#: DlgAdvPreferences.cpp:985
#, c-format
msgid "'%s' is already in the list."
-msgstr "'%s' er allerede i listen."
+msgstr ""
#: DlgAdvPreferences.cpp:1077
msgid ""
"Do you really want to clear all local preferences?\n"
"(This will not affect exclusive applications.)"
msgstr ""
-"Ønsker du virkelig å fjerne alle lokale instillinger?\n"
-"(Dette vil ikke påvirke ekslusive applikasjoner.)"
#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
msgid "Confirmation"
@@ -1178,11 +1177,6 @@ msgid ""
"Click OK to set preferences.\n"
"Click Clear to restore web-based settings (except exclusive apps)."
msgstr ""
-"Denne dialogboksen kontrollerer utelukkende innstillinger for denne "
-"datamaskinen.\n"
-"Klikk OK for lagre innstillingene.\n"
-"Klikk Fjern for å gjenopprette nettbaserte innstillinger (endrer ikke "
-"programinnstillinger)."
#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
msgid "Clear"
@@ -1190,11 +1184,11 @@ msgstr "Fjern"
#: DlgAdvPreferencesBase.cpp:66
msgid "clear all local preferences and close the dialog"
-msgstr "fjern alle lokale innstillinger og lukk dialogboksen"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:81
msgid "processor usage"
-msgstr "prosessorbruk"
+msgstr "Prosessor bruk"
#: DlgAdvPreferencesBase.cpp:84
msgid "network usage"
@@ -1206,7 +1200,7 @@ msgstr "disk og minne bruk"
#: DlgAdvPreferencesBase.cpp:90
msgid "exclusive applications"
-msgstr "Applikasjoner med enerett"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
msgid "OK"
@@ -1214,11 +1208,11 @@ msgstr "OK"
#: DlgAdvPreferencesBase.cpp:103
msgid "save all values and close the dialog"
-msgstr "lagre alle verdier og lukk dialogboksen"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:108
msgid "close the dialog without saving"
-msgstr "lukk dialogboksen uten å lagre"
+msgstr "lukk vinduet uten å lagre"
#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
@@ -1227,11 +1221,11 @@ msgstr "Hjelp"
#: DlgAdvPreferencesBase.cpp:113
msgid "shows the preferences web page"
-msgstr "viser nettsiden for preferanser"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:135
msgid "Computing allowed"
-msgstr "Beregning tillatt"
+msgstr "Databehandling tillatt"
#: DlgAdvPreferencesBase.cpp:139
msgid "While computer is on batteries"
@@ -1241,8 +1235,6 @@ msgstr "Når datamaskinen går på batterier"
msgid ""
"check this if you want this computer to do work while it runs on batteries"
msgstr ""
-"sett kryss om du ønsker at denne datamaskinen skal utføre arbeid når den "
-"kjører på batterier"
#: DlgAdvPreferencesBase.cpp:148
msgid "While computer is in use"
@@ -1252,8 +1244,6 @@ msgstr "Når datamaskinen er i bruk"
msgid ""
"check this if you want this computer to do work even when you're using it"
msgstr ""
-"sett kryss om du ønsker at denne datamaskinen skal utføre arbeid, selv når "
-"du bruker den"
#: DlgAdvPreferencesBase.cpp:157
msgid "Use GPU while computer is in use"
@@ -1264,19 +1254,15 @@ msgid ""
"check this if you want your GPU to do work even when you're using the "
"computer"
msgstr ""
-"sett kryss om du ønsker at grafikkprosessoren skal utføre arbeid, selv når "
-"du bruker datamaskinen"
#: DlgAdvPreferencesBase.cpp:172
msgid "Only after computer has been idle for"
-msgstr "Bare etter at datamaskinen har vært inaktiv i"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:182
msgid ""
"do work only after you haven't used the computer for this number of minutes"
msgstr ""
-"bare utfør arbeid etter at du ikke har brukt datamaskinen i dette antall "
-"minutter"
#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
#: sg_DlgPreferences.cpp:417
@@ -1285,7 +1271,7 @@ msgstr "minutter"
#: DlgAdvPreferencesBase.cpp:206
msgid "While processor usage is less than"
-msgstr "Når prosessorbruken er mindre enn"
+msgstr "Når prosessor bruken er mindre enn"
#: DlgAdvPreferencesBase.cpp:216
msgid "suspend work if processor usage exceeds this level"
@@ -1318,11 +1304,11 @@ msgstr "(ingen begrensning hvis lik)"
#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
msgid "Day-of-week override:"
-msgstr "Overstyr ukedag:"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
msgid "check box to specify hours for this day of week"
-msgstr "sett kryss for å spesifisere tidsintervall for denne ukedagen"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
msgid "Monday"
@@ -1362,18 +1348,18 @@ msgstr "Bytt mellom applikasjon hver"
#: DlgAdvPreferencesBase.cpp:339
msgid "On multiprocessor systems, use at most"
-msgstr "På multiprosessorsystemer, bruk maks"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:346
#, no-c-format
msgid "% of the processors (0 means ignore this setting)"
-msgstr "% av prosessorene (0 betyr ignorer denne innstillingen)"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
msgid "Use at most"
-msgstr "Bruk på det meste"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:356
#, no-c-format
@@ -1398,7 +1384,7 @@ msgstr "Maksimum opplastingshastighet"
#: DlgAdvPreferencesBase.cpp:406
msgid "Transfer at most"
-msgstr "Overfør på det meste"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:412
msgid "Mbytes"
@@ -1415,28 +1401,27 @@ msgstr "dager"
#: DlgAdvPreferencesBase.cpp:429
msgid "Minimum work buffer"
-msgstr "Minimum arbeidsbuffer"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:438
msgid "Try to maintain enough tasks to keep busy for this many days"
msgstr ""
-"Prøv å opprettholde nok oppgaver til å være opptatt i følgende antall dager"
#: DlgAdvPreferencesBase.cpp:450
msgid "Max additional work buffer"
-msgstr "Maks ekstra arbeidsbuffer"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:459
msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "I tillegg, oppretthold nok oppgaver opp til dette antall dager"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:466
msgid "Skip image file verification"
-msgstr "Hopp over verifisering av avbildningsfil"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:468
msgid "check this if your Internet provider modifies image files"
-msgstr "merk denne hvis din Internettleverandør modifiserer avbildingsfilene"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:476
msgid "Connect options"
@@ -1444,26 +1429,23 @@ msgstr "Tilkoblings alternativer"
#: DlgAdvPreferencesBase.cpp:478
msgid "Confirm before connecting to internet"
-msgstr "Bekreft før det kobles til Internet"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:480
msgid ""
"if checked, a confirmation dialog will be displayed before trying to connect "
"to the Internet"
msgstr ""
-"hvis merket, vil en dialogboks vises før det forsøkes å koble til Internet"
#: DlgAdvPreferencesBase.cpp:484
msgid "Disconnect when done"
-msgstr "Koble fra når ferdig"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:486
msgid ""
"if checked, BOINC hangs up when network usage is done\n"
"(only relevant for dialup-connection)"
msgstr ""
-"hvis merket, vil BOINC koble fra når overføring er ferdig\n"
-"(kun relevant for oppringte tilkoblinger)"
#: DlgAdvPreferencesBase.cpp:492
msgid "Network usage allowed"
@@ -1471,11 +1453,11 @@ msgstr "Nettverksbruk tillatt"
#: DlgAdvPreferencesBase.cpp:500
msgid "network usage start hour"
-msgstr "bruk av nettverk starter klokken"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:508
msgid "network usage stop hour"
-msgstr "bruk av nettverk stopper klokken"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
msgid "Disk usage"
@@ -1483,7 +1465,7 @@ msgstr "Disk bruk"
#: DlgAdvPreferencesBase.cpp:609
msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "maksimal diskplass brukt av BOINC (i Gigabytes)"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:613
msgid "Gigabytes disk space"
@@ -1491,11 +1473,11 @@ msgstr "Gigabytes diskplass"
#: DlgAdvPreferencesBase.cpp:616
msgid "Leave at least"
-msgstr "La det minst være"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:620
msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC lar det minimum være så mye diskplass ledig (i Gigabytes)"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:624
msgid "Gigabytes disk space free"
@@ -1503,7 +1485,7 @@ msgstr "Gigabytes diskplass ledig"
#: DlgAdvPreferencesBase.cpp:631
msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC bruker på det meste denne prosentandelen av total diskplass"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:636
#, no-c-format
@@ -1512,7 +1494,7 @@ msgstr "% av total diskplass"
#: DlgAdvPreferencesBase.cpp:639
msgid "Tasks checkpoint to disk at most every"
-msgstr "Kontrollpunkt for oppgaver skrives til disk på det meste hver"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:645
msgid "seconds"
@@ -1521,7 +1503,7 @@ msgstr "sekunder"
#: DlgAdvPreferencesBase.cpp:655
#, no-c-format
msgid "% of page file (swap space)"
-msgstr "% av sidevekslingsfil (veksleområde)"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:662
msgid "Memory usage"
@@ -1534,30 +1516,30 @@ msgstr "% når datamaskinen er i bruk"
#: DlgAdvPreferencesBase.cpp:686
#, no-c-format
-#, no-c-format, no-c-format
+#, fuzzy, no-c-format
msgid "% when computer is idle"
-msgstr "% når datamaskinen er inaktiv"
+msgstr "% når datamaskinen er i bruk"
#: DlgAdvPreferencesBase.cpp:691
msgid "Leave applications in memory while suspended"
-msgstr "La applikasjonene bli værende i minnet når suspendert"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:693
msgid "if checked, suspended work units are left in memory"
-msgstr "hvis merket, vil suspenderte arbeidsenheter bli værende i minnet"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:713
msgid ""
"Suspend processor and network usage when these applications are running:"
-msgstr "Suspender bruk av prosessor og nettverk når disse programmene kjører:"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:722
msgid "Add..."
-msgstr "Legg til..."
+msgstr ""
#: DlgAdvPreferencesBase.cpp:723
msgid "Add an application to this list"
-msgstr "Legg til en applikasjon i denne listen"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
#: sg_ProjectCommandPopup.cpp:85
@@ -1566,16 +1548,16 @@ msgstr "Fjern"
#: DlgAdvPreferencesBase.cpp:729
msgid "Remove an application from this list"
-msgstr "Fjern en applikasjon fra denne listen"
+msgstr ""
#: DlgAdvPreferencesBase.cpp:738
msgid "For advanced options, refer to "
-msgstr "For avanserte alternativer, henvis til"
+msgstr ""
#: DlgEventLog.cpp:219
#, c-format
msgid "%s - Event Log"
-msgstr "%s - Hendelseslogg"
+msgstr "%s - Hendelse logg"
#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
@@ -1592,36 +1574,36 @@ msgid "Message"
msgstr "Melding"
#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
+#, fuzzy
msgid "&Show only this project"
-msgstr "&Vis bare dette prosjektet"
+msgstr "Vis bare dette prosjektet"
#: DlgEventLog.cpp:294
+#, fuzzy
msgid "Copy &All"
-msgstr "Kopier &alt"
+msgstr "Kopier alt"
#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
+#, fuzzy
msgid "Copy all the messages to the clipboard."
-msgstr "Kopier alle meldinger til utklippstavlen."
+msgstr "Kopier alle meldinger til utklippstavle..."
#: DlgEventLog.cpp:305
+#, fuzzy
msgid "Copy &Selected"
-msgstr "Kopier &valgte"
+msgstr "Kopier valgte"
#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 ViewMessages.cpp:97
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or command key while clicking on messages."
msgstr ""
-"Kopier valgte meldinger til utklippstavlen. Du kan velge flere meldinger ved "
-"å holde Shift eller Command tasten inne mens du klikker på meldingene."
#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 ViewMessages.cpp:99
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or control key while clicking on messages."
msgstr ""
-"Kopier valgte meldinger til utklippstavlen. Du kan velge flere meldinger ved "
-"å trykke Shift eller Control tasten inne mens du klikker på meldingene."
#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
msgid "&Close"
@@ -1633,8 +1615,9 @@ msgid "Get help with %s"
msgstr "Få hjelp med %s"
#: DlgEventLog.cpp:348
+#, fuzzy
msgid "Show all &messages"
-msgstr "Vis alle &meldinger"
+msgstr "Vis alle meldinger"
#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
msgid "Show messages for all projects"
@@ -1659,12 +1642,6 @@ msgid ""
"If you also want to stop running the tasks,\n"
"choose from the following options:"
msgstr ""
-"Du har valgt å avslutte %s,\n"
-"som lar det vise og administrere\n"
-"oppgavene som kjører på din arbeidsstasjon.\n"
-"\n"
-"Hvis du også ønsker å stoppe kjøring av oppgavene,\n"
-"velg fra følgende alternativer:"
#: DlgExitMessage.cpp:135
#, c-format
@@ -1676,21 +1653,15 @@ msgid ""
"rather than to exit the application; that will allow %s to run its\n"
"tasks at the times you selected in your preferences."
msgstr ""
-"Dette vil stenge ned %s og dens oppgaver inntil enten\n"
-"%s eller skjermspareren til %s kjører igjen.\n"
-"\n"
-"I de fleste tilfeller, er det bedre å lukke %s vinduet\n"
-"istedenfor å avslutte applikasjonen; som tillater %s å kjøre dens\n"
-"oppgaver på tidspunktene du har valgt i dine innstillinger."
#: DlgExitMessage.cpp:153
#, c-format
msgid "Stop running tasks when exiting the %s"
-msgstr "Stopp kjøring av oppgaver ved avsluttning av %s"
+msgstr ""
#: DlgExitMessage.cpp:165
msgid "Remember this decision and do not show this dialog."
-msgstr "Husk dette valget og ikke vis denne dialogboksen."
+msgstr ""
#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
#: DlgSelectComputer.cpp:168 wizardex.cpp:378
@@ -1699,40 +1670,43 @@ msgstr "&Avbryt"
#: DlgGenericMessage.cpp:112
msgid "Don't show this dialog again."
-msgstr "Ikke vis denne dialogboksen igjen."
+msgstr ""
#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
+#, fuzzy
msgid "Don't fetch tasks for "
-msgstr "Ikke hent oppgaver for "
+msgstr "Ikke hent CPU oppgaver"
#: DlgItemProperties.cpp:168
msgid "Project preference"
msgstr "Prosjekt innstilling "
#: DlgItemProperties.cpp:171
+#, fuzzy
msgid "Account manager preference"
-msgstr "Kontobehandlerinnstilling"
+msgstr "Kontostyring nettside"
#: DlgItemProperties.cpp:174
+#, fuzzy
msgid "Project has no apps for "
-msgstr "Prosjektet har ingen apps til "
+msgstr "Prosjektets nettsider"
#: DlgItemProperties.cpp:177
msgid "Client configuration excludes "
-msgstr "Klientkonfigurasjonen ekskluderer "
+msgstr ""
#: DlgItemProperties.cpp:181
msgid " work fetch deferred for"
-msgstr " arbeidsfangst utsatt for"
+msgstr ""
#: DlgItemProperties.cpp:182
msgid " work fetch deferral interval"
-msgstr " intervall for utsettelse av arbeidsfangst"
+msgstr ""
#: DlgItemProperties.cpp:213
msgid "Properties of project "
-msgstr "Egenskaper for prosjekt "
+msgstr "Egenskaper for prosjekt"
#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
msgid "General"
@@ -1752,19 +1726,19 @@ msgstr "Team navn"
#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
msgid "Resource share"
-msgstr "Ressursandel"
+msgstr ""
#: DlgItemProperties.cpp:223
msgid "Scheduler RPC deferred for"
-msgstr "RPC planlegger utsatt for"
+msgstr ""
#: DlgItemProperties.cpp:226
msgid "File downloads deferred for"
-msgstr "Nedlastning av filer utsatt for"
+msgstr ""
#: DlgItemProperties.cpp:229
msgid "File uploads deferred for"
-msgstr "Opplasting av filer utsatt for"
+msgstr ""
#: DlgItemProperties.cpp:232
msgid "Computer ID"
@@ -1791,19 +1765,19 @@ msgstr "nei"
#: DlgItemProperties.cpp:237
msgid "Don't request more work"
-msgstr "Ikke anmod mer arbeid"
+msgstr "Ikke anmod om mer arbeid"
#: DlgItemProperties.cpp:239
msgid "Scheduler call in progress"
-msgstr "Samtaleplanlegging pågår"
+msgstr ""
#: DlgItemProperties.cpp:242
msgid "Trickle-up pending"
-msgstr "Godskriv andel venter"
+msgstr ""
#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
msgid "Host location"
-msgstr "Vertslokasjon"
+msgstr ""
#: DlgItemProperties.cpp:247
msgid "default"
@@ -1811,19 +1785,19 @@ msgstr "forvalg"
#: DlgItemProperties.cpp:251
msgid "Added via account manager"
-msgstr "Lagt til via kontobehandler"
+msgstr ""
#: DlgItemProperties.cpp:254
msgid "Remove when tasks done"
-msgstr "Fjern når oppgavene er utført"
+msgstr ""
#: DlgItemProperties.cpp:257
msgid "Ended"
-msgstr "Ferdig"
+msgstr ""
#: DlgItemProperties.cpp:259
msgid "Credit"
-msgstr "Arbeid utført"
+msgstr ""
#: DlgItemProperties.cpp:260
msgid "User"
@@ -1835,23 +1809,23 @@ msgstr "Vert"
#: DlgItemProperties.cpp:276
msgid "Scheduling"
-msgstr "Planlegging"
+msgstr ""
#: DlgItemProperties.cpp:277
msgid "Scheduling priority"
-msgstr "Planleggingsprioritet"
+msgstr ""
#: DlgItemProperties.cpp:278
msgid "CPU"
-msgstr "Prosessor"
+msgstr ""
#: DlgItemProperties.cpp:302
msgid "Duration correction factor"
-msgstr "Korrigeringsfaktor varighet"
+msgstr ""
#: DlgItemProperties.cpp:316
msgid "Properties of task "
-msgstr "Egenskaper for oppgave "
+msgstr "Egenskaper for oppgave"
#: DlgItemProperties.cpp:328 ViewWork.cpp:238
msgid "Application"
@@ -1859,7 +1833,7 @@ msgstr "Applikasjon"
#: DlgItemProperties.cpp:329 ViewWork.cpp:239
msgid "Name"
-msgstr "Navn"
+msgstr ""
#: DlgItemProperties.cpp:330
msgid "State"
@@ -1871,7 +1845,7 @@ msgstr "Mottatt"
#: DlgItemProperties.cpp:336
msgid "Report deadline"
-msgstr "Rapporter frist"
+msgstr "Rapporterings frist"
#: DlgItemProperties.cpp:338
msgid "Resources"
@@ -1879,7 +1853,7 @@ msgstr "Resurser"
#: DlgItemProperties.cpp:341
msgid "Estimated computation size"
-msgstr "Estimert beregningsstørrelse"
+msgstr ""
#: DlgItemProperties.cpp:344
msgid "CPU time at last checkpoint"
@@ -1891,15 +1865,15 @@ msgstr "CPU tid"
#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
msgid "Elapsed time"
-msgstr "Tid brukt"
+msgstr ""
#: DlgItemProperties.cpp:349
msgid "Estimated time remaining"
-msgstr "Forventet tid igjen"
+msgstr ""
#: DlgItemProperties.cpp:350
msgid "Fraction done"
-msgstr "Fraksjon ferdig"
+msgstr ""
#: DlgItemProperties.cpp:351
msgid "Virtual memory size"
@@ -1907,7 +1881,7 @@ msgstr "Virtuell minne størrelse"
#: DlgItemProperties.cpp:352
msgid "Working set size"
-msgstr "Arbeidssettstørrelse"
+msgstr ""
#: DlgItemProperties.cpp:354
msgid "Directory"
@@ -1919,11 +1893,11 @@ msgstr "Prosess ID"
#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
msgid "Local: "
-msgstr "Lokal: "
+msgstr "Lokal:"
#: DlgOptions.cpp:129 DlgOptions.cpp:135
msgid "Options"
-msgstr "Alternativer"
+msgstr ""
#: DlgOptions.cpp:175
msgid "Language:"
@@ -1935,31 +1909,31 @@ msgstr "Hvilket språk skal BOINC bruke?"
#: DlgOptions.cpp:186
msgid "Notice reminder interval:"
-msgstr "Varselintervall for påminnelser:"
+msgstr ""
#: DlgOptions.cpp:193
msgid "How often should BOINC remind you of new notices?"
-msgstr "Hvor ofte skal BOINC gi deg påminnelse om nye varsler?"
+msgstr ""
#: DlgOptions.cpp:198
msgid "Run Manager at login?"
-msgstr "Kjør kontobehandler ved innlogging?"
+msgstr ""
#: DlgOptions.cpp:204
msgid "Run the BOINC Manager when you log on."
-msgstr "Kjør BOINC kontobehandler når du logger på."
+msgstr ""
#: DlgOptions.cpp:209
msgid "Enable Manager exit dialog?"
-msgstr "Aktivere avsluttningsdialogboksen for behandleren?"
+msgstr ""
#: DlgOptions.cpp:215
msgid "Display the exit dialog when shutting down the Manager."
-msgstr "Vis dialogboks for avsluttning når behandleren stenges ned."
+msgstr ""
#: DlgOptions.cpp:226
msgid "Dial-up and Virtual Private Network settings"
-msgstr "Innstillinger for oppringte- og virtuelle private nettverk"
+msgstr ""
#: DlgOptions.cpp:240
msgid "&Set Default"
@@ -1971,7 +1945,7 @@ msgstr "%Fjern forvalg"
#: DlgOptions.cpp:252
msgid "Default Connection:"
-msgstr "Standard tilkobling:"
+msgstr ""
#: DlgOptions.cpp:259
msgid "Connections"
@@ -1995,11 +1969,11 @@ msgstr "Port:"
#: DlgOptions.cpp:296 DlgOptions.cpp:360
msgid "Don't use proxy for:"
-msgstr "Ikke bruk mellomtjener for:"
+msgstr "Ikke bruk proxy for:"
#: DlgOptions.cpp:303 DlgOptions.cpp:367
msgid "Leave these blank if not needed"
-msgstr "La disse være blanke hvis de ikke behøves."
+msgstr ""
#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
msgid "User Name:"
@@ -2012,19 +1986,19 @@ msgstr "Passord:"
#: DlgOptions.cpp:324
msgid "HTTP Proxy"
-msgstr "HTTP mellomtjener"
+msgstr "HTTP Proxy"
#: DlgOptions.cpp:332
msgid "Connect via SOCKS proxy server"
-msgstr "Koble til via SOCKS mellomtjener"
+msgstr "Koble til via SOCKS proxy-tjener"
#: DlgOptions.cpp:336
msgid "SOCKS Proxy Server Configuration"
-msgstr "SOCKS mellomtjener konfigurasjon"
+msgstr "SOCKS Proxy-tjener konfigurasjon"
#: DlgOptions.cpp:388
msgid "SOCKS Proxy"
-msgstr "SOCKS mellomtjener"
+msgstr "SOCKS Proxy"
#: DlgOptions.cpp:586
msgid "always"
@@ -2057,13 +2031,13 @@ msgstr "%s - Språkvalg"
#: DlgOptions.cpp:695
#, c-format
-#, c-format, c-format
+#, fuzzy, c-format
msgid ""
"The %s's language has been changed. In order for this change to take "
"effect, you must restart the %s."
msgstr ""
-"Standardspråk for %s er endret. For å ta i bruk endringene må du starte %s "
-"på nytt."
+"Standardspråk for %s er forandret, for at forandringene skal vises må du "
+"starte om %s."
#: DlgSelectComputer.cpp:91
#, c-format
@@ -2076,8 +2050,6 @@ msgid ""
"Another instance of %s is already running \n"
"on this computer. Please select a client to monitor."
msgstr ""
-"En annen forekomst av %s kjører allerede \n"
-"på denne datamaskinen. Vennligst velg en klient å monitorere."
#: DlgSelectComputer.cpp:143
msgid "Host name:"
@@ -2085,11 +2057,11 @@ msgstr "Vertsnavn:"
#: Localization.cpp:31 Localization.cpp:69
msgid "Message boards"
-msgstr "Diskusjonsfora"
+msgstr ""
#: Localization.cpp:33
msgid "Correspond with other users on the SETI at home message boards"
-msgstr "Utveksle meldinger med andre brukere på SETI at home diskusjonsforum"
+msgstr ""
#: Localization.cpp:37
msgid "Ask questions and report problems"
@@ -2102,7 +2074,7 @@ msgstr "Din konto"
#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
msgid "View your account information and credit totals"
-msgstr "Vis din kontoinformasjon og dine totaler"
+msgstr ""
#: Localization.cpp:43
msgid "Your preferences"
@@ -2110,7 +2082,7 @@ msgstr "Dine innstillinger"
#: Localization.cpp:45
msgid "View and modify your SETI at home account profile and preferences"
-msgstr "Vis og endre din SETI at home kontoprofil og innstillinger"
+msgstr ""
#: Localization.cpp:47 Localization.cpp:89
msgid "Your results"
@@ -2118,7 +2090,7 @@ msgstr "Dine resultat"
#: Localization.cpp:49 Localization.cpp:91
msgid "View your last week (or more) of computational results and work"
-msgstr "Vis din siste ukes (eller mer) beregningsresultater og arbeid"
+msgstr ""
#: Localization.cpp:51 Localization.cpp:93
msgid "Your computers"
@@ -2126,7 +2098,7 @@ msgstr "Dine datamaskiner"
#: Localization.cpp:53
msgid "View a listing of all the computers on which you are running SETI at Home"
-msgstr "Vis liste med alle dine datamaskiner som kjører SETI at Home"
+msgstr ""
#: Localization.cpp:55 Localization.cpp:97
msgid "Your team"
@@ -2142,7 +2114,7 @@ msgstr "Vanlige spørsmål"
#: Localization.cpp:63
msgid "Read the Einstein at Home Frequently Asked Question list"
-msgstr "Les Einstein at Home's ofte stilte spørsmålslisten"
+msgstr ""
#: Localization.cpp:65
msgid "Screensaver info"
@@ -2150,14 +2122,12 @@ msgstr "Skjermsparer info"
#: Localization.cpp:67
msgid "Read a detailed description of the Einstein at Home screensaver"
-msgstr "Les en detaljert beskrivelse av Einstein at Home's skjermsparer"
+msgstr ""
#: Localization.cpp:71
msgid ""
"Correspond with admins and other users on the Einstein at Home message boards"
msgstr ""
-"Utveksle meldinger med administratorer og andre brukere på Einstein at Home "
-"diskusjonsforum"
#: Localization.cpp:73
msgid "Einstein status"
@@ -2165,28 +2135,28 @@ msgstr "Einstein status"
#: Localization.cpp:75
msgid "Current status of the Einstein at Home server"
-msgstr "Nåværende status for Einstein at Home tjeneren"
+msgstr ""
#: Localization.cpp:77
msgid "Report problems"
-msgstr "Rapporter problemer"
+msgstr "Rapporter problemer "
#: Localization.cpp:79
msgid "A link to the Einstein at Home problems and bug reports message board"
-msgstr "Link til Einstein at Home diskusjonsforumet for problemer og feilrapporter"
+msgstr ""
#: Localization.cpp:83
msgid "View and modify your Einstein at Home account profile and preferences"
-msgstr "Vis og modifiser din Einstein at Home kontoprofil og innstillinger"
+msgstr ""
#: Localization.cpp:85
msgid "Account summary"
-msgstr "Konto sammendrag"
+msgstr "Konto oppsummering"
#: Localization.cpp:95
msgid ""
"View a listing of all the computers on which you are running Einstein at Home"
-msgstr "Vis en oversikt over alle dine datamaskiner som kjører Einstein at Home"
+msgstr ""
#: Localization.cpp:101
msgid "LIGO project"
@@ -2231,7 +2201,7 @@ msgstr "climateprediction.net Nyheter"
#: Localization.cpp:131
msgid "View your account information, credits, and trickles"
-msgstr "Vis din kontoinformasjon, poeng og andeler"
+msgstr ""
#: Localization.cpp:135
msgid "Info about your team"
@@ -2247,7 +2217,7 @@ msgstr "Global statestikk"
#: Localization.cpp:145
msgid "Summary statistics for World Community Grid"
-msgstr "Statistikksammendrag for World Community Grid"
+msgstr ""
#: Localization.cpp:147
msgid "My Grid"
@@ -2263,7 +2233,7 @@ msgstr "Enhetsprofiler"
#: Localization.cpp:153
msgid "Update your device settings"
-msgstr "Oppdater din enhets innstillinger"
+msgstr "Oppdater dine enhets innstillinger"
#: Localization.cpp:155
msgid "Research"
@@ -2271,7 +2241,7 @@ msgstr "Forskning"
#: Localization.cpp:157
msgid "Learn about the projects hosted at World Community Grid"
-msgstr "Lær om prosjektene driftet av World Community Grid"
+msgstr ""
#: MainDocument.cpp:583
msgid "Starting client"
@@ -2286,16 +2256,15 @@ msgid "Retrieving system state; please wait..."
msgstr "Henter systemstatus; vennligst vent..."
#: MainDocument.cpp:1816
+#, fuzzy
msgid "Missing application"
-msgstr "Applikasjon mangler"
+msgstr "Applikasjon"
#: MainDocument.cpp:1817
msgid ""
"Please download and install the CoRD application from http://cord."
"sourceforge.net"
msgstr ""
-"Vennligst last ned og installer CoRD applikasjonen fra "
-"http://cord.sourceforge.net"
#: MainDocument.cpp:2432
msgid "on batteries"
@@ -2315,7 +2284,7 @@ msgstr "tid på dag"
#: MainDocument.cpp:2436
msgid "CPU benchmarks in progress"
-msgstr "CPU ytelsestest er startet"
+msgstr "CPU ytelses test er startet "
#: MainDocument.cpp:2437
msgid "need disk space - check preferences"
@@ -2331,7 +2300,7 @@ msgstr "starter opp"
#: MainDocument.cpp:2440
msgid "an exclusive app is running"
-msgstr "en app med enerett kjører"
+msgstr ""
#: MainDocument.cpp:2441
msgid "CPU is busy"
@@ -2339,11 +2308,11 @@ msgstr "CPU er opptatt"
#: MainDocument.cpp:2442
msgid "network bandwidth limit exceeded"
-msgstr "grense for bruk av båndbredde er overskredet"
+msgstr ""
#: MainDocument.cpp:2443
msgid "requested by operating system"
-msgstr "anmodet av operativsystemet"
+msgstr ""
#: MainDocument.cpp:2445
msgid "unknown reason"
@@ -2351,7 +2320,7 @@ msgstr "ukjent grunn"
#: MainDocument.cpp:2467
msgid "GPU missing, "
-msgstr "GPU mangler, "
+msgstr "GPU mangler."
#: MainDocument.cpp:2474
msgid "New"
@@ -2383,8 +2352,9 @@ msgstr "Suspendert - "
# 75%
#: MainDocument.cpp:2500
+#, fuzzy
msgid "GPU suspended - "
-msgstr "GPU suspendert - "
+msgstr " (suspendert - "
#: MainDocument.cpp:2507
msgid "Waiting for memory"
@@ -2416,19 +2386,20 @@ msgstr "Klar til å starte"
#: MainDocument.cpp:2532
msgid " (Scheduler wait: "
-msgstr " (Planleggeren venter: "
+msgstr ""
#: MainDocument.cpp:2536
msgid " (Scheduler wait)"
-msgstr " (Planleggeren venter)"
+msgstr ""
#: MainDocument.cpp:2540
+#, fuzzy
msgid " (Waiting for network access)"
-msgstr " (Venter på nettverkstilgang)"
+msgstr "Venter på minne"
#: MainDocument.cpp:2544
msgid "Computation error"
-msgstr "Beregningsfeil"
+msgstr "Databehandling feilet"
#: MainDocument.cpp:2548
msgid "Upload failed"
@@ -2452,15 +2423,15 @@ msgstr "Avbrutt: ikke startet innen tidsfristen"
#: MainDocument.cpp:2570
msgid "Aborted: disk limit exceeded"
-msgstr "Avbrutt: Plassbegrensning oversteget"
+msgstr ""
#: MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
-msgstr "Avbrutt: Grense for kjøretid oversteget"
+msgstr ""
#: MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
-msgstr "Avbrutt: Minneterskel overskredet"
+msgstr ""
#: MainDocument.cpp:2579
msgid "Aborted"
@@ -2468,7 +2439,7 @@ msgstr "Avbrutt"
#: MainDocument.cpp:2584
msgid "Acknowledged"
-msgstr "Bekreftet"
+msgstr ""
#: MainDocument.cpp:2586
msgid "Ready to report"
@@ -2489,7 +2460,7 @@ msgstr "Vennligst koble til Internett og prøv igjen."
#: NotDetectedPage.cpp:181
msgid "Project not found"
-msgstr "Prosjekt ikke funnet"
+msgstr "Fant ikke prosjektet"
#: NotDetectedPage.cpp:184
msgid ""
@@ -2503,18 +2474,19 @@ msgstr ""
#: NotDetectedPage.cpp:188
msgid "Account manager not found"
-msgstr "Kontobehandler ikke funnet"
+msgstr ""
#: NotDetectedPage.cpp:191
+#, fuzzy
msgid ""
"The URL you supplied is not that of a BOINC-based account\n"
"manager.\n"
"\n"
"Please check the URL and try again."
msgstr ""
-"URL'en du tastet inn er ikke den til en BOINC basert konto\n"
-"behandler.\n"
-"Vennligst kontroller URL'en og prøv igjen."
+"URL'en du skrev inn er ikke et BOINC basert prosjekt.\n"
+"\n"
+"Vennligst sjekk URL'en og prøv igjen."
#: NotFoundPage.cpp:181
msgid "Login Failed."
@@ -2526,7 +2498,7 @@ msgstr "Sjekk brukernavn og passord, og prøv igjen."
#: NotFoundPage.cpp:189
msgid "Check the email address and password, and try again."
-msgstr "Sjekk epostadressen og passordet, og prøv igjen."
+msgstr "Sjekk e-post adresse og passord, og prøv igjen."
#: NoticeListCtrl.cpp:222
msgid "more..."
@@ -2534,7 +2506,7 @@ msgstr "mer..."
#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
msgid "All"
-msgstr "Alle"
+msgstr ""
#: ProjectInfoPage.cpp:615
msgid "Choose a project"
@@ -2546,33 +2518,36 @@ msgstr "For å velge et prosjekt, klikk på navnet eller skriv inn URL nedenfor.
#: ProjectInfoPage.cpp:623
msgid "Categories:"
-msgstr "Kategorier:"
+msgstr ""
#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
+#, fuzzy
msgid "Projects:"
-msgstr "Prosjekter:"
+msgstr "Prosjekter"
#: ProjectInfoPage.cpp:631
msgid "Project details"
-msgstr "Prosjektdetaljer"
+msgstr ""
#: ProjectInfoPage.cpp:635
msgid "Research area:"
-msgstr "Forskningsområde:"
+msgstr ""
#: ProjectInfoPage.cpp:639
msgid "Organization:"
-msgstr "Organisasjon:"
+msgstr ""
#: ProjectInfoPage.cpp:643
+#, fuzzy
msgid "Web site:"
-msgstr "Nettsted:"
+msgstr "Nettsted"
#: ProjectInfoPage.cpp:647
msgid "Supported systems:"
-msgstr "Supporterte systemer:"
+msgstr ""
#: ProjectInfoPage.cpp:651
+#, fuzzy
msgid "Project URL:"
msgstr "Prosjekt &URL:"
@@ -2581,8 +2556,6 @@ msgid ""
"This project may not have work for your type of computer. Do you want to "
"add it anyway?"
msgstr ""
-"Dette prosjektet har muligens ikke arbeid for din type arbeidsstasjon. "
-"Ønsker du å legge til det allikevel?"
#: ProjectInfoPage.cpp:850
msgid "You already added this project. Please choose a different project."
@@ -2595,11 +2568,11 @@ msgstr "Kommuniserer med prosjektet."
#: ProjectProcessingPage.cpp:509
msgid "Required files not found on the server."
-msgstr "Obligatoriske filer ikke funnet på tjeneren."
+msgstr ""
#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
msgid "An internal server error has occurred."
-msgstr "En intern tjenerfeil har oppstått."
+msgstr "En intern tjener feil har oppstått."
#: ProjectPropertiesPage.cpp:334
msgid ""
@@ -2675,11 +2648,11 @@ msgstr ""
#: ProxyPage.cpp:331
msgid "Proxy configuration"
-msgstr "Mellomtjener konfigurasjon"
+msgstr "Proxy konfigurasjon"
#: ProxyPage.cpp:334
msgid "HTTP proxy"
-msgstr "HTTP mellomtjener"
+msgstr "HTTP proxy"
#: ProxyPage.cpp:337 ProxyPage.cpp:357
msgid "Server:"
@@ -2687,27 +2660,27 @@ msgstr "Tjener:"
#: ProxyPage.cpp:350
msgid "Autodetect"
-msgstr "Oppdag automatisk"
+msgstr ""
#: ProxyPage.cpp:354
msgid "SOCKS proxy"
-msgstr "SOCKS mellomtjener"
+msgstr "SOCKS proxy"
#: TermsOfUsePage.cpp:218
msgid "Terms of Use"
-msgstr "Vilkår for Bruk"
+msgstr ""
#: TermsOfUsePage.cpp:222
msgid "Please read the following terms of use:"
-msgstr "Vennligst les følgende vilkår for bruk:"
+msgstr ""
#: TermsOfUsePage.cpp:231
msgid "I agree to the terms of use."
-msgstr "Jeg aksepterer vilkårene for bruk."
+msgstr ""
#: TermsOfUsePage.cpp:237
msgid "I do not agree to the terms of use."
-msgstr "Jeg aksepterer ikke vilkårene for bruk."
+msgstr ""
#: UnavailablePage.cpp:183
msgid "Project temporarily unavailable"
@@ -2725,29 +2698,30 @@ msgstr ""
#: UnavailablePage.cpp:190
msgid "Account manager temporarily unavailable"
-msgstr "Kontobehandler midlertidig utilgjengelig"
+msgstr ""
#: UnavailablePage.cpp:193
+#, fuzzy
msgid ""
"The account manager is temporarily unavailable.\n"
"\n"
"Please try again later."
msgstr ""
-"Kontobehandler er midlertidig utilgjengelig.\n"
+"Prosjektet er midlertidig utilgjengelig.\n"
"\n"
"Vennligst prøv igjen senere."
#: ValidateAccountKey.cpp:68
msgid "Please specify an account key to continue."
-msgstr "Vennligst oppgi kontonøkkel for å fortsette."
+msgstr ""
#: ValidateAccountKey.cpp:71
msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Ugyldig kontonøkkel; vennligst tast inn en gyldig kontonøkkel"
+msgstr ""
#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
msgid "Validation conflict"
-msgstr "Valideringskonflikt"
+msgstr "Validerings konflikt"
#: ValidateEmailAddress.cpp:72
msgid "Please specify an email address"
@@ -2799,7 +2773,7 @@ msgstr "'%s' inneholder ikke en gyldig sti."
#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
#: ViewTransfers.cpp:160 ViewWork.cpp:183
msgid "Commands"
-msgstr "Kommandoer"
+msgstr ""
#: ViewMessages.cpp:88
msgid "Copy all messages"
@@ -2839,11 +2813,11 @@ msgstr "Vis alle meldinger"
#: ViewMessages.cpp:495
msgid "Show messages for all projects."
-msgstr "Vis meldinger fra alle prosjekter."
+msgstr "Vis meldinger fra alle prosjekt."
#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
msgid "Fetching notices; please wait..."
-msgstr "Henter varsler; vennligst vent..."
+msgstr ""
#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
msgid "There are no notices at this time."
@@ -2851,7 +2825,7 @@ msgstr "Det er ingen meldinger."
#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
msgid "Notices"
-msgstr "Varsler"
+msgstr "Meldinger"
#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
msgid "Update"
@@ -2862,8 +2836,6 @@ msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
msgstr ""
-"Rapporter alle utførte oppgaver, hent oversikt over arbeid utført, hent "
-"oppdaterte innstillinger, og last ned flere oppgaver hvis tilgjengelig."
#: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
#: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
@@ -2888,24 +2860,19 @@ msgstr "Ikke hent nye oppgaver for dette prosjektet."
#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
msgid "Reset project"
-msgstr "Nullstill prosjekt"
+msgstr ""
#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
msgid ""
"Delete all files and tasks associated with this project, and get new tasks. "
"You can update the project first to report any completed tasks."
msgstr ""
-"Slett alle filer og oppgaver assosiert med dette prosjektet, og hent nye "
-"oppgaver. Du kan oppdatere prosjektet først for å rapportere fullførte "
-"oppgaver."
#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
msgstr ""
-"Fjern dette prosjektet. Oppgaver i arbeidskøen vil bli slettet (klikk "
-"'Oppdater' først for å rapportere fullførte oppgaver)."
#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
#: sg_TaskCommandPopup.cpp:78
@@ -2942,8 +2909,9 @@ msgstr "Oppdaterer prosjekt..."
# 85%
#: ViewProjects.cpp:344
+#, fuzzy
msgid "Resuming project..."
-msgstr "Gjenopptar prosjekt..."
+msgstr "Suspender prosjekt..."
#: ViewProjects.cpp:348
msgid "Suspending project..."
@@ -2951,30 +2919,32 @@ msgstr "Suspender prosjekt..."
#: ViewProjects.cpp:385
msgid "Telling project to allow additional task downloads..."
-msgstr "Instruerer prosjektet om å tillate nedlastning av ekstra oppgaver..."
+msgstr ""
#: ViewProjects.cpp:389
msgid "Telling project to not fetch any additional tasks..."
-msgstr "Ber prosjektet om ikke å hente ekstra oppgaver..."
+msgstr ""
#: ViewProjects.cpp:425
+#, fuzzy
msgid "Resetting project..."
-msgstr "Nullstiller prosjektet..."
+msgstr "Suspender prosjekt..."
#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
#, c-format
-#, c-format, c-format
+#, fuzzy, c-format
msgid "Are you sure you want to reset project '%s'?"
-msgstr "Er du sikker på at du vil nullstille prosjektet '%s'?"
+msgstr "Er du sikker på at du vil fjerne prosjekt '%s'?"
#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
msgid "Reset Project"
-msgstr "Nullstill prosjekt"
+msgstr ""
# 80%
#: ViewProjects.cpp:483
+#, fuzzy
msgid "Removing project..."
-msgstr "Fjerner prosjekt..."
+msgstr "Suspender prosjekt..."
#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
#, c-format
@@ -2990,8 +2960,9 @@ msgid "Launching browser..."
msgstr "Starter nettleser..."
#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+#, fuzzy
msgid "Resume tasks for this project."
-msgstr "Gjenoppta oppgaver for dette prosjektet."
+msgstr "Suspender oppgaver fra dette prosjektet."
#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
msgid "Allow new tasks"
@@ -2999,40 +2970,42 @@ msgstr "Tillat nye oppgaver"
# 80%
#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+#, fuzzy
msgid "Allow fetching new tasks for this project."
-msgstr "Tillat henting av nye oppgaver for dette prosjektet."
+msgstr "Ikke hent nye oppgaver for dette prosjektet."
#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+#, fuzzy
msgid "Don't fetch new tasks for this project."
msgstr "Ikke hent nye oppgaver for dette prosjektet."
#: ViewProjects.cpp:1058
msgid "Requested by user"
-msgstr "Anmodet av bruker"
+msgstr ""
#: ViewProjects.cpp:1059
msgid "To fetch work"
-msgstr "Å hente arbeid"
+msgstr ""
#: ViewProjects.cpp:1060
msgid "To report completed tasks"
-msgstr "Å rapportere fullførte oppgaver"
+msgstr ""
#: ViewProjects.cpp:1061
msgid "To send trickle-up message"
-msgstr "Å sende godskriv andelsmelding"
+msgstr ""
#: ViewProjects.cpp:1062
msgid "Requested by account manager"
-msgstr "Forespurt av kontobehandler"
+msgstr ""
#: ViewProjects.cpp:1063
msgid "Project initialization"
-msgstr "Initialisering av prosjekt"
+msgstr ""
#: ViewProjects.cpp:1064
msgid "Requested by project"
-msgstr "Anmodet av prosjektet"
+msgstr ""
#: ViewProjects.cpp:1065
msgid "Unknown reason"
@@ -3044,31 +3017,31 @@ msgstr "Suspendert av bruker"
#: ViewProjects.cpp:1082
msgid "Won't get new tasks"
-msgstr "Vil ikke hente nye oppgaver"
+msgstr ""
#: ViewProjects.cpp:1085
msgid "Project ended - OK to remove"
-msgstr "Prosjekt avsluttet - OK å fjerne"
+msgstr ""
#: ViewProjects.cpp:1088
msgid "Will remove when tasks done"
-msgstr "Vil fjerne når oppgaver er ferdige"
+msgstr ""
#: ViewProjects.cpp:1091
msgid "Scheduler request pending"
-msgstr "Forespørsel fra planleggeren venter"
+msgstr ""
#: ViewProjects.cpp:1097
msgid "Scheduler request in progress"
-msgstr "Forespørsel fra planleggeren pågår"
+msgstr ""
#: ViewProjects.cpp:1100
msgid "Trickle up message pending"
-msgstr "Godskriv andelsmelding venter"
+msgstr ""
#: ViewProjects.cpp:1106
msgid "Communication deferred "
-msgstr "Kommunikasjon utsatt "
+msgstr ""
#: ViewResources.cpp:62
msgid "Total disk usage"
@@ -3108,19 +3081,19 @@ msgstr "i bruk av ande progrmmer:"
#: ViewStatistics.cpp:1205
msgid "User Total"
-msgstr "Total for bruker"
+msgstr "Bruker total"
#: ViewStatistics.cpp:1206
msgid "User Average"
-msgstr "Gjennomsnitt for bruker"
+msgstr "Bruker gjennomsnitt"
#: ViewStatistics.cpp:1207
msgid "Host Total"
-msgstr "Total for vert"
+msgstr "Vert total"
#: ViewStatistics.cpp:1208
msgid "Host Average"
-msgstr "Gjennomsnitt for vert"
+msgstr "Vert gjennomsnitt"
#: ViewStatistics.cpp:1355
#, c-format
@@ -3129,35 +3102,35 @@ msgstr "Siste oppdatering: %.0f dager siden"
#: ViewStatistics.cpp:1982
msgid "Show user total"
-msgstr "Vis total for bruker"
+msgstr "Vis bruker total"
#: ViewStatistics.cpp:1983
msgid "Show total credit for user"
-msgstr "Vis totalt arbeid utført for bruker"
+msgstr ""
#: ViewStatistics.cpp:1989
msgid "Show user average"
-msgstr "Vis gjennomsnitt for bruker"
+msgstr "Vis bruker gjennomsnitt"
#: ViewStatistics.cpp:1990
msgid "Show average credit for user"
-msgstr "Vis gjennomsnittlig arbeid utført for bruker"
+msgstr ""
#: ViewStatistics.cpp:1996
msgid "Show host total"
-msgstr "Vis total for vert"
+msgstr "Vis vert total"
#: ViewStatistics.cpp:1997
msgid "Show total credit for host"
-msgstr "Vis totalt arbeid utført for vert"
+msgstr ""
#: ViewStatistics.cpp:2003
msgid "Show host average"
-msgstr "Vis gjennomsnitt for vert"
+msgstr "Vis vert gjennomsnitt"
#: ViewStatistics.cpp:2004
msgid "Show average credit for host"
-msgstr "Vis gjennomsnittlig arbeid utført for vert"
+msgstr ""
#: ViewStatistics.cpp:2013
msgid "< &Previous project"
@@ -3165,7 +3138,7 @@ msgstr "< &Forrige prosjekt"
#: ViewStatistics.cpp:2014
msgid "Show chart for previous project"
-msgstr "Vis diagram for forrige prosjekt"
+msgstr ""
#: ViewStatistics.cpp:2019
msgid "&Next project >"
@@ -3173,19 +3146,19 @@ msgstr "&Neste prosjekt >"
#: ViewStatistics.cpp:2020
msgid "Show chart for next project"
-msgstr "Vis diagram for neste prosjekt"
+msgstr ""
#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
msgid "Hide project list"
-msgstr "Skjul prosjektliste"
+msgstr "Skjul prosjekt liste"
#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
msgid "Use entire area for graphs"
-msgstr "Benytt hele området for grafer"
+msgstr ""
#: ViewStatistics.cpp:2032
msgid "Mode view"
-msgstr "Modusvisning"
+msgstr ""
#: ViewStatistics.cpp:2036
msgid "One project"
@@ -3193,7 +3166,7 @@ msgstr "Et prosjekt"
#: ViewStatistics.cpp:2037
msgid "Show one chart with selected project"
-msgstr "Vis et diagram for valgt prosjekt"
+msgstr ""
#: ViewStatistics.cpp:2043
msgid "All projects (separate)"
@@ -3201,7 +3174,7 @@ msgstr "Alle prosjekt (separat)"
#: ViewStatistics.cpp:2044
msgid "Show all projects, one chart per project"
-msgstr "Vis alle prosjekter, et diagram per prosjekt"
+msgstr ""
#: ViewStatistics.cpp:2050
msgid "All projects (together)"
@@ -3209,7 +3182,7 @@ msgstr "Alle prosjekt (sammen)"
#: ViewStatistics.cpp:2051
msgid "Show one chart with all projects"
-msgstr "Vis et diagram med alle prosjekter"
+msgstr ""
#: ViewStatistics.cpp:2057
msgid "All projects (sum)"
@@ -3217,26 +3190,26 @@ msgstr "Alle prosjekt (sum)"
#: ViewStatistics.cpp:2058
msgid "Show one chart with sum of projects"
-msgstr "Vis et diagram med summen av alle prosjekter"
+msgstr ""
#: ViewStatistics.cpp:2079
msgid "Statistics"
-msgstr "Statistikk"
+msgstr "Statistikk "
#: ViewStatistics.cpp:2103 ViewStatistics.cpp:2124 ViewStatistics.cpp:2145
#: ViewStatistics.cpp:2167 ViewStatistics.cpp:2188 ViewStatistics.cpp:2209
#: ViewStatistics.cpp:2230 ViewStatistics.cpp:2251 ViewStatistics.cpp:2272
#: ViewStatistics.cpp:2296
msgid "Updating charts..."
-msgstr "Oppdaterer diagrammer..."
+msgstr ""
#: ViewStatistics.cpp:2420
msgid "Show project list"
-msgstr "Vis prosjektliste"
+msgstr "Vis prosjekt liste"
#: ViewStatistics.cpp:2420
msgid "Uses smaller area for graphs"
-msgstr "Bruker mindre område for grafer"
+msgstr ""
#: ViewTransfers.cpp:164
msgid "Retry Now"
@@ -3244,7 +3217,7 @@ msgstr "Prøv igjen nå"
#: ViewTransfers.cpp:165
msgid "Retry the file transfer now"
-msgstr "Prøv filoverføring på nytt nå"
+msgstr ""
#: ViewTransfers.cpp:171
msgid "Abort Transfer"
@@ -3252,7 +3225,7 @@ msgstr "Avbryt overføring"
#: ViewTransfers.cpp:172
msgid "Abort this file transfer. You won't get credit for the task."
-msgstr "Avbryt filoverføring. Du vil ikke få poeng for oppgaven."
+msgstr ""
#: ViewTransfers.cpp:183
msgid "File"
@@ -3260,7 +3233,7 @@ msgstr "Fil"
#: ViewTransfers.cpp:184 ViewWork.cpp:233
msgid "Progress"
-msgstr "Fremgang"
+msgstr ""
#: ViewTransfers.cpp:185
msgid "Size"
@@ -3268,7 +3241,7 @@ msgstr "Størrelse"
#: ViewTransfers.cpp:186
msgid "Elapsed Time"
-msgstr "Tid brukt"
+msgstr ""
#: ViewTransfers.cpp:187
msgid "Speed"
@@ -3287,8 +3260,6 @@ msgid ""
".\n"
"You can enable it using the Activity menu."
msgstr ""
-".\n"
-"Du kan aktivere denne ved å benytte menyen for aktiviteter."
#: ViewTransfers.cpp:285
msgid "BOINC"
@@ -3309,9 +3280,6 @@ msgid ""
"NOTE: Aborting a transfer will invalidate a task and you\n"
"will not receive credit for it."
msgstr ""
-"Er du sikker på at du vil avbryte denne filoverføringen '%s'?\n"
-"MERK: Å avbryte en overføring vil ugyldiggjøre en oppgave\n"
-"og du vil ikke motta poeng for den."
#: ViewTransfers.cpp:349
msgid "Abort File Transfer"
@@ -3319,35 +3287,36 @@ msgstr "Avbryt fil overføring"
#: ViewTransfers.cpp:780
msgid "Upload"
-msgstr "Last opp"
+msgstr ""
#: ViewTransfers.cpp:780
msgid "Download"
-msgstr "Last ned"
+msgstr ""
#: ViewTransfers.cpp:784
+#, fuzzy
msgid "retry in "
-msgstr "prøver igjen om "
+msgstr "Prøv igjen om "
#: ViewTransfers.cpp:786
msgid "failed"
-msgstr "mislyktes"
+msgstr ""
#: ViewTransfers.cpp:789
msgid "suspended"
-msgstr "suspendert"
+msgstr ""
#: ViewTransfers.cpp:794
msgid "active"
-msgstr "aktiv"
+msgstr ""
#: ViewTransfers.cpp:796
msgid "pending"
-msgstr "venter"
+msgstr ""
#: ViewTransfers.cpp:803
msgid " (project backoff: "
-msgstr " (prosjekt holder igjen: "
+msgstr ""
#: ViewWork.cpp:187 ViewWork.cpp:777
msgid "Show active tasks"
@@ -3363,19 +3332,20 @@ msgstr "Vis grafikk"
#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
msgid "Show application graphics in a window."
-msgstr "Vis grafikk for applikasjonen i et vindu."
+msgstr ""
#: ViewWork.cpp:201
+#, fuzzy
msgid "Show VM Console"
-msgstr "Vis VM konsollen"
+msgstr "Vis vert total"
#: ViewWork.cpp:202
msgid "Show VM Console in a window."
-msgstr "Vis VM konsollen i et vindu."
+msgstr ""
#: ViewWork.cpp:209
msgid "Suspend work for this result."
-msgstr "Suspender arbeid for dette resultatet."
+msgstr ""
#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
msgid "Abort"
@@ -3383,7 +3353,7 @@ msgstr "Avbryt"
#: ViewWork.cpp:216
msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Gi opp arbeid på grunn av resultatet. Du vil ikke få poeng for det."
+msgstr ""
#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
msgid "Show task details."
@@ -3391,15 +3361,15 @@ msgstr "Vis oppgave detaljer."
#: ViewWork.cpp:235
msgid "Elapsed"
-msgstr "Tid brukt"
+msgstr ""
#: ViewWork.cpp:236
msgid "Remaining (estimated)"
-msgstr "Gjenstår (estimert)"
+msgstr ""
#: ViewWork.cpp:237
msgid "Deadline"
-msgstr "Frist"
+msgstr ""
#: ViewWork.cpp:264
msgid "Tasks"
@@ -3407,19 +3377,19 @@ msgstr "Oppgaver"
#: ViewWork.cpp:357
msgid "Resuming task..."
-msgstr "Gjenopptar oppgave..."
+msgstr ""
#: ViewWork.cpp:360
msgid "Suspending task..."
-msgstr "Suspenderer oppgave..."
+msgstr ""
#: ViewWork.cpp:389
msgid "Showing graphics for task..."
-msgstr "Viser grafikk for oppgave..."
+msgstr ""
#: ViewWork.cpp:426
msgid "Showing VM console for task..."
-msgstr "Viser VM konsollen for oppgave..."
+msgstr ""
#: ViewWork.cpp:479
#, c-format
@@ -3427,13 +3397,11 @@ msgid ""
"Are you sure you want to abort this task '%s'?\n"
"(Progress: %s, Status: %s)"
msgstr ""
-"Er du sikker på at du ønsker å avbryte denne oppgaven '%s'?\n"
-"(Fremgang: %s, Status: %s)"
#: ViewWork.cpp:485
#, c-format
msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Er du sikker på at du ønsker å avbryte disse %d oppgavene?"
+msgstr ""
#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
msgid "Abort task"
@@ -3441,8 +3409,9 @@ msgstr "Avbryt oppgave"
# 75%
#: ViewWork.cpp:499
+#, fuzzy
msgid "Aborting task..."
-msgstr "Avbryter oppgave..."
+msgstr "Avbryter overføring..."
#: ViewWork.cpp:771
msgid "Show all tasks"
@@ -3454,19 +3423,20 @@ msgstr "Vis alle oppgavene."
#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
msgid "Resume work for this task."
-msgstr "Gjenoppta arbeid for denne oppgaven."
+msgstr ""
#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
msgid "Suspend work for this task."
-msgstr "Suspender arbeid for denne oppgaven."
+msgstr ""
#: WelcomePage.cpp:284
+#, fuzzy
msgid "Add project or account manager"
-msgstr "Legg til prosjekt eller kontobehandler"
+msgstr "&Legg til prosjekt eller kontobehandler..."
#: WelcomePage.cpp:288
msgid "Add project or use BOINC Account Manager"
-msgstr "Legg til prosjekt eller bruk BOINC kontobehandler"
+msgstr ""
#: WelcomePage.cpp:297
#, c-format
@@ -3477,11 +3447,6 @@ msgid ""
"Projects added via this wizard will not be\n"
"listed on or managed via %s."
msgstr ""
-"Hvis mulig, legg til prosjekter fra\n"
-"%s nettside.\n"
-"\n"
-"Prosjekter lagt til via denne veilederen vil ikke bli\n"
-"listet i eller administrert via %s."
#: WelcomePage.cpp:313
msgid ""
@@ -3491,11 +3456,6 @@ msgid ""
"You can add a project directly,\n"
"or use an 'Account Manager' web site to select projects."
msgstr ""
-"Det er mer enn 30 BOINC baserte prosjekter\n"
-"som utfører forskning innenfor mange vitenskapelige områder,\n"
-"og du kan delta i så mange av disse du måtte ønske.\n"
-"Du kan legge til et prosjekt med en gang,\n"
-"eller bruke en 'Kontobehandler' nettside for å velge prosjekter."
#: WelcomePage.cpp:325
msgid ""
@@ -3515,24 +3475,10 @@ msgid ""
"\n"
"Please choose which type of change you would like to make:\n"
msgstr ""
-"Du have valgt å legge til et nytt frivillig beregningsprosjekt eller endre "
-"hvilke prosjekter\n"
-"du bidrar til.\n"
-"\n"
-"Noen av disse prosjektene kjøres og administreres av World Community Grid, "
-"mens andre\n"
-"kjøres og administreres av andre forskere eller organisasjoner. BOINC "
-"programvaren\n"
-"kan dele din gjenværende prosessorkraft blant hvilken som helst kombinasjon "
-"av prosjekter.\\Alternativt, hvis du har registrert deg hos en BOINC "
-"kontobehandler kan du bruke\n"
-"denne til å velge hvilke prosjekter du vil støtte.\n"
-"\n"
-"Vennligst velg hvilken type av endringer du ønsker å gjøre:\n"
#: WelcomePage.cpp:339
msgid "Use a BOINC Account Manager"
-msgstr "Bruk en BOINC kontobehandler"
+msgstr ""
#: WelcomePage.cpp:352
msgid "To continue, click Next."
@@ -3540,15 +3486,15 @@ msgstr "For å fortsette, klikk Neste."
#: WelcomePage.cpp:358
msgid "Add or change your World Community Grid projects"
-msgstr "Legg til eller endre dine World Community Grid prosjekter"
+msgstr ""
#: WelcomePage.cpp:361
msgid "Add projects run by other researchers or organizations"
-msgstr "Legg til prosjekter som driftes av andre forskere eller organisasjoner"
+msgstr ""
#: WizardAttach.cpp:634
msgid "Do you really want to cancel?"
-msgstr "Ønsker du virkelig å avbryte?"
+msgstr ""
#: WizardAttach.cpp:635
msgid "Question"
@@ -3564,11 +3510,11 @@ msgstr "Vis det grafisk avanserte brukergrensesnittet."
#: sg_BoincSimpleFrame.cpp:157
msgid "Skin"
-msgstr "Skall"
+msgstr ""
#: sg_BoincSimpleFrame.cpp:159
msgid "Select the appearance of the user interface."
-msgstr "Velg utseende på brukergrensesnittet."
+msgstr ""
#: sg_BoincSimpleFrame.cpp:206
#, c-format
@@ -3576,20 +3522,21 @@ msgid "&%s"
msgstr "&%s"
#: sg_BoincSimpleFrame.cpp:390
+#, fuzzy
msgid "Default"
-msgstr "Standard"
+msgstr "forvalg"
#: sg_BoincSimpleFrame.cpp:759
msgid "Suspend Computing"
-msgstr "Suspender beregning"
+msgstr ""
#: sg_BoincSimpleFrame.cpp:760
msgid "Resume Computing"
-msgstr "Gjenoppta beregning"
+msgstr ""
#: sg_BoincSimpleFrame.cpp:777
msgid "Open a window to view notices from projects or BOINC"
-msgstr "Åpne et vindu for å vise varsler fra prosjekter eller BOINC"
+msgstr ""
#: sg_DlgMessages.cpp:146
msgid "Close"
@@ -3597,39 +3544,35 @@ msgstr "Lukk"
#: sg_DlgMessages.cpp:389
#, c-format
-#, c-format, c-format
+#, fuzzy, c-format
msgid "%s - Notices"
-msgstr "%s - Varsler"
+msgstr "%s Meldinger"
#: sg_DlgPreferences.cpp:268
msgid "This dialog controls preferences for this computer only."
msgstr ""
-"Denne dialogboksen kontrollerer innstillinger kun for denne datamaskinen."
#: sg_DlgPreferences.cpp:273
msgid "Click OK to set preferences."
-msgstr "Klikk OK for å fastsette innstillinger."
+msgstr ""
#: sg_DlgPreferences.cpp:278
msgid ""
"Click Clear to restore web-based settings for all preferences listed below."
msgstr ""
-"Klikk Fjern for å gjenopprette webbaserte innstillinger for alle preferanser "
-"listet nedenfor."
#: sg_DlgPreferences.cpp:285
msgid ""
"For additional settings, select Computing Preferences in the Advanced View."
msgstr ""
-"For ekstra innstillinger, velg Beregningsinnstillinger i Avansert visning."
#: sg_DlgPreferences.cpp:313
msgid "Do work only between:"
-msgstr "Utfør arbeid bare mellom:"
+msgstr ""
#: sg_DlgPreferences.cpp:335
msgid "Connect to internet only between:"
-msgstr "Bare koble til Internet mellom:"
+msgstr ""
#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
msgid "Use no more than:"
@@ -3645,22 +3588,22 @@ msgstr "av prosessoren"
#: sg_DlgPreferences.cpp:391
msgid "Do work while on battery?"
-msgstr "Utfør arbeid på batteridrift?"
+msgstr ""
#: sg_DlgPreferences.cpp:404
msgid "Do work after idle for:"
-msgstr "Utfør arbeid etter inaktiv i:"
+msgstr ""
#: sg_DlgPreferences.cpp:429
msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Fjern alle lokale innstillinger som vist over og lukk dialogboksen"
+msgstr ""
#: sg_DlgPreferences.cpp:602 sg_DlgPreferences.cpp:605
#: sg_DlgPreferences.cpp:681 sg_DlgPreferences.cpp:685
#: sg_DlgPreferences.cpp:697 sg_DlgPreferences.cpp:701
#: sg_DlgPreferences.cpp:844 sg_DlgPreferences.cpp:855
msgid "Anytime"
-msgstr "Når som helst"
+msgstr ""
#: sg_DlgPreferences.cpp:638
msgid "100 MB"
@@ -3727,8 +3670,9 @@ msgid "%d"
msgstr "%d"
#: sg_DlgPreferences.cpp:1029
+#, fuzzy
msgid "Do you really want to clear all local preferences?\n"
-msgstr "Vil du virkelig fjerne alle lokale innstillinger?\n"
+msgstr "Vil du virkelig fjerne alle lokale innstillinger ?"
#: sg_ProjectPanel.cpp:72
msgid "Add Project"
@@ -3740,41 +3684,42 @@ msgstr "Synkroniser"
#: sg_ProjectPanel.cpp:74
msgid "Work done for this project"
-msgstr "Arbeid avsluttet for dette prosjektet"
+msgstr ""
#: sg_ProjectPanel.cpp:77
msgid "Synchronize projects with account manager system"
-msgstr "Synkroniser prosjekter med kontobehandlersystemet"
+msgstr ""
#: sg_ProjectPanel.cpp:124
msgid "Select a project to access with the controls below"
-msgstr "Velg et prosjekt å aksessere med kontrolltavlen nedenfor"
+msgstr ""
#: sg_ProjectPanel.cpp:145
+#, fuzzy
msgid "Project Web Pages"
msgstr "Prosjektets nettsider"
#: sg_ProjectPanel.cpp:149
msgid "Project Commands"
-msgstr "Prosjektkommandoer"
+msgstr ""
#: sg_ProjectPanel.cpp:267
#, c-format
msgid "Pop up a menu of web sites for project %s"
-msgstr "Vis en meny med nettsider for prosjektet %s"
+msgstr ""
#: sg_ProjectPanel.cpp:269
#, c-format
msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Vis meny med kommandoer som skal gjelde for %s prosjektet"
+msgstr ""
#: sg_TaskCommandPopup.cpp:67
msgid "Suspend this task."
-msgstr "Suspender denne oppgaven."
+msgstr ""
#: sg_TaskCommandPopup.cpp:73
msgid "Abandon this task. You will get no credit for it."
-msgstr "Gi opp denne oppgaven. Du vil ikke få poeng for den."
+msgstr ""
#: sg_TaskCommandPopup.cpp:251
#, c-format
@@ -3782,40 +3727,39 @@ msgid ""
"Are you sure you want to abort this task '%s'?\n"
"(Progress: %.1lf%%, Status: %s)"
msgstr ""
-"Er du sikker på at du vil avbryte denne oppgaven '%s'?\n"
-"(Fremgang: %.1lf%%, Status: %s)"
#: sg_TaskPanel.cpp:464
msgid "You don't have any projects. Please Add a Project."
-msgstr "Du har ingen prosjekt. Vennligst legg til et prosjekt."
+msgstr "Du har ingen prosjekt. Vennligst legg til et prosjekt."
#: sg_TaskPanel.cpp:465
msgid "Not available"
msgstr "Ikke tilgjengelig"
#: sg_TaskPanel.cpp:476
+#, fuzzy
msgid "Tasks:"
-msgstr "Oppgaver:"
+msgstr "Oppgaver"
#: sg_TaskPanel.cpp:482
msgid "Select a task to access"
-msgstr "Velg en oppgave for granskning"
+msgstr ""
#: sg_TaskPanel.cpp:493
msgid "From:"
-msgstr "Fra:"
+msgstr ""
#: sg_TaskPanel.cpp:547
msgid "This task's progress"
-msgstr "Denne oppgavens fremgang"
+msgstr ""
#: sg_TaskPanel.cpp:565
msgid "Task Commands"
-msgstr "Oppgavekommandoer"
+msgstr ""
#: sg_TaskPanel.cpp:566
msgid "Pop up a menu of commands to apply to this task"
-msgstr "Vis meny med kommandoer som skal gjelde for denne oppgaven"
+msgstr ""
#: sg_TaskPanel.cpp:701
#, c-format
@@ -3825,7 +3769,7 @@ msgstr "Applikasjon: %s"
#: sg_TaskPanel.cpp:724
#, c-format
msgid "%.3f%%"
-msgstr "%.3f%%"
+msgstr ""
#: sg_TaskPanel.cpp:732
msgid "Application: Not available"
@@ -3838,12 +3782,12 @@ msgstr "Ikke tilgjengelig"
#: sg_TaskPanel.cpp:847
#, c-format
msgid "Elapsed: %s"
-msgstr "Tid brukt: %s"
+msgstr ""
#: sg_TaskPanel.cpp:861
#, c-format
msgid "Remaining (estimated): %s"
-msgstr "Gjenstår (estimert): %s"
+msgstr ""
#: sg_TaskPanel.cpp:876
#, c-format
@@ -3852,7 +3796,7 @@ msgstr "Status: %s"
#: sg_TaskPanel.cpp:1223
msgid "Retrieving current status."
-msgstr "Henter gjeldende status."
+msgstr ""
#: sg_TaskPanel.cpp:1229
msgid "Downloading work from the server."
@@ -3860,23 +3804,23 @@ msgstr "Laster ned arbeid fra tjeneren."
#: sg_TaskPanel.cpp:1234
msgid "Processing Suspended: Running On Batteries."
-msgstr "Prosessering suspendert: Kjører på batterier."
+msgstr "Prosessering suspendert: Kjører på batterier."
#: sg_TaskPanel.cpp:1236
msgid "Processing Suspended: User Active."
-msgstr "Prosessering suspendert: Bruker aktiv."
+msgstr "Prosessering suspendert:Bruker aktiv."
#: sg_TaskPanel.cpp:1238
msgid "Processing Suspended: User paused processing."
-msgstr "Prosessering suspendert: Bruker har pauset prosessering."
+msgstr "Prosessering suspendert: Bruker har satt prosessering på pause."
#: sg_TaskPanel.cpp:1240
msgid "Processing Suspended: Time of Day."
-msgstr "Prosessering suspendert: Tid på dag."
+msgstr "Prosessering suspendert: Tid på dag."
#: sg_TaskPanel.cpp:1242
msgid "Processing Suspended: Benchmarks Running."
-msgstr "Prosessering suspendert: Ytelsestest kjører."
+msgstr "Prosessering suspendert: Ytelsestest kjører."
#: sg_TaskPanel.cpp:1244
msgid "Processing Suspended."
@@ -3888,7 +3832,7 @@ msgstr "Venter på kontakt med prosjekt tjener."
#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
msgid "Retrieving current status"
-msgstr "Henter gjeldende status"
+msgstr ""
#: sg_TaskPanel.cpp:1256
msgid "No work available to process"
@@ -3896,7 +3840,7 @@ msgstr "Ingen arbeid tilgjengelig for prosessering"
#: sg_TaskPanel.cpp:1258
msgid "Unable to connect to the core client"
-msgstr "Kan ikke koble til kjerneklienten"
+msgstr ""
#: wizardex.cpp:377 wizardex.cpp:553
msgid "&Next >"
@@ -3916,7 +3860,7 @@ msgstr "Instillinger..."
#: mac/Mac_GUI.cpp:122
msgid "Services"
-msgstr "Tjenester"
+msgstr ""
#: mac/Mac_GUI.cpp:144
#, c-format
diff --git a/locale/nb/BOINC-Project-Generic.po b/locale/nb/BOINC-Project-Generic.po
index 32a9686..ced9db5 100644
--- a/locale/nb/BOINC-Project-Generic.po
+++ b/locale/nb/BOINC-Project-Generic.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: BOINC-prject-generic\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-09-02 03:56+0000\n"
-"Last-Translator: Jan <jan at sherdahl.com>\n"
+"PO-Revision-Date: 2012-09-16 13:49+0000\n"
+"Last-Translator: Kenneth <kenneth at skjold.biz>\n"
"Language-Team: Hjelp andre <kenneth at skjold.biz>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1409630204.0\n"
+"X-POOTLE-MTIME: 1347803390.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "English"
@@ -27,15 +27,15 @@ msgstr "English"
#: ../inc/bbcode_html.inc:11
msgid "Bold text: [b]text[/b] (alt+b)"
-msgstr "Uthevet tekst: [b]tekst[/b] (alt+b) "
+msgstr ""
#: ../inc/bbcode_html.inc:14
msgid "Italic text: [i]text[/i] (alt+i)"
-msgstr "Kursiv tekst: [i]tekst[/i] (alt+i) "
+msgstr ""
#: ../inc/bbcode_html.inc:17
msgid "Underline text: [u]text[/u] (alt+u)"
-msgstr "Understreket tekst: [u]tekst[/u] (alt+u) "
+msgstr ""
#: ../inc/bbcode_html.inc:20
msgid "Quote text: [quote]text[/quote] (alt+q)"
@@ -47,7 +47,7 @@ msgstr ""
#: ../inc/bbcode_html.inc:26
msgid "List: [list]text[/list] (alt+l)"
-msgstr "Liste: [list]tekst[/list] (alt+l) "
+msgstr ""
#: ../inc/bbcode_html.inc:29
msgid "Ordered list: [list=]text[/list] (alt+o)"
@@ -55,7 +55,7 @@ msgstr ""
#: ../inc/bbcode_html.inc:32
msgid "Insert image: [img]http://image_url[/img] (alt+p)"
-msgstr "Sett inn bilde: [img]http://image_url[/img] (alt+p) "
+msgstr ""
#: ../inc/bbcode_html.inc:35
msgid ""
@@ -64,7 +64,7 @@ msgstr ""
#: ../inc/bbcode_html.inc:42
msgid "Font color"
-msgstr "Skriftfarge"
+msgstr ""
#: ../inc/bbcode_html.inc:43
msgid ""
@@ -77,11 +77,11 @@ msgstr "Forvalg"
#: ../inc/bbcode_html.inc:45
msgid "Dark Red"
-msgstr "Mørkerød"
+msgstr ""
#: ../inc/bbcode_html.inc:46
msgid "Red"
-msgstr "Rød"
+msgstr ""
#: ../inc/bbcode_html.inc:47
#, fuzzy
@@ -90,32 +90,31 @@ msgstr "Endre"
#: ../inc/bbcode_html.inc:48
msgid "Brown"
-msgstr "Brun"
+msgstr ""
#: ../inc/bbcode_html.inc:49
msgid "Yellow"
-msgstr "Gul"
+msgstr ""
#: ../inc/bbcode_html.inc:50
msgid "Green"
-msgstr "Grønn"
+msgstr ""
#: ../inc/bbcode_html.inc:51
-#, fuzzy
msgid "Olive"
-msgstr "Oliven"
+msgstr ""
#: ../inc/bbcode_html.inc:52
msgid "Cyan"
-msgstr "Turkis"
+msgstr ""
#: ../inc/bbcode_html.inc:53
msgid "Blue"
-msgstr "Blå"
+msgstr ""
#: ../inc/bbcode_html.inc:54
msgid "Dark Blue"
-msgstr "Mørkeblå"
+msgstr ""
#: ../inc/bbcode_html.inc:55
msgid "Indigo"
@@ -123,32 +122,31 @@ msgstr ""
#: ../inc/bbcode_html.inc:56
msgid "Violet"
-msgstr "Fiolett"
+msgstr ""
#: ../inc/bbcode_html.inc:57
msgid "Font size"
-msgstr "Skriftstørrelse"
+msgstr ""
#: ../inc/bbcode_html.inc:58
msgid "Font size: [size=x-small]small text[/size]"
-msgstr "Skriftstørrelse: [size=x-small]Liten tekst[/size]"
+msgstr ""
#: ../inc/bbcode_html.inc:60
msgid "Small"
-msgstr "Liten"
+msgstr ""
#: ../inc/bbcode_html.inc:61
msgid "Normal"
-msgstr "Normal"
+msgstr ""
#: ../inc/bbcode_html.inc:62
msgid "Large"
-msgstr "Stor"
+msgstr ""
#: ../inc/bbcode_html.inc:65
-#, fuzzy
msgid "Close all open bbCode tags"
-msgstr "Avslutt alle åpne bbCode tagger"
+msgstr ""
#: ../inc/bbcode_html.inc:65
msgid "Close Tags"
@@ -163,23 +161,20 @@ msgid "Newest first"
msgstr "Nyeste først"
#: ../inc/forum.inc:39
-#, fuzzy
msgid "Highest rated posts first"
-msgstr "Høyest rangerte innlegg først"
+msgstr ""
#: ../inc/forum.inc:41
msgid "Newest post first"
msgstr "Nyeste post først"
#: ../inc/forum.inc:42
-#, fuzzy
msgid "Most views first"
-msgstr "Flest visninger først"
+msgstr ""
#: ../inc/forum.inc:43
-#, fuzzy
msgid "Most posts first"
-msgstr "Flest innlegg først"
+msgstr ""
#: ../inc/forum.inc:125
msgid "Search for words in forum messages"
@@ -216,11 +211,11 @@ msgstr "%1 oppslagstavle"
#: ../inc/forum.inc:245 ../inc/result.inc:695
msgid "Previous"
-msgstr "Forrige"
+msgstr ""
#: ../inc/forum.inc:283 ../inc/result.inc:704
msgid "Next"
-msgstr "Neste"
+msgstr ""
#: ../inc/forum.inc:412 ../inc/forum.inc:1175 ../user/forum_forum.php:137
#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
@@ -235,41 +230,47 @@ msgid "Message"
msgstr "Melding"
#: ../inc/forum.inc:580
+#, fuzzy
msgid "Send message"
-msgstr "Send melding"
+msgstr "Send melding"
#: ../inc/forum.inc:580
+#, fuzzy
msgid "Send %1 a private message"
-msgstr "Send %1 en privat melding"
+msgstr "Send en privat melding"
#: ../inc/forum.inc:581
msgid "Joined: %1"
-msgstr "Sammenslått: %1"
+msgstr ""
#: ../inc/forum.inc:590
+#, fuzzy
msgid "Posts: %1"
-msgstr "Innlegg: %1"
+msgstr "Innlegg"
#: ../inc/forum.inc:596
+#, fuzzy
msgid "Credit: %1"
-msgstr "Poeng: %1"
+msgstr "Lag"
#: ../inc/forum.inc:597
-#, fuzzy
msgid "RAC: %1"
-msgstr "GAU: %1"
+msgstr ""
#: ../inc/forum.inc:620
+#, fuzzy
msgid "You haven't read this message yet"
-msgstr "Du har ikke lest denne meldingen enda"
+msgstr "Du har ingen private meldinger."
#: ../inc/forum.inc:620
+#, fuzzy
msgid "Unread"
-msgstr "Ulest"
+msgstr "ulest"
#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
+#, fuzzy
msgid "Message %1"
-msgstr "Melding %1"
+msgstr "Melding"
#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
msgid "hidden"
@@ -278,7 +279,7 @@ msgstr "skjult"
#: ../inc/forum.inc:625
#, fuzzy
msgid "Posted: %1"
-msgstr "Postet: %1"
+msgstr "Innlegg"
#: ../inc/forum.inc:628
msgid " - in response to "
@@ -289,91 +290,87 @@ msgid "Edit"
msgstr "Rediger"
#: ../inc/forum.inc:631
+#, fuzzy
msgid "Edit this message"
-msgstr "Rediger denne meldingen"
+msgstr "Redigere din profil"
#: ../inc/forum.inc:637
+#, fuzzy
msgid "Last modified: %1"
-msgstr "Sist endret: %1"
+msgstr "Innstillinger sist endret:"
#: ../inc/forum.inc:640
msgid ""
"This post is not shown because the sender is on your 'ignore' list. Click %"
"1here%2 to view this post"
msgstr ""
-"Dette innlegget vises ikke fordi avsender er på din 'ignoreringsliste'. "
-"Klikk %1her%2 for å vise innlegget"
#: ../inc/forum.inc:668 ../inc/forum.inc:679
msgid "Report this post as offensive"
-msgstr "Rapporter dette innlegget som støtende"
+msgstr ""
#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#, fuzzy
msgid "Report as offensive"
-msgstr "Rapporter som støtende"
+msgstr "Siste innlegg"
#: ../inc/forum.inc:672
-#, fuzzy
msgid "Rating: %1"
-msgstr "Rangering: %1"
+msgstr ""
#: ../inc/forum.inc:672
msgid "rate: "
-msgstr "bedøm: "
+msgstr ""
# 83%
#: ../inc/forum.inc:675
#, fuzzy
msgid "Click if you like this message"
-msgstr " Klikk hvis du liker denne meldingen"
+msgstr "Kunne ikke lage melding"
#: ../inc/forum.inc:675
-#, fuzzy
msgid "Rate +"
-msgstr "Bedøm +"
+msgstr ""
#: ../inc/forum.inc:677
#, fuzzy
msgid "Click if you don't like this message"
-msgstr "Klikk hvis du ikke liker denne meldingen"
+msgstr "Kunne ikke lage melding"
#: ../inc/forum.inc:677
-#, fuzzy
msgid "Rate -"
-msgstr "Bedøm -"
+msgstr ""
#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
msgid "Reply"
msgstr "Svar"
#: ../inc/forum.inc:685
-#, fuzzy
msgid "Post a reply to this message"
-msgstr "Svar på denne meldingen"
+msgstr ""
#: ../inc/forum.inc:687
#, fuzzy
msgid "Quote"
-msgstr "Sitat"
+msgstr "Forlat team"
#: ../inc/forum.inc:687
-#, fuzzy
msgid "Post a reply by quoting this message"
-msgstr "Svar på denne meldingen"
+msgstr ""
#: ../inc/forum.inc:708
-#, fuzzy
msgid "Hidden by a moderator"
-msgstr "Skjult av en moderator"
+msgstr ""
#: ../inc/forum.inc:729
+#, fuzzy
msgid "Posted %1 by %2"
-msgstr "Postet %1 av %2"
+msgstr "Innlegg"
#: ../inc/forum.inc:747
#, fuzzy
msgid "You may not post or rate messages until %1"
-msgstr "Du kan ikke legge til eller rangere meldinger før %1"
+msgstr "Du har ingen private meldinger."
#: ../inc/forum.inc:758
msgid ""
@@ -395,27 +392,30 @@ msgstr ""
#: ../inc/forum.inc:780
msgid "Rules:"
-msgstr "Regler:"
+msgstr ""
#: ../inc/forum.inc:781
+#, fuzzy
msgid "More info"
-msgstr "Mer informasjon"
+msgstr "Team info"
#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
msgid "Unhide"
-msgstr "Vis"
+msgstr ""
#: ../inc/forum.inc:1055
+#, fuzzy
msgid "Unhide this post"
-msgstr "Vis dette innlegget"
+msgstr "Lås opp denne tråden"
#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
msgid "Hide"
msgstr "Skjul"
#: ../inc/forum.inc:1057
+#, fuzzy
msgid "Hide this post"
-msgstr "Skjul dette innlegget"
+msgstr "Skjul"
#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
msgid "Move"
@@ -423,31 +423,28 @@ msgstr "&Flytt"
#: ../inc/forum.inc:1062
msgid "Move post to a different thread"
-msgstr "Flytt innlegg til en annen tråd"
+msgstr ""
#: ../inc/forum.inc:1067
+#, fuzzy
msgid "Banish author"
-msgstr "Forvis forfatter"
+msgstr "Ingen slik bruker"
#: ../inc/forum.inc:1074
-#, fuzzy
msgid "Vote to banish author"
-msgstr "Stem for å forvise forfatter"
+msgstr ""
#: ../inc/forum.inc:1078
-#, fuzzy
msgid "Vote not to banish author"
-msgstr "Stem for ikke å forvise forfatter"
+msgstr ""
#: ../inc/forum.inc:1083
-#, fuzzy
msgid "Start vote to banish author"
-msgstr "Start avstemming for å forvise forfatter"
+msgstr ""
#: ../inc/forum.inc:1116
-#, fuzzy
msgid "Only team members can post to the team message board"
-msgstr "Bare teammedlemmer kan poste innlegg på teamets diskusjonsforum"
+msgstr ""
#: ../inc/forum.inc:1126
msgid ""
@@ -468,18 +465,14 @@ msgstr ""
"systemet"
#: ../inc/forum.inc:1140
-#, fuzzy
msgid ""
"This thread is locked. Only forum moderators and administrators are allowed "
"to post there."
msgstr ""
-"Denne tråden er stengt. Bare forumets moderatorer og administratorer har "
-"tillatelse til å poste innlegg der."
#: ../inc/forum.inc:1145
-#, fuzzy
msgid "Can't post to a hidden thread."
-msgstr "Kan ikke poste til en skjult tråd."
+msgstr ""
#: ../inc/forum.inc:1173
msgid "Thread"
@@ -500,12 +493,14 @@ msgid "Last post"
msgstr "Siste innlegg"
#: ../inc/forum.inc:1235
+#, fuzzy
msgid "New posts in the thread %1"
-msgstr "Nye innlegg i tråden %1"
+msgstr "Post til tråd"
#: ../inc/forum.inc:1240
+#, fuzzy
msgid "New posts in subscribed thread"
-msgstr "Nye innlegg i tråden du abonnerer på"
+msgstr "Abonnér"
#: ../inc/forum.inc:1241
msgid "There are new posts in the thread '%1'"
@@ -516,8 +511,9 @@ msgid "Mark all threads as read"
msgstr "Merk alle trådene som lest"
#: ../inc/forum.inc:1252
+#, fuzzy
msgid "Mark all threads in all message boards as read."
-msgstr "Merk alle tråder i alle diskusjonsforum som 'lest'."
+msgstr "Merk alle trådene i alle meldings-tavler som 'lest'."
#: ../inc/host.inc:24
msgid "No host"
@@ -542,7 +538,7 @@ msgstr "Skole"
#: ../inc/host.inc:59
msgid "Mobile"
-msgstr "Mobil"
+msgstr ""
#: ../inc/host.inc:61 ../user/edit_forum_preferences_form.php:172
#: ../user/edit_forum_preferences_form.php:173
@@ -551,7 +547,7 @@ msgstr "Oppdater"
#: ../inc/host.inc:85
msgid "Computer information"
-msgstr "Datamaskininformasjon"
+msgstr "Datamaskin informasjon"
#: ../inc/host.inc:89 ../inc/host.inc:94
msgid "IP address"
@@ -559,11 +555,11 @@ msgstr "IP adresse"
#: ../inc/host.inc:89
msgid "(same the last %1 times)"
-msgstr "(lik de siste %1 ganger)"
+msgstr ""
#: ../inc/host.inc:91
msgid "External IP address"
-msgstr "Ekstern IP adresse"
+msgstr ""
#: ../inc/host.inc:94
msgid "Show IP address"
@@ -571,11 +567,11 @@ msgstr "Vis IP adresse"
#: ../inc/host.inc:96
msgid "Domain name"
-msgstr "Domenenavn"
+msgstr "Domene navn"
#: ../inc/host.inc:98
msgid "Product name"
-msgstr "Produktnavn"
+msgstr ""
#: ../inc/host.inc:102
msgid "Local Standard Time"
@@ -606,12 +602,12 @@ msgstr "Opprettet"
#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
#: ../user/top_users.php:59 ../user/user_search.php:140
msgid "Total credit"
-msgstr "Totalt arbeid utført"
+msgstr "Total kreditt"
#: ../inc/host.inc:114 ../inc/user.inc:125 ../user/team_search.php:70
#: ../user/user_search.php:139
msgid "Average credit"
-msgstr "Gjennomsnittlig arbeid utført"
+msgstr "Gjennomsnittlig kreditt"
#: ../inc/host.inc:116
msgid "Cross project credit"
@@ -619,15 +615,16 @@ msgstr ""
#: ../inc/host.inc:118
msgid "CPU type"
-msgstr "Prosessortype"
+msgstr "CPU type"
#: ../inc/host.inc:119
msgid "Number of processors"
msgstr "Antall prosessorer"
#: ../inc/host.inc:121
+#, fuzzy
msgid "Coprocessors"
-msgstr "Støtteprosessorer"
+msgstr "prosessorer"
#: ../inc/host.inc:123 ../inc/host.inc:687
msgid "Operating System"
@@ -655,7 +652,7 @@ msgstr "%1 KB"
#: ../inc/host.inc:140
msgid "Swap space"
-msgstr "Veksleminne"
+msgstr ""
#: ../inc/host.inc:143
msgid "Total disk space"
@@ -671,19 +668,19 @@ msgstr "Ledig diskplass"
#: ../inc/host.inc:150
msgid "Measured floating point speed"
-msgstr "Målt flyttallshastighet"
+msgstr ""
#: ../inc/host.inc:150 ../inc/host.inc:153
msgid "%1 million ops/sec"
-msgstr "%1 millioner operasjoner per sekund"
+msgstr ""
#: ../inc/host.inc:153
msgid "Measured integer speed"
-msgstr "Målt heltallshastighet"
+msgstr ""
#: ../inc/host.inc:157 ../inc/host.inc:159
msgid "Average upload rate"
-msgstr "Gjennomsnittlig opplastingshastighet"
+msgstr "Gjennomsnittlig opplastingshastighet "
#: ../inc/host.inc:157 ../inc/host.inc:164
msgid "%1 KB/sec"
@@ -711,7 +708,7 @@ msgstr "%1 dager"
#: ../inc/host.inc:170
msgid "Application details"
-msgstr "Programdetaljer"
+msgstr "Program detaljer"
#: ../inc/host.inc:171
msgid "Show"
@@ -722,18 +719,18 @@ msgid "Tasks"
msgstr "Oppgaver"
#: ../inc/host.inc:185 ../inc/host.inc:206
+#, fuzzy
msgid "Number of times client has contacted server"
-msgstr "Antall ganger klient har kontaktet tjener"
+msgstr "Antall ganger BOINC har kontaktet tjener"
#: ../inc/host.inc:186
-#, fuzzy
msgid "Last time contacted server"
-msgstr "Server sist kontaktet"
+msgstr ""
#: ../inc/host.inc:187
#, php-format
msgid "% of time BOINC is running"
-msgstr "% av tiden BOINC kjører"
+msgstr ""
#: ../inc/host.inc:189
#, php-format
@@ -747,7 +744,7 @@ msgstr ""
#: ../inc/host.inc:193
msgid "Average CPU efficiency"
-msgstr "Gjennomsnittlig prosessoreffektivitet"
+msgstr ""
#: ../inc/host.inc:196
msgid "Task duration correction factor"
@@ -783,9 +780,8 @@ msgid "Rank"
msgstr "Plassering"
#: ../inc/host.inc:225 ../inc/host.inc:679
-#, fuzzy
msgid "Avg. credit"
-msgstr "Gj.sn. arbeid"
+msgstr ""
#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
@@ -794,12 +790,12 @@ msgstr "Gj.sn. arbeid"
#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
#: ../user/top_users.php:58
msgid "Recent average credit"
-msgstr "Gjennomsnitt nylig arbeid utført"
+msgstr "Nylig gjennomsnitts kreditt"
#: ../inc/host.inc:236 ../inc/host.inc:684 ../inc/result.inc:51
#: ../user/host_app_versions.php:25
msgid "CPU"
-msgstr "Prosessor"
+msgstr "CPU"
#: ../inc/host.inc:237 ../inc/host.inc:685
msgid "GPU"
@@ -810,9 +806,8 @@ msgid "Operating system"
msgstr "Operativsystem"
#: ../inc/host.inc:315
-#, fuzzy
msgid "(%1 processors)"
-msgstr "(%1 prosessorer)"
+msgstr ""
#: ../inc/host.inc:335
msgid "Details"
@@ -847,23 +842,20 @@ msgid "Merging host %1 into host %2"
msgstr "Flett vert %1 inn i vert %2"
#: ../inc/host.inc:618
-#, fuzzy
msgid "Couldn't update credit of new computer"
-msgstr "Kunne ikke oppdatere poengene til ny datamaskin"
+msgstr ""
#: ../inc/host.inc:622
msgid "Couldn't update results"
msgstr "Kunne ikke oppdatere resultater"
#: ../inc/host.inc:627
-#, fuzzy
msgid "Couldn't retire old computer"
-msgstr "Kunne ikke pensjonere gammel datamaskin"
+msgstr ""
#: ../inc/host.inc:629
-#, fuzzy
msgid "Retired old computer %1"
-msgstr "Pensjonert gammel datamaskin %1"
+msgstr ""
#: ../inc/host.inc:652 ../inc/host.inc:655
msgid "Show:"
@@ -894,14 +886,12 @@ msgid "BOINC<br>version"
msgstr "BOINC<br>versjon"
#: ../inc/host.inc:745 ../user/merge_by_name.php:65
-#, fuzzy
msgid "Merge computers by name"
-msgstr "Slå sammen datamaskiner på navn"
+msgstr ""
#: ../inc/language_names.inc:61
-#, fuzzy
msgid "Browser default"
-msgstr "Standard utforsker"
+msgstr ""
#: ../inc/news.inc:40
msgid "Comment"
@@ -935,8 +925,9 @@ msgid "Preview"
msgstr "Forhåndsvisning"
#: ../inc/pm.inc:48 ../user/pm.php:131
+#, fuzzy
msgid "no such message"
-msgstr "Ingen slik melding"
+msgstr "Ingen slik bruker"
#: ../inc/pm.inc:82
msgid "To"
@@ -955,9 +946,8 @@ msgid "Send message"
msgstr "Send melding"
#: ../inc/pm.inc:121
-#, fuzzy
msgid "sent you a private message; subject:"
-msgstr "sendte deg en privat melding; emne:"
+msgstr ""
#: ../inc/pm.inc:127
msgid "Private message%1 from %2, subject:"
@@ -980,27 +970,22 @@ msgid "unread"
msgstr "ulest"
#: ../inc/pm.inc:186
-#, fuzzy
msgid "For email notification, %1edit community prefs%2"
-msgstr "For epostvarsel, %1rediger innstillinger for gruppen%2"
+msgstr ""
#: ../inc/pm.inc:198
msgid "Private message"
msgstr "Private meldinger"
#: ../inc/prefs.inc:77
-#, fuzzy
msgid ""
"Suspend work while computer is on battery power? %1 Matters only for "
"portable computers %2"
msgstr ""
-"Suspender arbeid ved batteridrift? %1 Har betydning kun for bærbare "
-"datamaskiner %2"
#: ../inc/prefs.inc:85
-#, fuzzy
msgid "Suspend work while computer is in use?"
-msgstr "Suspendere arbeid når datamaskinen er i bruk?"
+msgstr ""
#: ../inc/prefs.inc:91
msgid ""
@@ -1143,9 +1128,8 @@ msgid "Maximum upload rate:"
msgstr "Maksimum opplastingshastighet:"
#: ../inc/prefs.inc:259
-#, fuzzy
msgid "Use network only between the hours of"
-msgstr "Bruk nettverk bare mellom klokken"
+msgstr ""
#: ../inc/prefs.inc:263
msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
@@ -1211,21 +1195,20 @@ msgstr ""
#: ../inc/prefs.inc:387
msgid "Disk and memory usage"
-msgstr "Disk- og minnebruk"
+msgstr "Disk og minne bruk"
#: ../inc/prefs.inc:388
msgid "Processor usage"
-msgstr "Prosessorbruk"
+msgstr "Prosessor bruk"
#: ../inc/prefs.inc:389
msgid "Network usage"
-msgstr "Nettverksbruk"
+msgstr "Nettverk bruk"
#: ../inc/prefs.inc:392
-#, fuzzy
msgid ""
"These preferences apply to all the BOINC projects in which you participate."
-msgstr "Disse innstillingene gjelder for alle BOINC prosjektene du deltar i."
+msgstr ""
#: ../inc/prefs.inc:395
msgid ""
@@ -1293,9 +1276,8 @@ msgid "Project specific settings"
msgstr "Prosjekt spesifikke innstillinger"
#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
-#, fuzzy
msgid "Primary (default) preferences"
-msgstr "Primære (standard) innstillinger"
+msgstr ""
#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
@@ -1405,7 +1387,7 @@ msgstr "ATI GPU"
#: ../inc/result.inc:57 ../user/host_app_versions.php:28
msgid "Intel GPU"
-msgstr "Intel GPU"
+msgstr ""
#: ../inc/result.inc:65
msgid "Not in DB"
@@ -1433,14 +1415,13 @@ msgstr ""
#: ../inc/result.inc:118 ../inc/result.inc:268
msgid "Valid"
-msgstr "Gyldig"
+msgstr ""
#: ../inc/result.inc:119 ../inc/result.inc:271
msgid "Invalid"
-msgstr "Ugyldig"
+msgstr ""
#: ../inc/result.inc:120 ../inc/result.inc:209
-#, fuzzy
msgid "Error"
msgstr "Feilet"
@@ -1450,88 +1431,80 @@ msgstr "Inaktiv"
#: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
msgid "Unsent"
-msgstr "Ikke sent"
+msgstr "Usent"
#: ../inc/result.inc:181
-#, fuzzy
msgid "Completed, waiting for validation"
-msgstr "Ferdig, venter på validering"
+msgstr ""
#: ../inc/result.inc:182
-#, fuzzy
msgid "Completed and validated"
-msgstr "Ferdig og validert"
+msgstr ""
#: ../inc/result.inc:183
msgid "Completed, marked as invalid"
msgstr ""
#: ../inc/result.inc:184
-#, fuzzy
msgid "Completed, can't validate"
-msgstr "Ferdig, kan ikke validere"
+msgstr ""
#: ../inc/result.inc:185
msgid "Completed, validation inconclusive"
msgstr ""
#: ../inc/result.inc:186
-#, fuzzy
msgid "Completed, too late to validate"
-msgstr "Ferdig, for sent å validere"
+msgstr ""
#: ../inc/result.inc:188
msgid "Completed"
-msgstr "Ferdig"
+msgstr ""
#: ../inc/result.inc:189 ../inc/result.inc:233 ../user/explain_state.php:62
msgid "Couldn't send"
-msgstr "Kunne ikke sende"
+msgstr ""
#: ../inc/result.inc:194 ../inc/result.inc:257
-#, fuzzy
msgid "Cancelled by server"
-msgstr "Avbrutt av server"
+msgstr ""
#: ../inc/result.inc:199
msgid "Not started by deadline - canceled"
msgstr ""
#: ../inc/result.inc:202
-#, fuzzy
msgid "Error while downloading"
-msgstr "Feil under nedlasting"
+msgstr ""
#: ../inc/result.inc:204
-#, fuzzy
msgid "Error while computing"
-msgstr "Feil oppsto ved beregning"
+msgstr ""
#: ../inc/result.inc:205
-#, fuzzy
msgid "Error while uploading"
-msgstr "Feil under nedlasting"
+msgstr ""
#: ../inc/result.inc:206 ../inc/result.inc:259
msgid "Aborted by user"
msgstr ""
#: ../inc/result.inc:207 ../inc/result.inc:260
+#, fuzzy
msgid "Upload failed"
-msgstr "Opplasting feilet"
+msgstr "Oppdatering feilet:"
#: ../inc/result.inc:210
msgid "Timed out - no response"
msgstr ""
#: ../inc/result.inc:211 ../inc/result.inc:240 ../user/explain_state.php:71
-#, fuzzy
msgid "Didn't need"
-msgstr "Trengte ikke"
+msgstr ""
#: ../inc/result.inc:212 ../inc/result.inc:241 ../user/explain_state.php:74
msgid "Validate error"
-msgstr "Valideringsfeil"
+msgstr ""
#: ../inc/result.inc:213 ../inc/result.inc:242
msgid "Abandoned"
@@ -1539,16 +1512,16 @@ msgstr ""
#: ../inc/result.inc:224 ../user/explain_state.php:43
msgid "Over"
-msgstr "Over"
+msgstr ""
#: ../inc/result.inc:232 ../user/explain_state.php:59
-#, fuzzy
msgid "Success"
-msgstr "Lyktes"
+msgstr ""
#: ../inc/result.inc:236
+#, fuzzy
msgid "Computation error"
-msgstr "Beregningsfeil"
+msgstr "Datamaskiner"
#: ../inc/result.inc:238
msgid "Redundant result"
@@ -1556,32 +1529,32 @@ msgstr ""
#: ../inc/result.inc:239 ../user/explain_state.php:68
msgid "No reply"
-msgstr "Ikke svar"
+msgstr ""
#: ../inc/result.inc:249 ../user/explain_state.php:85
msgid "New"
-msgstr "Ny"
+msgstr ""
#: ../inc/result.inc:250 ../user/explain_state.php:91
msgid "Downloading"
-msgstr "Laster ned"
+msgstr ""
#: ../inc/result.inc:251
msgid "Processing"
-msgstr "Prosesserer"
+msgstr ""
#: ../inc/result.inc:252
-#, fuzzy
msgid "Compute error"
-msgstr "Prosesseringsfeil"
+msgstr ""
#: ../inc/result.inc:253 ../user/explain_state.php:97
msgid "Uploading"
-msgstr "Laster opp"
+msgstr ""
#: ../inc/result.inc:254 ../user/explain_state.php:88
+#, fuzzy
msgid "Done"
-msgstr "Ferdig"
+msgstr "Ingen"
#: ../inc/result.inc:267
msgid "Initial"
@@ -1589,7 +1562,7 @@ msgstr ""
#: ../inc/result.inc:273
msgid "Not necessary"
-msgstr "Ikke nødvendig"
+msgstr ""
#: ../inc/result.inc:274
msgid "Workunit error - check skipped"
@@ -1605,11 +1578,11 @@ msgstr ""
#: ../inc/result.inc:302
msgid "Couldn't send result"
-msgstr "Kunne ikke sende resultat"
+msgstr ""
#: ../inc/result.inc:306
msgid "Too many errors (may have bug)"
-msgstr "For mange feil (kan ha programvarefeil)"
+msgstr ""
#: ../inc/result.inc:310
msgid "Too many results (may be nondeterministic)"
@@ -1629,85 +1602,89 @@ msgstr ""
#: ../inc/result.inc:349
msgid "Task name"
-msgstr "Oppgavenavn"
+msgstr ""
#: ../inc/result.inc:349 ../inc/result.inc:354 ../inc/result.inc:357
#: ../inc/result.inc:360
msgid "click for details"
-msgstr "klikk for detaljer"
+msgstr ""
#: ../inc/result.inc:349
-#, fuzzy
msgid "Show IDs"
-msgstr "Vis IDs"
+msgstr ""
#: ../inc/result.inc:354
msgid "Show names"
-msgstr "Vis navn"
+msgstr ""
#: ../inc/result.inc:357
+#, fuzzy
msgid "Task"
-msgstr "Oppgave"
+msgstr "Oppgaver"
#: ../inc/result.inc:360
msgid "Work unit"
-msgstr "Arbeidsenhet"
+msgstr ""
#: ../inc/result.inc:369
+#, fuzzy
msgid "Computer"
-msgstr "Datamaskin"
+msgstr "Datamaskiner"
#: ../inc/result.inc:372 ../inc/result.inc:631
+#, fuzzy
msgid "Sent"
-msgstr "Sendt"
+msgstr "Avsender"
#: ../inc/result.inc:373
msgid "Time reported<br />or deadline"
-msgstr "Tid rapportert<br /> eller frist"
+msgstr ""
#: ../inc/result.inc:374
msgid "explain"
-msgstr "forklar"
+msgstr ""
#: ../inc/result.inc:376 ../user/server_status.php:241
msgid "Status"
-msgstr "Status"
+msgstr ""
#: ../inc/result.inc:377
msgid "Run time<br />(sec)"
-msgstr "Kjøretid<br />(sek)"
+msgstr ""
#: ../inc/result.inc:378
msgid "CPU time<br />(sec)"
-msgstr "Prosessortid<br />(sek)"
+msgstr ""
#: ../inc/result.inc:379 ../inc/result.inc:642
+#, fuzzy
msgid "Credit"
-msgstr "Arbeid utført"
+msgstr "Lag"
#: ../inc/result.inc:380 ../inc/result.inc:724
+#, fuzzy
msgid "Application"
-msgstr "Applikasjon"
+msgstr "Programmer"
#: ../inc/result.inc:629
msgid "Workunit"
-msgstr "Arbeidsenhet"
+msgstr ""
#: ../inc/result.inc:632
msgid "Received"
-msgstr "Mottatt"
+msgstr ""
#: ../inc/result.inc:633
msgid "Server state"
-msgstr "Tilstand tjener"
+msgstr ""
#: ../inc/result.inc:634
msgid "Outcome"
-msgstr "Utfall"
+msgstr ""
#: ../inc/result.inc:635
msgid "Client state"
-msgstr "Tilstand klient"
+msgstr ""
#: ../inc/result.inc:636
msgid "Exit status"
@@ -1715,41 +1692,42 @@ msgstr ""
#: ../inc/result.inc:638
msgid "Report deadline"
-msgstr "Rapporter frist"
+msgstr ""
#: ../inc/result.inc:639
msgid "Run time"
-msgstr "Kjøretid"
+msgstr ""
#: ../inc/result.inc:640
+#, fuzzy
msgid "CPU time"
-msgstr "Prosessortid"
+msgstr "CPU type"
#: ../inc/result.inc:641
msgid "Validate state"
-msgstr "Valider tilstand"
+msgstr ""
#: ../inc/result.inc:643
#, fuzzy
msgid "Application version"
-msgstr "Versjon applikasjon"
+msgstr "Programmer"
#: ../inc/result.inc:656
msgid "Output files"
-msgstr "Utdata filer"
+msgstr ""
#: ../inc/result.inc:659
msgid "Stderr output"
msgstr ""
#: ../inc/result.inc:706
+#, fuzzy
msgid "State"
-msgstr "Tilstand"
+msgstr "Dato"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "Oppgavenavn"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -1790,7 +1768,6 @@ msgid "Requested by you, and founder response deadline has passed."
msgstr "Anmodet av deg, og grunnleggers svarfrist er passert."
#: ../inc/team.inc:63
-#, fuzzy
msgid "Complete foundership transfer"
msgstr "Fullført grunnlegger overføring"
@@ -1845,7 +1822,7 @@ msgstr "Tråder"
#: ../inc/team.inc:136
msgid "Join this team"
-msgstr "Bli med i dette teamet"
+msgstr "Bli med i dette teamet "
#: ../inc/team.inc:137
msgid ""
@@ -1902,7 +1879,7 @@ msgstr "Aktive medlemmer"
#: ../inc/team.inc:187
msgid "Members with credit"
-msgstr "Medlemmer med arbeid utført"
+msgstr "Medlemmer med kreditt"
#: ../inc/team.inc:256
msgid "Admin"
@@ -1921,12 +1898,10 @@ msgid "Next %1"
msgstr "Neste %1"
#: ../inc/team.inc:289
-#, fuzzy
msgid "No such team."
msgstr "Ingen slikt team."
#: ../inc/team.inc:302
-#, fuzzy
msgid "This operation requires foundership."
msgstr "Denne handlingen krever grunnlegger rolle."
@@ -1986,11 +1961,11 @@ msgstr "Beskrivelse av teamet"
#: ../inc/team.inc:462
msgid "Accept new members?"
-msgstr "Tillat nye medlemmer?"
+msgstr ""
#: ../inc/uotd.inc:28
msgid "User profile"
-msgstr "Brukerprofil"
+msgstr ""
#: ../inc/user.inc:119
msgid "Projects in which you are participating"
@@ -2014,7 +1989,7 @@ msgstr "Siden"
#: ../inc/user.inc:148
msgid "Computing and credit"
-msgstr "Databehandling og poeng"
+msgstr "Databehandling og kreditt"
#: ../inc/user.inc:151
msgid "Computers on this account"
@@ -2036,7 +2011,7 @@ msgstr "Kryss-prosjekt statistikk"
#: ../inc/user.inc:163
msgid "Account"
-msgstr "Konto"
+msgstr ""
#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
#: ../inc/user.inc:371 ../user/user_search.php:139
@@ -2046,7 +2021,7 @@ msgstr "Team"
#: ../inc/user.inc:167
#, fuzzy
msgid "Cross-project"
-msgstr "Kryssprosjekt"
+msgstr "Kryss-prosjekt ID"
#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
msgid "Certificate"
@@ -2057,18 +2032,17 @@ msgid "Stats on your cell phone"
msgstr "Statistikk på din mobiltelefon"
#: ../inc/user.inc:183
-#, fuzzy
msgid "Unknown notification type: %1"
-msgstr "Ukjent varsel type: %1"
+msgstr ""
#: ../inc/user.inc:198
msgid "Account information"
-msgstr "Kontoinformasjon"
+msgstr "Konto informasjon"
#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
msgid "Email address"
-msgstr "Epostadresse"
+msgstr "Epost adresse"
#: ../inc/user.inc:203 ../inc/user.inc:322
msgid "URL"
@@ -2088,7 +2062,7 @@ msgstr "Endre"
#: ../inc/user.inc:209
msgid "email address"
-msgstr "epostadresse"
+msgstr "epost adresse"
#: ../inc/user.inc:210
msgid "password"
@@ -2096,20 +2070,20 @@ msgstr "passord"
#: ../inc/user.inc:211
msgid "other account info"
-msgstr "annen kontoinformasjon"
+msgstr "annen konto informasjon"
#: ../inc/user.inc:213 ../inc/user.inc:315
msgid "User ID"
msgstr "Bruker ID"
#: ../inc/user.inc:213
-#, fuzzy
msgid "Used in community functions"
msgstr "Brukes i fellesskap funksjoner"
#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#, fuzzy
msgid "Account keys"
-msgstr "Kontonøkler"
+msgstr "Konto nøkkel"
#: ../inc/user.inc:221
msgid "Preferences"
@@ -2121,24 +2095,23 @@ msgstr "Når og hvordan BOINC bruker din datamaskin"
#: ../inc/user.inc:225
msgid "Computing preferences"
-msgstr "Beregningsalternativer"
+msgstr "Databehandling preferanser"
#: ../inc/user.inc:228
msgid "Message boards and private messages"
msgstr "Meldingstavle og private meldinger"
#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
-#, fuzzy
msgid "Community preferences"
-msgstr "Alternativer for felleskap"
+msgstr "Fellesskap preferanser"
#: ../inc/user.inc:232
msgid "Preferences for this project"
-msgstr "Alternativer for dette prosjektet"
+msgstr ""
#: ../inc/user.inc:233 ../user/prefs.php:29
msgid "%1 preferences"
-msgstr "%1 alternativer"
+msgstr "%1 preferanser"
#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
#: ../user/sample_index.php:125
@@ -2151,7 +2124,7 @@ msgstr "Slett"
#: ../inc/user.inc:245
msgid "Create"
-msgstr "Opprett"
+msgstr "Lag"
#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
msgid "Profile"
@@ -2216,10 +2189,9 @@ msgstr "Denne personen er en venn"
#: ../inc/user.inc:382 ../user/friend.php:238
msgid "Cancel friendship"
-msgstr "Avbryt vennskap"
+msgstr "Kanslere vennskap "
#: ../inc/user.inc:385 ../user/friend.php:37
-#, fuzzy
msgid "Request pending"
msgstr "Anmodning forestående"
@@ -2232,37 +2204,33 @@ msgid "user name cannot have leading or trailing white space"
msgstr ""
#: ../inc/user.inc:450
-#, fuzzy
msgid "user name must be nonempty"
-msgstr "brukernavn kan ikke være tomt"
+msgstr ""
#: ../inc/user.inc:454
-#, fuzzy
msgid "user name may not contain HTML tags"
-msgstr "brukernavn kan ikke innehold HTML tagger"
+msgstr ""
#: ../inc/util.inc:131
#, fuzzy
msgid "log out"
-msgstr "logg ut"
+msgstr "Log ut"
#: ../inc/util.inc:133
-#, fuzzy
msgid "log in"
-msgstr "logg inn"
+msgstr ""
#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
msgid "Log in"
-msgstr "Logg inn"
+msgstr ""
#: ../inc/util.inc:205 ../user/create_account_form.php:40
msgid "Create an account"
-msgstr "Opprett en konto"
+msgstr "Lag en konto"
#: ../inc/util.inc:206
-#, fuzzy
msgid "Server status page"
-msgstr "Server status side"
+msgstr ""
#: ../inc/util.inc:248
msgid ""
@@ -2271,22 +2239,20 @@ msgid ""
msgstr ""
#: ../inc/util.inc:257
-#, fuzzy
msgid "Unable to handle request"
-msgstr "Ikke mulig å behandle forespørselen"
+msgstr ""
#: ../inc/util.inc:277
msgid "hours"
msgstr ""
#: ../inc/util.inc:280
-#, fuzzy
msgid "min"
-msgstr "min"
+msgstr ""
#: ../inc/util.inc:283
msgid "sec"
-msgstr "sek"
+msgstr ""
#: ../inc/util.inc:444
msgid "Link has timed out. Please click Back, refresh the page, and try again."
@@ -2305,17 +2271,17 @@ msgid "Project down for maintenance"
msgstr ""
#: ../inc/util.inc:799
+#, fuzzy
msgid "%1 is temporarily shut down for maintenance. Please try again later."
-msgstr "%1 er midlertidig nede for vedlikehold. Vennligst prøv igjen senere."
+msgstr "Kunne ikke lage team - vennligst prøv igjen senere"
#: ../inc/util.inc:817
msgid "Unable to connect to database - please try again later"
-msgstr "Kan ikke koble til databasen - vennligst prøv igjen senere"
+msgstr ""
#: ../inc/util.inc:821
-#, fuzzy
msgid "Unable to select database - please try again later"
-msgstr "Kan ikke koble til databasen - vennligst prøv igjen senere"
+msgstr ""
#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
@@ -2344,17 +2310,17 @@ msgid "Optional"
msgstr "Valgfritt"
#: ../user/account_finish_action.php:27
+#, fuzzy
msgid "You must supply a name for your account"
-msgstr "Du må oppgi et navn for din konto"
+msgstr "Du må ha en invitasjons kode for å lage en konto."
#: ../user/account_finish_action.php:30
-#, fuzzy
msgid "HTML tags not allowed in name"
-msgstr "HTML tagger ikke tillatt på navn"
+msgstr ""
#: ../user/add_venue.php:81
msgid "Add %1 preferences for %2"
-msgstr "Legg til %1 innstillinger for %2"
+msgstr ""
#: ../user/apps.php:32 ../user/bs_sample_index.php:55
#: ../user/sample_index.php:120
@@ -2382,9 +2348,8 @@ msgid "Version"
msgstr "Versjon"
#: ../user/apps.php:52
-#, fuzzy
msgid "Installation time"
-msgstr "Installasjonstid"
+msgstr "Installasjons tid"
#: ../user/bbcode.php:23
msgid "BBCode tags"
@@ -2400,20 +2365,20 @@ msgstr ""
#: ../user/bbcode.php:31
msgid "Examples"
-msgstr "Eksempler"
+msgstr ""
#: ../user/bbcode.php:32
msgid "Bold"
-msgstr "Uthevet"
+msgstr ""
#: ../user/bbcode.php:33
msgid "Italic"
-msgstr "Kursiv"
+msgstr ""
#: ../user/bbcode.php:34
#, fuzzy
msgid "Underline"
-msgstr "Understrek"
+msgstr "Avslå"
#: ../user/bbcode.php:35
#, fuzzy
@@ -2422,21 +2387,20 @@ msgstr "Beskrivelse"
#: ../user/bbcode.php:36
msgid "Big text"
-msgstr "Stor tekst"
+msgstr ""
#: ../user/bbcode.php:37
msgid "Red text"
-msgstr "Rød tekst"
+msgstr ""
#: ../user/bbcode.php:38
-#, fuzzy
msgid "link to website"
-msgstr "link til nettsted"
+msgstr ""
#: ../user/bbcode.php:39
#, fuzzy
msgid "Quoted text"
-msgstr "Sitert tekst"
+msgstr "Forlat team"
#: ../user/bbcode.php:39
msgid "use for quoted blocks of text"
@@ -2456,7 +2420,7 @@ msgstr ""
#: ../user/bbcode.php:42
msgid "Pre-formatted text"
-msgstr "Preformattert tekst"
+msgstr ""
#: ../user/bbcode.php:42
msgid "use to display pre-formatted (usually monospaced) text"
@@ -2464,16 +2428,15 @@ msgstr ""
#: ../user/bbcode.php:43
msgid "Item 1"
-msgstr "Element 1"
+msgstr ""
#: ../user/bbcode.php:43
msgid "Item2"
-msgstr "Element 2"
+msgstr ""
#: ../user/bbcode.php:43
-#, fuzzy
msgid "Item 2"
-msgstr "Element 2"
+msgstr ""
#: ../user/bbcode.php:45
msgid "use to link to Trac ticket on BOINC website"
@@ -2495,11 +2458,11 @@ msgstr ""
#: ../user/bs_sample_index.php:44
msgid "Participants"
-msgstr "Deltakere"
+msgstr ""
#: ../user/bs_sample_index.php:46
msgid "Do work"
-msgstr "Utfør arbeid"
+msgstr ""
#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
#: ../user/home.php:49 ../project.sample/project.inc:43
@@ -2508,26 +2471,25 @@ msgstr "Din konto"
#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
msgid "view stats, modify preferences"
-msgstr "vis statistikk, modifiser innstillinger"
+msgstr ""
#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
#: ../user/team.php:25
+#, fuzzy
msgid "Teams"
msgstr "Team"
#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#, fuzzy
msgid "create or join a team"
-msgstr "opprett eller bli med i et team"
+msgstr ""
#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
msgid "User of the day"
msgstr "Dagens Bruker"
#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-#, fuzzy
msgid "Server status"
-msgstr "Serverstatus"
+msgstr ""
#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
#: ../user/sample_index.php:127
@@ -2561,17 +2523,19 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
+#, fuzzy
msgid "Languages"
msgstr "Språk"
#: ../user/bs_sample_index.php:149 ../user/info.php:24
#: ../user/sample_index.php:79
msgid "Read our rules and policies"
-msgstr "Les våre regler og retningslinjer"
+msgstr ""
#: ../user/create_account_action.php:26
+#, fuzzy
msgid "Can't create account"
-msgstr "Kan ikke opprette konto"
+msgstr "Lag konto"
#: ../user/create_account_action.php:29
msgid "Click your browser's <b>Back</b> button to try again."
@@ -2590,11 +2554,10 @@ msgid "The invitation code you gave is not valid."
msgstr "Invitasjons koden du skrev er ikke gyldig."
#: ../user/create_account_action.php:84
+#, fuzzy
msgid ""
"Invalid email address: you must enter a valid address of the form name at domain"
-msgstr ""
-"Ugyldig epostadresse: Du må taste inn en gyldig adresse i dette formatet "
-"name at domene"
+msgstr "Må være en gyldig adresse i denne formen 'name at domene'."
#: ../user/create_account_action.php:88
msgid "There's already an account with that email address."
@@ -2633,18 +2596,17 @@ msgstr ""
#: ../user/create_account_form.php:73
msgid "Invitation Code"
-msgstr "Invitasjonskode"
+msgstr "Invitasjons kode"
#: ../user/create_account_form.php:73
msgid "A valid invitation code is required to create an account."
-msgstr "En gyldig invitasjonskode er nødvendig for å opprette en konto."
+msgstr "En gyldig invitasjons kode er nødvendig for å lage en konto."
#: ../user/create_account_form.php:83
msgid "Email Address"
-msgstr "Epostadresse"
+msgstr "Epost adresse"
#: ../user/create_account_form.php:83
-#, fuzzy
msgid "Must be a valid address of the form 'name at domain'."
msgstr "Må være en gyldig adresse i denne formen 'name at domene'."
@@ -2666,7 +2628,7 @@ msgstr ""
#: ../user/create_account_form.php:119
msgid "Create account"
-msgstr "Opprett konto"
+msgstr "Lag konto"
#: ../user/create_profile.php:50
msgid "Picture"
@@ -2702,7 +2664,7 @@ msgstr ""
#: ../user/create_profile.php:104
msgid "Submit profile"
-msgstr "Registrer profil"
+msgstr "Send inn profil"
#: ../user/create_profile.php:110
msgid "Please enter the words shown in the image."
@@ -2710,7 +2672,7 @@ msgstr ""
#: ../user/create_profile.php:115
msgid "Create/edit profile"
-msgstr "Opprett/rediger profil"
+msgstr "Lag/rediger profil"
#: ../user/create_profile.php:137
msgid "The format of your uploaded image is not supported."
@@ -2765,7 +2727,7 @@ msgstr ""
#: ../user/create_profile.php:315
msgid "Create a profile"
-msgstr "Opprett en profil"
+msgstr "Lag en profil"
#: ../user/create_profile.php:343
msgid ""
@@ -2831,20 +2793,23 @@ msgid "No"
msgstr "Nei"
#: ../user/delete_account.php:80
+#, fuzzy
msgid "Do not delete this account"
-msgstr "Ikke slett denne kontoen"
+msgstr "Datamaskiner på denne kontoen"
#: ../user/delete_profile.php:30
+#, fuzzy
msgid "couldn't delete profile - please try again later"
-msgstr "kunne ikke slette profil - vennligst prøv igjen senere"
+msgstr "Kunne ikke lage team - vennligst prøv igjen senere"
#: ../user/delete_profile.php:33
msgid "Delete Confirmation"
msgstr ""
#: ../user/delete_profile.php:35
+#, fuzzy
msgid "Your profile has been deleted."
-msgstr "Profilen din har blitt slettet."
+msgstr "Meldingen din har blitt sendt"
#: ../user/delete_profile.php:40
msgid "Profile delete confirmation"
@@ -2868,12 +2833,14 @@ msgid ""
msgstr ""
#: ../user/delete_profile.php:52
+#, fuzzy
msgid "Delete my profile"
-msgstr "Slett min profil"
+msgstr "Lag en profil"
#: ../user/delete_profile.php:53
+#, fuzzy
msgid "Do not delete my profile"
-msgstr "Ikke slett min profil"
+msgstr "Jeg %1like ikke%2 denne profilen"
#: ../user/donated.php:25
msgid "PayPal - Transaction Completed"
@@ -2902,8 +2869,9 @@ msgid "This project is not accepting donations."
msgstr ""
#: ../user/donations.php:34
+#, fuzzy
msgid "%1 donations"
-msgstr "%1 donasjoner"
+msgstr "%1 innlegg"
#: ../user/donations.php:39
msgid ""
@@ -2928,7 +2896,7 @@ msgstr ""
#: ../user/donations.php:316
msgid "Amount you would like to donate"
-msgstr "Beløp du ønsker å donere"
+msgstr ""
#: ../user/donations.php:317
msgid "Estimated value in"
@@ -2949,8 +2917,9 @@ msgid "To assign the donation with your user ID, please log in."
msgstr ""
#: ../user/donations.php:328
+#, fuzzy
msgid "Proceed"
-msgstr "Fortsett"
+msgstr "Profilen er lagret"
#: ../user/donations.php:329
msgid "Donations are accepted through"
@@ -2986,8 +2955,9 @@ msgid "This list is managed centrally at %1the BOINC website%2."
msgstr ""
#: ../user/edit_email_action.php:31
+#, fuzzy
msgid "Change email address of account"
-msgstr "Endre epostadresse for kontoen"
+msgstr "epost adresse"
#: ../user/edit_email_action.php:34 ../user/edit_email_action.php:36
#, fuzzy
@@ -3025,7 +2995,7 @@ msgstr ""
#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
msgid "Change email address"
-msgstr "Endre epostadresse"
+msgstr ""
#: ../user/edit_email_form.php:36
#, fuzzy
@@ -3043,9 +3013,8 @@ msgid "Must be a valid address of the form 'name at domain'"
msgstr "Må være en gyldig adresse i denne formen 'name at domene'."
#: ../user/edit_email_form.php:48
-#, fuzzy
msgid "No password?"
-msgstr "Nytt passord"
+msgstr ""
#: ../user/edit_forum_preferences_action.php:33
#, fuzzy
@@ -3059,8 +3028,9 @@ msgid ""
msgstr ""
#: ../user/edit_forum_preferences_action.php:38
+#, fuzzy
msgid "Reset preferences"
-msgstr "Nullstill innstillinger"
+msgstr "%1 preferanser"
#: ../user/edit_forum_preferences_action.php:88
msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
@@ -3072,8 +3042,9 @@ msgstr ""
#: ../user/edit_forum_preferences_action.php:132
#: ../user/edit_forum_preferences_action.php:146
+#, fuzzy
msgid "No such user: %1"
-msgstr "Ingen slik bruker: %1"
+msgstr "Ingen slik bruker"
#: ../user/edit_forum_preferences_form.php:56
msgid ""
@@ -3094,8 +3065,9 @@ msgid "In a single daily email"
msgstr ""
#: ../user/edit_forum_preferences_form.php:75
+#, fuzzy
msgid "Message-board identity"
-msgstr "Meldingstavle identitet"
+msgstr "Meldingstavle"
#: ../user/edit_forum_preferences_form.php:76
msgid "Avatar"
@@ -3151,7 +3123,7 @@ msgstr ""
#: ../user/edit_forum_preferences_form.php:108
msgid "Signature preview"
-msgstr "Forhåndsvisning signatur"
+msgstr ""
#: ../user/edit_forum_preferences_form.php:109
msgid "This is how your signature will look in the forums"
@@ -3195,12 +3167,14 @@ msgid "How to sort"
msgstr ""
#: ../user/edit_forum_preferences_form.php:140
+#, fuzzy
msgid "Threads:"
-msgstr "Tråder:"
+msgstr "Tråder"
#: ../user/edit_forum_preferences_form.php:140
+#, fuzzy
msgid "Posts:"
-msgstr "Innlegg:"
+msgstr "Innlegg"
#: ../user/edit_forum_preferences_form.php:141
msgid "Jump to first new post in thread automatically"
@@ -3211,12 +3185,13 @@ msgid "Don't move sticky posts to top"
msgstr ""
#: ../user/edit_forum_preferences_form.php:148
+#, fuzzy
msgid "Message filtering"
-msgstr "Meldingsfilter"
+msgstr "Meldingstavle"
#: ../user/edit_forum_preferences_form.php:164
msgid "Filtered users"
-msgstr "Filtrerte brukere"
+msgstr ""
#: ../user/edit_forum_preferences_form.php:165
#, fuzzy
@@ -3225,7 +3200,7 @@ msgstr "Meldingstavle og private meldinger"
#: ../user/edit_forum_preferences_form.php:167
msgid "User ID (For instance: 123456789)"
-msgstr "Bruker ID (For eksempel: 123456789)"
+msgstr ""
#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
msgid "Add user to filter"
@@ -3239,7 +3214,7 @@ msgstr "%1 preferanser"
#: ../user/edit_forum_preferences_form.php:175
#: ../user/edit_forum_preferences_form.php:177
msgid "Reset"
-msgstr "Nullstill"
+msgstr ""
#: ../user/edit_forum_preferences_form.php:176
msgid "Or click here to reset preferences to the defaults"
@@ -3262,7 +3237,7 @@ msgstr "Bekreft passord"
#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
#: ../user/edit_passwd_form.php:55
msgid "Change password"
-msgstr "Endre passord"
+msgstr ""
#: ../user/edit_passwd_action.php:67
#, fuzzy
@@ -3291,9 +3266,8 @@ msgid "your account key"
msgstr "Svak konto nøkkel"
#: ../user/edit_passwd_form.php:46
-#, fuzzy
msgid "Current password"
-msgstr "Nåværende passord"
+msgstr ""
#: ../user/edit_passwd_form.php:48
msgid "<b>OR</b>: Account key"
@@ -3305,11 +3279,11 @@ msgstr ""
#: ../user/edit_passwd_form.php:53
msgid "New password"
-msgstr "Nytt passord"
+msgstr ""
#: ../user/edit_passwd_form.php:54
msgid "New password, again"
-msgstr "Nytt passord, igjen"
+msgstr ""
#: ../user/edit_user_info_action.php:31
msgid "HTML tags are not allowed in your name."
@@ -3343,12 +3317,11 @@ msgstr ""
#: ../user/edit_user_info_form.php:47
msgid "Update info"
-msgstr "Oppdater info"
+msgstr ""
#: ../user/explain_state.php:27
-#, fuzzy
msgid "Server states"
-msgstr "Tilstand tjener"
+msgstr ""
#: ../user/explain_state.php:30
msgid ""
@@ -3370,7 +3343,7 @@ msgstr ""
#: ../user/explain_state.php:40
#, fuzzy
msgid "In Progress"
-msgstr "På fremmarsj"
+msgstr "I prosess"
#: ../user/explain_state.php:41
msgid "The task has been sent; waiting for completion."
@@ -3383,9 +3356,8 @@ msgid ""
msgstr ""
#: ../user/explain_state.php:49
-#, fuzzy
msgid "Outcomes"
-msgstr "Utfall"
+msgstr ""
#: ../user/explain_state.php:52
msgid ""
@@ -3410,45 +3382,35 @@ msgid ""
msgstr ""
#: ../user/explain_state.php:65
+#, fuzzy
msgid "Client error"
-msgstr "Klientfeil"
+msgstr "Datamaskiner"
#: ../user/explain_state.php:66
-#, fuzzy
msgid "The task was sent to a computer and an error occurred."
-msgstr "Oppgaven ble sendt til en datamaskin og en feil oppstod."
+msgstr ""
#: ../user/explain_state.php:69
-#, fuzzy
msgid ""
"The task was sent to a computer and no reply was received within the time "
"limit."
msgstr ""
-"Oppgaven ble sendt til en datamaskin og ikke noe svar var mottatt innenfor "
-"tidsfristen."
#: ../user/explain_state.php:72
-#, fuzzy
msgid ""
"The task wasn't sent to a computer because enough other tasks were completed "
"for this workunit."
msgstr ""
-"Oppgaven ble ikke sendt til en datamaskin fordi nok andre oppgaver var "
-"ferdige for denne arbeidsenheten."
#: ../user/explain_state.php:75
-#, fuzzy
msgid ""
"The task was reported but could not be validated, typically because the "
"output files were lost on the server."
msgstr ""
-"Oppgaven ble rapportert men kunne ikke bli validert, typisk fordi "
-"utdatafilene forsvant fra tjeneren."
#: ../user/explain_state.php:80
-#, fuzzy
msgid "Client states"
-msgstr "Tilstand klient"
+msgstr ""
#: ../user/explain_state.php:81
msgid ""
@@ -3457,33 +3419,28 @@ msgid ""
msgstr ""
#: ../user/explain_state.php:86
-#, fuzzy
msgid "The computer has not yet completed the task."
-msgstr "Datamaskinen har ikke foreløpig ferdigstilt oppgaven."
+msgstr ""
#: ../user/explain_state.php:89
-#, fuzzy
msgid "The computer completed the task successfully."
-msgstr "Datamaskinen fullførte oppgaven korrekt."
+msgstr ""
#: ../user/explain_state.php:92
-#, fuzzy
msgid "The computer couldn't download the application or input files."
-msgstr "Datamaskinen kunne ikke laste ned applikasjonen eller inndatafilene."
+msgstr ""
#: ../user/explain_state.php:95
msgid "An error occurred during computation."
-msgstr "En feil oppstod under beregning."
+msgstr ""
#: ../user/explain_state.php:98
-#, fuzzy
msgid "The computer couldn't upload the output files."
-msgstr "Datamaskinen kunne ikke laste opp utdatafilene."
+msgstr ""
#: ../user/explain_state.php:103
-#, fuzzy
msgid "Time reported and deadline"
-msgstr "Tid rapportert<br /> eller frist"
+msgstr ""
#: ../user/explain_state.php:106
msgid ""
@@ -3492,8 +3449,9 @@ msgid ""
msgstr ""
#: ../user/explain_state.php:110
+#, fuzzy
msgid "Already reported"
-msgstr "Allerede rapportert"
+msgstr "Allerede venner"
#: ../user/explain_state.php:110
msgid "The date/time it was reported"
@@ -3504,58 +3462,56 @@ msgid "Not reported yet, deadline in the future"
msgstr ""
#: ../user/explain_state.php:112
-#, fuzzy
msgid "Deadline, shown in green."
-msgstr "Frist, vist i grønt."
+msgstr ""
#: ../user/explain_state.php:114
msgid "Not reported yet, deadline in the past"
msgstr ""
#: ../user/explain_state.php:115
-#, fuzzy
msgid "Deadline, shown in red."
-msgstr "Frist, vist i rødt."
+msgstr ""
#: ../user/explain_state.php:120
+#, fuzzy
msgid "Unknown field"
-msgstr "Ukjent felt"
+msgstr "Ukjent handling"
#: ../user/ffmail_action.php:47
+#, fuzzy
msgid "Email preview"
-msgstr "Forhåndsvisning epost"
+msgstr "Epost adresse"
#: ../user/ffmail_action.php:48
-#, fuzzy
msgid "Your email will appear as follows:"
-msgstr "Din epostadresse vil bli synlig som følgende:"
+msgstr ""
#: ../user/ffmail_action.php:57
+#, fuzzy
msgid "Send email"
-msgstr "Send epost"
+msgstr "Send melding"
#: ../user/ffmail_action.php:59
-#, fuzzy
msgid "Use your browser's back button to return to message form"
-msgstr "Bruk din nettlesers tilbake knapp for å gå tilbake til meldingsskjema"
+msgstr ""
#: ../user/ffmail_action.php:63
+#, fuzzy
msgid "Sending emails"
-msgstr "Sender epost"
+msgstr "Forestående kreditt"
#: ../user/ffmail_action.php:84
-#, fuzzy
msgid "email sent successfully to %1"
-msgstr "epost sendt korrekt til %1"
+msgstr ""
#: ../user/ffmail_action.php:86
msgid "failed to send email to %1: %2"
msgstr ""
#: ../user/ffmail_action.php:92
-#, fuzzy
msgid "Thanks for telling your friends about %1"
-msgstr "Takk for at du fortalte din venner om %1"
+msgstr ""
#: ../user/ffmail_action.php:94
msgid ""
@@ -3570,14 +3526,12 @@ msgid ""
msgstr ""
#: ../user/ffmail_form.php:33
-#, fuzzy
msgid "Tell your friends about %1"
-msgstr "Fortell dine venner om %1"
+msgstr ""
#: ../user/ffmail_form.php:37
-#, fuzzy
msgid "Help us by telling your friends, family and coworkers about %1"
-msgstr "Hjelp oss med å fortelle dine venner, familie og kolleger om %1"
+msgstr ""
#: ../user/ffmail_form.php:39
msgid ""
@@ -3588,15 +3542,17 @@ msgstr ""
#: ../user/ffmail_form.php:42
msgid "Your name:"
-msgstr "Ditt navn:"
+msgstr ""
#: ../user/ffmail_form.php:42
+#, fuzzy
msgid "Your email address:"
-msgstr "Din epostadresse:"
+msgstr "epost adresse"
#: ../user/ffmail_form.php:48
+#, fuzzy
msgid "Friend's name:"
-msgstr "Venns navn:"
+msgstr "Venner"
#: ../user/ffmail_form.php:48
#, fuzzy
@@ -3628,9 +3584,8 @@ msgid "No user with this ID found."
msgstr "Ingen datamaskin medID %1 funnet"
#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
-#, fuzzy
msgid "User is already banished"
-msgstr "Bruker er allerede forvist"
+msgstr ""
#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
msgid ""
@@ -3647,13 +3602,13 @@ msgstr ""
#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
msgid "Category"
-msgstr "Kategori"
+msgstr ""
#: ../user/forum_banishment_vote.php:64
#: ../user/forum_banishment_vote_action.php:57
#: ../user/forum_moderate_post.php:55 ../user/forum_moderate_thread.php:52
msgid "Obscene"
-msgstr "Uanstendig"
+msgstr ""
#: ../user/forum_banishment_vote.php:65
#: ../user/forum_banishment_vote_action.php:59
@@ -3672,12 +3627,13 @@ msgstr "Ingen anmodning"
#: ../user/forum_banishment_vote_action.php:63
#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
msgid "Other"
-msgstr "Annen"
+msgstr ""
#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_post.php:53
#: ../user/forum_moderate_thread.php:85
+#, fuzzy
msgid "Reason"
-msgstr "Årsak"
+msgstr "Versjon"
#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
msgid "Mailed if nonempty"
@@ -3690,7 +3646,7 @@ msgstr ""
#: ../user/forum_banishment_vote_action.php:39
#: ../user/forum_moderate_post_action.php:63
msgid "You must specify an action..."
-msgstr "Du må spesifisere en handling..."
+msgstr ""
#: ../user/forum_edit.php:41
msgid ""
@@ -3699,16 +3655,18 @@ msgid ""
msgstr ""
#: ../user/forum_edit.php:47
+#, fuzzy
msgid "You are not authorized to edit this post."
-msgstr "Du har ikke autorisasjon til å endre denne posten."
+msgstr "Du er nå venn med %1."
#: ../user/forum_edit.php:86 ../user/forum_search.php:72
msgid "Forum"
msgstr ""
#: ../user/forum_edit.php:110
+#, fuzzy
msgid "Edit your message"
-msgstr "Rediger din melding"
+msgstr "Redigere din profil"
#: ../user/forum_edit.php:115 ../user/forum_edit.php:120
#: ../user/forum_post.php:109 ../user/forum_post.php:111
@@ -3721,8 +3679,9 @@ msgid "Add my signature to this post"
msgstr "Legg til min signatur til dette innlegget"
#: ../user/forum_forum.php:41
+#, fuzzy
msgid "Not visible to you"
-msgstr "Ikke synlig for deg"
+msgstr "Dette forumet er ikke synlig for deg."
#: ../user/forum_forum.php:80
#, fuzzy
@@ -3730,20 +3689,23 @@ msgid "Team message board for %1"
msgstr "%1 oppslagstavle"
#: ../user/forum_forum.php:96
+#, fuzzy
msgid "New thread"
-msgstr "Ny tråd"
+msgstr "Tråd"
#: ../user/forum_forum.php:96
+#, fuzzy
msgid "Add a new thread to this forum"
-msgstr "Legg til en ny tråd i dette forumet"
+msgstr "Legg til en ny melding til denne tråden"
#: ../user/forum_forum.php:116
msgid "This message board is available as an %1RSS feed%2"
msgstr ""
#: ../user/forum_forum.php:174
+#, fuzzy
msgid "This thread is hidden"
-msgstr "Denne tråden er skjult"
+msgstr "Rediger tråd tittel"
#: ../user/forum_forum.php:178
msgid "This thread is sticky and locked, and you haven't read it yet"
@@ -3859,8 +3821,9 @@ msgid "Moderate post"
msgstr "Siste innlegg"
#: ../user/forum_moderate_post.php:52
+#, fuzzy
msgid "Hide post"
-msgstr "Skjul post"
+msgstr "Skjul"
#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
msgid "Commercial spam"
@@ -3871,8 +3834,9 @@ msgid "Doublepost"
msgstr ""
#: ../user/forum_moderate_post.php:63
+#, fuzzy
msgid "Move post"
-msgstr "Flytte post"
+msgstr "&Flytt"
#: ../user/forum_moderate_post.php:65
#, fuzzy
@@ -3898,19 +3862,20 @@ msgstr ""
#: ../user/forum_moderate_post.php:83
msgid "1 week"
-msgstr "1 uke"
+msgstr ""
#: ../user/forum_moderate_post.php:84
msgid "2 weeks"
-msgstr "2 uker"
+msgstr ""
#: ../user/forum_moderate_post.php:85
+#, fuzzy
msgid "1 month"
-msgstr "1 måned"
+msgstr "%1 innlegg"
#: ../user/forum_moderate_post.php:86
msgid "Forever"
-msgstr "For evig"
+msgstr ""
#: ../user/forum_moderate_post.php:96
msgid "Optional explanation %1 This is included in email to user.%2"
@@ -3921,7 +3886,7 @@ msgstr ""
#: ../user/forum_rss.php:55 ../user/friend.php:81 ../user/get_passwd.php:41
#: ../user/get_passwd.php:75
msgid "OK"
-msgstr "OK"
+msgstr ""
#: ../user/forum_moderate_post_action.php:57
#, fuzzy
@@ -3945,23 +3910,20 @@ msgid "Banishment"
msgstr ""
#: ../user/forum_moderate_post_action.php:128
-#, fuzzy
msgid "User %1 has been banished."
-msgstr "Brukeren %1 har blitt forvist."
+msgstr ""
#: ../user/forum_moderate_post_action.php:131
msgid "Action failed: possible database problem"
-msgstr "Handling feilet: Mulig databaseproblem"
+msgstr ""
#: ../user/forum_moderate_thread.php:33
-#, fuzzy
msgid "not authorized"
-msgstr "ikke autorisert"
+msgstr ""
#: ../user/forum_moderate_thread.php:36
-#, fuzzy
msgid "Moderate thread '%1'"
-msgstr "Moderer tråd '%1'"
+msgstr ""
#: ../user/forum_moderate_thread.php:48
msgid ""
@@ -4005,9 +3967,8 @@ msgid "Create a new thread"
msgstr "Lag en ny tråd"
#: ../user/forum_post.php:105
-#, fuzzy
msgid "Remember to add a title"
-msgstr "Husk å legge til en tittel"
+msgstr ""
#: ../user/forum_post.php:127
msgid "Show this item as a Notice in the BOINC Manager"
@@ -4201,7 +4162,7 @@ msgstr ""
#: ../user/forum_search.php:35
msgid "For example: \"screensaver freeze\""
-msgstr "For eksempel: \"skjermsparer frys\""
+msgstr ""
#: ../user/forum_search.php:36
#, fuzzy
@@ -4214,7 +4175,7 @@ msgstr ""
#: ../user/forum_search.php:39
msgid "For example: \"43214\""
-msgstr "For eksempel: \"43214\""
+msgstr ""
#: ../user/forum_search.php:41
#, fuzzy
@@ -4421,7 +4382,7 @@ msgstr "Rediger tittel"
#: ../user/forum_thread.php:235
msgid "Edit thread title"
-msgstr "Rediger tittel på tråd"
+msgstr "Rediger tråd tittel"
#: ../user/forum_thread.php:245
msgid "Export as Notice"
@@ -4488,7 +4449,7 @@ msgstr "Legg til en valgfri melding her:"
#: ../user/friend.php:115
msgid "Friend request sent"
-msgstr "Venneforespørsel sendt"
+msgstr "Venne forespørsel sent"
#: ../user/friend.php:116
msgid "We have notified %1 of your request."
@@ -4504,7 +4465,7 @@ msgstr ""
#: ../user/friend.php:138
msgid "Friend request"
-msgstr "Venneforespørsel"
+msgstr "Venne forespørsel"
#: ../user/friend.php:141
msgid "%1 has requested friendship with you."
@@ -4560,7 +4521,7 @@ msgstr "Du er nå venn med %1."
#: ../user/friend.php:232
msgid "Cancel friendship?"
-msgstr "Avbryt vennskap?"
+msgstr "Kanslere vennskap?"
#: ../user/friend.php:234
msgid "Are you sure you want to cancel your friendship with %1?"
@@ -4572,7 +4533,7 @@ msgstr "Forbli venner"
#: ../user/friend.php:249
msgid "Friendship cancelled"
-msgstr "Vennskap avbrutt"
+msgstr "Vennskap kanselert"
#: ../user/friend.php:250
msgid "Your friendship with %1 has been cancelled."
@@ -4768,27 +4729,28 @@ msgid "name"
msgstr "Navn"
#: ../user/host_edit_form.php:70 ../user/workunit.php:41
+#, fuzzy
msgid "created"
-msgstr "opprettet"
+msgstr "Lag"
#: ../user/host_edit_form.php:70
+#, fuzzy
msgid "computer ID"
-msgstr "datamaskin id"
+msgstr "Datamaskiner"
#: ../user/host_edit_form.php:77
#, fuzzy
msgid "no hostname"
-msgstr "ingen vertsnavn"
+msgstr "Ingen slikt team."
#: ../user/host_edit_form.php:109
#, fuzzy
msgid "Merge hosts"
-msgstr "Slå sammen vert"
+msgstr "Melding"
#: ../user/host_update_credit.php:28
-#, fuzzy
msgid "Updating computer credit"
-msgstr "Oppdaterer arbeid utført"
+msgstr ""
#: ../user/host_venue_action.php:41
msgid "Host venue updated"
@@ -4812,17 +4774,17 @@ msgstr ""
#: ../user/host_venue_action.php:50
#, fuzzy
msgid "Return to host page"
-msgstr "Returner til"
+msgstr "Retuner til profil."
#: ../user/hosts_user.php:53
#, fuzzy
msgid "Computers belonging to %1"
-msgstr "Datamaskiner hører til %1"
+msgstr "Datamaskiner på denne kontoen"
#: ../user/hosts_user.php:55
#, fuzzy
msgid "Computers hidden"
-msgstr "Skjulte datamaskiner"
+msgstr "Datamaskiner"
#: ../user/hosts_user.php:56
msgid ""
@@ -4830,12 +4792,14 @@ msgid ""
msgstr ""
#: ../user/hosts_user.php:64
+#, fuzzy
msgid "Your computers"
-msgstr "Dine datamaskiner"
+msgstr "Topp datamaskiner"
#: ../user/html.php:23
+#, fuzzy
msgid "Allowed HTML tags"
-msgstr ""
+msgstr "Ikke bruk HTML tags."
#: ../user/html.php:25
msgid "The following HTML tags are allowed in team descriptions:"
@@ -4843,27 +4807,28 @@ msgstr ""
#: ../user/html.php:27
msgid "bold"
-msgstr "fet"
+msgstr ""
#: ../user/html.php:28
msgid "italics"
-msgstr "kursiv"
+msgstr ""
#: ../user/html.php:29
msgid "hyperlink"
-msgstr "hyperlink"
+msgstr ""
#: ../user/html.php:30
msgid "paragraph"
-msgstr "paragraf"
+msgstr ""
#: ../user/html.php:31
msgid "break"
msgstr ""
#: ../user/html.php:32
+#, fuzzy
msgid "preformatted"
-msgstr "preformattert"
+msgstr "Lag"
#: ../user/html.php:33
msgid ""
@@ -5005,7 +4970,7 @@ msgstr ""
#: ../user/language_select.php:47
msgid "Language selection"
-msgstr "Språkvalg"
+msgstr ""
#: ../user/language_select.php:73
msgid ""
@@ -5020,14 +4985,12 @@ msgid ""
msgstr ""
#: ../user/language_select.php:83
-#, fuzzy
msgid "Firefox: Tools/Options/General"
-msgstr "Firefox: Verktøy/Alternativer/Generelt"
+msgstr ""
#: ../user/language_select.php:85
-#, fuzzy
msgid "Microsoft IE: Tools/Internet Options/Languages"
-msgstr "Microsoft IE: Verktøy/Alternativer for Internet/Språk"
+msgstr ""
#: ../user/language_select.php:89
msgid ""
@@ -5041,9 +5004,8 @@ msgid "Language name (click to select)"
msgstr ""
#: ../user/language_select.php:97
-#, fuzzy
msgid "Use browser language setting"
-msgstr "Bruk språkinnstillinger for utforskeren"
+msgstr ""
#: ../user/language_select.php:113
msgid ""
@@ -5052,35 +5014,34 @@ msgid ""
msgstr ""
#: ../user/login_form.php:45
+#, fuzzy
msgid "Email address:"
-msgstr "Epostadresse:"
+msgstr "Epost adresse"
#: ../user/login_form.php:45
msgid "forgot email address?"
-msgstr "glemt epostadressen?"
+msgstr ""
#: ../user/login_form.php:48
+#, fuzzy
msgid "Password:"
-msgstr "Passord:"
+msgstr "Passord"
#: ../user/login_form.php:48
msgid "forgot password?"
-msgstr "glemt passord?"
+msgstr ""
#: ../user/login_form.php:51
-#, fuzzy
msgid "Stay logged in"
-msgstr "Vær innlogget"
+msgstr ""
#: ../user/login_form.php:62
-#, fuzzy
msgid "or %1create an account%2."
-msgstr "eller %1 opprett en konto%2."
+msgstr ""
#: ../user/merge_by_name.php:31
-#, fuzzy
msgid "Processing %1"
-msgstr "Prosesserer %1"
+msgstr ""
#: ../user/merge_by_name.php:43
#, fuzzy
@@ -5089,8 +5050,9 @@ msgstr "Flett vert %1 inn i vert %2"
# 86%
#: ../user/merge_by_name.php:72
+#, fuzzy
msgid "Return to the list of your computers"
-msgstr "Retuner til listen over dine datamaskiner"
+msgstr "Retuner til profil."
#: ../user/merge_by_name.php:76
msgid ""
@@ -5159,45 +5121,43 @@ msgid ""
msgstr ""
#: ../user/pending.php:66
-#, fuzzy
msgid "Pending credit"
-msgstr "Arbeid utført som venter"
+msgstr "Forestående kreditt"
#: ../user/pending.php:68
msgid "Result ID"
-msgstr "Resultat ID"
+msgstr ""
#: ../user/pending.php:68
-#, fuzzy
msgid "Workunit ID"
-msgstr "Arbeidsenhet ID"
+msgstr ""
#: ../user/pending.php:68
-#, fuzzy
msgid "Host ID"
-msgstr "Vert ID"
+msgstr ""
#: ../user/pending.php:68
+#, fuzzy
msgid "Claimed credit"
-msgstr ""
+msgstr "Gjennomsnittlig kreditt"
#: ../user/pending.php:81
#, fuzzy
msgid "Pending credit: %1"
-msgstr "Arbeid utført som venter"
+msgstr "Forestående kreditt"
#: ../user/pm.php:32
-#, fuzzy
msgid "Block messages from this user"
-msgstr "Blokker meldinger fra denne brukeren"
+msgstr ""
#: ../user/pm.php:32
+#, fuzzy
msgid "Block user"
-msgstr "Blokker bruker"
+msgstr "Ingen slik bruker"
#: ../user/pm.php:73
msgid "Your message has been sent."
-msgstr "Meldingen din har blitt sendt."
+msgstr "Meldingen din har blitt sendt"
#: ../user/pm.php:83
msgid "You have no private messages."
@@ -5208,22 +5168,22 @@ msgid "Sender and date"
msgstr "Avsender og dato"
#: ../user/pm.php:106
+#, fuzzy
msgid "Reply to this message"
-msgstr "Svar på denne meldingen"
+msgstr "Retuner til profil."
#: ../user/pm.php:107
+#, fuzzy
msgid "Delete this message"
-msgstr "Slette denne meldingen"
+msgstr "Slett valgte meldinger"
#: ../user/pm.php:112
-#, fuzzy
msgid "Select all"
-msgstr "Merk alt"
+msgstr ""
#: ../user/pm.php:114
-#, fuzzy
msgid "Unselect all"
-msgstr "Fjern markering"
+msgstr ""
#: ../user/pm.php:117
msgid "Delete selected messages"
@@ -5269,9 +5229,8 @@ msgid "No such user"
msgstr "Ingen slik bruker"
#: ../user/pm.php:242
-#, fuzzy
msgid "Really block %1?"
-msgstr "Virkelig blokkere %1?"
+msgstr ""
#: ../user/pm.php:243
msgid ""
@@ -5330,31 +5289,29 @@ msgid ""
msgstr ""
#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
-#, fuzzy
msgid "%1 for %2"
-msgstr "%1 for %2"
+msgstr ""
#: ../user/prefs_edit.php:110
-#, fuzzy
msgid "Back to preferences"
-msgstr "Tilbake til innstillinger"
+msgstr ""
#: ../user/prefs_remove.php:45
-#, fuzzy
msgid "Confirm delete preferences"
-msgstr "Bekreft sletting av innstillinger"
+msgstr ""
#: ../user/prefs_remove.php:48
msgid "Are you sure you want to delete your separate %1 preferences for %2?"
msgstr ""
#: ../user/prefs_remove.php:52
+#, fuzzy
msgid "Remove preferences"
-msgstr "Fjern innstillinger"
+msgstr "%1 preferanser"
#: ../user/prefs_remove.php:54
msgid "Cancel"
-msgstr "Avbryt"
+msgstr ""
#: ../user/profile_menu.php:35
msgid ""
@@ -5413,9 +5370,8 @@ msgid "No profiles matched your query."
msgstr "Ingen prifiler passet med din spørring"
#: ../user/profile_rate.php:29
-#, fuzzy
msgid "Invalid vote type:"
-msgstr "Ugyldig stemmetype:"
+msgstr "Ugyldig stemme type:"
#: ../user/profile_rate.php:34
msgid "Vote Recorded"
@@ -5442,8 +5398,9 @@ msgid "Profiles containing '%1'"
msgstr ""
#: ../user/profile_search_action.php:40
+#, fuzzy
msgid "User name"
-msgstr "Brukernavn"
+msgstr "Bruker ID"
#: ../user/profile_search_action.php:41
msgid "Joined project"
@@ -5452,7 +5409,7 @@ msgstr ""
#: ../user/profile_search_action.php:44
#, fuzzy
msgid "Recent credit"
-msgstr "Nylig arbeid utført"
+msgstr "Nylig gjennomsnitts kreditt"
#: ../user/profile_search_action.php:54
msgid "No profiles found containing '%1'"
@@ -5460,7 +5417,7 @@ msgstr ""
#: ../user/result.php:35
msgid "Task %1"
-msgstr "Oppgave %1"
+msgstr ""
#: ../user/results.php:29
msgid "This feature is turned off temporarily"
@@ -5468,7 +5425,7 @@ msgstr "Denne funksjonen er midlertidig avslått "
#: ../user/results.php:56
msgid "No computer with ID %1 found"
-msgstr "Ingen datamaskin med ID %1 funnet"
+msgstr "Ingen datamaskin medID %1 funnet"
#: ../user/results.php:63
msgid "No access"
@@ -5479,38 +5436,36 @@ msgid "Missing user ID or host ID"
msgstr "Mangler bruker ID eller verts ID"
#: ../user/results.php:107
-#, fuzzy
msgid "No tasks to display"
-msgstr "Ingen oppgaver å vise"
+msgstr ""
#: ../user/server_status.php:97
msgid "Running"
-msgstr "Kjører"
+msgstr ""
#: ../user/server_status.php:100
msgid "Not Running"
-msgstr "Kjører ikke"
+msgstr ""
#: ../user/server_status.php:103
msgid "Disabled"
-msgstr "Deaktivert"
+msgstr ""
#: ../user/server_status.php:231
msgid "Project status"
-msgstr "Prosjektstatus"
+msgstr ""
#: ../user/server_status.php:233
-#, fuzzy
msgid "Server software version: %1"
-msgstr "Tjenerprogramvare versjon: %1"
+msgstr ""
#: ../user/server_status.php:241
msgid "Program"
-msgstr "Program"
+msgstr ""
#: ../user/server_status.php:241
msgid "Host"
-msgstr "Vert"
+msgstr ""
#: ../user/server_status.php:252
msgid "data-driven web pages"
@@ -5518,73 +5473,67 @@ msgstr ""
#: ../user/server_status.php:258
msgid "upload/download server"
-msgstr "last opp/last ned tjener"
+msgstr ""
#: ../user/server_status.php:261
msgid "scheduler"
-msgstr "planlegger"
+msgstr ""
#: ../user/server_status.php:294
msgid "Running:"
-msgstr "Kjører:"
+msgstr ""
#: ../user/server_status.php:295
msgid "Program is operating normally"
-msgstr "Program fungerer normalt"
+msgstr ""
#: ../user/server_status.php:296
msgid "Not Running:"
-msgstr "Kjører ikke:"
+msgstr ""
#: ../user/server_status.php:297
-#, fuzzy
msgid "Program failed or the project is down"
-msgstr "Program feilet eller prosjektet er nede"
+msgstr ""
#: ../user/server_status.php:298
msgid "Disabled:"
-msgstr "Deaktivert:"
+msgstr ""
#: ../user/server_status.php:299
msgid "Program is disabled"
-msgstr "Program er deaktivert"
+msgstr ""
#: ../user/server_status.php:303
-#, fuzzy
msgid "Computing status"
-msgstr "Status beregning"
+msgstr ""
#: ../user/server_status.php:309
msgid "The database server is not accessible"
-msgstr "Databasetjeneren er ikke tilgjengelig"
+msgstr ""
#: ../user/server_status.php:326
msgid "Tasks ready to send"
-msgstr "Oppgaver klare for sending"
+msgstr ""
#: ../user/server_status.php:331 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr ""
#: ../user/server_status.php:336
-#, fuzzy
msgid "Workunits waiting for validation"
-msgstr "Arbeidsenheter venter på validering"
+msgstr ""
#: ../user/server_status.php:341
-#, fuzzy
msgid "Workunits waiting for assimilation"
-msgstr "Arbeidsenheter venter på assimilering"
+msgstr ""
#: ../user/server_status.php:346
-#, fuzzy
msgid "Workunits waiting for file deletion"
-msgstr "Arbeidseneheter venter på sletting av fil"
+msgstr ""
#: ../user/server_status.php:351
-#, fuzzy
msgid "Tasks waiting for file deletion"
-msgstr "Oppgaver venter på sletting av fil"
+msgstr ""
#: ../user/server_status.php:367
msgid "Transitioner backlog (hours)"
@@ -5592,42 +5541,42 @@ msgstr ""
#: ../user/server_status.php:374
msgid "Users"
-msgstr "Brukere"
+msgstr ""
#: ../user/server_status.php:377 ../user/server_status.php:395
-#, fuzzy
msgid "with recent credit"
-msgstr "med nylig arbeid utført"
+msgstr ""
#: ../user/server_status.php:382 ../user/server_status.php:400
msgid "with credit"
-msgstr "med arbeid utført"
+msgstr ""
#: ../user/server_status.php:387 ../user/server_status.php:405
msgid "registered in past 24 hours"
-msgstr "registrert de siste 24 timer"
+msgstr ""
#: ../user/server_status.php:411
msgid "current GigaFLOPs"
msgstr ""
#: ../user/server_status.php:420
-#, fuzzy
msgid "Tasks by application"
-msgstr "Oppgaver per applikasjon"
+msgstr ""
#: ../user/server_status.php:423 ../user/workunit.php:40
+#, fuzzy
msgid "application"
-msgstr "applikasjon"
+msgstr "Programmer"
#: ../user/server_status.php:424
+#, fuzzy
msgid "unsent"
-msgstr "Ikke sendt"
+msgstr "Usent"
#: ../user/server_status.php:425
#, fuzzy
msgid "in progress"
-msgstr "i progresjon"
+msgstr "I prosess"
#: ../user/server_status.php:426
msgid "avg runtime of last 100 results in h (min-max)"
@@ -5635,15 +5584,16 @@ msgstr ""
#: ../user/server_status.php:427
msgid "users in last 24h"
-msgstr "brukere siste 24t"
+msgstr ""
#: ../user/show_host_detail.php:40
+#, fuzzy
msgid "Computer %1"
-msgstr "Datamaskin %1"
+msgstr "Datamaskiner"
#: ../user/stats.php:21
msgid "Statistics and leaderboards"
-msgstr "Statistikk og oppslagstavler"
+msgstr ""
#: ../user/stats.php:28
msgid "Statistics for %1"
@@ -5689,9 +5639,8 @@ msgid "edit the team's name and description"
msgstr "Rediger teamet's navn og beskrivelse"
#: ../user/team.php:35
-#, fuzzy
msgid "add or remove team admins"
-msgstr "legg til eller fjern teamadministratorer"
+msgstr ""
#: ../user/team.php:36
msgid "remove members from the team"
@@ -5731,9 +5680,8 @@ msgid "Remove Team Admin status from this member"
msgstr ""
#: ../user/team_admins.php:40 ../user/team_admins.php:51
-#, fuzzy
msgid "Add or remove Team Admins"
-msgstr "Legg til eller fjern teamadministratorer"
+msgstr ""
#: ../user/team_admins.php:41
msgid "You can select team members as 'Team Admins'. Team Admins can:"
@@ -5754,18 +5702,16 @@ msgid ""
msgstr ""
#: ../user/team_admins.php:47
-#, fuzzy
msgid "Team Admins cannot:"
-msgstr "Teamadministratorer kan ikke:"
+msgstr ""
#: ../user/team_admins.php:49
-#, fuzzy
msgid "Change the team founder"
-msgstr "Endre grunnlegger av team"
+msgstr ""
#: ../user/team_admins.php:50 ../user/team_manage.php:54
msgid "Remove members"
-msgstr "Fjern medlemmer"
+msgstr ""
#: ../user/team_admins.php:53
msgid "If a Team Admin quits the team, they cease to be a Team Admin."
@@ -5794,34 +5740,30 @@ msgid "Add Team Admin"
msgstr ""
#: ../user/team_admins.php:78
-#, fuzzy
msgid "Email address of team member:"
-msgstr "Epostadressen til teammedlem:"
+msgstr ""
#: ../user/team_admins.php:90
-#, fuzzy
msgid "failed to remove admin"
-msgstr "fjerning av administrator feilet"
+msgstr ""
#: ../user/team_admins.php:99
-#, fuzzy
msgid "User is not member of team"
-msgstr "Bruker er ikke medlem av team"
+msgstr ""
#: ../user/team_admins.php:101
msgid "%1 is already an admin of %2"
msgstr ""
#: ../user/team_admins.php:105
-#, fuzzy
msgid "Couldn't add admin"
-msgstr "Kunne ikke legge til administrator"
+msgstr ""
#: ../user/team_admins.php:111 ../user/team_manage.php:85
#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
#, fuzzy
msgid "No such team"
-msgstr "Ingen slikt team"
+msgstr "Ingen slikt team."
#: ../user/team_change_founder_action.php:30
#: ../user/team_change_founder_form.php:33 ../user/team_display.php:67
@@ -5829,11 +5771,11 @@ msgstr "Ingen slikt team"
#: ../user/team_email_list.php:55
#, fuzzy
msgid "no such team"
-msgstr "ingen slikt team"
+msgstr "Ingen slikt team."
#: ../user/team_change_founder_action.php:38
msgid "User is not a member of %1"
-msgstr "Bruker er ikke medlem av %1"
+msgstr ""
#: ../user/team_change_founder_action.php:41
msgid "Changing founder of %1"
@@ -5861,7 +5803,7 @@ msgstr ""
#: ../user/team_change_founder_form.php:55
msgid "decline request"
-msgstr "avslå forespørsel"
+msgstr ""
#: ../user/team_change_founder_form.php:58
msgid ""
@@ -5903,7 +5845,7 @@ msgstr "Et team med det navnet %1 eksisterer allerede - velg et annet navn"
#: ../user/team_create_action.php:54
msgid "Could not create team - please try later."
-msgstr "Kunne ikke opprette team - vennligst prøv igjen senere."
+msgstr "Kunne ikke lage team - vennligst prøv igjen senere"
#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
msgid "Create a team"
@@ -5924,47 +5866,44 @@ msgstr ""
#: ../user/team_delta.php:75
msgid "When"
-msgstr "Når"
+msgstr ""
#: ../user/team_delta.php:76
msgid "User"
-msgstr "Bruker"
+msgstr ""
#: ../user/team_delta.php:77
-#, fuzzy
msgid "Action"
-msgstr "Handling"
+msgstr ""
#: ../user/team_delta.php:78
msgid "Total credit at time of action"
msgstr ""
#: ../user/team_edit_action.php:53
-#, fuzzy
msgid "bad country"
-msgstr "feil land"
+msgstr ""
#: ../user/team_edit_action.php:59
-#, fuzzy
msgid "The name '%1' is being used by another team."
-msgstr "Navnet '%1' er allerede i bruk av et annet team."
+msgstr ""
#: ../user/team_edit_action.php:62
-#, fuzzy
msgid "Must specify team name"
-msgstr "Må spesifisere teamnavn"
+msgstr ""
#: ../user/team_edit_action.php:90
+#, fuzzy
msgid "Could not update team - please try again later."
-msgstr "Kunne ikke oppdatere team - vennligst prøv igjen senere."
+msgstr "Kunne ikke lage team - vennligst prøv igjen senere"
#: ../user/team_edit_form.php:33
msgid "Edit %1"
-msgstr "Rediger %1"
+msgstr ""
#: ../user/team_edit_form.php:34
msgid "Update team info"
-msgstr "Oppdater teaminfo"
+msgstr ""
#: ../user/team_email_list.php:61
msgid "%1 Email List"
@@ -5972,16 +5911,15 @@ msgstr ""
#: ../user/team_email_list.php:63
msgid "Member list of %1"
-msgstr "Medlemsliste for %1"
+msgstr ""
#: ../user/team_email_list.php:78
msgid "Show as plain text"
-msgstr "Vis som ren tekst"
+msgstr ""
#: ../user/team_forum.php:28 ../user/team_forum.php:39
-#, fuzzy
msgid "Create Message Board"
-msgstr "Opprett meldingstavle"
+msgstr ""
#: ../user/team_forum.php:29
msgid "You may create a message board for use by %1."
@@ -6002,17 +5940,15 @@ msgstr ""
#: ../user/team_forum.php:40
#, fuzzy
msgid "Create a message board for %1"
-msgstr "Opprett meldingstavle for %1"
+msgstr "%1 oppslagstavle"
#: ../user/team_forum.php:48
-#, fuzzy
msgid "Team already has a message board"
-msgstr "Team har alerede en meldingstavle"
+msgstr ""
#: ../user/team_forum.php:59
-#, fuzzy
msgid "Team Message Board"
-msgstr "Meldingstavle for team"
+msgstr ""
#: ../user/team_forum.php:71
msgid "Minimum time between posts (seconds)"
@@ -6028,17 +5964,15 @@ msgstr ""
#: ../user/team_forum.php:80
msgid "Submit"
-msgstr "Registrer"
+msgstr ""
#: ../user/team_forum.php:89
-#, fuzzy
msgid "Remove your team's message board."
-msgstr "Fjern meldingstavlen til ditt team"
+msgstr ""
#: ../user/team_forum.php:97
-#, fuzzy
msgid "Really remove message board?"
-msgstr "Virkelig fjerne meldingstavlen?"
+msgstr ""
#: ../user/team_forum.php:98
msgid ""
@@ -6048,39 +5982,35 @@ msgid ""
msgstr ""
#: ../user/team_forum.php:100
-#, fuzzy
msgid "Yes - remove message board"
-msgstr "Ja - fjern meldingstavlen"
+msgstr ""
#: ../user/team_forum.php:121
-#, fuzzy
msgid "Message board removed"
-msgstr "Meldingstavle fjernet"
+msgstr ""
#: ../user/team_forum.php:124
-#, fuzzy
msgid ""
"Your team's message board has been removed. You may now %1create a new one%2."
msgstr ""
-"Ditt teams meldingstavle har blitt fjernet. Du kan nå %1 opprette en ny%2."
#: ../user/team_forum.php:143
msgid "Team Message Board Updated"
msgstr ""
#: ../user/team_forum.php:144
-#, fuzzy
msgid "Update successful"
-msgstr "Oppdatering velykket"
+msgstr ""
#: ../user/team_forum.php:147
+#, fuzzy
msgid "Update failed"
-msgstr "Oppdatering feilet"
+msgstr "Oppdatering feilet:"
#: ../user/team_forum.php:154
#, fuzzy
msgid "Team has no forum"
-msgstr "Team har ikke et forum"
+msgstr "Team info"
#: ../user/team_founder_transfer_action.php:36
msgid "You must be a member of a team to access this page."
@@ -6133,7 +6063,7 @@ msgstr ""
#: ../user/team_founder_transfer_form.php:83
#, fuzzy
msgid "Return to team page"
-msgstr "Retuner til teamsiden"
+msgstr "Retuner til profil."
#: ../user/team_founder_transfer_form.php:28
msgid "You need to be a member of a team to access this page."
@@ -6193,37 +6123,33 @@ msgstr ""
#: ../user/team_join.php:32 ../user/team_join_action.php:32
#: ../user/team_join_form.php:29
-#, fuzzy
msgid "The team %1 is not joinable."
-msgstr "Teamet %1 kan ikke slås sammen."
+msgstr ""
#: ../user/team_join.php:35 ../user/team_join_action.php:35
msgid "Already a member"
-msgstr "Allerede medlem"
+msgstr ""
#: ../user/team_join.php:36 ../user/team_join_action.php:36
msgid "You are already a member of %1."
-msgstr "Du er allerede medlem av %1."
+msgstr ""
#: ../user/team_join.php:42 ../user/team_join_action.php:43
#, fuzzy
msgid "Couldn't join team - please try again later."
-msgstr "Kunne ikke slå sammen team - vennligst prøv igjen senere."
+msgstr "Kunne ikke lage team - vennligst prøv igjen senere"
#: ../user/team_join_action.php:40
-#, fuzzy
msgid "Joined %1"
-msgstr "Sammenslått %1"
+msgstr ""
#: ../user/team_join_action.php:41
-#, fuzzy
msgid "You have joined %1."
-msgstr "Du har slått sammen %1."
+msgstr ""
#: ../user/team_join_form.php:32
-#, fuzzy
msgid "Join %1"
-msgstr "Slå sammen %1"
+msgstr ""
#: ../user/team_join_form.php:33
msgid "Please note:"
@@ -6243,11 +6169,11 @@ msgstr ""
#: ../user/team_lookup.php:84
msgid "Search Results"
-msgstr "Søkeresultater"
+msgstr ""
#: ../user/team_lookup.php:86
msgid "Search results for '%1'"
-msgstr "Søkeresultater for '%1'"
+msgstr ""
#: ../user/team_lookup.php:88
msgid "You may view these teams' members, statistics, and information."
@@ -6268,9 +6194,8 @@ msgid "Team administration for %1"
msgstr ""
#: ../user/team_manage.php:29
-#, fuzzy
msgid "Edit team info"
-msgstr "Rediger teaminfo"
+msgstr ""
#: ../user/team_manage.php:30
msgid "Change team name, URL, description, type, or country"
@@ -6278,28 +6203,27 @@ msgstr ""
#: ../user/team_manage.php:32
msgid "Member list:"
-msgstr "Medlemsliste:"
+msgstr ""
#: ../user/team_manage.php:33 ../user/team_manage.php:37
msgid "HTML"
-msgstr "HTML"
+msgstr ""
#: ../user/team_manage.php:34
msgid "text"
-msgstr "tekst"
+msgstr ""
#: ../user/team_manage.php:35
msgid "View member names and email addresses"
-msgstr "Vis navn på medlemmer og epostadresser"
+msgstr ""
#: ../user/team_manage.php:36
msgid "View change history:"
msgstr ""
#: ../user/team_manage.php:38
-#, fuzzy
msgid "XML"
-msgstr "XML"
+msgstr ""
#: ../user/team_manage.php:39
msgid "See when members joined or quit this team"
@@ -6322,9 +6246,8 @@ msgid "Transfer foundership to another member"
msgstr ""
#: ../user/team_manage.php:58
-#, fuzzy
msgid "Add/remove Team Admins"
-msgstr "Legg til eller fjern teamadministratorer"
+msgstr ""
#: ../user/team_manage.php:59
msgid "Give selected team members Team Admin privileges"
@@ -6332,12 +6255,11 @@ msgstr ""
#: ../user/team_manage.php:61
msgid "Remove team"
-msgstr "Fjern team"
+msgstr ""
#: ../user/team_manage.php:62
-#, fuzzy
msgid "Allowed only if team has no members"
-msgstr "Kun tillatt hvis teamet ikke har medlemmer"
+msgstr ""
#: ../user/team_manage.php:64
msgid "Create or manage a team message board"
@@ -6367,7 +6289,7 @@ msgstr ""
#: ../user/team_manage.php:95
msgid "Team %1 deleted"
-msgstr "Team %1 slettet"
+msgstr ""
#: ../user/team_members.php:36
msgid "Limit exceeded: Can only display the first 1000 members."
@@ -6375,7 +6297,7 @@ msgstr ""
#: ../user/team_members.php:49
msgid "Members of %1"
-msgstr "Medlem av %1"
+msgstr ""
#: ../user/team_quit_action.php:32
msgid "Unable to quit team"
@@ -6386,9 +6308,8 @@ msgid "Team doesn't exist, or you don't belong to it."
msgstr ""
#: ../user/team_quit_form.php:31
-#, fuzzy
msgid "Quit %1"
-msgstr "Forlat %1"
+msgstr ""
#: ../user/team_quit_form.php:32
msgid ""
@@ -6408,12 +6329,11 @@ msgstr "Forlat team"
#: ../user/team_remove_inactive_action.php:31
msgid "Removing users from %1"
-msgstr "Fjerner brukere fra %1"
+msgstr ""
#: ../user/team_remove_inactive_action.php:39
-#, fuzzy
msgid "%1 is not a member of %2"
-msgstr "Bruker er ikke medlem av %1"
+msgstr ""
#: ../user/team_remove_inactive_action.php:42
msgid "%1 has been removed"
@@ -6421,15 +6341,16 @@ msgstr ""
#: ../user/team_remove_inactive_form.php:32
msgid "Remove members from %1"
-msgstr "Fjern brukere fra %1"
+msgstr ""
#: ../user/team_remove_inactive_form.php:39
+#, fuzzy
msgid "Remove?"
-msgstr "Fjerne?"
+msgstr "Fjern"
#: ../user/team_remove_inactive_form.php:40
msgid "Name (ID)"
-msgstr "Navn (ID)"
+msgstr ""
#: ../user/team_remove_inactive_form.php:65
msgid "No members are eligible for removal."
@@ -6437,25 +6358,24 @@ msgstr ""
#: ../user/team_remove_inactive_form.php:68
msgid "Remove users"
-msgstr "Fjern brukere"
+msgstr ""
#: ../user/team_search.php:68
msgid "Team name"
-msgstr "Teamnavn"
+msgstr ""
#: ../user/team_search.php:92
#, fuzzy
msgid "Team search results"
-msgstr "Søkeresultat team"
+msgstr "Forum søkeresultat"
#: ../user/team_search.php:94
-#, fuzzy
msgid "No teams were found matching your criteria. Try another search."
-msgstr "Ingen team som passer til dine kriterier. Prøv et annet søk."
+msgstr ""
#: ../user/team_search.php:96
msgid "Or you can %1create a new team%2."
-msgstr "Eller du kan %1opprette et nytt team%2."
+msgstr ""
#: ../user/team_search.php:100
msgid ""
@@ -6513,15 +6433,15 @@ msgstr ""
#: ../user/user_search.php:51
msgid "Filters"
-msgstr "Filtre"
+msgstr ""
#: ../user/user_search.php:52
msgid "User name starts with"
-msgstr "Brukernavn starter med"
+msgstr ""
#: ../user/user_search.php:53
msgid "Any"
-msgstr "Hvilken som helst"
+msgstr ""
#: ../user/user_search.php:56
msgid "With profile?"
@@ -6546,41 +6466,42 @@ msgstr ""
#: ../user/user_search.php:68
#, fuzzy
msgid "Decreasing average credit"
-msgstr "Gjennomsnitt nylig arbeid utført"
+msgstr "Nylig gjennomsnitts kreditt"
#: ../user/user_search.php:69
+#, fuzzy
msgid "Decreasing total credit"
-msgstr ""
+msgstr "Nylig gjennomsnitts kreditt"
#: ../user/user_search.php:100
msgid "search string must be at least 3 characters"
-msgstr "søkestreng må minst inneholde 3 tegn"
+msgstr ""
#: ../user/user_search.php:133
#, fuzzy
msgid "User search results"
-msgstr "Søkeresultat bruker"
+msgstr "Forum søkeresultat"
#: ../user/user_search.php:140
msgid "Joined"
msgstr ""
#: ../user/user_search.php:148
-#, fuzzy
msgid "No users match your search criteria."
-msgstr "Ingen brukere passer til dine søkekriterier"
+msgstr ""
#: ../user/userw.php:35
msgid "User not found!"
-msgstr "Bruker ikke funnet!"
+msgstr ""
#: ../user/userw.php:44
msgid "Account Data<br/>for %1<br/>Time:"
msgstr ""
#: ../user/userw.php:47
+#, fuzzy
msgid "Team:"
-msgstr "Team:"
+msgstr "Team"
#: ../user/userw.php:48
msgid "Team TotCred:"
@@ -6596,7 +6517,7 @@ msgstr ""
#: ../user/validate_email_addr.php:30
msgid "Validate BOINC email address"
-msgstr "Valider BOINC epostadresse"
+msgstr ""
#: ../user/validate_email_addr.php:31
msgid ""
@@ -6628,9 +6549,8 @@ msgid "Database update failed - please try again later."
msgstr ""
#: ../user/validate_email_addr.php:57
-#, fuzzy
msgid "Validate email address"
-msgstr "Valider BOINC epostadresse"
+msgstr ""
#: ../user/validate_email_addr.php:58
msgid "The email address of your account has been validated."
@@ -6693,14 +6613,12 @@ msgid ""
msgstr ""
#: ../user/workunit.php:32
-#, fuzzy
msgid "can't find workunit"
-msgstr "finner ikke arbeidsenhet"
+msgstr ""
#: ../user/workunit.php:35
-#, fuzzy
msgid "Workunit %1"
-msgstr "Arbeidsenhet %1"
+msgstr ""
#: ../user/workunit.php:43
msgid "canonical result"
@@ -6727,13 +6645,12 @@ msgid "max # of error/total/success tasks"
msgstr ""
#: ../user/workunit.php:64
-#, fuzzy
msgid "errors"
-msgstr "feil"
+msgstr ""
#: ../user/workunit.php:67
msgid "validation"
-msgstr "validering"
+msgstr ""
#: ../user/workunit.php:67
msgid "Pending"
@@ -6752,9 +6669,8 @@ msgid "Generated"
msgstr ""
#: ../project.sample/project.inc:79
-#, fuzzy
msgid "Your personal background."
-msgstr "Din personlige bakgrunn."
+msgstr ""
#: ../project.sample/project.inc:83
msgid ""
@@ -6763,9 +6679,8 @@ msgid ""
msgstr ""
#: ../project.sample/project.inc:87
-#, fuzzy
msgid "Your opinions about %1"
-msgstr "Din mening om %1"
+msgstr ""
#: ../project.sample/project.inc:91
msgid ""
@@ -6785,9 +6700,8 @@ msgid "Maximum CPU % for graphics%10 ... 100%2"
msgstr ""
#: ../project.sample/project_specific_prefs.inc:49
-#, fuzzy
msgid "Run only the selected applications"
-msgstr "Kjør bare valgte applikasjoner"
+msgstr ""
#: ../project.sample/project_specific_prefs.inc:50
msgid ""
@@ -6796,9 +6710,8 @@ msgid ""
msgstr ""
#: ../project.sample/project_specific_prefs.inc:91
-#, fuzzy
msgid "(all applications)"
-msgstr "(alle applikasjoner)"
+msgstr ""
#, fuzzy
#~ msgid "Error:"
diff --git a/locale/nb/BOINC-Setup.mo b/locale/nb/BOINC-Setup.mo
index 66289f2..ed20377 100644
Binary files a/locale/nb/BOINC-Setup.mo and b/locale/nb/BOINC-Setup.mo differ
diff --git a/locale/nb/BOINC-Setup.po b/locale/nb/BOINC-Setup.po
index dd863f2..96a1114 100644
--- a/locale/nb/BOINC-Setup.po
+++ b/locale/nb/BOINC-Setup.po
@@ -7,47 +7,35 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2014-08-31 14:37+0000\n"
-"Last-Translator: Jan <jan at sherdahl.com>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Poedit 1.5.5\n"
"X-Poedit-SearchPath-0: mac_installer\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1409495864.0\n"
"X-Poedit-KeywordsList: _\n"
#: Installer.cpp:124
#, c-format
msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr "Beklager, denne versjonen av %s krever system 10.5 eller høyere."
+msgstr ""
#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
msgid "Yes"
-msgstr "Ja"
+msgstr ""
#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
msgid "No"
msgstr ""
-"Brukere med tillatelse til å administrere denne datamaskinen vil automatisk "
-"få tilgang til å kjøre og kontrollere %s.\n"
-"\n"
-"Ønsker du også at brukere uten administratorrettigheter skal kunne kjøre og "
-"kontrollere %s på denne Mac'en?"
#: PostInstall.cpp:133
msgid "Should BOINC run even when no user is logged in?"
msgstr ""
-"Brukere som har tillatelse til å administrere denne datamaskinen vil "
-"automatisk få tilgang til å kjøre og kontrollere %s.\n"
-"\n"
-"Ønsker du at brukere uten administratorrettigheter skal kunne kjøre og "
-"kontrollere %s på denne Mac'en?"
#: PostInstall.cpp:1416
#, c-format
@@ -58,34 +46,25 @@ msgid ""
"Do you also want non-administrative users to be able to run and control %s "
"on this Mac?"
msgstr ""
-"Brukere med tillatelse til å administrere denne datamaskinen vil automatisk "
-"få tilgang til å kjøre og kontrollere %s.\n"
-"\n"
-"Ønsker du også at brukere uten administratorrettigheter skal kunne kjøre og "
-"kontrollere %s på denne Mac'en?"
#: PostInstall.cpp:1444
#, c-format
msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
msgstr ""
-"Ønsker du å sette %s som standard skjermsparer for alle %s brukere på denne "
-"Mac'en?"
#: uninstall.cpp:82
msgid "OK"
-msgstr "OK"
+msgstr ""
#: uninstall.cpp:136
msgid "Permission error after relaunch"
-msgstr "Tilgangsfeilmelding etter omstart"
+msgstr ""
#: uninstall.cpp:141
msgid ""
"Removal may take several minutes.\n"
"Please be patient."
msgstr ""
-"Avinstallering vil ta flere minutter.\n"
-"Vennligst vent."
#: uninstall.cpp:156
#, c-format
@@ -94,31 +73,26 @@ msgid ""
"\n"
"This will remove the executables but will not touch %s data files."
msgstr ""
-"Er du sikker på at du ønsker å fullstendig fjerne %s fra din datamaskin?\n"
-"\n"
-"Dette vil fjerne programfiler, men ikke slette %s data filer."
#: uninstall.cpp:163
#, c-format
msgid "Canceled: %s has not been touched."
-msgstr "Avbrutt: %s har ikke blitt endret."
+msgstr ""
#: uninstall.cpp:174
#, c-format
msgid "An error occurred: error code %d"
-msgstr "En feil oppsto: Feilkode %d"
+msgstr ""
#: uninstall.cpp:230
msgid "name of user"
-msgstr "navn på bruker"
+msgstr ""
#: uninstall.cpp:272
msgid ""
"Do you also want to remove VirtualBox from your computer?\n"
"(VirtualBox was installed along with BOINC.)"
msgstr ""
-"Vil du også avinstallere VirtualBox fra din datamaskin?\n"
-" (VirtualBox ble installert sammen med BOINC.)"
#: uninstall.cpp:312
#, c-format
@@ -131,13 +105,6 @@ msgid ""
"for each user, the file\n"
"\"%s\"."
msgstr ""
-"Avinnstallasjon ferdig.\n"
-"\n"
-" Det kan hende du ønsker å fjerne resterende elementer ved å benytte Finder:\n"
-"mappen \"%s\"\n"
-"\n"
-"for hver bruker, filen\n"
-"\"%s\"."
#: uninstall.cpp:840
#, c-format
@@ -146,14 +113,11 @@ msgid ""
"computer.\n"
"\n"
msgstr ""
-"Tast inn ditt administrator passord for å fullstendig fjerne %s fra din "
-"datamaskin.\n"
-"\n"
#: uninstall.cpp:1616
msgid "Cancel"
-msgstr "Avbryt"
+msgstr ""
#: uninstall.cpp:1617
msgid "Continue..."
-msgstr "Fortsett... "
+msgstr ""
diff --git a/locale/nb/BOINC-Web.mo b/locale/nb/BOINC-Web.mo
index 2eda995..36dd478 100644
Binary files a/locale/nb/BOINC-Web.mo and b/locale/nb/BOINC-Web.mo differ
diff --git a/locale/nb/BOINC-Web.po b/locale/nb/BOINC-Web.po
index 79ec8dc..6673334 100644
--- a/locale/nb/BOINC-Web.po
+++ b/locale/nb/BOINC-Web.po
@@ -7,66 +7,62 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-09-03 03:41+0000\n"
-"Last-Translator: Jan <jan at sherdahl.com>\n"
+"PO-Revision-Date: 2012-09-16 13:49+0200\n"
+"Last-Translator: Kenneth <kenneth at skjold.biz>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1409715674.0\n"
#: docutil.php:21
msgid "Search"
-msgstr "Søk"
+msgstr ""
#: docutil.php:103
msgid "Return to BOINC main page"
-msgstr "Tilbake til BOINC hovedsiden"
+msgstr ""
#: docutil.php:114
#, php-format
-#, php-format, php-format
msgid "This page is %stranslatable%s."
-msgstr "Denne siden er %soversettbar%s."
+msgstr ""
#: download.php:39
msgid ""
"We recommend that you also install VirtualBox, so your computer can work on "
"science projects that require it."
msgstr ""
-"Vi anbefaler at du også installerer VirtualBox, så din datamaskin kan "
-"arbeide med vitenskapelige prosjekter som er avhengig av denne."
#: download.php:41
msgid "Learn more about VirtualBox."
-msgstr "Lær mer om VirutalBox."
+msgstr ""
#: download.php:51
msgid "Download BOINC + VirtualBox"
-msgstr "Last ned BOINC + VirtualBox"
+msgstr ""
#: download.php:54 download.php:69
#, php-format
msgid "for %s"
-msgstr "for %s"
+msgstr ""
#: download.php:57 download.php:72
#, php-format
msgid "BOINC version %s"
-msgstr "BOINC versjon %s"
+msgstr ""
#: download.php:59
#, php-format
msgid "VirtualBox version %s"
-msgstr "VirtualBox versjon %s"
+msgstr ""
#: download.php:67
msgid "Download BOINC"
-msgstr "Last ned BOINC"
+msgstr ""
#: download.php:123
msgid ""
@@ -74,75 +70,61 @@ msgid ""
"projects like SETI at home, Climateprediction.net, Rosetta at home, World "
"Community Grid, and many others."
msgstr ""
-"BOINC er et program som lar deg donere inaktiv datamaskintid til "
-"vitenskapelige prosjekter som SETI at home, Climateprediction.net, "
-"Rosetta at home, World Community Grid og mange flere."
#: download.php:125
msgid ""
"After installing BOINC on your computer, you can connect it to as many of "
"these projects as you like."
msgstr ""
-"Etter å ha installert BOINC på din datamaskin, kan du knytte den opp til så "
-"mange av disse prosjektene du ønsker."
#: download.php:127
msgid ""
"You may run this software on a computer only if you own the computer or have "
"the permission of its owner."
msgstr ""
-"Du kan kjøre denne programvaren på en datamaskin bare hvis du er eier av den "
-"eller har tillatelse fra dens eier."
#: download.php:132
msgid ""
"We recommend that you download BOINC from the Google Play Store or Amazon "
"Appstore, not from here."
msgstr ""
-"Vi anbefaler deg å laste ned BOINC fra Google Play Store eller Amazon "
-"Appstore, og ikke fra denne siden."
#: download.php:167
msgid "System requirements"
-msgstr "Systemkrav"
+msgstr ""
#: download.php:168
msgid "Release notes"
-msgstr "Utgivelsesmerknader"
+msgstr ""
#: download.php:169 index.php:86
msgid "Help"
-msgstr "Hjelp"
+msgstr ""
#: download.php:170
msgid "All versions"
-msgstr "Alle versjoner"
+msgstr ""
#: download.php:171
msgid "Version history"
-msgstr "Versjonslogg"
+msgstr ""
#: download.php:172
msgid "GPU computing"
-msgstr "GPU beregning"
+msgstr ""
#: download.php:190
msgid "BOINC: compute for science"
-msgstr "BOINC: beregne for vitenskap"
+msgstr ""
#: help.php:12
#, php-format
-#, php-format, php-format
msgid ""
"BOINC Online Help lets you talk one-on-one with experienced BOINC users, who "
"can: %s answer questions about BOINC and volunteer computing; %s walk you "
"through the process of installing and using BOINC; %s troubleshoot any "
"problems you might have."
msgstr ""
-"BOINC online hjelp lar deg snakke med erfarne BOINC brukere som kan: %s "
-"svare på spørsmål angående BOINC og frivillig beregning; %s veilede deg "
-"gjennom installasjonsprosessen og bruk av BOINC; %s feilsøke eventuelle "
-"problemer du måtte ha."
#: help.php:21
#, php-format
@@ -152,132 +134,104 @@ msgid ""
"Skype, please %sdownload and install it now%s. When you're finished, return "
"to this page."
msgstr ""
-"BOINC online hjelp er basert på Skype, et telefonsystem via Internet. Skype "
-"er gratis (både programvaren og samtalene). Hvis du ikke allerede har Skype "
-"installert, vennligst %slast ned og installer det nå%s. Når du er ferdig, "
-"kom tilbake til denne siden."
#: help.php:28
-#, fuzzy
msgid ""
"The best way to get help is by voice, for which you need either built-in "
"microphone and speakers or an external headset for your computer. You can "
"also use Skype's text-based chat system or regular email (if you don't have "
"Skype) to communicate with Help Volunteers."
msgstr ""
-"Den beste måten å få hjelp på er via en samtale. Til dette trenger du enten "
-"en innebygd mikrofon og høyttalere, eller et eksternt headset tilkoblet din "
-"datamaskin. Du kan også benytte Skype sitt tekstbaserte chat system eller "
-"vanlig epost (hvis du ikke har Skype installert) for å kommunisere med våre "
-"frivillige supportmedarbeidere."
#: help.php:31
-#, fuzzy
msgid ""
"Volunteers speaking several languages are available. Please select a "
"language:"
msgstr ""
-"Våre supportmedarbeidere snakker flere språk og er tilgjengelige. Vennligst "
-"velg et språk:"
#: help.php:47
-#, fuzzy
msgid "Be a Help Volunteer"
-msgstr "Bli frivillig supportmedarbeider"
+msgstr ""
#: help.php:50
#, php-format
-#, fuzzy, php-format
msgid ""
"If you're an experienced BOINC user, we encourage you to %sbecome a Help "
"Volunteer%s. It's a great way to help the cause of scientific research and "
"volunteer computing - and it's fun!"
msgstr ""
-"Hvis du er en erfaren BOINC bruker, oppfordrer vi deg til å %sbli en "
-"supportmedarbeider%s. Det er en fin måte å bidra til vitenskapelig "
-"forskning og frivillig databehandling - og det er morsomt!"
#: help.php:56
#, php-format
-#, fuzzy, php-format
msgid ""
"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
msgstr ""
-"Hvis du allerede er en frivillig supportmedarbeider: For å endre dine "
-"innstillinger, %sklikk her%s."
#: help_funcs.php:107
-#, fuzzy
msgid ""
"BOINC helpers are unpaid volunteers. Their advice is not endorsed by BOINC "
"or the University of California."
msgstr ""
-"BOINC supportmedarbeidere får ikke betalt for sitt frivillige arbeid. Deres "
-"råd bifalles ikke av BOINC eller University of California."
#: help_funcs.php:110
msgid "%1Never%2 give email address or password information to BOINC helpers."
msgstr ""
-"Oppgi %1aldri%2 informasjon angående din epostadresse eller ditt passord til "
-"BOINC supportmedarbeidere."
#: index.php:24
msgid "Computing power"
-msgstr "Beregningskraft"
+msgstr ""
#: index.php:26
msgid "Top 100 volunteers"
-msgstr "Topp 100 frivillige"
+msgstr ""
#: index.php:27
msgid "Statistics"
-msgstr "Statistikk"
+msgstr ""
#: index.php:55
msgid "Active:"
-msgstr "Aktiv:"
+msgstr ""
#: index.php:55
msgid "volunteers,"
-msgstr "frivillige,"
+msgstr ""
#: index.php:55
msgid "computers.\n"
msgstr ""
-"datamaskiner.\n"
-" "
#: index.php:56
msgid "24-hour average:"
-msgstr "24 timers gjennomsnitt:"
+msgstr ""
#: index.php:56
msgid "PetaFLOPS."
-msgstr "PetaFLOPS."
+msgstr ""
#: index.php:68
msgid "News"
-msgstr "Nyheter "
+msgstr ""
#: index.php:83
msgid "Volunteer"
-msgstr "Frivillig"
+msgstr ""
#: index.php:85
msgid "Download"
-msgstr "Last ned"
+msgstr ""
#: index.php:87 index.php:120 index.php:171
msgid "Documentation"
-msgstr "Dokumentasjon"
+msgstr ""
#: index.php:88
msgid "Add-ons"
-msgstr "Tillegg"
+msgstr ""
#: index.php:89
msgid "Links"
-msgstr "Lenker "
+msgstr ""
#: index.php:94
msgid ""
@@ -285,59 +239,45 @@ msgid ""
"diseases, study global warming, discover pulsars, and do many other types of "
"scientific research. It's safe, secure, and easy:"
msgstr ""
-"Bruk inaktiv tid på din datamaskin (Windows, Mac, Linux eller Android) for å "
-"kurere sykdommer, studere global oppvarming, oppdage pulsarer, og hjelp til "
-"med mange andre typer av vitenskapelig forskning. Det er trygt, sikkert og "
-"enkelt:"
#: index.php:96
msgid "Choose projects"
-msgstr "Velg prosjekter"
+msgstr ""
#: index.php:97
msgid "Download BOINC software"
-msgstr "Last ned BOINC programvare"
+msgstr ""
#: index.php:98
msgid "Enter an email address and password."
-msgstr "Tast inn en epostadresse og et passord."
+msgstr ""
#: index.php:102
#, php-format
-#, fuzzy, php-format
msgid ""
"Or, if you run several projects, try an %saccount manager%s such as %"
"sGridRepublic%s or %sBAM!%s. "
msgstr ""
-"Eller hvis du kjører flere prosjekter, prøv en %skontobehandler%s som for "
-"eksempel %sGridRepublic%s eller %sBAM!%s. "
#: index.php:118
-#, fuzzy
msgid "Compute with BOINC"
-msgstr "Beregn med BOINC"
+msgstr ""
#: index.php:121
msgid "Software updates"
-msgstr "Programvareoppdateringer"
+msgstr ""
#: index.php:128
-#, fuzzy
msgid ""
"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
"you the computing power of thousands of CPUs."
msgstr ""
-"%1Forskere%2: Bruk BOINC for å opprette et %3frivillig beregningsprosjekt%4 "
-"som gir deg datakraften tiltusenvis av prosessorer."
#: index.php:132
-#, fuzzy
msgid ""
"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
"Center%4."
msgstr ""
-"%1Universiteter%2: Bruk BOINC til å opprette et %3virtuelt tungregnesenter "
-"på deres universitetsområde%4."
#: index.php:137
msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -345,23 +285,23 @@ msgstr ""
#: index.php:149
msgid "The BOINC project"
-msgstr "BOINC prosjektet"
+msgstr ""
#: index.php:155
msgid "Message boards"
-msgstr "Diskusjonsfora"
+msgstr ""
#: index.php:156
msgid "Email lists"
-msgstr "Epostlister"
+msgstr ""
#: index.php:157
msgid "Personnel and contributors"
-msgstr "Personal og bidragsytere"
+msgstr ""
#: index.php:158
msgid "Events"
-msgstr "Hendelser"
+msgstr ""
#: index.php:159
msgid "Papers and talks"
@@ -369,31 +309,31 @@ msgstr ""
#: index.php:160
msgid "Research projects"
-msgstr "Forskningsprosjekter"
+msgstr ""
#: index.php:161
msgid "Logos and graphics"
-msgstr "Logoer og bildemateriale"
+msgstr ""
#: index.php:162
msgid "and"
-msgstr "og"
+msgstr ""
#: index.php:166
msgid "Help wanted"
-msgstr "Hjelp ønskes"
+msgstr ""
#: index.php:168
msgid "Programming"
-msgstr "Programmering"
+msgstr ""
#: index.php:169
msgid "Translation"
-msgstr "Oversettelse"
+msgstr ""
#: index.php:170
msgid "Testing"
-msgstr "Tester"
+msgstr ""
#: index.php:172
msgid "Publicity"
@@ -401,38 +341,35 @@ msgstr ""
#: index.php:174
msgid "Software development"
-msgstr "Programvareutvikling"
+msgstr ""
#: index.php:175
msgid "APIs for add-on software"
-msgstr "API'er for tilleggsprogramvare"
+msgstr ""
#: index.php:217
#, php-format
-#, fuzzy, php-format
msgid ""
"Open-source software for %svolunteer computing%s and %sgrid computing%s."
msgstr ""
-"Åpen kildekode programvare for %sfrivillig beregning%s og %sdistribuert "
-"beregning%s."
#: index.php:230
msgid "BOINC is based at The University of California, Berkeley"
-msgstr "BOINC holder til ved Universitetet i California, Berkeley"
+msgstr ""
#: projects.inc:14
-#, fuzzy
msgid "Distributed sensing"
-msgstr "Distribuert sunn fornuft"
+msgstr ""
# 78%
#: projects.inc:19
+#, fuzzy
msgid "Stanford University"
-msgstr "Stanford University"
+msgstr "Oxford University"
#: projects.inc:20
msgid "Seismology"
-msgstr "Seismologi"
+msgstr ""
#: projects.inc:21
msgid ""
@@ -442,13 +379,12 @@ msgid ""
msgstr ""
#: projects.inc:27
-#, fuzzy
msgid "BOINC Poland Foundation"
-msgstr "Den polske BOINC stiftelsen"
+msgstr ""
#: projects.inc:28
msgid "Environmental research"
-msgstr "Miljøforskning"
+msgstr ""
#: projects.inc:29
msgid ""
@@ -465,12 +401,13 @@ msgstr ""
#: projects.inc:37
msgid "Cognitive science and artifical intelligence"
-msgstr "Kognitiv vitenskap og kunstig intelligens"
+msgstr ""
#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
#: projects.inc:464 projects.inc:511
+#, fuzzy
msgid "Private"
-msgstr "Privat"
+msgstr "privat"
#: projects.inc:61
msgid "Artificial intelligence"
@@ -587,9 +524,8 @@ msgid ""
msgstr ""
#: projects.inc:146
-#, fuzzy
msgid "The Swiss Tropical Institute"
-msgstr "Det Sveitsiske tropiske institutt"
+msgstr ""
#: projects.inc:147
msgid "Epidemiology"
@@ -615,7 +551,6 @@ msgid "Biology"
msgstr "Biologi"
#: projects.inc:172
-#, fuzzy
msgid ""
"Determine the 3-dimensional shapes of proteins in research that may "
"ultimately lead to finding cures for some major human diseases. By running "
@@ -624,27 +559,17 @@ msgid ""
"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
"Cancer, and Alzheimer's"
msgstr ""
-"Fastsett den 3-dinemsjonale formen til proteiner i forskningen som til sist "
-"leder til å kurere noen viktige menneskelige sykommer. Ved å kjøre "
-"Rosetta at home vil du hjelpe oss å få fart på og utvide vår forskning på måter "
-"vi ikke kunne forsøkt uten din hjelp. Du vil også hjelpe vår innsats i å "
-"designe nye proteiner for å bekjempe sykdommer som HIV, Malaria, Kref og "
-"Alzheimer"
#: projects.inc:178
msgid "University of Vienna"
msgstr "University of Vienna"
#: projects.inc:180
-#, fuzzy
msgid ""
"Calculate similarities between proteins. SIMAP provides a public database of "
"the resulting data, which plays a key role in many bioinformatics research "
"projects."
msgstr ""
-"Beregne likheter mellom proteiner. SIMAP sørger for en offentlig database "
-"med resulterende data, som spiller en nøkkelrolle imange "
-"forskningsprosjekter angående bioinformatikk"
#: projects.inc:186
msgid "Earth Sciences"
@@ -676,7 +601,7 @@ msgstr ""
#: projects.inc:213
msgid "Mechanical engineering"
-msgstr "Mekanisk ingeniørvitenskap"
+msgstr ""
#: projects.inc:214
msgid ""
@@ -724,33 +649,26 @@ msgid "University of Illinois at Urbana-Champaign"
msgstr ""
#: projects.inc:264
-#, fuzzy
msgid ""
"The goal of Cosmology at Home is to search for the model that best describes "
"our Universe and to find the range of models that agree with the available "
"astronomical particle physics data."
msgstr ""
-"Målsettingen til Cosmology at Home er å søke etter modellen som best beskriver "
-"vår univers og å finne områder medmodeller som stemmer overens med "
-"tilgjengelige astronomiske partikkelfysikkdata."
#: projects.inc:270
msgid "Rensselaer Polytechnic Institute"
msgstr ""
#: projects.inc:272
-#, fuzzy
msgid ""
"The goal of Milkyway at Home is to create a highly accurate three dimensional "
"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
"Survey."
msgstr ""
-"Målsetting til Milkyway at Home er å lage en nøyaktig tredimensjonal modell av "
-"Melkeveien ved å bruke datasanket av Sloan Digital Sky Survey."
#: projects.inc:278
msgid "Leiden University, The Netherlands"
-msgstr "Universitetet i Leiden, Nederland"
+msgstr ""
#: projects.inc:280
msgid ""
@@ -767,9 +685,8 @@ msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
msgstr ""
#: projects.inc:295
-#, fuzzy
msgid "Astrophysics"
-msgstr "Astrofysikk"
+msgstr ""
#: projects.inc:296
msgid ""
@@ -813,7 +730,6 @@ msgid "Astrophysics, astrobiology"
msgstr ""
#: projects.inc:328
-#, fuzzy
msgid ""
"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
"goal is to detect intelligent life outside Earth. One approach, known as "
@@ -821,11 +737,6 @@ msgid ""
"signals from space. Such signals are not known to occur naturally, so a "
"detection would provide evidence of extraterrestrial technology."
msgstr ""
-"SETI (søk etter utenomjordisk intelligens) er et vitenskapelig område hvis "
-"målsetting er å detektere intelligent liv i verdensrommet. En instilling, "
-"kjent som radio SETI, bruker radioteleskop for å lytte etter smal båndbredde "
-"radiosignaler fra verdensrommet. Slike signaler er ikke kjent at oppstår "
-"naturlig, så detektering ville sørge for bevis for utenomjordisk teknologi."
#: projects.inc:342
msgid "Bielefeld University of Applied Sciences"
diff --git a/locale/nl/BOINC-Manager.mo b/locale/nl/BOINC-Manager.mo
index 7c11256..9aa35bf 100644
Binary files a/locale/nl/BOINC-Manager.mo and b/locale/nl/BOINC-Manager.mo differ
diff --git a/locale/nl/BOINC-Manager.po b/locale/nl/BOINC-Manager.po
index a6b7dc1..74d696b 100644
--- a/locale/nl/BOINC-Manager.po
+++ b/locale/nl/BOINC-Manager.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC Manager 6.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2014-01-17 18:18+0000\n"
+"POT-Creation-Date: 2014-01-13 00:00-0800\n"
+"PO-Revision-Date: 2014-01-17 18:17+0000\n"
"Last-Translator: Rene <oskamjr at ziggo.nl>\n"
"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
"Language: nl\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-POOTLE-MTIME: 1389982727.0\n"
+"X-POOTLE-MTIME: 1389982668.0\n"
# 81%
#: AccountInfoPage.cpp:387
@@ -533,7 +533,7 @@ msgstr "P&restaties"
msgid "A&dvanced"
msgstr "&Geavanceerd"
-#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:267
#: wizardex.cpp:374 wizardex.cpp:381
msgid "&Help"
msgstr "&Help"
@@ -572,27 +572,27 @@ msgstr ""
"%s gaat de huidige client afsluiten en je vragen\n"
"naar een 'host' om een andere verbinding te maken."
-#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
+#: AdvancedFrame.cpp:1738 DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: AdvancedFrame.cpp:1754
+#: AdvancedFrame.cpp:1747
#, c-format
msgid "%s has successfully added %s"
msgstr "%s heeft met succes %s toegevoegd"
-#: AdvancedFrame.cpp:1893
+#: AdvancedFrame.cpp:1886
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: AdvancedFrame.cpp:1897
+#: AdvancedFrame.cpp:1890
#, c-format
msgid "Connecting to %s"
msgstr "Bezig te verbinden met %s"
-#: AdvancedFrame.cpp:1900
+#: AdvancedFrame.cpp:1893
#, c-format
msgid "Connected to %s (%s)"
msgstr "Verbonden met %s (%s)"
@@ -648,7 +648,7 @@ msgstr "%s &Afsluiten"
msgid "%s - Communication"
msgstr "%s - Communicatie"
-#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:438
msgid "Cancel"
msgstr "Annuleren"
@@ -857,65 +857,65 @@ msgstr ""
msgid "BOINC Manager"
msgstr "BOINC Manager"
-#: BOINCGUIApp.cpp:572
+#: BOINCGUIApp.cpp:568
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC Manager is automatisch opgestart door het besturingssysteem"
-#: BOINCGUIApp.cpp:574
+#: BOINCGUIApp.cpp:570
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "Start BOINC zodat deze alleen zichtbaar is in het systeemvak"
-#: BOINCGUIApp.cpp:576
+#: BOINCGUIApp.cpp:572
msgid "Directory containing the BOINC Client executable"
msgstr "Map waar de BOINC client zich bevindt"
-#: BOINCGUIApp.cpp:577
+#: BOINCGUIApp.cpp:573
msgid "BOINC data directory"
msgstr "BOINC data map"
-#: BOINCGUIApp.cpp:579
+#: BOINCGUIApp.cpp:575
msgid "Host name or IP address"
msgstr "Computer naam of IP adres"
-#: BOINCGUIApp.cpp:580
+#: BOINCGUIApp.cpp:576
msgid "GUI RPC port number"
msgstr "GUI RPC poortnummer"
-#: BOINCGUIApp.cpp:581
+#: BOINCGUIApp.cpp:577
msgid "Password"
msgstr "Wachtwoord"
-#: BOINCGUIApp.cpp:582
+#: BOINCGUIApp.cpp:578
msgid "Startup BOINC with these optional arguments"
msgstr "Start BOINC op met deze opties"
-#: BOINCGUIApp.cpp:583
+#: BOINCGUIApp.cpp:579
msgid "disable BOINC security users and permissions"
msgstr "schakel de BOINC toegangs- en gebruikersrechten uit"
-#: BOINCGUIApp.cpp:584
+#: BOINCGUIApp.cpp:580
msgid "set skin debugging mode to enable skin manager error messages"
msgstr ""
"schakel de skin-debugger modus in om fout berichten mogelijk te maken van de "
"skin-manager"
-#: BOINCGUIApp.cpp:585
+#: BOINCGUIApp.cpp:581
msgid "multiple instances of BOINC Manager allowed"
msgstr "meerdere gelijktijdige sessies van BOINC-Manager mogelijk"
-#: BOINCGUIApp.cpp:587
+#: BOINCGUIApp.cpp:583
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Niet gebruikt: vanwege fout in Xcode 4.2"
-#: BOINCGUIApp.cpp:814
+#: BOINCGUIApp.cpp:801
msgid "(Automatic Detection)"
msgstr "(Automatische Detectie)"
-#: BOINCGUIApp.cpp:815
+#: BOINCGUIApp.cpp:802
msgid "(Unknown)"
msgstr "(Onbekend)"
-#: BOINCGUIApp.cpp:816
+#: BOINCGUIApp.cpp:803
msgid "(User Defined)"
msgstr "(Gedefineerd door gebruiker)"
@@ -1101,7 +1101,7 @@ msgid "Berkeley Open Infrastructure for Network Computing"
msgstr "Berkeley Open Infrastructure for Network Computing"
#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
-#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:162
msgid "&OK"
msgstr "&OK"
@@ -1166,11 +1166,11 @@ msgstr ""
"Weet je zeker dat je de lokale voorkeuren wilt wissen?\n"
"(Dit heeft geen gevolgen voor de exclusieve programma's)"
-#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1035
msgid "Confirmation"
msgstr "Bevestiging"
-#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:951
#, c-format
msgid "%s - Preferences"
msgstr "%s - Voorkeuren"
@@ -1185,11 +1185,11 @@ msgstr ""
"Klik op 'OK' om ze op te slaan of op 'Wissen' om terug te gaan\n"
"naar online instellingen (exclusieve programma's blijven intact)."
-#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:433
msgid "Clear"
msgstr "Wissen"
-#: DlgAdvPreferencesBase.cpp:66
+#: DlgAdvPreferencesBase.cpp:66 sg_DlgPreferences.cpp:434
msgid "clear all local preferences and close the dialog"
msgstr "Wis alle lokale voorkeuren en sluit het venster"
@@ -1209,7 +1209,7 @@ msgstr "schijf- en geheugengebruik"
msgid "exclusive applications"
msgstr "exclusieve programma's"
-#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:429
msgid "OK"
msgstr "OK"
@@ -1222,7 +1222,7 @@ msgid "close the dialog without saving"
msgstr "sluit het venster zonder op te slaan"
#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
-#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:444
msgid "Help"
msgstr "Help"
@@ -1276,7 +1276,7 @@ msgstr ""
"aantal minuten"
#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
-#: sg_DlgPreferences.cpp:417
+#: sg_DlgPreferences.cpp:422
msgid "minutes"
msgstr "minuten"
@@ -1301,7 +1301,7 @@ msgid "start work at this time"
msgstr "start het werk op dit tijdstip"
#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
-#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
+#: sg_DlgPreferences.cpp:331 sg_DlgPreferences.cpp:353
msgid "and"
msgstr "en"
@@ -1572,42 +1572,42 @@ msgstr "Verwijder een programma van de lijst"
msgid "For advanced options, refer to "
msgstr "Voor geavanceerde opties, raadpleeg het "
-#: DlgEventLog.cpp:219
+#: DlgEventLog.cpp:221
#, c-format
msgid "%s - Event Log"
msgstr "%s - Gebeurtenissen Logboek"
-#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: DlgEventLog.cpp:234 ViewMessages.cpp:117 ViewProjects.cpp:219
#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
#: ViewWork.cpp:232
msgid "Project"
msgstr "Project"
-#: DlgEventLog.cpp:233 ViewMessages.cpp:118
+#: DlgEventLog.cpp:235 ViewMessages.cpp:118
msgid "Time"
msgstr "Tijd"
-#: DlgEventLog.cpp:234 ViewMessages.cpp:119
+#: DlgEventLog.cpp:236 ViewMessages.cpp:119
msgid "Message"
msgstr "Bericht"
-#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
+#: DlgEventLog.cpp:292 DlgEventLog.cpp:356
msgid "&Show only this project"
msgstr "Alleen dit project laten zien"
-#: DlgEventLog.cpp:294
+#: DlgEventLog.cpp:296
msgid "Copy &All"
msgstr "&Alles kopiëren"
-#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
+#: DlgEventLog.cpp:298 DlgEventLog.cpp:302 ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr "Alle berichten kopiëren naar het klembord."
-#: DlgEventLog.cpp:305
+#: DlgEventLog.cpp:307
msgid "Copy &Selected"
msgstr "&Selectie kopiëren"
-#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 ViewMessages.cpp:97
+#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 ViewMessages.cpp:97
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or command key while clicking on messages."
@@ -1616,7 +1616,7 @@ msgstr ""
"berichten selecteren door met behulp van de Shift of Command toets op de "
"bestanden te klikken."
-#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 ViewMessages.cpp:99
+#: DlgEventLog.cpp:312 DlgEventLog.cpp:320 ViewMessages.cpp:99
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or control key while clicking on messages."
@@ -1625,24 +1625,24 @@ msgstr ""
"berichten selecteren door met behulp van de Shift of Ctrl toets op de "
"bestanden te klikken."
-#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
+#: DlgEventLog.cpp:327 DlgItemProperties.cpp:67
msgid "&Close"
msgstr "Sluiten"
-#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
+#: DlgEventLog.cpp:336 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:447
#, c-format
msgid "Get help with %s"
msgstr "Hulp krijgen bij %s"
-#: DlgEventLog.cpp:348
+#: DlgEventLog.cpp:350
msgid "Show all &messages"
msgstr "Toon alle berichten"
-#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
+#: DlgEventLog.cpp:351 DlgEventLog.cpp:353
msgid "Show messages for all projects"
msgstr "Laat berichten zien van alle projecten"
-#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
+#: DlgEventLog.cpp:357 DlgEventLog.cpp:359
msgid "Show only the messages for the selected project"
msgstr "Laat alleen berichten zien van het geselecteerde project"
@@ -1695,7 +1695,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "Onthoud deze keuze en laat dit venster niet meer zien."
#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
-#: DlgSelectComputer.cpp:168 wizardex.cpp:378
+#: DlgSelectComputer.cpp:167 wizardex.cpp:378
msgid "&Cancel"
msgstr "&Annuleren"
@@ -1859,8 +1859,8 @@ msgstr "Eigenschappen van taak "
msgid "Application"
msgstr "Programma"
-#: DlgItemProperties.cpp:329 ViewWork.cpp:239
-msgid "Name"
+#: DlgItemProperties.cpp:329
+msgid "Workunit name"
msgstr "Bestandsnaam"
#: DlgItemProperties.cpp:330
@@ -1919,7 +1919,7 @@ msgstr "Map"
msgid "Process ID"
msgstr "Proces ID"
-#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
+#: DlgItemProperties.cpp:431 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
msgid "Local: "
msgstr "Lokaal: "
@@ -2007,7 +2007,7 @@ msgstr "Laat dit gedeelte leeg indien niet vereist"
msgid "User Name:"
msgstr "Gebruikersnaam:"
-#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:151
#: ProxyPage.cpp:346 ProxyPage.cpp:366
msgid "Password:"
msgstr "Wachtwoord:"
@@ -2067,12 +2067,12 @@ msgstr ""
"De standaard taal van de %s is gewijzigd. Om dit te activeren dien je de %s "
"te herstarten."
-#: DlgSelectComputer.cpp:91
+#: DlgSelectComputer.cpp:90
#, c-format
msgid "%s - Select Computer"
msgstr "%s - Selecteer computer"
-#: DlgSelectComputer.cpp:125
+#: DlgSelectComputer.cpp:124
#, c-format
msgid ""
"Another instance of %s is already running \n"
@@ -2081,7 +2081,7 @@ msgstr ""
"%s wordt al een keer uitgevoerd op deze \n"
"computer. Kies de client die u wilt controleren."
-#: DlgSelectComputer.cpp:143
+#: DlgSelectComputer.cpp:142
msgid "Host name:"
msgstr "Host naam:"
@@ -2531,7 +2531,7 @@ msgstr "Controleer de gebruikersnaam en het wachtwoord en probeer opnieuw."
msgid "Check the email address and password, and try again."
msgstr "Controleer het email adres en het wachtwoord en probeer opnieuw."
-#: NoticeListCtrl.cpp:222
+#: NoticeListCtrl.cpp:221
msgid "more..."
msgstr "meer..."
@@ -2595,11 +2595,11 @@ msgstr "Je hebt dit project reeds toegevoegd. Kies a.u.b. een ander project."
msgid "Communicating with project."
msgstr "Aan het communiceren met het project."
-#: ProjectProcessingPage.cpp:509
+#: ProjectProcessingPage.cpp:507
msgid "Required files not found on the server."
msgstr "Benodigde bestanden niet gevonden op de server."
-#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
+#: ProjectProcessingPage.cpp:510 ProjectProcessingPage.cpp:572
msgid "An internal server error has occurred."
msgstr "Er is een server fout opgetreden."
@@ -2708,8 +2708,7 @@ msgid "I agree to the terms of use."
msgstr "Ik ga akkoord met de voorwaarden."
#: TermsOfUsePage.cpp:237
-#, fuzzy
-msgid "I do not agree to the terms of use."
+msgid "I do not agree with the terms of use."
msgstr "Ik ga NIET akkoord met de voorwaarden."
#: UnavailablePage.cpp:183
@@ -3401,6 +3400,10 @@ msgstr "Nog te gaan (geschat)"
msgid "Deadline"
msgstr "Rapporteren voor"
+#: ViewWork.cpp:239
+msgid "Name"
+msgstr "Bestandsnaam"
+
#: ViewWork.cpp:264
msgid "Tasks"
msgstr "Werk"
@@ -3610,121 +3613,117 @@ msgid "Click OK to set preferences."
msgstr "Klik op 'OK' om instellingen vast te leggen."
#: sg_DlgPreferences.cpp:278
-msgid ""
-"Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
+msgid "Click Clear to restore web-based settings."
+msgstr "Klik op 'Wissen' om terug te keren naar online instellingen."
#: sg_DlgPreferences.cpp:285
-#, fuzzy
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
+msgid "For additional settings, select Computing Preferences in "
msgstr "Voor aanvullende opties klik je op 'Verwerkings voorkeuren' in "
-#: sg_DlgPreferences.cpp:313
+#: sg_DlgPreferences.cpp:290
+msgid "the Advanced View."
+msgstr "de Geavanceerde Weergave."
+
+#: sg_DlgPreferences.cpp:318
msgid "Do work only between:"
msgstr "Werk actief tussen:"
-#: sg_DlgPreferences.cpp:335
+#: sg_DlgPreferences.cpp:340
msgid "Connect to internet only between:"
msgstr "Internet verbinding tussen:"
-#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+#: sg_DlgPreferences.cpp:362 sg_DlgPreferences.cpp:379
msgid "Use no more than:"
msgstr "Gebruik maximaal:"
-#: sg_DlgPreferences.cpp:370
+#: sg_DlgPreferences.cpp:375
msgid "of disk space"
msgstr "schijfruimte"
-#: sg_DlgPreferences.cpp:387
+#: sg_DlgPreferences.cpp:392
msgid "of the processor"
msgstr "van processor"
-#: sg_DlgPreferences.cpp:391
+#: sg_DlgPreferences.cpp:396
msgid "Do work while on battery?"
msgstr "Actief indien op accu?"
-#: sg_DlgPreferences.cpp:404
+#: sg_DlgPreferences.cpp:409
msgid "Do work after idle for:"
msgstr "Indien inactief starten na:"
-#: sg_DlgPreferences.cpp:429
-#, fuzzy
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Wis alle lokale voorkeuren en sluit het venster"
-
-#: sg_DlgPreferences.cpp:602 sg_DlgPreferences.cpp:605
-#: sg_DlgPreferences.cpp:681 sg_DlgPreferences.cpp:685
-#: sg_DlgPreferences.cpp:697 sg_DlgPreferences.cpp:701
-#: sg_DlgPreferences.cpp:844 sg_DlgPreferences.cpp:855
+#: sg_DlgPreferences.cpp:607 sg_DlgPreferences.cpp:610
+#: sg_DlgPreferences.cpp:686 sg_DlgPreferences.cpp:690
+#: sg_DlgPreferences.cpp:702 sg_DlgPreferences.cpp:706
+#: sg_DlgPreferences.cpp:849 sg_DlgPreferences.cpp:860
msgid "Anytime"
msgstr "Altijd"
-#: sg_DlgPreferences.cpp:638
+#: sg_DlgPreferences.cpp:643
msgid "100 MB"
msgstr "100 MB"
-#: sg_DlgPreferences.cpp:639
+#: sg_DlgPreferences.cpp:644
msgid "200 MB"
msgstr "200 MB"
-#: sg_DlgPreferences.cpp:640
+#: sg_DlgPreferences.cpp:645
msgid "500 MB"
msgstr "500 MB"
-#: sg_DlgPreferences.cpp:641
+#: sg_DlgPreferences.cpp:646
msgid "1 GB"
msgstr "1 GB"
-#: sg_DlgPreferences.cpp:642
+#: sg_DlgPreferences.cpp:647
msgid "2 GB"
msgstr "2 GB"
-#: sg_DlgPreferences.cpp:643
+#: sg_DlgPreferences.cpp:648
msgid "5 GB"
msgstr "5 GB"
-#: sg_DlgPreferences.cpp:644
+#: sg_DlgPreferences.cpp:649
msgid "10 GB"
msgstr "10 GB"
-#: sg_DlgPreferences.cpp:645
+#: sg_DlgPreferences.cpp:650
msgid "20 GB"
msgstr "20 GB"
-#: sg_DlgPreferences.cpp:646
+#: sg_DlgPreferences.cpp:651
msgid "50 GB"
msgstr "50 GB"
-#: sg_DlgPreferences.cpp:647
+#: sg_DlgPreferences.cpp:652
msgid "100 GB"
msgstr "100 GB"
-#: sg_DlgPreferences.cpp:717
+#: sg_DlgPreferences.cpp:722
#, c-format
msgid "%d MB"
msgstr "%d MB"
-#: sg_DlgPreferences.cpp:719
+#: sg_DlgPreferences.cpp:724
#, c-format
msgid "%4.2f GB"
msgstr "%4.2f GB"
-#: sg_DlgPreferences.cpp:760
+#: sg_DlgPreferences.cpp:765
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: sg_DlgPreferences.cpp:796
+#: sg_DlgPreferences.cpp:801
msgid "0 (Run Always)"
msgstr "0 (Altijd actief)"
-#: sg_DlgPreferences.cpp:799
+#: sg_DlgPreferences.cpp:804
#, c-format
msgid "%d"
msgstr "%d"
-#: sg_DlgPreferences.cpp:1029
+#: sg_DlgPreferences.cpp:1034
msgid "Do you really want to clear all local preferences?\n"
msgstr "Weet je zeker dat je de lokale voorkeuren wilt wissen?\n"
@@ -3934,21 +3933,6 @@ msgstr "Alles Weergeven"
msgid "Quit %s"
msgstr "%s Sluiten"
-#~ msgid "Workunit name"
-#~ msgstr "Bestandsnaam"
-
-#~ msgid "I do not agree with the terms of use."
-#~ msgstr "Ik ga NIET akkoord met de voorwaarden."
-
-#~ msgid "Click Clear to restore web-based settings."
-#~ msgstr "Klik op 'Wissen' om terug te keren naar online instellingen."
-
-#~ msgid "For additional settings, select Computing Preferences in "
-#~ msgstr "Voor aanvullende opties klik je op 'Verwerkings voorkeuren' in "
-
-#~ msgid "the Advanced View."
-#~ msgstr "de Geavanceerde Weergave."
-
#~ msgid "invalid float"
#~ msgstr "ongeldige waarde gevonden"
diff --git a/locale/nl/BOINC-Setup.mo b/locale/nl/BOINC-Setup.mo
index 5a8905d..086dbe7 100644
Binary files a/locale/nl/BOINC-Setup.mo and b/locale/nl/BOINC-Setup.mo differ
diff --git a/locale/nl/BOINC-Web.mo b/locale/nl/BOINC-Web.mo
index 035968d..e33c72b 100644
Binary files a/locale/nl/BOINC-Web.mo and b/locale/nl/BOINC-Web.mo differ
diff --git a/locale/nl/BOINC-Web.po b/locale/nl/BOINC-Web.po
index dad11c1..12ba8ae 100644
--- a/locale/nl/BOINC-Web.po
+++ b/locale/nl/BOINC-Web.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: $Id: nl.po 13216 2007-07-25 15:11:14Z davea $\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
-"POT-Creation-Date: 2014-02-01 00:00 PST\n"
+"POT-Creation-Date: 2013-11-12 00:00 PST\n"
"PO-Revision-Date: 2013-12-18 19:26+0000\n"
"Last-Translator: Rene <oskamjr at ziggo.nl>\n"
"Language-Team: \n"
@@ -456,16 +456,16 @@ msgstr ""
msgid "Cognitive science and artifical intelligence"
msgstr "Cognitieve wetenschappen en kunstmatige intelligentie"
-#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
-#: projects.inc:464 projects.inc:511
+#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
+#: projects.inc:442 projects.inc:489
msgid "Private"
msgstr "Particulier project"
-#: projects.inc:61
+#: projects.inc:51
msgid "Artificial intelligence"
msgstr "Kunstmatige intelligentie"
-#: projects.inc:62
+#: projects.inc:52
msgid ""
"Parse and convert semantic nets for use in FreeHAL, an artificial "
"intelligence that uses semantic networks, stemmers, part of speech "
@@ -477,19 +477,19 @@ msgstr ""
"netwerken, vervoegingsgeneratoren, part-of-speech databanken en part-of-"
"speech tagging om menselijke eigenschappen in een gesprek te na te bootsen."
-#: projects.inc:69
+#: projects.inc:58
msgid "Biology and Medicine"
msgstr "Biologie en geneeskunde"
-#: projects.inc:82
+#: projects.inc:71
msgid "University College Dublin"
msgstr "University College Dublin"
-#: projects.inc:83
+#: projects.inc:72
msgid "Antimalarial drug discovery"
msgstr "Onderzoek naar malaria medicijnen"
-#: projects.inc:84
+#: projects.inc:73
msgid ""
"The parasite that causes malaria continues to evolve resistance to available "
"medication. We therefore urgently need to discover new drugs to replace "
@@ -503,15 +503,15 @@ msgstr ""
"proteïnen in de parasiet. Het FightMalaria at Home project is gericht op het "
"vinden hiervan."
-#: projects.inc:90
+#: projects.inc:79
msgid "University of Karlsruhe (Germany)"
msgstr "Universiteit van Karlsruhe (Duitsland)"
-#: projects.inc:91
+#: projects.inc:80
msgid "Protein structure prediction"
msgstr "Voorspelling van proteïne-structuren"
-#: projects.inc:92
+#: projects.inc:81
msgid ""
"POEM at HOME uses a computational approach to predict the biologically active "
"structure of proteins, to understand the signal-processing mechanisms when "
@@ -526,15 +526,15 @@ msgstr ""
"bewerkstelligen van nieuwe medicijnen op basis van de driedimensionale "
"structuur van biologisch belangrijke proteïnen."
-#: projects.inc:98
+#: projects.inc:87
msgid "University of Delaware"
msgstr "Universiteit van Delaware"
-#: projects.inc:99
+#: projects.inc:88
msgid "Study of protein - ligand interactions"
msgstr "Studie over proteïnen - ligland interactie"
-#: projects.inc:100
+#: projects.inc:89
msgid ""
"Docking at Home has both bioscience and computer science goals. The project "
"aims to further knowledge of the atomic details of protein-ligand "
@@ -546,15 +546,15 @@ msgstr ""
"kennis over atomische proteïne-ligand interacties, om aldus inzicht te "
"verschaffen omtrent de ontwikkeling van nieuwe geneesmiddelen."
-#: projects.inc:114
+#: projects.inc:103
msgid "Barcelona Biomedical Research Park (PRBB)"
msgstr "Barcelona Biomedical Research Park (PRBB)"
-#: projects.inc:115
+#: projects.inc:104
msgid "Molecular simulations of proteins"
msgstr "Moleculaire simulatie van proteïnen"
-#: projects.inc:116
+#: projects.inc:105
msgid ""
"GPUGrid.net opens novel computational scenarios by the first full-atom "
"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
@@ -567,15 +567,15 @@ msgstr ""
"biomedisch onderzoek opeens mogelijk worden en computationele biologie een "
"nieuwe taak krijgt toebedeeld."
-#: projects.inc:122
+#: projects.inc:111
msgid "Technion, Israel"
msgstr "Technion, Israël"
-#: projects.inc:123
+#: projects.inc:112
msgid "Genetic linkage analysis"
msgstr "Genetische koppelingsanalyse"
-#: projects.inc:124
+#: projects.inc:113
msgid ""
"Superlink at Technion helps geneticists all over the world find disease-"
"provoking genes causing some types of diabetes, hypertension (high blood "
@@ -585,18 +585,18 @@ msgstr ""
"veroorzakende genen die betrokken zijn bij sommige soorten diabetes, "
"hypertensie (hoge bloeddruk), kanker, schizofrenie, en vele andere ziektes."
-#: projects.inc:138
+#: projects.inc:127
msgid ""
"University of Maryland Center for Bioinformatics and Computational Biology"
msgstr ""
"Universiteit van Maryland Centrum voor bio-informatica en computationele "
"biologie"
-#: projects.inc:139
+#: projects.inc:128
msgid "Life science research"
msgstr "Wetenschappelijk onderzoek inzake Life science"
-#: projects.inc:140
+#: projects.inc:129
msgid ""
"The Lattice Project supplies computing power to scientists at the University "
"of Maryland studying evolutionary relationships based on DNA sequence data; "
@@ -609,15 +609,15 @@ msgstr ""
"virusproteïnesequenties, evenals voor onderzoek naar biodiversiteit in "
"natuurgebieden. "
-#: projects.inc:146
+#: projects.inc:135
msgid "The Swiss Tropical Institute"
msgstr "Het Zwitserse Tropen Instituut"
-#: projects.inc:147
+#: projects.inc:136
msgid "Epidemiology"
msgstr "Epidemiologie"
-#: projects.inc:148
+#: projects.inc:137
msgid ""
"Simulation models of the transmission dynamics and health effects of malaria "
"are an important tool for malaria control. They can be used to determine "
@@ -637,15 +637,15 @@ msgstr ""
"gerelateerd moeten zijn aan biologische en sociale factoren die van invloed "
"zijn op de verspreiding van de ziekte. "
-#: projects.inc:170
+#: projects.inc:159
msgid "University of Washington"
msgstr "Universiteit van Washington"
-#: projects.inc:171 projects.inc:179
+#: projects.inc:160 projects.inc:168
msgid "Biology"
msgstr "Biologie"
-#: projects.inc:172
+#: projects.inc:161
msgid ""
"Determine the 3-dimensional shapes of proteins in research that may "
"ultimately lead to finding cures for some major human diseases. By running "
@@ -662,11 +662,11 @@ msgstr ""
"ontwerpen ter bestrijding van hiv en ziektes zoals malaria, kanker en "
"alzheimer"
-#: projects.inc:178
+#: projects.inc:167
msgid "University of Vienna"
msgstr "Universiteit van Wenen"
-#: projects.inc:180
+#: projects.inc:169
msgid ""
"Calculate similarities between proteins. SIMAP provides a public database of "
"the resulting data, which plays a key role in many bioinformatics research "
@@ -676,19 +676,19 @@ msgstr ""
"databank van gegevens die een sleutelrol spelen bij menig onderzoeksproject "
"inzake bio-informatica."
-#: projects.inc:186
+#: projects.inc:175
msgid "Earth Sciences"
msgstr "Aardkunde"
-#: projects.inc:198
+#: projects.inc:187
msgid "Oxford University"
msgstr "Universiteit van Oxford"
-#: projects.inc:199
+#: projects.inc:188
msgid "Climate study"
msgstr "Klimaat studie"
-#: projects.inc:200
+#: projects.inc:189
msgid ""
"Investigate the approximations that have to be made in state-of-the-art "
"climate models. By running the model thousands of times we hope to find out "
@@ -709,25 +709,16 @@ msgstr ""
"ons in staat om de klimaatverandering de komende eeuw volgens een breed "
"scala aan scenario's te bestuderen."
-#: projects.inc:207
-msgid "Physical Science"
-msgstr ""
-
-#: projects.inc:213
-msgid "Mechanical engineering"
-msgstr ""
-
-#: projects.inc:214
-msgid ""
-"Currently we are calculating the optimum design of a structure call the 52 "
-"bar truss"
-msgstr ""
+# 75%
+#: projects.inc:196
+msgid "Astronomy, Physics, and Chemistry"
+msgstr "Astronomie/Fysica/Chemie"
-#: projects.inc:224 projects.inc:263 projects.inc:271
+#: projects.inc:202 projects.inc:241 projects.inc:249
msgid "Astronomy"
msgstr "Astronomie"
-#: projects.inc:225
+#: projects.inc:203
msgid ""
"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to "
"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby "
@@ -745,15 +736,15 @@ msgstr ""
"x 1 pixel middels specifieke spectrale energie-distributietechnieken (SED) "
"in een gedistribueerde rekenmodus. "
-#: projects.inc:247
+#: projects.inc:225
msgid "University of Texas at Austin"
msgstr "Universiteit van Texas te Austin"
-#: projects.inc:248 projects.inc:279
+#: projects.inc:226 projects.inc:257
msgid "Chemistry"
msgstr "Chemie"
-#: projects.inc:249
+#: projects.inc:227
msgid ""
"A common problem in theoretical chemistry, condensed matter physics and "
"materials science is the calculation of the time evolution of an atomic "
@@ -777,11 +768,11 @@ msgstr ""
"langetermijndynamiek van tijdsvariabele systemen."
# 95%
-#: projects.inc:262
+#: projects.inc:240
msgid "University of Illinois at Urbana-Champaign"
msgstr "Universiteit van Illinois te Urbana-Chamapign"
-#: projects.inc:264
+#: projects.inc:242
msgid ""
"The goal of Cosmology at Home is to search for the model that best describes "
"our Universe and to find the range of models that agree with the available "
@@ -791,11 +782,11 @@ msgstr ""
"universum het best omschrijft, alsmede het spectrum van modellen die met de "
"beschikbare data inzake deeltjes astrofysica overweg kunnen."
-#: projects.inc:270
+#: projects.inc:248
msgid "Rensselaer Polytechnic Institute"
msgstr "Rensselaer Polytechnisch Instituut"
-#: projects.inc:272
+#: projects.inc:250
msgid ""
"The goal of Milkyway at Home is to create a highly accurate three dimensional "
"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
@@ -805,11 +796,11 @@ msgstr ""
"accuraat drie-dimensionaal model van het melkwegstelsel middels de gegevens "
"van het Sloan Digital Sky Survey."
-#: projects.inc:278
+#: projects.inc:256
msgid "Leiden University, The Netherlands"
msgstr "Universiteit Leiden, Nederland"
-#: projects.inc:280
+#: projects.inc:258
msgid ""
"Surface science calculations using Classical Dynamics. Leiden Classical "
"allows volunteers, students and other scientist to submit their personal "
@@ -827,15 +818,15 @@ msgstr ""
"van de algemene gaswet te testen en aldus de simulaties daadwerkelijk uit te "
"voeren via het computercluster."
-#: projects.inc:294
+#: projects.inc:272
msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
msgstr "Universiteit van Wisconsin - Milwaukee, Max Planck Instituut"
-#: projects.inc:295
+#: projects.inc:273
msgid "Astrophysics"
msgstr "Astrofysica"
-#: projects.inc:296
+#: projects.inc:274
msgid ""
"Search for spinning neutron stars (also called pulsars) using data from the "
"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
@@ -849,15 +840,15 @@ msgstr ""
"gesponsord door 'the American Physical Society' (APS) en enkele "
"internationale organisaties."
-#: projects.inc:310 projects.inc:318
+#: projects.inc:288 projects.inc:296
msgid "CERN (European Organization for Nuclear Research)"
msgstr "CERN (Europese organisatie voor nucleair onderzoek)"
-#: projects.inc:311 projects.inc:319
+#: projects.inc:289 projects.inc:297
msgid "Physics"
msgstr "Natuurkunde"
-#: projects.inc:312
+#: projects.inc:290
msgid ""
"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
"European Organization for Nuclear Research, the world's largest particle "
@@ -872,7 +863,7 @@ msgstr ""
"simulaties uit ter verbetering van het ontwerp van de LHC en diens "
"detectors."
-#: projects.inc:320
+#: projects.inc:298
msgid ""
"This project uses CERN-developed virtual machine technology for full-fledged "
"LHC event physics simulation on volunteer computers. Requires that you "
@@ -882,15 +873,15 @@ msgstr ""
"volwaardige LHC natuurkundige simulatie op je computer. Het is vereist om "
"VirtualBox op je computer te installeren"
-#: projects.inc:326
+#: projects.inc:304
msgid "University of California, Berkeley"
msgstr "University van Californië, Berkeley"
-#: projects.inc:327
+#: projects.inc:305
msgid "Astrophysics, astrobiology"
msgstr "Astrofysica, astrobiologie"
-#: projects.inc:328
+#: projects.inc:306
msgid ""
"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
"goal is to detect intelligent life outside Earth. One approach, known as "
@@ -905,15 +896,15 @@ msgstr ""
"ruimte. Dergelijke signalen kunnen niet spontaan ontstaan, dus een detectie "
"zou een mogelijk bewijs van buitenaardse technologie kunnen zijn."
-#: projects.inc:342
+#: projects.inc:320
msgid "Bielefeld University of Applied Sciences"
msgstr "Bielefeld Universiteit voor toegepaste wetenschappen"
-#: projects.inc:343
+#: projects.inc:321
msgid "Chemical engineering and nanotechnology"
msgstr "Chemische technologie en nanotechnologie"
-#: projects.inc:344
+#: projects.inc:322
msgid ""
"The study of molecular magnets and controlled nanoscale magnetism. These "
"magnetic molecules may be used to develop tiny magnetic switches, with "
@@ -926,19 +917,19 @@ msgstr ""
"vinden in de geneeskunde (zoals chemotherapeutische behandeling van een "
"plaatselijke kanker) en biotechnologie."
-#: projects.inc:351
+#: projects.inc:329
msgid "Multiple applications"
msgstr "Diverse applicaties"
-#: projects.inc:356
+#: projects.inc:334
msgid "Chinese Academy of Sciences"
msgstr "Chinese Academie voor wetenschappen"
-#: projects.inc:357
+#: projects.inc:335
msgid "Physics, biochemistry, and others"
msgstr "Natuurkunde, biochemie en diverse andere wetenschappen"
-#: projects.inc:358
+#: projects.inc:336
msgid ""
"The objective of CAS at home is to encourage and assist scientists in China to "
"adopt the technologies of volunteer computing and volunteer thinking for "
@@ -948,11 +939,11 @@ msgstr ""
"wetenschappers in China om technologieën als volunteer computing en "
"volunteer thinking in te zetten bij hun wetenschappelijk onderzoek."
-#: projects.inc:365
+#: projects.inc:343
msgid "Mathematics, physics, evolution"
msgstr "Wiskunde, natuurkunde en evolutie studie"
-#: projects.inc:366
+#: projects.inc:344
msgid ""
"Yoyo at home is an adapter between BOINC and several existing volunteer "
"computing projects: ECM, Muon, Evolution at home, and distributed.net"
@@ -960,15 +951,15 @@ msgstr ""
"Yoyo at home is een verbinding tussen BOINC en diverse bestaande volunteer "
"computing projecten: ECM, Muon, Evolution at home, en distributed.net"
-#: projects.inc:371 projects.inc:527
+#: projects.inc:349 projects.inc:505
msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
-#: projects.inc:372
+#: projects.inc:350
msgid "European research projects"
msgstr "Europees wetenschappelijk onderzoek"
-#: projects.inc:373
+#: projects.inc:351
msgid ""
"The EDGeS at Home Beta project integrates volunteer computing into the service "
"grid network of Europe by allowing service grids to send workunits to be "
@@ -980,27 +971,27 @@ msgstr ""
"en te laten verwerken door de vrijwilligers bij dit project. De "
"wetenschappelijke projecten omvatten o.a. wiskunde, natuurkunde en biologie."
-#: projects.inc:379
+#: projects.inc:357
msgid "Spanish universities and research centers"
msgstr "Spaanse universiteiten en centra voor wetenschappelijk onderzoek"
-#: projects.inc:380
+#: projects.inc:358
msgid "Various Spanish research projects"
msgstr "Diverse Spaanse projecten voor wetenschappelijk onderzoek"
-#: projects.inc:381
+#: projects.inc:359
msgid "Research in physics, material science, and biomedicine"
msgstr "Onderzoek inzake fysica, materiaalkunde, en bio-geneeskunde"
-#: projects.inc:387
+#: projects.inc:365
msgid "IBM Corporate Citizenship"
msgstr "IBM Corporate Citizenship"
-#: projects.inc:388
+#: projects.inc:366
msgid "Medical, environmental and other humanitarian research"
msgstr "Medisch, omgeving en ander menselijk onderzoek"
-#: projects.inc:389
+#: projects.inc:367
msgid ""
"To further critical non-profit research on some of humanity's most pressing "
"problems by creating the world's largest volunteer computing grid. Research "
@@ -1012,27 +1003,27 @@ msgstr ""
"grootste vrijwilligers netwerk. Onderzoek omvat HIV-AIDS, kanker, tropische "
"en verwaarloosde ziektes, zonne-energie, schoon water en nog veel meer"
-#: projects.inc:395
+#: projects.inc:373
msgid "Mathematics, computing, and games"
msgstr "Wiskunde, informatica en games"
-#: projects.inc:401
+#: projects.inc:379
msgid "Computer Science"
msgstr "Computer wetenschap"
-#: projects.inc:409
+#: projects.inc:387
msgid "Mathematics, Physics, Artificial Intelligence"
msgstr "Wiskunde, natuurkunde, kunstmatige intelligentie"
-#: projects.inc:410
+#: projects.inc:388
msgid "Simulation of quantum computing; Goldbach's conjecture."
msgstr "Simulatie van een quantum computer; Goldbach's conjecture."
-#: projects.inc:450 projects.inc:458
+#: projects.inc:428 projects.inc:436
msgid "Cryptography"
msgstr "Cryptografie"
-#: projects.inc:459
+#: projects.inc:437
msgid ""
"Attempt to decode 3 original Enigma messages. The signals were intercepted "
"in the North Atlantic in 1942 and are believed to be unbroken."
@@ -1041,25 +1032,25 @@ msgstr ""
"Deze werden in 1942 op de Noord-Atlantische Oceaan onderschept en er wordt "
"aangenomen dat de codering nog niet is gekraakt."
-#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
-#: projects.inc:528 projects.inc:568
+#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
+#: projects.inc:506 projects.inc:546
msgid "Mathematics"
msgstr "Wiskunde"
-#: projects.inc:466
+#: projects.inc:444
msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
msgstr ""
"Bestudeer het Vermoeden van Collatz, een onopgelost vraagstuk in de wiskunde"
-#: projects.inc:471
+#: projects.inc:449
msgid "California State University Fullerton"
msgstr "California State University Fullerton"
-#: projects.inc:472
+#: projects.inc:450
msgid "Factorization of large integers"
msgstr "Factorisatie van grote getallen"
-#: projects.inc:473
+#: projects.inc:451
msgid ""
"NFS at Home is a research project that uses Internet-connected computers to do "
"the lattice sieving step in the Number Field Sieve factorization of large "
@@ -1076,7 +1067,7 @@ msgstr ""
"35 = 5 * 7. NFS at Home zet dit principe voort, echter met getallen die uit "
"honderden cijfers bestaan."
-#: projects.inc:479
+#: projects.inc:457
msgid ""
"Vilnius Gediminas Technical University and Kaunas University of Technology "
"(Lithuania)"
@@ -1084,11 +1075,11 @@ msgstr ""
"Vilnius Gediminas Technische Universiteit en Kaunas Technische Universiteit "
"(Litouwen)"
-#: projects.inc:480
+#: projects.inc:458
msgid "Software testing"
msgstr "Software testen"
-#: projects.inc:481
+#: projects.inc:459
msgid ""
"The aim of this project is to provide a powerful distributed computing "
"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
@@ -1101,11 +1092,11 @@ msgstr ""
"rekenkracht. De huidige applicaties zijn gewijd aan het onderzoek naar "
"software die op de Monte-Carlo simulatie is gebaseerd."
-#: projects.inc:503
+#: projects.inc:481
msgid "Mathematical Institute of Leiden University / Kennislink"
msgstr "Mathematisch Instituut Universiteit Leiden / Kennislink"
-#: projects.inc:505
+#: projects.inc:483
msgid ""
"Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b "
"< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the "
@@ -1124,7 +1115,7 @@ msgstr ""
"in de wiskunde. Als dit vermoeden wordt bewezen als waarheid, kunnen "
"vervolgens vele andere vraagstukken worden opgelost."
-#: projects.inc:513
+#: projects.inc:491
msgid ""
"Primegrid has multiple projects searching for different forms of very large "
"prime numbers, including searching for the largest known prime number."
@@ -1132,11 +1123,11 @@ msgstr ""
"Primegrid heeft diverse projecten die onderzoek doen naar grote "
"priemgetallen, inclusief een zoektocht naar het grootste priemgetal."
-#: projects.inc:519
+#: projects.inc:497
msgid "Hochschule RheinMain University of Applied Sciences"
msgstr "Hogeschool RheinMain Universiteit voor toegepaste wetenschappen"
-#: projects.inc:521
+#: projects.inc:499
msgid ""
"Search for counterexamples to two conjectures related to the identification "
"of prime numbers"
@@ -1144,7 +1135,7 @@ msgstr ""
"Ga op zoek naar tegenvoorbeelden van twee vermoedens omtrent de "
"identificatie van priemgetallen"
-#: projects.inc:529
+#: projects.inc:507
msgid ""
"Find all the generalized binary number systems (in which bases are matrices "
"and digits are vectors) up to dimension 11."
@@ -1161,10 +1152,6 @@ msgstr "Opmerking"
msgid "News is available as an %sRSS feed%s"
msgstr "Het nieuws is beschikbaar als %sRSS feed%s"
-# 75%
-#~ msgid "Astronomy, Physics, and Chemistry"
-#~ msgstr "Astronomie/Fysica/Chemie"
-
#~ msgid "Download BOINC + Virtualbox"
#~ msgstr "Download BOINC + Virtualbox"
diff --git a/locale/pl/BOINC-Project-Generic.po b/locale/pl/BOINC-Project-Generic.po
index cc26564..c546307 100644
--- a/locale/pl/BOINC-Project-Generic.po
+++ b/locale/pl/BOINC-Project-Generic.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2013-01-20 16:11+0000\n"
+"PO-Revision-Date: 2013-01-20 16:11+0200\n"
"Last-Translator: Pawel <pawel.pbm at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: pl\n"
@@ -16,12 +16,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-0: html\\user\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
-"X-POOTLE-MTIME: 1358698319.0\n"
+"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -1219,9 +1218,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "Używaj karty graficznej NVIDIA %1 Egzekwowane od wersji 6.10+ %2"
#: ../inc/prefs.inc:344
-#, fuzzy
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Używaj karty graficznej ATI %1 Egzekwowane od wersji 6.10+ %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1785,9 +1783,8 @@ msgid "State"
msgstr "Stan"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "Nazwa zadania"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -2605,9 +2602,8 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
-#, fuzzy
msgid "Languages"
-msgstr "Język"
+msgstr ""
# #######################################
# Rules and Policies page (info.php)
diff --git a/locale/ro/BOINC-Project-Generic.po b/locale/ro/BOINC-Project-Generic.po
index d72a0dd..5ae0d04 100644
--- a/locale/ro/BOINC-Project-Generic.po
+++ b/locale/ro/BOINC-Project-Generic.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-07-21 11:48+0000\n"
+"PO-Revision-Date: 2014-02-24 07:17+0000\n"
"Last-Translator: Marius <marius.sirbu at outlook.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: ro\n"
@@ -18,7 +18,7 @@ msgstr ""
"20)) ? 1 : 2);;\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1405943302.0\n"
+"X-POOTLE-MTIME: 1393226265.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "Română"
@@ -2449,7 +2449,7 @@ msgstr "Participanţi"
#: ../user/bs_sample_index.php:46
msgid "Do work"
-msgstr "Lucrează"
+msgstr ""
#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
#: ../user/home.php:49 ../project.sample/project.inc:43
@@ -2631,8 +2631,6 @@ msgid ""
"To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 "
"or less)."
msgstr ""
-"Pentru a înlocui, apăsați butonul \"Răsfoiește\" și selectați un fișier JPEG "
-"sau PNG (%1 sau mai puțin)."
#: ../user/create_profile.php:69
msgid "To remove it from your profile, check this box:"
@@ -3141,7 +3139,7 @@ msgstr "Evidenţiază utilizatorii speciali"
#: ../user/edit_forum_preferences_form.php:135
msgid "Display this many messages per page"
-msgstr "Afișează atâtea mesaje pe pagină"
+msgstr ""
#: ../user/edit_forum_preferences_form.php:139
msgid "How to sort"
@@ -4064,11 +4062,11 @@ msgstr ""
#: ../user/forum_search.php:27
msgid "Forum search"
-msgstr "Căutare în forum"
+msgstr ""
#: ../user/forum_search.php:31
msgid "Search query"
-msgstr "Expresia căutată"
+msgstr ""
#: ../user/forum_search.php:32
msgid "Search for keywords:"
@@ -4276,15 +4274,15 @@ msgstr ""
#: ../user/forum_thread.php:229
msgid "Move this thread to a different forum"
-msgstr "Mută acest fir în alt forum"
+msgstr ""
#: ../user/forum_thread.php:234
msgid "Edit title"
-msgstr "Modifică titlul"
+msgstr ""
#: ../user/forum_thread.php:235
msgid "Edit thread title"
-msgstr "Modifică titlul firului"
+msgstr ""
#: ../user/forum_thread.php:245
msgid "Export as Notice"
@@ -4292,7 +4290,7 @@ msgstr ""
#: ../user/forum_thread.php:251
msgid "Don't export"
-msgstr "Nu exporta"
+msgstr ""
#: ../user/forum_thread.php:252
msgid "Don't export this news item as a Notice"
@@ -4304,11 +4302,11 @@ msgstr "Sortează"
#: ../user/forum_thread_status.php:49
msgid "Thread status updated"
-msgstr "Stare fir actualizată"
+msgstr ""
#: ../user/forum_thread_status.php:50
msgid "The status has been updated."
-msgstr "Starea a fost actualizată."
+msgstr ""
#: ../user/forum_user_posts.php:73
msgid "Posts by %1"
@@ -4320,7 +4318,7 @@ msgstr "Deja prieteni"
#: ../user/friend.php:39
msgid "You requested friendship with %1 on %2."
-msgstr "Ați cerut prietenia lui %1 pe %2."
+msgstr ""
#: ../user/friend.php:41
msgid "This request is still pending confirmation."
@@ -4328,7 +4326,7 @@ msgstr "Această cerere încă aşteaptă confirmarea."
#: ../user/friend.php:52
msgid "%1 is not accepting friendship requests from you"
-msgstr "%1 nu acceptă cererile de prietenie de la dumneavoastră"
+msgstr ""
#: ../user/friend.php:61
msgid "You can't be friends with yourself"
@@ -4366,7 +4364,7 @@ msgstr ""
#: ../user/friend.php:138
msgid "Friend request"
-msgstr "Cerere prietenie"
+msgstr ""
#: ../user/friend.php:141
msgid "%1 has requested friendship with you."
@@ -4374,51 +4372,51 @@ msgstr ""
#: ../user/friend.php:143
msgid "%1 says: %2"
-msgstr "%1 spune: %2"
+msgstr ""
#: ../user/friend.php:146
msgid "Accept friendship"
-msgstr "Acceptă prietenia"
+msgstr ""
#: ../user/friend.php:146
msgid "Click accept if %1 is in fact a friend"
-msgstr "Apăsați acceptă dacă %1 este de fapt un prieten"
+msgstr ""
#: ../user/friend.php:147
msgid "Decline"
-msgstr "Refuză"
+msgstr ""
#: ../user/friend.php:147
msgid "Click decline if %1 is not a friend"
-msgstr "Apăsați refuză dacă %1 nu este un prieten"
+msgstr ""
#: ../user/friend.php:186
msgid "Friendship confirmed"
-msgstr "Prietenie confirmată"
+msgstr ""
#: ../user/friend.php:187
msgid "Your friendship with %1 has been confirmed."
-msgstr "Prietenia dumneavoastră cu %1 a fost confirmată."
+msgstr ""
#: ../user/friend.php:205
msgid "Friendship declined"
-msgstr "Prietenie refuzată"
+msgstr ""
#: ../user/friend.php:206
msgid "You have declined friendship with %1"
-msgstr "Ați refuzat prietenia cu %1"
+msgstr ""
#: ../user/friend.php:221
msgid "Notification not found"
-msgstr "Notificarea nu s-a găsit"
+msgstr ""
#: ../user/friend.php:223
msgid "Friend confirmed"
-msgstr "Prieten confirmat"
+msgstr ""
#: ../user/friend.php:224
msgid "You are now friends with %1."
-msgstr "Acum sunteți prieten cu %1."
+msgstr ""
#: ../user/friend.php:232
msgid "Cancel friendship?"
@@ -4426,19 +4424,19 @@ msgstr "Anulează prietenie?"
#: ../user/friend.php:234
msgid "Are you sure you want to cancel your friendship with %1?"
-msgstr "Sunteți siguri că doriți să anulați prietenia cu %1?"
+msgstr ""
#: ../user/friend.php:239
msgid "Stay friends"
-msgstr "Rămâneți prieteni"
+msgstr ""
#: ../user/friend.php:249
msgid "Friendship cancelled"
-msgstr "Prietenie anulată"
+msgstr ""
#: ../user/friend.php:250
msgid "Your friendship with %1 has been cancelled."
-msgstr "Prietenia dumneavoastră cu %1 a fost anulată."
+msgstr ""
#: ../user/get_passwd.php:25
msgid "Forgot your account info?"
diff --git a/locale/ru/BOINC-Manager.mo b/locale/ru/BOINC-Manager.mo
index 6904216..e032399 100644
Binary files a/locale/ru/BOINC-Manager.mo and b/locale/ru/BOINC-Manager.mo differ
diff --git a/locale/ru/BOINC-Manager.po b/locale/ru/BOINC-Manager.po
index bba31a0..ee1c26b 100644
--- a/locale/ru/BOINC-Manager.po
+++ b/locale/ru/BOINC-Manager.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2014-08-17 17:24+0000\n"
+"PO-Revision-Date: 2013-11-20 17:57+0000\n"
"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
"Language-Team: Russia\n"
"Language: ru\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-POOTLE-MTIME: 1408296243.0\n"
+"X-POOTLE-MTIME: 1384970232.0\n"
# 81%
#: AccountInfoPage.cpp:387
@@ -1148,7 +1148,7 @@ msgstr "OK"
#: DlgAdvPreferences.cpp:544
msgid "invalid number"
-msgstr "неправильный номер"
+msgstr ""
#: DlgAdvPreferences.cpp:545
msgid "invalid time, format is HH:MM"
@@ -2846,7 +2846,7 @@ msgstr "Я согласен с условиями."
#: TermsOfUsePage.cpp:237
msgid "I do not agree to the terms of use."
-msgstr "Я не согласен с условиями использования."
+msgstr ""
#: UnavailablePage.cpp:183
msgid "Project temporarily unavailable"
@@ -3774,15 +3774,11 @@ msgstr "Для сохранения настроек нажмите 'OK'."
msgid ""
"Click Clear to restore web-based settings for all preferences listed below."
msgstr ""
-"Нажмите кнопку 'Удалить', чтобы восстановить параметры, указанные на "
-"веб-сайте проекта, для всех настроек, перечисленных ниже."
#: sg_DlgPreferences.cpp:285
msgid ""
"For additional settings, select Computing Preferences in the Advanced View."
msgstr ""
-"Для дополнительных параметров выберите 'Настройки клиента' в меню 'Полный "
-"вид'."
#: sg_DlgPreferences.cpp:313
msgid "Do work only between:"
@@ -3816,8 +3812,6 @@ msgstr "Запуск обработки при простое:"
#: sg_DlgPreferences.cpp:429
msgid "Clear all local preferences listed above and close the dialog"
msgstr ""
-"Удалить локально хранимые настройки для данного компьютера и закрыть "
-"диалоговое окно"
# ?
#: sg_DlgPreferences.cpp:602 sg_DlgPreferences.cpp:605
diff --git a/locale/ru/BOINC-Project-Generic.po b/locale/ru/BOINC-Project-Generic.po
index e5e9889..91227fa 100644
--- a/locale/ru/BOINC-Project-Generic.po
+++ b/locale/ru/BOINC-Project-Generic.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-08-17 17:09+0000\n"
-"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
+"PO-Revision-Date: 2013-11-20 16:46+0000\n"
+"Last-Translator: akuloboy <oleg_kras at rambler.ru>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1408295381.0\n"
+"X-POOTLE-MTIME: 1384965965.0\n"
# The name of this language in this language
# Имя языка в этом файле
@@ -1216,7 +1216,7 @@ msgstr "Использовать ГП NVIDIA %1 Начиная с версии 6
#: ../inc/prefs.inc:344
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Использовать ГП Intel %1 начиная с версии 7.2+ %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -3633,8 +3633,6 @@ msgid ""
"This project hasn't created an email message - please notify its "
"administrators"
msgstr ""
-"Этот проект не создал электронное сообщение - пожалуйста, сообщите об этом "
-"администраторам проекта"
#: ../user/ffmail_form.php:33
msgid "Tell your friends about %1"
@@ -6098,7 +6096,7 @@ msgstr "Поменять основателя"
#: ../user/team_change_founder_form.php:108
msgid "There are no users to transfer team to."
-msgstr "Нет участников, которым можно передать команду."
+msgstr ""
#: ../user/team_create_action.php:29
msgid "You must choose a non-blank team name"
diff --git a/locale/ru/BOINC-Setup.mo b/locale/ru/BOINC-Setup.mo
index ab811d7..c5695a5 100644
Binary files a/locale/ru/BOINC-Setup.mo and b/locale/ru/BOINC-Setup.mo differ
diff --git a/locale/ru/BOINC-Setup.po b/locale/ru/BOINC-Setup.po
index 0b2edcf..7462405 100644
--- a/locale/ru/BOINC-Setup.po
+++ b/locale/ru/BOINC-Setup.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2014-08-17 15:28+0000\n"
+"PO-Revision-Date: 2013-08-09 18:20+0200\n"
"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: ru\n"
@@ -16,17 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Poedit 1.5.5\n"
"X-Poedit-SearchPath-0: mac_installer\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1408289307.0\n"
"X-Poedit-KeywordsList: _\n"
#: Installer.cpp:124
#, c-format
msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr "Извините, данная версия %s требует систему 10.5 или выше."
+msgstr ""
#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
msgid "Yes"
@@ -108,8 +107,6 @@ msgid ""
"Do you also want to remove VirtualBox from your computer?\n"
"(VirtualBox was installed along with BOINC.)"
msgstr ""
-"Хотите ли Вы также удалить VirtualBox с вашего компьютера?\n"
-"(VirtualBox был установлен вместе с BOINC.)"
#: uninstall.cpp:312
#, c-format
diff --git a/locale/ru/BOINC-Web.mo b/locale/ru/BOINC-Web.mo
index d520c19..68f9eee 100644
Binary files a/locale/ru/BOINC-Web.mo and b/locale/ru/BOINC-Web.mo differ
diff --git a/locale/ru/BOINC-Web.po b/locale/ru/BOINC-Web.po
index 0d5bc81..7bcb31b 100644
--- a/locale/ru/BOINC-Web.po
+++ b/locale/ru/BOINC-Web.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-08-17 16:46+0000\n"
+"PO-Revision-Date: 2013-12-01 15:08+0000\n"
"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1408293979.0\n"
+"X-POOTLE-MTIME: 1385910498.0\n"
#: docutil.php:21
msgid "Search"
@@ -718,19 +718,17 @@ msgstr ""
#: projects.inc:207
msgid "Physical Science"
-msgstr "Физика"
+msgstr ""
#: projects.inc:213
msgid "Mechanical engineering"
-msgstr "Машиностроение"
+msgstr ""
#: projects.inc:214
msgid ""
"Currently we are calculating the optimum design of a structure call the 52 "
"bar truss"
msgstr ""
-"В настоящее время мы рассчитываем оптимальное исполнение структуры под "
-"названием 'ферма из 52 стержней'"
#: projects.inc:224 projects.inc:263 projects.inc:271
msgid "Astronomy"
diff --git a/locale/sk/BOINC-Manager.mo b/locale/sk/BOINC-Manager.mo
index 8836a9d..ae9bfa0 100644
Binary files a/locale/sk/BOINC-Manager.mo and b/locale/sk/BOINC-Manager.mo differ
diff --git a/locale/sk/BOINC-Setup.mo b/locale/sk/BOINC-Setup.mo
index 267a4f8..6a8a582 100644
Binary files a/locale/sk/BOINC-Setup.mo and b/locale/sk/BOINC-Setup.mo differ
diff --git a/locale/sk/BOINC-Web.mo b/locale/sk/BOINC-Web.mo
index 1d5e044..7dee145 100644
Binary files a/locale/sk/BOINC-Web.mo and b/locale/sk/BOINC-Web.mo differ
diff --git a/locale/sl/BOINC-Android.po b/locale/sl/BOINC-Android.po
index dded20a..9a0db97 100644
--- a/locale/sl/BOINC-Android.po
+++ b/locale/sl/BOINC-Android.po
@@ -7,18 +7,18 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2013-10-18 00:00-0700\n"
-"PO-Revision-Date: 2014-08-07 16:50+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"PO-Revision-Date: 2013-10-22 15:28-0700\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: sl <LL at li.org>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"n%100==4 ? 2 : 3)\n"
"X-Generator: Pootle 2.5.0\n"
"Generated-By: Babel 1.0dev\n"
-"X-POOTLE-MTIME: 1407430203.0\n"
+"X-POOTLE-MTIME: 1388701690.0\n"
#. app global
msgctxt "app_name"
@@ -405,10 +405,9 @@ msgid "Synchronize"
msgstr "Синхронизировать"
#. main activity
-#, fuzzy
msgctxt "main_noproject_warning"
msgid "Tab here to choose a project."
-msgstr "Нажмите здесь для выбора проекта."
+msgstr ""
#, fuzzy
msgctxt "main_error"
diff --git a/locale/sl/BOINC-Project-Generic.po b/locale/sl/BOINC-Project-Generic.po
index e7e039d..1017ed9 100644
--- a/locale/sl/BOINC-Project-Generic.po
+++ b/locale/sl/BOINC-Project-Generic.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2014-08-07 14:54+0000\n"
+"PO-Revision-Date: 2013-06-05 20:02+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: sl\n"
@@ -16,9 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1407423277.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "Slovenščina"
@@ -1201,9 +1200,8 @@ msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
msgstr "Uporabi NVIDIA grafični procesor %1 Velja za različice od 6.10 dalje %2"
#: ../inc/prefs.inc:344
-#, fuzzy
msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Uporabi ATI grafični procesor %1 Velja za različice od 6.10 dalje %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1764,9 +1762,8 @@ msgid "State"
msgstr "Status"
#: ../inc/result.inc:747
-#, fuzzy
msgid "Task name:"
-msgstr "Ime opravila"
+msgstr ""
#: ../inc/team.inc:40
msgid "Search criteria (use one or more)"
@@ -2121,9 +2118,8 @@ msgid "Used in community functions"
msgstr "Uporabljeno v funkcijah skupnosti"
#: ../inc/user.inc:216 ../user/weak_auth.php:25
-#, fuzzy
msgid "Account keys"
-msgstr "Ključ računa"
+msgstr ""
#: ../inc/user.inc:221
msgid "Preferences"
@@ -2570,9 +2566,8 @@ msgid "Top GPU models"
msgstr ""
#: ../user/bs_sample_index.php:70
-#, fuzzy
msgid "Languages"
-msgstr "Jezik"
+msgstr ""
#: ../user/bs_sample_index.php:149 ../user/info.php:24
#: ../user/sample_index.php:79
diff --git a/locale/sl/BOINC-Web.mo b/locale/sl/BOINC-Web.mo
index 1670013..599bb2e 100644
Binary files a/locale/sl/BOINC-Web.mo and b/locale/sl/BOINC-Web.mo differ
diff --git a/locale/sl/BOINC-Web.po b/locale/sl/BOINC-Web.po
index 935e0a8..6c0a477 100644
--- a/locale/sl/BOINC-Web.po
+++ b/locale/sl/BOINC-Web.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-08-07 14:27+0000\n"
+"PO-Revision-Date: 2013-06-05 20:02+0200\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: sl\n"
@@ -16,9 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
-"X-Generator: Pootle 2.5.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1407421662.0\n"
#: docutil.php:21
msgid "Search"
@@ -972,9 +971,8 @@ msgid ""
msgstr ""
#: ../html/inc/news.inc:40
-#, fuzzy
msgid "Comment"
-msgstr "Pripombe"
+msgstr ""
#: ../html/inc/news.inc:111
#, php-format
diff --git a/locale/tr/BOINC-Web.mo b/locale/tr/BOINC-Web.mo
index 9046113..579078e 100644
Binary files a/locale/tr/BOINC-Web.mo and b/locale/tr/BOINC-Web.mo differ
diff --git a/locale/tr/BOINC-Web.po b/locale/tr/BOINC-Web.po
index 1bf6922..a5e3fc7 100644
--- a/locale/tr/BOINC-Web.po
+++ b/locale/tr/BOINC-Web.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: BOINC Web Site\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-08-11 10:03+0000\n"
+"PO-Revision-Date: 2013-11-24 20:45+0000\n"
"Last-Translator: Aycan <aycandemirel at hotmail.com>\n"
"Language-Team: Donanım Haber <bilgi at donanimhaber.com>\n"
"Language: tr\n"
@@ -17,7 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.5.0\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-POOTLE-MTIME: 1407751406.0\n"
+"X-POOTLE-MTIME: 1385325940.0\n"
#: docutil.php:21
msgid "Search"
@@ -697,19 +697,17 @@ msgstr ""
#: projects.inc:207
msgid "Physical Science"
-msgstr "Fiziksel Bilimi"
+msgstr ""
#: projects.inc:213
msgid "Mechanical engineering"
-msgstr "Makine mühendisliği"
+msgstr ""
#: projects.inc:214
msgid ""
"Currently we are calculating the optimum design of a structure call the 52 "
"bar truss"
msgstr ""
-"Şu anda, 52 bar kafese (kirişe) sahip bir yapının optimum tasarımını "
-"araştırıyoruz."
#: projects.inc:224 projects.inc:263 projects.inc:271
msgid "Astronomy"
diff --git a/locale/zh_CN/BOINC-Web.mo b/locale/zh_CN/BOINC-Web.mo
index 2efcebe..4b8ad32 100644
Binary files a/locale/zh_CN/BOINC-Web.mo and b/locale/zh_CN/BOINC-Web.mo differ
diff --git a/locale/zh_CN/BOINC-Web.po b/locale/zh_CN/BOINC-Web.po
index b081365..21c5ce2 100644
--- a/locale/zh_CN/BOINC-Web.po
+++ b/locale/zh_CN/BOINC-Web.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: 15349\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2014-08-31 01:58+0000\n"
+"PO-Revision-Date: 2014-02-23 06:01+0000\n"
"Last-Translator: Gang <zenith.yin at gmail.com>\n"
"Language-Team: Team China <zenith.yin at gmail.com>\n"
"Language: zh_CN\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-SearchPath-0: doc\n"
"X-Poedit-Basepath: D:\\Work\\boinc_src\\doc\n"
-"X-POOTLE-MTIME: 1409450318.0\n"
+"X-POOTLE-MTIME: 1393135305.0\n"
"X-Poedit-KeywordsList: tra\n"
#: docutil.php:21
@@ -226,7 +226,7 @@ msgstr "24 小时平均： "
# 80%
#: index.php:56
msgid "PetaFLOPS."
-msgstr "千万亿次浮点运算/秒。 "
+msgstr "万亿次浮点运算/秒。 "
#: index.php:68
msgid "News"
diff --git a/py/Boinc/boinc_db.py b/py/Boinc/boinc_db.py
index 36efe47..c70d29e 100644
--- a/py/Boinc/boinc_db.py
+++ b/py/Boinc/boinc_db.py
@@ -77,12 +77,6 @@ MODE_BLANKSCREEN = 4
MODE_REREAD_PREFS = 5
MODE_QUIT = 6
NGRAPHICS_MSGS = 7
-PROCESS_PRIORITY_UNSPECIFIED = 0
-PROCESS_PRIORITY_LOWEST = 1
-PROCESS_PRIORITY_LOW = 2
-PROCESS_PRIORITY_NORMAL = 3
-PROCESS_PRIORITY_HIGH = 4
-PROCESS_PRIORITY_HIGHEST = 5
MSG_INFO = 1
MSG_USER_ALERT = 2
MSG_INTERNAL_ERROR = 3
diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp
index d357791..8a1f93b 100644
--- a/sched/handle_request.cpp
+++ b/sched/handle_request.cpp
@@ -1311,11 +1311,6 @@ void process_request(char* code_sign_key) {
&& !g_request->results_truncated
) {
if (resend_lost_work()) {
- if (config.debug_send) {
- log_messages.printf(MSG_NORMAL,
- "[send] Resent lost jobs, don't send more\n"
- );
- }
ok_to_send_work = false;
}
}
diff --git a/sched/hr.cpp b/sched/hr.cpp
index 910e26c..e0fa6d5 100644
--- a/sched/hr.cpp
+++ b/sched/hr.cpp
@@ -23,7 +23,7 @@
const int nocpu = 1;
const int Intel = 2;
const int AMD = 3;
-const int Macintosh = 4; // PowerPC
+const int Macintosh = 4;
const int AMDAthlon = 5;
const int AMDDuron = 6;
const int AMDSempron = 7;
diff --git a/sched/hr_info.h b/sched/hr_info.h
index f8eed32..cc62fdc 100644
--- a/sched/hr_info.h
+++ b/sched/hr_info.h
@@ -15,13 +15,6 @@
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
-// Used by the feeder to decide how many array slots
-// to allocate to various HR classes,
-// based on how much RAC is being generated by that class
-//
-// The RAC info is obtained by census.php,
-// which writes it to a file read by the feeder.
-
#ifndef _HR_INFO_
#define _HR_INFO_
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index bda585f..5961461 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -855,7 +855,7 @@ bool work_needed(bool locality_sched) {
if (config.debug_send) {
char buf[256], buf2[256];
strcpy(buf, "");
- for (int i=0; i<NPROC_TYPES; i++) {
+ for (int i=1; i<NPROC_TYPES; i++) {
sprintf(buf2, " %s (%.2f, %.2f)",
proc_type_name(i),
g_wreq->req_secs[i],
diff --git a/sched/script_validator.cpp b/sched/script_validator.cpp
deleted file mode 100644
index 43b80de..0000000
--- a/sched/script_validator.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2014 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/>.
-
-// A validator that runs scripts to check and compare results
-// cmdline args:
-// --init_script scriptname
-// --compare_script scriptname
-//
-// the init script is called as
-// scriptname f1 ... fn
-// where f1 ... fn are the output files of a job (there may be just one)
-// It returns zero if the files are valid
-//
-// the compare script is called as
-// scriptname f1 ... fn g1 ... gn
-// where f1 ... fn are the output files of one job,
-// and g1 ... gn are the output files are another job.
-// It returns zero if the files are equivalent.
-
-#include <sys/param.h>
-
-#include "validate_util2.h"
-#include "error_numbers.h"
-#include "boinc_db.h"
-#include "sched_util.h"
-#include "validate_util.h"
-#include "validator.h"
-
-using std::string;
-using std::vector;
-
-bool first = true;
-char init_script[MAXPATHLEN], compare_script[MAXPATHLEN];
-
-void parse_cmdline() {
- strcpy(init_script, "");
- strcpy(compare_script, "");
- for (int i=1; i<g_argc; i++) {
- if (!strcmp(g_argv[i], "--init_script")) {
- sprintf(init_script, "../bin/%s", g_argv[++i]);
- } else if (!strcmp(g_argv[i], "--compare_script")) {
- sprintf(compare_script, "../bin/%s", g_argv[++i]);
- }
- }
- if (!strlen(init_script) && !strlen(compare_script)) {
- log_messages.printf(MSG_CRITICAL,
- "script names missing from command line\n"
- );
- exit(1);
- }
-}
-
-int init_result(RESULT& result, void*&) {
- if (!strlen(init_script)) return 0;
- vector<string> paths;
- int retval;
- retval = get_output_file_paths(result, paths);
- if (retval) {
- fprintf(stderr, "get_output_file_paths() returned %d\n", retval);
- return retval;
- }
- char cmd[4096];
- strcpy(cmd, init_script);
- for (unsigned int i=0; i<paths.size(); i++) {
- strcat(cmd, " ");
- strcat(cmd, paths[i].c_str());
- }
- retval = system(cmd);
- if (retval) {
- return retval;
- }
- return 0;
-}
-
-int compare_results(RESULT& r1, void*, RESULT const& r2, void*, bool& match) {
- if (!strlen(compare_script)) {
- match = true;
- return 0;
- }
- vector<string> paths1, paths2;
- int retval;
- retval = get_output_file_paths(r1, paths1);
- if (retval) {
- fprintf(stderr, "get_output_file_paths() returned %d\n", retval);
- return retval;
- }
- retval = get_output_file_paths(r2, paths2);
- if (retval) {
- fprintf(stderr, "get_output_file_paths() returned %d\n", retval);
- return retval;
- }
- char cmd[4096];
- strcpy(cmd, compare_script);
- for (unsigned int i=0; i<paths1.size(); i++) {
- strcat(cmd, " ");
- strcat(cmd, paths1[i].c_str());
- }
- for (unsigned int i=0; i<paths2.size(); i++) {
- strcat(cmd, " ");
- strcat(cmd, paths2[i].c_str());
- }
- retval = system(cmd);
- if (retval) {
- match = false;
- } else {
- match = true;
- }
- return 0;
-}
-
-int cleanup_result(RESULT const&, void*) {
- return 0;
-}
-
diff --git a/version.log b/version.log
index b0a6b9a..646d2ed 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.4.35
+7.4.37
diff --git a/zip/unzip/ttyio.c b/zip/unzip/ttyio.c
index 149eb91..a1a13b1 100644
--- a/zip/unzip/ttyio.c
+++ b/zip/unzip/ttyio.c
@@ -54,10 +54,6 @@
# define HAVE_TERMIOS_H
#endif
-#ifndef _WIN32
-#include <unistd.h> /* defines POSIX_VERSION */
-#endif
-
#ifdef _POSIX_VERSION
# ifndef USE_POSIX_TERMIOS
# define USE_POSIX_TERMIOS /* use POSIX style termio (termios) */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list