[boinc] 01/03: Imported Upstream version 7.4.7+dfsg
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Fri Jun 27 15:50:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit d89826d86e949543c51d992367a2ee189453ae24
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Jun 27 16:38:30 2014 +0200
Imported Upstream version 7.4.7+dfsg
---
.gitattributes | 23 +
Makefile.incl | 1 +
android/BOINC/AndroidManifest.xml | 4 +-
client/cs_notice.cpp | 8 +-
client/cs_notice.h | 4 +
client/cs_statefile.cpp | 5 +-
client/log_flags.cpp | 11 +-
clientgui/BOINCBaseFrame.cpp | 5 -
clientgui/BOINCBaseFrame.h | 3 -
clientgui/BOINCGUIApp.cpp | 265 ++-
clientgui/BOINCGUIApp.h | 2 +
clientgui/BOINCListCtrl.cpp | 2 +-
clientgui/DlgAdvPreferences.cpp | 135 +-
clientgui/DlgAdvPreferences.h | 5 +-
clientgui/DlgAdvPreferencesBase.cpp | 71 +-
clientgui/DlgOptions.cpp | 6 +-
clientgui/ViewProjects.cpp | 3 +-
clientgui/ViewTransfers.cpp | 3 +
clientgui/ViewWork.cpp | 2 +-
clientgui/res/atiicon.xpm | 574 +++---
clientgui/res/blankicon.xpm | 78 +-
clientgui/res/externalweblink.xpm | 92 +-
clientgui/res/nvidiaicon.xpm | 282 +--
.../default/graphic/workunit_running_image.xpm | 224 +--
.../default/graphic/workunit_waiting_image.xpm | 176 +-
.../res/templates/skins/Resource Information.txt | 14 +-
clientgui/sg_ProjectCommandPopup.cpp | 4 +-
clientgui/sg_ProjectWebSitesPopup.cpp | 4 +-
clientgui/sg_TaskCommandPopup.cpp | 4 +-
clientgui/skins/Charity Engine/skin.xml | 210 +--
clientgui/skins/Default/skin.xml | 78 +-
clientgui/skins/GridRepublic/skin.xml | 210 +--
clientgui/skins/ProgressThruProcessors/skin.xml | 210 +--
configure.ac | 2 +-
db/boinc_db_types.h | 8 +-
dcapi/java/example/boinc-java-launcher | 34 +-
dcapi/java/jre-boinc/jre_for_boinc_guide.txt | 82 +-
html/languages/translations/fi.po | 7 +-
html/languages/translations/hu.po | 2 +-
html/languages/translations/nl.po | 32 +-
html/user/top_hosts.php | 2 +-
lib/notice.cpp | 15 +-
lib/notice.h | 6 +-
lib/str_util.cpp | 2 +-
locale/ar/BOINC-Web.po | 180 +-
locale/be/BOINC-Manager.po | 94 +-
locale/be/BOINC-Web.po | 246 +--
locale/bg/BOINC-Web.po | 30 +-
locale/ca/BOINC-Android.po | 8 +-
locale/ca/BOINC-Setup.po | 2 +-
locale/ca/BOINC-Web.mo | Bin 36904 -> 37107 bytes
locale/ca/BOINC-Web.po | 6 +-
locale/da/BOINC-Manager.po | 1895 ++++++++++----------
locale/da/BOINC-Project-Generic.po | 601 +++----
locale/da/BOINC-Setup.po | 50 +-
locale/da/BOINC-Web.po | 322 ++--
locale/el/BOINC-Web.po | 24 +-
locale/fi/BOINC-Android.po | 7 +-
locale/fi/BOINC-Manager.mo | Bin 73083 -> 73214 bytes
locale/fi/BOINC-Manager.po | 16 +-
locale/fi/BOINC-Project-Generic.po | 7 +-
locale/fr/BOINC-Web.po | 14 +-
locale/gl/BOINC-Web.po | 14 +-
locale/hr/BOINC-Web.po | 24 +-
locale/hu/BOINC-Project-Generic.po | 2 +-
locale/hu/BOINC-Web.po | 24 +-
locale/it_IT/BOINC-Project-Generic.po | 2 +-
locale/ko/BOINC-Manager.po | 70 +-
locale/ko/BOINC-Project-Generic.po | 873 ++++-----
locale/ko/BOINC-Setup.po | 10 +-
locale/ko/BOINC-Web.po | 333 ++--
locale/lv/BOINC-Manager.po | 10 +-
locale/lv/BOINC-Web.po | 24 +-
locale/ms/BOINC-Android.po | 1 -
locale/ms/BOINC-Client.po | 1 -
locale/ms/BOINC-Manager.po | 1 -
locale/ms/BOINC-Project-Generic.po | 3 -
locale/ms/BOINC-Setup.po | 1 -
locale/nl/BOINC-Project-Generic.po | 32 +-
locale/nl/BOINC-Web.po | 4 +-
locale/pl/BOINC-Web.po | 2 +-
locale/pt_BR/BOINC-Web.po | 32 +-
locale/ro/BOINC-Web.po | 24 +-
locale/ru/BOINC-Manager.po | 1213 +++++++------
locale/ru/BOINC-Project-Generic.po | 630 +++----
locale/ru/BOINC-Setup.po | 50 +-
locale/ru/BOINC-Web.po | 217 +--
locale/sk/BOINC-Web.po | 20 +-
locale/sv_SE/BOINC-Web.po | 24 +-
locale/uk/BOINC-Web.mo | Bin 48855 -> 49109 bytes
locale/uk/BOINC-Web.po | 7 +-
locale/zh_CN/BOINC-Android.po | 11 +-
locale/zh_CN/BOINC-Manager.po | 2 +
locale/zh_CN/BOINC-Setup.po | 1 +
locale/zh_TW/BOINC-Web.po | 20 +-
samples/nvcuda/Makefile | 26 +-
samples/nvcuda/Makefile_mac | 24 +-
samples/nvcuda/common_mac.mk | 942 +++++-----
samples/nvcuda/cuda_kernel.cu | 264 +--
samples/openclapp/Makefile_AMD | 88 +-
samples/openclapp/Makefile_NVIDIA | 88 +-
samples/openclapp/Makefile_mac | 86 +-
samples/openclapp/openclapp.hpp | 456 ++---
samples/openclapp/openclapp_kernels.cl | 98 +-
.../vboxwrapper/deprecated/mscom/VirtualBox_i.c | 936 +++++-----
samples/wrapper/regexp_report.c | 2 +-
sched/Makefile.am | 5 +-
sched/sched_util.cpp | 287 +--
sched/sched_util.h | 58 +-
sched/{sched_util.cpp => sched_util_basic.cpp} | 105 --
sched/{sched_util.h => sched_util_basic.h} | 38 +-
sched/sched_version.cpp | 2 +-
version.log | 2 +-
113 files changed, 6628 insertions(+), 6973 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 8d8116b..e76be31 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,23 +2,46 @@
# various IDEs.
#
+# Random stuff
+* text=auto
+
# Source files
#
*.cpp text eol=lf
*.h text eol=lf
*.rc text eol=lf
*.php text eol=lf
+*.xpm text eol=lf
+*.cu text eol=lf
+*.cl text eol=lf
+*.c text eol=lf
+*.hpp text eol=lf
# Project files
#
*.vcproj text eol=crlf
+*.vcxproj text eol=crlf
*.sln text eol=crlf
+*.rules text eol=crlf
+*.bat text eol=crlf
+*.cmd text eol=crlf
*.ac text eol=lf
*.am text eol=lf
*.in text eol=lf
*.m4 text eol=lf
+*Makefile* text eol=lf
+*.mk text eol=lf
# Commit Notes
#
checkin_notes text eol=lf
checkin_notes_2012 text eol=lf
+
+# Misc files
+#
+*.txt text eol=lf
+*.xml text eol=lf
+*.po text eol=lf
+*.log text eol=lf
+*.rtf text eol=lf
+*.rul text eol=crlf
diff --git a/Makefile.incl b/Makefile.incl
index 6c4cca6..582e5b8 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -63,4 +63,5 @@ $(LIBAPI):
SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
APPLIBS = $(LIBAPI) $(LIBBOINC)
+FUHLIBS = $(LIBBOINC_CRYPT) $(LIBBOINC) $(RSA_LIBS) $(SSL_LIBS)
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index c22c378..2f24e1c 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.berkeley.boinc"
android:installLocation="internalOnly"
- android:versionCode="76"
- android:versionName="7.4.1" > <!-- installation on SD card would break boot receiver -->
+ android:versionCode="82"
+ android:versionName="7.4.7" > <!-- 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 -->
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index fd39a14..ff1cb34 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2009 University of California
+// 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
@@ -503,6 +503,12 @@ void NOTICES::remove_notices(PROJECT* p, int which) {
case REMOVE_NO_WORK_MSG:
remove = !strcmp(n.description.c_str(), NO_WORK_MSG);
break;
+ case REMOVE_CONFIG_MSG:
+ remove = (strstr(n.description.c_str(), "cc_config.xml") != NULL);
+ break;
+ case REMOVE_APP_INFO_MSG:
+ remove = (strstr(n.description.c_str(), "app_info.xml") != NULL);
+ break;
}
if (remove) {
i = notices.erase(i);
diff --git a/client/cs_notice.h b/client/cs_notice.h
index 20e388d..1ba59e8 100644
--- a/client/cs_notice.h
+++ b/client/cs_notice.h
@@ -90,6 +90,10 @@ struct NOTICES {
// msgs from scheduler
#define REMOVE_NO_WORK_MSG 2
// msgs about no work due to settings
+#define REMOVE_CONFIG_MSG 3
+ // notices about cc_config.xml
+#define REMOVE_APP_INFO_MSG 4
+ // notices about project/app_info.xml
extern NOTICES notices;
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index a353d19..34e3737 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -841,7 +841,10 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) {
while (!xp.get_tag()) {
if (xp.match_tag("app_info")) continue;
- if (xp.match_tag("/app_info")) return 0;
+ if (xp.match_tag("/app_info")) {
+ notices.remove_notices(p, REMOVE_APP_INFO_MSG);
+ return 0;
+ }
if (xp.match_tag("file_info") || xp.match_tag("file")) {
FILE_INFO* fip = new FILE_INFO;
if (fip->parse(xp)) {
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index 5d49170..433c07d 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -451,7 +451,10 @@ int CC_CONFIG::parse_client(FILE* f) {
);
continue;
}
- if (xp.match_tag("/cc_config")) return 0;
+ if (xp.match_tag("/cc_config")) {
+ notices.remove_notices(NULL, REMOVE_CONFIG_MSG);
+ return 0;
+ }
if (xp.match_tag("log_flags")) {
log_flags.parse(xp);
continue;
@@ -561,7 +564,7 @@ void process_gpu_exclusions() {
p = gstate.lookup_project(eg.url.c_str());
if (!p) {
msg_printf(0, MSG_USER_ALERT,
- "Bad URL in GPU exclusion: %s", eg.url.c_str()
+ "cc_config.xml: bad URL in GPU exclusion: %s", eg.url.c_str()
);
continue;
}
@@ -569,7 +572,7 @@ void process_gpu_exclusions() {
APP* app = gstate.lookup_app(p, eg.appname.c_str());
if (!app) {
msg_printf(p, MSG_USER_ALERT,
- "A GPU exclusion in your cc_config.xml file refers to an unknown application '%s'. Known applications: %s",
+ "cc_config.xml: a GPU exclusion refers to an unknown application '%s'. Known applications: %s",
eg.appname.c_str(),
app_list_string(p).c_str()
);
@@ -590,7 +593,7 @@ void process_gpu_exclusions() {
}
if (!found) {
msg_printf(p, MSG_USER_ALERT,
- "Bad type '%s' in GPU exclusion; valid types:%s",
+ "cc_config.xml: bad type '%s' in GPU exclusion; valid types:%s",
eg.type.c_str(), types.c_str()
);
continue;
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 01c7fd7..ae2b9ae 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -75,7 +75,6 @@ CBOINCBaseFrame::CBOINCBaseFrame(wxWindow* parent, const wxWindowID id, const wx
wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::CBOINCBaseFrame - Function Begin"));
// Configuration Settings
- m_iSelectedLanguage = 0;
m_iReminderFrequency = 0;
m_strNetworkDialupConnectionName = wxEmptyString;
m_aSelectedComputerMRU.Clear();
@@ -771,9 +770,7 @@ bool CBOINCBaseFrame::SaveState() {
//
pConfig->SetPath(strBaseConfigLocation);
- pConfig->Write(wxT("Language"), m_iSelectedLanguage);
pConfig->Write(wxT("ReminderFrequencyV3"), m_iReminderFrequency);
-
pConfig->Write(wxT("NetworkDialupConnectionName"), m_strNetworkDialupConnectionName);
@@ -828,9 +825,7 @@ bool CBOINCBaseFrame::RestoreState() {
//
pConfig->SetPath(strBaseConfigLocation);
- pConfig->Read(wxT("Language"), &m_iSelectedLanguage, 0L);
pConfig->Read(wxT("ReminderFrequencyV3"), &m_iReminderFrequency, 360L);
-
pConfig->Read(wxT("NetworkDialupConnectionName"), &m_strNetworkDialupConnectionName, wxEmptyString);
diff --git a/clientgui/BOINCBaseFrame.h b/clientgui/BOINCBaseFrame.h
index 37d4fcf..abc3694 100644
--- a/clientgui/BOINCBaseFrame.h
+++ b/clientgui/BOINCBaseFrame.h
@@ -69,8 +69,6 @@ public:
CBOINCDialUpManager* GetDialupManager() { return m_pDialupManager; }
int GetReminderFrequency() { return m_iReminderFrequency; }
void SetReminderFrequency(int val) { m_iReminderFrequency = val; }
- int GetSelectedLanguage() { return m_iSelectedLanguage; }
- void SetSelectedLanguage(int val) { m_iSelectedLanguage = val; }
void FireInitialize();
void FireRefreshView();
@@ -111,7 +109,6 @@ protected:
wxTimer* m_pAlertPollTimer;
wxTimer* m_pPeriodicRPCTimer;
- int m_iSelectedLanguage;
int m_iReminderFrequency;
int m_iFrameRefreshRate;
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index e2d578f..bf55d7e 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -54,6 +54,245 @@
bool s_bSkipExitConfirmation = false;
+wxChar* Convert28toISOLangCode[] =
+{
+ wxT(""),
+ wxT(""),
+ wxT("ab"),
+ wxT("aa"),
+ wxT("af_ZA"),
+ wxT("sq_AL"),
+ wxT("am"),
+ wxT("ar"),
+ wxT("ar_DZ"),
+ wxT("ar_BH"),
+ wxT("ar_EG"),
+ wxT("ar_IQ"),
+ wxT("ar_JO"),
+ wxT("ar_KW"),
+ wxT("ar_LB"),
+ wxT("ar_LY"),
+ wxT("ar_MA"),
+ wxT("ar_OM"),
+ wxT("ar_QA"),
+ wxT("ar_SA"),
+ wxT("ar_SD"),
+ wxT("ar_SY"),
+ wxT("ar_TN"),
+ wxT("ar_AE"),
+ wxT("ar_YE"),
+ wxT("hy"),
+ wxT("as"),
+ wxT("ay"),
+ wxT("az"),
+ wxT("az"),
+ wxT("az"),
+ wxT("ba"),
+ wxT("eu_ES"),
+ wxT("be_BY"),
+ wxT("bn"),
+ wxT("dz"),
+ wxT("bh"),
+ wxT("bi"),
+ wxT("br"),
+ wxT("bg_BG"),
+ wxT("my"),
+ wxT("km"),
+ wxT("ca_ES"),
+ wxT("zh_TW"),
+ wxT("zh_CN"),
+ wxT("zh_TW"),
+ wxT("zh_HK"),
+ wxT("zh_MO"),
+ wxT("zh_SG"),
+ wxT("zh_TW"),
+ wxT("co"),
+ wxT("hr_HR"),
+ wxT("cs_CZ"),
+ wxT("da_DK"),
+ wxT("nl_NL"),
+ wxT("nl_BE"),
+ wxT("en_GB"),
+ wxT("en_GB"),
+ wxT("en_US"),
+ wxT("en_AU"),
+ wxT("en_BZ"),
+ wxT("en_BW"),
+ wxT("en_CA"),
+ wxT("en_CB"),
+ wxT("en_DK"),
+ wxT("en_IE"),
+ wxT("en_JM"),
+ wxT("en_NZ"),
+ wxT("en_PH"),
+ wxT("en_ZA"),
+ wxT("en_TT"),
+ wxT("en_ZW"),
+ wxT("eo"),
+ wxT("et_EE"),
+ wxT("fo_FO"),
+ wxT("fa_IR"),
+ wxT("fj"),
+ wxT("fi_FI"),
+ wxT("fr_FR"),
+ wxT("fr_BE"),
+ wxT("fr_CA"),
+ wxT("fr_LU"),
+ wxT("fr_MC"),
+ wxT("fr_CH"),
+ wxT("fy"),
+ wxT("gl_ES"),
+ wxT("ka_GE"),
+ wxT("de_DE"),
+ wxT("de_AT"),
+ wxT("de_BE"),
+ wxT("de_LI"),
+ wxT("de_LU"),
+ wxT("de_CH"),
+ wxT("el_GR"),
+ wxT("kl_GL"),
+ wxT("gn"),
+ wxT("gu"),
+ wxT("ha"),
+ wxT("he_IL"),
+ wxT("hi_IN"),
+ wxT("hu_HU"),
+ wxT("is_IS"),
+ wxT("id_ID"),
+ wxT("ia"),
+ wxT("ie"),
+ wxT("iu"),
+ wxT("ik"),
+ wxT("ga_IE"),
+ wxT("it_IT"),
+ wxT("it_CH"),
+ wxT("ja_JP"),
+ wxT("jw"),
+ wxT("kn"),
+ wxT("ks"),
+ wxT("ks_IN"),
+ wxT("kk"),
+ wxT("kw_GB"),
+ wxT("rw"),
+ wxT("ky"),
+ wxT("rn"),
+ wxT(""),
+ wxT("ko_KR"),
+ wxT("ku_TR"),
+ wxT("lo"),
+ wxT("la"),
+ wxT("lv_LV"),
+ wxT("ln"),
+ wxT("lt_LT"),
+ wxT("mk_MK"),
+ wxT("mg"),
+ wxT("ms_MY"),
+ wxT("ml"),
+ wxT("ms_BN"),
+ wxT("ms_MY"),
+ wxT("mt_MT"),
+ wxT(""),
+ wxT("mi"),
+ wxT("mr_IN"),
+ wxT("mo"),
+ wxT("mn"),
+ wxT("na"),
+ wxT("ne_NP"),
+ wxT("ne_IN"),
+ wxT("nb_NO"),
+ wxT("nn_NO"),
+ wxT("oc"),
+ wxT("or"),
+ wxT("om"),
+ wxT("ps"),
+ wxT("pl_PL"),
+ wxT("pt_PT"),
+ wxT("pt_BR"),
+ wxT("pa"),
+ wxT("qu"),
+ wxT("rm"),
+ wxT("ro_RO"),
+ wxT("ru_RU"),
+ wxT("ru_UA"),
+ wxT("se_NO"),
+ wxT("sm"),
+ wxT("sg"),
+ wxT("sa"),
+ wxT("gd"),
+ wxT("sr_RS"),
+ wxT("sr_RS"),
+ wxT("sr_RS at latin"),
+ wxT("sr_YU"),
+ wxT("sr_YU at latin"),
+ wxT("sh"),
+ wxT("st"),
+ wxT("tn"),
+ wxT("sn"),
+ wxT("sd"),
+ wxT("si"),
+ wxT("ss"),
+ wxT("sk_SK"),
+ wxT("sl_SI"),
+ wxT("so"),
+ wxT("es_ES"),
+ wxT("es_AR"),
+ wxT("es_BO"),
+ wxT("es_CL"),
+ wxT("es_CO"),
+ wxT("es_CR"),
+ wxT("es_DO"),
+ wxT("es_EC"),
+ wxT("es_SV"),
+ wxT("es_GT"),
+ wxT("es_HN"),
+ wxT("es_MX"),
+ wxT("es_ES"),
+ wxT("es_NI"),
+ wxT("es_PA"),
+ wxT("es_PY"),
+ wxT("es_PE"),
+ wxT("es_PR"),
+ wxT("es_UY"),
+ wxT("es_US"),
+ wxT("es_VE"),
+ wxT("su"),
+ wxT("sw_KE"),
+ wxT("sv_SE"),
+ wxT("sv_FI"),
+ wxT("tl_PH"),
+ wxT("tg"),
+ wxT("ta"),
+ wxT("tt"),
+ wxT("te"),
+ wxT("th_TH"),
+ wxT("bo"),
+ wxT("ti"),
+ wxT("to"),
+ wxT("ts"),
+ wxT("tr_TR"),
+ wxT("tk"),
+ wxT("tw"),
+ wxT("ug"),
+ wxT("uk_UA"),
+ wxT("ur"),
+ wxT("ur_IN"),
+ wxT("ur_PK"),
+ wxT("uz"),
+ wxT("uz"),
+ wxT("uz"),
+ wxT("ca_ES at valencia"),
+ wxT("vi_VN"),
+ wxT("vo"),
+ wxT("cy"),
+ wxT("wo"),
+ wxT("xh"),
+ wxT("yi"),
+ wxT("yo"),
+ wxT("za"),
+ wxT("zu")
+};
+
+
#ifdef __WXMAC__
// Set s_bSkipExitConfirmation to true if cancelled because of logging out or shutting down
@@ -154,10 +393,12 @@ bool CBOINCGUIApp::OnInit() {
// Initialize local variables
int iErrorCode = 0;
- int iSelectedLanguage = 0;
+ int iDesiredLanguageCode = 0;
+ int iOldLanguageCode = 0;
bool bOpenEventLog = false;
wxString strDesiredSkinName = wxEmptyString;
wxString strDialogMessage = wxEmptyString;
+ wxString strOldLanguageCode = wxEmptyString;
bool success = false;
@@ -212,7 +453,8 @@ bool CBOINCGUIApp::OnInit() {
m_pConfig->Read(wxT("AutomaticallyShutdownClient"), &m_iShutdownCoreClient, 0L);
m_pConfig->Read(wxT("DisplayShutdownClientDialog"), &m_iDisplayExitDialog, 1L);
m_pConfig->Read(wxT("DisableAutoStart"), &m_iBOINCMGRDisableAutoStart, 0L);
- m_pConfig->Read(wxT("Language"), &iSelectedLanguage, 0L);
+ m_pConfig->Read(wxT("Language"), &iOldLanguageCode, 0);
+ m_pConfig->Read(wxT("LanguageISO"), &m_strISOLanguageCode, wxT(""));
m_pConfig->Read(wxT("GUISelection"), &m_iGUISelected, BOINC_SIMPLEGUI);
m_pConfig->Read(wxT("EventLogOpen"), &bOpenEventLog);
@@ -276,9 +518,23 @@ bool CBOINCGUIApp::OnInit() {
m_pLocale = new wxLocale();
wxASSERT(m_pLocale);
+ //
+ if (m_strISOLanguageCode.IsEmpty()) {
+ iDesiredLanguageCode = wxLANGUAGE_DEFAULT;
+ if (iOldLanguageCode) {
+ strOldLanguageCode = Convert28toISOLangCode[iOldLanguageCode];
+ if (!strOldLanguageCode.IsEmpty()) {
+ iDesiredLanguageCode = wxLocale::FindLanguageInfo(strOldLanguageCode)->Language;
+ }
+ }
+ m_pLocale->Init(iDesiredLanguageCode);
+ m_strISOLanguageCode = m_pLocale->GetCanonicalName();
+ } else {
+ m_pLocale->Init(wxLocale::FindLanguageInfo(m_strISOLanguageCode)->Language);
+ }
+
// Look for the localization files by absolute and relative locations.
// preference given to the absolute location.
- m_pLocale->Init(iSelectedLanguage);
if (!m_strBOINCMGRRootDirectory.IsEmpty()) {
m_pLocale->AddCatalogLookupPathPrefix(
wxString(m_strBOINCMGRRootDirectory + wxT("locale"))
@@ -291,8 +547,6 @@ bool CBOINCGUIApp::OnInit() {
InitSupportedLanguages();
- m_strISOLanguageCode = m_pLocale->GetCanonicalName();
-
// Note: JAWS for Windows will only speak the context-sensitive
// help if you use this help provider:
wxHelpProvider::Set(new wxHelpControllerHelpProvider());
@@ -604,6 +858,7 @@ void CBOINCGUIApp::SaveState() {
if (m_pSkinManager) {
m_pConfig->Write(wxT("Skin"), m_pSkinManager->GetSelectedSkin());
}
+ m_pConfig->Write(wxT("LanguageISO"), m_strISOLanguageCode);
m_pConfig->Write(wxT("AutomaticallyShutdownClient"), m_iShutdownCoreClient);
m_pConfig->Write(wxT("DisplayShutdownClientDialog"), m_iDisplayExitDialog);
m_pConfig->Write(wxT("DisableAutoStart"), m_iBOINCMGRDisableAutoStart);
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index 6a0c46f..6990d9d 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -158,6 +158,8 @@ public:
wxArrayString& GetSupportedLanguages() { return m_astrLanguages; }
wxString GetISOLanguageCode() { return m_strISOLanguageCode; }
+ void SetISOLanguageCode(wxString strISOLanguageCode)
+ { m_strISOLanguageCode = strISOLanguageCode; }
void DisplayEventLog(bool bShowWindow = true);
void OnEventLogClose();
diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
index 0b1dd14..1e61bf4 100644
--- a/clientgui/BOINCListCtrl.cpp
+++ b/clientgui/BOINCListCtrl.cpp
@@ -242,7 +242,7 @@ void CBOINCListCtrl::DrawProgressBars()
wxClientDC dc(this);
m_bProgressBarEventPending = false;
#else
- wxWindowDC dc(GetMainWin()); // Available only in wxGenericListCtrl
+ wxClientDC dc(GetMainWin()); // Available only in wxGenericListCtrl
#endif
if (progressColumn < 0) {
diff --git a/clientgui/DlgAdvPreferences.cpp b/clientgui/DlgAdvPreferences.cpp
index af153aa..8a4b23a 100644
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
@@ -105,16 +105,29 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
/* destructor */
CDlgAdvPreferences::~CDlgAdvPreferences() {
SaveState();
+ delete m_vTimeIntervalValidator;
}
/* set validators for input filtering purposes only */
void CDlgAdvPreferences::SetValidators() {
+ m_vTimeIntervalValidator = new wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST);
+ m_vTimeIntervalValidator->SetCharIncludes(wxT("0123456789:-"));
+
//proc page
m_txtProcIdleFor->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtMaxLoad->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtProcSwitchEvery->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtProcUseProcessors->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtProcUseCPUTime->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+
+ m_txtProcMonday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtProcTuesday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtProcWednesday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtProcThursday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtProcFriday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtProcSaturday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtProcSunday->SetValidator(*m_vTimeIntervalValidator);
+
//net page
m_txtNetConnectInterval->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtNetDownloadRate->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
@@ -122,6 +135,15 @@ void CDlgAdvPreferences::SetValidators() {
m_txt_daily_xfer_period_days->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtNetUploadRate->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtNetAdditionalDays->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
+
+ m_txtNetMonday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtNetTuesday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtNetWednesday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtNetThursday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtNetFriday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtNetSaturday->SetValidator(*m_vTimeIntervalValidator);
+ m_txtNetSunday->SetValidator(*m_vTimeIntervalValidator);
+
//disk and memory page
m_txtDiskMaxSpace->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
m_txtDiskLeastFree->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
@@ -202,6 +224,17 @@ wxString CDlgAdvPreferences::DoubleToTimeString(double dt) {
return wxString::Format(wxT("%02d:%02d"),hour,minutes);
}
+
+// We only display 2 places past the decimal, so restrict the
+// precision of saved values to .01. This prevents unexpected
+// behavior when, for example, a zero value means no restriction
+// and the value is displayed as 0.00 but is actually 0.001.
+double CDlgAdvPreferences::RoundToHundredths(double td) {
+ int i = (int)((td + .005) * 100.);
+ return ((double)(i) / 100.);
+}
+
+
/* read preferences from core client and initialize control values */
void CDlgAdvPreferences::ReadPreferenceSettings() {
m_bInInit=true;//prevent dialog handlers from doing anything
@@ -342,11 +375,6 @@ void CDlgAdvPreferences::ReadPreferenceSettings() {
this->UpdateControlStates();
}
-void clamp_pct(double& x) {
- if (x < 0) x = 0;
- if (x > 100) x = 100;
-}
-
/* write overridden preferences to disk (global_prefs_override.xml) */
/* IMPORTANT: Any items added here must be checked in ValidateInput()! */
bool CDlgAdvPreferences::SavePreferencesSettings() {
@@ -368,12 +396,12 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
//
if(m_txtProcIdleFor->IsEnabled()) {
m_txtProcIdleFor->GetValue().ToDouble(&td);
- prefs.idle_time_to_run=td;
+ prefs.idle_time_to_run=RoundToHundredths(td);
mask.idle_time_to_run=true;
}
m_txtMaxLoad->GetValue().ToDouble(&td);
- prefs.suspend_cpu_usage=td;
+ prefs.suspend_cpu_usage=RoundToHundredths(td);
mask.suspend_cpu_usage=true;
//
@@ -397,37 +425,39 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
}
}
m_txtProcSwitchEvery->GetValue().ToDouble(&td);
- prefs.cpu_scheduling_period_minutes=td;
+ prefs.cpu_scheduling_period_minutes=RoundToHundredths(td);
mask.cpu_scheduling_period_minutes=true;
//
m_txtProcUseProcessors->GetValue().ToDouble(&td);
- clamp_pct(td);
+ td = RoundToHundredths(td);
prefs.max_ncpus_pct=td;
mask.max_ncpus_pct=true;
//
m_txtProcUseCPUTime->GetValue().ToDouble(&td);
- prefs.cpu_usage_limit=td;
+ prefs.cpu_usage_limit=RoundToHundredths(td);
mask.cpu_usage_limit=true;
// network page
m_txtNetConnectInterval->GetValue().ToDouble(&td);
- prefs.work_buf_min_days=td;
+ prefs.work_buf_min_days=RoundToHundredths(td);
mask.work_buf_min_days=true;
//
m_txtNetDownloadRate->GetValue().ToDouble(&td);
+ td = RoundToHundredths(td);
td = td * 1024;
prefs.max_bytes_sec_down=td;
mask.max_bytes_sec_down=true;
//
m_txtNetUploadRate->GetValue().ToDouble(&td);
+ td = RoundToHundredths(td);
td = td * 1024;
prefs.max_bytes_sec_up=td;
mask.max_bytes_sec_up=true;
m_txt_daily_xfer_limit_mb->GetValue().ToDouble(&td);
- prefs.daily_xfer_limit_mb=td;
+ prefs.daily_xfer_limit_mb=RoundToHundredths(td);
mask.daily_xfer_limit_mb=true;
m_txt_daily_xfer_period_days->GetValue().ToDouble(&td);
prefs.daily_xfer_period_days=(int)td;
@@ -443,7 +473,7 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
mask.hangup_if_dialed=true;
//
m_txtNetAdditionalDays->GetValue().ToDouble(&td);
- prefs.work_buf_additional_days = td;
+ prefs.work_buf_additional_days = RoundToHundredths(td);
mask.work_buf_additional_days = true;
//
prefs.net_times.start_hour=TimeStringToDouble(m_txtNetEveryDayStart->GetValue());
@@ -467,36 +497,36 @@ bool CDlgAdvPreferences::SavePreferencesSettings() {
}
//disk usage
m_txtDiskMaxSpace->GetValue().ToDouble(&td);
- prefs.disk_max_used_gb=td;
+ prefs.disk_max_used_gb=RoundToHundredths(td);
mask.disk_max_used_gb=true;
//
m_txtDiskLeastFree->GetValue().ToDouble(&td);
- prefs.disk_min_free_gb=td;
+ prefs.disk_min_free_gb=RoundToHundredths(td);
mask.disk_min_free_gb=true;
//
m_txtDiskMaxOfTotal->GetValue().ToDouble(&td);
- clamp_pct(td);
+ td = RoundToHundredths(td);
prefs.disk_max_used_pct=td;
mask.disk_max_used_pct=true;
//
m_txtDiskWriteToDisk->GetValue().ToDouble(&td);
- prefs.disk_interval=td;
+ prefs.disk_interval=RoundToHundredths(td);
mask.disk_interval=true;
//
m_txtDiskMaxSwap->GetValue().ToDouble(&td);
- clamp_pct(td);
+ td = RoundToHundredths(td);
td = td / 100.0 ;
prefs.vm_max_used_frac=td;
mask.vm_max_used_frac=true;
//Memory
m_txtMemoryMaxInUse->GetValue().ToDouble(&td);
- clamp_pct(td);
+ td = RoundToHundredths(td);
td = td / 100.0;
prefs.ram_max_used_busy_frac=td;
mask.ram_max_used_busy_frac=true;
//
m_txtMemoryMaxOnIdle->GetValue().ToDouble(&td);
- clamp_pct(td);
+ td = RoundToHundredths(td);
td = td / 100.0;
prefs.ram_max_used_idle_frac=td;
mask.ram_max_used_idle_frac=true;
@@ -554,7 +584,7 @@ bool CDlgAdvPreferences::ValidateInput() {
}
}
buffer = m_txtMaxLoad->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtMaxLoad);
return false;
}
@@ -595,13 +625,13 @@ bool CDlgAdvPreferences::ValidateInput() {
}
buffer = m_txtProcUseProcessors->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtProcUseProcessors);
return false;
}
buffer = m_txtProcUseCPUTime->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtProcUseCPUTime);
return false;
}
@@ -632,14 +662,14 @@ bool CDlgAdvPreferences::ValidateInput() {
}
//limit additional days from 0 to 10
- double td;
- if (!m_txtNetConnectInterval->GetValue().ToDouble(&td)) td = -1.;
- if(td>10.0 || td < 0.0) {
+ buffer = m_txtNetConnectInterval->GetValue();
+ if(!IsValidFloatValueBetween(buffer, 0.0, 10.0)) {
ShowErrorMessage(invMsgFloat,m_txtNetConnectInterval);
return false;
}
- if (!m_txtNetAdditionalDays->GetValue().ToDouble(&td)) td = -1.;
- if(td>10.0 || td < 0.0) {
+
+ buffer = m_txtNetAdditionalDays->GetValue();
+ if(!IsValidFloatValueBetween(buffer, 0.0, 10.0)) {
ShowErrorMessage(invMsgFloat,m_txtNetAdditionalDays);
return false;
}
@@ -690,7 +720,7 @@ bool CDlgAdvPreferences::ValidateInput() {
}
buffer = m_txtDiskMaxOfTotal->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtDiskMaxOfTotal);
return false;
}
@@ -702,19 +732,19 @@ bool CDlgAdvPreferences::ValidateInput() {
}
buffer = m_txtDiskMaxSwap->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtDiskMaxSwap);
return false;
}
buffer = m_txtMemoryMaxInUse->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtMemoryMaxInUse);
return false;
}
buffer = m_txtMemoryMaxOnIdle->GetValue();
- if(!IsValidFloatValue(buffer)) {
+ if(!IsValidFloatValueBetween(buffer, 0.0, 100.0)) {
ShowErrorMessage(invMsgFloat, m_txtMemoryMaxOnIdle);
return false;
}
@@ -729,11 +759,15 @@ bool CDlgAdvPreferences::EnsureTabPageVisible(wxTextCtrl* txtCtrl) {
int parentid = parent->GetId();
int index = m_arrTabPageIds.Index(parentid);
if(index == wxNOT_FOUND) {
- //some controls are containe din a additional panel, so look at its parent
- parent = parent->GetParent();
- wxASSERT(parent);
- parentid = parent->GetId();
- index = m_arrTabPageIds.Index(parentid);
+ //some controls are contained in an additional panel,
+ //so look at its parent and grandparent
+ for (int i=0; i<2; ++i) {
+ parent = parent->GetParent();
+ wxASSERT(parent);
+ parentid = parent->GetId();
+ index = m_arrTabPageIds.Index(parentid);
+ if(index != wxNOT_FOUND) break;
+ }
if(index == wxNOT_FOUND) {
//this should never happen
return false;
@@ -745,7 +779,8 @@ bool CDlgAdvPreferences::EnsureTabPageVisible(wxTextCtrl* txtCtrl) {
/* show an error message and set the focus to the control that caused the error */
void CDlgAdvPreferences::ShowErrorMessage(wxString& message,wxTextCtrl* errorCtrl) {
- wxASSERT(this->EnsureTabPageVisible(errorCtrl));
+ bool visibleOK = this->EnsureTabPageVisible(errorCtrl);
+ wxASSERT(visibleOK);
//
if(message.IsEmpty()){
message = _("invalid input value detected");
@@ -757,8 +792,7 @@ void CDlgAdvPreferences::ShowErrorMessage(wxString& message,wxTextCtrl* errorCtr
/* checks if ch is a valid character for float values */
bool CDlgAdvPreferences::IsValidFloatChar(const wxChar& ch) {
//don't accept the e
- return wxIsdigit(ch) || ch=='.' || ch==',' || ch=='+' || ch=='-';
-}
+ return wxIsdigit(ch) || ch=='.' || ch==',' || ch=='+' || ch=='-';}
/* checks if ch is a valid character for time values */
bool CDlgAdvPreferences::IsValidTimeChar(const wxChar& ch) {
@@ -771,7 +805,24 @@ bool CDlgAdvPreferences::IsValidTimeIntervalChar(const wxChar& ch) {
}
/* checks if the value contains a valid float */
-bool CDlgAdvPreferences::IsValidFloatValue(const wxString& value) {
+bool CDlgAdvPreferences::IsValidFloatValue(const wxString& value, bool allowNegative) {
+ for(unsigned int i=0; i < value.Length();i++) {
+ if(!IsValidFloatChar(value[i])) {
+ return false;
+ }
+ }
+ //all chars are valid, now what is with the value as a whole ?
+ double td;
+ if(!value.ToDouble(&td)) {
+ return false;
+ }
+ if (!allowNegative) {
+ if (td < 0.0) return false;
+ }
+ return true;
+}
+
+bool CDlgAdvPreferences::IsValidFloatValueBetween(const wxString& value, double minVal, double maxVal){
for(unsigned int i=0; i < value.Length();i++) {
if(!IsValidFloatChar(value[i])) {
return false;
@@ -782,9 +833,11 @@ bool CDlgAdvPreferences::IsValidFloatValue(const wxString& value) {
if(!value.ToDouble(&td)) {
return false;
}
+ if ((td < minVal) || (td > maxVal)) return false;
return true;
}
+
/* checks if the value is a valid time */
bool CDlgAdvPreferences::IsValidTimeValue(const wxString& value) {
for(unsigned int i=0; i < value.Length();i++) {
diff --git a/clientgui/DlgAdvPreferences.h b/clientgui/DlgAdvPreferences.h
index 757bc71..e448efc 100644
--- a/clientgui/DlgAdvPreferences.h
+++ b/clientgui/DlgAdvPreferences.h
@@ -42,7 +42,8 @@ class CDlgAdvPreferences : public CDlgAdvPreferencesBase {
bool ValidateInput();
void SetValidators();
bool IsValidFloatChar(const wxChar& ch);
- bool IsValidFloatValue(const wxString& value);
+ bool IsValidFloatValue(const wxString& value, bool allowNegative=false);
+ bool IsValidFloatValueBetween(const wxString& value, double minVal, double maxVal);
bool IsValidTimeChar(const wxChar& ch);
bool IsValidTimeValue(const wxString& value);
bool IsValidTimeIntervalChar(const wxChar& ch);
@@ -52,6 +53,7 @@ class CDlgAdvPreferences : public CDlgAdvPreferencesBase {
bool ConfirmClear();
wxString DoubleToTimeString(double dt);
double TimeStringToDouble(wxString timeStr);
+ double RoundToHundredths(double td);
public:
CDlgAdvPreferences(wxWindow* parent=NULL);//to act as standard constructor set a default value
virtual ~CDlgAdvPreferences();
@@ -74,6 +76,7 @@ private:
bool m_bPrefsDataChanged;
bool m_bInInit;
wxArrayInt m_arrTabPageIds;
+ wxTextValidator* m_vTimeIntervalValidator;
};
#endif // _DLGADVPREFERENCES_H_
diff --git a/clientgui/DlgAdvPreferencesBase.cpp b/clientgui/DlgAdvPreferencesBase.cpp
index 54a58ca..9876dfd 100644
--- a/clientgui/DlgAdvPreferencesBase.cpp
+++ b/clientgui/DlgAdvPreferencesBase.cpp
@@ -58,7 +58,7 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
wxStaticBoxSizer* topControlsSizer = new wxStaticBoxSizer( topControlsStaticBox, wxHORIZONTAL );
- m_bmpWarning = new wxStaticBitmap( this, ID_DEFAULT, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+ m_bmpWarning = new wxStaticBitmap( topControlsStaticBox, ID_DEFAULT, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
m_bmpWarning->SetMinSize( wxSize( 48,48 ) );
topControlsSizer->Add( m_bmpWarning, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
@@ -69,7 +69,7 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnClear->SetToolTip( _("clear all local preferences and close the dialog") );
- topControlsSizer->Add( m_btnClear, 0, wxALIGN_BOTTOM|wxALL, 1 );
+ topControlsSizer->Add( m_btnClear, 0, wxALIGN_BOTTOM|wxALL, 4 );
dialogSizer->Add( topControlsSizer, 0, wxALL|wxEXPAND, 1 );
@@ -105,7 +105,8 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnOK->SetToolTip( _("save all values and close the dialog") );
-
+ m_btnOK->SetDefault();
+
buttonSizer->Add( m_btnOK, 0, wxALL, 5 );
m_btnCancel = new wxButton( m_panelButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -348,7 +349,7 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
miscProcGridSizer->Add( m_txtProcUseProcessors, 0, wxALL, 1 );
/*xgettext:no-c-format*/
- m_staticText21 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("% of the processors (0 means ignore this setting)"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText21 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("% of the processors (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
miscProcGridSizer->Add( m_staticText21, 0, wxALL, 5 );
m_staticText22 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("Use at most"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
@@ -358,7 +359,7 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
miscProcGridSizer->Add( m_txtProcUseCPUTime, 0, wxALL, 1 );
/*xgettext:no-c-format*/
- m_staticText23 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("% CPU time"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText23 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("% of CPU time (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
miscProcGridSizer->Add( m_staticText23, 0, wxALL, 5 );
miscProcBoxSizer->Add( miscProcGridSizer, 0, wxEXPAND, 1 );
@@ -383,7 +384,7 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
wxStaticBox* networkGeneralStaticBox = new wxStaticBox( networkTab, -1, _("General options") );
wxStaticBoxSizer* networkGeneralBoxSizer = new wxStaticBoxSizer( networkGeneralStaticBox, wxVERTICAL );
- wxFlexGridSizer* networkGeneralGridSizer = new wxFlexGridSizer(6, 0, 0 );
+ wxFlexGridSizer* networkGeneralGridSizer = new wxFlexGridSizer(3, 0, 0 );
networkGeneralGridSizer->SetFlexibleDirection( wxHORIZONTAL );
networkGeneralGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -395,7 +396,7 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
m_txtNetDownloadRate = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETDOWNLOADRATE, wxT(""), wxDefaultPosition, wxSize( 50,-1 ), wxTE_RIGHT );
networkGeneralGridSizer->Add( m_txtNetDownloadRate, 0, wxALL, 1 );
- m_staticText33 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("KBytes/sec."), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText33 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("KBytes/second (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
networkGeneralGridSizer->Add( m_staticText33, 0, wxALL, 5 );
m_staticText34 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Maximum upload rate"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -404,30 +405,9 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
m_txtNetUploadRate = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETUPLOADRATE, wxT(""), wxDefaultPosition, wxSize( 50,-1 ), wxTE_RIGHT );
networkGeneralGridSizer->Add( m_txtNetUploadRate, 0, wxALL, 1 );
- m_staticText35 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("KBytes/sec."), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText35 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("KBytes/second (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
networkGeneralGridSizer->Add( m_staticText35, 0, wxALL, 5 );
- // long-term quota
-
- m_staticText_daily_xfer1 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Transfer at most"), wxDefaultPosition, wxDefaultSize, 0 );
- networkGeneralGridSizer->Add( m_staticText_daily_xfer1, 0, wxALL, 5 );
-
- m_txt_daily_xfer_limit_mb = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETDOWNLOADRATE, wxT(""), wxDefaultPosition, wxSize( 50,-1 ), wxTE_RIGHT );
- networkGeneralGridSizer->Add( m_txt_daily_xfer_limit_mb, 0, wxALL, 1 );
-
- m_staticText_daily_xfer2 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Mbytes"), wxDefaultPosition, wxDefaultSize, 0 );
- networkGeneralGridSizer->Add( m_staticText_daily_xfer2, 0, wxALL, 5 );
-
- m_staticText_daily_xfer3 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("every"), wxDefaultPosition, wxDefaultSize, 0 );
- networkGeneralGridSizer->Add( m_staticText_daily_xfer3, 0, wxALIGN_RIGHT|wxALL, 5 );
-
- m_txt_daily_xfer_period_days = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETUPLOADRATE, wxT(""), wxDefaultPosition, wxSize( 50,-1 ), wxTE_RIGHT );
- networkGeneralGridSizer->Add( m_txt_daily_xfer_period_days, 0, wxALL, 1 );
-
- m_staticText_daily_xfer4 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("days"), wxDefaultPosition, wxDefaultSize, 0 );
- networkGeneralGridSizer->Add( m_staticText_daily_xfer4, 0, wxALL, 5 );
-
-
// buffer sizes
m_staticText30 = new wxStaticText(
@@ -447,7 +427,7 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
networkGeneralGridSizer->Add( m_txtNetConnectInterval, 0, wxALL, 1 );
m_staticText31 = new wxStaticText(
- networkGeneralStaticBox, ID_DEFAULT, _("days"), wxDefaultPosition, wxDefaultSize, 0
+ networkGeneralStaticBox, ID_DEFAULT, _("days (maximum value: 10)"), wxDefaultPosition, wxDefaultSize, 0
);
networkGeneralGridSizer->Add( m_staticText31, 0, wxALL, 5 );
@@ -466,16 +446,37 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
);
networkGeneralGridSizer->Add( m_txtNetAdditionalDays, 0, wxALL, 1 );
- m_staticText341 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("days"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText341 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("days (maximum value: 10)"), wxDefaultPosition, wxDefaultSize, 0 );
networkGeneralGridSizer->Add( m_staticText341, 0, wxALL, 5 );
+ networkGeneralBoxSizer->Add( networkGeneralGridSizer, 0, wxEXPAND, 1 );
+
+ // long-term quota
+
+ wxBoxSizer* networkTransferLimitSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ m_staticText_daily_xfer1 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("Transfer at most"), wxDefaultPosition, wxDefaultSize, 0 );
+ networkTransferLimitSizer->Add( m_staticText_daily_xfer1, 0, wxALL, 5 );
+
+ m_txt_daily_xfer_limit_mb = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETDOWNLOADRATE, wxT(""), wxDefaultPosition, wxSize( 50,-1 ), wxTE_RIGHT );
+ networkTransferLimitSizer->Add( m_txt_daily_xfer_limit_mb, 0, wxALL, 1 );
+
+ m_staticText_daily_xfer2 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("MBytes every"), wxDefaultPosition, wxDefaultSize, 0 );
+ networkTransferLimitSizer->Add( m_staticText_daily_xfer2, 0, wxALL, 5 );
+
+ m_txt_daily_xfer_period_days = new wxTextCtrl( networkGeneralStaticBox, ID_TXTNETUPLOADRATE, wxT(""), wxDefaultPosition, wxSize( 50,-1 ), wxTE_RIGHT );
+ networkTransferLimitSizer->Add( m_txt_daily_xfer_period_days, 0, wxALL, 1 );
+
+ m_staticText_daily_xfer4 = new wxStaticText( networkGeneralStaticBox, ID_DEFAULT, _("days (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
+ networkTransferLimitSizer->Add( m_staticText_daily_xfer4, 0, wxALL, 5 );
+
+ networkGeneralBoxSizer->Add( networkTransferLimitSizer, 0, wxALL, 0 );
+
m_chkNetSkipImageVerification = new wxCheckBox( networkGeneralStaticBox, ID_CHKNETSKIPIMAGEVERIFICATION, _("Skip image file verification"), wxDefaultPosition, wxDefaultSize, 0 );
m_chkNetSkipImageVerification->SetToolTip( _("check this if your Internet provider modifies image files") );
- networkGeneralGridSizer->Add( m_chkNetSkipImageVerification, 0, wxALL, 5 );
-
- networkGeneralBoxSizer->Add( networkGeneralGridSizer, 0, wxEXPAND, 1 );
+ networkGeneralBoxSizer->Add( m_chkNetSkipImageVerification, 0, wxALL, 5 );
networkTabSizer->Add( networkGeneralBoxSizer, 0, wxEXPAND, 1 );
@@ -619,7 +620,7 @@ wxPanel* CDlgAdvPreferencesBase::createDiskAndMemoryTab(wxNotebook* notebook)
diskUsageGridSizer->Add( m_txtDiskMaxSpace, 0, wxALL, 1 );
- m_staticText41 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Gigabytes disk space"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText41 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Gigabytes disk space (0 means no restriction)"), wxDefaultPosition, wxDefaultSize, 0 );
diskUsageGridSizer->Add( m_staticText41, 0, wxALL, 5 );
m_staticText42 = new wxStaticText( diskUsageStaticBox, ID_DEFAULT, _("Leave at least"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp
index 8847b8e..8f881de 100755
--- a/clientgui/DlgOptions.cpp
+++ b/clientgui/DlgOptions.cpp
@@ -584,7 +584,7 @@ bool CDlgOptions::ReadSettings() {
// General Tab
m_LanguageSelectionCtrl->Append(wxGetApp().GetSupportedLanguages());
- m_LanguageSelectionCtrl->SetSelection(pFrame->GetSelectedLanguage());
+ m_LanguageSelectionCtrl->SetSelection(wxLocale::FindLanguageInfo(wxGetApp().GetISOLanguageCode())->Language);
m_ReminderFrequencyCtrl->Append(_("always"));
m_ReminderFrequencyCtrl->Append(_("1 hour"));
@@ -681,7 +681,7 @@ bool CDlgOptions::SaveSettings() {
// General Tab
- if (pFrame->GetSelectedLanguage() != m_LanguageSelectionCtrl->GetSelection()) {
+ if (wxLocale::FindLanguageInfo(wxGetApp().GetISOLanguageCode())->Language != m_LanguageSelectionCtrl->GetSelection()) {
wxString strDialogTitle;
wxString strDialogMessage;
@@ -707,7 +707,7 @@ bool CDlgOptions::SaveSettings() {
);
}
- pFrame->SetSelectedLanguage(m_LanguageSelectionCtrl->GetSelection());
+ wxGetApp().SetISOLanguageCode(wxLocale::GetLanguageInfo(m_LanguageSelectionCtrl->GetSelection())->CanonicalName);
switch(m_ReminderFrequencyCtrl->GetSelection()) {
case 0:
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 48fd599..f978343 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -83,14 +83,13 @@ BEGIN_EVENT_TABLE (CViewProjects, CBOINCBaseView)
EVT_BUTTON(ID_TASK_PROJECT_SHOW_PROPERTIES, CViewProjects::OnShowItemProperties)
EVT_CUSTOM_RANGE(wxEVT_COMMAND_BUTTON_CLICKED, ID_TASK_PROJECT_WEB_PROJDEF_MIN, ID_TASK_PROJECT_WEB_PROJDEF_MAX, CViewProjects::OnProjectWebsiteClicked)
// We currently handle EVT_LIST_CACHE_HINT on Windows or
-// EVT_CHECK_SELECTION_CHANGED on Mac instead of EVT_LIST_ITEM_SELECTED
+// EVT_CHECK_SELECTION_CHANGED on Mac & Linux instead of EVT_LIST_ITEM_SELECTED
// or EVT_LIST_ITEM_DESELECTED. See CBOINCBaseView::OnCacheHint() for info.
#if USE_LIST_CACHE_HINT
EVT_LIST_CACHE_HINT(ID_LIST_PROJECTSVIEW, CViewProjects::OnCacheHint)
#else
EVT_CHECK_SELECTION_CHANGED(CViewProjects::OnCheckSelectionChanged)
#endif
- EVT_CHECK_SELECTION_CHANGED(CViewProjects::OnCheckSelectionChanged)
EVT_LIST_COL_CLICK(ID_LIST_PROJECTSVIEW, CViewProjects::OnColClick)
EVT_LIST_COL_END_DRAG(ID_LIST_PROJECTSVIEW, CViewProjects::OnColResize)
END_EVENT_TABLE ()
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index dad3dab..0737626 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -68,6 +68,9 @@ IMPLEMENT_DYNAMIC_CLASS(CViewTransfers, CBOINCBaseView)
BEGIN_EVENT_TABLE (CViewTransfers, CBOINCBaseView)
EVT_BUTTON(ID_TASK_TRANSFERS_RETRYNOW, CViewTransfers::OnTransfersRetryNow)
EVT_BUTTON(ID_TASK_TRANSFERS_ABORT, CViewTransfers::OnTransfersAbort)
+// We currently handle EVT_LIST_CACHE_HINT on Windows or
+// EVT_CHECK_SELECTION_CHANGED on Mac & Linux instead of EVT_LIST_ITEM_SELECTED
+// or EVT_LIST_ITEM_DESELECTED. See CBOINCBaseView::OnCacheHint() for info.
#if USE_LIST_CACHE_HINT
EVT_LIST_CACHE_HINT(ID_LIST_TRANSFERSVIEW, CViewTransfers::OnCacheHint)
#else
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 84f763a..9905fd2 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE (CViewWork, CBOINCBaseView)
EVT_BUTTON(ID_TASK_ACTIVE_ONLY, CViewWork::OnActiveTasksOnly)
EVT_CUSTOM_RANGE(wxEVT_COMMAND_BUTTON_CLICKED, ID_TASK_PROJECT_WEB_PROJDEF_MIN, ID_TASK_PROJECT_WEB_PROJDEF_MAX, CViewWork::OnProjectWebsiteClicked)
// We currently handle EVT_LIST_CACHE_HINT on Windows or
-// EVT_CHECK_SELECTION_CHANGED on Mac instead of EVT_LIST_ITEM_SELECTED
+// EVT_CHECK_SELECTION_CHANGED on Mac & Linux instead of EVT_LIST_ITEM_SELECTED
// or EVT_LIST_ITEM_DESELECTED. See CBOINCBaseView::OnCacheHint() for info.
#if USE_LIST_CACHE_HINT
EVT_LIST_CACHE_HINT(ID_LIST_WORKVIEW, CViewWork::OnCacheHint)
diff --git a/clientgui/res/atiicon.xpm b/clientgui/res/atiicon.xpm
index 617e848..f0d630a 100644
--- a/clientgui/res/atiicon.xpm
+++ b/clientgui/res/atiicon.xpm
@@ -1,287 +1,287 @@
-/* XPM */
-static const char *atiicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 249 2",
-"n. c #A6222E",
-"% c #C5565B",
-"O. c #CE7D7A",
-"D c #F71A1C",
-"S. c #FFFFE7",
-"C c #4F0100",
-"5 c #FD6C6E",
-"Q. c #AD4636",
-"]. c #7A2E17",
-"^ c #FB7273",
-"a. c #7B181C",
-"dX c #9C4038",
-"h. c #D96979",
-"1. c #DCA59F",
-"v c #FF6066",
-"<. c #F7848C",
-"N. c #FFFFF6",
-"_. c #AE2A30",
-"#. c #FFFFF7",
-"*X c #7A2B1A",
-"y. c #89142A",
-"B. c #A2221C",
-"-. c #AB1718",
-"R. c #FFFCF4",
-"@. c #FFFFFE",
-"c. c #E1A9AC",
-"_ c #FFFFFF",
-" X c #BE4331",
-"Y. c #C23734",
-"bX c #D73445",
-"p. c #C7122F",
-"DX c #C03D37",
-"/. c #C2373B",
-"4. c #E6ADB8",
-"y c #FF575F",
-"9. c #C31210",
-"F c #FF1918",
-"M c #9C373B",
-"j c #A21916",
-"=X c #BE403A",
-"8X c #C73B4A",
-"%. c #79121C",
-": c #AF0524",
-"I. c #FFEDE0",
-",. c #EA2228",
-"$ c #EB6D6A",
-" . c #B0474E",
-"lX c #D13A3A",
-"3. c #F6F8ED",
-";X c #D3343D",
-"r c #E26F5C",
-"o. c #FF8085",
-"gX c #D3374D",
-"E c #EDC8B9",
-"0 c #7F1D16",
-"CX c #D3344B",
-"s c #BC4044",
-"/ c #EC7A78",
-") c #F4C3BE",
-"@ c #D35A4D",
-"R c #E0DCC2",
-"} c #F09D9E",
-"~ c #E0341F",
-"Z. c #E1565B",
-"k. c #DB332D",
-"I c #E5AEAC",
-"- c #7F1718",
-"X. c #F02A2B",
-"uX c #C63F40",
-"N c #560A08",
-"g c #4B1805",
-"m. c #571D13",
-"| c #E15669",
-"2 c #F75A5B",
-",X c #CB3D36",
-"C. c #D66773",
-"kX c #BD443D",
-"e. c #E9292C",
-"2X c #B33932",
-"l c #CF281E",
-"h c #951B1A",
-"U c #E5D7C6",
-"`. c #61282D",
-"r. c #C05D77",
-"z c #F52523",
-"XX c #D73C3B",
-":X c #D9363D",
-"[. c #BD3E36",
-">. c #D8555B",
-"q c #951511",
-"FX c #AA413E",
-"v. c #F3FFE6",
-"GX c #A53D41",
-"fX c #713E2D",
-"1X c #B24C3D",
-"@X c #D2353E",
-"( c #D57779",
-"ZX c #923A3B",
-"0X c #BB413E",
-"H. c #FFF8DC",
-"> c #DC6959",
-"SX c #AB4B3C",
-"yX c #C23C3D",
-"J c #F9777B",
-"Q c #F07F7C",
-"u. c #FFF8E8",
-".X c #C54034",
-" c #DC6356",
-"#X c #B43D3B",
-"wX c #DC343D",
-":. c #DE667B",
-"x c #EB6F5F",
-"f. c #B51B1C",
-"!. c #EA2D3E",
-"6 c #BC4B46",
-"|. c #D3393F",
-"4X c #CC3B40",
-"~. c #FF213C",
-"L c #F1C1BC",
-"zX c #BE3F3F",
-"j. c #D9535B",
-"& c #5A0F16",
-"*. c #BEB2BE",
-"'. c #803B33",
-"{. c #C7343D",
-", c #FF4D56",
-"MX c #BE3C40",
-"rX c #BC423F",
-".. c #E54F54",
-"iX c #B23736",
-"%X c #712928",
-"sX c #CA3B40",
-"}. c #BC4246",
-"q. c #DA636F",
-"[ c #E9E2F0",
-"<X c #BF463B",
-"P. c #C8AEB0",
-"VX c #67472F",
-"m c #E96F77",
-"b c #E96C6E",
-"{ c #E9A19E",
-">X c #BF4339",
-"5X c #AC463F",
-"n c #D86367",
-"V c #4C0405",
-"* c #85071E",
-"o c #E45C4F",
-"0. c #CA2C28",
-"2. c #C9BBB6",
-"7. c #C4B7B9",
-"6X c #8D3E32",
-"nX c #AC403D",
-"cX c #994038",
-"qX c #CD393C",
-"3X c #D4373E",
-"U. c #852716",
-"7 c #670C07",
-"$. c #E8BAC0",
-"A c #D51826",
-"g. c #D82533",
-"$X c #96302C",
-"+ c #E4534B",
-"eX c #D23A3F",
-"A. c #CB3629",
-"&. c #1F0000",
-"a c #F67578",
-"i c #F55F66",
-"G c #F66F67",
-"s. c #C2BAC6",
-"xX c #B13E43",
-"vX c #BF373F",
-"c c #FF6162",
-"&X c #AF4446",
-"F. c #EA3E57",
-"^. c #D42B35",
-"1 c #EC5E56",
-"6. c #631210",
-"K. c #B72331",
-"! c #CC4334",
-"S c #E61220",
-"). c #CF2738",
-"9X c #863127",
-"V. c #D22E35",
-"i. c #EBB5B6",
-";. c #AB1819",
-"B c #540004",
-"p c #F35C65",
-"9 c #981E29",
-"l. c #FFFAEE",
-"w. c #D26060",
-"d c #6A0704",
-"-X c #D0343B",
-"E. c #EC5B5F",
-"d. c #FFFAF2",
-"f c #692319",
-"t c #FF585C",
-"8 c #4E120A",
-"M. c #CFC3CD",
-"=. c #FFFAF5",
-"7X c #78322A",
-"8. c #FFF7EC",
-"aX c #CE3A42",
-"W c #C85254",
-"hX c #903634",
-"J. c #F5B4AB",
-"D. c #B24546",
-"] c #B2A996",
-"W. c #FF7E6C",
-"+. c #E4ABA9",
-"' c #C18685",
-"3 c #F15658",
-"# c #EA5856",
-"OX c #C73333",
-"< c #FF4F56",
-"O c #EF5952",
-"t. c #FDC8D4",
-"Y c #D3D7DB",
-"mX c #8D4C3B",
-"= c #691718",
-"X c #FF4951",
-"AX c #A43D3C",
-"jX c #B03F3F",
-"H c #FC6E6E",
-"u c #F26362",
-"tX c #BE383A",
-"b. c #E6C8B5",
-"BX c #9B4238",
-"oX c #D43F3D",
-"` c #D6A6A7",
-". c #FF4655",
-"5. c #A21128",
-"w c #A1241C",
-"P c #C67B7E",
-"L. c #822523",
-"x. c #CD7982",
-"k c #C21A16",
-"pX c #BA3E3D",
-"(. c #D12F3D",
-"K c #C86C6B",
-"NX c #D63343",
-"T c #C1D5C5",
-"Z c #B41E24",
-"G. c #B84144",
-"z. c #FCFBEB",
-"e c #D82431",
-"T. c #E2646D",
-"+X c #DB313D",
-"4 c #E25E5A",
-"; c #821C1E",
-/* pixels */
-" . X o O + @ # $ % & * = - ; : ",
-"> , < 1 2 3 4 5 6 7 8 9 0 q w e ",
-"r t y u i p a s d f g h j k l z ",
-"x c v b n m M N B V C Z A S D F ",
-"G H J K L P I U Y T R E W Q ! ~ ",
-"^ / ( ) _ ` ' ] [ _ { } | ...X.",
-"o.O.+. at .#.$.%.&.*.=.-.;.:._ >.,.",
-"<.1._ 2.3.4.5.6.7.8.9.0.q._ w.e.",
-"r._ t.y.u.i.p.a.s.d.f.g.h._ j.k.",
-"l.z.x.c.v.b.n.m.M.N.B.V.C._ Z.A.",
-"S.D.F.G.H.J.K.L.P.I.U.Y.T.R.E.W.",
-"Q.!.~.^./.(.)._.`.'.].[.{.}.|. X",
-".XXXoXOX+X at X#X$X%X&X*X=X-X;X:X>X",
-",X<X1X2X3X4X5X6X7X8X9X0XqXwXeXrX",
-"tXyXuXiXpXaXsXdXfXgXhXjXkXlXzXxX",
-"cXvXbXnXmXMXNXBXVXCXZXAXSXDXFXGX"
-};
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
+/* XPM */
+static const char *atiicon_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 249 2",
+"n. c #A6222E",
+"% c #C5565B",
+"O. c #CE7D7A",
+"D c #F71A1C",
+"S. c #FFFFE7",
+"C c #4F0100",
+"5 c #FD6C6E",
+"Q. c #AD4636",
+"]. c #7A2E17",
+"^ c #FB7273",
+"a. c #7B181C",
+"dX c #9C4038",
+"h. c #D96979",
+"1. c #DCA59F",
+"v c #FF6066",
+"<. c #F7848C",
+"N. c #FFFFF6",
+"_. c #AE2A30",
+"#. c #FFFFF7",
+"*X c #7A2B1A",
+"y. c #89142A",
+"B. c #A2221C",
+"-. c #AB1718",
+"R. c #FFFCF4",
+"@. c #FFFFFE",
+"c. c #E1A9AC",
+"_ c #FFFFFF",
+" X c #BE4331",
+"Y. c #C23734",
+"bX c #D73445",
+"p. c #C7122F",
+"DX c #C03D37",
+"/. c #C2373B",
+"4. c #E6ADB8",
+"y c #FF575F",
+"9. c #C31210",
+"F c #FF1918",
+"M c #9C373B",
+"j c #A21916",
+"=X c #BE403A",
+"8X c #C73B4A",
+"%. c #79121C",
+": c #AF0524",
+"I. c #FFEDE0",
+",. c #EA2228",
+"$ c #EB6D6A",
+" . c #B0474E",
+"lX c #D13A3A",
+"3. c #F6F8ED",
+";X c #D3343D",
+"r c #E26F5C",
+"o. c #FF8085",
+"gX c #D3374D",
+"E c #EDC8B9",
+"0 c #7F1D16",
+"CX c #D3344B",
+"s c #BC4044",
+"/ c #EC7A78",
+") c #F4C3BE",
+"@ c #D35A4D",
+"R c #E0DCC2",
+"} c #F09D9E",
+"~ c #E0341F",
+"Z. c #E1565B",
+"k. c #DB332D",
+"I c #E5AEAC",
+"- c #7F1718",
+"X. c #F02A2B",
+"uX c #C63F40",
+"N c #560A08",
+"g c #4B1805",
+"m. c #571D13",
+"| c #E15669",
+"2 c #F75A5B",
+",X c #CB3D36",
+"C. c #D66773",
+"kX c #BD443D",
+"e. c #E9292C",
+"2X c #B33932",
+"l c #CF281E",
+"h c #951B1A",
+"U c #E5D7C6",
+"`. c #61282D",
+"r. c #C05D77",
+"z c #F52523",
+"XX c #D73C3B",
+":X c #D9363D",
+"[. c #BD3E36",
+">. c #D8555B",
+"q c #951511",
+"FX c #AA413E",
+"v. c #F3FFE6",
+"GX c #A53D41",
+"fX c #713E2D",
+"1X c #B24C3D",
+"@X c #D2353E",
+"( c #D57779",
+"ZX c #923A3B",
+"0X c #BB413E",
+"H. c #FFF8DC",
+"> c #DC6959",
+"SX c #AB4B3C",
+"yX c #C23C3D",
+"J c #F9777B",
+"Q c #F07F7C",
+"u. c #FFF8E8",
+".X c #C54034",
+" c #DC6356",
+"#X c #B43D3B",
+"wX c #DC343D",
+":. c #DE667B",
+"x c #EB6F5F",
+"f. c #B51B1C",
+"!. c #EA2D3E",
+"6 c #BC4B46",
+"|. c #D3393F",
+"4X c #CC3B40",
+"~. c #FF213C",
+"L c #F1C1BC",
+"zX c #BE3F3F",
+"j. c #D9535B",
+"& c #5A0F16",
+"*. c #BEB2BE",
+"'. c #803B33",
+"{. c #C7343D",
+", c #FF4D56",
+"MX c #BE3C40",
+"rX c #BC423F",
+".. c #E54F54",
+"iX c #B23736",
+"%X c #712928",
+"sX c #CA3B40",
+"}. c #BC4246",
+"q. c #DA636F",
+"[ c #E9E2F0",
+"<X c #BF463B",
+"P. c #C8AEB0",
+"VX c #67472F",
+"m c #E96F77",
+"b c #E96C6E",
+"{ c #E9A19E",
+">X c #BF4339",
+"5X c #AC463F",
+"n c #D86367",
+"V c #4C0405",
+"* c #85071E",
+"o c #E45C4F",
+"0. c #CA2C28",
+"2. c #C9BBB6",
+"7. c #C4B7B9",
+"6X c #8D3E32",
+"nX c #AC403D",
+"cX c #994038",
+"qX c #CD393C",
+"3X c #D4373E",
+"U. c #852716",
+"7 c #670C07",
+"$. c #E8BAC0",
+"A c #D51826",
+"g. c #D82533",
+"$X c #96302C",
+"+ c #E4534B",
+"eX c #D23A3F",
+"A. c #CB3629",
+"&. c #1F0000",
+"a c #F67578",
+"i c #F55F66",
+"G c #F66F67",
+"s. c #C2BAC6",
+"xX c #B13E43",
+"vX c #BF373F",
+"c c #FF6162",
+"&X c #AF4446",
+"F. c #EA3E57",
+"^. c #D42B35",
+"1 c #EC5E56",
+"6. c #631210",
+"K. c #B72331",
+"! c #CC4334",
+"S c #E61220",
+"). c #CF2738",
+"9X c #863127",
+"V. c #D22E35",
+"i. c #EBB5B6",
+";. c #AB1819",
+"B c #540004",
+"p c #F35C65",
+"9 c #981E29",
+"l. c #FFFAEE",
+"w. c #D26060",
+"d c #6A0704",
+"-X c #D0343B",
+"E. c #EC5B5F",
+"d. c #FFFAF2",
+"f c #692319",
+"t c #FF585C",
+"8 c #4E120A",
+"M. c #CFC3CD",
+"=. c #FFFAF5",
+"7X c #78322A",
+"8. c #FFF7EC",
+"aX c #CE3A42",
+"W c #C85254",
+"hX c #903634",
+"J. c #F5B4AB",
+"D. c #B24546",
+"] c #B2A996",
+"W. c #FF7E6C",
+"+. c #E4ABA9",
+"' c #C18685",
+"3 c #F15658",
+"# c #EA5856",
+"OX c #C73333",
+"< c #FF4F56",
+"O c #EF5952",
+"t. c #FDC8D4",
+"Y c #D3D7DB",
+"mX c #8D4C3B",
+"= c #691718",
+"X c #FF4951",
+"AX c #A43D3C",
+"jX c #B03F3F",
+"H c #FC6E6E",
+"u c #F26362",
+"tX c #BE383A",
+"b. c #E6C8B5",
+"BX c #9B4238",
+"oX c #D43F3D",
+"` c #D6A6A7",
+". c #FF4655",
+"5. c #A21128",
+"w c #A1241C",
+"P c #C67B7E",
+"L. c #822523",
+"x. c #CD7982",
+"k c #C21A16",
+"pX c #BA3E3D",
+"(. c #D12F3D",
+"K c #C86C6B",
+"NX c #D63343",
+"T c #C1D5C5",
+"Z c #B41E24",
+"G. c #B84144",
+"z. c #FCFBEB",
+"e c #D82431",
+"T. c #E2646D",
+"+X c #DB313D",
+"4 c #E25E5A",
+"; c #821C1E",
+/* pixels */
+" . X o O + @ # $ % & * = - ; : ",
+"> , < 1 2 3 4 5 6 7 8 9 0 q w e ",
+"r t y u i p a s d f g h j k l z ",
+"x c v b n m M N B V C Z A S D F ",
+"G H J K L P I U Y T R E W Q ! ~ ",
+"^ / ( ) _ ` ' ] [ _ { } | ...X.",
+"o.O.+. at .#.$.%.&.*.=.-.;.:._ >.,.",
+"<.1._ 2.3.4.5.6.7.8.9.0.q._ w.e.",
+"r._ t.y.u.i.p.a.s.d.f.g.h._ j.k.",
+"l.z.x.c.v.b.n.m.M.N.B.V.C._ Z.A.",
+"S.D.F.G.H.J.K.L.P.I.U.Y.T.R.E.W.",
+"Q.!.~.^./.(.)._.`.'.].[.{.}.|. X",
+".XXXoXOX+X at X#X$X%X&X*X=X-X;X:X>X",
+",X<X1X2X3X4X5X6X7X8X9X0XqXwXeXrX",
+"tXyXuXiXpXaXsXdXfXgXhXjXkXlXzXxX",
+"cXvXbXnXmXMXNXBXVXCXZXAXSXDXFXGX"
+};
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
diff --git a/clientgui/res/blankicon.xpm b/clientgui/res/blankicon.xpm
index 4d9d184..98e6c05 100644
--- a/clientgui/res/blankicon.xpm
+++ b/clientgui/res/blankicon.xpm
@@ -1,39 +1,39 @@
-/* XPM */
-static const char *blankicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 1 2",
-" c None",
-/* pixels */
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
+/* XPM */
+static const char *blankicon_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 1 2",
+" c None",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
diff --git a/clientgui/res/externalweblink.xpm b/clientgui/res/externalweblink.xpm
index 7ff371f..539199d 100644
--- a/clientgui/res/externalweblink.xpm
+++ b/clientgui/res/externalweblink.xpm
@@ -1,46 +1,46 @@
-/* XPM */
-static const char *externalweblink_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 8 1",
-" c None",
-"@ c #99D5FF",
-"+ c #0055CC",
-"o c #33AACC",
-". c #0055FF",
-"O c #66AACC",
-"# c #0080CC",
-"X c #0080FF",
-/* pixels */
-" ",
-" ",
-" ",
-" ..X... ",
-" oO . ",
-" .o . ",
-" ++++.@ . ",
-" + .@ @o . ",
-" + .@ @..O. ",
-" + @O at .+ o ",
-" + @. + ",
-" + + ",
-" #++++#+ ",
-" ",
-" ",
-" "
-};
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
+/* XPM */
+static const char *externalweblink_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 8 1",
+" c None",
+"@ c #99D5FF",
+"+ c #0055CC",
+"o c #33AACC",
+". c #0055FF",
+"O c #66AACC",
+"# c #0080CC",
+"X c #0080FF",
+/* pixels */
+" ",
+" ",
+" ",
+" ..X... ",
+" oO . ",
+" .o . ",
+" ++++.@ . ",
+" + .@ @o . ",
+" + .@ @..O. ",
+" + @O at .+ o ",
+" + @. + ",
+" + + ",
+" #++++#+ ",
+" ",
+" ",
+" "
+};
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
diff --git a/clientgui/res/nvidiaicon.xpm b/clientgui/res/nvidiaicon.xpm
index 9c91a56..1ce33fe 100644
--- a/clientgui/res/nvidiaicon.xpm
+++ b/clientgui/res/nvidiaicon.xpm
@@ -1,141 +1,141 @@
-/* XPM */
-static const char *nvidiaicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 103 2",
-"V c #6DB400",
-"| c #7EBD0F",
-"Q c #91C632",
-"L c #C3E08F",
-"@. c #F5FAED",
-"f c #77B902",
-"X. c #77B903",
-"m c #FAFBF5",
-"p c #D4E9B0",
-"^ c #ECF6DB",
-" c None",
-"C c #CDE5A3",
-"5 c #F1F7E5",
-"+. c #6EB500",
-" . c #EFF7E1",
-"h c #BDDD84",
-"> c #AAD462",
-"&. c #A3D054",
-"$. c #A3D055",
-"3 c #67B100",
-"T c #E8F3D6",
-"4 c #CEE6A4",
-"* c #71B600",
-"g c #CEE6A5",
-"( c #82BF17",
-"= c #F2F8E6",
-"r c #ADD567",
-"#. c #9ACC45",
-"o. c #F2F8E8",
-"` c #A6D15B",
-"x c #D1E7A9",
-"a c #5EAD00",
-"d c #BEDE87",
-"$ c #68B200",
-"/ c #FCFDFA",
-"l c #A4D157",
-"& c #72B700",
-"N c #96C93B",
-"; c #83C019",
-"] c #61AE00",
-"X c #7CBC0B",
-"s c #F3F9E9",
-"@ c #F3F9EA",
-"% c #6BB300",
-"U c #A7D25B",
-"S c #FFFEFF",
-"i c #75B800",
-"I c #8DC52C",
-"K c #69B300",
-"P c #64AF00",
-"v c #EAF5D8",
-"o c #86C11E",
-"~ c #86C11F",
-"9 c #B8DB7C",
-"O. c #6EB400",
-"! c #EFF6E2",
-"t c #62AF00",
-"j c #BBDC80",
-"1 c #76B900",
-"D c #76B901",
-"[ c #A8D35F",
-": c #F9FBF4",
-"b c #F9FBF5",
-"# c #65B000",
-"M c #87C220",
-"e c #FEFFFE",
-"J c #6FB500",
-"F c #93C736",
-"w c #93C737",
-"{ c #BEDD86",
-"' c #F0F7E3",
-"6 c #5EAC00",
-"8 c #DDEEC1",
-"%. c #A4D056",
-") c #FAFCF5",
-"Z c #B5D976",
-"0 c #66B100",
-"G c #AED568",
-"W c #AED569",
-"z c #70B600",
-"y c #D9EBB8",
-"- c #94C839",
-"Y c #5FAD00",
-". c #F1F8E6",
-"u c #69B200",
-"H c #B8DA7B",
-"k c #73B700",
-"R c #C9E39A",
-"_ c #67B200",
-"} c #FBFDF9",
-"q c #E1F0C7",
-"E c #6CB300",
-"B c #7DBC0E",
-"7 c #8EC52C",
-", c #6AB300",
-"O c #87C11F",
-"< c #74B800",
-"A c #9FCE4B",
-".. c #B2D76F",
-"n c #59AA00",
-"c c #63AF00",
-"2 c #CAE49D",
-"+ c #85C11D",
-/* pixels */
-" ",
-" . X o O O O O O + o ",
-" @ # $ % & & & & * * ",
-" = - ; : > , < 1 1 < < ",
-" 2 3 4 5 6 7 8 3 < 1 < < ",
-" 9 0 q w e r t y u i < < ",
-"p a s d f g h j k l z < < ",
-"x t c v b n m M N B V < < ",
-" 3 C Z A S $ , D F z G u < ",
-" H J K L P I U Y T R E ",
-" & W Q ! ~ # ^ / ( * ",
-" ) _ ` ' ] J [ { , z < ",
-" } - | ...X.% < < < ",
-" o.$ $ # 3 V J J O.+. ",
-" @.#.$.%.%.%.%.%.$.&. ",
-" "
-};
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
+/* XPM */
+static const char *nvidiaicon_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 103 2",
+"V c #6DB400",
+"| c #7EBD0F",
+"Q c #91C632",
+"L c #C3E08F",
+"@. c #F5FAED",
+"f c #77B902",
+"X. c #77B903",
+"m c #FAFBF5",
+"p c #D4E9B0",
+"^ c #ECF6DB",
+" c None",
+"C c #CDE5A3",
+"5 c #F1F7E5",
+"+. c #6EB500",
+" . c #EFF7E1",
+"h c #BDDD84",
+"> c #AAD462",
+"&. c #A3D054",
+"$. c #A3D055",
+"3 c #67B100",
+"T c #E8F3D6",
+"4 c #CEE6A4",
+"* c #71B600",
+"g c #CEE6A5",
+"( c #82BF17",
+"= c #F2F8E6",
+"r c #ADD567",
+"#. c #9ACC45",
+"o. c #F2F8E8",
+"` c #A6D15B",
+"x c #D1E7A9",
+"a c #5EAD00",
+"d c #BEDE87",
+"$ c #68B200",
+"/ c #FCFDFA",
+"l c #A4D157",
+"& c #72B700",
+"N c #96C93B",
+"; c #83C019",
+"] c #61AE00",
+"X c #7CBC0B",
+"s c #F3F9E9",
+"@ c #F3F9EA",
+"% c #6BB300",
+"U c #A7D25B",
+"S c #FFFEFF",
+"i c #75B800",
+"I c #8DC52C",
+"K c #69B300",
+"P c #64AF00",
+"v c #EAF5D8",
+"o c #86C11E",
+"~ c #86C11F",
+"9 c #B8DB7C",
+"O. c #6EB400",
+"! c #EFF6E2",
+"t c #62AF00",
+"j c #BBDC80",
+"1 c #76B900",
+"D c #76B901",
+"[ c #A8D35F",
+": c #F9FBF4",
+"b c #F9FBF5",
+"# c #65B000",
+"M c #87C220",
+"e c #FEFFFE",
+"J c #6FB500",
+"F c #93C736",
+"w c #93C737",
+"{ c #BEDD86",
+"' c #F0F7E3",
+"6 c #5EAC00",
+"8 c #DDEEC1",
+"%. c #A4D056",
+") c #FAFCF5",
+"Z c #B5D976",
+"0 c #66B100",
+"G c #AED568",
+"W c #AED569",
+"z c #70B600",
+"y c #D9EBB8",
+"- c #94C839",
+"Y c #5FAD00",
+". c #F1F8E6",
+"u c #69B200",
+"H c #B8DA7B",
+"k c #73B700",
+"R c #C9E39A",
+"_ c #67B200",
+"} c #FBFDF9",
+"q c #E1F0C7",
+"E c #6CB300",
+"B c #7DBC0E",
+"7 c #8EC52C",
+", c #6AB300",
+"O c #87C11F",
+"< c #74B800",
+"A c #9FCE4B",
+".. c #B2D76F",
+"n c #59AA00",
+"c c #63AF00",
+"2 c #CAE49D",
+"+ c #85C11D",
+/* pixels */
+" ",
+" . X o O O O O O + o ",
+" @ # $ % & & & & * * ",
+" = - ; : > , < 1 1 < < ",
+" 2 3 4 5 6 7 8 3 < 1 < < ",
+" 9 0 q w e r t y u i < < ",
+"p a s d f g h j k l z < < ",
+"x t c v b n m M N B V < < ",
+" 3 C Z A S $ , D F z G u < ",
+" H J K L P I U Y T R E ",
+" & W Q ! ~ # ^ / ( * ",
+" ) _ ` ' ] J [ { , z < ",
+" } - | ...X.% < < < ",
+" o.$ $ # 3 V J J O.+. ",
+" @.#.$.%.%.%.%.%.$.&. ",
+" "
+};
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
diff --git a/clientgui/res/skins/default/graphic/workunit_running_image.xpm b/clientgui/res/skins/default/graphic/workunit_running_image.xpm
index 4fc6ef2..705353a 100644
--- a/clientgui/res/skins/default/graphic/workunit_running_image.xpm
+++ b/clientgui/res/skins/default/graphic/workunit_running_image.xpm
@@ -1,112 +1,112 @@
-/* XPM */
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2011 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/>.
-static const char *workunit_running_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 74 2",
-/* colors */
-"AA c #FFFFFFFFFFFF",
-"BA c #E8E8F0F0E8E8",
-"CA c #E0E0E8E8E0E0",
-"DA c #D8D8F0F0D8D8",
-"EA c #D0D0E8E8D0D0",
-"FA c #D0D0D8D8D8D8",
-"GA c #C8C8E8E8C8C8",
-"HA c #B8B8E0E0B8B8",
-"IA c #B0B0C8C8B0B0",
-"JA c #A8A8E0E0A0A0",
-"KA c #A8A8D8D8A8A8",
-"LA c #9898D0D09898",
-"MA c #9090F8F85858",
-"NA c #9090A8A89898",
-"OA c #8888F0F06060",
-"PA c #8888F0F05858",
-"AB c #8888B0B08888",
-"BB c #8080E0E06060",
-"CB c #8080C8C88080",
-"DB c #7878E8E85050",
-"EB c #7070F0F04848",
-"FB c #6868E0E04848",
-"GB c #6868D8D84040",
-"HB c #6060C0C05858",
-"IB c #5858D8D84040",
-"JB c #5858D8D83838",
-"KB c #5858B8B85858",
-"LB c #585890906868",
-"MB c #585890905858",
-"NB c #585888886060",
-"OB c #5050A0A04848",
-"PB c #505080805858",
-"AC c #505078786868",
-"BC c #505068687070",
-"CC c #505068686868",
-"DC c #4848C8C83030",
-"EC c #484898984848",
-"FC c #484868686868",
-"GC c #404080804848",
-"HC c #404058586060",
-"IC c #3838C0C02828",
-"JC c #3838B8B83030",
-"KC c #3838B8B82828",
-"LC c #383898983030",
-"MC c #383890904848",
-"NC c #383888884040",
-"OC c #383878783838",
-"PC c #303088883030",
-"AD c #303060604848",
-"BD c #303058584848",
-"CD c #303050505858",
-"DD c #2828C0C01818",
-"ED c #2828B8B81818",
-"FD c #282898982828",
-"GD c #282860604848",
-"HD c #282858584848",
-"ID c #282850505050",
-"JD c #2020A8A82020",
-"KD c #202068683030",
-"LD c #1818B0B01010",
-"MD c #1818A8A81010",
-"ND c #181870702020",
-"OD c #181868682828",
-"PD c #181850504040",
-"AE c #181848484040",
-"BE c #1010A8A80808",
-"CE c #101098981010",
-"DE c #101088881818",
-"EE c #080898980808",
-"FE c #080888880000",
-"GE c #0000A0A00000",
-"HE c #000058581010",
-"IE c #000040402020",
-"JE s bg c None",
-/* pixels */
-"JEJEJEJEIANBHDBDCDHDCCJEJEJEJEJE",
-"JEJEJEMBOCABFACAAAEANACDFCJEJEJE",
-"JEJEPCOBGAAAAAAAAAAAAAGALBCDJEJE",
-"JENBPCJAGADABABAAABADAGAHAGCFCJE",
-"JEHELCLAJAGADADADADAGAJALAJCIEJE",
-"NBNDFEHBKAJAHAGAGAHAJAJAHBFEODFC",
-"KDCEFEMDKBCBLALALALACBHBMDEEDEAE",
-"NDCEGEGEMDDCHBHBGBHBJCEDGEEEBEPD",
-"NDJDMDKCLDKCICICDCICICEDKCGEMDPD",
-"FDJDLDEDICICJBIBDCJBDCICEDEDJDHD",
-"PBKCKCICDCJBJBIBFBIBJBDCICDDLCHC",
-"JEKDICICJBIBDBDBDBDBIBJBICDCPDJE",
-"JEACNCJBJBGBDBPAOADBFBJBJBMCBCJE",
-"JEJEHCMCFBEBPAMAMAPAEBFBECCDJEJE",
-"JEJEJEBCGDKBBBOAOAOAKBADBCJEJEJE",
-"JEJEJEJEJEFCIDADGDIDHCJEJEJEJEJE"};
+/* XPM */
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2011 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/>.
+static const char *workunit_running_image_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 74 2",
+/* colors */
+"AA c #FFFFFFFFFFFF",
+"BA c #E8E8F0F0E8E8",
+"CA c #E0E0E8E8E0E0",
+"DA c #D8D8F0F0D8D8",
+"EA c #D0D0E8E8D0D0",
+"FA c #D0D0D8D8D8D8",
+"GA c #C8C8E8E8C8C8",
+"HA c #B8B8E0E0B8B8",
+"IA c #B0B0C8C8B0B0",
+"JA c #A8A8E0E0A0A0",
+"KA c #A8A8D8D8A8A8",
+"LA c #9898D0D09898",
+"MA c #9090F8F85858",
+"NA c #9090A8A89898",
+"OA c #8888F0F06060",
+"PA c #8888F0F05858",
+"AB c #8888B0B08888",
+"BB c #8080E0E06060",
+"CB c #8080C8C88080",
+"DB c #7878E8E85050",
+"EB c #7070F0F04848",
+"FB c #6868E0E04848",
+"GB c #6868D8D84040",
+"HB c #6060C0C05858",
+"IB c #5858D8D84040",
+"JB c #5858D8D83838",
+"KB c #5858B8B85858",
+"LB c #585890906868",
+"MB c #585890905858",
+"NB c #585888886060",
+"OB c #5050A0A04848",
+"PB c #505080805858",
+"AC c #505078786868",
+"BC c #505068687070",
+"CC c #505068686868",
+"DC c #4848C8C83030",
+"EC c #484898984848",
+"FC c #484868686868",
+"GC c #404080804848",
+"HC c #404058586060",
+"IC c #3838C0C02828",
+"JC c #3838B8B83030",
+"KC c #3838B8B82828",
+"LC c #383898983030",
+"MC c #383890904848",
+"NC c #383888884040",
+"OC c #383878783838",
+"PC c #303088883030",
+"AD c #303060604848",
+"BD c #303058584848",
+"CD c #303050505858",
+"DD c #2828C0C01818",
+"ED c #2828B8B81818",
+"FD c #282898982828",
+"GD c #282860604848",
+"HD c #282858584848",
+"ID c #282850505050",
+"JD c #2020A8A82020",
+"KD c #202068683030",
+"LD c #1818B0B01010",
+"MD c #1818A8A81010",
+"ND c #181870702020",
+"OD c #181868682828",
+"PD c #181850504040",
+"AE c #181848484040",
+"BE c #1010A8A80808",
+"CE c #101098981010",
+"DE c #101088881818",
+"EE c #080898980808",
+"FE c #080888880000",
+"GE c #0000A0A00000",
+"HE c #000058581010",
+"IE c #000040402020",
+"JE s bg c None",
+/* pixels */
+"JEJEJEJEIANBHDBDCDHDCCJEJEJEJEJE",
+"JEJEJEMBOCABFACAAAEANACDFCJEJEJE",
+"JEJEPCOBGAAAAAAAAAAAAAGALBCDJEJE",
+"JENBPCJAGADABABAAABADAGAHAGCFCJE",
+"JEHELCLAJAGADADADADAGAJALAJCIEJE",
+"NBNDFEHBKAJAHAGAGAHAJAJAHBFEODFC",
+"KDCEFEMDKBCBLALALALACBHBMDEEDEAE",
+"NDCEGEGEMDDCHBHBGBHBJCEDGEEEBEPD",
+"NDJDMDKCLDKCICICDCICICEDKCGEMDPD",
+"FDJDLDEDICICJBIBDCJBDCICEDEDJDHD",
+"PBKCKCICDCJBJBIBFBIBJBDCICDDLCHC",
+"JEKDICICJBIBDBDBDBDBIBJBICDCPDJE",
+"JEACNCJBJBGBDBPAOADBFBJBJBMCBCJE",
+"JEJEHCMCFBEBPAMAMAPAEBFBECCDJEJE",
+"JEJEJEBCGDKBBBOAOAOAKBADBCJEJEJE",
+"JEJEJEJEJEFCIDADGDIDHCJEJEJEJEJE"};
diff --git a/clientgui/res/skins/default/graphic/workunit_waiting_image.xpm b/clientgui/res/skins/default/graphic/workunit_waiting_image.xpm
index 45adbf1..d91d789 100644
--- a/clientgui/res/skins/default/graphic/workunit_waiting_image.xpm
+++ b/clientgui/res/skins/default/graphic/workunit_waiting_image.xpm
@@ -1,88 +1,88 @@
-/* XPM */
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2011 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/>.
-static const char *workunit_waiting_image_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 50 2",
-/* colors */
-"AA c #FFFFFFFFFFFF",
-"BA c #F8F8F8F8E8E8",
-"CA c #F8F8F8F8D8D8",
-"DA c #F8F8F8F8C8C8",
-"EA c #F8F8F8F8B0B0",
-"FA c #F8F8F8F8A0A0",
-"GA c #F8F8F8F89898",
-"HA c #F8F8F8F88080",
-"IA c #F8F8F8F87070",
-"JA c #F8F8F8F85858",
-"KA c #F8F8F8F80000",
-"LA c #F8F8E8E80000",
-"MA c #F8F8D8D80000",
-"NA c #F8F8C8C80000",
-"OA c #F8F8B8B80000",
-"PA c #F8F8A8A80000",
-"AB c #F8F898980000",
-"BB c #F8F878780000",
-"CB c #E8E888880000",
-"DB c #D0D0C8C8B8B8",
-"EB c #D0D0B8B8B0B0",
-"FB c #D0D070700000",
-"GB c #C0C060601010",
-"HB c #B8B870700808",
-"IB c #B0B088885858",
-"JB c #A8A868680000",
-"KB c #909068685858",
-"LB c #909068683838",
-"MB c #888878785050",
-"NB c #888868680000",
-"OB c #808050501010",
-"PB c #787870705050",
-"AC c #787840400000",
-"BC c #707070700000",
-"CC c #686868680000",
-"DC c #585868685050",
-"EC c #505060604848",
-"FC c #505050505050",
-"GC c #484860604040",
-"HC c #484858580000",
-"IC c #484848484848",
-"JC c #404058584040",
-"KC c #404048481010",
-"LC c #303048482828",
-"MC c #282848482020",
-"NC c #282838382828",
-"OC c #202048481010",
-"PC c #202040400808",
-"AD c #181860600808",
-"BD s bg c None",
-/* pixels */
-"BDBDBDBDDBPBKCADHCOCFCBDBDBDBDBD",
-"BDBDBDIBFBIAAAAAAAAAGANBICBDBDBD",
-"BDBDLBOAAAAAAAAAAAAAAAAANANCBDBD",
-"BDKBOADAAAAAAAAAAAAAAAAACACBICBD",
-"BDACOAHABAAAAAAAAAAAAABAGANAPCBD",
-"MBHBABKAGACAAAAAAAAABAFALABBJBGC",
-"OBPAPANAKAJAGAEAEAGAJALANAPABBPC",
-"HBOAOANAPAKALAKAKALAKAPAABOAABHC",
-"HBMANAMAOAKAKAKAKAMANANAMAMANAHC",
-"GBMAPANAKALAKAKAKAKALAMANAMAMAKC",
-"IBABKAMALAKAKAKAKAKAKALAMAKAOAJC",
-"EBHBKAKAKAKAKAKAKAKAKAKALALABCBD",
-"BDECABKAKAKAKAKAKAKAKAKAKAABGCBD",
-"BDBDLCOAKAKAKAKAKAKAKAKANAMCBDBD",
-"BDBDBDDCNBLAKAKAKAKAKAJBFCBDBDBD",
-"BDBDBDBDBDECLCCCBCHCJCBDBDBDBDBD"};
+/* XPM */
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2011 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/>.
+static const char *workunit_waiting_image_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 50 2",
+/* colors */
+"AA c #FFFFFFFFFFFF",
+"BA c #F8F8F8F8E8E8",
+"CA c #F8F8F8F8D8D8",
+"DA c #F8F8F8F8C8C8",
+"EA c #F8F8F8F8B0B0",
+"FA c #F8F8F8F8A0A0",
+"GA c #F8F8F8F89898",
+"HA c #F8F8F8F88080",
+"IA c #F8F8F8F87070",
+"JA c #F8F8F8F85858",
+"KA c #F8F8F8F80000",
+"LA c #F8F8E8E80000",
+"MA c #F8F8D8D80000",
+"NA c #F8F8C8C80000",
+"OA c #F8F8B8B80000",
+"PA c #F8F8A8A80000",
+"AB c #F8F898980000",
+"BB c #F8F878780000",
+"CB c #E8E888880000",
+"DB c #D0D0C8C8B8B8",
+"EB c #D0D0B8B8B0B0",
+"FB c #D0D070700000",
+"GB c #C0C060601010",
+"HB c #B8B870700808",
+"IB c #B0B088885858",
+"JB c #A8A868680000",
+"KB c #909068685858",
+"LB c #909068683838",
+"MB c #888878785050",
+"NB c #888868680000",
+"OB c #808050501010",
+"PB c #787870705050",
+"AC c #787840400000",
+"BC c #707070700000",
+"CC c #686868680000",
+"DC c #585868685050",
+"EC c #505060604848",
+"FC c #505050505050",
+"GC c #484860604040",
+"HC c #484858580000",
+"IC c #484848484848",
+"JC c #404058584040",
+"KC c #404048481010",
+"LC c #303048482828",
+"MC c #282848482020",
+"NC c #282838382828",
+"OC c #202048481010",
+"PC c #202040400808",
+"AD c #181860600808",
+"BD s bg c None",
+/* pixels */
+"BDBDBDBDDBPBKCADHCOCFCBDBDBDBDBD",
+"BDBDBDIBFBIAAAAAAAAAGANBICBDBDBD",
+"BDBDLBOAAAAAAAAAAAAAAAAANANCBDBD",
+"BDKBOADAAAAAAAAAAAAAAAAACACBICBD",
+"BDACOAHABAAAAAAAAAAAAABAGANAPCBD",
+"MBHBABKAGACAAAAAAAAABAFALABBJBGC",
+"OBPAPANAKAJAGAEAEAGAJALANAPABBPC",
+"HBOAOANAPAKALAKAKALAKAPAABOAABHC",
+"HBMANAMAOAKAKAKAKAMANANAMAMANAHC",
+"GBMAPANAKALAKAKAKAKALAMANAMAMAKC",
+"IBABKAMALAKAKAKAKAKAKALAMAKAOAJC",
+"EBHBKAKAKAKAKAKAKAKAKAKALALABCBD",
+"BDECABKAKAKAKAKAKAKAKAKAKAABGCBD",
+"BDBDLCOAKAKAKAKAKAKAKAKANAMCBDBD",
+"BDBDBDDCNBLAKAKAKAKAKAJBFCBDBDBD",
+"BDBDBDBDBDECLCCCBCHCJCBDBDBDBDBD"};
diff --git a/clientgui/res/templates/skins/Resource Information.txt b/clientgui/res/templates/skins/Resource Information.txt
index 1635b3a..96beb24 100644
--- a/clientgui/res/templates/skins/Resource Information.txt
+++ b/clientgui/res/templates/skins/Resource Information.txt
@@ -1,8 +1,8 @@
-Boinc Logo:
-http://boinc.berkeley.edu/logo.php
-
-Background (used with permission by Funerium):
-http://funerium.deviantart.com/art/Moment-in-space-XCVI-103416759?q=gallery%3Afunerium%2F230361&qo=100
-
-Background changes and Icons:
+Boinc Logo:
+http://boinc.berkeley.edu/logo.php
+
+Background (used with permission by Funerium):
+http://funerium.deviantart.com/art/Moment-in-space-XCVI-103416759?q=gallery%3Afunerium%2F230361&qo=100
+
+Background changes and Icons:
Jacob Klein
\ No newline at end of file
diff --git a/clientgui/sg_ProjectCommandPopup.cpp b/clientgui/sg_ProjectCommandPopup.cpp
index a0b17e2..82225ff 100644
--- a/clientgui/sg_ProjectCommandPopup.cpp
+++ b/clientgui/sg_ProjectCommandPopup.cpp
@@ -99,12 +99,12 @@ void CSimpleProjectCommandPopupButton::AddMenuItems() {
}
-void CSimpleProjectCommandPopupButton::OnProjectCommandsMouseDown(wxMouseEvent& event) {
+void CSimpleProjectCommandPopupButton::OnProjectCommandsMouseDown(wxMouseEvent&) {
ShowProjectCommandsMenu(ScreenToClient(wxGetMousePosition()));
}
-void CSimpleProjectCommandPopupButton::OnProjectCommandsKeyboardNav(wxCommandEvent& event) {
+void CSimpleProjectCommandPopupButton::OnProjectCommandsKeyboardNav(wxCommandEvent&) {
ShowProjectCommandsMenu(wxPoint(GetSize().GetWidth()/2, GetSize().GetHeight()/2));
}
diff --git a/clientgui/sg_ProjectWebSitesPopup.cpp b/clientgui/sg_ProjectWebSitesPopup.cpp
index 168db16..5b22e11 100644
--- a/clientgui/sg_ProjectWebSitesPopup.cpp
+++ b/clientgui/sg_ProjectWebSitesPopup.cpp
@@ -93,12 +93,12 @@ void CSimpleProjectWebSitesPopupButton::RebuildMenu() {
}
-void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesMouseDown(wxMouseEvent& event) {
+void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesMouseDown(wxMouseEvent&) {
ShowProjectWebSitesMenu(ScreenToClient(wxGetMousePosition()));
}
-void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesKeyboardNav(wxCommandEvent& event) {
+void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesKeyboardNav(wxCommandEvent&) {
ShowProjectWebSitesMenu(wxPoint(GetSize().GetWidth()/2, GetSize().GetHeight()/2));
}
diff --git a/clientgui/sg_TaskCommandPopup.cpp b/clientgui/sg_TaskCommandPopup.cpp
index cdc82c0..66022ff 100644
--- a/clientgui/sg_TaskCommandPopup.cpp
+++ b/clientgui/sg_TaskCommandPopup.cpp
@@ -87,12 +87,12 @@ void CSimpleTaskPopupButton::AddMenuItems() {
}
-void CSimpleTaskPopupButton::OnTaskCommandsMouseDown(wxMouseEvent& event) {
+void CSimpleTaskPopupButton::OnTaskCommandsMouseDown(wxMouseEvent&) {
ShowTaskCommandsMenu(ScreenToClient(wxGetMousePosition()));
}
-void CSimpleTaskPopupButton::OnTaskCommandsKeyboardNav(wxCommandEvent& event) {
+void CSimpleTaskPopupButton::OnTaskCommandsKeyboardNav(wxCommandEvent&) {
ShowTaskCommandsMenu(wxPoint(GetSize().GetWidth()/2, GetSize().GetHeight()/2));
}
diff --git a/clientgui/skins/Charity Engine/skin.xml b/clientgui/skins/Charity Engine/skin.xml
index a74f969..f9c5941 100644
--- a/clientgui/skins/Charity Engine/skin.xml
+++ b/clientgui/skins/Charity Engine/skin.xml
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin>
- <en>
- <simple>
-
- <panel_opacity>128</panel_opacity>
-
- <background_image>
- <!-- Background Image for Simple GUI -->
- <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
- <!-- Top banner height: about 68 -->
- <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
- <image>
- <imagesrc>background_image.png</imagesrc>
- <background_color>255:255:255</background_color>
- </image>
- </background_image>
-
- <workunit_running_image>
- <image>
- <imagesrc>workunit_running_image.png</imagesrc>
- </image>
- </workunit_running_image>
-
- <workunit_waiting_image>
- <image>
- <imagesrc>workunit_waiting_image.png</imagesrc>
- </image>
- </workunit_waiting_image>
-
- <workunit_suspended_image>
- <image>
- <imagesrc>workunit_suspended_image.png</imagesrc>
- </image>
- </workunit_suspended_image>
-
- <dialog_background_image>
- <image>
- <imagesrc>dialog_background_image.png</imagesrc>
- </image>
- </dialog_background_image>
-
- <project_image>
- <image>
- <imagesrc>project_image.png</imagesrc>
- </image>
- </project_image>
-
- </simple>
- <advanced>
- <application_name>Charity Engine Desktop</application_name>
- <application_short_name>Charity Engine</application_short_name>
-
- <application_logo>ce_about.ico</application_logo>
- <application_icon>
- <image>
- <imagesrc>ce_icon_play.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_icon>
-
- <application_icon32>
- <image>
- <imagesrc>ce_about.ico</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_icon32>
-
- <application_disconnected_icon>
- <image>
- <imagesrc>ce_stop.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_disconnected_icon>
-
- <application_snooze_icon>
- <image>
- <imagesrc>ce_pause.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_snooze_icon>
-
- <is_branded>1</is_branded>
-
- <organization_name>Charity Engine</organization_name>
- <organization_website>http://www.charityengine.com</organization_website>
- <organization_help_url>http://www.charityengine.com/manager_menu.php</organization_help_url>
-
- </advanced>
-
- <wizards>
- <attach_to_project>
- <!-- title displayed on the attach to project wizard -->
- <title>Charity Engine Desktop - Attach to Project</title>
- </attach_to_project>
- <attach_to_account_manager>
- <!-- title displayed on the attach to account manager wizard -->
- <title></title>
- <!-- additional message to user about attaching to an account manager -->
- <account_info_message></account_info_message>
- </attach_to_account_manager>
- </wizards>
-
- </en>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin>
+ <en>
+ <simple>
+
+ <panel_opacity>128</panel_opacity>
+
+ <background_image>
+ <!-- Background Image for Simple GUI -->
+ <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
+ <!-- Top banner height: about 68 -->
+ <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
+ <image>
+ <imagesrc>background_image.png</imagesrc>
+ <background_color>255:255:255</background_color>
+ </image>
+ </background_image>
+
+ <workunit_running_image>
+ <image>
+ <imagesrc>workunit_running_image.png</imagesrc>
+ </image>
+ </workunit_running_image>
+
+ <workunit_waiting_image>
+ <image>
+ <imagesrc>workunit_waiting_image.png</imagesrc>
+ </image>
+ </workunit_waiting_image>
+
+ <workunit_suspended_image>
+ <image>
+ <imagesrc>workunit_suspended_image.png</imagesrc>
+ </image>
+ </workunit_suspended_image>
+
+ <dialog_background_image>
+ <image>
+ <imagesrc>dialog_background_image.png</imagesrc>
+ </image>
+ </dialog_background_image>
+
+ <project_image>
+ <image>
+ <imagesrc>project_image.png</imagesrc>
+ </image>
+ </project_image>
+
+ </simple>
+ <advanced>
+ <application_name>Charity Engine Desktop</application_name>
+ <application_short_name>Charity Engine</application_short_name>
+
+ <application_logo>ce_about.ico</application_logo>
+ <application_icon>
+ <image>
+ <imagesrc>ce_icon_play.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_icon>
+
+ <application_icon32>
+ <image>
+ <imagesrc>ce_about.ico</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_icon32>
+
+ <application_disconnected_icon>
+ <image>
+ <imagesrc>ce_stop.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_disconnected_icon>
+
+ <application_snooze_icon>
+ <image>
+ <imagesrc>ce_pause.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_snooze_icon>
+
+ <is_branded>1</is_branded>
+
+ <organization_name>Charity Engine</organization_name>
+ <organization_website>http://www.charityengine.com</organization_website>
+ <organization_help_url>http://www.charityengine.com/manager_menu.php</organization_help_url>
+
+ </advanced>
+
+ <wizards>
+ <attach_to_project>
+ <!-- title displayed on the attach to project wizard -->
+ <title>Charity Engine Desktop - Attach to Project</title>
+ </attach_to_project>
+ <attach_to_account_manager>
+ <!-- title displayed on the attach to account manager wizard -->
+ <title></title>
+ <!-- additional message to user about attaching to an account manager -->
+ <account_info_message></account_info_message>
+ </attach_to_account_manager>
+ </wizards>
+
+ </en>
+</skin>
diff --git a/clientgui/skins/Default/skin.xml b/clientgui/skins/Default/skin.xml
index 88f75bc..5175f55 100644
--- a/clientgui/skins/Default/skin.xml
+++ b/clientgui/skins/Default/skin.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin>
- <en>
- <simple>
-
- <panel_opacity>180</panel_opacity>
-
- <background_image>
- <!-- Background Image for Simple GUI -->
- <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
- <!-- Top banner height: about 68 -->
- <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
- <image>
- <imagesrc>background_image.png</imagesrc>
- <background_color>0:0:0</background_color>
- </image>
- </background_image>
-
- <workunit_running_image>
- <image>
- <imagesrc>workunit_running_image.png</imagesrc>
- </image>
- </workunit_running_image>
-
- <workunit_waiting_image>
- <image>
- <imagesrc>workunit_waiting_image.png</imagesrc>
- </image>
- </workunit_waiting_image>
-
- <workunit_suspended_image>
- <image>
- <imagesrc>workunit_suspended_image.png</imagesrc>
- </image>
- </workunit_suspended_image>
-
- </simple>
- </en>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin>
+ <en>
+ <simple>
+
+ <panel_opacity>180</panel_opacity>
+
+ <background_image>
+ <!-- Background Image for Simple GUI -->
+ <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
+ <!-- Top banner height: about 68 -->
+ <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
+ <image>
+ <imagesrc>background_image.png</imagesrc>
+ <background_color>0:0:0</background_color>
+ </image>
+ </background_image>
+
+ <workunit_running_image>
+ <image>
+ <imagesrc>workunit_running_image.png</imagesrc>
+ </image>
+ </workunit_running_image>
+
+ <workunit_waiting_image>
+ <image>
+ <imagesrc>workunit_waiting_image.png</imagesrc>
+ </image>
+ </workunit_waiting_image>
+
+ <workunit_suspended_image>
+ <image>
+ <imagesrc>workunit_suspended_image.png</imagesrc>
+ </image>
+ </workunit_suspended_image>
+
+ </simple>
+ </en>
+</skin>
diff --git a/clientgui/skins/GridRepublic/skin.xml b/clientgui/skins/GridRepublic/skin.xml
index 0ff4faf..9fde89a 100644
--- a/clientgui/skins/GridRepublic/skin.xml
+++ b/clientgui/skins/GridRepublic/skin.xml
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin>
- <en>
- <simple>
-
- <panel_opacity>128</panel_opacity>
-
- <background_image>
- <!-- Background Image for Simple GUI -->
- <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
- <!-- Top banner height: about 68 -->
- <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
- <image>
- <imagesrc>background_image.png</imagesrc>
- <background_color>255:255:255</background_color>
- </image>
- </background_image>
-
- <workunit_running_image>
- <image>
- <imagesrc>workunit_running_image.png</imagesrc>
- </image>
- </workunit_running_image>
-
- <workunit_waiting_image>
- <image>
- <imagesrc>workunit_waiting_image.png</imagesrc>
- </image>
- </workunit_waiting_image>
-
- <workunit_suspended_image>
- <image>
- <imagesrc>workunit_suspended_image.png</imagesrc>
- </image>
- </workunit_suspended_image>
-
- <dialog_background_image>
- <image>
- <imagesrc>dialog_background_image.png</imagesrc>
- </image>
- </dialog_background_image>
-
- <project_image>
- <image>
- <imagesrc>project_image.png</imagesrc>
- </image>
- </project_image>
-
- </simple>
- <advanced>
- <application_name>GridRepublic Desktop</application_name>
- <application_short_name>GridRepublic</application_short_name>
- <application_logo>gr_about.ico</application_logo>
-
- <application_icon>
- <image>
- <imagesrc>gr_icon_play.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_icon>
-
- <application_icon32>
- <image>
- <imagesrc>gr_about.ico</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_icon32>
-
- <application_disconnected_icon>
- <image>
- <imagesrc>gr_stop.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_disconnected_icon>
-
- <application_snooze_icon>
- <image>
- <imagesrc>gr_pause.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_snooze_icon>
-
- <is_branded>1</is_branded>
-
- <organization_name>GridRepublic</organization_name>
- <organization_website>http://www.gridrepublic.org</organization_website>
- <organization_help_url>http://www.gridrepublic.org/manager_menu.php</organization_help_url>
-
- </advanced>
-
- <wizards>
- <attach_to_project>
- <!-- title displayed on the attach to project wizard -->
- <title>GridRepublic Desktop - Attach to Project</title>
- </attach_to_project>
- <attach_to_account_manager>
- <!-- title displayed on the attach to account manager wizard -->
- <title></title>
- <!-- additional message to user about attaching to an account manager -->
- <account_info_message></account_info_message>
- </attach_to_account_manager>
- </wizards>
-
- </en>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin>
+ <en>
+ <simple>
+
+ <panel_opacity>128</panel_opacity>
+
+ <background_image>
+ <!-- Background Image for Simple GUI -->
+ <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
+ <!-- Top banner height: about 68 -->
+ <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
+ <image>
+ <imagesrc>background_image.png</imagesrc>
+ <background_color>255:255:255</background_color>
+ </image>
+ </background_image>
+
+ <workunit_running_image>
+ <image>
+ <imagesrc>workunit_running_image.png</imagesrc>
+ </image>
+ </workunit_running_image>
+
+ <workunit_waiting_image>
+ <image>
+ <imagesrc>workunit_waiting_image.png</imagesrc>
+ </image>
+ </workunit_waiting_image>
+
+ <workunit_suspended_image>
+ <image>
+ <imagesrc>workunit_suspended_image.png</imagesrc>
+ </image>
+ </workunit_suspended_image>
+
+ <dialog_background_image>
+ <image>
+ <imagesrc>dialog_background_image.png</imagesrc>
+ </image>
+ </dialog_background_image>
+
+ <project_image>
+ <image>
+ <imagesrc>project_image.png</imagesrc>
+ </image>
+ </project_image>
+
+ </simple>
+ <advanced>
+ <application_name>GridRepublic Desktop</application_name>
+ <application_short_name>GridRepublic</application_short_name>
+ <application_logo>gr_about.ico</application_logo>
+
+ <application_icon>
+ <image>
+ <imagesrc>gr_icon_play.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_icon>
+
+ <application_icon32>
+ <image>
+ <imagesrc>gr_about.ico</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_icon32>
+
+ <application_disconnected_icon>
+ <image>
+ <imagesrc>gr_stop.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_disconnected_icon>
+
+ <application_snooze_icon>
+ <image>
+ <imagesrc>gr_pause.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_snooze_icon>
+
+ <is_branded>1</is_branded>
+
+ <organization_name>GridRepublic</organization_name>
+ <organization_website>http://www.gridrepublic.org</organization_website>
+ <organization_help_url>http://www.gridrepublic.org/manager_menu.php</organization_help_url>
+
+ </advanced>
+
+ <wizards>
+ <attach_to_project>
+ <!-- title displayed on the attach to project wizard -->
+ <title>GridRepublic Desktop - Attach to Project</title>
+ </attach_to_project>
+ <attach_to_account_manager>
+ <!-- title displayed on the attach to account manager wizard -->
+ <title></title>
+ <!-- additional message to user about attaching to an account manager -->
+ <account_info_message></account_info_message>
+ </attach_to_account_manager>
+ </wizards>
+
+ </en>
+</skin>
diff --git a/clientgui/skins/ProgressThruProcessors/skin.xml b/clientgui/skins/ProgressThruProcessors/skin.xml
index 40e4e21..e319bb5 100644
--- a/clientgui/skins/ProgressThruProcessors/skin.xml
+++ b/clientgui/skins/ProgressThruProcessors/skin.xml
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin>
- <en>
- <simple>
-
- <panel_opacity>128</panel_opacity>
-
- <background_image>
- <!-- Background Image for Simple GUI -->
- <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
- <!-- Top banner height: about 68 -->
- <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
- <image>
- <imagesrc>background_image.png</imagesrc>
- <background_color>255:255:255</background_color>
- </image>
- </background_image>
-
- <workunit_running_image>
- <image>
- <imagesrc>workunit_running_image.png</imagesrc>
- </image>
- </workunit_running_image>
-
- <workunit_waiting_image>
- <image>
- <imagesrc>workunit_waiting_image.png</imagesrc>
- </image>
- </workunit_waiting_image>
-
- <workunit_suspended_image>
- <image>
- <imagesrc>workunit_suspended_image.png</imagesrc>
- </image>
- </workunit_suspended_image>
-
- <dialog_background_image>
- <image>
- <imagesrc>dialog_background_image.png</imagesrc>
- </image>
- </dialog_background_image>
-
- <project_image>
- <image>
- <imagesrc>project_image.png</imagesrc>
- </image>
- </project_image>
-
- </simple>
- <advanced>
- <application_name>Progress Thru Processors Desktop</application_name>
- <application_short_name>Progress Thru Processors</application_short_name>
- <application_logo>ptp_about.ico</application_logo>
-
- <application_icon>
- <image>
- <imagesrc>ptp_icon_play.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_icon>
-
- <application_icon32>
- <image>
- <imagesrc>ptp_about.ico</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_icon32>
-
- <application_disconnected_icon>
- <image>
- <imagesrc>ptp_stop.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_disconnected_icon>
-
- <application_snooze_icon>
- <image>
- <imagesrc>ptp_pause.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
- </image>
- </application_snooze_icon>
-
- <is_branded>1</is_branded>
-
- <organization_name>Progress Thru Processors</organization_name>
- <organization_website>https://apps.facebook.com/processors</organization_website>
- <organization_help_url>https://apps.facebook.com/processors/manager_menu.php</organization_help_url>
-
- </advanced>
-
- <wizards>
- <attach_to_project>
- <!-- title displayed on the attach to project wizard -->
- <title>Progress Thru Processors Desktop - Attach to Project</title>
- </attach_to_project>
- <attach_to_account_manager>
- <!-- title displayed on the attach to account manager wizard -->
- <title></title>
- <!-- additional message to user about attaching to an account manager -->
- <account_info_message></account_info_message>
- </attach_to_account_manager>
- </wizards>
-
- </en>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin>
+ <en>
+ <simple>
+
+ <panel_opacity>128</panel_opacity>
+
+ <background_image>
+ <!-- Background Image for Simple GUI -->
+ <!-- Recommended total size: 600x750 (to accomodate OS size differences and localizations of text) -->
+ <!-- Top banner height: about 68 -->
+ <!-- EN-Win total size: about 422x582 as of 6.13.12 -->
+ <image>
+ <imagesrc>background_image.png</imagesrc>
+ <background_color>255:255:255</background_color>
+ </image>
+ </background_image>
+
+ <workunit_running_image>
+ <image>
+ <imagesrc>workunit_running_image.png</imagesrc>
+ </image>
+ </workunit_running_image>
+
+ <workunit_waiting_image>
+ <image>
+ <imagesrc>workunit_waiting_image.png</imagesrc>
+ </image>
+ </workunit_waiting_image>
+
+ <workunit_suspended_image>
+ <image>
+ <imagesrc>workunit_suspended_image.png</imagesrc>
+ </image>
+ </workunit_suspended_image>
+
+ <dialog_background_image>
+ <image>
+ <imagesrc>dialog_background_image.png</imagesrc>
+ </image>
+ </dialog_background_image>
+
+ <project_image>
+ <image>
+ <imagesrc>project_image.png</imagesrc>
+ </image>
+ </project_image>
+
+ </simple>
+ <advanced>
+ <application_name>Progress Thru Processors Desktop</application_name>
+ <application_short_name>Progress Thru Processors</application_short_name>
+ <application_logo>ptp_about.ico</application_logo>
+
+ <application_icon>
+ <image>
+ <imagesrc>ptp_icon_play.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_icon>
+
+ <application_icon32>
+ <image>
+ <imagesrc>ptp_about.ico</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_icon32>
+
+ <application_disconnected_icon>
+ <image>
+ <imagesrc>ptp_stop.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_disconnected_icon>
+
+ <application_snooze_icon>
+ <image>
+ <imagesrc>ptp_pause.png</imagesrc>
+ <transparency_mask>255:0:255</transparency_mask>
+ </image>
+ </application_snooze_icon>
+
+ <is_branded>1</is_branded>
+
+ <organization_name>Progress Thru Processors</organization_name>
+ <organization_website>https://apps.facebook.com/processors</organization_website>
+ <organization_help_url>https://apps.facebook.com/processors/manager_menu.php</organization_help_url>
+
+ </advanced>
+
+ <wizards>
+ <attach_to_project>
+ <!-- title displayed on the attach to project wizard -->
+ <title>Progress Thru Processors Desktop - Attach to Project</title>
+ </attach_to_project>
+ <attach_to_account_manager>
+ <!-- title displayed on the attach to account manager wizard -->
+ <title></title>
+ <!-- additional message to user about attaching to an account manager -->
+ <account_info_message></account_info_message>
+ </attach_to_account_manager>
+ </wizards>
+
+ </en>
+</skin>
diff --git a/configure.ac b/configure.ac
index 288cd42..1f82c2e 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.1)
+AC_INIT(BOINC, 7.4.7)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/db/boinc_db_types.h b/db/boinc_db_types.h
index e4dde79..1580ac3 100644
--- a/db/boinc_db_types.h
+++ b/db/boinc_db_types.h
@@ -126,8 +126,12 @@ struct APP_VERSION {
char plan_class[256];
AVERAGE pfc;
// the stats of (claimed PFC)/wu.rsc_fpops_est
- // If wu.rsc_fpops_est is accurate,
- // this is the reciprocal of efficiency
+ // What does this mean?
+ // Suppose X is the error in rsc_fpops_est
+ // (i.e. actual FPOPS = X*rsc_fpops_est)
+ // and Y is average efficiency
+ // (actual FLOPS = Y*peak FLOPS)
+ // Then this is X/Y.
double pfc_scale;
// PFC scaling factor for this app (or 0 if not enough data)
// The reciprocal of this version's efficiency, averaged over all jobs,
diff --git a/dcapi/java/example/boinc-java-launcher b/dcapi/java/example/boinc-java-launcher
index 10b7aea..531136b 100644
--- a/dcapi/java/example/boinc-java-launcher
+++ b/dcapi/java/example/boinc-java-launcher
@@ -1,17 +1,17 @@
-#!/bin/sh
-
-#
-# Script to launch java applications in a BOINC environment
-#
-
-set +v
-
-libdcapi-jre=`sed -n '/^<soft_link>/ s/<[^>]*>//gp' libdcapi-jre.tar`
-app-jar=`sed -n '/^<soft_link>/ s/<[^>]*>//gp' Uppercase.jar`
-
-[ -d jre ] || gunzip -c "$libdcapi-jre" | tar xf -
-
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
-export LD_LIBRARY_PATH
-
-exec ./jre/bin/java -jar "$app-jar"
+#!/bin/sh
+
+#
+# Script to launch java applications in a BOINC environment
+#
+
+set +v
+
+libdcapi-jre=`sed -n '/^<soft_link>/ s/<[^>]*>//gp' libdcapi-jre.tar`
+app-jar=`sed -n '/^<soft_link>/ s/<[^>]*>//gp' Uppercase.jar`
+
+[ -d jre ] || gunzip -c "$libdcapi-jre" | tar xf -
+
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+export LD_LIBRARY_PATH
+
+exec ./jre/bin/java -jar "$app-jar"
diff --git a/dcapi/java/jre-boinc/jre_for_boinc_guide.txt b/dcapi/java/jre-boinc/jre_for_boinc_guide.txt
index d92ae6f..08f0b70 100644
--- a/dcapi/java/jre-boinc/jre_for_boinc_guide.txt
+++ b/dcapi/java/jre-boinc/jre_for_boinc_guide.txt
@@ -1,41 +1,41 @@
-Guide for preparing Java Runtime Environment (JRE)
-for use in a BOINC infrastructure on Linux clients.
----------------------------------------------------
-
-1. Requirements
----------------
-
- i. JRE available at http://java.sun.com/javase/downloads/index.jsp
-
- ii. DC-API for java (libdcapi-java-client-0.9.so, libdcapi-boinc-client.so)
-
-2. Preparing
-------------
-
- i. Extract the 'bin' and 'lib' directories from the JRE distribution.
- This can be done, by installing JRE on a machine and locating the
- necessary directories in the installation directory.
- Copy these two directories with all of their content to a directory
- called jre.
-
- ii. Put the files of DC-API in a directory called lib
-
- iii. Tar the contents of the above directories (jre, lib) in an archive
- called lidc-jre.tar
- eg.: tar czvf lidc-jre.tar jre lib
-
-
-3. Deploying a java application on a BOINC server
--------------------------------------------------
-
- i. The java application on BOINC consists of the following
- a. libdcapi-jre.tar - the jre prepared in part 2.
- b. application.jar - the java application to be run in BOINC
- c. launcher - script that untars jre and calls java with the
- jar of the application on the client computer
-
- ii. Give execution rights to the launcher script only.
-
- iii. Proceed with signing the files and installing them to the boinc server as usual...
-
-
+Guide for preparing Java Runtime Environment (JRE)
+for use in a BOINC infrastructure on Linux clients.
+---------------------------------------------------
+
+1. Requirements
+---------------
+
+ i. JRE available at http://java.sun.com/javase/downloads/index.jsp
+
+ ii. DC-API for java (libdcapi-java-client-0.9.so, libdcapi-boinc-client.so)
+
+2. Preparing
+------------
+
+ i. Extract the 'bin' and 'lib' directories from the JRE distribution.
+ This can be done, by installing JRE on a machine and locating the
+ necessary directories in the installation directory.
+ Copy these two directories with all of their content to a directory
+ called jre.
+
+ ii. Put the files of DC-API in a directory called lib
+
+ iii. Tar the contents of the above directories (jre, lib) in an archive
+ called lidc-jre.tar
+ eg.: tar czvf lidc-jre.tar jre lib
+
+
+3. Deploying a java application on a BOINC server
+-------------------------------------------------
+
+ i. The java application on BOINC consists of the following
+ a. libdcapi-jre.tar - the jre prepared in part 2.
+ b. application.jar - the java application to be run in BOINC
+ c. launcher - script that untars jre and calls java with the
+ jar of the application on the client computer
+
+ ii. Give execution rights to the launcher script only.
+
+ iii. Proceed with signing the files and installing them to the boinc server as usual...
+
+
diff --git a/html/languages/translations/fi.po b/html/languages/translations/fi.po
index 7eb8923..c3c1fc5 100644
--- a/html/languages/translations/fi.po
+++ b/html/languages/translations/fi.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-02-21 20:27+0000\n"
+"PO-Revision-Date: 2014-06-22 06:09+0000\n"
"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: fi\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: 1393014450.0\n"
+"X-POOTLE-MTIME: 1403417349.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "English"
@@ -357,9 +357,8 @@ msgid "Posted %1 by %2"
msgstr "Kirjoitettu %1 jäsen %2"
#: ../inc/forum.inc:747
-#, fuzzy
msgid "You may not post or rate messages until %1"
-msgstr "Sinulle ei ole yksityisviestejä."
+msgstr "Et voi lähettää tai arvioida viestejä ennen %1"
#: ../inc/forum.inc:758
msgid ""
diff --git a/html/languages/translations/hu.po b/html/languages/translations/hu.po
index 28bdd28..588466b 100644
--- a/html/languages/translations/hu.po
+++ b/html/languages/translations/hu.po
@@ -7089,7 +7089,7 @@ msgstr "(minden alkalmazás)"
#~ msgid "- private message"
#~ msgstr "- privát üzenet"
-# #######################################
+# #######################################
# Private messages
#~ msgid "Private message from"
#~ msgstr "Személyes üzenet tőle:"
diff --git a/html/languages/translations/nl.po b/html/languages/translations/nl.po
index 5dff162..7ae8384 100644
--- a/html/languages/translations/nl.po
+++ b/html/languages/translations/nl.po
@@ -7344,18 +7344,18 @@ msgstr "(alle applicaties)"
#~ msgid "No such message."
#~ msgstr "Geen bericht gevonden."
-# Apps page (apps.php)
-# ########################################
+# Apps page (apps.php)
+# ########################################
#~ msgid "APPS_TITLE"
#~ msgstr "Applicaties"
-# Rules and Policies page (info.php)
-# ########################################
+# Rules and Policies page (info.php)
+# ########################################
#~ msgid "RULES_TITLE"
#~ msgstr "Lees onze regels en beleid"
-# Create account form (create_account_form.php)
-# ########################################
+# Create account form (create_account_form.php)
+# ########################################
#~ msgid "CREATE_AC_TITLE"
#~ msgstr "Maak een an account"
@@ -7365,9 +7365,9 @@ msgstr "(alle applicaties)"
#~ msgid "FORUM_TITLE_SHORT"
#~ msgstr "Forums"
-# ########################################
-# General stuff (create_account_form.php and others)
-# ########################################
+# ########################################
+# General stuff (create_account_form.php and others)
+# ########################################
#~ msgid "OPTIONAL"
#~ msgstr "Optioneel"
@@ -7398,19 +7398,19 @@ msgstr "(alle applicaties)"
#~ msgid "TEAM_TABLE_MEMBERS"
#~ msgstr "Leden"
-# ########################################
-# Forum
-# ########################################
+# ########################################
+# Forum
+# ########################################
#~ msgid "FORUM_POSTS"
#~ msgstr "Berichten"
-# Forum thread
-# ########################################
+# Forum thread
+# ########################################
#~ msgid "FORUM_THREAD_HIDDEN"
#~ msgstr "Deze discussie is verborgen voor administratieve doeleinden"
-# Forum search features
-# ########################################
+# Forum search features
+# ########################################
# Apps page (apps.php)
# ########################################
# Rules and Policies page (info.php)
diff --git a/html/user/top_hosts.php b/html/user/top_hosts.php
index 5450f2b..aef32bc 100644
--- a/html/user/top_hosts.php
+++ b/html/user/top_hosts.php
@@ -84,7 +84,7 @@ top_host_table_start($sort_by);
$i = 1 + $offset;
$n = sizeof($data);
foreach($data as $host) {
- show_host_row($host, $i, false, true);
+ show_host_row($host, $i, false, true, false);
$i++;
}
echo "</table>\n<p>";
diff --git a/lib/notice.cpp b/lib/notice.cpp
index 966f72b..5f907e9 100644
--- a/lib/notice.cpp
+++ b/lib/notice.cpp
@@ -22,6 +22,7 @@
#endif
#include "error_numbers.h"
+#include "str_replace.h"
#include "notice.h"
@@ -29,12 +30,10 @@ NOTICE::NOTICE() {
clear();
}
-
NOTICE::~NOTICE() {
clear();
}
-
// This is to parse our own XML.
// parse_rss() parses an RSS feed item.
//
@@ -43,6 +42,9 @@ int NOTICE::parse(XML_PARSER& xp) {
while (!xp.get_tag()) {
if (!xp.is_tag) continue;
if (xp.match_tag("/notice")) {
+ if (strcasestr(description.c_str(), "youtube.com")) {
+ is_youtube_video = true;
+ }
return 0;
}
if (xp.parse_int("seqno", seqno)) continue;
@@ -84,13 +86,13 @@ void NOTICE::write(MIOFILE& f, bool for_gui) {
category,
link
);
- if (!for_gui) {
+ if (for_gui) {
f.printf(
- " <guid>%s</guid>\n", guid
+ " <seqno>%d</seqno>\n", seqno
);
} else {
f.printf(
- " <seqno>%d</seqno>\n", seqno
+ " <guid>%s</guid>\n", guid
);
}
f.printf(
@@ -105,7 +107,8 @@ void NOTICE::clear() {
description = "";
create_time = 0;
arrival_time = 0;
- is_private = 0;
+ is_private = false;
+ is_youtube_video = false;
strcpy(category, "");
strcpy(link, "");
strcpy(project_name, "");
diff --git a/lib/notice.h b/lib/notice.h
index e5794c1..ff3580e 100644
--- a/lib/notice.h
+++ b/lib/notice.h
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2009 University of California
+// 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
@@ -40,12 +40,16 @@ public:
// URL where original message can be seen, if any
char project_name[64];
// if notice is associated with a project
+ bool is_youtube_video;
+ // set if the text includes "youtube.com"
// the following fields used in client only (not reported to GUI)
char guid[256];
char feed_url[256];
// URL of RSS feed, or blank
+
bool keep;
+ // temp used when adding new notices
NOTICE();
~NOTICE();
diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index df2bad3..a573620 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -81,7 +81,7 @@ size_t strlcat(char *dst, const char *src, size_t size) {
#if !HAVE_STRCASESTR
// BOINC only uses strcasestr() for short strings,
-// so the following till suffice
+// so the following will suffice
//
const char *strcasestr(const char *s1, const char *s2) {
char needle[1024], haystack[1024], *p=NULL;
diff --git a/locale/ar/BOINC-Web.po b/locale/ar/BOINC-Web.po
index df7c32a..d8571c2 100644
--- a/locale/ar/BOINC-Web.po
+++ b/locale/ar/BOINC-Web.po
@@ -894,22 +894,22 @@ msgstr ""
msgid "News is available as an %sRSS feed%s"
msgstr ""
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# #######################################
-# download.php 2006/08/03 by je2bwm
-# #######################################
-# msgstr "Download BOINC"
+# #######################################
+# download.php 2006/08/03 by je2bwm
+# #######################################
+# msgstr "Download BOINC"
#~ msgid "DL_DOWNLOAD"
#~ msgstr "نزِّل BOINC"
-# msgstr "%s for %s (%s MB)"
+# msgstr "%s for %s (%s MB)"
#~ msgid "DL_VERSION_LNAME_SIZE"
#~ msgstr "%s لمنصة %s <span dir=\"rtl\">(%s م بايت)</span>"
-# msgstr " 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. <p>"
+# msgstr " 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. <p>"
#~ msgid "DL_WHATS_BOINC"
#~ msgstr ""
#~ "<p>BOINC برمجية تمكنك من التبرع بقوة حاسوبك غير المستغلة لمشروعات علمية "
@@ -919,35 +919,35 @@ msgstr ""
#~ "و غيرها.</p><p>بعد تثبيت BOINC على حاسوبك يمكنك الشبك بأي عدد تريد "
#~ "من تلك المشروعات.</p>"
-# msgstr "System requirements"
+# msgstr "System requirements"
#~ msgid "DL_SYSTEMREQ"
#~ msgstr "متطلبات النظام"
-# msgstr "Release notes"
+# msgstr "Release notes"
#~ msgid "DL_RELNOTES"
#~ msgstr "ملاحظات الإصدارة"
-# msgstr "Troubleshooting"
+# msgstr "Troubleshooting"
#~ msgid "DL_TROUBLE"
#~ msgstr "علاج المشكلات"
-# msgstr "Other systems"
+# msgstr "Other systems"
#~ msgid "DL_OTHERSYS"
#~ msgstr "نظم أخرى"
-# msgstr "All versions"
+# msgstr "All versions"
#~ msgid "DL_ALLVERSIONS"
#~ msgstr "كل الإصدارات"
-# msgstr "If your computer is not of one of the above types, you can"
+# msgstr "If your computer is not of one of the above types, you can"
#~ msgid "DL_IF_OTHERTYPES"
#~ msgstr "إن لم يكن حاسوبك من أي من الأنواع أعلاه فيمكنك"
-# msgstr "%s make your own client software %s or"
+# msgstr "%s make your own client software %s or"
#~ msgid "DL_MAKEYOUROWN"
#~ msgstr "%s عمل البرمجية العميلة الخاصة بك %s أو"
-# msgstr "%s download executables from a third-party site %s (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others)."
+# msgstr "%s download executables from a third-party site %s (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others)."
#~ msgid "DL_DL_FROM3RDP"
#~ msgstr ""
#~ "%s تنزيل التنفيذيات من موقع آخر %s (متاح لكل من <span title=\"Solaris/"
@@ -956,129 +956,129 @@ msgstr ""
#~ "PPC<span>، و <span xml:lang=\"en\" dir=\"ltr\">HP-UX</span>، و "
#~ "<span xml:lang=\"en\" dir=\"ltr\">FreeBSD</span> و غيرها."
-# msgstr "BOINC: compute for science"
+# msgstr "BOINC: compute for science"
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC: حوسبة لأجل العلم"
-# #############################################
-# system_requirements.php by je2bwm 2006/08/07
-# #############################################
-# msgstr "System requirements"
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
+# msgstr "System requirements"
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "متطلبات النظام"
-# msgstr "Your computer must satisfy the following requirements to run BOINC. BOINC-based projects may have additional requirements."
+# msgstr "Your computer must satisfy the following requirements to run BOINC. BOINC-based projects may have additional requirements."
#~ msgid "SRQ_INTRO"
#~ msgstr ""
#~ "ينبغي أن تتوافر في حاسوبك المتطلبات التالية لكي يتمكن من تشغيل BOINC. كما "
#~ "قد يكون لكل مشروع من مشروعات BOINC متطلبات إضافية."
-# msgstr "Windows"
+# msgstr "Windows"
#~ msgid "SRQ_MSWIN"
#~ msgstr "ويندوز"
-# msgstr "Operating systems"
+# msgstr "Operating systems"
#~ msgid "SRQ_OS"
#~ msgstr "نظم التشغيل"
-# msgstr "Windows 98 or later"
+# msgstr "Windows 98 or later"
#~ msgid "SRQ_MSWIN_REQ_OS"
#~ msgstr "ويندوز 98 أو ما بعده"
-# msgstr "Minimum hardware"
+# msgstr "Minimum hardware"
#~ msgid "SRQ_MIN_HARDWARE"
#~ msgstr "الحد الأدنى من العتاد"
-# msgstr "Pentium 233 MHz (Recommended: Pentium 500 MHz or greater)"
+# msgstr "Pentium 233 MHz (Recommended: Pentium 500 MHz or greater)"
#~ msgid "SRQ_MSWIN_REQ_CPU"
#~ msgstr "بنتيوم 233 م هرتز (يفضل: بنتيوم 500 م هرتز أو أكثر)"
-# msgstr "64 MB RAM (Recommended: 128 MB RAM or greater)"
+# msgstr "64 MB RAM (Recommended: 128 MB RAM or greater)"
#~ msgid "SRQ_MSWIN_REQ_RAM"
#~ msgstr "64 م بايت رام (بفضل: 128 م بايت رام أو أكثر)"
-# msgstr "20 MB disk space"
+# msgstr "20 MB disk space"
#~ msgid "SRQ_MSWIN_REQ_DISK"
#~ msgstr "20 م بايت على القرص"
-# msgstr "Macintosh"
+# msgstr "Macintosh"
#~ msgid "SRQ_APPLMAC"
#~ msgstr "ماكنتوش"
-# msgstr "Mac OS X 10.3 and later"
+# msgstr "Mac OS X 10.3 and later"
#~ msgid "SRQ_APPLMAC_REQ_OS"
#~ msgstr "ماك أوإس X <span dir=\"rtl\">10.3</span> أو ما بعده"
-# msgstr "Macintosh computer with an Intel x86or PowerPC G3, G4, or G5 processor"
+# msgstr "Macintosh computer with an Intel x86or PowerPC G3, G4, or G5 processor"
#~ msgid "SRQ_APPLMAC_REQ_CPU"
#~ msgstr ""
#~ "حواسيب ماكنتوش ذات معالجات إنتل x86 أو PowerPC <span dir=\"rtl\">G3</"
#~ "span> أو G4 أو G5"
-# msgstr "128 MB RAM (Recommended: 256 MB RAM or greater)"
+# msgstr "128 MB RAM (Recommended: 256 MB RAM or greater)"
#~ msgid "SRQ_APPLMAC_REQ_RAM"
#~ msgstr "128 م بايت رام (يفضل: 256 م بايت رام أو أكثر)"
-# msgstr "200 MB disk space"
+# msgstr "200 MB disk space"
#~ msgid "SRQ_APPLMAC_REQ_DISK"
#~ msgstr "200 م بايت على القرص"
-# msgstr "Linux"
+# msgstr "Linux"
#~ msgid "SRQ_LINUX"
#~ msgstr "لينكس"
-# msgstr "Linux kernel 2.2.14 or higher"
+# msgstr "Linux kernel 2.2.14 or higher"
#~ msgid "SRQ_LINUX_REQ_KERNEL"
#~ msgstr "نواة لينكس 2.2.14 أو ما بعدها"
-# msgstr "glibc 2.3.2 or higher"
+# msgstr "glibc 2.3.2 or higher"
#~ msgid "SRQ_LINUX_REQ_GLIBC"
#~ msgstr "glibc <span dir=\"rtl\">2.3.2</span> أو ما بعدها"
-# msgstr "XFree86-3.3.6 or higher"
+# msgstr "XFree86-3.3.6 or higher"
#~ msgid "SRQ_LINUX_REQ_XFREE86"
#~ msgstr "<span dir=\"ltr\">XFree86-3.3.6</span> أو ما بعدها"
-# msgstr "gtk+2.0 or higher"
+# msgstr "gtk+2.0 or higher"
#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
#~ msgstr "gtk+ <span dir=\"rtl\">2.0</span> أو ما بعدها"
-# msgstr "Pentium 500 MHz or greater"
+# msgstr "Pentium 500 MHz or greater"
#~ msgid "SRQ_LINUX_REQ_CPU"
#~ msgstr "بنتيوم 500 م هرتز أو أكثر"
-# msgstr "64 MB RAM"
+# msgstr "64 MB RAM"
#~ msgid "SRQ_LINUX_REQ_RAM"
#~ msgstr "64 م بايت رام"
-# msgstr "50 MB disk space"
+# msgstr "50 MB disk space"
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 م بايت على القرص"
-# #############################################
-# release_notes.php
-# #############################################
-# msgstr "Release notes"
+# #############################################
+# release_notes.php
+# #############################################
+# msgstr "Release notes"
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "ملاحظات الإصدارة"
-# msgstr "What's new in %s"
+# msgstr "What's new in %s"
#~ msgid "RLN_WHATS_NEW"
#~ msgstr "ما الجديد في %s"
-# msgstr "Installing"
+# msgstr "Installing"
#~ msgid "RLN_INSTALLING"
#~ msgstr "التثبيت"
-# msgstr "Uninstalling"
+# msgstr "Uninstalling"
#~ msgid "RLN_UNINSTALLING"
#~ msgstr "الإزالة"
-# msgstr "Known issues"
+# msgstr "Known issues"
#~ msgid "RLN_KNOWN_ISSUES"
#~ msgstr "مشكلات معروفة"
-# msgstr "(Windows) In rare cases, installation may fail because of an existing installation of BOINC. If this happens: %s Quit BOINC if it's running, and uninstall BOINC using %s Start/Control Panel/Add and remove programs%s. Install the new version again. %s If that fails, reinstall the version of BOINC you were previously running (old versions can be found %shere%s). Uninstall it as above, then install the new version. %s If that fails, download the %sWindows Install Clean Up%s utili [...]
+# msgstr "(Windows) In rare cases, installation may fail because of an existing installation of BOINC. If this happens: %s Quit BOINC if it's running, and uninstall BOINC using %s Start/Control Panel/Add and remove programs%s. Install the new version again. %s If that fails, reinstall the version of BOINC you were previously running (old versions can be found %shere%s). Uninstall it as above, then install the new version. %s If that fails, download the %sWindows Install Clean Up%s utili [...]
#~ msgid "RLN_WIN_INSTALL_PROBLEMS"
#~ msgstr ""
#~ "(ويندوز) في حالات نادرة قد يفشل التثبيت بسبب وجود تثبيتة قائمة من BOINC. "
@@ -1094,11 +1094,11 @@ msgstr ""
#~ "(تحذير: لا تعبث بملفات <span dir=\"ltr\">.msi</span> الأخرى و إلا قد "
#~ "لا تتمكن من إدارة تثبيتاتك الأخرى). %s"
-# msgstr "Troubleshooting BOINC"
+# msgstr "Troubleshooting BOINC"
#~ msgid "RLN_TROUBLESHOOT"
#~ msgstr "علاج مشكلات BOINC"
-# msgstr "Support for 'Account managers' - web sites that let you browse BOINC projects, attach/detach, change resource share and settings, all with point-and-click simplicity. Account managers are also great if you have several computers - you just have to make changes once."
+# msgstr "Support for 'Account managers' - web sites that let you browse BOINC projects, attach/detach, change resource share and settings, all with point-and-click simplicity. Account managers are also great if you have several computers - you just have to make changes once."
#~ msgid "RLN_NEWF_5_4_AM"
#~ msgstr ""
#~ "الدعم الفني لمديري الحسابات - هي مواقع تمكنك من تصفح مشروعات BOINC و "
@@ -1106,17 +1106,17 @@ msgstr ""
#~ "طريق استمارات بسيطة. مديرو الحسابات مفيدون للغاية إن كنت تشغل BOINC "
#~ "على حواسيب عديدة حيث يمكنك باستخدامها إحداث التغييرات في موضع واحد."
-# msgstr "General preferences can be overridden by a local file; details are %s here %s."
+# msgstr "General preferences can be overridden by a local file; details are %s here %s."
#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
#~ msgstr ""
#~ "التضبيطات العامة تتسلط عليها التضبيطات في ملف محلي؛ %sتفاصيل ذلك مشروحة "
#~ "في صفحة أخرى%s."
-# msgstr "BOINC now alerts you whenever it needs you to create a network connection."
+# msgstr "BOINC now alerts you whenever it needs you to create a network connection."
#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
#~ msgstr "ينبهك BOINC الآن عند حاجته إلى عمل اتصال عبر الشبكة."
-# msgstr "The BOINC Manager offers two different interfaces: 'Simple' (small, graphical, skinnable) and 'Advanced' (maximum information). The Simple GUI allows local editing of preferences. You can switch back and forth between Simple and Advanced. "
+# msgstr "The BOINC Manager offers two different interfaces: 'Simple' (small, graphical, skinnable) and 'Advanced' (maximum information). The Simple GUI allows local editing of preferences. You can switch back and forth between Simple and Advanced. "
#~ msgid "RLN_5_8_SIMPLE_GUI"
#~ msgstr ""
#~ "توجد لمدير BOINC و اجهتان مختلفتان: 'بسيطة' (صغيرة، رسومية، قابلة "
@@ -1124,62 +1124,62 @@ msgstr ""
#~ "التضبيطات المحلية. يمكنك التحويل ما بين الواجهتين، البسيطة و "
#~ "المتقدمة."
-# msgstr " CPU throttling: you can reduce CPU heat by limiting the fraction of time that BOINC computes. "
+# msgstr " CPU throttling: you can reduce CPU heat by limiting the fraction of time that BOINC computes. "
#~ msgid "RLN_5_8_THROTTLE"
#~ msgstr ""
#~ "كبح المعالج: يمكنك تقليل تسخين المعالج عن طريق تقليل حصة الوقت التي "
#~ "يستغلها BOINC في الحسبانات."
-# msgstr " Improved scheduling policies avoid missing job deadlines even on a slow computer with lots of projects. "
+# msgstr " Improved scheduling policies avoid missing job deadlines even on a slow computer with lots of projects. "
#~ msgid "RLN_5_8_SCHED"
#~ msgstr ""
#~ "سياسات جدولة محسنة تتلافى التأخر عن مواعيد تسليم المهمات حتى على الحواسيب "
#~ "البطيئة العاملة على مشروعات عديدة."
-# msgstr " You can limit the amount of memory used by BOINC; this lets you compute all the time without losing performance. "
+# msgstr " You can limit the amount of memory used by BOINC; this lets you compute all the time without losing performance. "
#~ msgid "RLN_5_8_MEM"
#~ msgstr ""
#~ "يمكنك تحديد قدر الذاكرة الذي يستغله BOINC؛ يجعلك هذا تشغل المهمات دون أن "
#~ "تبطأ حاسوبك."
-# msgstr " Mac OS X version runs applications in an unpriviledged account, increasing security. "
+# msgstr " Mac OS X version runs applications in an unpriviledged account, increasing security. "
#~ msgid "RLN_5_8_SANDBOX"
#~ msgstr ""
#~ "إصدارة ماك أوإس X تشغل التطبيقات في حساب غير متميز، مما يزيد الأمان."
-# msgstr " Snooze button (in the system tray icon) lets you stop computing for one hour. "
+# msgstr " Snooze button (in the system tray icon) lets you stop computing for one hour. "
#~ msgid "RLN_5_8_SNOOZE"
#~ msgstr "زر للإرجاء (في أيقونة صينية النظام) يجعلك توقف الحسبانات لساعة."
-# msgstr "We recommend that all BOINC users upgrade to %s."
+# msgstr "We recommend that all BOINC users upgrade to %s."
#~ msgid "RLN_RECOMMEND_LATEST_VERSION"
#~ msgstr "نحثُّ كل متخدمي BOINC على الترقية إلى %s."
-# msgstr "A detailed revision history is %shere%s."
+# msgstr "A detailed revision history is %shere%s."
#~ msgid "RLN_LINK2_VERSION_HISTORY"
#~ msgstr "%sالتأريخ التفصيلي للإصدارات%s."
-# msgstr "Windows"
+# msgstr "Windows"
#~ msgid "RLN_MSWIN"
#~ msgstr "ويندوز"
-# msgstr "Macintosh"
+# msgstr "Macintosh"
#~ msgid "RLN_APPLMAC"
#~ msgstr "ماكنتوش"
-# msgstr "Linux"
+# msgstr "Linux"
#~ msgid "RLN_LINUX"
#~ msgstr "لينكس"
-# msgstr "BOINC can be installed in any of several modes:"
+# msgstr "BOINC can be installed in any of several modes:"
#~ msgid "RLN_MSWIN_INSTALL_MODES"
#~ msgstr "يمكن تثبيت BOINC في أي من الأطوار التالية:"
-# msgstr "Single-user installation"
+# msgstr "Single-user installation"
#~ msgid "RLN_SINGLE_USER_INSTALL"
#~ msgstr "تثبيته مستخدم واحد"
-# msgstr "This is the recommended mode. BOINC will run while you (the installing user) are logged in. BOINC is listed in the Start menu of you,but not other users. The 'Show graphics' command in the BOINC managerworks only for you. The BOINC screensaver shows applicationgraphics only for you (other users can run the screensaver but will see textual information only)."
+# msgstr "This is the recommended mode. BOINC will run while you (the installing user) are logged in. BOINC is listed in the Start menu of you,but not other users. The 'Show graphics' command in the BOINC managerworks only for you. The BOINC screensaver shows applicationgraphics only for you (other users can run the screensaver but will see textual information only)."
#~ msgid "RLN_MSWIN_INSTALL_SINGLE_USER_DESC"
#~ msgstr ""
#~ "هذا هو الطور الموصى به؛ فيه يعمل BOINC طالما أنك (المستخدم المثبِّت) "
@@ -1189,11 +1189,11 @@ msgstr ""
#~ "المستخدمون الآخرون من تشغيل حافظ الشاشة لكنهم لن يروا سوى معلومات نصية "
#~ "و حسب)."
-# msgstr "Shared installation"
+# msgstr "Shared installation"
#~ msgid "RLN_SHARED_INSTALL"
#~ msgstr "التثبيت المشترك"
-# msgstr "BOINC runs whenever any user is logged in. BOINC is listed in the Start menu of all users. While BOINC is running, it runs as a particular user (either the first user to log in, or the first to run BOINC). The 'Show graphics' command in the BOINC manager works only for this user. The BOINC screensaver shows application graphics only for this user (other users can run the screensaver but will see textual information only)."
+# msgstr "BOINC runs whenever any user is logged in. BOINC is listed in the Start menu of all users. While BOINC is running, it runs as a particular user (either the first user to log in, or the first to run BOINC). The 'Show graphics' command in the BOINC manager works only for this user. The BOINC screensaver shows application graphics only for this user (other users can run the screensaver but will see textual information only)."
#~ msgid "RLN_MSWIN_INSTALL_SHARED_DESC"
#~ msgstr ""
#~ "يعمل BOINC في أي وقت يكون فيه مستخدم ما والجًا إلى النظام؛ سيظهر BOINC في "
@@ -1203,11 +1203,11 @@ msgstr ""
#~ "لهذا المستخدم، كما لا يُظهر حافظ الشاشة الرسوميات إلا لذات المستخدم (سيكون "
#~ "بوسع الآخرين رؤية المعلومات النصية و حسب)."
-# msgstr "Service installation"
+# msgstr "Service installation"
#~ msgid "RLN_WIN_SERVICE_INSTALL"
#~ msgstr "التثبيتة كخدمة"
-# msgstr "BOINC runs all the time (even when no one is logged in). BOINC is listed in the Start menu of the installing user, but not other users. The 'Show graphics' command in the BOINC manager will not work for any user. The BOINC screensaver will only show textual information."
+# msgstr "BOINC runs all the time (even when no one is logged in). BOINC is listed in the Start menu of the installing user, but not other users. The 'Show graphics' command in the BOINC manager will not work for any user. The BOINC screensaver will only show textual information."
#~ msgid "RLN_MSWIN_INSTALL_WINSERVICE_DESC"
#~ msgstr ""
#~ "يعمل BOINC طوال الوقت (حتى عندما لا يكون أحد والجا)، و يظهر BOINC في "
@@ -1215,47 +1215,47 @@ msgstr ""
#~ "يعمل أمر <kbd>أظهر الرسوميات</kbd> لأي مستخدم، و لن يظهر حافظ الشاشة "
#~ "سوى المعلومات النصية و حسب للجميع."
-# msgstr "BOINC for Linux is distributed as a self-extracting archive. This type of installation requires that you be familiar with the UNIX command-line interface."
+# msgstr "BOINC for Linux is distributed as a self-extracting archive. This type of installation requires that you be familiar with the UNIX command-line interface."
#~ msgid "RLN_LINUX_INSTALL_SEA_DESC"
#~ msgstr ""
#~ "BOINC للينكس يوزع كأرشيف ذاتي الفك. هذا النمط من التثبيت يتطلب أن تكون "
#~ "عالما بواجهة سطر أوامر يونكس."
-# msgstr "The download files have names like <code>%s</code>."
+# msgstr "The download files have names like <code>%s</code>."
#~ msgid "RLN_LINUX_DL_FILENAME"
#~ msgstr "لملفات التنزيل أسماء مثل <code>%s</code>."
-# msgstr "After downloading the file, type<pre>%s</pre>"
+# msgstr "After downloading the file, type<pre>%s</pre>"
#~ msgid "RLN_LINUX_RUN_SEA"
#~ msgstr "بعد تنزيل الملف، أدخل <pre>%s</pre>"
-# msgstr "This will create a directory BOINC/ with the following files:"
+# msgstr "This will create a directory BOINC/ with the following files:"
#~ msgid "RLN_LINUX_RESULTOF_SEA"
#~ msgstr "سينشأ هذا الدليل BOINC و فيه الملفات التالية:"
-# msgstr "The BOINC core client"
+# msgstr "The BOINC core client"
#~ msgid "RLN_BOINC_CORE_CL"
#~ msgstr "عميل نواة BOINC"
-# msgstr "The BOINC manager"
+# msgstr "The BOINC manager"
#~ msgid "RLN_BOINC_MANAGER"
#~ msgstr "مدير BOINC"
-# msgstr "A script that cd's into the BOINC directory and runs the core client."
+# msgstr "A script that cd's into the BOINC directory and runs the core client."
#~ msgid "RLN_SCRIPT_RUN_CLIENT_DESC"
#~ msgstr ""
#~ "سكريبت يغير الدليل العامل إلى الذي ثبت فيه BOINC و يشغل العميل النواة"
-# msgstr "A script that cd's into the BOINC directory and runs the manager."
+# msgstr "A script that cd's into the BOINC directory and runs the manager."
#~ msgid "RLN_SCRIPT_RUN_MANAGER_DESC"
#~ msgstr ""
#~ "سكريبت يغير الدليل العامل إلى الذي ثبت فيه BOINC و يشغل المدير."
-# msgstr "You may want to%s automatically start the core client %sat boot time."
+# msgstr "You may want to%s automatically start the core client %sat boot time."
#~ msgid "RLN_LINUX_AUTOSTART"
#~ msgstr "قد ترغب في أن %sيبدأ العميل النواة ذاتيا عند بدء التشغيل%s."
-# msgstr "Select Start/Control Panel/Add or Remove Programs. Select BOINC, then click Remove. This removes the BOINC software only. To completely remove BOINC, delete the BOINC data directory (usually C:/Program Files/BOINC). "
+# msgstr "Select Start/Control Panel/Add or Remove Programs. Select BOINC, then click Remove. This removes the BOINC software only. To completely remove BOINC, delete the BOINC data directory (usually C:/Program Files/BOINC). "
#~ msgid "RLN_MSWIN_UNINSTALL_DESC"
#~ msgstr ""
#~ "اضغط <kdb>ابدأ/لوحة التحكم/ركب و أزل البرمجيات</kbd>، ثم اختر BOINC "
@@ -1263,25 +1263,25 @@ msgstr ""
#~ "عليك حذفه يدويا إن كنت لن تشغل BOINC مجددا في المستقبل <span dir=\"rtl\">"
#~ "(عادة يكون في <span dir=\"ltr\">C:/Program Files/BOINC</span>)</span>."
-# msgstr "If you use a proxy server, please hold off upgrading for now. We have a fix in the works for proxies that use NTLM authentication."
+# msgstr "If you use a proxy server, please hold off upgrading for now. We have a fix in the works for proxies that use NTLM authentication."
#~ msgid "RLN_ISSUE_PROXY_NTLMAUTH"
#~ msgstr ""
#~ "إن كنت تستخدم خادوما وسيطا فأجل الترقية لبرهة، فنحن نعمل على تصليحة تتعلق "
#~ "بالخواديم التي تستخدم تصريح NTLM."
-# msgstr "(Windows) If BOINC applications are repeatedly crashing on your computer, it's possibly that you need to %supgrade to the latest version (9.0c or later) of DirectX %s."
+# msgstr "(Windows) If BOINC applications are repeatedly crashing on your computer, it's possibly that you need to %supgrade to the latest version (9.0c or later) of DirectX %s."
#~ msgid "RLN_ISSUE_MSWIN_LATEST_DIRECTX"
#~ msgstr ""
#~ "(ويندوز) إذا تعددت انهيارات تطبيقات BOINC على حاسوبك، فقد تكون بحاجة "
#~ "لترقية DiretX إلى الإصدارة 9.0C أو ما بعدها."
-# msgstr "(Windows) If BOINC runs at the same time as Windows XP 3-D screensavers, the system becomes sluggish and unresponsive."
+# msgstr "(Windows) If BOINC runs at the same time as Windows XP 3-D screensavers, the system becomes sluggish and unresponsive."
#~ msgid "RLN_ISSUE_MSWIN_SCREENSAVER_XP3D"
#~ msgstr ""
#~ "(ويندوز) إذا اشتغل BOINC في ذات الوقت مع حافظات شاشة ويندوز XP ثلاثية "
#~ "الأبعاد قفقد يصبح النظام بطيئا و غير مستجيب."
-# msgstr "(Windows) Applications that were built before October 2004 do not display screensaver graphics with the Service or Shared install type, or the Single-user install type with the password protect screensaver option on NT based machines."
+# msgstr "(Windows) Applications that were built before October 2004 do not display screensaver graphics with the Service or Shared install type, or the Single-user install type with the password protect screensaver option on NT based machines."
#~ msgid "RLN_ISSUE_MSWIN_NO_SCREENSAVER"
#~ msgstr ""
#~ "(ويندوز) التطبيقات التي بنيت قبل أكتوبر 2004 لا تعرض رسوميات حافظ الشاشة "
@@ -1289,11 +1289,11 @@ msgstr ""
#~ "لمستخدم واحد في حالة وجود كلمة مرور على حافظ الشاشة و ذلك في النظم "
#~ "المبنية على NT."
-# msgstr "If you have problems with BOINC, here are some steps you can take:"
+# msgstr "If you have problems with BOINC, here are some steps you can take:"
#~ msgid "RLN_TROUBLESHOOT_INTRO"
#~ msgstr "إن كانت لديك مشكلات مع BOINC فهذه بعض الخطوات التي يمكنك اتباعها:"
-# msgstr "If you have a problem with a particular project, go to the 'Questions and Answers' area of the project's web site. You may find the solution to your problem. If not, post it there, and you'll get help from other users. If the problem persists, use the BOINC Manager to 'reset' that project. This will erase any jobs in progress and start from scratch. "
+# msgstr "If you have a problem with a particular project, go to the 'Questions and Answers' area of the project's web site. You may find the solution to your problem. If not, post it there, and you'll get help from other users. If the problem persists, use the BOINC Manager to 'reset' that project. This will erase any jobs in progress and start from scratch. "
#~ msgid "RLN_TROUBLESHOOT_PRJ_SPECIFIC"
#~ msgstr ""
#~ "إن كانت لديك مشكلة مع مشروع معين زُر قسم الأسئلة و الأجوبة في موقع "
@@ -1301,12 +1301,12 @@ msgstr ""
#~ "المستخدمون الآخرون. إذا ما ظلت المشكلة قائمة استخدم مدير BOINC لتصفير "
#~ "المشروع، فسيمحي هذا كل المهمات قيد التنفيذ و يبدأ من جديد."
-# msgstr "If you have problems with BOINC itself, get help from the %s BOINC message boards %s."
+# msgstr "If you have problems with BOINC itself, get help from the %s BOINC message boards %s."
#~ msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
#~ msgstr ""
#~ "إن كانت لديك مشكلات مع BOINC ذاته فابحث عن مساعدة في %sمنتدى BOINC%s"
-# msgstr " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research. It's safe, secure, and easy: %sChoose%s projects %sDownload%s and run BOINC software %sEnter%s the project URLs, your email address, and password. "
+# msgstr " Use the idle time on your computer (Windows, Mac, or Linux) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research. It's safe, secure, and easy: %sChoose%s projects %sDownload%s and run BOINC software %sEnter%s the project URLs, your email address, and password. "
#~ msgid "HOME_HELP"
#~ msgstr ""
#~ "استخدم قوة حاسوبك غير المستغلة (ويندوز، ماك، أو لينكس) للبحث عن "
diff --git a/locale/be/BOINC-Manager.po b/locale/be/BOINC-Manager.po
index bab24ba..d4436a3 100644
--- a/locale/be/BOINC-Manager.po
+++ b/locale/be/BOINC-Manager.po
@@ -4758,7 +4758,7 @@ msgstr ""
#~ msgid "BOINC Manager - Detach from %s"
#~ msgstr "BOINC мэнэджэр - адлучэнне ад %s"
-# Апрацоўка прыпынена...
+# Апрацоўка прыпынена...
#~ msgid "%s is currently suspended...\n"
#~ msgstr "%s - паўза ...\n"
@@ -4808,11 +4808,11 @@ msgstr ""
#~ msgid "BOINC Manager - Messages"
#~ msgstr "BOINC мэнэджэр - паведамленні"
-# ?
+# ?
#~ msgid "BOINC Manager - Preferences"
#~ msgstr "BOINC мэнэджэр - персанальныя налады"
-# эээээээээ, пэўна ўсёткі працэсар перагружаны або абмежаванне загрузкі працэсара
+# эээээээээ, пэўна ўсёткі працэсар перагружаны або абмежаванне загрузкі працэсара
#~ msgid " - CPU throttled"
#~ msgstr " - абмежаванне загрузкі працэсара"
@@ -4825,8 +4825,8 @@ msgstr ""
#~ msgid "Activities suspended by user"
#~ msgstr "Прыпынена карыстачом"
-# ууууууууу якія канцэпты пайшлі, у амерыканцы даюць - пераход на ручное кіраванне ўжо прыдумалі.
-# думка - рухавік Прагрэсу
+# ууууууууу якія канцэпты пайшлі, у амерыканцы даюць - пераход на ручное кіраванне ўжо прыдумалі.
+# думка - рухавік Прагрэсу
#~ msgid ""
#~ "We'll now remove this computer from %s. You will\n"
#~ "be responsible for managing the BOINC client software from\n"
@@ -4845,17 +4845,17 @@ msgstr ""
#~ msgid "BOINC Manager - Select Computer"
#~ msgstr "BOINC мэнэджэр - падлучэнне да кампутара"
-# my Spinhenge at home
+# my Spinhenge at home
#~ msgid "Correspond with other users on the Spinhenge at home message boards"
#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту Spinhenge at home"
-# my Spinhenge at home
+# my Spinhenge at home
#~ msgid "View and modify your Spinhenge at home account profile and preferences"
#~ msgstr ""
#~ "Прагляд і змена наладаў вашага запісу і вашага профіля ў праекце "
#~ "Spinhenge at home"
-# my Spinhenge at home
+# my Spinhenge at home
#~ msgid ""
#~ "View a listing of all the computers on which you are running "
#~ "Spinhenge at Home"
@@ -4863,173 +4863,173 @@ msgstr ""
#~ "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
#~ "заданняў праекту Spinhenge at Home"
-# my Spinhenge at home
+# my Spinhenge at home
#~ msgid "View information about your team:"
#~ msgstr "Прагляд інфармацыі аб камандзе, да якой вы далучыліся: "
-# my Spinhenge at home
+# my Spinhenge at home
#~ msgid "Spinhenge status"
#~ msgstr "Стан сервераў"
-# my Spinhenge at home
+# my Spinhenge at home
#~ msgid "Current status of the Spinhenge at home server"
#~ msgstr "Інфармацыя аб бягучым стане сервераў праекту Spinhenge at home"
-# my SIMAP
+# my SIMAP
#~ msgid "Homepage of SIMAP"
#~ msgstr "Хатняя старонка праекту SIMAP"
-# my Predictor at home
+# my Predictor at home
#~ msgid "Info about Russia"
#~ msgstr "Інфармацыя аб камандзе Russia"
-# my Predictor at home
+# my Predictor at home
#~ msgid "Info about www.elite-games.ru"
#~ msgstr "Інфармацыя аб камандзе www.elite-games.ru"
-# my Seti at home
+# my Seti at home
#~ msgid "View information about your team: Russia"
#~ msgstr "Прагляд інфармацыі аб камандзе, да якой вы далучыліся: Russia"
-# my Seti at home
+# my Seti at home
#~ msgid "View information about your team: www.elite-games.ru"
#~ msgstr ""
#~ "Прагляд інфармацыі аб камандзе, да якой вы далучыліся: www.elite-games.ru"
-# my Primegrid
+# my Primegrid
#~ msgid "View detailed statistics"
#~ msgstr "Прагляд падрабязнае статыстыкі па праектах."
-# my Primegrid
+# my Primegrid
#~ msgid "-- Support the project --"
#~ msgstr "-- Падтрымка праекту --"
-# my Primegrid
+# my Primegrid
#~ msgid "Read about donations and support the project"
#~ msgstr "Інфармацыя аб матэрыяльнай падтрымцы і далейшым развіцці праекту"
-# my Einstein
+# my Einstein
#~ msgid "Your messages"
#~ msgstr "Вашы паведамленні"
-# my Einstein
+# my Einstein
#~ msgid ""
#~ "Links to messages that you have posted on the Einstein at Home message "
#~ "boards."
#~ msgstr "Вашы паведамленні на форуме Einstein at Home."
-# my SIMAP
+# my SIMAP
#~ msgid "Homepage of SIMAP at home"
#~ msgstr "Хатняя старонка праекту SIMAP at home"
-# my Rosetta
+# my Rosetta
#~ msgid ""
#~ "View a listing of all the computers on which you are running Rosetta at home"
#~ msgstr ""
#~ "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
#~ "заданняў праекту Rosetta at home"
-# my Rosetta
+# my Rosetta
#~ msgid "View and modify your Rosetta at home account profile and preferences"
#~ msgstr ""
#~ "Прагляд і змена наладаў вашага запісу і вашага профіля ў праекце "
#~ "Rosetta at home"
-# my Rosetta
+# my Rosetta
#~ msgid "Correspond with other users on the Rosetta at home message boards"
#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту Rosetta at home"
-# my Leiden Classical
+# my Leiden Classical
#~ msgid "Get help about Leiden Classical"
#~ msgstr "Дапамога па праекце Leiden Classical"
-# my QMC at HOME
+# my QMC at HOME
#~ msgid "Get help about QMC at HOME"
#~ msgstr "Дапамога па праекце QMC at HOME"
-# my QMC at HOME
+# my QMC at HOME
#~ msgid "More"
#~ msgstr "Пазнаць больш"
-# my QMC at HOME
+# my QMC at HOME
#~ msgid "More on QMC at HOME"
#~ msgstr "Атрымаць больш інфармацыі аб праекце QMC at HOME"
-# my QMC at HOME
+# my QMC at HOME
#~ msgid "More on QMC at HOME workunits"
#~ msgstr "Атрымаць больш інфармацыі аб праекце QMC at HOME"
-# my RALPH at home
+# my RALPH at home
#~ msgid "Correspond with other users on the RALPH at home message boards"
#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту RALPH at home"
-# my RALPH at home
+# my RALPH at home
#~ msgid "View and modify your RALPH at home account profile and preferences"
#~ msgstr ""
#~ "Прагляд і змена наладаў вашага запісу і вашага профіля ў праекце "
#~ "RALPH at home"
-# my RALPH at home
+# my RALPH at home
#~ msgid ""
#~ "View a listing of all the computers on which you are running RALPH at home"
#~ msgstr ""
#~ "Прагляд інфармацыі аб вашых кампутарах, якія ўдзельнічаюць у апрацоўцы "
#~ "заданняў праекту RALPH at home"
-# my SETI at Home
+# my SETI at Home
#~ msgid "Donate"
#~ msgstr "Падтрымаць праект"
-# my SETI at Home
+# my SETI at Home
#~ msgid "Donate to SETI at home"
#~ msgstr "Падтрымаць праект SETI at home матэрыяльна :)"
-# my XtremLab
+# my XtremLab
#~ msgid "View your account informations"
#~ msgstr "Прагляд інфармацыі аб вашым уліковым запісе"
-# my XtremLab
+# my XtremLab
#~ msgid "Introduction"
#~ msgstr "Апісанне праекту"
-# my XtremLab
+# my XtremLab
#~ msgid "An Introduction to XtremLab"
#~ msgstr "Знаёмства з праектам XtremLab"
-# my CPDN
+# my CPDN
#~ msgid "Help Desk"
#~ msgstr "Дапамога"
-# my CPDN
+# my CPDN
#~ msgid "Get help from project staff and users with the experiment"
#~ msgstr ""
#~ "Тут можна атрымаць дапамогу па праекце і эксперыментам ад арганізатараў і "
#~ "ўдзельнікаў."
-# my CPDN
+# my CPDN
#~ msgid "User Forum"
#~ msgstr "Форум удзельнікаў"
-# my CPDN
+# my CPDN
#~ msgid "Speak to other users about this experiment"
#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту"
-# my Chess960 at home
+# my Chess960 at home
#~ msgid "Get help and chat with other users"
#~ msgstr "Форум для зносінаў з іншымі ўдзельнікамі праекту"
-# my Riesel Sieve Project
+# my Riesel Sieve Project
#~ msgid "Your Account"
#~ msgstr "Ваш уліковы запіс"
-# my Riesel Sieve Project
+# my Riesel Sieve Project
#~ msgid "View and edit project settings"
#~ msgstr "Прагляд і змена наладаў вашага праекту"
-# my Riesel Sieve Project
+# my Riesel Sieve Project
#~ msgid "Top Participant Stats"
#~ msgstr "Лепшыя ўдзельнікі"
-# my Riesel Sieve Project
+# my Riesel Sieve Project
#~ msgid "Stats showing scores by user"
#~ msgstr "Статыстыка ўдзельнікаў праекту"
diff --git a/locale/be/BOINC-Web.po b/locale/be/BOINC-Web.po
index 2583b58..dad2a23 100644
--- a/locale/be/BOINC-Web.po
+++ b/locale/be/BOINC-Web.po
@@ -894,7 +894,7 @@ msgstr ""
msgid "News is available as an %sRSS feed%s"
msgstr ""
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
@@ -905,18 +905,18 @@ msgstr ""
#~ msgstr ""
#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
-# ######################################
-# download.php 2006/08/03 by je2bwm
-# ######################################
-# Download BOINC
+# ######################################
+# download.php 2006/08/03 by je2bwm
+# ######################################
+# Download BOINC
#~ msgid "DL_DOWNLOAD"
#~ msgstr "Загрузіць BOINC"
-# %s for %s (%s MB)
+# %s for %s (%s MB)
#~ msgid "DL_VERSION_LNAME_SIZE"
#~ msgstr "%s для %s (%s Мбайт)"
-# 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. <p>
+# 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. <p>
#~ msgid "DL_WHATS_BOINC"
#~ msgstr ""
#~ "BOINC - гэта праграма, якая прадстаўляе нявыкарыстаны час вашага "
@@ -925,185 +925,185 @@ msgstr ""
#~ "BOINC на ваш кампутар, вы зможаце вылучыць і ўдзельнічаць адначасова ў "
#~ "некалькіх праектах, якіх - вырашайце самі. <p>"
-# System requirements
+# System requirements
#~ msgid "DL_SYSTEMREQ"
#~ msgstr "Сістэмныя патрабаванні"
-# Release notes
-# ???
+# Release notes
+# ???
#~ msgid "DL_RELNOTES"
#~ msgstr "Апісанне апошняй версіі"
-# Troubleshooting
+# Troubleshooting
#~ msgid "DL_TROUBLE"
#~ msgstr "Вядомыя праблемы"
-# Other systems
+# Other systems
#~ msgid "DL_OTHERSYS"
#~ msgstr "Іншыя аперацыйныя сістэмы"
-# All versions
+# All versions
#~ msgid "DL_ALLVERSIONS"
#~ msgstr "Усе версіі"
-# If your computer is not of one of the above types, you can
+# If your computer is not of one of the above types, you can
#~ msgid "DL_IF_OTHERTYPES"
#~ msgstr ""
#~ "Калі вашаму кампутару не падыходзіць ні адзін з варыянтаў, вы можаце"
-# %s make your own client software %s or
-# ???
+# %s make your own client software %s or
+# ???
#~ msgid "DL_MAKEYOUROWN"
#~ msgstr "%s стварыць праграму кліента на базе зыходных тэкстаў %s або"
-# %s download executables from a third-party site %s (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others).
+# %s download executables from a third-party site %s (available for Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, and FreeBSD, and others).
#~ msgid "DL_DL_FROM3RDP"
#~ msgstr ""
#~ "%s загрузіць гатовыя ўсталявальныя файлы з неафіцыйных сайтаў %s "
#~ "(даступныя версіі для Solaris/Opteron, Linux/Opteron, Linux/PPC, HP-UX, "
#~ "FreeBSD, а таксама іншых платформаў)."
-# BOINC: compute for science
+# BOINC: compute for science
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC: вылічэнні для навукі"
-# ############################################
-# system_requirements.php by je2bwm 2006/08/07
-# ############################################
-# System requirements
+# ############################################
+# system_requirements.php by je2bwm 2006/08/07
+# ############################################
+# System requirements
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "Сістэмныя патрабаванні"
-# Your computer must satisfy the following requirements to run BOINC. BOINC-based projects may have additional requirements.
+# Your computer must satisfy the following requirements to run BOINC. BOINC-based projects may have additional requirements.
#~ msgid "SRQ_INTRO"
#~ msgstr ""
#~ "Для нармалёвае працы BOINC ваш кампутар павінен задавальняць выкладзеным "
#~ "ніжэй патрабаванням. Праекты выкарыстоўвалыя платформу BOINC могуць "
#~ "прад'яўляць свае дадатковыя патрабаванні да кампутара."
-# Windows
+# Windows
#~ msgid "SRQ_MSWIN"
#~ msgstr "Windows"
-# Operating systems
+# Operating systems
#~ msgid "SRQ_OS"
#~ msgstr "Версіі аперацыйнае сістэмы"
-# Windows 98 or later
+# Windows 98 or later
#~ msgid "SRQ_MSWIN_REQ_OS"
#~ msgstr "Windows 98 або пазнейшая"
-# Minimum hardware
+# Minimum hardware
#~ msgid "SRQ_MIN_HARDWARE"
#~ msgstr "Мінімальныя патрабаванні да кампутара"
-# Pentium 233 MHz (Recommended: Pentium 500 MHz or greater)
+# Pentium 233 MHz (Recommended: Pentium 500 MHz or greater)
#~ msgid "SRQ_MSWIN_REQ_CPU"
#~ msgstr ""
#~ "Працэсар: Pentium 233 Мгц (Рэкамендуецца: Pentium 500 Мгц або хутчэй)"
-# 64 MB RAM (Recommended: 128 MB RAM or greater)
+# 64 MB RAM (Recommended: 128 MB RAM or greater)
#~ msgid "SRQ_MSWIN_REQ_RAM"
#~ msgstr "Памяць: 64 Мбайт АЗП (Рэкамендуецца: 128 Мбайт або больш)"
-# 20 MB disk space
+# 20 MB disk space
#~ msgid "SRQ_MSWIN_REQ_DISK"
#~ msgstr "20 Мбайт вольнага месца на цвёрдым дыску"
-# Macintosh
+# Macintosh
#~ msgid "SRQ_APPLMAC"
#~ msgstr "Macintosh"
-# Mac OS X 10.3 and later
+# Mac OS X 10.3 and later
#~ msgid "SRQ_APPLMAC_REQ_OS"
#~ msgstr "Mac OS X 10.3 або пазнейшая"
-# Macintosh computer with an Intel x86or PowerPC G3, G4, or G5 processor
+# Macintosh computer with an Intel x86or PowerPC G3, G4, or G5 processor
#~ msgid "SRQ_APPLMAC_REQ_CPU"
#~ msgstr "Кампутар Macintosh з працэсарам Intel x86 або PowerPC G3, G4, G5"
-# 128 MB RAM (Recommended: 256 MB RAM or greater)
+# 128 MB RAM (Recommended: 256 MB RAM or greater)
#~ msgid "SRQ_APPLMAC_REQ_RAM"
#~ msgstr "Памяць: 128 Мбайт АЗП (Рэкамендуецца: 256 Мбайт або больш)"
-# 200 MB disk space
+# 200 MB disk space
#~ msgid "SRQ_APPLMAC_REQ_DISK"
#~ msgstr "200 Мбайт вольнага месца на цвёрдым дыску"
-# Linux
+# Linux
#~ msgid "SRQ_LINUX"
#~ msgstr "Linux"
-# Linux kernel 2.2.14 or higher
+# Linux kernel 2.2.14 or higher
#~ msgid "SRQ_LINUX_REQ_KERNEL"
#~ msgstr "ядро Linux 2.2.14 або навей"
-# glibc 2.3.2 or higher
+# glibc 2.3.2 or higher
#~ msgid "SRQ_LINUX_REQ_GLIBC"
#~ msgstr "glibc 2.3.2 або навей"
-# XFree86-3.3.6 or higher
+# XFree86-3.3.6 or higher
#~ msgid "SRQ_LINUX_REQ_XFREE86"
#~ msgstr "XFree86-3.3.6 або навей"
-# gtk+2.0 or higher
+# gtk+2.0 or higher
#~ msgid "SRQ_LINUX_REQ_GTKPLUS"
#~ msgstr "gtk+2.0 або навей"
-# Pentium 500 MHz or greater
+# Pentium 500 MHz or greater
#~ msgid "SRQ_LINUX_REQ_CPU"
#~ msgstr "Pentium 500 Мгц або хутчэй"
-# 64 MB RAM
+# 64 MB RAM
#~ msgid "SRQ_LINUX_REQ_RAM"
#~ msgstr "Памяць: 64 Мбайт АЗП"
-# 50 MB disk space
+# 50 MB disk space
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 Мбайт вольнага месца на цвёрдым дыску"
-# ############################################
-# release notes by je2bwm 2006/08/09
-# ############################################
-# Release notes
+# ############################################
+# release notes by je2bwm 2006/08/09
+# ############################################
+# Release notes
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "Апісанне апошняй версіі"
-# What's new in %s
+# What's new in %s
#~ msgid "RLN_WHATS_NEW"
#~ msgstr "Што новага ў версіі %s"
-# Installing
+# Installing
#~ msgid "RLN_INSTALLING"
#~ msgstr "Усталёўка праграмы"
-# Uninstalling
+# Uninstalling
#~ msgid "RLN_UNINSTALLING"
#~ msgstr "Выдаленне праграмы"
-# Known issues
+# Known issues
#~ msgid "RLN_KNOWN_ISSUES"
#~ msgstr "Магчымыя праблемы"
-# (Windows) In rare cases, installation may fail because "
-# "of an existing installation of BOINC. If this happens: "
-# "%s Quit BOINC if it's running, and uninstall BOINC "
-# "using %s Start/Control Panel/Add and remove programs%s. "
-# "Install the new version again. "
-# "%s If that fails, reinstall the version of BOINC you "
-# "were previously running "
-# "(old versions can be found %shere%s). "
-# "Uninstall it as above, then install the new version. "
-# "%s If that fails, download the %sWindows Install Clean Up%s "
-# "utility from Microsoft and run it. "
-# "The old BOINC version shows up as either BOINC.msi or as "
-# "a corrupt icon .msi (it'll be the top option). "
-# "Click on it to select, then click Remove and Exit. "
-# "Reboot your computer. "
-# "Install the new version. "
-# "(Warning: leave all other .msi files as they are, "
-# "otherwise you will have problems uninstalling other programs). "
-# "%s
+# (Windows) In rare cases, installation may fail because "
+# "of an existing installation of BOINC. If this happens: "
+# "%s Quit BOINC if it's running, and uninstall BOINC "
+# "using %s Start/Control Panel/Add and remove programs%s. "
+# "Install the new version again. "
+# "%s If that fails, reinstall the version of BOINC you "
+# "were previously running "
+# "(old versions can be found %shere%s). "
+# "Uninstall it as above, then install the new version. "
+# "%s If that fails, download the %sWindows Install Clean Up%s "
+# "utility from Microsoft and run it. "
+# "The old BOINC version shows up as either BOINC.msi or as "
+# "a corrupt icon .msi (it'll be the top option). "
+# "Click on it to select, then click Remove and Exit. "
+# "Reboot your computer. "
+# "Install the new version. "
+# "(Warning: leave all other .msi files as they are, "
+# "otherwise you will have problems uninstalling other programs). "
+# "%s
#~ msgid "RLN_WIN_INSTALL_PROBLEMS"
#~ msgstr ""
#~ "(Windows) BOINC можа не ўсталявацца, калі не выдаленая папярэдняя версія "
@@ -1120,11 +1120,11 @@ msgstr ""
#~ "Install Clean Up не спрабуйце выдаляць іншыя .msi файлы, гэта не "
#~ "дапаможа). %s"
-# Troubleshooting BOINC
+# Troubleshooting BOINC
#~ msgid "RLN_TROUBLESHOOT"
#~ msgstr "Вядомыя праблемы пры працы BOINC"
-# Support for 'Account managers' - web sites that let you browse BOINC projects, attach/detach, change resource share and settings, all with point-and-click simplicity. Account managers are also great if you have several computers - you just have to make changes once.
+# Support for 'Account managers' - web sites that let you browse BOINC projects, attach/detach, change resource share and settings, all with point-and-click simplicity. Account managers are also great if you have several computers - you just have to make changes once.
#~ msgid "RLN_NEWF_5_4_AM"
#~ msgstr ""
#~ "Дададзеная падтрымка 'Мэнэджэраў праектаў' - гэта сайты аб'яднаўчыя "
@@ -1136,20 +1136,20 @@ msgstr ""
#~ "толькі да 'Мэнэджэру праектаў', а не да ўсяго n-му колькасці праектаў у "
#~ "якіх вы захочаце ўдзельнічаць. "
-# General preferences can be overridden by a local file; details are %s here %s.
-# ???
+# General preferences can be overridden by a local file; details are %s here %s.
+# ???
#~ msgid "RLN_NEWF_5_4_PREF_OVERRIDE"
#~ msgstr ""
#~ "Агульныя налады могуць быць замененыя наладамі з лакальна захоўваемага "
#~ "файла; падрабязнасці можна пазнаць %s тут %s"
-# BOINC now alerts you whenever it needs you to create a network connection.
+# BOINC now alerts you whenever it needs you to create a network connection.
#~ msgid "RLN_NEWF_5_4_ALERTS_CONNECT"
#~ msgstr ""
#~ "BOINC мэнэджэр выдае дыялогавае акно з напамінкам штораз, калі BOINC "
#~ "кліенту патрабуецца ўсталяваць злучэнне з інтэрнэтам."
-# The BOINC Manager offers two different interfaces: 'Simple' (small, graphical, skinnable) and 'Advanced' (maximum information). The Simple GUI allows local editing of preferences. You can switch back and forth between Simple and Advanced.
+# The BOINC Manager offers two different interfaces: 'Simple' (small, graphical, skinnable) and 'Advanced' (maximum information). The Simple GUI allows local editing of preferences. You can switch back and forth between Simple and Advanced.
#~ msgid "RLN_5_8_SIMPLE_GUI"
#~ msgstr ""
#~ "У BOINC мэнэджэру з'явілася два варыянту знешняга выгляду - "
@@ -1158,66 +1158,66 @@ msgstr ""
#~ "'персанальных' (лакальных) наладаў BOINC кліента. У любы момант можна "
#~ "змяніць знешні выгляд праграмы з 'Скарочанага' на 'Поўны' і наадварот."
-# CPU throttling: you can reduce CPU heat by limiting the fraction of time that BOINC computes.
+# CPU throttling: you can reduce CPU heat by limiting the fraction of time that BOINC computes.
#~ msgid "RLN_5_8_THROTTLE"
#~ msgstr ""
#~ " Рэгуляваная загрузка ЦП: для таго каб пазбегнуць перагрэва зараз можна "
#~ "задаць абмежаванне адсотка загрузкі ЦП."
-# Improved scheduling policies avoid missing job deadlines even on a slow computer with lots of projects.
+# Improved scheduling policies avoid missing job deadlines even on a slow computer with lots of projects.
#~ msgid "RLN_5_8_SCHED"
#~ msgstr ""
#~ " Палепшаны механізм выдачы заданняў для павольных кампутараў з вялікай "
#~ "колькасцю праектаў."
-# You can limit the amount of memory used by BOINC; this lets you compute all the time without losing performance.
+# You can limit the amount of memory used by BOINC; this lets you compute all the time without losing performance.
#~ msgid "RLN_5_8_MEM"
#~ msgstr ""
#~ "Дададзена абмежаванне на занятую прыкладаннямі BOINC памяць пры "
#~ "апрацоўцы; гэта павінна дапамагчы пазбегнуць падзенні прадукцыйнасці "
#~ "кампутара (для простых карыстачоў) падчас апрацоўкі заданняў."
-# Mac OS X version runs applications in an unpriviledged account, increasing security.
+# Mac OS X version runs applications in an unpriviledged account, increasing security.
#~ msgid "RLN_5_8_SANDBOX"
#~ msgstr ""
#~ " Для Mac OS X падвышаная бяспека за рахунак запуску прыкладанняў BOINC з "
#~ "правамі 'простага' карыстача, а не адміністратара."
-# Snooze button (in the system tray icon) lets you stop computing for one hour.
+# Snooze button (in the system tray icon) lets you stop computing for one hour.
#~ msgid "RLN_5_8_SNOOZE"
#~ msgstr ""
#~ " Выбар пункта меню 'Паўза' (меню BOINC у трэі) прыпыняе апрацоўку на адну "
#~ "гадзіну."
-# We recommend that all BOINC users upgrade to %s.
+# We recommend that all BOINC users upgrade to %s.
#~ msgid "RLN_RECOMMEND_LATEST_VERSION"
#~ msgstr "Настойліва рэкамендуецца абнавіць BOINC да версіі %s"
-# A detailed revision history is %s here %s.
+# A detailed revision history is %s here %s.
#~ msgid "RLN_LINK2_VERSION_HISTORY"
#~ msgstr "Падрабязней аб новаўвядзеннях у розных версіях %s тут %s"
-# Windows
+# Windows
#~ msgid "RLN_MSWIN"
#~ msgstr "Windows"
-# Macintosh
+# Macintosh
#~ msgid "RLN_APPLMAC"
#~ msgstr "Macintosh"
-# Linux
+# Linux
#~ msgid "RLN_LINUX"
#~ msgstr "Linux"
-# BOINC can be installed in any of several modes:
+# BOINC can be installed in any of several modes:
#~ msgid "RLN_MSWIN_INSTALL_MODES"
#~ msgstr "Існуе некалькі варыянтаў усталёўкі BOINC:"
-# Single-user installation
+# Single-user installation
#~ msgid "RLN_SINGLE_USER_INSTALL"
#~ msgstr "Індывідуальная ўсталёўка"
-# This is the recommended mode. BOINC will run while you (the installing user) are logged in. BOINC is listed in the Start menu of you,but not other users. The 'Show graphics' command in the BOINC managerworks only for you. The BOINC screensaver shows applicationgraphics only for you (other users can run the screensaver but will see textual information only).
+# This is the recommended mode. BOINC will run while you (the installing user) are logged in. BOINC is listed in the Start menu of you,but not other users. The 'Show graphics' command in the BOINC managerworks only for you. The BOINC screensaver shows applicationgraphics only for you (other users can run the screensaver but will see textual information only).
#~ msgid "RLN_MSWIN_INSTALL_SINGLE_USER_DESC"
#~ msgstr ""
#~ "Рэкамендуемы варыянт усталёўкі. BOINC кліент будзе працаваць толькі калі "
@@ -1228,11 +1228,11 @@ msgstr ""
#~ "карыстачы кампутара таксама змогуць вылучыць экранную застаўку BOINC, але "
#~ "яны будуць бачыць толькі тэкст)."
-# Shared installation
+# Shared installation
#~ msgid "RLN_SHARED_INSTALL"
#~ msgstr "Усталёўка для ўсіх карыстачоў"
-# BOINC runs whenever any user is logged in. BOINC is listed in the Start menu of all users. While BOINC is running, it runs as a particular user (either the first user to log in, or the first to run BOINC). The 'Show graphics' command in the BOINC manager works only for this user. The BOINC screensaver shows application graphics only for this user (other users can run the screensaver but will see textual information only).
+# BOINC runs whenever any user is logged in. BOINC is listed in the Start menu of all users. While BOINC is running, it runs as a particular user (either the first user to log in, or the first to run BOINC). The 'Show graphics' command in the BOINC manager works only for this user. The BOINC screensaver shows application graphics only for this user (other users can run the screensaver but will see textual information only).
#~ msgid "RLN_MSWIN_INSTALL_SHARED_DESC"
#~ msgstr ""
#~ "BOINC кліент будзе запускацца пры ўваходзе любога карыстача кампутара. "
@@ -1245,11 +1245,11 @@ msgstr ""
#~ "(іншыя карыстачы кампутара таксама змогуць вылучыць экранную застаўку "
#~ "BOINC, але яны будуць бачыць толькі тэкст)."
-# Shared installation
+# Shared installation
#~ msgid "RLN_WIN_SERVICE_INSTALL"
#~ msgstr "Усталёўка ў якасці службы"
-# BOINC runs all the time (even when no one is logged in). BOINC is listed in the Start menu of the installing user, but not other users. The 'Show graphics' command in the BOINC manager will not work for any user. The BOINC screensaver will only show textual information.
+# BOINC runs all the time (even when no one is logged in). BOINC is listed in the Start menu of the installing user, but not other users. The 'Show graphics' command in the BOINC manager will not work for any user. The BOINC screensaver will only show textual information.
#~ msgid "RLN_MSWIN_INSTALL_WINSERVICE_DESC"
#~ msgstr ""
#~ "BOINC кліент працуе заўсёды (нават калі на кампутары не ўвайшоў ні адзін "
@@ -1258,56 +1258,56 @@ msgstr ""
#~ "мэнэджэру не будзе працаваць ні ў каго. Экранная застаўка BOINC будзе "
#~ "паказваць толькі тэкст)."
-# BOINC for Linux is distributed as a self-extracting archive. This type of installation requires that you be familiar with the UNIX command-line interface.
+# BOINC for Linux is distributed as a self-extracting archive. This type of installation requires that you be familiar with the UNIX command-line interface.
#~ msgid "RLN_LINUX_INSTALL_SEA_DESC"
#~ msgstr ""
#~ "Усталявальны файл BOINC для Linux уяўляе з сябе самоизвлекающийся архіў. "
#~ "Працэс усталёўкі разлічаны на тое, што вы знаёмыя з інтэрфейсам радка "
#~ "UNIX."
-# The download files have names like<code> %s </code>.
+# The download files have names like<code> %s </code>.
#~ msgid "RLN_LINUX_DL_FILENAME"
#~ msgstr "Загрузіце файл з назовам, падобным на: <code> %s </code>."
-# After downloading the file, type<pre>%s</pre>
+# After downloading the file, type<pre>%s</pre>
#~ msgid "RLN_LINUX_RUN_SEA"
#~ msgstr "Пасля загрузкі файла выканаеце каманду <pre>%s</pre>"
-# This will create a directory BOINC/ with the following files:
+# This will create a directory BOINC/ with the following files:
#~ msgid "RLN_LINUX_RESULTOF_SEA"
#~ msgstr "Будуць створаныя тэчкі са наступнымі файламі:"
-# The BOINC core client
+# The BOINC core client
#~ msgid "RLN_BOINC_CORE_CL"
#~ msgstr "Кліент BOINC"
-# The BOINC manager
+# The BOINC manager
#~ msgid "RLN_BOINC_MANAGER"
#~ msgstr "BOINC мэнэджэр"
-# A script that cd's into the BOINC directory and runs the core client.
+# A script that cd's into the BOINC directory and runs the core client.
#~ msgid "RLN_SCRIPT_RUN_CLIENT_DESC"
#~ msgstr ""
#~ "Камандны файл, які змяняе бягучую тэчку на тэчку з BOINC камандаю cd і "
#~ "затым што запускае кліент BOINC."
-# A script that cd's into the BOINC directory and runs the manager.
+# A script that cd's into the BOINC directory and runs the manager.
#~ msgid "RLN_SCRIPT_RUN_MANAGER_DESC"
#~ msgstr ""
#~ "Камандны файл, які змяняе бягучую тэчку на тэчку з BOINC камандаю cd і "
#~ "затым што запускае BOINC мэнэджэр."
-# You may want to%s automatically start the core client %sat boot time.
+# You may want to%s automatically start the core client %sat boot time.
#~ msgid "RLN_LINUX_AUTOSTART"
#~ msgstr ""
#~ "Вы можаце наладзіць %s аўтаматычны запуск кліента BOINC %s пры старце "
#~ "сістэмы."
-# Select Start/Control Panel/Add or Remove Programs. "
-# "Select BOINC, then click Remove. "
-# "This removes the BOINC software only. "
-# "To completely remove BOINC, delete the BOINC data directory "
-# "(usually C:/Program Files/BOINC).
+# Select Start/Control Panel/Add or Remove Programs. "
+# "Select BOINC, then click Remove. "
+# "This removes the BOINC software only. "
+# "To completely remove BOINC, delete the BOINC data directory "
+# "(usually C:/Program Files/BOINC).
#~ msgid "RLN_MSWIN_UNINSTALL_DESC"
#~ msgstr ""
#~ "У меню 'Пуск / Налада / Панэль кіравання / Усталёўка і выдаленне "
@@ -1315,29 +1315,29 @@ msgstr ""
#~ "толькі асноўныя файлы BOINC. Для поўнага выдалення неабходна пасля гэтага "
#~ "выдаліць пакінутую тэчку BOINC (звычайна гэта C:/Program Files/BOINC)."
-# If you use a proxy server, please hold off upgrading for now. We have a fix in the works for proxies that use NTLM authentication.
+# If you use a proxy server, please hold off upgrading for now. We have a fix in the works for proxies that use NTLM authentication.
#~ msgid "RLN_ISSUE_PROXY_NTLMAUTH"
#~ msgstr ""
#~ "Калі вы выкарыстаеце проксі сервер, абновіце BOINC да апошняй версіі. "
#~ "Нядаўна былі ўхіленыя памылкі пры працы з проксі выкарыстоўвалымі NTLM "
#~ "аўтарызацыю."
-# (Windows) If BOINC applications are repeatedly crashing on your computer, "
-# "it's possibly that you need to "
-# "%supgrade to the latest version (9.0c or later) of DirectX %s.
+# (Windows) If BOINC applications are repeatedly crashing on your computer, "
+# "it's possibly that you need to "
+# "%supgrade to the latest version (9.0c or later) of DirectX %s.
#~ msgid "RLN_ISSUE_MSWIN_LATEST_DIRECTX"
#~ msgstr ""
#~ "(Windows) Калі праца BOINC часта перарываецца памылкаю, магчыма вам "
#~ "неабходна %s абнавіць DirectX да апошняй версіі (9.0c або навей) %s."
-# (Windows) If BOINC runs at the same time as Windows XP 3-D screensavers, the system becomes sluggish and unresponsive.
+# (Windows) If BOINC runs at the same time as Windows XP 3-D screensavers, the system becomes sluggish and unresponsive.
#~ msgid "RLN_ISSUE_MSWIN_SCREENSAVER_XP3D"
#~ msgstr ""
#~ "(Windows) Калі BOINC запушчаны як экранная застаўка Windows XP 3-D, "
#~ "рэакцыя аперацыйнае сістэмы на дзеянні карыстача моцна запавольваецца "
#~ "(сістэма завісае)."
-# (Windows) Applications that were built before October 2004 do not display screensaver graphics with the Service or Shared install type, or the Single-user install type with the password protect screensaver option on NT based machines.
+# (Windows) Applications that were built before October 2004 do not display screensaver graphics with the Service or Shared install type, or the Single-user install type with the password protect screensaver option on NT based machines.
#~ msgid "RLN_ISSUE_MSWIN_NO_SCREENSAVER"
#~ msgstr ""
#~ "(Windows) Прыкладанні, створаныя да кастрычніка 2004 года не паказваюць "
@@ -1347,19 +1347,19 @@ msgstr ""
#~ "абароны паролем выхаду з экраннае застаўкі на аперацыйных сістэмах "
#~ "пабудаваных на базе NT."
-# If you have problems with BOINC, here are some steps you can take:
+# If you have problems with BOINC, here are some steps you can take:
#~ msgid "RLN_TROUBLESHOOT_INTRO"
#~ msgstr ""
#~ "Пры з'яўленні праблемаў з працаю BOINC, вы можаце паступіць наступным "
#~ "чынам:"
-# If you have a problem with a particular project, "
-# "go to the 'Questions and Answers' area of the project's web site. "
-# "You may find the solution to your problem. "
-# "If not, post it there, and you'll get help from other users. "
-# "If the problem persists, "
-# "use the BOINC Manager to 'reset' that project. "
-# "This will erase any jobs in progress and start from scratch.
+# If you have a problem with a particular project, "
+# "go to the 'Questions and Answers' area of the project's web site. "
+# "You may find the solution to your problem. "
+# "If not, post it there, and you'll get help from other users. "
+# "If the problem persists, "
+# "use the BOINC Manager to 'reset' that project. "
+# "This will erase any jobs in progress and start from scratch.
#~ msgid "RLN_TROUBLESHOOT_PRJ_SPECIFIC"
#~ msgstr ""
#~ "Калі праблемы звязаныя з пэўным праектам, зайдзіце на старонку 'Пытанні і "
@@ -1370,12 +1370,12 @@ msgstr ""
#~ "файлы і налады звязаныя з дадзеным праектам будуць знішчаныя і загружаныя "
#~ "зноўку."
-# If you have problems with BOINC itself, get help from the %s BOINC message boards %s.
+# If you have problems with BOINC itself, get help from the %s BOINC message boards %s.
#~ msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
#~ msgstr ""
#~ "Калі праблема складаецца ў працы самога праграмнага забеспячэння BOINC, "
#~ "паспрабуйце атрымаць дапамогу на %sфоруме BOINC%s"
-# Running BOINC
+# Running BOINC
#~ msgid "HOME_MORE_INFO"
#~ msgstr "Падрабязней аб BOINC"
diff --git a/locale/bg/BOINC-Web.po b/locale/bg/BOINC-Web.po
index 993daf4..473abb7 100644
--- a/locale/bg/BOINC-Web.po
+++ b/locale/bg/BOINC-Web.po
@@ -1441,7 +1441,7 @@ msgstr "Новини са налични и под формата на %sRSS fee
#~ msgid "TeraFLOPS."
#~ msgstr "TeraFLOPS."
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
@@ -1728,9 +1728,9 @@ msgstr "Новини са налични и под формата на %sRSS fee
#~ "These are the current results of the <a href=poll.php>BOINC user survey</"
#~ "a>. This page is updated every hour."
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1795,9 +1795,9 @@ msgstr "Новини са налични и под формата на %sRSS fee
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
@@ -1838,8 +1838,8 @@ msgstr "Новини са налични и под формата на %sRSS fee
#~ msgstr ""
#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
-# download.php 2006/08/03 by je2bwm
-# #######################################
+# download.php 2006/08/03 by je2bwm
+# #######################################
#~ msgid "DL_DOWNLOAD"
#~ msgstr "Изтеглете BOINC"
@@ -1881,9 +1881,9 @@ msgstr "Новини са налични и под формата на %sRSS fee
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC: изчисление в името на науката"
-# #############################################
-# system_requirements.php by je2bwm 2006/08/07
-# #############################################
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "Системни изисквания"
@@ -1952,9 +1952,9 @@ msgstr "Новини са налични и под формата на %sRSS fee
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 MB свободно дисково пространство"
-# #############################################
-# release notes by je2bwm 2006/08/09
-# #############################################
+# #############################################
+# release notes by je2bwm 2006/08/09
+# #############################################
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "Информация за версията"
diff --git a/locale/ca/BOINC-Android.po b/locale/ca/BOINC-Android.po
index 1b55fc8..448f003 100644
--- a/locale/ca/BOINC-Android.po
+++ b/locale/ca/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-02-01 21:47+0000\n"
+"PO-Revision-Date: 2014-06-01 19:12+0000\n"
"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
"Language-Team: ca <LL at li.org>\n"
"Language: ca\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: 1391291270.0\n"
+"X-POOTLE-MTIME: 1401649969.0\n"
#. app global
msgctxt "app_name"
@@ -27,7 +27,7 @@ msgstr "BOINC"
#. generic. used by multiple Activities/tabs
msgctxt "generic_loading"
msgid "Loading! Please wait…"
-msgstr "Carregant! Si us plau, espera..."
+msgstr "Carregant! Si us plau, espera…"
#. attach project
#. project list
@@ -37,7 +37,7 @@ msgstr "Selecciona un projecte:"
msgctxt "attachproject_list_manual_button"
msgid "Add project by URL"
-msgstr "Afegir projecte mitjançant URL"
+msgstr "Afegeix un projecte mitjançant URL"
msgctxt "attachproject_list_manual_dialog_title"
msgid "Enter project URL:"
diff --git a/locale/ca/BOINC-Setup.po b/locale/ca/BOINC-Setup.po
index ed25342..525cd9e 100644
--- a/locale/ca/BOINC-Setup.po
+++ b/locale/ca/BOINC-Setup.po
@@ -19,8 +19,8 @@ msgstr ""
"X-Poedit-SearchPath-0: mac_installer\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-Poedit-KeywordsList: _\n"
"X-POOTLE-MTIME: 1391463278.0\n"
+"X-Poedit-KeywordsList: _\n"
#: Installer.cpp:124
#, c-format
diff --git a/locale/ca/BOINC-Web.mo b/locale/ca/BOINC-Web.mo
index 334621e..5ded33e 100644
Binary files a/locale/ca/BOINC-Web.mo and b/locale/ca/BOINC-Web.mo differ
diff --git a/locale/ca/BOINC-Web.po b/locale/ca/BOINC-Web.po
index 76c3963..931285a 100644
--- a/locale/ca/BOINC-Web.po
+++ b/locale/ca/BOINC-Web.po
@@ -7,7 +7,7 @@ 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-02-03 22:05+0000\n"
+"PO-Revision-Date: 2014-06-01 19:20+0000\n"
"Last-Translator: Xavier <xavi.mormur at gmail.com>\n"
"Language-Team: BOINC Development Team <boinc_loc at ssl.berkeley.edu>\n"
"Language: ca\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: 1391465133.0\n"
+"X-POOTLE-MTIME: 1401650445.0\n"
"X-Poedit-KeywordsList: tra\n"
#: docutil.php:21
@@ -738,6 +738,8 @@ msgid ""
"Currently we are calculating the optimum design of a structure call the 52 "
"bar truss"
msgstr ""
+"Actualment estem calculant el disseny òptim d'una estructura anomenada "
+"armadura de 52 barres"
#: projects.inc:224 projects.inc:263 projects.inc:271
msgid "Astronomy"
diff --git a/locale/da/BOINC-Manager.po b/locale/da/BOINC-Manager.po
index 539ed97..b5bec6e 100644
--- a/locale/da/BOINC-Manager.po
+++ b/locale/da/BOINC-Manager.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC Manager 6.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-15 22:26-0700\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\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"
@@ -78,11 +78,11 @@ msgstr ""
msgid "Find login information"
msgstr "Find loginoplysninger"
-#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:642
+#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
msgid "&Password:"
msgstr "&Kodeord:"
-#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:666
+#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
msgid "Choose a &password:"
msgstr "Vælg et &kodeord:"
@@ -123,8 +123,8 @@ msgstr ""
"for at registrere eller for at hente en glemt adgangskode."
#: AccountInfoPage.cpp:532
-msgid "Account manager website"
-msgstr "Hjemmeside for kontohåndtering"
+msgid "Account manager web site"
+msgstr ""
#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
msgid "Add project"
@@ -151,18 +151,18 @@ msgstr "Angiv venligst en emailadresse."
msgid "Please enter a password of at least %d characters."
msgstr "Angiv venligst et kodeord på mindst %d tegn."
-#: AccountInfoPage.cpp:608
+#: AccountInfoPage.cpp:607
msgid ""
"The password and confirmation password do not match. Please type them again."
msgstr ""
"Kodeordet og bekræftelsen af kodeordet stemmer ikke overens. Indtast dem "
"venligst igen."
-#: AccountManagerInfoPage.cpp:248
+#: AccountManagerInfoPage.cpp:272
msgid "Choose an account manager"
msgstr "Vælg en kontohåndtering"
-#: AccountManagerInfoPage.cpp:251
+#: AccountManagerInfoPage.cpp:275
msgid ""
"To choose an account manager, click its name or \n"
"type its URL below."
@@ -170,24 +170,36 @@ msgstr ""
"For at vælge en kontohåndtering skal du klikke på navnet eller \n"
"skrive dens URL herunder."
-#: AccountManagerInfoPage.cpp:254
-msgid "Account Manager &URL:"
-msgstr "&URL for kontohåndtering:"
+#: AccountManagerInfoPage.cpp:279
+msgid "Account manager details:"
+msgstr ""
+
+#: AccountManagerInfoPage.cpp:283
+msgid "Account manager &URL:"
+msgstr ""
-#: AccountManagerProcessingPage.cpp:188 AccountManagerPropertiesPage.cpp:194
+#: AccountManagerInfoPage.cpp:287
+msgid "Open web page"
+msgstr ""
+
+#: AccountManagerInfoPage.cpp:290
+msgid "Visit this account manager's web site"
+msgstr ""
+
+#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
#, c-format
msgid "Communicating with %s."
msgstr "Kommunikerer med %s."
-#: AccountManagerProcessingPage.cpp:195 AccountManagerPropertiesPage.cpp:201
+#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
msgid "Communicating with server."
msgstr "Kommunikerer med server."
-#: AccountManagerProcessingPage.cpp:200 AccountManagerPropertiesPage.cpp:206
+#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
msgid "Please wait..."
msgstr "Vent venligst…"
-#: AccountManagerProcessingPage.cpp:327
+#: AccountManagerProcessingPage.cpp:326
msgid "An internal server error has occurred.\n"
msgstr "Der er opstået en intern serverfejl.\n"
@@ -199,342 +211,342 @@ msgstr "Forbundet"
msgid "Disconnected"
msgstr "Afbrudt"
-#: AdvancedFrame.cpp:315 sg_BoincSimpleFrame.cpp:112 sg_BoincSimpleGUI.cpp:103
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
#, c-format
msgid "Close the %s window"
msgstr "Luk %s-vinduet"
-#: AdvancedFrame.cpp:318 sg_BoincSimpleFrame.cpp:115 sg_BoincSimpleGUI.cpp:106
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
msgid "&Close Window"
msgstr "&Luk vindue"
-#: AdvancedFrame.cpp:329 AdvancedFrame.cpp:336 AdvancedFrame.cpp:343
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
#, c-format
msgid "Exit %s"
msgstr "Afslut %s"
-#: AdvancedFrame.cpp:358
+#: AdvancedFrame.cpp:371
msgid "&Notices\tCtrl+Shift+N"
msgstr "&Meddelelser\tCtrl+Shift+N"
-#: AdvancedFrame.cpp:359
+#: AdvancedFrame.cpp:372
msgid "Display notices"
msgstr "Vis meddelelser"
-#: AdvancedFrame.cpp:364
+#: AdvancedFrame.cpp:377
msgid "&Projects\tCtrl+Shift+P"
msgstr "&Projekter\tCtrl+Shift+P"
-#: AdvancedFrame.cpp:365
+#: AdvancedFrame.cpp:378
msgid "Display projects"
msgstr "Vis projekter"
-#: AdvancedFrame.cpp:370
+#: AdvancedFrame.cpp:383
msgid "&Tasks\tCtrl+Shift+T"
msgstr "&Opgaver\tCtrl+Shift+T"
-#: AdvancedFrame.cpp:371
+#: AdvancedFrame.cpp:384
msgid "Display tasks"
msgstr "Vis opgaver"
-#: AdvancedFrame.cpp:376
+#: AdvancedFrame.cpp:389
msgid "Trans&fers\tCtrl+Shift+X"
msgstr "Over&førsler\tCtrl+Shift+X"
-#: AdvancedFrame.cpp:377
+#: AdvancedFrame.cpp:390
msgid "Display transfers"
msgstr "Vis overførsler"
-#: AdvancedFrame.cpp:382
+#: AdvancedFrame.cpp:395
msgid "&Statistics\tCtrl+Shift+S"
msgstr "&Statistik\tCtrl+Shift+S"
-#: AdvancedFrame.cpp:383
+#: AdvancedFrame.cpp:396
msgid "Display statistics"
msgstr "Vis statistik"
-#: AdvancedFrame.cpp:388
+#: AdvancedFrame.cpp:401
msgid "&Disk usage\tCtrl+Shift+D"
msgstr "&Diskforbrug\tCtrl+Shift+D"
-#: AdvancedFrame.cpp:389
+#: AdvancedFrame.cpp:402
msgid "Display disk usage"
msgstr "Vis diskforbrug"
-#: AdvancedFrame.cpp:396
+#: AdvancedFrame.cpp:409
msgid "Simple &View...\tCtrl+Shift+V"
msgstr "Simpel &visning…\tCtrl+Shift+V"
-#: AdvancedFrame.cpp:397
+#: AdvancedFrame.cpp:410
msgid "Display the simple graphical interface."
msgstr "Vis den simple grafiske grænseflade."
-#: AdvancedFrame.cpp:411
+#: AdvancedFrame.cpp:424
msgid "&Add project or account manager..."
msgstr "&Tilføj projekt eller kontohåndtering…"
-#: AdvancedFrame.cpp:412 sg_ProjectPanel.cpp:76 sg_ProjectsComponent.cpp:106
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
msgid "Volunteer for any or all of 30+ projects in many areas of science"
msgstr ""
"Meld dig som frivillig til en eller flere af de mere end 30 projekter "
"indenfor videnskabens mange områder"
-#: AdvancedFrame.cpp:416
+#: AdvancedFrame.cpp:429
#, c-format
msgid "&Synchronize with %s"
msgstr "&Synkronisér med %s"
-#: AdvancedFrame.cpp:420
+#: AdvancedFrame.cpp:433
#, c-format
msgid "Get current settings from %s"
msgstr "Hent nuværende indstillinger fra %s"
-#: AdvancedFrame.cpp:430
+#: AdvancedFrame.cpp:443
msgid "&Add project..."
msgstr "Tilføj &projekt…"
-#: AdvancedFrame.cpp:431
+#: AdvancedFrame.cpp:444
msgid "Add a project"
msgstr "Tilføj et projekt"
-#: AdvancedFrame.cpp:434
+#: AdvancedFrame.cpp:447
#, c-format
#, c-format, c-format
msgid "S&top using %s..."
msgstr "S&top med at bruge %s…"
-#: AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:453
msgid "Remove this computer from account manager control."
msgstr "Fjern denne computer fra kontohåndtering."
-#: AdvancedFrame.cpp:445 sg_BoincSimpleFrame.cpp:165
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
msgid "&Options..."
msgstr "&Indstillinger…"
-#: AdvancedFrame.cpp:446 sg_BoincSimpleFrame.cpp:166
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
msgid "Configure display options and proxy settings"
msgstr "Konfigurér visningsvalgmuligheder og proxy-indstillinger"
-#: AdvancedFrame.cpp:450 sg_BoincSimpleFrame.cpp:159
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
msgid "Computing &preferences..."
msgstr "&Beregningsindstillinger…"
-#: AdvancedFrame.cpp:451 sg_BoincSimpleFrame.cpp:160
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
msgid "Configure computing preferences"
msgstr "Konfigurér indstillinger for beregning"
-#: AdvancedFrame.cpp:459
+#: AdvancedFrame.cpp:472
msgid "&Run always"
msgstr "Kør &altid"
-#: AdvancedFrame.cpp:460
+#: AdvancedFrame.cpp:473
msgid "Allow work regardless of preferences"
msgstr "Tillad arbejde uanset indstillinger"
-#: AdvancedFrame.cpp:464
+#: AdvancedFrame.cpp:477
msgid "Run based on &preferences"
msgstr "Kør efter &indstillinger"
-#: AdvancedFrame.cpp:465
+#: AdvancedFrame.cpp:478
msgid "Allow work according to preferences"
msgstr "Tillad arbejde i henhold til indstillinger"
-#: AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:482
msgid "&Suspend"
msgstr "&Suspendér"
-#: AdvancedFrame.cpp:470
+#: AdvancedFrame.cpp:483
msgid "Stop work regardless of preferences"
msgstr "Suspendér arbejde uanset indstillinger"
-#: AdvancedFrame.cpp:495
+#: AdvancedFrame.cpp:508
msgid "Use GPU always"
msgstr "Brug altid GPU"
-#: AdvancedFrame.cpp:496
+#: AdvancedFrame.cpp:509
msgid "Allow GPU work regardless of preferences"
msgstr "Tillad GPU-arbejde uanset indstillinger"
-#: AdvancedFrame.cpp:500
+#: AdvancedFrame.cpp:513
msgid "Use GPU based on preferences"
msgstr "Brug GPU efter indstillinger"
-#: AdvancedFrame.cpp:501
+#: AdvancedFrame.cpp:514
msgid "Allow GPU work according to preferences"
msgstr "Tillad GPU-arbejde i henhold til indstillinger"
-#: AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:518
msgid "Suspend GPU"
msgstr "Suspendér GPU"
-#: AdvancedFrame.cpp:506
+#: AdvancedFrame.cpp:519
msgid "Stop GPU work regardless of preferences"
msgstr "Stop GPU-arbejde uanset indstillinger"
-#: AdvancedFrame.cpp:530
+#: AdvancedFrame.cpp:543
msgid "Network activity always available"
msgstr "Netværksaktivitet altid tilgængelig"
-#: AdvancedFrame.cpp:531
+#: AdvancedFrame.cpp:544
msgid "Allow network activity regardless of preferences"
msgstr "Tillad netværksaktivitet uanset indstillinger"
-#: AdvancedFrame.cpp:535
+#: AdvancedFrame.cpp:548
msgid "Network activity based on preferences"
msgstr "Netværksaktivitet efter indstillinger"
-#: AdvancedFrame.cpp:536
+#: AdvancedFrame.cpp:549
msgid "Allow network activity according to preferences"
msgstr "Tillad netværksaktivitet efter indstillinger"
-#: AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:553
msgid "Network activity suspended"
msgstr "Netværksaktivitet suspenderet"
-#: AdvancedFrame.cpp:541
+#: AdvancedFrame.cpp:554
msgid "Stop BOINC network activity"
msgstr "Stop BOINC netværksaktivitet"
-#: AdvancedFrame.cpp:551
+#: AdvancedFrame.cpp:564
#, c-format
msgid "Connect to another computer running %s"
msgstr "Forbind til en anden computer, der kører %s"
-#: AdvancedFrame.cpp:556
+#: AdvancedFrame.cpp:569
msgid "Select computer..."
msgstr "Vælg computer…"
-#: AdvancedFrame.cpp:561
+#: AdvancedFrame.cpp:574
msgid "Shut down connected client..."
msgstr "Stop den forbundne klient…"
-#: AdvancedFrame.cpp:562
+#: AdvancedFrame.cpp:575
msgid "Shut down the currently connected client"
msgstr "Stop den nuværende forbundne klient"
-#: AdvancedFrame.cpp:566
+#: AdvancedFrame.cpp:579
msgid "Run CPU &benchmarks"
msgstr "Kør CPU-&ydelsesmåling"
-#: AdvancedFrame.cpp:567
+#: AdvancedFrame.cpp:580
msgid "Runs BOINC CPU benchmarks"
msgstr "Kører BOINC CPU-ydelsesmåling"
-#: AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:584
msgid "Do network communication"
msgstr "Udfør netværkskommunikation"
-#: AdvancedFrame.cpp:572
+#: AdvancedFrame.cpp:585
msgid "Do all pending network communication"
msgstr "Udfør al afventende netværkskommunikation"
# 94%
-#: AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:589
msgid "Read config files"
msgstr "Læs konfigurationsfiler"
-#: AdvancedFrame.cpp:577
+#: AdvancedFrame.cpp:590
msgid "Read configuration info from cc_config.xml and any app_config.xml files"
msgstr ""
"Læs konfigurationsinfo fra cc_config.xml og eventuelle app_config.xml filer"
-#: AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:594
msgid "Read local prefs file"
msgstr "Læs lokal indstillingsfil"
-#: AdvancedFrame.cpp:582
+#: AdvancedFrame.cpp:595
msgid "Read preferences from global_prefs_override.xml."
msgstr "Læs indstillinger fra global_prefs_override.xml."
-#: AdvancedFrame.cpp:587
+#: AdvancedFrame.cpp:600
#, c-format
msgid "Launch another instance of %s..."
msgstr "Kør endnu en instans af %s…"
-#: AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:604
#, c-format
msgid "Launch another %s"
msgstr "Kør endnu en %s"
-#: AdvancedFrame.cpp:601
+#: AdvancedFrame.cpp:614
msgid "Event Log...\tCtrl+Shift+E"
msgstr "Hændelseslog\tCtrl+Shift+E"
-#: AdvancedFrame.cpp:602
+#: AdvancedFrame.cpp:615
msgid "Display diagnostic messages."
msgstr "Vis diagnosticeringsbeskeder."
-#: AdvancedFrame.cpp:612 sg_BoincSimpleFrame.cpp:175 sg_BoincSimpleGUI.cpp:129
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
#, c-format
msgid "%s &help"
msgstr "%s &hjælp"
-#: AdvancedFrame.cpp:618 sg_BoincSimpleFrame.cpp:181 sg_BoincSimpleGUI.cpp:135
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
#, c-format
#, c-format, c-format
msgid "Show information about %s"
msgstr "Vis information om %s"
-#: AdvancedFrame.cpp:630
+#: AdvancedFrame.cpp:643
#, c-format
msgid "&%s help"
msgstr "&%s hjælp"
-#: AdvancedFrame.cpp:636 sg_BoincSimpleFrame.cpp:199 sg_BoincSimpleGUI.cpp:153
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
#, c-format
msgid "Show information about the %s"
msgstr "Vis information om %s"
-#: AdvancedFrame.cpp:648 sg_BoincSimpleFrame.cpp:211 sg_BoincSimpleGUI.cpp:165
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
#, c-format
-msgid "%s &website"
-msgstr "%s-&hjemmeside"
+msgid "%s &web site"
+msgstr ""
-#: AdvancedFrame.cpp:654 sg_BoincSimpleFrame.cpp:217 sg_BoincSimpleGUI.cpp:171
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
#, c-format
msgid "Show information about BOINC and %s"
msgstr "Vis information om BOINC og %s"
-#: AdvancedFrame.cpp:666 BOINCTaskBar.cpp:533 sg_BoincSimpleFrame.cpp:229
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
#, c-format
msgid "&About %s..."
msgstr "&Om %s…"
-#: AdvancedFrame.cpp:672 sg_BoincSimpleFrame.cpp:235
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
msgid "Licensing and copyright information."
msgstr "Licens- og copyrightinformation."
-#: AdvancedFrame.cpp:679 sg_BoincSimpleFrame.cpp:242 sg_BoincSimpleGUI.cpp:194
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
msgid "&File"
msgstr "&Filer"
-#: AdvancedFrame.cpp:683 sg_BoincSimpleFrame.cpp:246 sg_BoincSimpleGUI.cpp:199
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
msgid "&View"
msgstr "&Vis"
-#: AdvancedFrame.cpp:687 sg_BoincSimpleFrame.cpp:250
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
msgid "&Tools"
msgstr "&Værktøjer"
-#: AdvancedFrame.cpp:691
+#: AdvancedFrame.cpp:704
msgid "&Activity"
msgstr "&Aktivitet"
-#: AdvancedFrame.cpp:695
+#: AdvancedFrame.cpp:708
msgid "A&dvanced"
msgstr "Avan&ceret"
-#: AdvancedFrame.cpp:699 DlgEventLog.cpp:329 sg_BoincSimpleFrame.cpp:254
-#: sg_BoincSimpleGUI.cpp:184 wizardex.cpp:374 wizardex.cpp:381
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
msgid "&Help"
msgstr "&Hjælp"
-#: AdvancedFrame.cpp:1178
+#: AdvancedFrame.cpp:1199
#, c-format
msgid "%s - Stop using %s"
msgstr "%s - Stop med at bruge %s"
-#: AdvancedFrame.cpp:1183
+#: AdvancedFrame.cpp:1204
#, c-format
msgid ""
"If you stop using %s,\n"
@@ -549,13 +561,13 @@ msgstr ""
"\n"
"Vil du stoppe med at bruge %s?"
-#: AdvancedFrame.cpp:1381
+#: AdvancedFrame.cpp:1401
#, c-format
#, c-format, c-format
msgid "%s - Shut down the current client..."
msgstr "%s - Luk den nuværende klient ned…"
-#: AdvancedFrame.cpp:1390
+#: AdvancedFrame.cpp:1410
#, c-format
#, c-format, c-format
msgid ""
@@ -565,28 +577,28 @@ msgstr ""
"%s vil lukke den nuværende klient ned\n"
"og vil derefter spørge efter en ny vært at forbinde til."
-#: AdvancedFrame.cpp:1709 DlgAbout.cpp:119
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: AdvancedFrame.cpp:1718
+#: AdvancedFrame.cpp:1754
#, c-format
#, c-format, c-format
msgid "%s has successfully added %s"
msgstr "%s har tilføjet %s med succes"
-#: AdvancedFrame.cpp:1860
+#: AdvancedFrame.cpp:1893
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: AdvancedFrame.cpp:1864
+#: AdvancedFrame.cpp:1897
#, c-format
msgid "Connecting to %s"
msgstr "Forbinder til %s"
-#: AdvancedFrame.cpp:1867
+#: AdvancedFrame.cpp:1900
#, c-format
msgid "Connected to %s (%s)"
msgstr "Forbundet til %s (%s)"
@@ -623,26 +635,26 @@ msgstr ""
"\n"
"Besøg venligst projektets hjemmeside og følg instruktionerne der."
-#: AsyncRPC.cpp:1238
+#: AsyncRPC.cpp:1031
msgid "Communicating with BOINC client. Please wait ..."
msgstr "Kommunikerer med BOINC-klienten. Vent venligst…"
-#: AsyncRPC.cpp:1241
+#: AsyncRPC.cpp:1034
#, c-format
msgid "&Quit %s"
msgstr "&Afslut %s"
-#: AsyncRPC.cpp:1243
+#: AsyncRPC.cpp:1036
#, c-format
msgid "E&xit %s"
msgstr "&Afslut %s"
-#: AsyncRPC.cpp:1247
+#: AsyncRPC.cpp:1040
#, c-format
msgid "%s - Communication"
msgstr "%s - Kommunikation"
-#: AsyncRPC.cpp:1263 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:452
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
msgid "Cancel"
msgstr "&Annullér"
@@ -734,16 +746,16 @@ msgstr ""
"s-klient.\n"
"For at forbinde til din lokale computer, brug 'localhost' som værtsnavn."
-#: BOINCBaseView.cpp:774
+#: BOINCBaseView.cpp:779
msgid "Project web pages"
msgstr "Projekt-hjemmesider"
-#: BOINCClientManager.cpp:573
+#: BOINCClientManager.cpp:575
#, c-format
msgid "%s - Unexpected Exit"
msgstr "%s - Uventet afslutning"
-#: BOINCClientManager.cpp:583
+#: BOINCClientManager.cpp:585
#, c-format
#, c-format, c-format
msgid ""
@@ -801,7 +813,7 @@ msgstr "%s har afbrudt forbindelsen til Internet."
msgid "%s failed to disconnected from the Internet."
msgstr "%s kunne ikke afbryde fra Internet."
-#: BOINCGUIApp.cpp:345
+#: BOINCGUIApp.cpp:339
#, c-format
#, c-format, c-format
msgid ""
@@ -823,7 +835,7 @@ msgstr ""
" - kontakt din administrator for at tilføje dig til brugergruppen\n"
" 'boinc_master'."
-#: BOINCGUIApp.cpp:351
+#: BOINCGUIApp.cpp:345
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
@@ -833,16 +845,16 @@ msgstr ""
"venligst %s.\n"
"(Fejlkode %d"
-#: BOINCGUIApp.cpp:357
+#: BOINCGUIApp.cpp:351
msgid " at "
msgstr " - "
-#: BOINCGUIApp.cpp:360 MainDocument.cpp:2472 MainDocument.cpp:2522
-#: MainDocument.cpp:2542 ViewTransfers.cpp:792
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
msgid ")"
msgstr ")"
-#: BOINCGUIApp.cpp:393
+#: BOINCGUIApp.cpp:384
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
@@ -850,141 +862,141 @@ msgstr ""
"En genstart er nødvendig for, at BOINC kan køre ordentligt.\n"
"Genstart venligst din computer og prøv igen."
-#: BOINCGUIApp.cpp:394 DlgAbout.cpp:153
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC-håndtering"
-#: BOINCGUIApp.cpp:561
+#: BOINCGUIApp.cpp:572
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC-håndtering blev startet automatisk af operativsystemet"
-#: BOINCGUIApp.cpp:563
+#: BOINCGUIApp.cpp:574
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "Start BOINC så kun ikonet i statusfeltet er synligt"
-#: BOINCGUIApp.cpp:565
+#: BOINCGUIApp.cpp:576
msgid "Directory containing the BOINC Client executable"
msgstr "Mappe, der indeholder den eksekvérbare fil for BOINC-klienten"
-#: BOINCGUIApp.cpp:566
+#: BOINCGUIApp.cpp:577
msgid "BOINC data directory"
msgstr "BOINC-datamappe"
-#: BOINCGUIApp.cpp:568
+#: BOINCGUIApp.cpp:579
msgid "Host name or IP address"
msgstr "Værtsnavn eller IP-adresse"
-#: BOINCGUIApp.cpp:569
+#: BOINCGUIApp.cpp:580
msgid "GUI RPC port number"
msgstr "GUI RPC portnummer"
-#: BOINCGUIApp.cpp:570
+#: BOINCGUIApp.cpp:581
msgid "Password"
msgstr "Kodeord"
-#: BOINCGUIApp.cpp:571
+#: BOINCGUIApp.cpp:582
msgid "Startup BOINC with these optional arguments"
msgstr "Start BOINC med disse valgfrie argumenter"
-#: BOINCGUIApp.cpp:572
+#: BOINCGUIApp.cpp:583
msgid "disable BOINC security users and permissions"
msgstr "deaktivér BOINCs sikkerhedsbrugere og -tilladelser"
-#: BOINCGUIApp.cpp:573
+#: BOINCGUIApp.cpp:584
msgid "set skin debugging mode to enable skin manager error messages"
msgstr ""
"sæt tema-fejlfindingstilstand for at slå fejlbeskeder til for skinhåndtering"
-#: BOINCGUIApp.cpp:574
+#: BOINCGUIApp.cpp:585
msgid "multiple instances of BOINC Manager allowed"
msgstr "adskillige instanser af BOINC-håndtering tillades"
-#: BOINCGUIApp.cpp:576
+#: BOINCGUIApp.cpp:587
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Bruges ikke: workaround for fejl i XCode 4.2"
-#: BOINCGUIApp.cpp:794
+#: BOINCGUIApp.cpp:814
msgid "(Automatic Detection)"
msgstr "(Automatisk registrering)"
-#: BOINCGUIApp.cpp:795
+#: BOINCGUIApp.cpp:815
msgid "(Unknown)"
msgstr "(Ukendt)"
-#: BOINCGUIApp.cpp:796
+#: BOINCGUIApp.cpp:816
msgid "(User Defined)"
msgstr "(Brugerdefineret)"
-#: BOINCTaskBar.cpp:511
+#: BOINCTaskBar.cpp:508
#, c-format
msgid "Open %s Web..."
msgstr "Åbn %s web…"
-#: BOINCTaskBar.cpp:518
+#: BOINCTaskBar.cpp:515
#, c-format
msgid "Open %s..."
msgstr "Åbn %s…"
-#: BOINCTaskBar.cpp:525 BOINCTaskBar.cpp:621 BOINCTaskBar.cpp:629
+#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
msgid "Snooze"
msgstr "Pause"
-#: BOINCTaskBar.cpp:527 BOINCTaskBar.cpp:648 BOINCTaskBar.cpp:656
+#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
msgid "Snooze GPU"
msgstr "GPU-pause"
-#: BOINCTaskBar.cpp:543 mac/MacSysMenu.cpp:225
+#: BOINCTaskBar.cpp:542
msgid "E&xit"
msgstr "&Afslut"
-#: BOINCTaskBar.cpp:614 ViewProjects.cpp:708 ViewWork.cpp:784
-#: sg_BoincSimpleFrame.cpp:738 sg_ProjectCommandPopup.cpp:110
+#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
#: sg_TaskCommandPopup.cpp:102
msgid "Resume"
msgstr "Genoptag"
-#: BOINCTaskBar.cpp:641
+#: BOINCTaskBar.cpp:639
msgid "Resume GPU"
msgstr "Genoptag GPU"
-#: BOINCTaskBar.cpp:715
+#: BOINCTaskBar.cpp:713
msgid "Computing is enabled"
msgstr "Beregning er slået til"
-#: BOINCTaskBar.cpp:719
+#: BOINCTaskBar.cpp:717
msgid "Computing is suspended - "
msgstr "Beregning er suspenderet - "
-#: BOINCTaskBar.cpp:729
+#: BOINCTaskBar.cpp:727
msgid "GPU computing is enabled"
msgstr "GPU-beregning er slået til"
-#: BOINCTaskBar.cpp:732
+#: BOINCTaskBar.cpp:730
msgid "GPU computing is suspended - "
msgstr "GPU-beregning er suspenderet - "
-#: BOINCTaskBar.cpp:741
+#: BOINCTaskBar.cpp:739
msgid "Network is enabled"
msgstr "Netværksadgang er slået til"
-#: BOINCTaskBar.cpp:744
+#: BOINCTaskBar.cpp:742
msgid "Network is suspended - "
msgstr "Netværksadgang er suspenderet - "
-#: BOINCTaskBar.cpp:752
+#: BOINCTaskBar.cpp:750
msgid "Reconnecting to client."
msgstr "Genforbinder til klienten."
-#: BOINCTaskBar.cpp:754
+#: BOINCTaskBar.cpp:752
msgid "Not connected to a client."
msgstr "Ikke forbundet til en klient."
-#: BOINCTaskBar.cpp:807
+#: BOINCTaskBar.cpp:805
#, c-format
msgid "%s Notices"
msgstr "%s-meddelelser"
-#: BOINCTaskBar.cpp:813
+#: BOINCTaskBar.cpp:811
msgid "There are new notices - click to view."
msgstr "Der er nye meddelelser - klik for at se."
@@ -1066,7 +1078,7 @@ msgstr "Du bruger nu %s til at håndtere konti."
msgid "You are now using this account manager."
msgstr "Du bruger nu denne kontohåndtering."
-#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:95
+#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
#, c-format
msgid "About %s"
msgstr "Om %s"
@@ -1097,64 +1109,64 @@ 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:162
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
msgid "&OK"
msgstr "&O.k."
-#: DlgAdvPreferences.cpp:542
-msgid "invalid float"
-msgstr "ugyldig float-værdi"
+#: DlgAdvPreferences.cpp:544
+msgid "invalid number"
+msgstr ""
-#: DlgAdvPreferences.cpp:543
+#: DlgAdvPreferences.cpp:545
msgid "invalid time, format is HH:MM"
msgstr "ugyldig tid, formatet er TT:MM"
-#: DlgAdvPreferences.cpp:544
+#: DlgAdvPreferences.cpp:546
msgid "invalid time interval, format is HH:MM-HH:MM"
msgstr "ugyldigt tidsinterval, formatet er TT:MM-TT:MM"
-#: DlgAdvPreferences.cpp:664
+#: DlgAdvPreferences.cpp:751
msgid "invalid input value detected"
msgstr "ugyldig input-værdi registreret"
-#: DlgAdvPreferences.cpp:666
+#: DlgAdvPreferences.cpp:753
msgid "Validation Error"
msgstr "Valideringsfejl"
-#: DlgAdvPreferences.cpp:797 DlgAdvPreferences.cpp:803
-#: DlgAdvPreferences.cpp:809
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
msgid "Applications to add"
msgstr "Applikationer, der skal tilføjes"
-#: DlgAdvPreferences.cpp:826
+#: DlgAdvPreferences.cpp:914
#, c-format
msgid "'%s' is not an executable application."
msgstr "'%s' er ikke en eksekverbar applikation."
-#: DlgAdvPreferences.cpp:827 DlgAdvPreferences.cpp:874
-#: DlgAdvPreferences.cpp:898
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
msgid "Add Exclusive App"
msgstr "Tilføj eksklusiv app"
-#: DlgAdvPreferences.cpp:839
+#: DlgAdvPreferences.cpp:927
msgid "Name of application to add?"
msgstr "Navn på applikation, der skal tilføjes?"
-#: DlgAdvPreferences.cpp:839
+#: DlgAdvPreferences.cpp:927
msgid "Add exclusive app"
msgstr "Tilføj eksklusiv app"
-#: DlgAdvPreferences.cpp:873
+#: DlgAdvPreferences.cpp:961
#, c-format
msgid "Application names must end with '%s'"
msgstr "Applikationsnavne skal ende med '%s'"
-#: DlgAdvPreferences.cpp:897
+#: DlgAdvPreferences.cpp:985
#, c-format
msgid "'%s' is already in the list."
msgstr "'%s' er allerede på listen"
-#: DlgAdvPreferences.cpp:989
+#: DlgAdvPreferences.cpp:1077
msgid ""
"Do you really want to clear all local preferences?\n"
"(This will not affect exclusive applications.)"
@@ -1162,11 +1174,11 @@ msgstr ""
"Vil du virkelig nulstille alle lokale indstillinger?\n"
"(Dette vil ikke have effekt på eksklusive applikationer.)"
-#: DlgAdvPreferences.cpp:990 sg_DlgPreferences.cpp:1032
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
msgid "Confirmation"
msgstr "Bekræftelse"
-#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:948
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
#, c-format
msgid "%s - Preferences"
msgstr "%s - Indstillinger"
@@ -1182,11 +1194,11 @@ msgstr ""
"Klik på Nulstil for at genskabe de web-baserede indstillinger (undtaget for "
"eksklusive apps)."
-#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:447
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
msgid "Clear"
msgstr "Nulstil"
-#: DlgAdvPreferencesBase.cpp:66 sg_DlgPreferences.cpp:448
+#: DlgAdvPreferencesBase.cpp:66
msgid "clear all local preferences and close the dialog"
msgstr "nulstil alle lokale indstillinger og luk denne dialogboks"
@@ -1206,7 +1218,7 @@ msgstr "disk- og hukommelsesforbrug"
msgid "exclusive applications"
msgstr "eksklusive applikationer"
-#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:443
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
msgid "OK"
msgstr "O.k."
@@ -1219,7 +1231,7 @@ msgid "close the dialog without saving"
msgstr "luk dialogboksen uden at gemme"
#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
-#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:774 sg_DlgPreferences.cpp:458
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
msgid "Help"
msgstr "Hjælp"
@@ -1276,7 +1288,7 @@ msgstr ""
"minutter"
#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
-#: sg_DlgPreferences.cpp:436
+#: sg_DlgPreferences.cpp:417
msgid "minutes"
msgstr "minutter"
@@ -1292,7 +1304,7 @@ msgstr "suspendér arbejde hvis processorforbrug overstiger dette niveau"
msgid "percent (0 means no restriction)"
msgstr "procent (0 betyder ingen begrænsning)"
-#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
msgid "Every day between hours of"
msgstr "Hver dag imellem"
@@ -1300,8 +1312,8 @@ msgstr "Hver dag imellem"
msgid "start work at this time"
msgstr "start arbejde på dette tidspunkt"
-#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:503
-#: sg_DlgPreferences.cpp:345 sg_DlgPreferences.cpp:367
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
msgid "and"
msgstr "og"
@@ -1309,43 +1321,43 @@ msgstr "og"
msgid "stop work at this time"
msgstr "stop arbejde på dette tidspunkt"
-#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:511
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
msgid "(no restriction if equal)"
msgstr "(ingen begrænsning hvis de er ens)"
-#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:516
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
msgid "Day-of-week override:"
msgstr "Undtagelser for ugedage:"
-#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:521
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
msgid "check box to specify hours for this day of week"
msgstr "marker feltet for at specificere timetal for denne ugedag"
-#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
msgid "Monday"
msgstr "Mandag"
-#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:534
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
msgid "Tuesday"
msgstr "Tirsdag"
-#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:541
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
msgid "Wednesday"
msgstr "Onsdag"
-#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:548
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
msgid "Thursday"
msgstr "Torsdag"
-#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:555
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
msgid "Friday"
msgstr "Fredag"
-#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:562
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
msgid "Saturday"
msgstr "Lørdag"
-#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:569
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
msgid "Sunday"
msgstr "Søndag"
@@ -1366,9 +1378,9 @@ msgstr "På multiprocessor-systemer, brug højst"
msgid "% of the processors (0 means ignore this setting)"
msgstr "% af processorerne (0 betyder ignorér denne indstilling)"
-#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:604
-#: DlgAdvPreferencesBase.cpp:626 DlgAdvPreferencesBase.cpp:647
-#: DlgAdvPreferencesBase.cpp:668 DlgAdvPreferencesBase.cpp:678
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
msgid "Use at most"
msgstr "Brug højst"
@@ -1377,74 +1389,74 @@ msgstr "Brug højst"
msgid "% CPU time"
msgstr "% CPU-tid"
-#: DlgAdvPreferencesBase.cpp:377
+#: DlgAdvPreferencesBase.cpp:378
msgid "General options"
msgstr "Generelle valgmuligheder"
-#: DlgAdvPreferencesBase.cpp:385
+#: DlgAdvPreferencesBase.cpp:386
msgid "Maximum download rate"
msgstr "Maksimal downloadhastighed"
-#: DlgAdvPreferencesBase.cpp:391 DlgAdvPreferencesBase.cpp:400
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
msgid "KBytes/sec."
msgstr "KBytes/sek"
-#: DlgAdvPreferencesBase.cpp:394
+#: DlgAdvPreferencesBase.cpp:395
msgid "Maximum upload rate"
msgstr "Maksimal uploadhastighed"
-#: DlgAdvPreferencesBase.cpp:405
+#: DlgAdvPreferencesBase.cpp:406
msgid "Transfer at most"
msgstr "Overfør højst"
-#: DlgAdvPreferencesBase.cpp:411
+#: DlgAdvPreferencesBase.cpp:412
msgid "Mbytes"
msgstr "Mbytes"
-#: DlgAdvPreferencesBase.cpp:414
+#: DlgAdvPreferencesBase.cpp:415
msgid "every"
msgstr "for hver"
-#: DlgAdvPreferencesBase.cpp:420 DlgAdvPreferencesBase.cpp:443
-#: DlgAdvPreferencesBase.cpp:462
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
msgid "days"
msgstr "dage"
-#: DlgAdvPreferencesBase.cpp:428
+#: DlgAdvPreferencesBase.cpp:429
msgid "Minimum work buffer"
msgstr "Minimum arbejdsbuffer"
-#: DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:438
msgid "Try to maintain enough tasks to keep busy for this many days"
msgstr ""
"Prøv at opretholde nok opgaver til at holde computeren optaget i så mange "
"dage"
-#: DlgAdvPreferencesBase.cpp:449
+#: DlgAdvPreferencesBase.cpp:450
msgid "Max additional work buffer"
msgstr "Maks. ekstra arbejdsbuffer"
-#: DlgAdvPreferencesBase.cpp:458
+#: DlgAdvPreferencesBase.cpp:459
msgid "In addition, maintain enough tasks for up to this many days"
msgstr "Der ud over, oprethold nok opgaver til op til så mange dage"
-#: DlgAdvPreferencesBase.cpp:465
+#: DlgAdvPreferencesBase.cpp:466
msgid "Skip image file verification"
msgstr "Spring billedfilsverifikation over"
-#: DlgAdvPreferencesBase.cpp:467
+#: DlgAdvPreferencesBase.cpp:468
msgid "check this if your Internet provider modifies image files"
msgstr "marker dette, hvis din internetudbyder ændrer på billedfiler"
-#: DlgAdvPreferencesBase.cpp:475
+#: DlgAdvPreferencesBase.cpp:476
msgid "Connect options"
msgstr "Forbindelsesindstillinger"
-#: DlgAdvPreferencesBase.cpp:477
+#: DlgAdvPreferencesBase.cpp:478
msgid "Confirm before connecting to internet"
msgstr "Bekræft før der tilsluttes Internet"
-#: DlgAdvPreferencesBase.cpp:479
+#: DlgAdvPreferencesBase.cpp:480
msgid ""
"if checked, a confirmation dialog will be displayed before trying to connect "
"to the Internet"
@@ -1452,11 +1464,11 @@ msgstr ""
"markeres dette vil en dialogboks vises før forsøg på at forbinde til "
"Internet"
-#: DlgAdvPreferencesBase.cpp:483
+#: DlgAdvPreferencesBase.cpp:484
msgid "Disconnect when done"
msgstr "Kobl af Internet når færdig"
-#: DlgAdvPreferencesBase.cpp:485
+#: DlgAdvPreferencesBase.cpp:486
msgid ""
"if checked, BOINC hangs up when network usage is done\n"
"(only relevant for dialup-connection)"
@@ -1464,148 +1476,148 @@ msgstr ""
"markeres dette vil BOINC lægge på, når netværksbrug er færdig\n"
"(kun relevant for opkaldsforbindelser)"
-#: DlgAdvPreferencesBase.cpp:491
+#: DlgAdvPreferencesBase.cpp:492
msgid "Network usage allowed"
msgstr "Netværksforbrug tilladt"
-#: DlgAdvPreferencesBase.cpp:499
+#: DlgAdvPreferencesBase.cpp:500
msgid "network usage start hour"
msgstr "netværksforbrug starttime"
-#: DlgAdvPreferencesBase.cpp:507
+#: DlgAdvPreferencesBase.cpp:508
msgid "network usage stop hour"
msgstr "netværksforbrug sluttime"
-#: DlgAdvPreferencesBase.cpp:597 DlgItemProperties.cpp:226
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
msgid "Disk usage"
msgstr "Diskforbrug"
-#: DlgAdvPreferencesBase.cpp:608
+#: DlgAdvPreferencesBase.cpp:609
msgid "the maximum disk space used by BOINC (in Gigabytes)"
msgstr "maksimal mængde diskplads brugt af BOINC (i gigabytes)"
-#: DlgAdvPreferencesBase.cpp:612
+#: DlgAdvPreferencesBase.cpp:613
msgid "Gigabytes disk space"
msgstr "Gigabytes diskplads"
-#: DlgAdvPreferencesBase.cpp:615
+#: DlgAdvPreferencesBase.cpp:616
msgid "Leave at least"
msgstr "Frihold mindst"
-#: DlgAdvPreferencesBase.cpp:619
+#: DlgAdvPreferencesBase.cpp:620
msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
msgstr "BOINC efterlader mindst denne mængde diskplads fri (i gigabytes)"
-#: DlgAdvPreferencesBase.cpp:623
+#: DlgAdvPreferencesBase.cpp:624
msgid "Gigabytes disk space free"
msgstr "Gigabytes diskplads fri"
-#: DlgAdvPreferencesBase.cpp:630
+#: DlgAdvPreferencesBase.cpp:631
msgid "BOINC uses at most this percentage of total disk space"
msgstr "BOINC bruger højst denne procentdel af den samlede diskplads"
-#: DlgAdvPreferencesBase.cpp:635
+#: DlgAdvPreferencesBase.cpp:636
#, no-c-format
msgid "% of total disk space"
msgstr "% af samlet diskplads"
-#: DlgAdvPreferencesBase.cpp:638
+#: DlgAdvPreferencesBase.cpp:639
msgid "Tasks checkpoint to disk at most every"
msgstr "Opgaver tilgår checkpoints på disk højst hver"
-#: DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:645
msgid "seconds"
msgstr "sekunder"
-#: DlgAdvPreferencesBase.cpp:654
+#: DlgAdvPreferencesBase.cpp:655
#, no-c-format
msgid "% of page file (swap space)"
msgstr "% af sidefil (swapplads)"
-#: DlgAdvPreferencesBase.cpp:661
+#: DlgAdvPreferencesBase.cpp:662
msgid "Memory usage"
msgstr "Hukommelsesforbrug"
-#: DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:676
#, no-c-format
msgid "% when computer is in use"
msgstr "% når computeren er i brug"
-#: DlgAdvPreferencesBase.cpp:685
+#: DlgAdvPreferencesBase.cpp:686
#, no-c-format
msgid "% when computer is idle"
msgstr "% når computeren ikke er i brug"
-#: DlgAdvPreferencesBase.cpp:690
+#: DlgAdvPreferencesBase.cpp:691
msgid "Leave applications in memory while suspended"
msgstr "Efterlad applikationer i hukommelsen under suspendering"
-#: DlgAdvPreferencesBase.cpp:692
+#: DlgAdvPreferencesBase.cpp:693
msgid "if checked, suspended work units are left in memory"
msgstr "markeres dette vil suspenderede arbejdsenheder blive gemt i hukkomelsen"
-#: DlgAdvPreferencesBase.cpp:712
+#: DlgAdvPreferencesBase.cpp:713
msgid ""
"Suspend processor and network usage when these applications are running:"
msgstr "Suspendér processor- og netværksforbrug, når disse applikationer kører:"
-#: DlgAdvPreferencesBase.cpp:721
+#: DlgAdvPreferencesBase.cpp:722
msgid "Add..."
msgstr "Tilføj…"
-#: DlgAdvPreferencesBase.cpp:722
+#: DlgAdvPreferencesBase.cpp:723
msgid "Add an application to this list"
msgstr "Tilføj en applikation til denne liste"
-#: DlgAdvPreferencesBase.cpp:727 ViewProjects.cpp:201
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
#: sg_ProjectCommandPopup.cpp:85
msgid "Remove"
msgstr "Fjern"
-#: DlgAdvPreferencesBase.cpp:728
+#: DlgAdvPreferencesBase.cpp:729
msgid "Remove an application from this list"
msgstr "Fjern en applikation fra denne liste"
-#: DlgAdvPreferencesBase.cpp:737
+#: DlgAdvPreferencesBase.cpp:738
msgid "For advanced options, refer to "
msgstr "For avancerede valgmuligheder, se"
-#: DlgEventLog.cpp:217
+#: DlgEventLog.cpp:219
#, c-format
msgid "%s - Event Log"
msgstr "%s - Begivenhedslog"
-#: DlgEventLog.cpp:230 ViewMessages.cpp:117 ViewProjects.cpp:218
-#: ViewStatistics.cpp:427 ViewStatistics.cpp:1996 ViewTransfers.cpp:181
-#: ViewWork.cpp:231
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
+#: ViewWork.cpp:232
msgid "Project"
msgstr "Projekt"
-#: DlgEventLog.cpp:231 ViewMessages.cpp:118
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
msgid "Time"
msgstr "Tid"
-#: DlgEventLog.cpp:232 ViewMessages.cpp:119
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
msgid "Message"
msgstr "Besked"
-#: DlgEventLog.cpp:287 DlgEventLog.cpp:351
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
msgid "&Show only this project"
msgstr "Vis kun dette &projekt"
-#: DlgEventLog.cpp:291
+#: DlgEventLog.cpp:294
msgid "Copy &All"
msgstr "Kopiér &alle"
-#: DlgEventLog.cpp:293 DlgEventLog.cpp:297 ViewMessages.cpp:89
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr "Kopiér alle beskederne til udklipsholderen."
-#: DlgEventLog.cpp:302
+#: DlgEventLog.cpp:305
msgid "Copy &Selected"
msgstr "Kopiér &valgte"
-#: DlgEventLog.cpp:305 DlgEventLog.cpp:313 ViewMessages.cpp:97
+#: 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."
@@ -1613,7 +1625,7 @@ msgstr ""
"Kopiér de valgte beskeder til udklipsholderen. Du kan vælge flere beskeder "
"ved at holde shift- eller command-tasten nede, mens du vælger."
-#: DlgEventLog.cpp:307 DlgEventLog.cpp:315 ViewMessages.cpp:99
+#: 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."
@@ -1621,25 +1633,24 @@ msgstr ""
"Kopiér de valgte beskeder til udklipsholderen. Du kan vælge flere beskeder "
"ved at holde shift- eller control-tasten nede, mens du vælger."
-#: DlgEventLog.cpp:322 DlgItemProperties.cpp:66
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
msgid "&Close"
msgstr "&Luk"
-#: DlgEventLog.cpp:331 sg_BoincSimpleFrame.cpp:778 sg_DlgPreferences.cpp:461
-#: sg_ProjectsComponent.cpp:142
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
#, c-format
msgid "Get help with %s"
msgstr "Få hjælp til %s"
-#: DlgEventLog.cpp:345
+#: DlgEventLog.cpp:348
msgid "Show all &messages"
msgstr "Vis alle &beskeder"
-#: DlgEventLog.cpp:346 DlgEventLog.cpp:348
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
msgid "Show messages for all projects"
msgstr "Vis beskeder fra alle projekter."
-#: DlgEventLog.cpp:352 DlgEventLog.cpp:354
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
msgid "Show only the messages for the selected project"
msgstr "Vis kun beskeder for det valgte projekt"
@@ -1692,7 +1703,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "Husk dette valg og vis ikke denne dialogboks fremover."
#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
-#: DlgSelectComputer.cpp:167 wizardex.cpp:378
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
msgid "&Cancel"
msgstr "&Annullér"
@@ -1700,223 +1711,223 @@ msgstr "&Annullér"
msgid "Don't show this dialog again."
msgstr "Vis ikke denne dialogboks igen."
-#: DlgItemProperties.cpp:163 DlgItemProperties.cpp:166
-#: DlgItemProperties.cpp:169 DlgItemProperties.cpp:172
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
msgid "Don't fetch tasks for "
msgstr "Hent ikke opgaver for"
-#: DlgItemProperties.cpp:163
+#: DlgItemProperties.cpp:168
msgid "Project preference"
msgstr "Projektindstilling"
-#: DlgItemProperties.cpp:166
+#: DlgItemProperties.cpp:171
msgid "Account manager preference"
msgstr "Kontohåndteringsindstilling"
-#: DlgItemProperties.cpp:169
+#: DlgItemProperties.cpp:174
msgid "Project has no apps for "
msgstr "Projekt har ingen apps for"
-#: DlgItemProperties.cpp:172
+#: DlgItemProperties.cpp:177
msgid "Client configuration excludes "
msgstr "Klientkonfiguration ekskluderer"
-#: DlgItemProperties.cpp:176
+#: DlgItemProperties.cpp:181
msgid " work fetch deferred for"
msgstr " hentning af arbejde udsat med"
-#: DlgItemProperties.cpp:177
+#: DlgItemProperties.cpp:182
msgid " work fetch deferral interval"
msgstr " udsættelsesinterval for hentning af arbejde"
-#: DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:213
msgid "Properties of project "
msgstr "Egenskaber for projekt"
-#: DlgItemProperties.cpp:212 DlgOptions.cpp:218
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
msgid "General"
msgstr "Generelt"
-#: DlgItemProperties.cpp:213
+#: DlgItemProperties.cpp:218
msgid "Master URL"
msgstr "Hoved-URL"
-#: DlgItemProperties.cpp:214
+#: DlgItemProperties.cpp:219
msgid "User name"
msgstr "Brugernavn"
-#: DlgItemProperties.cpp:215
+#: DlgItemProperties.cpp:220
msgid "Team name"
msgstr "Holdnavn"
-#: DlgItemProperties.cpp:216 ViewProjects.cpp:223
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
msgid "Resource share"
msgstr "Resourcefordeling"
-#: DlgItemProperties.cpp:218
+#: DlgItemProperties.cpp:223
msgid "Scheduler RPC deferred for"
msgstr "Planlægger-RPC udsat med"
-#: DlgItemProperties.cpp:221
+#: DlgItemProperties.cpp:226
msgid "File downloads deferred for"
msgstr "Fildownload udsat med"
-#: DlgItemProperties.cpp:224
+#: DlgItemProperties.cpp:229
msgid "File uploads deferred for"
msgstr "Filupload udsat med"
-#: DlgItemProperties.cpp:227
+#: DlgItemProperties.cpp:232
msgid "Computer ID"
msgstr "Computer-ID"
-#: DlgItemProperties.cpp:229
+#: DlgItemProperties.cpp:234
msgid "Non CPU intensive"
msgstr "Ikke CPU-intensiv"
-#: DlgItemProperties.cpp:229 DlgItemProperties.cpp:231
-#: DlgItemProperties.cpp:232 DlgItemProperties.cpp:234
-#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:246
-#: DlgItemProperties.cpp:249 DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
msgid "yes"
msgstr "ja"
-#: DlgItemProperties.cpp:231
+#: DlgItemProperties.cpp:236
msgid "Suspended via GUI"
msgstr "Suspenderet via GUI"
-#: DlgItemProperties.cpp:231 DlgItemProperties.cpp:232
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
msgid "no"
msgstr "nej"
-#: DlgItemProperties.cpp:232
+#: DlgItemProperties.cpp:237
msgid "Don't request more work"
msgstr "Efterspørg ikke mere arbejde"
-#: DlgItemProperties.cpp:234
+#: DlgItemProperties.cpp:239
msgid "Scheduler call in progress"
msgstr "Planlæggeropslag igang"
-#: DlgItemProperties.cpp:237
+#: DlgItemProperties.cpp:242
msgid "Trickle-up pending"
msgstr "Sivebesked til server afventer"
-#: DlgItemProperties.cpp:240 DlgItemProperties.cpp:242
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
msgid "Host location"
msgstr "Værtssted"
-#: DlgItemProperties.cpp:242
+#: DlgItemProperties.cpp:247
msgid "default"
msgstr "standard"
-#: DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:251
msgid "Added via account manager"
msgstr "Tilføjet via kontohåndtering"
-#: DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:254
msgid "Remove when tasks done"
msgstr "Fjern når opgaver er færdige"
-#: DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:257
msgid "Ended"
msgstr "Afsluttet"
-#: DlgItemProperties.cpp:254
+#: DlgItemProperties.cpp:259
msgid "Credit"
msgstr "Points"
-#: DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:260
msgid "User"
msgstr "Bruger"
-#: DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:267
msgid "Host"
msgstr "Vært"
-#: DlgItemProperties.cpp:271
+#: DlgItemProperties.cpp:276
msgid "Scheduling"
msgstr "Planlægning"
-#: DlgItemProperties.cpp:272
+#: DlgItemProperties.cpp:277
msgid "Scheduling priority"
msgstr "Planlægningsprioritet"
-#: DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:278
msgid "CPU"
msgstr "CPU"
-#: DlgItemProperties.cpp:297
+#: DlgItemProperties.cpp:302
msgid "Duration correction factor"
msgstr "Korrektionsfaktor for varighed"
-#: DlgItemProperties.cpp:311
+#: DlgItemProperties.cpp:316
msgid "Properties of task "
msgstr "Egenskaber for opgave"
-#: DlgItemProperties.cpp:323 ViewWork.cpp:237
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
msgid "Application"
msgstr "Applikation"
-#: DlgItemProperties.cpp:324
-msgid "Workunit name"
-msgstr "Navn på arbejdsenhed"
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
+msgid "Name"
+msgstr "Navn"
-#: DlgItemProperties.cpp:325
+#: DlgItemProperties.cpp:330
msgid "State"
msgstr "Tilstand"
-#: DlgItemProperties.cpp:328
+#: DlgItemProperties.cpp:333
msgid "Received"
msgstr "Modtaget"
-#: DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:336
msgid "Report deadline"
msgstr "Rapporterings-frist"
-#: DlgItemProperties.cpp:333
+#: DlgItemProperties.cpp:338
msgid "Resources"
msgstr "Ressourcer"
-#: DlgItemProperties.cpp:336
+#: DlgItemProperties.cpp:341
msgid "Estimated computation size"
msgstr "Estimeret beregningsstørrelse"
-#: DlgItemProperties.cpp:339
+#: DlgItemProperties.cpp:344
msgid "CPU time at last checkpoint"
msgstr "CPU-tid ved sidste checkpoint"
-#: DlgItemProperties.cpp:340 DlgItemProperties.cpp:355
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
msgid "CPU time"
msgstr "CPU-tid"
-#: DlgItemProperties.cpp:342 DlgItemProperties.cpp:356
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
msgid "Elapsed time"
msgstr "Forløben tid"
-#: DlgItemProperties.cpp:344
+#: DlgItemProperties.cpp:349
msgid "Estimated time remaining"
msgstr "Estimeret resterende tid"
-#: DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:350
msgid "Fraction done"
msgstr "Procentdel færdig"
-#: DlgItemProperties.cpp:346
+#: DlgItemProperties.cpp:351
msgid "Virtual memory size"
msgstr "Størrelse på virtuel hukommelse"
-#: DlgItemProperties.cpp:347
+#: DlgItemProperties.cpp:352
msgid "Working set size"
msgstr "Størrelse på arbejdssæt"
-#: DlgItemProperties.cpp:349
+#: DlgItemProperties.cpp:354
msgid "Directory"
msgstr "Mappe"
-#: DlgItemProperties.cpp:352
+#: DlgItemProperties.cpp:357
msgid "Process ID"
msgstr "Proces-ID"
-#: DlgItemProperties.cpp:426 ViewWork.cpp:1021 sg_TaskPanel.cpp:807
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
msgid "Local: "
msgstr "Lokal:"
@@ -2004,7 +2015,7 @@ msgstr "Lad disse være tomme hvis der ikke er brug for dem"
msgid "User Name:"
msgstr "Brugernavn:"
-#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:151
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
#: ProxyPage.cpp:346 ProxyPage.cpp:366
msgid "Password:"
msgstr "Kodeord:"
@@ -2063,12 +2074,12 @@ msgid ""
msgstr ""
"%s's sprog er ændret. For at dette kan træde i kraft, skal du genstarte %s."
-#: DlgSelectComputer.cpp:90
+#: DlgSelectComputer.cpp:91
#, c-format
msgid "%s - Select Computer"
msgstr "%s - Vælg computer"
-#: DlgSelectComputer.cpp:124
+#: DlgSelectComputer.cpp:125
#, c-format
msgid ""
"Another instance of %s is already running \n"
@@ -2077,7 +2088,7 @@ msgstr ""
"En anden instans af %s kører allerede \n"
"på denne computer. Vælg venligst en klient at overvåge."
-#: DlgSelectComputer.cpp:142
+#: DlgSelectComputer.cpp:143
msgid "Host name:"
msgstr "Værtsnavn:"
@@ -2205,8 +2216,8 @@ msgstr "GEO-600-projekt"
msgid "The home page of the GEO-600 project"
msgstr "Hjemmesiden for GEO-600-projektet"
-#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:220
-#: ViewStatistics.cpp:457
+#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
+#: ViewStatistics.cpp:465
msgid "Team"
msgstr "Hold"
@@ -2270,23 +2281,23 @@ msgstr "Forskning"
msgid "Learn about the projects hosted at World Community Grid"
msgstr "Lær om projekter hos World Community Grid"
-#: MainDocument.cpp:586
+#: MainDocument.cpp:583
msgid "Starting client"
msgstr "Starter klient"
-#: MainDocument.cpp:594
+#: MainDocument.cpp:591
msgid "Connecting to client"
msgstr "Forbinder til klient"
-#: MainDocument.cpp:1183
+#: MainDocument.cpp:1195
msgid "Retrieving system state; please wait..."
msgstr "Henter systemtilstand; vent venligst…"
-#: MainDocument.cpp:1804
+#: MainDocument.cpp:1816
msgid "Missing application"
msgstr "Manglende applikation"
-#: MainDocument.cpp:1805
+#: MainDocument.cpp:1817
msgid ""
"Please download and install the CoRD application from http://cord."
"sourceforge.net"
@@ -2294,184 +2305,184 @@ msgstr ""
"Download og installér venligst CoRD-applikationen fra "
"http://cord.sourceforge.net"
-#: MainDocument.cpp:2420
+#: MainDocument.cpp:2432
msgid "on batteries"
msgstr "på batterier"
-#: MainDocument.cpp:2421
+#: MainDocument.cpp:2433
msgid "computer is in use"
msgstr "computeren er i brug"
-#: MainDocument.cpp:2422
+#: MainDocument.cpp:2434
msgid "user request"
msgstr "brugerforespørgsel"
-#: MainDocument.cpp:2423
+#: MainDocument.cpp:2435
msgid "time of day"
msgstr "tidspunkt på dagen"
-#: MainDocument.cpp:2424
+#: MainDocument.cpp:2436
msgid "CPU benchmarks in progress"
msgstr "kører CPU-ydelsesmåling"
-#: MainDocument.cpp:2425
+#: MainDocument.cpp:2437
msgid "need disk space - check preferences"
msgstr "behøver diskplads - check indstillinger"
-#: MainDocument.cpp:2426
+#: MainDocument.cpp:2438
msgid "computer is not in use"
msgstr "computeren er ikke i brug"
-#: MainDocument.cpp:2427
+#: MainDocument.cpp:2439
msgid "starting up"
msgstr "starter op"
-#: MainDocument.cpp:2428
+#: MainDocument.cpp:2440
msgid "an exclusive app is running"
msgstr "en eksklusiv applikation kører"
-#: MainDocument.cpp:2429
+#: MainDocument.cpp:2441
msgid "CPU is busy"
msgstr "CPU er optaget"
-#: MainDocument.cpp:2430
+#: MainDocument.cpp:2442
msgid "network bandwidth limit exceeded"
msgstr "begrænsning for netværksbåndbredde nået"
-#: MainDocument.cpp:2431
+#: MainDocument.cpp:2443
msgid "requested by operating system"
msgstr "forespurgt af operativsystem"
-#: MainDocument.cpp:2433
+#: MainDocument.cpp:2445
msgid "unknown reason"
msgstr "ukendt begrundelse"
-#: MainDocument.cpp:2455
+#: MainDocument.cpp:2467
msgid "GPU missing, "
msgstr "GPU mangler,"
-#: MainDocument.cpp:2462
+#: MainDocument.cpp:2474
msgid "New"
msgstr "Ny"
-#: MainDocument.cpp:2466
+#: MainDocument.cpp:2478
msgid "Download failed"
msgstr "Download mislykkedes"
-#: MainDocument.cpp:2468
+#: MainDocument.cpp:2480
msgid "Downloading"
msgstr "Downloader"
-#: MainDocument.cpp:2470 MainDocument.cpp:2540
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
msgid " (suspended - "
msgstr "(suspenderet - "
-#: MainDocument.cpp:2478
+#: MainDocument.cpp:2490
msgid "Project suspended by user"
msgstr "Projekt suspenderet af bruger"
-#: MainDocument.cpp:2480
+#: MainDocument.cpp:2492
msgid "Task suspended by user"
msgstr "Opgave suspenderet af bruger"
-#: MainDocument.cpp:2482
+#: MainDocument.cpp:2494
msgid "Suspended - "
msgstr "Suspenderet - "
# 75%
-#: MainDocument.cpp:2488
+#: MainDocument.cpp:2500
msgid "GPU suspended - "
msgstr "GPU suspenderet - "
-#: MainDocument.cpp:2495
+#: MainDocument.cpp:2507
msgid "Waiting for memory"
msgstr "Venter på hukommelse"
-#: MainDocument.cpp:2497
+#: MainDocument.cpp:2509
msgid "Waiting for shared memory"
msgstr "Venter på delt hukommelse"
-#: MainDocument.cpp:2500
+#: MainDocument.cpp:2512
msgid "Running, high priority"
msgstr "Kører, høj prioritet"
-#: MainDocument.cpp:2502 sg_ImageButton.cpp:88
+#: MainDocument.cpp:2514
msgid "Running"
msgstr "Kører"
-#: MainDocument.cpp:2505
+#: MainDocument.cpp:2517
msgid " (non-CPU-intensive)"
msgstr " (ikke CPU-intensiv)"
-#: MainDocument.cpp:2508
+#: MainDocument.cpp:2520
msgid "Waiting to run"
msgstr "Venter på at køre"
-#: MainDocument.cpp:2510 MainDocument.cpp:2516
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
msgid "Ready to start"
msgstr "Klar til at starte"
-#: MainDocument.cpp:2520
+#: MainDocument.cpp:2532
msgid " (Scheduler wait: "
msgstr " (Planlægger venter: "
-#: MainDocument.cpp:2524
+#: MainDocument.cpp:2536
msgid " (Scheduler wait)"
msgstr " (Planlægger venter)"
-#: MainDocument.cpp:2528
+#: MainDocument.cpp:2540
msgid " (Waiting for network access)"
msgstr " (Venter på netværksadgang)"
-#: MainDocument.cpp:2532
+#: MainDocument.cpp:2544
msgid "Computation error"
msgstr "Beregningsfejl"
-#: MainDocument.cpp:2536
+#: MainDocument.cpp:2548
msgid "Upload failed"
msgstr "Upload mislykkedes"
-#: MainDocument.cpp:2538
+#: MainDocument.cpp:2550
msgid "Uploading"
msgstr "Uploader"
-#: MainDocument.cpp:2549
+#: MainDocument.cpp:2561
msgid "Aborted by user"
msgstr "Afbrudt af bruger"
-#: MainDocument.cpp:2552
+#: MainDocument.cpp:2564
msgid "Aborted by project"
msgstr "Afbrudt af projekt"
-#: MainDocument.cpp:2555
+#: MainDocument.cpp:2567
msgid "Aborted: not started by deadline"
msgstr "Afbrudt: ikke startet før frist"
-#: MainDocument.cpp:2558
+#: MainDocument.cpp:2570
msgid "Aborted: disk limit exceeded"
msgstr "Afbrudt: diskbegrænsning overtrådt"
-#: MainDocument.cpp:2561
+#: MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
msgstr "Afbrudt: Køretidsbegrænsning overtrådt"
-#: MainDocument.cpp:2564
+#: MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
msgstr "Afbrudt: hukommelsesbegrænsning overtrådt"
-#: MainDocument.cpp:2567
+#: MainDocument.cpp:2579
msgid "Aborted"
msgstr "Afbrudt"
-#: MainDocument.cpp:2572
+#: MainDocument.cpp:2584
msgid "Acknowledged"
msgstr "Anerkendt"
-#: MainDocument.cpp:2574
+#: MainDocument.cpp:2586
msgid "Ready to report"
msgstr "Klar til rapportering"
-#: MainDocument.cpp:2576
+#: MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
msgstr "Fejl: Ugydig tilstand '%d'"
@@ -2526,75 +2537,57 @@ msgstr "Check dit brugernavn og kodeord, og prøv igen."
msgid "Check the email address and password, and try again."
msgstr "Check emailadresse og kodeord, og prøv igen."
-#: NoticeListCtrl.cpp:63
-msgid "Notice List"
-msgstr "Meddelelsesliste"
-
-#: NoticeListCtrl.cpp:185
-#, c-format
-msgid "%s; received on %s"
-msgstr "%s; modtaget %s"
-
-#: NoticeListCtrl.cpp:187
-#, c-format
-msgid "%s; received from %s; on %s"
-msgstr "%s; modtaget af %s; %s"
-
-#: NoticeListCtrl.cpp:284 ProjectListCtrl.cpp:282
-msgid "Click"
-msgstr "Klik"
-
-#: NoticeListCtrl.cpp:569
+#: NoticeListCtrl.cpp:222
msgid "more..."
msgstr "mere…"
-#: ProjectInfoPage.cpp:451 ProjectInfoPage.cpp:739 ProjectInfoPage.cpp:743
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
msgid "All"
msgstr "Alle"
-#: ProjectInfoPage.cpp:582
+#: ProjectInfoPage.cpp:615
msgid "Choose a project"
msgstr "Vælg et projekt"
-#: ProjectInfoPage.cpp:586
+#: ProjectInfoPage.cpp:619
msgid "To choose a project, click its name or type its URL below."
msgstr ""
"For at vælge et projekt skal du klikke på dets navn eller skrive dets URL "
"herunder."
-#: ProjectInfoPage.cpp:590
+#: ProjectInfoPage.cpp:623
msgid "Categories:"
msgstr "Kategorier:"
-#: ProjectInfoPage.cpp:594 sg_ProjectPanel.cpp:89
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
msgid "Projects:"
msgstr "Projekter:"
-#: ProjectInfoPage.cpp:598
+#: ProjectInfoPage.cpp:631
msgid "Project details"
msgstr "Projektdetaljer"
-#: ProjectInfoPage.cpp:602
+#: ProjectInfoPage.cpp:635
msgid "Research area:"
msgstr "Forskningsområde:"
-#: ProjectInfoPage.cpp:606
+#: ProjectInfoPage.cpp:639
msgid "Organization:"
msgstr "Organisation:"
-#: ProjectInfoPage.cpp:610
+#: ProjectInfoPage.cpp:643
msgid "Web site:"
msgstr "Hjemmeside:"
-#: ProjectInfoPage.cpp:614
+#: ProjectInfoPage.cpp:647
msgid "Supported systems:"
msgstr "Understøttede systemer:"
-#: ProjectInfoPage.cpp:618
+#: ProjectInfoPage.cpp:651
msgid "Project URL:"
msgstr "Projekt URL:"
-#: ProjectInfoPage.cpp:787
+#: ProjectInfoPage.cpp:826
msgid ""
"This project may not have work for your type of computer. Do you want to "
"add it anyway?"
@@ -2602,35 +2595,19 @@ msgstr ""
"Dette projekt har måske ikke arbejde til din type computer. Vil du tilføje "
"det alligevel?"
-#: ProjectInfoPage.cpp:811
+#: ProjectInfoPage.cpp:850
msgid "You already added this project. Please choose a different project."
msgstr "Du har allerede tilføjet dette projekt. Vælg venligst et andet projekt."
-#: ProjectListCtrl.cpp:66
-msgid "Project List"
-msgstr "Projektliste"
-
-#: ProjectListCtrl.cpp:507
-msgid "Nvidia GPU Supported"
-msgstr "Nvidia-GPU understøttet"
-
-#: ProjectListCtrl.cpp:509
-msgid "ATI GPU Supported"
-msgstr "ATI-GPU understøttet"
-
-#: ProjectListCtrl.cpp:511
-msgid "Project Website"
-msgstr "Projekthjemmeside"
-
#: ProjectProcessingPage.cpp:321
msgid "Communicating with project."
msgstr "Kommunikerer med projekt."
-#: ProjectProcessingPage.cpp:507
+#: ProjectProcessingPage.cpp:509
msgid "Required files not found on the server."
msgstr "Nødvendige filer blev ikke fundet på serveren."
-#: ProjectProcessingPage.cpp:510 ProjectProcessingPage.cpp:572
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
msgid "An internal server error has occurred."
msgstr "Der er opstået en intern serverfejl."
@@ -2739,8 +2716,8 @@ msgid "I agree to the terms of use."
msgstr "Jeg er enig i brugsvilkårene."
#: TermsOfUsePage.cpp:237
-msgid "I do not agree with the terms of use."
-msgstr "Jeg er ikke enig i brugsvilkårene."
+msgid "I do not agree to the terms of use."
+msgstr ""
#: UnavailablePage.cpp:183
msgid "Project temporarily unavailable"
@@ -2829,8 +2806,8 @@ msgstr "'%s' indeholder ikke et gyldigt værtsnavn."
msgid "'%s' does not contain a valid path."
msgstr "'%s' indeholder ikke en gyldig sti."
-#: ViewMessages.cpp:84 ViewProjects.cpp:169 ViewStatistics.cpp:1965
-#: ViewTransfers.cpp:159 ViewWork.cpp:182
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
+#: ViewTransfers.cpp:160 ViewWork.cpp:183
msgid "Commands"
msgstr "Kommandoer"
@@ -2874,32 +2851,23 @@ msgstr "Vis alle beskeder"
msgid "Show messages for all projects."
msgstr "Vis beskeder fra alle projekter."
-#: ViewNotices.cpp:60 sg_DlgMessages.cpp:130
-msgid "One or more items failed to load from the Internet."
-msgstr "Hentning af et eller flere elementer fra Internet mislykkedes."
-
-# 88%
-#: ViewNotices.cpp:68 sg_DlgMessages.cpp:138
-msgid "Retry now"
-msgstr "Prøv igen nu"
-
-#: ViewNotices.cpp:91 sg_DlgMessages.cpp:171
+#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
msgid "Fetching notices; please wait..."
msgstr "Henter meddelelser; vent venligst…"
-#: ViewNotices.cpp:97 sg_DlgMessages.cpp:178
+#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
msgid "There are no notices at this time."
msgstr "Der er ingen meddelelser på nuværende tidspunkt."
-#: ViewNotices.cpp:120 sg_BoincSimpleFrame.cpp:756
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
msgid "Notices"
msgstr "Meddelelser"
-#: ViewProjects.cpp:173 sg_ProjectCommandPopup.cpp:61
+#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
msgid "Update"
msgstr "Opdatér"
-#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:62
+#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
@@ -2907,32 +2875,32 @@ msgstr ""
"Rapportér alle færdige opgaver, hent seneste points, indstillinger, og hvis "
"muligt, flere opgaver."
-#: ViewProjects.cpp:180 ViewProjects.cpp:712 ViewWork.cpp:207 ViewWork.cpp:790
-#: sg_BoincSimpleFrame.cpp:737 sg_ProjectCommandPopup.cpp:67
+#: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
+#: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
#: sg_ProjectCommandPopup.cpp:113 sg_TaskCommandPopup.cpp:66
#: sg_TaskCommandPopup.cpp:106
msgid "Suspend"
msgstr "Suspendér"
-#: ViewProjects.cpp:181 ViewProjects.cpp:712 sg_ProjectCommandPopup.cpp:68
+#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
#: sg_ProjectCommandPopup.cpp:114
msgid "Suspend tasks for this project."
msgstr "Suspendér opgaver for dette projekt."
-#: ViewProjects.cpp:187 ViewProjects.cpp:731 sg_ProjectCommandPopup.cpp:73
+#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
#: sg_ProjectCommandPopup.cpp:121
msgid "No new tasks"
msgstr "Ingen nye opgaver"
-#: ViewProjects.cpp:188 sg_ProjectCommandPopup.cpp:74
+#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
msgid "Don't get new tasks for this project."
msgstr "Hent ikke nye opgaver for dette projekt."
-#: ViewProjects.cpp:194 sg_ProjectCommandPopup.cpp:79
+#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
msgid "Reset project"
msgstr "Nulstil projekt"
-#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:80
+#: 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."
@@ -2941,7 +2909,7 @@ msgstr ""
"opgaver. Du kan opdatere projektet først for at rapportere eventuelle "
"færdige opgaver."
-#: ViewProjects.cpp:202 sg_ProjectCommandPopup.cpp:86
+#: 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)."
@@ -2949,165 +2917,163 @@ msgstr ""
"Fjerner dette projekt. Igangværende opgaver vil blive tabt (brug 'Opdatér' "
"først for at rapportere eventuelle færdige opgaver)."
-#: ViewProjects.cpp:208 ViewWork.cpp:221 sg_ProjectCommandPopup.cpp:91
+#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
#: sg_TaskCommandPopup.cpp:78
msgid "Properties"
msgstr "Egenskaber"
-#: ViewProjects.cpp:209 sg_ProjectCommandPopup.cpp:92
+#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
msgid "Show project details."
msgstr "Vis projektdetajler."
-#: ViewProjects.cpp:219 ViewStatistics.cpp:442
+#: ViewProjects.cpp:220 ViewStatistics.cpp:450
msgid "Account"
msgstr "Konto"
-#: ViewProjects.cpp:221
+#: ViewProjects.cpp:222
msgid "Work done"
msgstr "Udført arbejde"
-#: ViewProjects.cpp:222
+#: ViewProjects.cpp:223
msgid "Avg. work done"
msgstr "Gennemsnitligt udført arbejde"
-#: ViewProjects.cpp:224 ViewTransfers.cpp:187 ViewWork.cpp:233
+#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
msgid "Status"
msgstr "Status"
-#: ViewProjects.cpp:249
+#: ViewProjects.cpp:250
msgid "Projects"
msgstr "Projekter"
-#: ViewProjects.cpp:301
+#: ViewProjects.cpp:302
msgid "Updating project..."
msgstr "Opdaterer projekt…"
-#: ViewProjects.cpp:343
+#: ViewProjects.cpp:344
msgid "Resuming project..."
msgstr "Genoptager projekt…"
-#: ViewProjects.cpp:347
+#: ViewProjects.cpp:348
msgid "Suspending project..."
msgstr "Suspenderer projekt…"
-#: ViewProjects.cpp:384
+#: ViewProjects.cpp:385
msgid "Telling project to allow additional task downloads..."
msgstr "Tillader projektet at sende flere opgaver…"
-#: ViewProjects.cpp:388
+#: ViewProjects.cpp:389
msgid "Telling project to not fetch any additional tasks..."
msgstr "Beder projektet om ikke at sende flere opgaver…"
-#: ViewProjects.cpp:424
+#: ViewProjects.cpp:425
msgid "Resetting project..."
msgstr "Nulstiller projekt…"
-#: ViewProjects.cpp:437 sg_ProjectCommandPopup.cpp:214
+#: 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'?"
-#: ViewProjects.cpp:443 sg_ProjectCommandPopup.cpp:220
+#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
msgid "Reset Project"
msgstr "Nulstil projekt"
-#: ViewProjects.cpp:482
+#: ViewProjects.cpp:483
msgid "Removing project..."
msgstr "Fjerner projekt…"
-#: ViewProjects.cpp:495 sg_ProjectCommandPopup.cpp:251
-#: sg_StatImageLoader.cpp:192
+#: 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'?"
-#: ViewProjects.cpp:501 sg_ProjectCommandPopup.cpp:257
-#: sg_StatImageLoader.cpp:138 sg_StatImageLoader.cpp:198
+#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
msgid "Remove Project"
msgstr "Fjern projekt"
-#: ViewProjects.cpp:542 ViewWork.cpp:598
+#: ViewProjects.cpp:543 ViewWork.cpp:599
msgid "Launching browser..."
msgstr "Starter browser…"
-#: ViewProjects.cpp:708 sg_ProjectCommandPopup.cpp:111
+#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
msgid "Resume tasks for this project."
msgstr "Genoptag opgaver for dette projekt."
-#: ViewProjects.cpp:727 sg_ProjectCommandPopup.cpp:118
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
msgid "Allow new tasks"
msgstr "Tillad nye opgaver"
-#: ViewProjects.cpp:727 sg_ProjectCommandPopup.cpp:119
+#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
msgid "Allow fetching new tasks for this project."
msgstr "Tillad hentning af nye opgaver for dette projekt."
-#: ViewProjects.cpp:731 sg_ProjectCommandPopup.cpp:122
+#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
msgid "Don't fetch new tasks for this project."
msgstr "Hent ikke nye opgaver for dette projekt."
-#: ViewProjects.cpp:1048
+#: ViewProjects.cpp:1058
msgid "Requested by user"
msgstr "Forespurgt af bruger"
-#: ViewProjects.cpp:1049
+#: ViewProjects.cpp:1059
msgid "To fetch work"
msgstr "For at hende arbejde"
-#: ViewProjects.cpp:1050
+#: ViewProjects.cpp:1060
msgid "To report completed tasks"
msgstr "For at rapportere færdiggjorte opgaver"
-#: ViewProjects.cpp:1051
+#: ViewProjects.cpp:1061
msgid "To send trickle-up message"
msgstr "For at sende sivebesked til server"
-#: ViewProjects.cpp:1052
+#: ViewProjects.cpp:1062
msgid "Requested by account manager"
msgstr "Forespurgt af kontohåndtering"
-#: ViewProjects.cpp:1053
+#: ViewProjects.cpp:1063
msgid "Project initialization"
msgstr "Projektinitialisering"
-#: ViewProjects.cpp:1054
+#: ViewProjects.cpp:1064
msgid "Requested by project"
msgstr "Forespurgt af projekt"
-#: ViewProjects.cpp:1055
+#: ViewProjects.cpp:1065
msgid "Unknown reason"
msgstr "Ukendt begrundelse"
-#: ViewProjects.cpp:1069
+#: ViewProjects.cpp:1079
msgid "Suspended by user"
msgstr "Suspenderet af bruger"
-#: ViewProjects.cpp:1072
+#: ViewProjects.cpp:1082
msgid "Won't get new tasks"
msgstr "Henter ikke nye opgaver"
-#: ViewProjects.cpp:1075
+#: ViewProjects.cpp:1085
msgid "Project ended - OK to remove"
msgstr "Projektet er slut - det er OK af fjerne"
-#: ViewProjects.cpp:1078
+#: ViewProjects.cpp:1088
msgid "Will remove when tasks done"
msgstr "Fjernes når opgaver er færdige"
-#: ViewProjects.cpp:1081
+#: ViewProjects.cpp:1091
msgid "Scheduler request pending"
msgstr "Planlægger-forespørgsel afventer"
-#: ViewProjects.cpp:1087
+#: ViewProjects.cpp:1097
msgid "Scheduler request in progress"
msgstr "Planlægger-forespørgsel igang"
-#: ViewProjects.cpp:1090
+#: ViewProjects.cpp:1100
msgid "Trickle up message pending"
msgstr "Sivebesked til server afventer"
-#: ViewProjects.cpp:1096
+#: ViewProjects.cpp:1106
msgid "Communication deferred "
msgstr "Kommunikation udsat "
@@ -3147,183 +3113,183 @@ msgstr "fri: "
msgid "used by other programs: "
msgstr "brugt af andre programmer: "
-#: ViewStatistics.cpp:1195
+#: ViewStatistics.cpp:1205
msgid "User Total"
msgstr "Bruger-total"
-#: ViewStatistics.cpp:1196
+#: ViewStatistics.cpp:1206
msgid "User Average"
msgstr "Brugergennemsnit"
-#: ViewStatistics.cpp:1197
+#: ViewStatistics.cpp:1207
msgid "Host Total"
msgstr "Vært-total"
-#: ViewStatistics.cpp:1198
+#: ViewStatistics.cpp:1208
msgid "Host Average"
msgstr "Værtsgennemsnit"
-#: ViewStatistics.cpp:1345
+#: ViewStatistics.cpp:1355
#, c-format
msgid "Last update: %.0f days ago"
msgstr "Seneste opdatering: %.0f dage siden"
-#: ViewStatistics.cpp:1969
+#: ViewStatistics.cpp:1982
msgid "Show user total"
msgstr "Vis bruger-total"
-#: ViewStatistics.cpp:1970
+#: ViewStatistics.cpp:1983
msgid "Show total credit for user"
msgstr "Vis total antal points for bruger"
-#: ViewStatistics.cpp:1976
+#: ViewStatistics.cpp:1989
msgid "Show user average"
msgstr "Vis brugergennemsnit"
-#: ViewStatistics.cpp:1977
+#: ViewStatistics.cpp:1990
msgid "Show average credit for user"
msgstr "Vis løbende gennemsnitspoint for bruger"
-#: ViewStatistics.cpp:1983
+#: ViewStatistics.cpp:1996
msgid "Show host total"
msgstr "Vis vært-total"
-#: ViewStatistics.cpp:1984
+#: ViewStatistics.cpp:1997
msgid "Show total credit for host"
msgstr "Vis total antal points for vært"
-#: ViewStatistics.cpp:1990
+#: ViewStatistics.cpp:2003
msgid "Show host average"
msgstr "Vis værtsgennemsnit"
-#: ViewStatistics.cpp:1991
+#: ViewStatistics.cpp:2004
msgid "Show average credit for host"
msgstr "Vis løbende gennemsnitspoint for vært"
-#: ViewStatistics.cpp:2000
+#: ViewStatistics.cpp:2013
msgid "< &Previous project"
msgstr "< &Forrige projekt"
-#: ViewStatistics.cpp:2001
+#: ViewStatistics.cpp:2014
msgid "Show chart for previous project"
msgstr "Vis graf for det forrige projekt"
-#: ViewStatistics.cpp:2006
+#: ViewStatistics.cpp:2019
msgid "&Next project >"
msgstr "&Næste projekt >"
-#: ViewStatistics.cpp:2007
+#: ViewStatistics.cpp:2020
msgid "Show chart for next project"
msgstr "Vis graf for det næste projekt"
-#: ViewStatistics.cpp:2013 ViewStatistics.cpp:2410
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
msgid "Hide project list"
msgstr "Gem projektliste"
-#: ViewStatistics.cpp:2014 ViewStatistics.cpp:2410
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
msgid "Use entire area for graphs"
msgstr "Brug hele området til grafer"
-#: ViewStatistics.cpp:2019
+#: ViewStatistics.cpp:2032
msgid "Mode view"
msgstr "Tilstandsvisning"
-#: ViewStatistics.cpp:2023
+#: ViewStatistics.cpp:2036
msgid "One project"
msgstr "Et projekt"
-#: ViewStatistics.cpp:2024
+#: ViewStatistics.cpp:2037
msgid "Show one chart with selected project"
msgstr "Vis en graf over valgt projekt"
-#: ViewStatistics.cpp:2030
+#: ViewStatistics.cpp:2043
msgid "All projects (separate)"
msgstr "Alle projekter (separat)"
-#: ViewStatistics.cpp:2031
+#: ViewStatistics.cpp:2044
msgid "Show all projects, one chart per project"
msgstr "Vis alle projekter, en graf for hvert"
-#: ViewStatistics.cpp:2037
+#: ViewStatistics.cpp:2050
msgid "All projects (together)"
msgstr "Alle projekter (sammen)"
-#: ViewStatistics.cpp:2038
+#: ViewStatistics.cpp:2051
msgid "Show one chart with all projects"
msgstr "Vis en graf med alle projekter"
-#: ViewStatistics.cpp:2044
+#: ViewStatistics.cpp:2057
msgid "All projects (sum)"
msgstr "Alle projekter (sum)"
-#: ViewStatistics.cpp:2045
+#: ViewStatistics.cpp:2058
msgid "Show one chart with sum of projects"
msgstr "Vis en graf med sum for alle projekter"
-#: ViewStatistics.cpp:2073
+#: ViewStatistics.cpp:2079
msgid "Statistics"
msgstr "Statistik"
-#: 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
+#: 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 "Opdaterer grafer…"
-#: ViewStatistics.cpp:2414
+#: ViewStatistics.cpp:2420
msgid "Show project list"
msgstr "Vis projektliste"
-#: ViewStatistics.cpp:2414
+#: ViewStatistics.cpp:2420
msgid "Uses smaller area for graphs"
msgstr "Bruger mindre område for grafer"
-#: ViewTransfers.cpp:163
+#: ViewTransfers.cpp:164
msgid "Retry Now"
msgstr "Prøv igen nu"
-#: ViewTransfers.cpp:164
+#: ViewTransfers.cpp:165
msgid "Retry the file transfer now"
msgstr "Prøv filoverførslen nu"
-#: ViewTransfers.cpp:170
+#: ViewTransfers.cpp:171
msgid "Abort Transfer"
msgstr "Afbryd overførsel"
-#: ViewTransfers.cpp:171
+#: ViewTransfers.cpp:172
msgid "Abort this file transfer. You won't get credit for the task."
msgstr "Afbryd denne filoverførsel. Du får ikke points for opgaven."
-#: ViewTransfers.cpp:182
+#: ViewTransfers.cpp:183
msgid "File"
msgstr "Fil"
-#: ViewTransfers.cpp:183 ViewWork.cpp:232
+#: ViewTransfers.cpp:184 ViewWork.cpp:233
msgid "Progress"
msgstr "Udført"
-#: ViewTransfers.cpp:184
+#: ViewTransfers.cpp:185
msgid "Size"
msgstr "Størrelse"
-#: ViewTransfers.cpp:185
+#: ViewTransfers.cpp:186
msgid "Elapsed Time"
msgstr "Forløben tid"
-#: ViewTransfers.cpp:186
+#: ViewTransfers.cpp:187
msgid "Speed"
msgstr "Hastighed"
-#: ViewTransfers.cpp:212
+#: ViewTransfers.cpp:213
msgid "Transfers"
msgstr "Overførsler"
-#: ViewTransfers.cpp:279
+#: ViewTransfers.cpp:280
msgid "Network activity is suspended - "
msgstr "Netværksaktivitet er suspenderet - "
-#: ViewTransfers.cpp:281
+#: ViewTransfers.cpp:282
msgid ""
".\n"
"You can enable it using the Activity menu."
@@ -3331,19 +3297,19 @@ msgstr ""
".\n"
"Du kan slå det til vha. menuen Aktivitet."
-#: ViewTransfers.cpp:284
+#: ViewTransfers.cpp:285
msgid "BOINC"
msgstr "BOINC"
-#: ViewTransfers.cpp:291
+#: ViewTransfers.cpp:292
msgid "Retrying transfer now..."
msgstr "Prøver overførsel igen nu…"
-#: ViewTransfers.cpp:329
+#: ViewTransfers.cpp:330
msgid "Aborting transfer..."
msgstr "Afbryder overførsel…"
-#: ViewTransfers.cpp:342
+#: ViewTransfers.cpp:343
#, c-format
msgid ""
"Are you sure you want to abort this file transfer '%s'?\n"
@@ -3354,119 +3320,115 @@ msgstr ""
"BEMÆRK: Hvis du afbryder en overførsel, vil opgaven\n"
"invalideres, og du vil ikke få points for den."
-#: ViewTransfers.cpp:348
+#: ViewTransfers.cpp:349
msgid "Abort File Transfer"
msgstr "Afbryd filoverførsel"
-#: ViewTransfers.cpp:769
+#: ViewTransfers.cpp:780
msgid "Upload"
msgstr "Upload"
-#: ViewTransfers.cpp:769
+#: ViewTransfers.cpp:780
msgid "Download"
msgstr "Download"
-#: ViewTransfers.cpp:773
+#: ViewTransfers.cpp:784
msgid "retry in "
msgstr "prøv igen om "
-#: ViewTransfers.cpp:775
+#: ViewTransfers.cpp:786
msgid "failed"
msgstr "mislykkedes"
-#: ViewTransfers.cpp:778
+#: ViewTransfers.cpp:789
msgid "suspended"
msgstr "suspenderet"
-#: ViewTransfers.cpp:783
+#: ViewTransfers.cpp:794
msgid "active"
msgstr "aktiv"
-#: ViewTransfers.cpp:785
+#: ViewTransfers.cpp:796
msgid "pending"
msgstr "afventer"
-#: ViewTransfers.cpp:792
+#: ViewTransfers.cpp:803
msgid " (project backoff: "
msgstr " (projekt backoff:"
-#: ViewWork.cpp:186 ViewWork.cpp:766
+#: ViewWork.cpp:187 ViewWork.cpp:777
msgid "Show active tasks"
msgstr "Vis aktive opgaver"
-#: ViewWork.cpp:187 ViewWork.cpp:767
+#: ViewWork.cpp:188 ViewWork.cpp:778
msgid "Show only active tasks."
msgstr "Vis kun aktive opgaver."
-#: ViewWork.cpp:193 sg_TaskCommandPopup.cpp:60 sg_ViewTabPage.cpp:424
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
msgid "Show graphics"
msgstr "Vis grafik"
-#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:61
+#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
msgid "Show application graphics in a window."
msgstr "Viser applikationsgrafik i et vindue."
-#: ViewWork.cpp:200
+#: ViewWork.cpp:201
msgid "Show VM Console"
msgstr "Vis VM-konsol"
-#: ViewWork.cpp:201
+#: ViewWork.cpp:202
msgid "Show VM Console in a window."
msgstr "Vis VM-konsol i et vindue."
-#: ViewWork.cpp:208
+#: ViewWork.cpp:209
msgid "Suspend work for this result."
msgstr "Suspender arbejde for dette resultat."
-#: ViewWork.cpp:214 sg_TaskCommandPopup.cpp:72
+#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
msgid "Abort"
msgstr "Afbryd"
-#: ViewWork.cpp:215
+#: ViewWork.cpp:216
msgid "Abandon work on the result. You will get no credit for it."
msgstr "Opgiv arbejde på resultatet. Du vil ikke få points for det."
-#: ViewWork.cpp:222 sg_TaskCommandPopup.cpp:79
+#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
msgid "Show task details."
msgstr "Vis detaljer for opgave."
-#: ViewWork.cpp:234
+#: ViewWork.cpp:235
msgid "Elapsed"
msgstr "Forløben"
-#: ViewWork.cpp:235
+#: ViewWork.cpp:236
msgid "Remaining (estimated)"
msgstr "Resterende (estimeret)"
-#: ViewWork.cpp:236
+#: ViewWork.cpp:237
msgid "Deadline"
msgstr "Frist"
-#: ViewWork.cpp:238
-msgid "Name"
-msgstr "Navn"
-
-#: ViewWork.cpp:263
+#: ViewWork.cpp:264
msgid "Tasks"
msgstr "Opgaver"
-#: ViewWork.cpp:356
+#: ViewWork.cpp:357
msgid "Resuming task..."
msgstr "Genoptager opgave…"
-#: ViewWork.cpp:359
+#: ViewWork.cpp:360
msgid "Suspending task..."
msgstr "Suspenderer opgave…"
-#: ViewWork.cpp:388
+#: ViewWork.cpp:389
msgid "Showing graphics for task..."
msgstr "Viser grafik for opgave…"
-#: ViewWork.cpp:425
+#: ViewWork.cpp:426
msgid "Showing VM console for task..."
msgstr "Viser VM-konsol for opgave…"
-#: ViewWork.cpp:478
+#: ViewWork.cpp:479
#, c-format
msgid ""
"Are you sure you want to abort this task '%s'?\n"
@@ -3475,33 +3437,33 @@ msgstr ""
"Er du sikker på, at du vil afbryde denne opgave '%s'?\n"
"(Udført: %s, Status: %s)"
-#: ViewWork.cpp:484
+#: ViewWork.cpp:485
#, c-format
msgid "Are you sure you want to abort these %d tasks?"
msgstr "Er du sikker på, at du vil afbryde disse %d opgaver?"
-#: ViewWork.cpp:489 sg_TaskCommandPopup.cpp:256
+#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
msgid "Abort task"
msgstr "Afbryd opgave"
# 75%
-#: ViewWork.cpp:498
+#: ViewWork.cpp:499
msgid "Aborting task..."
msgstr "Afbryder opgave…"
-#: ViewWork.cpp:760
+#: ViewWork.cpp:771
msgid "Show all tasks"
msgstr "Vis alle opgaver"
-#: ViewWork.cpp:761
+#: ViewWork.cpp:772
msgid "Show all tasks."
msgstr "Vis alle opgaver."
-#: ViewWork.cpp:785 sg_TaskCommandPopup.cpp:103
+#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
msgid "Resume work for this task."
msgstr "Genoptag arbejde for denne opgave."
-#: ViewWork.cpp:791 sg_TaskCommandPopup.cpp:107
+#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
msgid "Suspend work for this task."
msgstr "Suspendér arbejde for denne opgave."
@@ -3592,344 +3554,185 @@ msgstr "Tilføj eller ændr dine World Community Grid-projekter"
msgid "Add projects run by other researchers or organizations"
msgstr "Tilføj projekter, der køres af andre forskere og organisationer"
-#: WizardAttach.cpp:635
+#: WizardAttach.cpp:634
msgid "Do you really want to cancel?"
msgstr "Er du sikker på, at du vil annullere?"
-#: WizardAttach.cpp:636
+#: WizardAttach.cpp:635
msgid "Question"
msgstr "Spørgsmål"
-#: sg_BoincSimpleFrame.cpp:136 sg_BoincSimpleGUI.cpp:119
+#: sg_BoincSimpleFrame.cpp:149
msgid "Advanced View...\tCtrl+Shift+A"
msgstr "Avanceret visning…\tCtrl+Shift+A"
-#: sg_BoincSimpleFrame.cpp:137
+#: sg_BoincSimpleFrame.cpp:150
msgid "Display the advanced graphical interface."
msgstr "Vis den avancerede grafiske grænseflade."
-#: sg_BoincSimpleFrame.cpp:144
+#: sg_BoincSimpleFrame.cpp:157
msgid "Skin"
msgstr "Tema"
-#: sg_BoincSimpleFrame.cpp:146
+#: sg_BoincSimpleFrame.cpp:159
msgid "Select the appearance of the user interface."
msgstr "Vælg udseende for brugergrænseflade."
-#: sg_BoincSimpleFrame.cpp:193 sg_BoincSimpleGUI.cpp:147
+#: sg_BoincSimpleFrame.cpp:206
#, c-format
msgid "&%s"
msgstr "&%s"
-#: sg_BoincSimpleFrame.cpp:369
+#: sg_BoincSimpleFrame.cpp:390
msgid "Default"
msgstr "Standard"
-#: sg_BoincSimpleFrame.cpp:739
+#: sg_BoincSimpleFrame.cpp:759
msgid "Suspend Computing"
msgstr "Suspendér beregning"
-#: sg_BoincSimpleFrame.cpp:740
+#: sg_BoincSimpleFrame.cpp:760
msgid "Resume Computing"
msgstr "Genoptag beregning"
-#: sg_BoincSimpleFrame.cpp:757
+#: sg_BoincSimpleFrame.cpp:777
msgid "Open a window to view notices from projects or BOINC"
msgstr "Åbn en vindue, for at se meddelelser fra projekter eller BOINC"
-#: sg_BoincSimpleGUI.cpp:120
-msgid "Display the advanced (accessible) graphical interface."
-msgstr "Vis den avancerede (tilgængelige) grafiske grænseflade."
-
-#: sg_ClientStateIndicator.cpp:288 sg_TaskPanel.cpp:1207
-msgid "Retrieving current status."
-msgstr "Henter nuværende status."
+#: sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Luk"
-#: sg_ClientStateIndicator.cpp:291 sg_TaskPanel.cpp:448
-msgid "You don't have any projects. Please Add a Project."
-msgstr "Du har ingen projekter. Tilføj venligst et projekt."
+#: sg_DlgMessages.cpp:389
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Meddelelser"
-#: sg_ClientStateIndicator.cpp:294 sg_TaskPanel.cpp:1213
-msgid "Downloading work from the server."
-msgstr "Henter arbejde fra serveren."
+#: sg_DlgPreferences.cpp:268
+msgid "This dialog controls preferences for this computer only."
+msgstr "Denne dislogboks styrer kun indstillinger for denne computer."
-#: sg_ClientStateIndicator.cpp:299 sg_TaskPanel.cpp:1218
-msgid "Processing Suspended: Running On Batteries."
-msgstr "Beregning suspenderet: Kører på batterier."
+#: sg_DlgPreferences.cpp:273
+msgid "Click OK to set preferences."
+msgstr "Klik O.k. for at sætte indstillinger."
-#: sg_ClientStateIndicator.cpp:301 sg_TaskPanel.cpp:1220
-msgid "Processing Suspended: User Active."
-msgstr "Beregning suspenderet: Bruger er aktiv."
+#: sg_DlgPreferences.cpp:278
+msgid ""
+"Click Clear to restore web-based settings for all preferences listed below."
+msgstr ""
-#: sg_ClientStateIndicator.cpp:303 sg_TaskPanel.cpp:1222
-msgid "Processing Suspended: User paused processing."
-msgstr "Beregning suspenderet: Bruger satte beregning på pause."
+#: sg_DlgPreferences.cpp:285
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
-#: sg_ClientStateIndicator.cpp:305 sg_TaskPanel.cpp:1224
-msgid "Processing Suspended: Time of Day."
-msgstr "Beregning suspenderet: Tidspunkt på dagen."
+#: sg_DlgPreferences.cpp:313
+msgid "Do work only between:"
+msgstr "Arbejd kun imellem:"
-#: sg_ClientStateIndicator.cpp:307 sg_TaskPanel.cpp:1226
-msgid "Processing Suspended: Benchmarks Running."
-msgstr "Beregning suspenderet: Ydelsesmåling kører."
+#: sg_DlgPreferences.cpp:335
+msgid "Connect to internet only between:"
+msgstr "Forbind kun til Internet imellem:"
-#: sg_ClientStateIndicator.cpp:309 sg_TaskPanel.cpp:1228
-msgid "Processing Suspended."
-msgstr "Beregning suspenderet."
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
+msgid "Use no more than:"
+msgstr "Brug ikke mere end:"
-#: sg_ClientStateIndicator.cpp:313 sg_TaskPanel.cpp:1232
-msgid "Waiting to contact project servers."
-msgstr "Venter på at kontakte projektservere."
+#: sg_DlgPreferences.cpp:370
+msgid "of disk space"
+msgstr "af diskpladsen"
-#: sg_ClientStateIndicator.cpp:317 sg_ClientStateIndicator.cpp:325
-#: sg_TaskPanel.cpp:1236 sg_TaskPanel.cpp:1245
-msgid "Retrieving current status"
-msgstr "Henter nuværende status"
+#: sg_DlgPreferences.cpp:387
+msgid "of the processor"
+msgstr "af processoren"
-#: sg_ClientStateIndicator.cpp:320 sg_TaskPanel.cpp:1240
-msgid "No work available to process"
-msgstr "Intet arbejde tilgængeligt"
+#: sg_DlgPreferences.cpp:391
+msgid "Do work while on battery?"
+msgstr "Udfør arbejde på batterier?"
-#: sg_ClientStateIndicator.cpp:322 sg_TaskPanel.cpp:1242
-msgid "Unable to connect to the core client"
-msgstr "Kan ikke forbinde til kerneklienten"
+#: sg_DlgPreferences.cpp:404
+msgid "Do work after idle for:"
+msgstr "Udfør arbejde efter computeren har været ubrugt i:"
-#: sg_DlgMessages.cpp:164
-msgid "Close"
-msgstr "Luk"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr ""
-#: sg_DlgMessages.cpp:463
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - Meddelelser"
+#: 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 "Til hver en tid"
-#: sg_DlgPreferences.cpp:94
+#: sg_DlgPreferences.cpp:638
msgid "100 MB"
msgstr "100 MB"
-#: sg_DlgPreferences.cpp:95
+#: sg_DlgPreferences.cpp:639
msgid "200 MB"
msgstr "200 MB"
-#: sg_DlgPreferences.cpp:96
+#: sg_DlgPreferences.cpp:640
msgid "500 MB"
msgstr "500 MB"
-#: sg_DlgPreferences.cpp:97
+#: sg_DlgPreferences.cpp:641
msgid "1 GB"
msgstr "1 GB"
-#: sg_DlgPreferences.cpp:98
+#: sg_DlgPreferences.cpp:642
msgid "2 GB"
msgstr "2 GB"
-#: sg_DlgPreferences.cpp:99
+#: sg_DlgPreferences.cpp:643
msgid "5 GB"
msgstr "5 GB"
-#: sg_DlgPreferences.cpp:100
+#: sg_DlgPreferences.cpp:644
msgid "10 GB"
msgstr "10 GB"
-#: sg_DlgPreferences.cpp:101
+#: sg_DlgPreferences.cpp:645
msgid "20 GB"
msgstr "20 GB"
-#: sg_DlgPreferences.cpp:102
+#: sg_DlgPreferences.cpp:646
msgid "50 GB"
msgstr "50 GB"
-#: sg_DlgPreferences.cpp:103
+#: sg_DlgPreferences.cpp:647
msgid "100 GB"
msgstr "100 GB"
-#: 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 "Denne dislogboks styrer kun indstillinger for denne computer."
-
-#: sg_DlgPreferences.cpp:287
-msgid "Click OK to set preferences."
-msgstr "Klik O.k. for at sætte indstillinger."
-
-#: sg_DlgPreferences.cpp:292
-msgid "Click Clear to restore web-based settings."
-msgstr "Klik Nulstil for at genoprette webbaserede indstillinger."
-
-#: sg_DlgPreferences.cpp:299
-msgid "For additional settings, select Computing Preferences in "
-msgstr "For yderligere indstillinger, vælg Beregningsindstillinger i "
-
-#: sg_DlgPreferences.cpp:304
-msgid "the Advanced View."
-msgstr "den avancerede visning."
-
-#: sg_DlgPreferences.cpp:332
-msgid "Do work only between:"
-msgstr "Arbejd kun imellem:"
-
-#: sg_DlgPreferences.cpp:354
-msgid "Connect to internet only between:"
-msgstr "Forbind kun til Internet imellem:"
-
-#: sg_DlgPreferences.cpp:376 sg_DlgPreferences.cpp:393
-msgid "Use no more than:"
-msgstr "Brug ikke mere end:"
-
-#: sg_DlgPreferences.cpp:389
-msgid "of disk space"
-msgstr "af diskpladsen"
-
-#: sg_DlgPreferences.cpp:406
-msgid "of the processor"
-msgstr "af processoren"
-
-#: sg_DlgPreferences.cpp:410
-msgid "Do work while on battery?"
-msgstr "Udfør arbejde på batterier?"
-
-#: sg_DlgPreferences.cpp:423
-msgid "Do work after idle for:"
-msgstr "Udfør arbejde efter computeren har været ubrugt i:"
-
-#: 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 "Til hver en tid"
-
-#: sg_DlgPreferences.cpp:719
+#: sg_DlgPreferences.cpp:717
#, c-format
msgid "%d MB"
msgstr "%d MB"
-#: sg_DlgPreferences.cpp:721
+#: sg_DlgPreferences.cpp:719
#, c-format
msgid "%4.2f GB"
msgstr "%4.2f GB"
-#: sg_DlgPreferences.cpp:762
+#: sg_DlgPreferences.cpp:760
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: sg_DlgPreferences.cpp:798
+#: sg_DlgPreferences.cpp:796
msgid "0 (Run Always)"
msgstr "0 (Kør altid)"
-#: sg_DlgPreferences.cpp:801
+#: sg_DlgPreferences.cpp:799
#, c-format
msgid "%d"
msgstr "%d"
-#: sg_DlgPreferences.cpp:1031
+#: sg_DlgPreferences.cpp:1029
msgid "Do you really want to clear all local preferences?\n"
msgstr "Er du sikker på, at du vil nulstille alle lokale indstillinger?\n"
-#: sg_ImageButton.cpp:90
-msgid "Paused: Other work running"
-msgstr "Pause: Andet arbejde udføres"
-
-#: sg_ImageButton.cpp:92
-msgid "Paused: User initiated. Click 'Resume' to continue"
-msgstr "Pause: Brugerforespørgsel. Klik 'Genoptag' for at fortsætte"
-
-#: sg_ImageButton.cpp:94
-msgid "Paused: User active"
-msgstr "Pause: Brugeren er aktiv"
-
-#: sg_ImageButton.cpp:96
-msgid "Paused: Computer on battery"
-msgstr "Pause: Computeren er på batterier"
-
-#: sg_ImageButton.cpp:98
-msgid "Paused: Time of Day"
-msgstr "Pause: Tidspunkt på dagen"
-
-#: sg_ImageButton.cpp:100
-msgid "Paused: Benchmarks running"
-msgstr "Pause: Ydelsesmåling kører"
-
-#: sg_ImageButton.cpp:102
-msgid "Paused"
-msgstr "Pause"
-
-#: sg_ImageButton.cpp:104
-msgid "Paused: Application start delayed"
-msgstr "Pause: Applikationsstart udskudt"
-
-#: sg_ImageButton.cpp:132
-msgid "Click to show project graphics"
-msgstr "Klik for at vise projekt-grafik"
-
#: sg_ProjectPanel.cpp:72
msgid "Add Project"
msgstr "Tilføj projekt"
@@ -3942,7 +3745,7 @@ msgstr "Synkronisér"
msgid "Work done for this project"
msgstr "Udført arbejde for dette projekt"
-#: sg_ProjectPanel.cpp:77 sg_ProjectsComponent.cpp:123
+#: sg_ProjectPanel.cpp:77
msgid "Synchronize projects with account manager system"
msgstr "Synkronisér projekter med kontohåndteringssystem"
@@ -3961,43 +3764,14 @@ msgstr "Projektkommandoer"
#: sg_ProjectPanel.cpp:267
#, c-format
-msgid "Pop up a menu of websites for project %s"
-msgstr "Vis en menu med hjemmesider for projektet %s"
+msgid "Pop up a menu of web sites for project %s"
+msgstr ""
#: sg_ProjectPanel.cpp:269
#, c-format
msgid "Pop up a menu of commands to apply to project %s"
msgstr "Vis en menu med kommandoer for projektet %s"
-#: sg_ProjectsComponent.cpp:196 sg_ProjectsComponent.cpp:207
-msgid "Open a window to view messages"
-msgstr "Vis et vindue med beskeder"
-
-#: sg_ProjectsComponent.cpp:225
-msgid "Stop all activity"
-msgstr "Stop al aktivitet"
-
-#: sg_ProjectsComponent.cpp:237
-msgid "Resume activity"
-msgstr "Genoptag aktivitet"
-
-#: sg_ProjectsComponent.cpp:254
-msgid "Open a window to set your preferences"
-msgstr "Vis et vindue med dine indstillinger"
-
-#: sg_ProjectsComponent.cpp:271
-msgid "Switch to the BOINC advanced view"
-msgstr "Skift til BOINC's avancerede visning"
-
-#: sg_ProjectsComponent.cpp:298
-msgid "My Projects:"
-msgstr "Mine projekter:"
-
-#: sg_StatImageLoader.cpp:101
-#, c-format
-msgid "%s. Work done by %s: %0.2f"
-msgstr "%s. Arbejde udført af %s: %0.2f"
-
#: sg_TaskCommandPopup.cpp:67
msgid "Suspend this task."
msgstr "Suspendér denne opgave."
@@ -4016,95 +3790,121 @@ msgstr ""
"Er du sikker på, at du vil afbryde denne opgave '%s'?\n"
"(Udført: %.1lf%%, Status: %s)"
-#: sg_TaskPanel.cpp:449
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects. Please Add a Project."
+msgstr "Du har ingen projekter. Tilføj venligst et projekt."
+
+#: sg_TaskPanel.cpp:465
msgid "Not available"
msgstr "Ikke tilgængelig"
-#: sg_TaskPanel.cpp:460
+#: sg_TaskPanel.cpp:476
msgid "Tasks:"
msgstr "Opgaver:"
-#: sg_TaskPanel.cpp:466
+#: sg_TaskPanel.cpp:482
msgid "Select a task to access"
msgstr "Vælg en opgave at tilgå"
-#: sg_TaskPanel.cpp:477
+#: sg_TaskPanel.cpp:493
msgid "From:"
msgstr "Fra:"
-#: sg_TaskPanel.cpp:531
+#: sg_TaskPanel.cpp:547
msgid "This task's progress"
msgstr "Denne opgaves fremgang"
-#: sg_TaskPanel.cpp:549
+#: sg_TaskPanel.cpp:565
msgid "Task Commands"
msgstr "Opgavekommandoer"
-#: sg_TaskPanel.cpp:550
+#: sg_TaskPanel.cpp:566
msgid "Pop up a menu of commands to apply to this task"
msgstr "Vis en menu med kommandoer for denne opgave"
-#: sg_TaskPanel.cpp:685
+#: sg_TaskPanel.cpp:701
#, c-format
#, c-format, c-format
msgid "Application: %s"
msgstr "Applikation: %s"
-#: sg_TaskPanel.cpp:708
+#: sg_TaskPanel.cpp:724
#, c-format
msgid "%.3f%%"
msgstr "%.3f%%"
-#: sg_TaskPanel.cpp:716
+#: sg_TaskPanel.cpp:732
msgid "Application: Not available"
msgstr "Applikation: ikke tilgængelig"
-#: sg_TaskPanel.cpp:816
+#: sg_TaskPanel.cpp:832
msgid "Not Available"
msgstr "Ikke tilgængelig"
-#: sg_TaskPanel.cpp:831
+#: sg_TaskPanel.cpp:847
#, c-format
msgid "Elapsed: %s"
msgstr "Forløbet: %s"
# 84%
-#: sg_TaskPanel.cpp:845
+#: sg_TaskPanel.cpp:861
#, c-format
#, c-format, c-format
msgid "Remaining (estimated): %s"
msgstr "Resterende (estimeret): %s"
-#: sg_TaskPanel.cpp:860
+#: sg_TaskPanel.cpp:876
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: sg_ViewTabPage.cpp:140 sg_ViewTabPage.cpp:280
-#, c-format
-msgid "%.1lf"
-msgstr "%.1lf"
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Henter nuværende status."
-#: sg_ViewTabPage.cpp:409
-#, c-format
-msgid "%d hr %d min %d sec"
-msgstr "%d t %d min %d sek"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Henter arbejde fra serveren."
-#: sg_ViewTabPage.cpp:423
-msgid "Are you sure you want to display graphics on a remote machine?"
-msgstr "Er du sikker på, at du ønsker at vise grafik på en anden maskine?"
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended: Running On Batteries."
+msgstr "Beregning suspenderet: Kører på batterier."
-#: sg_ViewTabPage.cpp:446
-msgid "Application: "
-msgstr "Applikation: "
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended: User Active."
+msgstr "Beregning suspenderet: Bruger er aktiv."
-#: sg_ViewTabPage.cpp:449 sg_ViewTabPage.cpp:453
-msgid "Time Remaining: "
-msgstr "Resterende tid: "
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended: User paused processing."
+msgstr "Beregning suspenderet: Bruger satte beregning på pause."
+
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended: Time of Day."
+msgstr "Beregning suspenderet: Tidspunkt på dagen."
+
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended: Benchmarks Running."
+msgstr "Beregning suspenderet: Ydelsesmåling kører."
+
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Beregning suspenderet."
+
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Venter på at kontakte projektservere."
+
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Henter nuværende status"
+
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Intet arbejde tilgængeligt"
-#: sg_ViewTabPage.cpp:452
-msgid "Elapsed Time: "
-msgstr "Forløben tid: "
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Kan ikke forbinde til kerneklienten"
#: wizardex.cpp:377 wizardex.cpp:553
msgid "&Next >"
@@ -4118,122 +3918,291 @@ msgstr "< &Tilbage"
msgid "&Finish"
msgstr "&Afslut"
-#: mac/MacAccessiblity.cpp:257
-msgid ""
-"for accessibility support, please select advanced from the view menu or type "
-"command shift a"
-msgstr ""
-"for understøttelse af tilgængelighed, vælg venligst avanceret fra Vis-menuen "
-"eller tast command shift a"
+#: mac/Mac_GUI.cpp:110
+msgid "Preferences…"
+msgstr "Indstillinger…"
-#: mac/MacAccessiblity.cpp:302
-msgid "This panel contains graphs showing user totals for projects"
-msgstr "Dette panel indeholder grafer, der viser brugertotaler for projekter"
+#: mac/Mac_GUI.cpp:122
+msgid "Services"
+msgstr "Servicer"
-#: mac/MacAccessiblity.cpp:726
-msgid "list headers"
-msgstr "liste over headers"
+#: mac/Mac_GUI.cpp:144
+#, c-format
+msgid "Hide %s"
+msgstr "Gem %s"
-#: mac/MacAccessiblity.cpp:732
-msgid "list of events"
-msgstr "liste over begivenheder"
+#: mac/Mac_GUI.cpp:158
+msgid "Hide Others"
+msgstr "Gem andre"
-#: mac/MacAccessiblity.cpp:734
-msgid "list of events is empty"
-msgstr "liste over begivenheder er tom"
+#: mac/Mac_GUI.cpp:172
+msgid "Show All"
+msgstr "Vis alle"
-#: mac/MacAccessiblity.cpp:739
+#: mac/Mac_GUI.cpp:186
#, c-format
-msgid "list of %s"
-msgstr "liste over %s"
+msgid "Quit %s"
+msgstr "Afslut %s"
+
+#~ msgid "Account manager website"
+#~ msgstr "Hjemmeside for kontohåndtering"
+
+#~ msgid "Account Manager &URL:"
+#~ msgstr "&URL for kontohåndtering:"
-#: mac/MacAccessiblity.cpp:741
#, c-format
-msgid "list of %s is empty"
-msgstr "liste over %s er tom"
+#~ msgid "%s &website"
+#~ msgstr "%s-&hjemmeside"
+
+#~ msgid "invalid float"
+#~ msgstr "ugyldig float-værdi"
+
+#~ msgid "Workunit name"
+#~ msgstr "Navn på arbejdsenhed"
+
+#~ msgid "Notice List"
+#~ msgstr "Meddelelsesliste"
-#: mac/MacAccessiblity.cpp:843
#, c-format
-msgid "; current sort column %d of %d; descending order; "
-msgstr "; nuværende sorteringskolonne %d af %d; aftagende rækkefølge; "
+#~ msgid "%s; received on %s"
+#~ msgstr "%s; modtaget %s"
-#: mac/MacAccessiblity.cpp:845
#, c-format
-msgid "; current sort column %d of %d; ascending order; "
-msgstr "; nuværende sorteringskolonne %d af %d; tiltagende rækkefølge; "
+#~ msgid "%s; received from %s; on %s"
+#~ msgstr "%s; modtaget af %s; %s"
+
+#~ msgid "Click"
+#~ msgstr "Klik"
+
+#~ msgid "Project List"
+#~ msgstr "Projektliste"
+
+#~ msgid "Nvidia GPU Supported"
+#~ msgstr "Nvidia-GPU understøttet"
+
+#~ msgid "ATI GPU Supported"
+#~ msgstr "ATI-GPU understøttet"
+
+#~ msgid "Project Website"
+#~ msgstr "Projekthjemmeside"
+
+#~ msgid "I do not agree with the terms of use."
+#~ msgstr "Jeg er ikke enig i brugsvilkårene."
+
+#~ msgid "One or more items failed to load from the Internet."
+#~ msgstr "Hentning af et eller flere elementer fra Internet mislykkedes."
+
+# 88%
+#~ msgid "Retry now"
+#~ msgstr "Prøv igen nu"
+
+#~ msgid "Display the advanced (accessible) graphical interface."
+#~ msgstr "Vis den avancerede (tilgængelige) grafiske grænseflade."
+
+#~ 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 "Klik Nulstil for at genoprette webbaserede indstillinger."
+
+#~ msgid "For additional settings, select Computing Preferences in "
+#~ msgstr "For yderligere indstillinger, vælg Beregningsindstillinger i "
+
+#~ msgid "the Advanced View."
+#~ msgstr "den avancerede visning."
+
+#~ msgid "Paused: Other work running"
+#~ msgstr "Pause: Andet arbejde udføres"
+
+#~ msgid "Paused: User initiated. Click 'Resume' to continue"
+#~ msgstr "Pause: Brugerforespørgsel. Klik 'Genoptag' for at fortsætte"
+
+#~ msgid "Paused: User active"
+#~ msgstr "Pause: Brugeren er aktiv"
+
+#~ msgid "Paused: Computer on battery"
+#~ msgstr "Pause: Computeren er på batterier"
+
+#~ msgid "Paused: Time of Day"
+#~ msgstr "Pause: Tidspunkt på dagen"
+
+#~ msgid "Paused: Benchmarks running"
+#~ msgstr "Pause: Ydelsesmåling kører"
+
+#~ msgid "Paused"
+#~ msgstr "Pause"
+
+#~ msgid "Paused: Application start delayed"
+#~ msgstr "Pause: Applikationsstart udskudt"
+
+#~ msgid "Click to show project graphics"
+#~ msgstr "Klik for at vise projekt-grafik"
-#: mac/MacAccessiblity.cpp:848
#, c-format
-msgid "; column %d of %d; "
-msgstr "; kolonne %d af %d; "
+#~ msgid "Pop up a menu of websites for project %s"
+#~ msgstr "Vis en menu med hjemmesider for projektet %s"
-#: mac/MacAccessiblity.cpp:855
-msgid "list is empty"
-msgstr "liste er tom"
+#~ msgid "Open a window to view messages"
+#~ msgstr "Vis et vindue med beskeder"
+
+#~ msgid "Stop all activity"
+#~ msgstr "Stop al aktivitet"
+
+#~ msgid "Resume activity"
+#~ msgstr "Genoptag aktivitet"
+
+#~ msgid "Open a window to set your preferences"
+#~ msgstr "Vis et vindue med dine indstillinger"
+
+#~ msgid "Switch to the BOINC advanced view"
+#~ msgstr "Skift til BOINC's avancerede visning"
+
+#~ msgid "My Projects:"
+#~ msgstr "Mine projekter:"
+
+#, c-format
+#~ msgid "%s. Work done by %s: %0.2f"
+#~ msgstr "%s. Arbejde udført af %s: %0.2f"
-#: mac/MacAccessiblity.cpp:858 mac/MacAccessiblity.cpp:870
#, c-format
-msgid "; row %d; "
-msgstr "; række %d; "
+#~ msgid "%.1lf"
+#~ msgstr "%.1lf"
-#: mac/MacAccessiblity.cpp:862
#, c-format
-msgid "; selected row %d of %d; "
-msgstr "; valgt række %d af %d; "
+#~ msgid "%d hr %d min %d sec"
+#~ msgstr "%d t %d min %d sek"
+
+#~ msgid "Are you sure you want to display graphics on a remote machine?"
+#~ msgstr "Er du sikker på, at du ønsker at vise grafik på en anden maskine?"
+
+#~ msgid "Application: "
+#~ msgstr "Applikation: "
+
+#~ msgid "Time Remaining: "
+#~ msgstr "Resterende tid: "
+
+#~ msgid "Elapsed Time: "
+#~ msgstr "Forløben tid: "
+
+#~ msgid ""
+#~ "for accessibility support, please select advanced from the view menu or type "
+#~ "command shift a"
+#~ msgstr ""
+#~ "for understøttelse af tilgængelighed, vælg venligst avanceret fra Vis-menuen "
+#~ "eller tast command shift a"
+
+#~ msgid "This panel contains graphs showing user totals for projects"
+#~ msgstr "Dette panel indeholder grafer, der viser brugertotaler for projekter"
+
+#~ msgid "list headers"
+#~ msgstr "liste over headers"
+
+#~ msgid "list of events"
+#~ msgstr "liste over begivenheder"
+
+#~ msgid "list of events is empty"
+#~ msgstr "liste over begivenheder er tom"
-#: mac/MacAccessiblity.cpp:864
#, c-format
-msgid "; selected row %d ; "
-msgstr "; valgt række %d ; "
+#~ msgid "list of %s"
+#~ msgstr "liste over %s"
-#: mac/MacAccessiblity.cpp:868
#, c-format
-msgid "; row %d of %d; "
-msgstr "; række %d af %d; "
+#~ msgid "list of %s is empty"
+#~ msgstr "liste over %s er tom"
-#: mac/MacAccessiblity.cpp:881
-msgid "blank"
-msgstr "blank"
+#, c-format
+#~ msgid "; current sort column %d of %d; descending order; "
+#~ msgstr "; nuværende sorteringskolonne %d af %d; aftagende rækkefølge; "
-#: mac/MacAccessiblity.cpp:1523
-msgid "list of projects or account managers"
-msgstr "liste over projekter eller kontohåndteringer"
+#, c-format
+#~ msgid "; current sort column %d of %d; ascending order; "
+#~ msgstr "; nuværende sorteringskolonne %d af %d; tiltagende rækkefølge; "
-#: mac/MacAccessiblity.cpp:1575
#, c-format
-msgid "selected row %d of %d; "
-msgstr "valgt række %d af %d; "
+#~ msgid "; column %d of %d; "
+#~ msgstr "; kolonne %d af %d; "
+
+#~ msgid "list is empty"
+#~ msgstr "liste er tom"
-#: mac/MacAccessiblity.cpp:1577
#, c-format
-msgid "row %d of %d; "
-msgstr "række %d af %d; "
+#~ msgid "; row %d; "
+#~ msgstr "; række %d; "
-#: mac/Mac_GUI.cpp:109
-msgid "Preferences…"
-msgstr "Indstillinger…"
+#, c-format
+#~ msgid "; selected row %d of %d; "
+#~ msgstr "; valgt række %d af %d; "
-#: mac/Mac_GUI.cpp:121
-msgid "Services"
-msgstr "Servicer"
+#, c-format
+#~ msgid "; selected row %d ; "
+#~ msgstr "; valgt række %d ; "
-#: mac/Mac_GUI.cpp:143
#, c-format
-msgid "Hide %s"
-msgstr "Gem %s"
+#~ msgid "; row %d of %d; "
+#~ msgstr "; række %d af %d; "
-#: mac/Mac_GUI.cpp:157
-msgid "Hide Others"
-msgstr "Gem andre"
+#~ msgid "blank"
+#~ msgstr "blank"
-#: mac/Mac_GUI.cpp:171
-msgid "Show All"
-msgstr "Vis alle"
+#~ msgid "list of projects or account managers"
+#~ msgstr "liste over projekter eller kontohåndteringer"
-#: mac/Mac_GUI.cpp:185
#, c-format
-msgid "Quit %s"
-msgstr "Afslut %s"
+#~ msgid "selected row %d of %d; "
+#~ msgstr "valgt række %d af %d; "
+
+#, c-format
+#~ msgid "row %d of %d; "
+#~ msgstr "række %d af %d; "
#~ msgid "The minimum username length for this project is 1. Please enter a different username."
#~ msgstr ""
diff --git a/locale/da/BOINC-Project-Generic.po b/locale/da/BOINC-Project-Generic.po
index 925f102..64aad77 100644
--- a/locale/da/BOINC-Project-Generic.po
+++ b/locale/da/BOINC-Project-Generic.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: 2013-10-29 10:57 PDT\n"
+"POT-Creation-Date: 2014-01-10 00:00 PST\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:252 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:253 ../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:119
+#: ../user/forum_forum.php:71 ../user/sample_index.php:130
msgid "Questions and Answers"
msgstr "Spørgsmål og svar (Q&A)"
-#: ../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
+#: ../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
#: ../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:330 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:331 ../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:127 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../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:127 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../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:329
+#: ../user/server_status.php:314
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: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
+#: ../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
#: ../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:29
+#: ../user/host_app_versions.php:30
msgid "Unknown"
msgstr ""
@@ -697,7 +697,7 @@ msgstr ""
msgid "Average download rate"
msgstr ""
-#: ../inc/host.inc:169 ../user/host_app_versions.php:64
+#: ../inc/host.inc:169 ../user/host_app_versions.php:65
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:356
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
#: ../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:215
-#: ../inc/team.inc:224 ../inc/team.inc:226 ../inc/team.inc:362
-#: ../inc/team.inc:367 ../inc/user.inc:139
+#: ../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
#: ../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: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
+#: ../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
#: ../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:67
+#: ../inc/host.inc:745 ../user/merge_by_name.php:65
msgid "Merge computers by name"
msgstr ""
@@ -914,12 +914,12 @@ msgstr "Indbakke"
msgid "Write"
msgstr "Skriv"
-#: ../inc/pm.inc:33 ../inc/user.inc:377
+#: ../inc/pm.inc:33 ../inc/user.inc:378
msgid "Send private message"
msgstr "Send personlig meddelelse"
#: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
-#: ../user/ffmail_form.php:59 ../user/forum_edit.php:99
+#: ../user/ffmail_form.php:58 ../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:258
+#: ../inc/util.inc:274
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.0+ %2"
+msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
msgstr ""
#: ../inc/prefs.inc:358
@@ -1286,7 +1286,7 @@ msgstr ""
msgid "Primary (default) preferences"
msgstr ""
-#: ../inc/prefs.inc:871 ../user/add_venue.php:43 ../user/add_venue.php:67
+#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
#: ../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:192
+#: ../inc/profile.inc:193
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:196
+#: ../inc/profile.inc:197
msgid "User is banished"
msgstr ""
-#: ../inc/profile.inc:210
+#: ../inc/profile.inc:211
msgid "No profile exists for that user ID."
msgstr ""
-#: ../inc/profile.inc:218 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:313
msgid "Edit your profile"
msgstr ""
-#: ../inc/profile.inc:261
+#: ../inc/profile.inc:262
msgid "Your feedback on this profile"
msgstr ""
-#: ../inc/profile.inc:263
+#: ../inc/profile.inc:264
msgid "Recommend this profile for User of the Day:"
msgstr ""
-#: ../inc/profile.inc:264
+#: ../inc/profile.inc:265
msgid "I %1like%2 this profile"
msgstr ""
-#: ../inc/profile.inc:267
+#: ../inc/profile.inc:268
msgid "Alert administrators to an offensive profile:"
msgstr ""
-#: ../inc/profile.inc:268
+#: ../inc/profile.inc:269
msgid "I %1do not like%2 this profile"
msgstr ""
@@ -1387,7 +1387,7 @@ msgstr ""
msgid "Anonymous platform"
msgstr ""
-#: ../inc/result.inc:53
+#: ../inc/result.inc:53 ../user/host_app_versions.php:26
msgid "NVIDIA GPU"
msgstr ""
@@ -1395,7 +1395,7 @@ msgstr ""
msgid "ATI GPU"
msgstr ""
-#: ../inc/result.inc:57
+#: ../inc/result.inc:57 ../user/host_app_versions.php:28
msgid "Intel GPU"
msgstr ""
@@ -1653,7 +1653,7 @@ msgstr ""
msgid "explain"
msgstr ""
-#: ../inc/result.inc:376 ../user/server_status.php:256
+#: ../inc/result.inc:376 ../user/server_status.php:241
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: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
+#: ../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
#: ../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:454
+#: ../inc/team.inc:49 ../inc/team.inc:453
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:77 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../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:556 ../inc/user.inc:280
-#: ../inc/user.inc:370
+#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
+#: ../inc/user.inc:371
msgid "None"
msgstr "Ingen"
@@ -1812,28 +1812,28 @@ msgstr "Beskrivelse"
msgid "Web site"
msgstr "Website"
-#: ../inc/team.inc:119
+#: ../inc/team.inc:120
#, fuzzy
msgid "Cross-project stats"
msgstr "Cross-project statistik"
-#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
+#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
msgid "Type"
msgstr "Type"
-#: ../inc/team.inc:126 ../user/team_manage.php:63
+#: ../inc/team.inc:127 ../user/team_manage.php:63
msgid "Message board"
msgstr "Forum"
-#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "Emner"
-#: ../inc/team.inc:135
+#: ../inc/team.inc:136
msgid "Join this team"
msgstr "Bliv medlem"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:137
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:139
+#: ../inc/team.inc:140
msgid "Not accepting new members"
msgstr "Accepterer ikke nye medlemmer"
-#: ../inc/team.inc:146
+#: ../inc/team.inc:147
msgid "Foundership change requested"
msgstr ""
-#: ../inc/team.inc:147
+#: ../inc/team.inc:148
msgid "Respond by %1"
msgstr ""
-#: ../inc/team.inc:151
+#: ../inc/team.inc:152
msgid "Team foundership change"
msgstr ""
-#: ../inc/team.inc:155 ../inc/team.inc:358
+#: ../inc/team.inc:156 ../inc/team.inc:359
msgid "Members"
msgstr "Medlemmer"
-#: ../inc/team.inc:156 ../inc/team.inc:253
+#: ../inc/team.inc:157 ../inc/team.inc:254
msgid "Founder"
msgstr "Hold-leder"
-#: ../inc/team.inc:168
+#: ../inc/team.inc:169
msgid "Admins"
msgstr "Admins"
-#: ../inc/team.inc:183
+#: ../inc/team.inc:184
msgid "New members in last day"
msgstr "Nye medlemmer siden igår"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:185
msgid "Total members"
msgstr "Medlemmer ialt"
-#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
+#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
msgid "view"
msgstr "se"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:186
msgid "Active members"
msgstr "Aktive medlemmer"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:187
msgid "Members with credit"
msgstr "Medlemmer med points"
-#: ../inc/team.inc:255
+#: ../inc/team.inc:256
msgid "Admin"
msgstr "Admin"
-#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:277 ../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:280 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:281 ../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:288
+#: ../inc/team.inc:289
msgid "No such team."
msgstr "Holdet findes ikke."
-#: ../inc/team.inc:301
+#: ../inc/team.inc:302
msgid "This operation requires foundership."
msgstr "Denne funktion kræver at du er leder af holdet."
-#: ../inc/team.inc:325
+#: ../inc/team.inc:326
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:429
+#: ../inc/team.inc:428
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:433
+#: ../inc/team.inc:432
msgid "Team name, text version"
msgstr "Hold navn, rentekst-udgave"
-#: ../inc/team.inc:434
+#: ../inc/team.inc:433
msgid "Don't use HTML tags."
msgstr "Brug ikke HTML tags."
-#: ../inc/team.inc:437
+#: ../inc/team.inc:436
msgid "Team name, HTML version"
msgstr "Hold navn, HTML-udgave"
-#: ../inc/team.inc:439 ../inc/team.inc:449
+#: ../inc/team.inc:438 ../inc/team.inc:448
msgid "You may use %1limited HTML tags%2."
msgstr "Du kan bruge %1nogle HTML tags%2."
-#: ../inc/team.inc:440
+#: ../inc/team.inc:439
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:443
+#: ../inc/team.inc:442
msgid "URL of team web page, if any"
msgstr "Holdets hjemmeside-URL, hvis den findes"
-#: ../inc/team.inc:443
+#: ../inc/team.inc:442
msgid "without \"http://\""
msgstr "uden \"http://\""
-#: ../inc/team.inc:444
+#: ../inc/team.inc:443
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:447
+#: ../inc/team.inc:446
msgid "Description of team"
msgstr "Beskrivelse af holdet"
-#: ../inc/team.inc:463
+#: ../inc/team.inc:462
msgid "Accept new members?"
msgstr ""
-#: ../inc/uotd.inc:27
+#: ../inc/uotd.inc:28
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:242 ../inc/user.inc:328 ../inc/user.inc:401
+#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
#: ../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:280 ../inc/user.inc:368
-#: ../inc/user.inc:370 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
+#: ../inc/user.inc:371 ../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:48
+#: ../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 "Emailaddresse"
-#: ../inc/user.inc:203 ../inc/user.inc:321
+#: ../inc/user.inc:203 ../inc/user.inc:322
msgid "URL"
msgstr "URL"
@@ -2062,7 +2062,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "Postboks (områdenummer)"
-#: ../inc/user.inc:207 ../inc/user.inc:315
+#: ../inc/user.inc:207 ../inc/user.inc:316
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:314
+#: ../inc/user.inc:213 ../inc/user.inc:315
msgid "User ID"
msgstr "Bruger ID"
@@ -2119,184 +2119,180 @@ msgstr "Forum-indstillinger"
msgid "Preferences for this project"
msgstr ""
-#: ../inc/user.inc:233 ../user/prefs.php:32
+#: ../inc/user.inc:233 ../user/prefs.php:29
msgid "%1 preferences"
msgstr "%1-indstillinger"
#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:114
+#: ../user/sample_index.php:125
msgid "Community"
msgstr ""
-#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "Slet"
-#: ../inc/user.inc:244
+#: ../inc/user.inc:245
msgid "Create"
msgstr "Opret"
-#: ../inc/user.inc:246 ../inc/user.inc:401 ../inc/util.inc:498
+#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
msgid "Profile"
msgstr "Profil"
-#: ../inc/user.inc:249 ../inc/user.inc:374
+#: ../inc/user.inc:250 ../inc/user.inc:375
msgid "%1 posts"
msgstr "%1 indlæg"
-#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "Notificering"
-#: ../inc/user.inc:268
+#: ../inc/user.inc:269
msgid "Quit team"
msgstr "Forlad holdet"
-#: ../inc/user.inc:270 ../inc/user.inc:287
+#: ../inc/user.inc:271 ../inc/user.inc:288
msgid "Administer"
msgstr "Administrer"
-#: ../inc/user.inc:276 ../inc/user.inc:289
+#: ../inc/user.inc:277 ../inc/user.inc:290
msgid "(foundership change request pending)"
msgstr ""
-#: ../inc/user.inc:278
+#: ../inc/user.inc:279
msgid "Member of team"
msgstr "Medlem af hold"
-#: ../inc/user.inc:280
+#: ../inc/user.inc:281
msgid "find a team"
msgstr "find et hold"
-#: ../inc/user.inc:291
+#: ../inc/user.inc:292
msgid "Founder but not member of"
msgstr "Leder men ikke medlem af"
-#: ../inc/user.inc:297
+#: ../inc/user.inc:298
msgid "Find friends"
msgstr "Find venner"
-#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
-#: ../inc/user.inc:386 ../inc/user.inc:395
+#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
+#: ../inc/user.inc:387 ../inc/user.inc:396
msgid "Friends"
msgstr "Venner"
-#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
+#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
msgid "Computers"
msgstr "Computere"
-#: ../inc/user.inc:337
+#: ../inc/user.inc:338
msgid "Donor"
msgstr "Donor"
-#: ../inc/user.inc:377
+#: ../inc/user.inc:378
msgid "Contact"
msgstr "Kontakt"
-#: ../inc/user.inc:380
+#: ../inc/user.inc:381
msgid "This person is a friend"
msgstr "Denne person er en ven"
-#: ../inc/user.inc:381 ../user/friend.php:238
+#: ../inc/user.inc:382 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "Afbryd venskab"
-#: ../inc/user.inc:384 ../user/friend.php:37
+#: ../inc/user.inc:385 ../user/friend.php:37
msgid "Request pending"
msgstr "Forespørgsel igang"
-#: ../inc/user.inc:386
+#: ../inc/user.inc:387
msgid "Add as friend"
msgstr "Tilføj som ven"
-#: ../inc/user.inc:445
+#: ../inc/user.inc:446
msgid "user name cannot have leading or trailing white space"
msgstr ""
-#: ../inc/user.inc:449
+#: ../inc/user.inc:450
msgid "user name must be nonempty"
msgstr ""
-#: ../inc/user.inc:453
+#: ../inc/user.inc:454
msgid "user name may not contain HTML tags"
msgstr ""
-#: ../inc/util.inc:116
+#: ../inc/util.inc:131
#, fuzzy
msgid "log out"
msgstr "Log ud"
-#: ../inc/util.inc:118
+#: ../inc/util.inc:133
msgid "log in"
msgstr ""
-#: ../inc/util.inc:188 ../user/login_form.php:30 ../user/login_form.php:55
+#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
msgid "Log in"
msgstr ""
-#: ../inc/util.inc:189 ../user/create_account_form.php:31
+#: ../inc/util.inc:205 ../user/create_account_form.php:40
msgid "Create an account"
msgstr "Opret en konto"
-#: ../inc/util.inc:190
+#: ../inc/util.inc:206
msgid "Server status page"
msgstr ""
-#: ../inc/util.inc:232
+#: ../inc/util.inc:248
msgid ""
"A database error occurred while handling your request; please try again "
"later."
msgstr ""
-#: ../inc/util.inc:241
+#: ../inc/util.inc:257
msgid "Unable to handle request"
msgstr ""
-#: ../inc/util.inc:261
+#: ../inc/util.inc:277
msgid "hours"
msgstr ""
-#: ../inc/util.inc:264
+#: ../inc/util.inc:280
msgid "min"
msgstr ""
-#: ../inc/util.inc:267
+#: ../inc/util.inc:283
msgid "sec"
msgstr ""
-#: ../inc/util.inc:428
+#: ../inc/util.inc:444
msgid "Link has timed out. Please click Back, refresh the page, and try again."
msgstr ""
-#: ../inc/util.inc:497
+#: ../inc/util.inc:513
msgid "View the profile of %1"
msgstr ""
-#: ../inc/util.inc:553
+#: ../inc/util.inc:569
msgid "Use BBCode tags to format your text"
msgstr "Du kan bruge BBCode-tags til at formatere din tekst"
-#: ../inc/util.inc:780
+#: ../inc/util.inc:796
msgid "Project down for maintenance"
msgstr ""
-#: ../inc/util.inc:783
+#: ../inc/util.inc:799
msgid "%1 is temporarily shut down for maintenance. Please try again later."
msgstr ""
-#: ../inc/util.inc:801
+#: ../inc/util.inc:817
msgid "Unable to connect to database - please try again later"
msgstr ""
-#: ../inc/util.inc:802
-msgid "Error:"
-msgstr ""
-
-#: ../inc/util.inc:806
+#: ../inc/util.inc:821
msgid "Unable to select database - please try again later"
msgstr ""
-#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr ""
@@ -2304,21 +2300,21 @@ msgstr ""
msgid "Finish account setup"
msgstr ""
-#: ../user/account_finish.php:41 ../user/create_account_form.php:80
+#: ../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 ""
"Identificerer dig på vores website. Brug dit rigtige navn eller et "
"dæknavn."
-#: ../user/account_finish.php:45 ../user/create_account_form.php:99
+#: ../user/account_finish.php:45 ../user/create_account_form.php:98
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:105
+#: ../user/account_finish.php:51 ../user/create_account_form.php:104
msgid "Postal or ZIP Code"
msgstr "Postbox (områdenummer)"
-#: ../user/account_finish.php:51 ../user/create_account_form.php:105
+#: ../user/account_finish.php:51 ../user/create_account_form.php:104
msgid "Optional"
msgstr "Ikke påkrævet"
@@ -2331,12 +2327,12 @@ msgstr "Du skal angive en invitationskode for at oprette en konto."
msgid "HTML tags not allowed in name"
msgstr ""
-#: ../user/add_venue.php:85
+#: ../user/add_venue.php:81
msgid "Add %1 preferences for %2"
msgstr ""
#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:109
+#: ../user/sample_index.php:120
msgid "Applications"
msgstr "Applikationer"
@@ -2496,17 +2492,17 @@ msgstr "Hold"
msgid "create or join a team"
msgstr ""
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:180
+#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
#, fuzzy
msgid "User of the day"
msgstr "Dagens Bruger"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
msgid "Server status"
msgstr ""
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:35
-#: ../user/sample_index.php:116
+#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
+#: ../user/sample_index.php:127
msgid "Profiles"
msgstr "Profiler"
@@ -2543,7 +2539,7 @@ msgid "Languages"
msgstr ""
#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:74
+#: ../user/sample_index.php:79
msgid "Read our rules and policies"
msgstr "Læs vores regler og politik"
@@ -2556,69 +2552,52 @@ msgstr "Opret brugerkonto"
msgid "Click your browser's <b>Back</b> button to try again."
msgstr ""
-#: ../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
+#: ../user/create_account_action.php:47
msgid "Your reCAPTCHA response was not correct. Please try again."
msgstr ""
-#: ../user/create_account_action.php:77
+#: ../user/create_account_action.php:70
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:80
+#: ../user/create_account_action.php:73
msgid "The invitation code you gave is not valid."
msgstr "Den invitationskode du angav var ikke korrekt."
-#: ../user/create_account_action.php:91
+#: ../user/create_account_action.php:84
#, 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:95
+#: ../user/create_account_action.php:88
msgid "There's already an account with that email address."
msgstr ""
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
msgid "New passwords are different"
msgstr ""
-#: ../user/create_account_action.php:108 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
msgid "Passwords may only include ASCII characters."
msgstr ""
-#: ../user/create_account_action.php:113 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
msgid "New password is too short: minimum password length is %1 characters."
msgstr ""
-#: ../user/create_account_action.php:134
+#: ../user/create_account_action.php:127
#, fuzzy
msgid "Couldn't create account"
msgstr "Opret brugerkonto"
-#: ../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
+#: ../user/create_account_form.php:44
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:62
+#: ../user/create_account_form.php:61
msgid ""
"This account will belong to the team %1 and will have the project "
"preferences of its founder."
@@ -2626,39 +2605,39 @@ msgstr ""
"Denne brugerkonto vil blive tilmeldt holder '%1' og vil få tildelt "
"projekt-indstillingers fra dette holds leder."
-#: ../user/create_account_form.php:74
+#: ../user/create_account_form.php:73
msgid "Invitation Code"
msgstr "Invitationskode"
-#: ../user/create_account_form.php:74
+#: ../user/create_account_form.php:73
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:84
+#: ../user/create_account_form.php:83
msgid "Email Address"
msgstr "Emailaddresse"
-#: ../user/create_account_form.php:84
+#: ../user/create_account_form.php:83
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:93 ../user/edit_email_form.php:49
+#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
msgid "Password"
msgstr "Password"
-#: ../user/create_account_form.php:94
+#: ../user/create_account_form.php:93
msgid "Must be at least %1 characters"
msgstr "Skal være på mindst %1 bogstaver"
-#: ../user/create_account_form.php:97
+#: ../user/create_account_form.php:96
msgid "Confirm password"
msgstr "Bekræft password"
-#: ../user/create_account_form.php:114
+#: ../user/create_account_form.php:113
msgid "Please enter the words shown in the image"
msgstr ""
-#: ../user/create_account_form.php:120
+#: ../user/create_account_form.php:119
msgid "Create account"
msgstr "Opret brugerkonto"
@@ -2808,7 +2787,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:55 ../user/user_search.php:59
+#: ../user/prefs_remove.php:52 ../user/user_search.php:59
#: ../user/user_search.php:64
msgid "Yes"
msgstr ""
@@ -3024,26 +3003,26 @@ msgstr ""
"Der er midlertidigt lukket for oprettelse af nye brugerkonto, men "
"prøv igen senere."
-#: ../user/edit_email_form.php:29 ../user/edit_email_form.php:53
+#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
msgid "Change email address"
msgstr ""
-#: ../user/edit_email_form.php:38
+#: ../user/edit_email_form.php:36
#, fuzzy
msgid "Change the email address of your account"
msgstr "emailaddresse"
-#: ../user/edit_email_form.php:39
+#: ../user/edit_email_form.php:37
#, fuzzy
msgid "New email address"
msgstr "emailaddresse"
-#: ../user/edit_email_form.php:40
+#: ../user/edit_email_form.php:38
#, 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:50
+#: ../user/edit_email_form.php:48
msgid "No password?"
msgstr ""
@@ -3265,8 +3244,8 @@ msgstr ""
msgid "Invalid password"
msgstr "Bekræft password"
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:28
-#: ../user/edit_passwd_form.php:58
+#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:55
msgid "Change password"
msgstr ""
@@ -3284,36 +3263,36 @@ msgstr ""
"Der er midlertidigt lukket for oprettelse af nye brugerkonto, men "
"prøv igen senere."
-#: ../user/edit_passwd_form.php:42
+#: ../user/edit_passwd_form.php:39
msgid "You can identify yourself using either"
msgstr ""
-#: ../user/edit_passwd_form.php:44
+#: ../user/edit_passwd_form.php:41
msgid "your email address and old password"
msgstr ""
-#: ../user/edit_passwd_form.php:45
+#: ../user/edit_passwd_form.php:42
#, fuzzy
msgid "your account key"
msgstr "Svag kontonøgle"
-#: ../user/edit_passwd_form.php:49
+#: ../user/edit_passwd_form.php:46
msgid "Current password"
msgstr ""
-#: ../user/edit_passwd_form.php:51
+#: ../user/edit_passwd_form.php:48
msgid "<b>OR</b>: Account key"
msgstr ""
-#: ../user/edit_passwd_form.php:52
+#: ../user/edit_passwd_form.php:49
msgid "Get account key by email"
msgstr ""
-#: ../user/edit_passwd_form.php:56
+#: ../user/edit_passwd_form.php:53
msgid "New password"
msgstr ""
-#: ../user/edit_passwd_form.php:57
+#: ../user/edit_passwd_form.php:54
msgid "New password, again"
msgstr ""
@@ -3330,24 +3309,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:29
+#: ../user/edit_user_info_form.php:27
#, fuzzy
msgid "Edit account information"
msgstr "Konto-information"
-#: ../user/edit_user_info_form.php:34
+#: ../user/edit_user_info_form.php:32
msgid "Name %1 real name or nickname%2"
msgstr ""
-#: ../user/edit_user_info_form.php:37
+#: ../user/edit_user_info_form.php:35
msgid "URL %1 of your web page; optional%2"
msgstr ""
-#: ../user/edit_user_info_form.php:45
+#: ../user/edit_user_info_form.php:43
msgid "Postal (ZIP) code %1 Optional%2"
msgstr ""
-#: ../user/edit_user_info_form.php:49
+#: ../user/edit_user_info_form.php:47
msgid "Update info"
msgstr ""
@@ -3548,51 +3527,51 @@ msgid ""
"1return to the form%2 and enter them."
msgstr ""
-#: ../user/ffmail_form.php:31
+#: ../user/ffmail_form.php:30
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:34
+#: ../user/ffmail_form.php:33
msgid "Tell your friends about %1"
msgstr ""
-#: ../user/ffmail_form.php:38
+#: ../user/ffmail_form.php:37
msgid "Help us by telling your friends, family and coworkers about %1"
msgstr ""
-#: ../user/ffmail_form.php:40
+#: ../user/ffmail_form.php:39
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:43
+#: ../user/ffmail_form.php:42
msgid "Your name:"
msgstr ""
-#: ../user/ffmail_form.php:43
+#: ../user/ffmail_form.php:42
#, fuzzy
msgid "Your email address:"
msgstr "emailaddresse"
-#: ../user/ffmail_form.php:49
+#: ../user/ffmail_form.php:48
#, fuzzy
msgid "Friend's name:"
msgstr "Venner"
-#: ../user/ffmail_form.php:49
+#: ../user/ffmail_form.php:48
#, fuzzy
msgid "Friend's email address:"
msgstr "emailaddresse"
-#: ../user/ffmail_form.php:57
+#: ../user/ffmail_form.php:56
msgid "Additional message (optional)"
msgstr ""
-#: ../user/ffmail_form.php:60
+#: ../user/ffmail_form.php:59
#, fuzzy
msgid "Send"
msgstr "Afsender"
@@ -4636,53 +4615,49 @@ msgstr ""
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr ""
-#: ../user/host_app_versions.php:26
-msgid "nvidia GPU"
-msgstr ""
-
-#: ../user/host_app_versions.php:36
+#: ../user/host_app_versions.php:37
msgid "Anonymous platform, missing app"
msgstr ""
-#: ../user/host_app_versions.php:39
+#: ../user/host_app_versions.php:40
msgid "anonymous platform"
msgstr ""
-#: ../user/host_app_versions.php:42
+#: ../user/host_app_versions.php:43
msgid "Missing app version"
msgstr ""
-#: ../user/host_app_versions.php:44
+#: ../user/host_app_versions.php:45
msgid "Missing app"
msgstr ""
-#: ../user/host_app_versions.php:46
+#: ../user/host_app_versions.php:47
msgid "Missing platform"
msgstr ""
-#: ../user/host_app_versions.php:55
+#: ../user/host_app_versions.php:56
msgid "Number of tasks completed"
msgstr ""
-#: ../user/host_app_versions.php:56
+#: ../user/host_app_versions.php:57
msgid "Max tasks per day"
msgstr ""
-#: ../user/host_app_versions.php:57
+#: ../user/host_app_versions.php:58
#, fuzzy
msgid "Number of tasks today"
msgstr "Dagens Bruger"
-#: ../user/host_app_versions.php:58
+#: ../user/host_app_versions.php:59
msgid "Consecutive valid tasks"
msgstr ""
-#: ../user/host_app_versions.php:62
+#: ../user/host_app_versions.php:63
#, fuzzy
msgid "Average processing rate"
msgstr "Løbende gennemsnit"
-#: ../user/host_app_versions.php:71
+#: ../user/host_app_versions.php:72
#, fuzzy
msgid "Application details for host %1"
msgstr "Applikationer"
@@ -5086,37 +5061,37 @@ msgstr "Emailaddresse"
msgid "forgot email address?"
msgstr ""
-#: ../user/login_form.php:47
+#: ../user/login_form.php:48
#, fuzzy
msgid "Password:"
msgstr "Password"
-#: ../user/login_form.php:47
+#: ../user/login_form.php:48
msgid "forgot password?"
msgstr ""
-#: ../user/login_form.php:50
+#: ../user/login_form.php:51
msgid "Stay logged in"
msgstr ""
-#: ../user/login_form.php:56
+#: ../user/login_form.php:62
msgid "or %1create an account%2."
msgstr ""
-#: ../user/merge_by_name.php:33
+#: ../user/merge_by_name.php:31
msgid "Processing %1"
msgstr ""
-#: ../user/merge_by_name.php:45
+#: ../user/merge_by_name.php:43
msgid "Merged %1 into %2"
msgstr ""
-#: ../user/merge_by_name.php:74
+#: ../user/merge_by_name.php:72
#, 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:78
+#: ../user/merge_by_name.php:76
msgid ""
"This operation merges computers based on their domain name.\n"
" <p>\n"
@@ -5126,11 +5101,11 @@ msgid ""
" <p>"
msgstr ""
-#: ../user/merge_by_name.php:84
+#: ../user/merge_by_name.php:82
msgid "Go ahead and do this"
msgstr ""
-#: ../user/merge_by_name.php:85
+#: ../user/merge_by_name.php:83
#, fuzzy
msgid "Return to the list of computers"
msgstr "Kør kun %1 på computere hvor du har lov til det"
@@ -5345,14 +5320,14 @@ msgstr "For at genåbne adgangen, besø %1forum-indstillingerne%2"
msgid "Unknown action"
msgstr ""
-#: ../user/prefs.php:35
+#: ../user/prefs.php:32
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:44
+#: ../user/prefs.php:41
msgid ""
"Your preferences have been reset to the defaults, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5367,24 +5342,24 @@ msgstr ""
msgid "Back to preferences"
msgstr ""
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:45
msgid "Confirm delete preferences"
msgstr ""
-#: ../user/prefs_remove.php:51
+#: ../user/prefs_remove.php:48
msgid "Are you sure you want to delete your separate %1 preferences for %2?"
msgstr ""
-#: ../user/prefs_remove.php:55
+#: ../user/prefs_remove.php:52
#, fuzzy
msgid "Remove preferences"
msgstr "%1-indstillinger"
-#: ../user/prefs_remove.php:57
+#: ../user/prefs_remove.php:54
msgid "Cancel"
msgstr ""
-#: ../user/profile_menu.php:38
+#: ../user/profile_menu.php:35
msgid ""
"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
"community."
@@ -5392,7 +5367,7 @@ msgstr ""
"%1Profiler%2 lader brugere dele deres baggrund og synspunkter med andre %"
"3-brugere."
-#: ../user/profile_menu.php:39
+#: ../user/profile_menu.php:36
msgid ""
"Explore the diversity of your fellow volunteers, and contribute your own "
"views for others to enjoy."
@@ -5400,7 +5375,7 @@ msgstr ""
"Udforsk mangfoldigheden blandt de andre deltagere - og bidrag med dine egne "
"synspunkter og holdninger"
-#: ../user/profile_menu.php:40
+#: ../user/profile_menu.php:37
msgid ""
"If you haven't already, you can %1create your own user profile%2 for others "
"to see!"
@@ -5408,23 +5383,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:45
+#: ../user/profile_menu.php:42
msgid "User of the Day"
msgstr "Dagens Bruger"
-#: ../user/profile_menu.php:58
+#: ../user/profile_menu.php:57
msgid "User Profile Explorer"
msgstr "Bruger-profil Visning"
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:60
msgid "View the %1User Picture Gallery%2."
msgstr "Se %1Brugernes Billedgalleri%2."
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:61
msgid "Browse profiles %1by country%2."
msgstr "Gennemse profiler sortered %1efter land%2."
-#: ../user/profile_menu.php:63
+#: ../user/profile_menu.php:62
msgid ""
"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
"without pictures%2."
@@ -5432,19 +5407,19 @@ msgstr ""
"Gennemse profiler %1tilfældigt%2, %3tilfældigt med billeder%2, "
"or %4tilfældigt uden billeder%2."
-#: ../user/profile_menu.php:67
+#: ../user/profile_menu.php:66
msgid "Alphabetical profile listings:"
msgstr "Alfabetisk profilliste:"
-#: ../user/profile_menu.php:73
+#: ../user/profile_menu.php:72
msgid "Search profile text"
msgstr "Søg i profil-teksten"
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:98
msgid "No profiles"
msgstr "Ingen profiler"
-#: ../user/profile_menu.php:100
+#: ../user/profile_menu.php:99
msgid "No profiles matched your query."
msgstr "Ingen profiler passede med din søgning."
@@ -5530,136 +5505,136 @@ msgstr ""
msgid "Disabled"
msgstr ""
-#: ../user/server_status.php:246
+#: ../user/server_status.php:231
msgid "Project status"
msgstr ""
-#: ../user/server_status.php:248
+#: ../user/server_status.php:233
msgid "Server software version: %1"
msgstr ""
-#: ../user/server_status.php:256
+#: ../user/server_status.php:241
msgid "Program"
msgstr ""
-#: ../user/server_status.php:256
+#: ../user/server_status.php:241
msgid "Host"
msgstr ""
-#: ../user/server_status.php:267
+#: ../user/server_status.php:252
msgid "data-driven web pages"
msgstr ""
-#: ../user/server_status.php:273
+#: ../user/server_status.php:258
msgid "upload/download server"
msgstr ""
-#: ../user/server_status.php:276
+#: ../user/server_status.php:261
msgid "scheduler"
msgstr ""
-#: ../user/server_status.php:309
+#: ../user/server_status.php:294
msgid "Running:"
msgstr ""
-#: ../user/server_status.php:310
+#: ../user/server_status.php:295
msgid "Program is operating normally"
msgstr ""
-#: ../user/server_status.php:311
+#: ../user/server_status.php:296
msgid "Not Running:"
msgstr ""
-#: ../user/server_status.php:312
+#: ../user/server_status.php:297
msgid "Program failed or the project is down"
msgstr ""
-#: ../user/server_status.php:313
+#: ../user/server_status.php:298
msgid "Disabled:"
msgstr ""
-#: ../user/server_status.php:314
+#: ../user/server_status.php:299
msgid "Program is disabled"
msgstr ""
-#: ../user/server_status.php:318
+#: ../user/server_status.php:303
msgid "Computing status"
msgstr ""
-#: ../user/server_status.php:324
+#: ../user/server_status.php:309
msgid "The database server is not accessible"
msgstr ""
-#: ../user/server_status.php:341
+#: ../user/server_status.php:326
msgid "Tasks ready to send"
msgstr ""
-#: ../user/server_status.php:346 ../user/workunit.php:55
+#: ../user/server_status.php:331 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr ""
-#: ../user/server_status.php:351
+#: ../user/server_status.php:336
msgid "Workunits waiting for validation"
msgstr ""
-#: ../user/server_status.php:356
+#: ../user/server_status.php:341
msgid "Workunits waiting for assimilation"
msgstr ""
-#: ../user/server_status.php:361
+#: ../user/server_status.php:346
msgid "Workunits waiting for file deletion"
msgstr ""
-#: ../user/server_status.php:366
+#: ../user/server_status.php:351
msgid "Tasks waiting for file deletion"
msgstr ""
-#: ../user/server_status.php:383
+#: ../user/server_status.php:367
msgid "Transitioner backlog (hours)"
msgstr ""
-#: ../user/server_status.php:390
+#: ../user/server_status.php:374
msgid "Users"
msgstr ""
-#: ../user/server_status.php:393 ../user/server_status.php:411
+#: ../user/server_status.php:377 ../user/server_status.php:395
msgid "with recent credit"
msgstr ""
-#: ../user/server_status.php:398 ../user/server_status.php:416
+#: ../user/server_status.php:382 ../user/server_status.php:400
msgid "with credit"
msgstr ""
-#: ../user/server_status.php:403 ../user/server_status.php:421
+#: ../user/server_status.php:387 ../user/server_status.php:405
msgid "registered in past 24 hours"
msgstr ""
-#: ../user/server_status.php:427
+#: ../user/server_status.php:411
msgid "current GigaFLOPs"
msgstr ""
-#: ../user/server_status.php:436
+#: ../user/server_status.php:420
msgid "Tasks by application"
msgstr ""
-#: ../user/server_status.php:439 ../user/workunit.php:40
+#: ../user/server_status.php:423 ../user/workunit.php:40
#, fuzzy
msgid "application"
msgstr "Applikationer"
-#: ../user/server_status.php:440
+#: ../user/server_status.php:424
msgid "unsent"
msgstr ""
-#: ../user/server_status.php:441
+#: ../user/server_status.php:425
msgid "in progress"
msgstr ""
-#: ../user/server_status.php:442
+#: ../user/server_status.php:426
msgid "avg runtime of last 100 results in h (min-max)"
msgstr ""
-#: ../user/server_status.php:443
+#: ../user/server_status.php:427
msgid "users in last 24h"
msgstr ""
@@ -5839,7 +5814,7 @@ msgid "Couldn't add admin"
msgstr ""
#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:28
+#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
#, fuzzy
msgid "No such team"
msgstr "Holdet findes ikke."
@@ -5910,6 +5885,10 @@ 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 ""
@@ -6195,7 +6174,7 @@ msgid ""
msgstr ""
#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:31
+#: ../user/team_join_form.php:29
msgid "The team %1 is not joinable."
msgstr ""
@@ -6219,23 +6198,23 @@ msgstr ""
msgid "You have joined %1."
msgstr ""
-#: ../user/team_join_form.php:34
+#: ../user/team_join_form.php:32
msgid "Join %1"
msgstr ""
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:33
msgid "Please note:"
msgstr ""
-#: ../user/team_join_form.php:37
+#: ../user/team_join_form.php:35
msgid "Joining a team gives its founder access to your email address."
msgstr ""
-#: ../user/team_join_form.php:38
+#: ../user/team_join_form.php:36
msgid "Joining a team does not affect your account's credit."
msgstr ""
-#: ../user/team_join_form.php:45
+#: ../user/team_join_form.php:43
msgid "Join team"
msgstr ""
@@ -6371,19 +6350,19 @@ msgstr ""
msgid "Members of %1"
msgstr ""
-#: ../user/team_quit_action.php:34
+#: ../user/team_quit_action.php:32
msgid "Unable to quit team"
msgstr ""
-#: ../user/team_quit_action.php:35
+#: ../user/team_quit_action.php:33
msgid "Team doesn't exist, or you don't belong to it."
msgstr ""
-#: ../user/team_quit_form.php:33
+#: ../user/team_quit_form.php:31
msgid "Quit %1"
msgstr ""
-#: ../user/team_quit_form.php:34
+#: ../user/team_quit_form.php:32
msgid ""
"<strong>Please note before quitting a team:</strong>\n"
" <ul>\n"
@@ -6394,7 +6373,7 @@ msgid ""
" </ul>"
msgstr ""
-#: ../user/team_quit_form.php:42
+#: ../user/team_quit_form.php:40
#, fuzzy
msgid "Quit Team"
msgstr "Forlad holdet"
@@ -6784,6 +6763,14 @@ 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/locale/da/BOINC-Setup.po b/locale/da/BOINC-Setup.po
index 46b447a..a3a3fce 100644
--- a/locale/da/BOINC-Setup.po
+++ b/locale/da/BOINC-Setup.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-15 22:27-0700\n"
+"POT-Creation-Date: 2014-01-26 00:00-0800\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"
@@ -22,24 +22,24 @@ msgstr ""
"X-POOTLE-MTIME: 1381176195.0\n"
"X-Poedit-KeywordsList: _\n"
-#: Installer.cpp:132
+#: Installer.cpp:124
#, c-format
-msgid "Sorry, this version of %s requires system 10.4 or higher."
-msgstr "Beklager, denne version af %s kræver system 10.4 eller højere."
+msgid "Sorry, this version of %s requires system 10.5 or higher."
+msgstr ""
-#: PostInstall.cpp:131 PostInstall.cpp:1211
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
msgid "Yes"
msgstr "Ja"
-#: PostInstall.cpp:132 PostInstall.cpp:1212
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
msgid "No"
msgstr "Nej"
-#: PostInstall.cpp:134
+#: PostInstall.cpp:133
msgid "Should BOINC run even when no user is logged in?"
msgstr "Skal BOINC køre, selvom ingen bruger er logget ind?"
-#: PostInstall.cpp:1491
+#: PostInstall.cpp:1416
#, c-format
msgid ""
"Users who are permitted to administer this computer will automatically be "
@@ -54,20 +54,20 @@ msgstr ""
"Vil du også tillade ikke-administrative brugere at køre og styre %s på denne "
"Mac?"
-#: PostInstall.cpp:1519
+#: PostInstall.cpp:1444
#, c-format
msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
msgstr "Vil du sætte %s som pauseskærm for alle %s-brugere på denne Mac?"
-#: uninstall.cpp:80
+#: uninstall.cpp:82
msgid "OK"
msgstr "O.k."
-#: uninstall.cpp:130
+#: uninstall.cpp:136
msgid "Permission error after relaunch"
msgstr "Fejl ved rettigheder efter genstart"
-#: uninstall.cpp:135
+#: uninstall.cpp:141
msgid ""
"Removal may take several minutes.\n"
"Please be patient."
@@ -75,7 +75,7 @@ msgstr ""
"Fjernelse kan tage adskillige minutter.\n"
"Vær venligst tålmodig."
-#: uninstall.cpp:150
+#: uninstall.cpp:156
#, c-format
msgid ""
"Are you sure you want to completely remove %s from your computer?\n"
@@ -86,21 +86,27 @@ msgstr ""
"\n"
"Dette vil fjerne de programfilerne men vil ikke røre ved %s datafiler."
-#: uninstall.cpp:157
+#: uninstall.cpp:163
#, c-format
msgid "Canceled: %s has not been touched."
msgstr "Annulleret: %s er ikke ændret."
-#: uninstall.cpp:168
+#: uninstall.cpp:174
#, c-format
msgid "An error occurred: error code %d"
msgstr "En fejl opstod: fejlkode %d"
-#: uninstall.cpp:224
+#: uninstall.cpp:230
msgid "name of user"
msgstr "navn på bruger"
-#: uninstall.cpp:261
+#: uninstall.cpp:272
+msgid ""
+"Do you also want to remove VirtualBox from your computer?\n"
+"(VirtualBox was installed along with BOINC.)"
+msgstr ""
+
+#: uninstall.cpp:312
#, c-format
msgid ""
"Removal completed.\n"
@@ -119,7 +125,7 @@ msgstr ""
"for hver bruger, filen\n"
"\"%s\"."
-#: uninstall.cpp:796
+#: uninstall.cpp:840
#, c-format
msgid ""
"Enter your administrator password to completely remove %s from you "
@@ -130,10 +136,14 @@ msgstr ""
"computer.\n"
"\n"
-#: uninstall.cpp:1555
+#: uninstall.cpp:1616
msgid "Cancel"
msgstr "Annuller"
-#: uninstall.cpp:1556
+#: uninstall.cpp:1617
msgid "Continue..."
msgstr "Fortsæt..."
+
+#, c-format
+#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
+#~ msgstr "Beklager, denne version af %s kræver system 10.4 eller højere."
diff --git a/locale/da/BOINC-Web.po b/locale/da/BOINC-Web.po
index 3cdbdbe..0b20737 100644
--- a/locale/da/BOINC-Web.po
+++ b/locale/da/BOINC-Web.po
@@ -6,7 +6,7 @@ msgid ""
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: 2013-10-29 11:10 PDT\n"
+"POT-Creation-Date: 2014-02-01 00:00 PST\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"
@@ -36,33 +36,53 @@ msgstr "Tilbage til BOINC-hovedsiden"
msgid "This page is %stranslatable%s."
msgstr "Denne side kan %soversættes%s."
-#: download.php:44
-msgid "Download BOINC + Virtualbox"
-msgstr "Download BOINC + Virtualbox"
+#: download.php:39
+msgid ""
+"We recommend that you also install VirtualBox, so your computer can work on "
+"science projects that require it."
+msgstr ""
+
+#: download.php:41
+msgid "Learn more about VirtualBox."
+msgstr ""
+
+#: download.php:51
+msgid "Download BOINC + VirtualBox"
+msgstr ""
+
+#: download.php:54 download.php:69
+#, php-format
+msgid "for %s"
+msgstr ""
+
+#: download.php:57 download.php:72
+#, php-format
+msgid "BOINC version %s"
+msgstr ""
-#: download.php:46 download.php:56
+#: download.php:59
#, php-format
-msgid "%s for %s (%s MB)"
-msgstr "%s til %s (%s MB)"
+msgid "VirtualBox version %s"
+msgstr ""
-#: download.php:54
+#: download.php:67
msgid "Download BOINC"
msgstr "Download BOINC"
-#: download.php:107
+#: download.php:123
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."
+"Community Grid, and many others."
+msgstr ""
+
+#: download.php:125
+msgid ""
+"After installing BOINC on your computer, you can connect it to as many of "
+"these projects as you like."
msgstr ""
-"BOINC er et program, der lader dig donere din overskydende computertid til "
-"videnskabelige projekter, så som SETI at home, Climateprediction.net, "
-"Rosetta at home, Rosld Community Grid og mange andre. <p> Efter at have "
-"installeret BOINC på din computer, kan du forbinde den til så mange af disse "
-"projekter, du har lyst til."
-#: download.php:109
+#: 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."
@@ -70,31 +90,37 @@ msgstr ""
"Du må kun køre denne software på en computer, hvis du ejer computeren eller "
"har ejerens tilladelse til det."
-#: download.php:151
+#: download.php:132
+msgid ""
+"We recommend that you download BOINC from the Google Play Store or Amazon "
+"Appstore, not from here."
+msgstr ""
+
+#: download.php:167
msgid "System requirements"
msgstr "Systemkrav"
-#: download.php:152
+#: download.php:168
msgid "Release notes"
msgstr "Udgivelsesnoter"
-#: download.php:153 index.php:86
+#: download.php:169 index.php:86
msgid "Help"
msgstr "Hjælp"
-#: download.php:154
+#: download.php:170
msgid "All versions"
msgstr "Alle versioner"
-#: download.php:155
+#: download.php:171
msgid "Version history"
msgstr "Versionshistorik"
-#: download.php:156
+#: download.php:172
msgid "GPU computing"
msgstr "GPU-beregning"
-#: download.php:174
+#: download.php:190
msgid "BOINC: compute for science"
msgstr "BOINC: beregn for videnskaben"
@@ -425,16 +451,16 @@ msgstr ""
msgid "Cognitive science and artifical intelligence"
msgstr "Kognitiv videnskab og kunstig Intelligens"
-#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
-#: projects.inc:442 projects.inc:489
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
msgid "Private"
msgstr "Privat"
-#: projects.inc:51
+#: projects.inc:61
msgid "Artificial intelligence"
msgstr "Kunstig Intelligens"
-#: projects.inc:52
+#: projects.inc:62
msgid ""
"Parse and convert semantic nets for use in FreeHAL, an artificial "
"intelligence that uses semantic networks, stemmers, part of speech "
@@ -445,19 +471,19 @@ msgstr ""
"intelligens, der bruger semantiske netværk, stemmers, dele af taledatabaser "
"og dele af taletaggers for at imitere menneskelig opførsel i konversationer."
-#: projects.inc:58
+#: projects.inc:69
msgid "Biology and Medicine"
msgstr "Biologi og medicin"
-#: projects.inc:71
+#: projects.inc:82
msgid "University College Dublin"
msgstr "University College Dublin"
-#: projects.inc:72
+#: projects.inc:83
msgid "Antimalarial drug discovery"
msgstr "Antimateriel medicinopdagelse"
-#: projects.inc:73
+#: projects.inc:84
msgid ""
"The parasite that causes malaria continues to evolve resistance to available "
"medication. We therefore urgently need to discover new drugs to replace "
@@ -471,15 +497,15 @@ msgstr ""
"er målrettet mod NYE proteiner i parasitten. FightMalaria at Home-projektet er "
"rettet mod at finde disse nye mål."
-#: projects.inc:79
+#: projects.inc:90
msgid "University of Karlsruhe (Germany)"
msgstr "Karlsruhe Universitet (Tyskland)"
-#: projects.inc:80
+#: projects.inc:91
msgid "Protein structure prediction"
msgstr "Forudsigelse af proteinstruktur"
-#: projects.inc:81
+#: projects.inc:92
msgid ""
"POEM at HOME uses a computational approach to predict the biologically active "
"structure of proteins, to understand the signal-processing mechanisms when "
@@ -493,15 +519,15 @@ msgstr ""
"proteinfejl og aggregering, og for at udvikle nye medikamenter baseret på "
"biologisk vigtige proteiners basale tredimentionelle struktur."
-#: projects.inc:87
+#: projects.inc:98
msgid "University of Delaware"
msgstr "Delaware Universitet"
-#: projects.inc:88
+#: projects.inc:99
msgid "Study of protein - ligand interactions"
msgstr ""
-#: projects.inc:89
+#: projects.inc:100
msgid ""
"Docking at Home has both bioscience and computer science goals. The project "
"aims to further knowledge of the atomic details of protein-ligand "
@@ -509,15 +535,15 @@ msgid ""
"of novel pharmaceuticals."
msgstr ""
-#: projects.inc:103
+#: projects.inc:114
msgid "Barcelona Biomedical Research Park (PRBB)"
msgstr "Barcelona Biomedicinsk Forskningspark (PRBB)"
-#: projects.inc:104
+#: projects.inc:115
msgid "Molecular simulations of proteins"
msgstr "Molekylære simuleringer af proteiner"
-#: projects.inc:105
+#: projects.inc:116
msgid ""
"GPUGrid.net opens novel computational scenarios by the first full-atom "
"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
@@ -525,31 +551,31 @@ msgid ""
"computational biology for biomedical research."
msgstr ""
-#: projects.inc:111
+#: projects.inc:122
msgid "Technion, Israel"
msgstr "Technion, Israel"
-#: projects.inc:112
+#: projects.inc:123
msgid "Genetic linkage analysis"
msgstr ""
-#: projects.inc:113
+#: projects.inc:124
msgid ""
"Superlink at Technion helps geneticists all over the world find disease-"
"provoking genes causing some types of diabetes, hypertension (high blood "
"pressure), cancer, schizophrenia and many others."
msgstr ""
-#: projects.inc:127
+#: projects.inc:138
msgid ""
"University of Maryland Center for Bioinformatics and Computational Biology"
msgstr ""
-#: projects.inc:128
+#: projects.inc:139
msgid "Life science research"
msgstr ""
-#: projects.inc:129
+#: projects.inc:140
msgid ""
"The Lattice Project supplies computing power to scientists at the University "
"of Maryland studying evolutionary relationships based on DNA sequence data; "
@@ -557,15 +583,15 @@ msgid ""
"nature reserves. "
msgstr ""
-#: projects.inc:135
+#: projects.inc:146
msgid "The Swiss Tropical Institute"
msgstr ""
-#: projects.inc:136
+#: projects.inc:147
msgid "Epidemiology"
msgstr ""
-#: projects.inc:137
+#: projects.inc:148
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 "
@@ -576,15 +602,15 @@ msgid ""
"social factors that influence the distribution of the disease. "
msgstr ""
-#: projects.inc:159
+#: projects.inc:170
msgid "University of Washington"
msgstr "Washington Universitet"
-#: projects.inc:160 projects.inc:168
+#: projects.inc:171 projects.inc:179
msgid "Biology"
msgstr "Biologi"
-#: projects.inc:161
+#: projects.inc:172
msgid ""
"Determine the 3-dimensional shapes of proteins in research that may "
"ultimately lead to finding cures for some major human diseases. By running "
@@ -594,30 +620,30 @@ msgid ""
"Cancer, and Alzheimer's"
msgstr ""
-#: projects.inc:167
+#: projects.inc:178
msgid "University of Vienna"
msgstr "Wien Universitet"
-#: projects.inc:169
+#: projects.inc:180
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 ""
-#: projects.inc:175
+#: projects.inc:186
msgid "Earth Sciences"
msgstr ""
-#: projects.inc:187
+#: projects.inc:198
msgid "Oxford University"
msgstr "Oxford Universitet"
-#: projects.inc:188
+#: projects.inc:199
msgid "Climate study"
msgstr "Klimastudier"
-#: projects.inc:189
+#: projects.inc:200
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 "
@@ -629,15 +655,25 @@ msgid ""
"century under a wide range of different scenarios."
msgstr ""
-#: projects.inc:196
-msgid "Astronomy, Physics, and Chemistry"
-msgstr "Astronomi, fysik og kemi"
+#: 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 ""
-#: projects.inc:202 projects.inc:241 projects.inc:249
+#: projects.inc:224 projects.inc:263 projects.inc:271
msgid "Astronomy"
msgstr "Astronomi"
-#: projects.inc:203
+#: projects.inc:225
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 "
@@ -647,15 +683,15 @@ msgid ""
"energy distribution (SED) fitting techniques in a distributed computing mode."
msgstr ""
-#: projects.inc:225
+#: projects.inc:247
msgid "University of Texas at Austin"
msgstr ""
-#: projects.inc:226 projects.inc:257
+#: projects.inc:248 projects.inc:279
msgid "Chemistry"
msgstr "Kemi"
-#: projects.inc:227
+#: projects.inc:249
msgid ""
"A common problem in theoretical chemistry, condensed matter physics and "
"materials science is the calculation of the time evolution of an atomic "
@@ -668,11 +704,11 @@ msgid ""
"interested in calculating the long time dynamics of systems."
msgstr ""
-#: projects.inc:240
+#: projects.inc:262
msgid "University of Illinois at Urbana-Champaign"
msgstr ""
-#: projects.inc:242
+#: projects.inc:264
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 "
@@ -682,11 +718,11 @@ msgstr ""
"vores univers, og at finde den mængde modeller, som passer sammen med den "
"eksisterende atronomiske data for partikelfysik."
-#: projects.inc:248
+#: projects.inc:270
msgid "Rensselaer Polytechnic Institute"
msgstr "Rensselaer polyteknisk institut"
-#: projects.inc:250
+#: projects.inc:272
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 "
@@ -696,11 +732,11 @@ msgstr ""
"vores galakse, Mælkevejen, ved hjælp af data, der er samlet af the Sloan "
"Digital Sky Survey."
-#: projects.inc:256
+#: projects.inc:278
msgid "Leiden University, The Netherlands"
msgstr "Leiden Universitet, Holland"
-#: projects.inc:258
+#: projects.inc:280
msgid ""
"Surface science calculations using Classical Dynamics. Leiden Classical "
"allows volunteers, students and other scientist to submit their personal "
@@ -710,15 +746,15 @@ msgid ""
"simulations through the grid."
msgstr ""
-#: projects.inc:272
+#: projects.inc:294
msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
msgstr "Wisconsin Universitet - Milwaukee, Max Planck Instituttet"
-#: projects.inc:273
+#: projects.inc:295
msgid "Astrophysics"
msgstr "Astrofysik"
-#: projects.inc:274
+#: projects.inc:296
msgid ""
"Search for spinning neutron stars (also called pulsars) using data from the "
"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
@@ -732,15 +768,15 @@ msgstr ""
"Physics 2005, støttet af the American Physical Society (APS) og af et antal "
"internationelle organisationer."
-#: projects.inc:288 projects.inc:296
+#: projects.inc:310 projects.inc:318
msgid "CERN (European Organization for Nuclear Research)"
msgstr "CERN (den europæiske organisation for kerneforskning)"
-#: projects.inc:289 projects.inc:297
+#: projects.inc:311 projects.inc:319
msgid "Physics"
msgstr "Fysik"
-#: projects.inc:290
+#: projects.inc:312
msgid ""
"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
"European Organization for Nuclear Research, the world's largest particle "
@@ -754,7 +790,7 @@ msgstr ""
"for at udforske partiklernes egenskaber. LHC at home kører simuleringer for at "
"forbedre LHC's design og dens detektorer."
-#: projects.inc:298
+#: projects.inc:320
msgid ""
"This project uses CERN-developed virtual machine technology for full-fledged "
"LHC event physics simulation on volunteer computers. Requires that you "
@@ -764,15 +800,15 @@ msgstr ""
"simulering af fysikken bag LHC-begivenheder på frivillige computere. Kræver "
"at du installerer VirtualBox på din computer"
-#: projects.inc:304
+#: projects.inc:326
msgid "University of California, Berkeley"
msgstr "University of California, Berkeley"
-#: projects.inc:305
+#: projects.inc:327
msgid "Astrophysics, astrobiology"
msgstr "Astrofysik, astrobiologi"
-#: projects.inc:306
+#: projects.inc:328
msgid ""
"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
"goal is to detect intelligent life outside Earth. One approach, known as "
@@ -787,15 +823,15 @@ msgstr ""
"naturligt, så sådan en opdagelse ville give bevis for udenjordisk "
"teknologi."
-#: projects.inc:320
+#: projects.inc:342
msgid "Bielefeld University of Applied Sciences"
msgstr "Bielefeld University of Applied Sciences"
-#: projects.inc:321
+#: projects.inc:343
msgid "Chemical engineering and nanotechnology"
msgstr ""
-#: projects.inc:322
+#: projects.inc:344
msgid ""
"The study of molecular magnets and controlled nanoscale magnetism. These "
"magnetic molecules may be used to develop tiny magnetic switches, with "
@@ -807,19 +843,19 @@ msgstr ""
"bittesmå magnetiske kontakter til brug indenfor medicin (fx lokal "
"tumorkemoterapi) og bioteknologi."
-#: projects.inc:329
+#: projects.inc:351
msgid "Multiple applications"
msgstr "Adskillige anvendelser"
-#: projects.inc:334
+#: projects.inc:356
msgid "Chinese Academy of Sciences"
msgstr "Det kinesiske videnskabsakademi"
-#: projects.inc:335
+#: projects.inc:357
msgid "Physics, biochemistry, and others"
msgstr "Fysik, biokemi og andre"
-#: projects.inc:336
+#: projects.inc:358
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 "
@@ -829,11 +865,11 @@ msgstr ""
"at adoptere teknologierne for frivillig beregning og den frivillige "
"tankegang for deres forskning."
-#: projects.inc:343
+#: projects.inc:365
msgid "Mathematics, physics, evolution"
msgstr "Matematik, fysik, evolution"
-#: projects.inc:344
+#: projects.inc:366
msgid ""
"Yoyo at home is an adapter between BOINC and several existing volunteer "
"computing projects: ECM, Muon, Evolution at home, and distributed.net"
@@ -841,16 +877,16 @@ msgstr ""
"Yoyo at home er et mellemled mellem BOINC og adskillige eksisterende frivillige "
"beregningsprojekter: ECM, Muon, Evolution at home og distributed.net"
-#: projects.inc:349 projects.inc:505
+#: projects.inc:371 projects.inc:527
msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
msgstr ""
"MTA-SZTAKI laboratorium for parallelle og distribuerede systemer (Ungarn)"
-#: projects.inc:350
+#: projects.inc:372
msgid "European research projects"
msgstr "Europæiske forskningsprojekter"
-#: projects.inc:351
+#: projects.inc:373
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 "
@@ -858,27 +894,27 @@ msgid ""
"by the project include math, physics, biology, etc."
msgstr ""
-#: projects.inc:357
+#: projects.inc:379
msgid "Spanish universities and research centers"
msgstr "Spanske universiteter og forskningscentre"
-#: projects.inc:358
+#: projects.inc:380
msgid "Various Spanish research projects"
msgstr "Diverse spanske forskningsprojekter"
-#: projects.inc:359
+#: projects.inc:381
msgid "Research in physics, material science, and biomedicine"
msgstr "Forskning i fysik, materialevidenskab og biomedicin"
-#: projects.inc:365
+#: projects.inc:387
msgid "IBM Corporate Citizenship"
msgstr ""
-#: projects.inc:366
+#: projects.inc:388
msgid "Medical, environmental and other humanitarian research"
msgstr "Medicinsk, miljømæssig og anden humanitær forskning"
-#: projects.inc:367
+#: projects.inc:389
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 "
@@ -886,27 +922,27 @@ msgid ""
"clean water and many more."
msgstr ""
-#: projects.inc:373
+#: projects.inc:395
msgid "Mathematics, computing, and games"
msgstr "Matematik, beregning og spil"
-#: projects.inc:379
+#: projects.inc:401
msgid "Computer Science"
msgstr "Datalogi"
-#: projects.inc:387
+#: projects.inc:409
msgid "Mathematics, Physics, Artificial Intelligence"
msgstr "Matematik, fysik, kunstig intelligens"
-#: projects.inc:388
+#: projects.inc:410
msgid "Simulation of quantum computing; Goldbach's conjecture."
msgstr "Simulering af kvanteberegning; Goldbachs formodning."
-#: projects.inc:428 projects.inc:436
+#: projects.inc:450 projects.inc:458
msgid "Cryptography"
msgstr "Kryptografi"
-#: projects.inc:437
+#: projects.inc:459
msgid ""
"Attempt to decode 3 original Enigma messages. The signals were intercepted "
"in the North Atlantic in 1942 and are believed to be unbroken."
@@ -914,24 +950,24 @@ msgstr ""
"Forsøg på at afkode 3 originale Enigma-beskeder. Signalerne blev opfanget i "
"det nordlige Atlanterhav i 1942, og menes aldrig at være blevet afkodet."
-#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
-#: projects.inc:506 projects.inc:546
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
msgid "Mathematics"
msgstr "Matematik"
-#: projects.inc:444
+#: projects.inc:466
msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
msgstr "Studier af Collatz-formodningen, en uløst formodning i matematik"
-#: projects.inc:449
+#: projects.inc:471
msgid "California State University Fullerton"
msgstr "California State University Fullerton"
-#: projects.inc:450
+#: projects.inc:472
msgid "Factorization of large integers"
msgstr "Faktorisering af store heltal"
-#: projects.inc:451
+#: projects.inc:473
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 "
@@ -941,17 +977,17 @@ msgid ""
"hundreds of digits long."
msgstr ""
-#: projects.inc:457
+#: projects.inc:479
msgid ""
"Vilnius Gediminas Technical University and Kaunas University of Technology "
"(Lithuania)"
msgstr ""
-#: projects.inc:458
+#: projects.inc:480
msgid "Software testing"
msgstr "Software-test"
-#: projects.inc:459
+#: projects.inc:481
msgid ""
"The aim of this project is to provide a powerful distributed computing "
"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
@@ -959,11 +995,11 @@ msgid ""
"involve the study of Monte-Carlo based software testing."
msgstr ""
-#: projects.inc:481
+#: projects.inc:503
msgid "Mathematical Institute of Leiden University / Kennislink"
msgstr "Matematisk Institut ved Leiden Universitet / Kennislink"
-#: projects.inc:483
+#: projects.inc:505
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 "
@@ -974,7 +1010,7 @@ msgid ""
"problems can be answered directly from it."
msgstr ""
-#: projects.inc:491
+#: projects.inc:513
msgid ""
"Primegrid has multiple projects searching for different forms of very large "
"prime numbers, including searching for the largest known prime number."
@@ -982,11 +1018,11 @@ msgstr ""
"Primegrid har flere projekter, der søger efter forskellige former for meget "
"store primtal, der iblandt søgning efter det størts kendte primtal."
-#: projects.inc:497
+#: projects.inc:519
msgid "Hochschule RheinMain University of Applied Sciences"
msgstr ""
-#: projects.inc:499
+#: projects.inc:521
msgid ""
"Search for counterexamples to two conjectures related to the identification "
"of prime numbers"
@@ -994,7 +1030,7 @@ msgstr ""
"Søgning efter modeksempler til to formodninger, relateret til "
"identificeringen af primtal"
-#: projects.inc:507
+#: projects.inc:529
msgid ""
"Find all the generalized binary number systems (in which bases are matrices "
"and digits are vectors) up to dimension 11."
@@ -1009,6 +1045,28 @@ msgstr "Kommentér"
msgid "News is available as an %sRSS feed%s"
msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
+#~ msgid "Download BOINC + Virtualbox"
+#~ msgstr "Download BOINC + Virtualbox"
+
+#, php-format
+#~ msgid "%s for %s (%s MB)"
+#~ msgstr "%s til %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 er et program, der lader dig donere din overskydende computertid til "
+#~ "videnskabelige projekter, så som SETI at home, Climateprediction.net, "
+#~ "Rosetta at home, Rosld Community Grid og mange andre. <p> Efter at have "
+#~ "installeret BOINC på din computer, kan du forbinde den til så mange af disse "
+#~ "projekter, du har lyst til."
+
+#~ msgid "Astronomy, Physics, and Chemistry"
+#~ msgstr "Astronomi, fysik og kemi"
+
#~ msgid "Browser default"
#~ msgstr "Browser-standard"
@@ -1029,13 +1087,13 @@ msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
#~ msgid "POEM at HOME"
#~ msgstr "Home"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
#~ msgid "POLL_TITLE"
#~ msgstr "BOINC user survey"
@@ -1330,9 +1388,9 @@ msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1397,9 +1455,9 @@ msgstr "Nyheder er tilgængelige som en %sRSS-strøm%s"
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/el/BOINC-Web.po b/locale/el/BOINC-Web.po
index 0c23b87..8b72428 100644
--- a/locale/el/BOINC-Web.po
+++ b/locale/el/BOINC-Web.po
@@ -1385,21 +1385,21 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
#~ "Αυτά είναι τα τρέχοντα αποτελέσματα της <a href=poll.php>έρευνας για "
#~ "χρήστες του BOINC</a>. Αυτή η σελίδα ανανεώνεται κάθε μία ώρα."
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "English"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "English"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
# poll-related stuff
# #######################################
#~ msgid "POLL_TITLE"
@@ -1696,9 +1696,9 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1763,9 +1763,9 @@ msgstr "Τα νέα είναι διαθέσιμα ως %sτροφοδοσία RS
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/fi/BOINC-Android.po b/locale/fi/BOINC-Android.po
index db6a3c5..f03b6df 100644
--- a/locale/fi/BOINC-Android.po
+++ b/locale/fi/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-03-05 10:57+0000\n"
+"PO-Revision-Date: 2014-06-22 06:10+0000\n"
"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
"Language-Team: fi <LL at li.org>\n"
"Language: fi\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: 1394017036.0\n"
+"X-POOTLE-MTIME: 1403417425.0\n"
#. app global
msgctxt "app_name"
@@ -126,10 +126,9 @@ msgctxt "attachproject_login_header_pwd"
msgid "Password:"
msgstr "Salasana:"
-#, fuzzy
msgctxt "attachproject_login_category_creation"
msgid "New to"
-msgstr "Neu bei"
+msgstr "Uusi projektissa"
msgctxt "attachproject_login_header_creation_enabled"
msgid "Register an account to participate:"
diff --git a/locale/fi/BOINC-Manager.mo b/locale/fi/BOINC-Manager.mo
index 81a146b..1d7a98f 100644
Binary files a/locale/fi/BOINC-Manager.mo and b/locale/fi/BOINC-Manager.mo differ
diff --git a/locale/fi/BOINC-Manager.po b/locale/fi/BOINC-Manager.po
index e77aae9..5a267b4 100644
--- a/locale/fi/BOINC-Manager.po
+++ b/locale/fi/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-03-03 17:12+0000\n"
+"PO-Revision-Date: 2014-06-22 06:13+0000\n"
"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: fi\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: 1393866765.0\n"
+"X-POOTLE-MTIME: 1403417630.0\n"
# 81%
#: AccountInfoPage.cpp:387
@@ -327,7 +327,7 @@ msgstr "Muuta näytön ja proxyn asetuksia"
#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
msgid "Computing &preferences..."
-msgstr "Laskenta &asetukset..."
+msgstr "La&skenta-asetukset..."
#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
msgid "Configure computing preferences"
@@ -839,7 +839,7 @@ msgstr ""
#: BOINCGUIApp.cpp:351
msgid " at "
-msgstr ""
+msgstr " paikassa "
#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
#: MainDocument.cpp:2554 ViewTransfers.cpp:803
@@ -1723,7 +1723,7 @@ msgstr "Projektilla ei ole sovelluksia prosessorille "
#: DlgItemProperties.cpp:177
msgid "Client configuration excludes "
-msgstr ""
+msgstr "Ohjelman asetukset eivät salli prosessoria "
#: DlgItemProperties.cpp:181
msgid " work fetch deferred for"
@@ -1982,7 +1982,7 @@ msgstr "Yhteydet"
#: DlgOptions.cpp:268
msgid "Connect via HTTP proxy server"
-msgstr "Yhteys HTTP proxypalvelimen kautta"
+msgstr "Yhdistä HTTP proxypalvelimen kautta"
#: DlgOptions.cpp:272
msgid "HTTP Proxy Server Configuration"
@@ -2019,7 +2019,7 @@ msgstr "HTTP Proxy"
#: DlgOptions.cpp:332
msgid "Connect via SOCKS proxy server"
-msgstr "Yhteys SOCKS proxypalvelimen kautta"
+msgstr "Yhdistä SOCKS proxypalvelimen kautta"
#: DlgOptions.cpp:336
msgid "SOCKS Proxy Server Configuration"
@@ -3096,7 +3096,7 @@ msgstr "vapaana, BOINCin käytettävissä: "
#: ViewResources.cpp:306
msgid "free, not available to BOINC: "
-msgstr "vapaana, BOINCin käytettävissä: "
+msgstr "vapaana, ei BOINCin käytettävissä: "
#: ViewResources.cpp:316
msgid "free: "
diff --git a/locale/fi/BOINC-Project-Generic.po b/locale/fi/BOINC-Project-Generic.po
index 7eb8923..c3c1fc5 100644
--- a/locale/fi/BOINC-Project-Generic.po
+++ b/locale/fi/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-02-21 20:27+0000\n"
+"PO-Revision-Date: 2014-06-22 06:09+0000\n"
"Last-Translator: Sami Nordlund <sami.nordlund at kolumbus.fi>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: fi\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: 1393014450.0\n"
+"X-POOTLE-MTIME: 1403417349.0\n"
msgid "LANG_NAME_NATIVE"
msgstr "English"
@@ -357,9 +357,8 @@ msgid "Posted %1 by %2"
msgstr "Kirjoitettu %1 jäsen %2"
#: ../inc/forum.inc:747
-#, fuzzy
msgid "You may not post or rate messages until %1"
-msgstr "Sinulle ei ole yksityisviestejä."
+msgstr "Et voi lähettää tai arvioida viestejä ennen %1"
#: ../inc/forum.inc:758
msgid ""
diff --git a/locale/fr/BOINC-Web.po b/locale/fr/BOINC-Web.po
index 26237af..66bfdd5 100644
--- a/locale/fr/BOINC-Web.po
+++ b/locale/fr/BOINC-Web.po
@@ -1794,7 +1794,7 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
#~ "Voici les résultats actuels de <a href=poll.php>l'enquête sur les "
#~ "utilisateurs de BOINC</a>. La page est mise à jour toutes les heures."
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
@@ -1952,9 +1952,9 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC : calculez pour la science"
-# #############################################
-# system_requirements.php by je2bwm 2006/08/07
-# #############################################
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "Prérequis système"
@@ -2026,9 +2026,9 @@ msgstr "Les nouvelles sont disponibles en tant que %sflux RSS%s"
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 Mo d'espace disque"
-# #############################################
-# release_notes.php
-# #############################################
+# #############################################
+# release_notes.php
+# #############################################
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "Notes de version"
diff --git a/locale/gl/BOINC-Web.po b/locale/gl/BOINC-Web.po
index 564712a..121c3e2 100644
--- a/locale/gl/BOINC-Web.po
+++ b/locale/gl/BOINC-Web.po
@@ -902,7 +902,7 @@ msgstr ""
#~ msgid "POEM at HOME"
#~ msgstr "Na casa"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
@@ -1231,9 +1231,9 @@ msgstr ""
#~ "institucións). O servidor é elixido aleatoriamente - se a descarga falla, "
#~ "recargue esta páxina e inténteo de novo."
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Axuda para o BOINC"
@@ -1298,9 +1298,9 @@ msgstr ""
#~ "Se vostede é xa un Voluntario para Axuda: para editar as súas "
#~ "preferencias, %sprema aquí%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Voluntario"
diff --git a/locale/hr/BOINC-Web.po b/locale/hr/BOINC-Web.po
index 82e1511..3dfe322 100644
--- a/locale/hr/BOINC-Web.po
+++ b/locale/hr/BOINC-Web.po
@@ -948,21 +948,21 @@ msgstr ""
#~ msgid "POEM at HOME"
#~ msgstr "Home"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "English"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "English"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
# #######################################
# poll-related stuff
#~ msgid "POLL_TITLE"
@@ -1259,9 +1259,9 @@ msgstr ""
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1326,9 +1326,9 @@ msgstr ""
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/hu/BOINC-Project-Generic.po b/locale/hu/BOINC-Project-Generic.po
index 28bdd28..588466b 100644
--- a/locale/hu/BOINC-Project-Generic.po
+++ b/locale/hu/BOINC-Project-Generic.po
@@ -7089,7 +7089,7 @@ msgstr "(minden alkalmazás)"
#~ msgid "- private message"
#~ msgstr "- privát üzenet"
-# #######################################
+# #######################################
# Private messages
#~ msgid "Private message from"
#~ msgstr "Személyes üzenet tőle:"
diff --git a/locale/hu/BOINC-Web.po b/locale/hu/BOINC-Web.po
index 6a168f5..813f87c 100644
--- a/locale/hu/BOINC-Web.po
+++ b/locale/hu/BOINC-Web.po
@@ -1530,21 +1530,21 @@ msgstr ""
#~ msgid "Advanced"
#~ msgstr "Haladó"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "English"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "English"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
# #######################################
# poll-related stuff
#~ msgid "POLL_TITLE"
@@ -1841,9 +1841,9 @@ msgstr ""
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1908,9 +1908,9 @@ msgstr ""
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/it_IT/BOINC-Project-Generic.po b/locale/it_IT/BOINC-Project-Generic.po
index 7e8bef7..e0184df 100644
--- a/locale/it_IT/BOINC-Project-Generic.po
+++ b/locale/it_IT/BOINC-Project-Generic.po
@@ -7184,7 +7184,7 @@ msgstr "(tutte le applicazioni)"
#~ msgid "User names starting with"
#~ msgstr "I nomi utente iniziano con"
-# ########################################<br /><br />
+# ########################################<br /><br />
# "Weak account key" page (weak_auth.php)
#~ msgid ""
#~ "Your 'weak account key' lets you link a computer to your account without "
diff --git a/locale/ko/BOINC-Manager.po b/locale/ko/BOINC-Manager.po
index 8d6b1c2..1ff1717 100644
--- a/locale/ko/BOINC-Manager.po
+++ b/locale/ko/BOINC-Manager.po
@@ -1,3 +1,8 @@
+# SOME DESCRIPTIVE TITLE.
+# 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"
@@ -12,10 +17,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.6.3\n"
+"X-Poedit-SearchPath-0: clientgui\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: clientgui\n"
#: AccountInfoPage.cpp:387
#, c-format
@@ -146,8 +151,7 @@ msgstr "최소한 %d 글자로 된 비밀번호를 입력해 주세요."
#: AccountInfoPage.cpp:607
msgid ""
"The password and confirmation password do not match. Please type them again."
-msgstr ""
-"처음 비밀번호와 재입력한 비밀번호가 일치하지 않습니다. 다시 입력해주세요."
+msgstr "처음 비밀번호와 재입력한 비밀번호가 일치하지 않습니다. 다시 입력해주세요."
#: AccountManagerInfoPage.cpp:272
msgid "Choose an account manager"
@@ -278,8 +282,7 @@ msgstr "프로젝트 혹은 계정 관리자 추가(&A)..."
#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr ""
-"많은 과학 분야의 30개 이상 프로젝트중에서 하나 혹은 전부 참여하는 기여자"
+msgstr "많은 과학 분야의 30개 이상 프로젝트중에서 하나 혹은 전부 참여하는 기여자"
#: AdvancedFrame.cpp:429
#, c-format
@@ -1469,8 +1472,7 @@ msgstr "최소한"
#: DlgAdvPreferencesBase.cpp:620
msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr ""
-"BOINC는 최소한 이 만큼의 디스크 용량을 빈 공간으로 남겨둡니다 (단위 GB)"
+msgstr "BOINC는 최소한 이 만큼의 디스크 용량을 빈 공간으로 남겨둡니다 (단위 GB)"
#: DlgAdvPreferencesBase.cpp:624
msgid "Gigabytes disk space free"
@@ -1523,8 +1525,7 @@ msgstr "체크되면 일시 정지시 작업 유닛을 메모리에서 비웁니
#: DlgAdvPreferencesBase.cpp:713
msgid ""
"Suspend processor and network usage when these applications are running:"
-msgstr ""
-"이 응용 프로그램이 실행 중인 동안에 프로세서와 네트워크 사용을 일시중지:"
+msgstr "이 응용 프로그램이 실행 중인 동안에 프로세서와 네트워크 사용을 일시중지:"
#: DlgAdvPreferencesBase.cpp:722
msgid "Add..."
@@ -1587,16 +1588,15 @@ 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 ""
-"선택한 메세지를 클립보드로 복사합니다. 메세지를 클릭하는 동안 shift 키나 "
-"control 키를 눌러 여러 메세지를 선택할 수 있습니다"
+"선택한 메세지를 클립보드로 복사합니다. 메세지를 클릭하는 동안 shift 키나 control 키를 눌러 여러 메세지를 선택할 수 있습니다"
#: 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 ""
-"클립보드에 선택한 메시지를 복사합니다. 메시지를 클릭하는 동안 Shift나 "
-"Control 키를 누른 상태에서 여러 메시지를 선택할 수 있습니다."
+"클립보드에 선택한 메시지를 복사합니다. 메시지를 클릭하는 동안 Shift나 Control 키를 누른 상태에서 여러 메시지를 선택할 수 "
+"있습니다."
#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
msgid "&Close"
@@ -2035,9 +2035,7 @@ msgstr "%s - 언어 선택"
msgid ""
"The %s's language has been changed. In order for this change to take "
"effect, you must restart the %s."
-msgstr ""
-"%s 언어가 변경되었습니다. 해당 변경 사항을 적용하기 위해서는 %s을(를) 재시작"
-"해야 됩니다."
+msgstr "%s 언어가 변경되었습니다. 해당 변경 사항을 적용하기 위해서는 %s을(를) 재시작해야 됩니다."
#: DlgSelectComputer.cpp:91
#, c-format
@@ -2129,8 +2127,7 @@ msgstr "Einstein at Home 화면보호기에 대해서 보다 자세한 정보를
#: Localization.cpp:71
msgid ""
"Correspond with admins and other users on the Einstein at Home message boards"
-msgstr ""
-"Einstein at Home 게시판에서 운영자 및 다른 사용자와 이야기를 주고 받으세요"
+msgstr "Einstein at Home 게시판에서 운영자 및 다른 사용자와 이야기를 주고 받으세요"
#: Localization.cpp:73
msgid "Einstein status"
@@ -2264,8 +2261,7 @@ msgstr "프로그램 누락됨"
msgid ""
"Please download and install the CoRD application from http://cord."
"sourceforge.net"
-msgstr ""
-"http://cord.sourceforge.net에서 CoRD 어플리케이션을 다운로드하고 설치하세요"
+msgstr "http://cord.sourceforge.net에서 CoRD 어플리케이션을 다운로드하고 설치하세요"
#: MainDocument.cpp:2432
msgid "on batteries"
@@ -2549,9 +2545,7 @@ msgstr "프로젝트 URL:"
msgid ""
"This project may not have work for your type of computer. Do you want to "
"add it anyway?"
-msgstr ""
-"이 프로젝트는 해당 컴퓨터에서 동작하지 않을 수도 있습니다. 그래도 추가하시겠"
-"습니까?"
+msgstr "이 프로젝트는 해당 컴퓨터에서 동작하지 않을 수도 있습니다. 그래도 추가하시겠습니까?"
#: ProjectInfoPage.cpp:850
msgid "You already added this project. Please choose a different project."
@@ -2634,8 +2628,7 @@ msgstr ""
"아니면 모뎀을 연결하고 다시 시도하세요.\n"
"\n"
"2) 개인 방화벽 소프트웨어가 BOINC를 막았습니다.\n"
-"개인 방화벽을 설정해서 BOINC가 80번 포트를 사용가능하게 한 후 다시 시도하세"
-"요.\n"
+"개인 방화벽을 설정해서 BOINC가 80번 포트를 사용가능하게 한 후 다시 시도하세요.\n"
"\n"
"3) 프록시 서버를 사용하고 계시다면\n"
"다음을 눌러 BOINC 프록시 설정을 설정해주세요."
@@ -2828,9 +2821,7 @@ msgstr "업데이트"
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
-msgstr ""
-"모든 완료된 태스크를 보고하고 마지막 크레딧과 환경 설정을 받아오며 가능하면 "
-"추가 태스크를 받아옵니다."
+msgstr "모든 완료된 태스크를 보고하고 마지막 크레딧과 환경 설정을 받아오며 가능하면 추가 태스크를 받아옵니다."
#: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
#: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
@@ -2862,16 +2853,14 @@ 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 ""
-"이 프로젝트와 관련된 모든 태스크와 파일들을 삭제하고 새 태스크를 받아옵니다. "
-"그 전에 먼저 완료된 태스크를 보고하도록 업데이트할 수 있습니다."
+"이 프로젝트와 관련된 모든 태스크와 파일들을 삭제하고 새 태스크를 받아옵니다. 그 전에 먼저 완료된 태스크를 보고하도록 업데이트할 수 "
+"있습니다."
#: 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 ""
-"이 프로젝트를 제거합니다. 진행 중인 태스크는 소실됩니다. (완료된 태스크를 보"
-"고하려면 '업데이트'를 사용하세요)"
+msgstr "이 프로젝트를 제거합니다. 진행 중인 태스크는 소실됩니다. (완료된 태스크를 보고하려면 '업데이트'를 사용하세요)"
#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
#: sg_TaskCommandPopup.cpp:78
@@ -3476,17 +3465,14 @@ msgid ""
"\n"
"Please choose which type of change you would like to make:\n"
msgstr ""
-"여러분은 새 기여자 컴퓨팅 프로젝트를 추가하거나 아니면 여러분이 공헌할 프로젝"
-"트를\n"
+"여러분은 새 기여자 컴퓨팅 프로젝트를 추가하거나 아니면 여러분이 공헌할 프로젝트를\n"
"변경할 수 있습니다.\n"
"\n"
-"이러한 프로젝트들 중 일부는 World Community Grid에서 수행 및 관리되고 있으"
-"며, 그외는\n"
+"이러한 프로젝트들 중 일부는 World Community Grid에서 수행 및 관리되고 있으며, 그외는\n"
"다른 연구자 혹은 기관에서 수행 및 관리되고 있습니다. BOINC 소프트웨어에서는\n"
"프로젝트들을 통틀어서 소모되는 연산력을 분할해 줄 수 있습니다.\n"
"\n"
-"대안으로서 만약 여러분이 BOINC 계정 관리자에 등록되어 있다면, 여러분이 지원"
-"할\n"
+"대안으로서 만약 여러분이 BOINC 계정 관리자에 등록되어 있다면, 여러분이 지원할\n"
"프로젝트를 선택하는데 있어 이것을 사용할 수 있습니다.\n"
"\n"
"여러분이 선호하는 관리 방식을 선택해 주십시오:\n"
@@ -3572,14 +3558,12 @@ msgstr "저장하려면 확인을 누르세요."
#: sg_DlgPreferences.cpp:278
msgid ""
"Click Clear to restore web-based settings for all preferences listed below."
-msgstr ""
-"아래 나열된 모든 환경설정을 웹기반 설정으로 복원하려면 지우기를 누르세요."
+msgstr "아래 나열된 모든 환경설정을 웹기반 설정으로 복원하려면 지우기를 누르세요."
#: sg_DlgPreferences.cpp:285
msgid ""
"For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
-"추가적인 설정은 고급 보기 상태로 변경 후 연산 환경 설정에서 선택하세요."
+msgstr "추가적인 설정은 고급 보기 상태로 변경 후 연산 환경 설정에서 선택하세요."
#: sg_DlgPreferences.cpp:313
msgid "Do work only between:"
diff --git a/locale/ko/BOINC-Project-Generic.po b/locale/ko/BOINC-Project-Generic.po
index a47d70e..c57ddbd 100644
--- a/locale/ko/BOINC-Project-Generic.po
+++ b/locale/ko/BOINC-Project-Generic.po
@@ -1,8 +1,15 @@
+# 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: 2013-12-17 00:00 PST\n"
+"POT-Creation-Date: 2014-01-10 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"
@@ -12,10 +19,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.7\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: html\\user\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
"X-BOINC-UTF8-Marker: 简体ä¸æ–‡, 日本語\n"
-"X-Poedit-SearchPath-0: html\\user\n"
# The name of this language in this language
msgid "LANG_NAME_NATIVE"
@@ -70,9 +77,7 @@ 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"
@@ -190,7 +195,7 @@ msgstr "포럼 검색"
msgid "Advanced search"
msgstr "고급 검색"
-#: ../inc/forum.inc:132 ../inc/user.inc:252 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
#: ../user/pm.php:133
msgid "Private messages"
msgstr "쪽지"
@@ -200,8 +205,8 @@ msgstr "쪽지"
msgid "Questions and Answers"
msgstr "질문과 답변"
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:249
-#: ../inc/user.inc:374 ../user/bs_sample_index.php:62
+#: ../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
#: ../project.sample/project.inc:43
msgid "Message boards"
@@ -267,7 +272,7 @@ msgstr "읽지 않음"
msgid "Message %1"
msgstr "메세지 %1"
-#: ../inc/forum.inc:624 ../inc/user.inc:330 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
msgid "hidden"
msgstr "숨김"
@@ -293,11 +298,9 @@ 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"
@@ -448,8 +451,7 @@ 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,17 +459,14 @@ 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."
@@ -477,7 +476,7 @@ msgstr "숨겨진 스레드에 글을 쓸 수 없습니다."
msgid "Thread"
msgstr "스레드"
-#: ../inc/forum.inc:1174 ../inc/team.inc:127 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
#: ../user/forum_index.php:94
msgid "Posts"
msgstr "포스트"
@@ -486,7 +485,7 @@ msgstr "포스트"
msgid "Views"
msgstr "보기"
-#: ../inc/forum.inc:1177 ../inc/team.inc:127 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
msgid "Last post"
msgstr "마지막 포스트"
@@ -524,7 +523,7 @@ msgid "Home"
msgstr "집"
#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:329
+#: ../user/server_status.php:314
msgid "Work"
msgstr "직장"
@@ -590,9 +589,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: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
+#: ../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
#: ../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
@@ -768,7 +767,7 @@ msgstr "마지막 통신"
msgid "Computer info"
msgstr "컴퓨터 정보"
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:356
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
#: ../user/top_users.php:48
msgid "Rank"
msgstr "순위"
@@ -777,9 +776,9 @@ msgstr "순위"
msgid "Avg. credit"
msgstr "평균 크레딧"
-#: ../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
+#: ../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
#: ../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
@@ -867,8 +866,8 @@ msgstr "최근 30일동안 활동한 컴퓨터만 보기"
msgid "Computer ID"
msgstr "컴퓨터 ID"
-#: ../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
+#: ../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
#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
#: ../user/top_users.php:49 ../user/user_search.php:139
@@ -904,7 +903,7 @@ msgstr "목록"
msgid "Write"
msgstr "쓰기"
-#: ../inc/pm.inc:33 ../inc/user.inc:377
+#: ../inc/pm.inc:33 ../inc/user.inc:378
msgid "Send private message"
msgstr "쪽지 보내기"
@@ -954,9 +953,7 @@ 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"
@@ -974,9 +971,7 @@ 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?"
@@ -985,8 +980,7 @@ 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"
@@ -1000,17 +994,13 @@ 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"
@@ -1020,9 +1010,7 @@ 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"
@@ -1109,8 +1097,7 @@ 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 ""
@@ -1148,9 +1135,8 @@ 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 ""
@@ -1159,9 +1145,8 @@ 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?"
@@ -1187,15 +1172,12 @@ 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?"
@@ -1226,9 +1208,7 @@ 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"
@@ -1307,9 +1287,7 @@ 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."
@@ -1339,17 +1317,13 @@ 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"
@@ -1359,9 +1333,7 @@ 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"
@@ -1660,7 +1632,7 @@ msgstr "보고 시각<br />혹은 마감 시각"
msgid "explain"
msgstr "상세 정보"
-#: ../inc/result.inc:376 ../user/server_status.php:256
+#: ../inc/result.inc:376 ../user/server_status.php:241
msgid "Status"
msgstr "상태"
@@ -1752,9 +1724,9 @@ msgstr "키워드"
msgid "Find teams with these words in their names or descriptions"
msgstr "이름이나 개요에 있는 단어로 팀을 찾으십시오"
-#: ../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
+#: ../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
#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
#: ../user/team_search.php:72 ../user/top_users.php:63
@@ -1762,7 +1734,7 @@ msgstr "이름이나 개요에 있는 단어로 팀을 찾으십시오"
msgid "Country"
msgstr "국가"
-#: ../inc/team.inc:49 ../inc/team.inc:454
+#: ../inc/team.inc:49 ../inc/team.inc:453
msgid "Type of team"
msgstr "팀 종류"
@@ -1790,8 +1762,8 @@ msgstr "요청됨"
msgid "founder response deadline is %1"
msgstr "창설자 응답 기한은 %1입니다"
-#: ../inc/team.inc:72 ../inc/team.inc:556 ../inc/user.inc:280
-#: ../inc/user.inc:370
+#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
+#: ../inc/user.inc:371
msgid "None"
msgstr "없음"
@@ -1815,107 +1787,107 @@ msgstr "개요"
msgid "Web site"
msgstr "웹 사이트"
-#: ../inc/team.inc:119
+#: ../inc/team.inc:120
msgid "Cross-project stats"
msgstr "공유 프로젝트 통계"
-#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
+#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
msgid "Type"
msgstr "종류"
-#: ../inc/team.inc:126 ../user/team_manage.php:63
+#: ../inc/team.inc:127 ../user/team_manage.php:63
msgid "Message board"
msgstr "게시판"
-#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "스레드"
-#: ../inc/team.inc:135
+#: ../inc/team.inc:136
msgid "Join this team"
msgstr "이 팀에 가입"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:137
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:139
+#: ../inc/team.inc:140
msgid "Not accepting new members"
msgstr "회원 가입을 허가하지 않습니다"
-#: ../inc/team.inc:146
+#: ../inc/team.inc:147
msgid "Foundership change requested"
msgstr "창설자 교체 요청이 있습니다"
-#: ../inc/team.inc:147
+#: ../inc/team.inc:148
msgid "Respond by %1"
msgstr "%1에 응답함"
-#: ../inc/team.inc:151
+#: ../inc/team.inc:152
msgid "Team foundership change"
msgstr "팀 창설자 변경"
-#: ../inc/team.inc:155 ../inc/team.inc:358
+#: ../inc/team.inc:156 ../inc/team.inc:359
msgid "Members"
msgstr "맴버들"
-#: ../inc/team.inc:156 ../inc/team.inc:253
+#: ../inc/team.inc:157 ../inc/team.inc:254
msgid "Founder"
msgstr "창설자"
-#: ../inc/team.inc:168
+#: ../inc/team.inc:169
msgid "Admins"
msgstr "관리자"
-#: ../inc/team.inc:183
+#: ../inc/team.inc:184
msgid "New members in last day"
msgstr "전 날의 새로운 맴버"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:185
msgid "Total members"
msgstr "전체 맴버"
-#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
+#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
msgid "view"
msgstr "보기"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:186
msgid "Active members"
msgstr "활동하는 맴버"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:187
msgid "Members with credit"
msgstr "크레딧을 가진 맴버"
-#: ../inc/team.inc:255
+#: ../inc/team.inc:256
msgid "Admin"
msgstr "관리"
-#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:277 ../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:280 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:281 ../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:288
+#: ../inc/team.inc:289
msgid "No such team."
msgstr "해당 팀이 없습니다."
-#: ../inc/team.inc:301
+#: ../inc/team.inc:302
msgid "This operation requires foundership."
msgstr "이 기능은 창설자 권한이 필요합니다."
-#: ../inc/team.inc:325
+#: ../inc/team.inc:326
msgid "This operation requires team admin privileges"
msgstr "이 기능은 팀 관리자 권한이 필요합니다"
@@ -1924,58 +1896,56 @@ 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:429
+#: ../inc/team.inc:428
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:433
+#: ../inc/team.inc:432
msgid "Team name, text version"
msgstr "팀 이름, 텍스트 버전"
-#: ../inc/team.inc:434
+#: ../inc/team.inc:433
msgid "Don't use HTML tags."
msgstr "HTML 태그를 사용하지 않습니다."
-#: ../inc/team.inc:437
+#: ../inc/team.inc:436
msgid "Team name, HTML version"
msgstr "팀 이름, HTML 버전"
-#: ../inc/team.inc:439 ../inc/team.inc:449
+#: ../inc/team.inc:438 ../inc/team.inc:448
msgid "You may use %1limited HTML tags%2."
msgstr "%1제한된 HTML 태그%2를 사용할 수 있습니다."
-#: ../inc/team.inc:440
+#: ../inc/team.inc:439
msgid "If you don't know HTML, leave this box blank."
msgstr "만약 HTML을 모른다면, 이 박스는 빈칸으로 남겨두세요."
-#: ../inc/team.inc:443
+#: ../inc/team.inc:442
msgid "URL of team web page, if any"
msgstr "팀 웹 페이지 URL(있을 경우)"
-#: ../inc/team.inc:443
+#: ../inc/team.inc:442
msgid "without \"http://\""
msgstr "\"http://\" 제외"
-#: ../inc/team.inc:444
+#: ../inc/team.inc:443
msgid "This URL will be linked to from the team's page on this site."
msgstr "이 URL은 이 사이트의 팀 페이지로 링크됩니다."
-#: ../inc/team.inc:447
+#: ../inc/team.inc:446
msgid "Description of team"
msgstr "팀 개요"
-#: ../inc/team.inc:463
+#: ../inc/team.inc:462
msgid "Accept new members?"
msgstr "회원 가입을 허가할까요?"
-#: ../inc/uotd.inc:30
+#: ../inc/uotd.inc:28
msgid "User profile"
msgstr "사용자 프로필"
@@ -2008,7 +1978,7 @@ msgid "Computers on this account"
msgstr "이 계정의 컴퓨터 목록"
#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:242 ../inc/user.inc:328 ../inc/user.inc:412
+#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
#: ../user/view_profile.php:64
msgid "View"
msgstr "보기"
@@ -2025,8 +1995,8 @@ msgstr "공유-프로젝트 통계"
msgid "Account"
msgstr "계정"
-#: ../inc/user.inc:165 ../inc/user.inc:280 ../inc/user.inc:368
-#: ../inc/user.inc:370 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
+#: ../inc/user.inc:371 ../user/user_search.php:139
msgid "Team"
msgstr "팀"
@@ -2055,7 +2025,7 @@ msgstr "계정 정보"
msgid "Email address"
msgstr "Email 주소"
-#: ../inc/user.inc:203 ../inc/user.inc:321
+#: ../inc/user.inc:203 ../inc/user.inc:322
msgid "URL"
msgstr "URL"
@@ -2063,7 +2033,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "우편 번호"
-#: ../inc/user.inc:207 ../inc/user.inc:315
+#: ../inc/user.inc:207 ../inc/user.inc:316
msgid "%1 member since"
msgstr "%1 참여 시작일"
@@ -2083,7 +2053,7 @@ msgstr "비밀번호"
msgid "other account info"
msgstr "다른 계정 정보"
-#: ../inc/user.inc:213 ../inc/user.inc:314
+#: ../inc/user.inc:213 ../inc/user.inc:315
msgid "User ID"
msgstr "사용자 ID"
@@ -2128,96 +2098,96 @@ msgstr "%1 환경 설정"
msgid "Community"
msgstr "커뮤니티"
-#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "삭제"
-#: ../inc/user.inc:244
+#: ../inc/user.inc:245
msgid "Create"
msgstr "생성"
-#: ../inc/user.inc:246 ../inc/user.inc:412 ../inc/util.inc:514
+#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
msgid "Profile"
msgstr "프로필"
-#: ../inc/user.inc:249 ../inc/user.inc:374
+#: ../inc/user.inc:250 ../inc/user.inc:375
msgid "%1 posts"
msgstr "%1 포스트"
-#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "공지"
-#: ../inc/user.inc:268
+#: ../inc/user.inc:269
msgid "Quit team"
msgstr "팀 탈퇴"
-#: ../inc/user.inc:270 ../inc/user.inc:287
+#: ../inc/user.inc:271 ../inc/user.inc:288
msgid "Administer"
msgstr "관리자"
-#: ../inc/user.inc:276 ../inc/user.inc:289
+#: ../inc/user.inc:277 ../inc/user.inc:290
msgid "(foundership change request pending)"
msgstr "(창설자 변경 요청 대기중)"
-#: ../inc/user.inc:278
+#: ../inc/user.inc:279
msgid "Member of team"
msgstr "팀 구성원"
-#: ../inc/user.inc:280
+#: ../inc/user.inc:281
msgid "find a team"
msgstr "팀 찾기"
-#: ../inc/user.inc:291
+#: ../inc/user.inc:292
msgid "Founder but not member of"
msgstr "창설자 (맴버 제외)"
-#: ../inc/user.inc:297
+#: ../inc/user.inc:298
msgid "Find friends"
msgstr "친구 찾기"
-#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
-#: ../inc/user.inc:386 ../inc/user.inc:395
+#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
+#: ../inc/user.inc:387 ../inc/user.inc:396
msgid "Friends"
msgstr "친구들"
-#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
+#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
msgid "Computers"
msgstr "컴퓨터들"
-#: ../inc/user.inc:337
+#: ../inc/user.inc:338
msgid "Donor"
msgstr "기부자"
-#: ../inc/user.inc:377
+#: ../inc/user.inc:378
msgid "Contact"
msgstr "접촉"
-#: ../inc/user.inc:380
+#: ../inc/user.inc:381
msgid "This person is a friend"
msgstr "이 사람은 친구입니다"
-#: ../inc/user.inc:381 ../user/friend.php:238
+#: ../inc/user.inc:382 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "친구 관계 취소"
-#: ../inc/user.inc:384 ../user/friend.php:37
+#: ../inc/user.inc:385 ../user/friend.php:37
msgid "Request pending"
msgstr "요청이 보류되었습니다"
-#: ../inc/user.inc:386
+#: ../inc/user.inc:387
msgid "Add as friend"
msgstr "친구로 추가"
-#: ../inc/user.inc:456
+#: ../inc/user.inc:446
msgid "user name cannot have leading or trailing white space"
msgstr "사용자 이름의 처음 또는 끝부분에 공백이 있습니다"
-#: ../inc/user.inc:460
+#: ../inc/user.inc:450
msgid "user name must be nonempty"
msgstr "사용자 이름에는 공백을 쓸 수 없습니다"
-#: ../inc/user.inc:464
+#: ../inc/user.inc:454
msgid "user name may not contain HTML tags"
msgstr "사용자 이름은 HTML 태그를 포함할 수 없습니다"
@@ -2245,9 +2215,7 @@ 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"
@@ -2267,9 +2235,7 @@ 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"
@@ -2285,8 +2251,7 @@ 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"
@@ -2296,7 +2261,7 @@ msgstr "선택한 데이터베이스에 접속할 수 없습니다. 나중에
msgid "Unable to select database - please try again later"
msgstr "선택한 데이터베이스를 사용할 수 없습니다. 나중에 다시 시도해주세요"
-#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr "이 컴퓨터에서 로그인 유지"
@@ -2306,8 +2271,7 @@ 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."
@@ -2345,10 +2309,9 @@ 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"
@@ -2499,7 +2462,7 @@ msgstr "팀 생성 혹은 가입"
msgid "User of the day"
msgstr "오늘의 사용자"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
msgid "Server status"
msgstr "서버 상태"
@@ -2593,16 +2556,14 @@ 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"
@@ -2652,8 +2613,7 @@ 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:"
@@ -2664,8 +2624,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"
@@ -2695,8 +2655,7 @@ 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."
@@ -2706,17 +2665,13 @@ 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."
@@ -2737,8 +2692,7 @@ 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"
@@ -2752,9 +2706,7 @@ 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"
@@ -2971,9 +2923,7 @@ 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 ""
@@ -2983,8 +2933,7 @@ msgid ""
"If this is not enough you should contact the author."
msgstr ""
"저희는 이들 응용 프로그램을 설치하기 위한 설명서를 제공하지 않습니다.\n"
-"그러나 작성자는 응용 프로그램 설치나 삭제에 관해서 약간의 도움말을 제공할 수"
-"도 있습니다.\n"
+"그러나 작성자는 응용 프로그램 설치나 삭제에 관해서 약간의 도움말을 제공할 수도 있습니다.\n"
"그 것으로 충분하지 않다면 작성자에게 연락하세요."
#: ../user/download_network.php:36
@@ -3027,9 +2976,7 @@ 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"
@@ -3059,9 +3006,7 @@ 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"
@@ -3084,9 +3029,7 @@ 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)"
@@ -3276,9 +3219,7 @@ 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"
@@ -3354,16 +3295,14 @@ 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."
@@ -3381,9 +3320,7 @@ 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"
@@ -3393,17 +3330,13 @@ 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."
@@ -3413,9 +3346,7 @@ 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"
@@ -3429,24 +3360,19 @@ 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"
@@ -3456,8 +3382,7 @@ 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."
@@ -3487,9 +3412,7 @@ 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"
@@ -3553,18 +3476,15 @@ 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"
@@ -3580,9 +3500,8 @@ 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:"
@@ -3631,17 +3550,14 @@ 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"
@@ -3693,9 +3609,7 @@ 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."
@@ -3809,11 +3723,9 @@ 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"
@@ -3835,8 +3747,7 @@ 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"
@@ -3949,9 +3860,7 @@ 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"
@@ -3969,17 +3878,13 @@ 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"
@@ -4048,9 +3953,7 @@ 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
@@ -4089,9 +3992,7 @@ 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"
@@ -4103,9 +4004,8 @@ 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"
@@ -4117,8 +4017,7 @@ 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
@@ -4243,8 +4142,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"
@@ -4281,9 +4180,7 @@ 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"
@@ -4328,8 +4225,7 @@ 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"
@@ -4337,8 +4233,7 @@ 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"
@@ -4448,9 +4343,7 @@ 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:"
@@ -4555,23 +4448,19 @@ 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 ""
@@ -4583,9 +4472,7 @@ 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>."
@@ -4607,9 +4494,7 @@ 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"
@@ -4623,9 +4508,7 @@ 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"
@@ -4633,13 +4516,11 @@ 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"
@@ -4695,9 +4576,8 @@ 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"
@@ -4724,8 +4604,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."
@@ -4780,9 +4660,7 @@ 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"
@@ -4841,9 +4719,7 @@ 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."
@@ -4859,9 +4735,8 @@ 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"
@@ -4873,17 +4748,16 @@ 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"
@@ -4896,9 +4770,8 @@ 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 ""
@@ -4908,22 +4781,19 @@ 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 ""
@@ -4933,11 +4803,9 @@ 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 ""
@@ -4946,10 +4814,8 @@ 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?"
@@ -4965,28 +4831,23 @@ 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"
@@ -4995,11 +4856,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"
@@ -5011,9 +4872,8 @@ 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 ""
@@ -5021,9 +4881,8 @@ 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"
@@ -5039,9 +4898,7 @@ 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"
@@ -5057,9 +4914,8 @@ 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)"
@@ -5071,11 +4927,9 @@ 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:"
@@ -5192,8 +5046,7 @@ msgstr ""
"관리자는 이 규정을 위반한 포스트를 삭제할 것입니다.\n"
"삭제된 포스트는 작성자에게 이메일로 통보됩니다.\n"
"상습적인 위반자는 일시적으로 글을 쓸 권한을 잃게 될 것입니다.\n"
-"(그렇지만 남용을 방지하기 위해서 오직 프로젝트 운영자만 그럴 권한을 갖습니"
-"다.)\n"
+"(그렇지만 남용을 방지하기 위해서 오직 프로젝트 운영자만 그럴 권한을 갖습니다.)\n"
"추가적으로 안 좋은 행동(다른 참여자들의 IP 주소를 수집하기 위한 함정을\n"
"놓는 \"도청\" 포스트, 포럼 내에 과도한 스레드를 생성해서 도배하는\n"
"행위, 기타)은 공식 규정에 명시되지 않았지만 유사한 패널티를\n"
@@ -5347,8 +5200,7 @@ 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"
@@ -5422,24 +5274,19 @@ 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"
@@ -5461,9 +5308,7 @@ 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:"
@@ -5561,135 +5406,135 @@ msgstr "미실행중"
msgid "Disabled"
msgstr "비활성화"
-#: ../user/server_status.php:246
+#: ../user/server_status.php:231
msgid "Project status"
msgstr "프로젝트 상태"
-#: ../user/server_status.php:248
+#: ../user/server_status.php:233
msgid "Server software version: %1"
msgstr "서버 소프트웨어 버전: %1"
-#: ../user/server_status.php:256
+#: ../user/server_status.php:241
msgid "Program"
msgstr "프로그램"
-#: ../user/server_status.php:256
+#: ../user/server_status.php:241
msgid "Host"
msgstr "호스트"
-#: ../user/server_status.php:267
+#: ../user/server_status.php:252
msgid "data-driven web pages"
msgstr "데이터 웹 페이지 서버"
-#: ../user/server_status.php:273
+#: ../user/server_status.php:258
msgid "upload/download server"
msgstr "업로드/다운로드 서버"
-#: ../user/server_status.php:276
+#: ../user/server_status.php:261
msgid "scheduler"
msgstr "스케쥴러"
-#: ../user/server_status.php:309
+#: ../user/server_status.php:294
msgid "Running:"
msgstr "가동 중:"
-#: ../user/server_status.php:310
+#: ../user/server_status.php:295
msgid "Program is operating normally"
msgstr "프로그램이 정상적으로 작동합니다"
-#: ../user/server_status.php:311
+#: ../user/server_status.php:296
msgid "Not Running:"
msgstr "미가동 중:"
-#: ../user/server_status.php:312
+#: ../user/server_status.php:297
msgid "Program failed or the project is down"
msgstr "프로그램 실행 실패 혹은 프로젝트 서버 다운됨"
-#: ../user/server_status.php:313
+#: ../user/server_status.php:298
msgid "Disabled:"
msgstr "비활성화:"
-#: ../user/server_status.php:314
+#: ../user/server_status.php:299
msgid "Program is disabled"
msgstr "프로그램이 꺼졌습니다"
-#: ../user/server_status.php:318
+#: ../user/server_status.php:303
msgid "Computing status"
msgstr "컴퓨팅 현황"
-#: ../user/server_status.php:324
+#: ../user/server_status.php:309
msgid "The database server is not accessible"
msgstr "DB 서버에 접근할 수 없습니다"
-#: ../user/server_status.php:341
+#: ../user/server_status.php:326
msgid "Tasks ready to send"
msgstr "전송 준비된 태스크"
-#: ../user/server_status.php:346 ../user/workunit.php:55
+#: ../user/server_status.php:331 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr "진행 중인 태스크"
-#: ../user/server_status.php:351
+#: ../user/server_status.php:336
msgid "Workunits waiting for validation"
msgstr "검증 대기 중인 작업 유닛"
-#: ../user/server_status.php:356
+#: ../user/server_status.php:341
msgid "Workunits waiting for assimilation"
msgstr "통합 대기 중인 작업 유닛"
-#: ../user/server_status.php:361
+#: ../user/server_status.php:346
msgid "Workunits waiting for file deletion"
msgstr "삭제 대기 중인 작업 유닛"
-#: ../user/server_status.php:366
+#: ../user/server_status.php:351
msgid "Tasks waiting for file deletion"
msgstr "파일 삭제 대기 중인 태스크"
-#: ../user/server_status.php:383
+#: ../user/server_status.php:367
msgid "Transitioner backlog (hours)"
msgstr "변환기 처리 목록 (시간)"
-#: ../user/server_status.php:390
+#: ../user/server_status.php:374
msgid "Users"
msgstr "사용자"
-#: ../user/server_status.php:393 ../user/server_status.php:411
+#: ../user/server_status.php:377 ../user/server_status.php:395
msgid "with recent credit"
msgstr "최근 크레딧 소유"
-#: ../user/server_status.php:398 ../user/server_status.php:416
+#: ../user/server_status.php:382 ../user/server_status.php:400
msgid "with credit"
msgstr "크레딧 소유"
-#: ../user/server_status.php:403 ../user/server_status.php:421
+#: ../user/server_status.php:387 ../user/server_status.php:405
msgid "registered in past 24 hours"
msgstr "최근 24시간 이내에 등록"
-#: ../user/server_status.php:427
+#: ../user/server_status.php:411
msgid "current GigaFLOPs"
msgstr "현재 GFLOPs"
-#: ../user/server_status.php:436
+#: ../user/server_status.php:420
msgid "Tasks by application"
msgstr "태스크 수행 프로그램"
-#: ../user/server_status.php:439 ../user/workunit.php:40
+#: ../user/server_status.php:423 ../user/workunit.php:40
msgid "application"
msgstr "응용 프로그램"
-#: ../user/server_status.php:440
+#: ../user/server_status.php:424
msgid "unsent"
msgstr "미전송"
-#: ../user/server_status.php:441
+#: ../user/server_status.php:425
msgid "in progress"
msgstr "진행 중"
-#: ../user/server_status.php:442
+#: ../user/server_status.php:426
msgid "avg runtime of last 100 results in h (min-max)"
msgstr "평균 100개의 결과물 실행 시간 (시, 최소-최대)"
-#: ../user/server_status.php:443
+#: ../user/server_status.php:427
msgid "users in last 24h"
msgstr "최근 24시간 내 사용자"
@@ -5709,9 +5554,7 @@ 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 ""
@@ -5724,8 +5567,7 @@ 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."
@@ -5734,9 +5576,7 @@ 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:"
@@ -5785,9 +5625,7 @@ 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"
@@ -5813,9 +5651,7 @@ 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:"
@@ -5837,9 +5673,7 @@ 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"
@@ -5909,17 +5743,14 @@ 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"
@@ -5932,10 +5763,8 @@ 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."
@@ -5946,8 +5775,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?"
@@ -5957,6 +5786,10 @@ 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 "공백없이 팀 이름을 입력하셔야 합니다"
@@ -5976,9 +5809,7 @@ 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"
@@ -6102,8 +5933,7 @@ 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"
@@ -6116,8 +5946,7 @@ 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"
@@ -6151,8 +5980,7 @@ 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
@@ -6167,9 +5995,7 @@ 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"
@@ -6212,9 +6038,7 @@ 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"
@@ -6224,9 +6048,7 @@ 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 ""
@@ -6237,10 +6059,9 @@ 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
@@ -6255,9 +6076,7 @@ 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
@@ -6322,11 +6141,9 @@ 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"
@@ -6409,24 +6226,19 @@ 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"
@@ -6468,10 +6280,8 @@ msgid ""
msgstr ""
"<strong>팀을 탈퇴하기 전에 읽어주세요:</strong>\n"
" <ul>\n"
-" <li>팀을 탈퇴하게 되면 나중에 재가입하거나 원하는 다른 팀으로 가입"
-"할 수 있습니다\n"
-" <li>팀 탈퇴는 어떤 방식으로든 개인의 크레딧에 어떤 영향도 주지 않습"
-"니다.\n"
+" <li>팀을 탈퇴하게 되면 나중에 재가입하거나 원하는 다른 팀으로 가입할 수 있습니다\n"
+" <li>팀 탈퇴는 어떤 방식으로든 개인의 크레딧에 어떤 영향도 주지 않습니다.\n"
" </ul>"
#: ../user/team_quit_form.php:40
@@ -6544,9 +6354,7 @@ 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."
@@ -6683,9 +6491,7 @@ 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."
@@ -6726,8 +6532,7 @@ msgid ""
" or by using an assigned 'account key'.\n"
" Your account key is:"
msgstr ""
-"여러분은 여러분의 이메일 주소와 비밀번호를 사용해서 계정에 접근할 수도 있지"
-"만\n"
+"여러분은 여러분의 이메일 주소와 비밀번호를 사용해서 계정에 접근할 수도 있지만\n"
" 한편으로 서명된 '계정 키'를 이용할 수도 있습니다.\n"
" 여러분의 계정 키:"
@@ -6764,10 +6569,8 @@ msgid ""
" do so using your weak account key.\n"
" Your weak account key is:"
msgstr ""
-"'약한 계정 키'는 위에서 설명한 대로 여러분이 가진 계정을 컴퓨터에 추가할 수 "
-"있게\n"
-" 해줍니다. 그러나 어떠한 방법으로든 계정에 로그인하거나 정보를 변경할 수"
-"는 없습니다.\n"
+"'약한 계정 키'는 위에서 설명한 대로 여러분이 가진 계정을 컴퓨터에 추가할 수 있게\n"
+" 해줍니다. 그러나 어떠한 방법으로든 계정에 로그인하거나 정보를 변경할 수는 없습니다.\n"
" 만약 신뢰할 수 없거나 안전하지 않은 컴퓨터에 계정을 추가하고 싶다면\n"
" 약한 계정 키를 사용해 주시기 바랍니다.\n"
" 여러분의 약한 계정 키:"
@@ -6776,9 +6579,7 @@ 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"
@@ -6844,9 +6645,7 @@ 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"
@@ -6882,9 +6681,7 @@ 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/locale/ko/BOINC-Setup.po b/locale/ko/BOINC-Setup.po
index 0e24e7f..6c12de4 100644
--- a/locale/ko/BOINC-Setup.po
+++ b/locale/ko/BOINC-Setup.po
@@ -2,7 +2,6 @@
# 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 7.2.y\n"
@@ -44,11 +43,9 @@ msgid ""
"Do you also want non-administrative users to be able to run and control %s "
"on this Mac?"
msgstr ""
-"이 컴퓨터에서 관리하도록 허가받은 사용자들은 자동적으로 %s를(를) 실행하고 제"
-"어할 수 있도록 허용될 것입니다.\n"
+"이 컴퓨터에서 관리하도록 허가받은 사용자들은 자동적으로 %s를(를) 실행하고 제어할 수 있도록 허용될 것입니다.\n"
"\n"
-"이 Mac에서 비관리자 사용자들도 %s를(을) 실행하고 제어할 수 있게 하길 원하십니"
-"까?"
+"이 Mac에서 비관리자 사용자들도 %s를(을) 실행하고 제어할 수 있게 하길 원하십니까?"
#: PostInstall.cpp:1444
#, c-format
@@ -130,8 +127,7 @@ msgid ""
"computer.\n"
"\n"
msgstr ""
-"여러분 컴퓨터에서 %s를(을) 완전히 제거하려면 관리자 비밀번호를 입력해 주세"
-"요.\n"
+"여러분 컴퓨터에서 %s를(을) 완전히 제거하려면 관리자 비밀번호를 입력해 주세요.\n"
"\n"
#: uninstall.cpp:1616
diff --git a/locale/ko/BOINC-Web.po b/locale/ko/BOINC-Web.po
index a89ba9d..5be6f3a 100644
--- a/locale/ko/BOINC-Web.po
+++ b/locale/ko/BOINC-Web.po
@@ -1,3 +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"
@@ -6,16 +13,16 @@ msgstr ""
"PO-Revision-Date: 2014-02-07 17:56+0900\n"
"Last-Translator: Lee Kangsan <treppolse at gmail.com>\n"
"Language-Team: SETIKAH at KOREA\n"
-"Language: ko_KR\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.3\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: doc\n"
"X-Poedit-Basepath: C:\\Src\\BOINCSVN\\trunk\\boinc\n"
"X-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-Poedit-KeywordsList: tra\n"
-"X-Poedit-SearchPath-0: doc\n"
#: docutil.php:21
msgid "Search"
@@ -35,8 +42,8 @@ msgid ""
"We recommend that you also install VirtualBox, so your computer can work on "
"science projects that require it."
msgstr ""
-"저희는 여러분이 VirtualBox도 같이 설치하길 권장합니다. 그렇게 하면 해당 기능"
-"을 요구하는 과학 프로젝트 작업도 수행할 수 있습니다."
+"저희는 여러분이 VirtualBox도 같이 설치하길 권장합니다. 그렇게 하면 해당 기능을 요구하는 과학 프로젝트 작업도 수행할 수 "
+"있습니다."
#: download.php:41
msgid "Learn more about VirtualBox."
@@ -44,7 +51,6 @@ msgstr "VirtualBox에 대해서 알아봅니다."
# #######################################
# download.php
-# #######################################
#: download.php:51
msgid "Download BOINC + VirtualBox"
msgstr "BOINC + VirtualBox 다운로드"
@@ -66,7 +72,6 @@ msgstr "VirtualBox 버전 %s"
# #######################################
# download.php
-# #######################################
#: download.php:67
msgid "Download BOINC"
msgstr "BOINC 다운로드"
@@ -78,32 +83,25 @@ msgid ""
"Community Grid, and many others."
msgstr ""
"BOINC는 SETI at home, Climateprediction.net, Rosetta at home, World Community Grid "
-"그 외 다른 많은 과학 프로젝트들에게 여러분의 컴퓨터 대기 시간을 기부하도록 하"
-"는 프로그램입니다."
+"그 외 다른 많은 과학 프로젝트들에게 여러분의 컴퓨터 대기 시간을 기부하도록 하는 프로그램입니다."
#: download.php:125
msgid ""
"After installing BOINC on your computer, you can connect it to as many of "
"these projects as you like."
-msgstr ""
-"컴퓨터에 BOINC를 설치한 후에 여러분이 선호하는 수많은 프로젝트에 연결하실 수 "
-"있습니다."
+msgstr "컴퓨터에 BOINC를 설치한 후에 여러분이 선호하는 수많은 프로젝트에 연결하실 수 있습니다."
#: 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 ""
-"여러분은 이 소프트웨어를 여러분이 소유한 컴퓨터 혹은 소유자로부터 권한을 부여"
-"받은 컴퓨터에서만 실행해야 합니다."
+msgstr "여러분은 이 소프트웨어를 여러분이 소유한 컴퓨터 혹은 소유자로부터 권한을 부여받은 컴퓨터에서만 실행해야 합니다."
#: download.php:132
msgid ""
"We recommend that you download BOINC from the Google Play Store or Amazon "
"Appstore, not from here."
-msgstr ""
-"이곳보다는 Google Play Store 또는 Amazon Appstore에서 BOINC를 다운로드하시길 "
-"권장합니다."
+msgstr "이곳보다는 Google Play Store 또는 Amazon Appstore에서 BOINC를 다운로드하시길 권장합니다."
#: download.php:167
msgid "System requirements"
@@ -141,9 +139,8 @@ msgid ""
"through the process of installing and using BOINC; %s troubleshoot any "
"problems you might have."
msgstr ""
-"BOINC 온라인 도움말은 경험많은 BOINC 사용자와 1:1대화를 하도록 합니다 대상: "
-"%s는 BOINC와 기여자 컴퓨팅에 대해서 답합니다. %s는 BOINC 설치 진행 및 사용을 "
-"도와드릴 것입니다. %s는 여러분이 겪는 각종 문제를 해결해 드릴 것입니다."
+"BOINC 온라인 도움말은 경험많은 BOINC 사용자와 1:1대화를 하도록 합니다 대상: %s는 BOINC와 기여자 컴퓨팅에 대해서 "
+"답합니다. %s는 BOINC 설치 진행 및 사용을 도와드릴 것입니다. %s는 여러분이 겪는 각종 문제를 해결해 드릴 것입니다."
#: help.php:21
#, php-format
@@ -153,9 +150,8 @@ msgid ""
"Skype, please %sdownload and install it now%s. When you're finished, return "
"to this page."
msgstr ""
-"BOINC 온라인 도움말은 인터넷 전화인 %sSkype%s에 기반을 두고 있습니다. Skype"
-"는 소프트웨어와 전화 모두 무료입니다. 아직 Skype를 사용하고 계시지 않았다면, "
-"%s지금 다운로드하고 설치하십시오%s. 완료되면 이 페이지로 돌아오십시오."
+"BOINC 온라인 도움말은 인터넷 전화인 %sSkype%s에 기반을 두고 있습니다. Skype는 소프트웨어와 전화 모두 무료입니다. 아직 "
+"Skype를 사용하고 계시지 않았다면, %s지금 다운로드하고 설치하십시오%s. 완료되면 이 페이지로 돌아오십시오."
#: help.php:28
msgid ""
@@ -164,17 +160,15 @@ msgid ""
"also use Skype's text-based chat system or regular email (if you don't have "
"Skype) to communicate with Help Volunteers."
msgstr ""
-"도움을 구하는 가장 좋은 방법은 목소리입니다. 이를 위해서 여러분 컴퓨터에는 마"
-"이크와 스피커 또는 외부 헤드셋이 필요합니다. 여러분은 또한 도우미 기여자들과 "
-"Skype 텍스트 기반 대화 시스템이나 일반적인 email (만약 Skype를 쓰지 않을 경"
-"우)로 대화를 주고받을 수 있습니다. "
+"도움을 구하는 가장 좋은 방법은 목소리입니다. 이를 위해서 여러분 컴퓨터에는 마이크와 스피커 또는 외부 헤드셋이 필요합니다. 여러분은 "
+"또한 도우미 기여자들과 Skype 텍스트 기반 대화 시스템이나 일반적인 email (만약 Skype를 쓰지 않을 경우)로 대화를 주고받을 "
+"수 있습니다. "
#: help.php:31
msgid ""
"Volunteers speaking several languages are available. Please select a "
"language:"
-msgstr ""
-"기여자들은 몇가지 언어로 얘기하는 것이 가능합니다. 언어를 선택해 주세요:"
+msgstr "기여자들은 몇가지 언어로 얘기하는 것이 가능합니다. 언어를 선택해 주세요:"
#: help.php:47
msgid "Be a Help Volunteer"
@@ -187,29 +181,24 @@ msgid ""
"Volunteer%s. It's a great way to help the cause of scientific research and "
"volunteer computing - and it's fun!"
msgstr ""
-"만약 여러분이 경험많은 BOINC 사용자라면, 우리는 여러분이 %s도우미 기여자%s가 "
-"되길 장려합니다. 그 것은 과학적 연구와 기여자 컴퓨팅을 돕는 위대한 방법입니"
-"다 - 그리고 그 것을 즐기세요!"
+"만약 여러분이 경험많은 BOINC 사용자라면, 우리는 여러분이 %s도우미 기여자%s가 되길 장려합니다. 그 것은 과학적 연구와 기여자 "
+"컴퓨팅을 돕는 위대한 방법입니다 - 그리고 그 것을 즐기세요!"
#: help.php:56
#, php-format
msgid ""
"If you're already a Help Volunteer: to edit your settings, %sclick here%s."
-msgstr ""
-"여러분이 이미 도우미 기여자일 경우: 설정을 바꾸실려면 %s여기를 누르십시오%s."
+msgstr "여러분이 이미 도우미 기여자일 경우: 설정을 바꾸실려면 %s여기를 누르십시오%s."
#: help_funcs.php:107
msgid ""
"BOINC helpers are unpaid volunteers. Their advice is not endorsed by BOINC "
"or the University of California."
-msgstr ""
-"BOINC 도우미는 자원봉사자들입니다. 그들의 조언은 BOINC나 캘리포니아 대학교에"
-"서 보증하지 않습니다."
+msgstr "BOINC 도우미는 자원봉사자들입니다. 그들의 조언은 BOINC나 캘리포니아 대학교에서 보증하지 않습니다."
#: help_funcs.php:110
msgid "%1Never%2 give email address or password information to BOINC helpers."
-msgstr ""
-"%1절대로%2 이메일 주소나 비밀번호 정보를 BOINC 도우미에게 제공하지 마세요."
+msgstr "%1절대로%2 이메일 주소나 비밀번호 정보를 BOINC 도우미에게 제공하지 마세요."
#: index.php:24
msgid "Computing power"
@@ -253,7 +242,6 @@ msgstr "기여자"
# #######################################
# download.php
-# #######################################
#: index.php:85
msgid "Download"
msgstr "다운로드"
@@ -276,9 +264,8 @@ msgid ""
"diseases, study global warming, discover pulsars, and do many other types of "
"scientific research. It's safe, secure, and easy:"
msgstr ""
-"질병 치료, 지구 온난화 연구, 중성자별 발견 그 외에 또 많은 종류의 과학연구를 "
-"위해 여러분 컴퓨터(윈도우, 맥, 리눅스, 안드로이드)의 대기 시간을 사용하십시"
-"오. 이 것은 안전하고 보안이 철저하며 쉽습니다:"
+"질병 치료, 지구 온난화 연구, 중성자별 발견 그 외에 또 많은 종류의 과학연구를 위해 여러분 컴퓨터(윈도우, 맥, 리눅스, "
+"안드로이드)의 대기 시간을 사용하십시오. 이 것은 안전하고 보안이 철저하며 쉽습니다:"
#: index.php:96
msgid "Choose projects"
@@ -286,7 +273,6 @@ msgstr "프로젝트를 선택하세요"
# #######################################
# download.php
-# #######################################
#: index.php:97
msgid "Download BOINC software"
msgstr "BOINC 소프트웨어를 다운로드하세요"
@@ -298,11 +284,10 @@ msgstr "이메일 주소와 비밀번호를 입력하세요."
#: index.php:102
#, php-format
msgid ""
-"Or, if you run several projects, try an %saccount manager%s such as "
-"%sGridRepublic%s or %sBAM!%s. "
+"Or, if you run several projects, try an %saccount manager%s such as %"
+"sGridRepublic%s or %sBAM!%s. "
msgstr ""
-"혹시 여러 개의 프로젝트를 수행하고 계시다면 %s계정 관리자%s(%sGridRepublic%s"
-"이나 %sBAM!%s등)를 사용해 보십시오."
+"혹시 여러 개의 프로젝트를 수행하고 계시다면 %s계정 관리자%s(%sGridRepublic%s이나 %sBAM!%s등)를 사용해 보십시오."
#: index.php:118
msgid "Compute with BOINC"
@@ -316,16 +301,13 @@ msgstr "소프트웨어 업데이트"
msgid ""
"%1Scientists%2: use BOINC to create a %3volunteer computing project%4 giving "
"you the computing power of thousands of CPUs."
-msgstr ""
-"%1과학자%2: BOINC를 이용해서 %3기여자 컴퓨팅 프로젝트%4를 생성하고 CPU 수천 "
-"개분의 연산 능력을 제공받으세요."
+msgstr "%1과학자%2: BOINC를 이용해서 %3기여자 컴퓨팅 프로젝트%4를 생성하고 CPU 수천 개분의 연산 능력을 제공받으세요."
#: index.php:132
msgid ""
"%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
"Center%4."
-msgstr ""
-"%1대학%2: %3가상 캠퍼스 슈퍼컴퓨터 센터%4를 생성해서 BOINC를 이용하세요."
+msgstr "%1대학%2: %3가상 캠퍼스 슈퍼컴퓨터 센터%4를 생성해서 BOINC를 이용하세요."
#: index.php:137
msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
@@ -404,8 +386,8 @@ msgstr "%s기여자 컴퓨팅%s과 %s그리드 컴퓨팅%s을 위한 오픈 소
#: index.php:230
msgid "BOINC is based at The University of California, Berkeley"
msgstr ""
-"BOINC는 캘리포니아 대학교 버클리 캠퍼스(The University of California, "
-"Berkeley)에 기반을 두고 있습니다"
+"BOINC는 캘리포니아 대학교 버클리 캠퍼스(The University of California, Berkeley)에 기반을 두고 "
+"있습니다"
#: projects.inc:14
msgid "Distributed sensing"
@@ -425,9 +407,8 @@ msgid ""
"using sensors attached to Internet-connected computers. You must buy a "
"sensor to participate."
msgstr ""
-"Quake-Catcher Network는 인터넷에 연결된 컴퓨터에 연결된 센서를 사용한 세계에"
-"서 가장 큰 지진 감지망으로 개발되었습니다. 여러분이 참여하려면 반드시 센서를 "
-"사야 됩니다."
+"Quake-Catcher Network는 인터넷에 연결된 컴퓨터에 연결된 센서를 사용한 세계에서 가장 큰 지진 감지망으로 개발되었습니다. "
+"여러분이 참여하려면 반드시 센서를 사야 됩니다."
#: projects.inc:27
msgid "BOINC Poland Foundation"
@@ -443,17 +424,14 @@ msgid ""
"levels by using sensors connected to volunteers' computers. You must buy a "
"sensor to participate."
msgstr ""
-"이 프로젝트는 기여자들의 컴퓨터에 연결된 센서를 사용해서 지속적으로 업데이트"
-"되는 방사능 단계 지도를 대가없이 생성합니다. 여러분이 참여하려면 반드시 센서"
-"를 사야 됩니다."
+"이 프로젝트는 기여자들의 컴퓨터에 연결된 센서를 사용해서 지속적으로 업데이트되는 방사능 단계 지도를 대가없이 생성합니다. 여러분이 "
+"참여하려면 반드시 센서를 사야 됩니다."
#: projects.inc:33
msgid ""
"To participate in these projects you must buy a sensor and attach it to your "
"computer."
-msgstr ""
-"이러한 프로젝트에 참여하려면 여러분은 반드시 센서를 사서 컴퓨터에 연결시켜야 "
-"됩니다."
+msgstr "이러한 프로젝트에 참여하려면 여러분은 반드시 센서를 사서 컴퓨터에 연결시켜야 됩니다."
#: projects.inc:37
msgid "Cognitive science and artifical intelligence"
@@ -475,9 +453,8 @@ msgid ""
"databases, and part of speech taggers in order to imitate human behavior in "
"conversations."
msgstr ""
-"인공 지능은 회화에서 인간의 행동을 모방하기 위해서 의미망, 스테밍, 품사 데이"
-"터베이스, 품사 태거를 이용합니다. FreeHAL에서는 이런 인공 지능 개발을 위해서 "
-"의미망을 분석하고 FreeHAL에서 사용할 수 있게 변환합니다."
+"인공 지능은 회화에서 인간의 행동을 모방하기 위해서 의미망, 스테밍, 품사 데이터베이스, 품사 태거를 이용합니다. FreeHAL에서는 "
+"이런 인공 지능 개발을 위해서 의미망을 분석하고 FreeHAL에서 사용할 수 있게 변환합니다."
#: projects.inc:69
msgid "Biology and Medicine"
@@ -499,11 +476,9 @@ msgid ""
"the parasite. The FightMalaria at Home project is aimed at finding these new "
"targets."
msgstr ""
-"말라리야를 유발하는 기생충은 사용가능한 약물에 대한 내성이 계속 진화하고 있습"
-"니다. 따라서 우리는 시급히 현존하는 약을 대체할 새로운 약을 발견할 필요가 있"
-"습니다. 중요한 점은 이런 새로운 약은 기생충 안에 있는 '새로운' 단백질을 대상"
-"으로 요구합니다. FightMalaria at Home 프로젝트는 이러한 새로운 대상을 찾는 것을 "
-"목표로 합니다."
+"말라리야를 유발하는 기생충은 사용가능한 약물에 대한 내성이 계속 진화하고 있습니다. 따라서 우리는 시급히 현존하는 약을 대체할 새로운 "
+"약을 발견할 필요가 있습니다. 중요한 점은 이런 새로운 약은 기생충 안에 있는 '새로운' 단백질을 대상으로 요구합니다. "
+"FightMalaria at Home 프로젝트는 이러한 새로운 대상을 찾는 것을 목표로 합니다."
#: projects.inc:90
msgid "University of Karlsruhe (Germany)"
@@ -521,11 +496,9 @@ msgid ""
"protein malfunction or aggregation, and to develop new drugs on the basis of "
"the three-dimensions structure of biologically important proteins."
msgstr ""
-"POEM at HOME은 단백질의 활성 구조를 생물학적으로 예측하기 위해서 컴퓨터를 이용합"
-"니다. 또 단백질 간의 상호작용이 일어날 때의 신호처리 메커니즘을 이해하고자 합"
-"니다. 이외에 단백질의 기능 저하나 집적과 관련있는 질병을 이해하고 생물학적으"
-"로 중요한 단백질들의 3차원 구조에 기반해서 신약을 개발하는데 그 목적이 있습니"
-"다."
+"POEM at HOME은 단백질의 활성 구조를 생물학적으로 예측하기 위해서 컴퓨터를 이용합니다. 또 단백질 간의 상호작용이 일어날 때의 "
+"신호처리 메커니즘을 이해하고자 합니다. 이외에 단백질의 기능 저하나 집적과 관련있는 질병을 이해하고 생물학적으로 중요한 단백질들의 3차원 "
+"구조에 기반해서 신약을 개발하는데 그 목적이 있습니다."
#: projects.inc:98
msgid "University of Delaware"
@@ -542,9 +515,8 @@ msgid ""
"interactions and, by doing so, will search for insights into the discovery "
"of novel pharmaceuticals."
msgstr ""
-"Docking at Home은 생명과학과 컴퓨터 과학의 양면에 목표를 갖고 있습니다. 프로젝트"
-"는 단백질 리간드 상호작용의 원자적 세부사항을 이해하고 그렇게 함으로써 새로"
-"운 의약품을 개발하기 위한 식견을 넓히는 것을 목표로 합니다."
+"Docking at Home은 생명과학과 컴퓨터 과학의 양면에 목표를 갖고 있습니다. 프로젝트는 단백질 리간드 상호작용의 원자적 세부사항을 "
+"이해하고 그렇게 함으로써 새로운 의약품을 개발하기 위한 식견을 넓히는 것을 목표로 합니다."
#: projects.inc:114
msgid "Barcelona Biomedical Research Park (PRBB)"
@@ -561,10 +533,9 @@ msgid ""
"New biomedical applications suddenly become possible giving a new role to "
"computational biology for biomedical research."
msgstr ""
-"GPUGrid.net은 NVIDIA GPU에서 실행시키기 위해 처음으로 분자 속 전체 원자 동적 "
-"분석 코드(CellMD)로 특별히 최적화되었습니다. 이로서 새로운 계산 시나리오가 개"
-"척되었습니다. 새로운 생물의학 어플리케이션은 생물의학 연구를 위한 전산 생물학"
-"에 새로운 역할을 부여할 가능성을 가지고 있습니다."
+"GPUGrid.net은 NVIDIA GPU에서 실행시키기 위해 처음으로 분자 속 전체 원자 동적 분석 코드(CellMD)로 특별히 "
+"최적화되었습니다. 이로서 새로운 계산 시나리오가 개척되었습니다. 새로운 생물의학 어플리케이션은 생물의학 연구를 위한 전산 생물학에 새로운 "
+"역할을 부여할 가능성을 가지고 있습니다."
#: projects.inc:122
msgid "Technion, Israel"
@@ -580,15 +551,15 @@ msgid ""
"provoking genes causing some types of diabetes, hypertension (high blood "
"pressure), cancer, schizophrenia and many others."
msgstr ""
-"Superlink at Technion은 당뇨병, 고혈압, 암, 정신 분열증, 기타 질병 등을 유발하"
-"는 특정 종류의 질병 유발 유전자를 찾는 전세계 모든 유전학자를 지원합니다."
+"Superlink at Technion은 당뇨병, 고혈압, 암, 정신 분열증, 기타 질병 등을 유발하는 특정 종류의 질병 유발 유전자를 찾는 "
+"전세계 모든 유전학자를 지원합니다."
#: projects.inc:138
msgid ""
"University of Maryland Center for Bioinformatics and Computational Biology"
msgstr ""
-"메릴랜드 대학교 생물정보학과 전산생물학 연구 센터(University of Maryland "
-"Center for Bioinformatics and Computational Biology)"
+"메릴랜드 대학교 생물정보학과 전산생물학 연구 센터(University of Maryland Center for Bioinformatics "
+"and Computational Biology)"
#: projects.inc:139
msgid "Life science research"
@@ -601,9 +572,8 @@ msgid ""
"bacterial, plasmid, and virus protein sequences; and biological diversity in "
"nature reserves. "
msgstr ""
-"Lattice 프로젝트는 Maryland 대학교의 과학자들에게 컴퓨터 연산 능력을 제공합니"
-"다. 연구 분야: DNA 서열 데이터에 기반한 진화 관계, 박테리아, 플라스미드, 바이"
-"러스의 단백질 서열, 자연보호구역의 생물학적 다양성"
+"Lattice 프로젝트는 Maryland 대학교의 과학자들에게 컴퓨터 연산 능력을 제공합니다. 연구 분야: DNA 서열 데이터에 기반한 "
+"진화 관계, 박테리아, 플라스미드, 바이러스의 단백질 서열, 자연보호구역의 생물학적 다양성"
#: projects.inc:146
msgid "The Swiss Tropical Institute"
@@ -623,12 +593,10 @@ msgid ""
"populations with a diverse set of parameters related to biological and "
"social factors that influence the distribution of the disease. "
msgstr ""
-"전염 개체들의 시뮬레이션과 말라리아가 건강에 끼치는 영향은 말라리아 통제를 위"
-"한 중요한 수단입니다. 이는 현재 개발되고 있거나 시험 중인 새로운 백신, 화학요"
-"법, 모기장을 제공하기 위한 최적화된 전략을 정하기 위해서 이용될 수 있습니다. "
-"이러한 모델은 컴퓨터에 매우 의존해야 되며, 질병 분포에 영향을 미치는 생물학"
-"적, 사회적 요인들이 관련된 인자를 포함한 여러 종류의 조건을 갖춘 대규모 인구 "
-"집단의 시뮬레이션이 요구됩니다."
+"전염 개체들의 시뮬레이션과 말라리아가 건강에 끼치는 영향은 말라리아 통제를 위한 중요한 수단입니다. 이는 현재 개발되고 있거나 시험 중인 "
+"새로운 백신, 화학요법, 모기장을 제공하기 위한 최적화된 전략을 정하기 위해서 이용될 수 있습니다. 이러한 모델은 컴퓨터에 매우 "
+"의존해야 되며, 질병 분포에 영향을 미치는 생물학적, 사회적 요인들이 관련된 인자를 포함한 여러 종류의 조건을 갖춘 대규모 인구 집단의 "
+"시뮬레이션이 요구됩니다."
#: projects.inc:170
msgid "University of Washington"
@@ -647,11 +615,10 @@ msgid ""
"efforts at designing new proteins to fight diseases such as HIV, Malaria, "
"Cancer, and Alzheimer's"
msgstr ""
-"단백질의 3차원 형태를 파악하는 연구는 궁극적으로 특정 질병의 치료법을 이끌어"
-"낼 수 있을지도 모릅니다. Rosetta at home을 실행함으로써 여러분의 도움 없이는 시"
-"도할 수 없었던 방법으로 연구를 진행하고 있습니다. 따라서 여러분은 저희 연구"
-"의 속도를 높이고 확장하는 것을 도울 수 있습니다. 또한 HIV, 말라리아, 암, 알츠"
-"하이머 병과 같은 질환과 싸울 새로운 단백질의 설계를 도와줄 수 있습니다."
+"단백질의 3차원 형태를 파악하는 연구는 궁극적으로 특정 질병의 치료법을 이끌어낼 수 있을지도 모릅니다. Rosetta at home을 "
+"실행함으로써 여러분의 도움 없이는 시도할 수 없었던 방법으로 연구를 진행하고 있습니다. 따라서 여러분은 저희 연구의 속도를 높이고 "
+"확장하는 것을 도울 수 있습니다. 또한 HIV, 말라리아, 암, 알츠하이머 병과 같은 질환과 싸울 새로운 단백질의 설계를 도와줄 수 "
+"있습니다."
#: projects.inc:178
msgid "University of Vienna"
@@ -663,8 +630,8 @@ msgid ""
"the resulting data, which plays a key role in many bioinformatics research "
"projects."
msgstr ""
-"단백질 사이의 유사성을 계산합니다. SIMAP는 많은 생명 정보학 연구 프로젝트에"
-"게 중요한 역할을 하는 결과 값들의 공공 데이터베이스를 제공합니다."
+"단백질 사이의 유사성을 계산합니다. SIMAP는 많은 생명 정보학 연구 프로젝트에게 중요한 역할을 하는 결과 값들의 공공 데이터베이스를 "
+"제공합니다."
#: projects.inc:186
msgid "Earth Sciences"
@@ -689,12 +656,10 @@ msgid ""
"cycle. This will allow us to explore how climate may change in the next "
"century under a wide range of different scenarios."
msgstr ""
-"최첨단 기후 모델로 만들어진 근사값을 추측합니다. 우리는 해당 모델을 여러 번 "
-"실행시켜서, 근사값을 조금씩 수정함에 따라 모델이 어떻게 반응하는지를 알아내려"
-"고 하고 있습니다.(근사값이 비현실적인 값이 되지 않을 만큼 조금씩만 변화시킵니"
-"다) 이 것은 우리의 모델이 작은 변화나 이산화탄소 및 유황순환의 변화에 얼마"
-"나 민감한지 이해할 수 있게 해줍니다. 또한 우리에게 기후가 다른 시나리오에서 "
-"넓은 지역에 걸쳐 다음 세기에 어떻게 변할 것인지 탐색할 수 있게 해줄 것입니다."
+"최첨단 기후 모델로 만들어진 근사값을 추측합니다. 우리는 해당 모델을 여러 번 실행시켜서, 근사값을 조금씩 수정함에 따라 모델이 어떻게 "
+"반응하는지를 알아내려고 하고 있습니다.(근사값이 비현실적인 값이 되지 않을 만큼 조금씩만 변화시킵니다) 이 것은 우리의 모델이 작은 "
+"변화나 이산화탄소 및 유황순환의 변화에 얼마나 민감한지 이해할 수 있게 해줍니다. 또한 우리에게 기후가 다른 시나리오에서 넓은 지역에 "
+"걸쳐 다음 세기에 어떻게 변할 것인지 탐색할 수 있게 해줄 것입니다."
#: projects.inc:207
msgid "Physical Science"
@@ -723,11 +688,9 @@ msgid ""
"star formation history) on a resolved pixel-by-pixel basis using spectral "
"energy distribution (SED) fitting techniques in a distributed computing mode."
msgstr ""
-"저희는 근처 우주의 다파장 UV 광학 NIR 은하 지도를 생성하기 위해 GALEX, Pan-"
-"STARRS1, WISE의 스펙트럼 커버리지를 통합합니다. 저희는 분산 컴퓨팅 모드에서 "
-"스펙트럼 에너지 분포(SED) 피팅 기술을 사용한, 분해된 개별 픽셀 정보상의 물리"
-"적 파라메터들(예를 들어 항성의 질량 면밀도, 항성 생성률의 면밀도, 감쇠, 일차 "
-"항성의 형성 이력)을 측량합니다."
+"저희는 근처 우주의 다파장 UV 광학 NIR 은하 지도를 생성하기 위해 GALEX, Pan-STARRS1, WISE의 스펙트럼 커버리지를 "
+"통합합니다. 저희는 분산 컴퓨팅 모드에서 스펙트럼 에너지 분포(SED) 피팅 기술을 사용한, 분해된 개별 픽셀 정보상의 물리적 "
+"파라메터들(예를 들어 항성의 질량 면밀도, 항성 생성률의 면밀도, 감쇠, 일차 항성의 형성 이력)을 측량합니다."
#: projects.inc:247
msgid "University of Texas at Austin"
@@ -749,19 +712,14 @@ msgid ""
"single event of interest can be expected to occur. Our research group is "
"interested in calculating the long time dynamics of systems."
msgstr ""
-"이론화학, 응집물질물리학, 재료과학에서의 일반적인 문제는 화학 반응이나 확산"
-"이 발생할 때 원자 단위 체계에서 일어나는 시간 변화를 계산하는 것입니다. 일반"
-"적으로 우리가 관측하려는 사건은 훨씬 드물게 발생합니다.(원자의 진동속도보다 "
-"비교할 수 없을 정도로 느립니다) 즉 원자 각각의 운동을 직접 시뮬레이션다면, 관"
-"측하려는 사건을 단 한 번 발생시키려고 하는 데만도 현존하는 가장 빠른 컴퓨터"
-"로 수천 년이 걸릴 정도입니다. 저희 연구 단체에서는 체계의 장시간 역학을 계산"
-"하는 것에 흥미를 갖고 있습니다."
+"이론화학, 응집물질물리학, 재료과학에서의 일반적인 문제는 화학 반응이나 확산이 발생할 때 원자 단위 체계에서 일어나는 시간 변화를 "
+"계산하는 것입니다. 일반적으로 우리가 관측하려는 사건은 훨씬 드물게 발생합니다.(원자의 진동속도보다 비교할 수 없을 정도로 느립니다) 즉 "
+"원자 각각의 운동을 직접 시뮬레이션다면, 관측하려는 사건을 단 한 번 발생시키려고 하는 데만도 현존하는 가장 빠른 컴퓨터로 수천 년이 "
+"걸릴 정도입니다. 저희 연구 단체에서는 체계의 장시간 역학을 계산하는 것에 흥미를 갖고 있습니다."
#: projects.inc:262
msgid "University of Illinois at Urbana-Champaign"
-msgstr ""
-"일리노이 대학교 어바나-샴페인<br />(University of Illinois at Urbana-"
-"Chamapign)"
+msgstr "일리노이 대학교 어바나-샴페인<br />(University of Illinois at Urbana-Chamapign)"
#: projects.inc:264
msgid ""
@@ -769,8 +727,8 @@ msgid ""
"our Universe and to find the range of models that agree with the available "
"astronomical particle physics data."
msgstr ""
-"Cosmology at Home의 목표는 우리 우주를 가장 잘 기술할 수 있는 모델을 찾고 사용 "
-"가능한 천문학적 입자 물리학 데이터와 일치하는 모델의 범위를 찾습니다."
+"Cosmology at Home의 목표는 우리 우주를 가장 잘 기술할 수 있는 모델을 찾고 사용 가능한 천문학적 입자 물리학 데이터와 일치하는 "
+"모델의 범위를 찾습니다."
#: projects.inc:270
msgid "Rensselaer Polytechnic Institute"
@@ -782,9 +740,8 @@ msgid ""
"model of the Milky Way galaxy using data gathered by the Sloan Digital Sky "
"Survey."
msgstr ""
-"Milkyway at Home의 목표는 슬론 디지털 스카이 탐사(Sloan Digital Sky Survey)에서 "
-"수집된 데이터를 사용해서 은하수 은하의 가장 정확한 3차원 모델을 만드는 것입니"
-"다."
+"Milkyway at Home의 목표는 슬론 디지털 스카이 탐사(Sloan Digital Sky Survey)에서 수집된 데이터를 사용해서 "
+"은하수 은하의 가장 정확한 3차원 모델을 만드는 것입니다."
#: projects.inc:278
msgid "Leiden University, The Netherlands"
@@ -799,18 +756,16 @@ msgid ""
"argon, or to test the validity of the ideal gas law by actually doing the "
"simulations through the grid."
msgstr ""
-"표면 과학 계산은 고전 역학을 이용합니다. Leiden Classical은 기여자, 학생, 다"
-"른 과학자에게 가각 개인적으로 한 계산을 그리드로 제출할 수 있게 해줍니다. 각 "
-"유저는 고전 역학 작업을 위한 개인적인 대기열을 가지고 있습니다. 이런 방식으"
-"로 학생들은 액체 아르곤을 시뮬레이션하기 위해서 또는 실제로 그리드를 통해서 "
-"시뮬레이션을 실행함으로써 이상기체 법칙의 타당성을 시험하기 위해 그리드를 이"
-"용할 수 있습니다."
+"표면 과학 계산은 고전 역학을 이용합니다. Leiden Classical은 기여자, 학생, 다른 과학자에게 가각 개인적으로 한 계산을 "
+"그리드로 제출할 수 있게 해줍니다. 각 유저는 고전 역학 작업을 위한 개인적인 대기열을 가지고 있습니다. 이런 방식으로 학생들은 액체 "
+"아르곤을 시뮬레이션하기 위해서 또는 실제로 그리드를 통해서 시뮬레이션을 실행함으로써 이상기체 법칙의 타당성을 시험하기 위해 그리드를 "
+"이용할 수 있습니다."
#: projects.inc:294
msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
msgstr ""
-"위스콘신-밀워키 대학교(Univ. of Wisconsin - Milwaukee), 막스 플랑크 연구소"
-"(Max Planck Institute)"
+"위스콘신-밀워키 대학교(Univ. of Wisconsin - Milwaukee), 막스 플랑크 연구소(Max Planck "
+"Institute)"
#: projects.inc:295
msgid "Astrophysics"
@@ -824,10 +779,8 @@ msgid ""
"supported by the American Physical Society (APS) and by a number of "
"international organizations."
msgstr ""
-"LIGO 및 GEO 중력파 감지기와 아레시보 전파 망원경에서 수집된 데이터를 사용해"
-"서 회전하는 중성자 별(펄서라고도 합니다)을 찾습니다. Einstein at Home은 미국 물"
-"리학 협회(APS) 및 수많은 국제 단체로부터 지원을 받는 2005 세계 과학의 해 프로"
-"젝트입니다."
+"LIGO 및 GEO 중력파 감지기와 아레시보 전파 망원경에서 수집된 데이터를 사용해서 회전하는 중성자 별(펄서라고도 합니다)을 찾습니다. "
+" Einstein at Home은 미국 물리학 협회(APS) 및 수많은 국제 단체로부터 지원을 받는 2005 세계 과학의 해 프로젝트입니다."
#: projects.inc:310 projects.inc:318
msgid "CERN (European Organization for Nuclear Research)"
@@ -845,10 +798,9 @@ msgid ""
"investigate on particles proprieties. LHC at home runs simulations to improve "
"the design of LHC and its detectors."
msgstr ""
-"대형 강입자 가속기(LHC)는 CERN(유럽 입자 물리 연구소)에 위치한 소립자 가속기"
-"이며, 세계에서 가장 큰 입자 물리학 연구시설입니다. 이것은 입자의 속성을 조사"
-"하기 위해서 건설한 것 중 가장 강력한 장치입니다. LHC at home은 LHC 및 검출기의 "
-"설계를 향상시키기 위한 시뮬레이션을 수행합니다."
+"대형 강입자 가속기(LHC)는 CERN(유럽 입자 물리 연구소)에 위치한 소립자 가속기이며, 세계에서 가장 큰 입자 물리학 "
+"연구시설입니다. 이것은 입자의 속성을 조사하기 위해서 건설한 것 중 가장 강력한 장치입니다. LHC at home은 LHC 및 검출기의 설계를 "
+"향상시키기 위한 시뮬레이션을 수행합니다."
#: projects.inc:320
msgid ""
@@ -856,9 +808,8 @@ msgid ""
"LHC event physics simulation on volunteer computers. Requires that you "
"install VirtualBox on your computer"
msgstr ""
-"이 프로젝트는 CERN이 개발한, 완전히 독립된 LHC 사건(event) 물리학 시뮬레이션"
-"용 가상 머신 기술을 기여자 컴퓨터 상에서 사용합니다. 따라서 여러분은 컴퓨터"
-"에 VirtualBox를 설치해야 됩니다."
+"이 프로젝트는 CERN이 개발한, 완전히 독립된 LHC 사건(event) 물리학 시뮬레이션용 가상 머신 기술을 기여자 컴퓨터 상에서 "
+"사용합니다. 따라서 여러분은 컴퓨터에 VirtualBox를 설치해야 됩니다."
#: projects.inc:326
msgid "University of California, Berkeley"
@@ -876,11 +827,10 @@ msgid ""
"signals from space. Such signals are not known to occur naturally, so a "
"detection would provide evidence of extraterrestrial technology."
msgstr ""
-"SETI(Search for Extraterrestrial Intelligence, 외계 지성체 탐사)는 지구 밖에 "
-"존재하는 지성체를 감지하는 데 목표를 둔 과학 분야입니다. 라디오 SETI로 알려"
-"진 한가지 접근 방법은 우주에서 오는, 좁은 대역폭의 전파를 듣기 위해서 전파 망"
-"원경을 사용합니다. 어떤 신호는 자연적으로 발생하지 않는다고 알려져 있습니다. "
-"따라서 이 것의 감지는 외계 기술의 증거를 제공해 줄 수도 있습니다."
+"SETI(Search for Extraterrestrial Intelligence, 외계 지성체 탐사)는 지구 밖에 존재하는 지성체를 "
+"감지하는 데 목표를 둔 과학 분야입니다. 라디오 SETI로 알려진 한가지 접근 방법은 우주에서 오는, 좁은 대역폭의 전파를 듣기 위해서 "
+"전파 망원경을 사용합니다. 어떤 신호는 자연적으로 발생하지 않는다고 알려져 있습니다. 따라서 이 것의 감지는 외계 기술의 증거를 제공해 "
+"줄 수도 있습니다."
#: projects.inc:342
msgid "Bielefeld University of Applied Sciences"
@@ -897,9 +847,8 @@ msgid ""
"applications in medicine (such as local tumor chemotherapy) and "
"biotechnology."
msgstr ""
-"분자 자석과 제어된 나노 단위의 자력을 연구합니다. 이런 자성을 가진 분자는 의"
-"약품(예를 들어 국소암 화학 요법)과 생물 공학에 적용할 수 있는 극소형 자성 스"
-"위치 개발에 사용될 수 있을지도 모릅니다."
+"분자 자석과 제어된 나노 단위의 자력을 연구합니다. 이런 자성을 가진 분자는 의약품(예를 들어 국소암 화학 요법)과 생물 공학에 적용할 "
+"수 있는 극소형 자성 스위치 개발에 사용될 수 있을지도 모릅니다."
#: projects.inc:351
msgid "Multiple applications"
@@ -919,8 +868,7 @@ msgid ""
"adopt the technologies of volunteer computing and volunteer thinking for "
"their research."
msgstr ""
-"CAS at home의 목적은 기여자 컴퓨팅 기술과 연구에 대한 기여자들의 생각을 채택해"
-"서 중국에 있는 과학자들을 장려하고 지원하는 것입니다."
+"CAS at home의 목적은 기여자 컴퓨팅 기술과 연구에 대한 기여자들의 생각을 채택해서 중국에 있는 과학자들을 장려하고 지원하는 것입니다."
#: projects.inc:365
msgid "Mathematics, physics, evolution"
@@ -931,14 +879,14 @@ msgid ""
"Yoyo at home is an adapter between BOINC and several existing volunteer "
"computing projects: ECM, Muon, Evolution at home, and distributed.net"
msgstr ""
-"Yoyo at home은 BOINC와 기존 기여자 컴퓨팅 프로젝트(ECM, 뮤온, Evolution at home, "
-"distributed.net)를 중개합니다."
+"Yoyo at home은 BOINC와 기존 기여자 컴퓨팅 프로젝트(ECM, 뮤온, Evolution at home, distributed.net)를 "
+"중개합니다."
#: projects.inc:371 projects.inc:527
msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
msgstr ""
-"MTA-SZTAKI 병렬 및 분산 시스템 연구소 (헝가리, MTA-SZTAKI Laboratory of "
-"Parallel and Distributed Systems)"
+"MTA-SZTAKI 병렬 및 분산 시스템 연구소 (헝가리, MTA-SZTAKI Laboratory of Parallel and "
+"Distributed Systems)"
#: projects.inc:372
msgid "European research projects"
@@ -951,10 +899,8 @@ msgid ""
"processed by the volunteers of this project. The scientific projects covered "
"by the project include math, physics, biology, etc."
msgstr ""
-"EDGeS at Home 베타 프로젝트는 해당 프로젝트의 기여자가 처리해야할 작업 유닛을 전"
-"송하는 서비스 그리드를 허용함으로써 유럽 서비스 그리드 네트워크와 기여자 컴퓨"
-"팅을 통합합니다. 과학 프로젝트는 수학, 물리학, 생물학, 기타 등을 포함하고 있"
-"습니다."
+"EDGeS at Home 베타 프로젝트는 해당 프로젝트의 기여자가 처리해야할 작업 유닛을 전송하는 서비스 그리드를 허용함으로써 유럽 서비스 "
+"그리드 네트워크와 기여자 컴퓨팅을 통합합니다. 과학 프로젝트는 수학, 물리학, 생물학, 기타 등을 포함하고 있습니다."
#: projects.inc:379
msgid "Spanish universities and research centers"
@@ -983,9 +929,8 @@ msgid ""
"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, "
"clean water and many more."
msgstr ""
-"세계에서 가장 큰 기여자 컴퓨팅 그리드를 통해서 인류가 직면한 가장 심각한 문제"
-"를 비영리적으로 연구합니다. 연구에는 HIV 에이즈, 암, 열대 지방의 병 및 연구"
-"가 덜 된 질병, 태양 에너지, 깨끗한 물 이외에 많은 것들이 포함됩니다."
+"세계에서 가장 큰 기여자 컴퓨팅 그리드를 통해서 인류가 직면한 가장 심각한 문제를 비영리적으로 연구합니다. 연구에는 HIV 에이즈, "
+"암, 열대 지방의 병 및 연구가 덜 된 질병, 태양 에너지, 깨끗한 물 이외에 많은 것들이 포함됩니다."
#: projects.inc:395
msgid "Mathematics, computing, and games"
@@ -1012,8 +957,7 @@ msgid ""
"Attempt to decode 3 original Enigma messages. The signals were intercepted "
"in the North Atlantic in 1942 and are believed to be unbroken."
msgstr ""
-"3가지 에니그마 원문을 해독하고자 시도합니다. 이 신호는 1942년 북대서양에서 포"
-"착되었으며 깨지지 않은 것으로 여겨지고 있습니다."
+"3가지 에니그마 원문을 해독하고자 시도합니다. 이 신호는 1942년 북대서양에서 포착되었으며 깨지지 않은 것으로 여겨지고 있습니다."
#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
#: projects.inc:528 projects.inc:568
@@ -1026,8 +970,7 @@ msgstr "수학에서 풀리지 않은 Collatz 추측을 연구합니다."
#: projects.inc:471
msgid "California State University Fullerton"
-msgstr ""
-"캘리포니아 주립 대학교 풀러턴 캠퍼스(California State University Fullerton)"
+msgstr "캘리포니아 주립 대학교 풀러턴 캠퍼스(California State University Fullerton)"
#: projects.inc:472
msgid "Factorization of large integers"
@@ -1042,19 +985,18 @@ msgid ""
"NFS at Home is a continuation of that experience, only with integers that are "
"hundreds of digits long."
msgstr ""
-"NFS at Home은 큰 정수들을 수체선별법(Number Field Sieve)으로써 인수분해하는 래티"
-"스 시빙 절차를 시행하기 위해서, 인터넷에 연결된 컴퓨터를 사용하는 연구 프로젝"
-"트입니다. 초등학교 저학년 시절에 15 = 3 * 5 혹은 35 = 5 * 7처럼 정수를 소인수"
-"로 쪼개어 본 경험을 하셨을 것입니다. NFS at Home은 이러한 경험의 연장선입니다. "
-"단지 정수가 백자리 정도의 길이를 갖을 뿐입니다."
+"NFS at Home은 큰 정수들을 수체선별법(Number Field Sieve)으로써 인수분해하는 래티스 시빙 절차를 시행하기 위해서, "
+"인터넷에 연결된 컴퓨터를 사용하는 연구 프로젝트입니다. 초등학교 저학년 시절에 15 = 3 * 5 혹은 35 = 5 * 7처럼 정수를 "
+"소인수로 쪼개어 본 경험을 하셨을 것입니다. NFS at Home은 이러한 경험의 연장선입니다. 단지 정수가 백자리 정도의 길이를 갖을 "
+"뿐입니다."
#: projects.inc:479
msgid ""
"Vilnius Gediminas Technical University and Kaunas University of Technology "
"(Lithuania)"
msgstr ""
-"빌니우스 게디미나스 공과대학교(Vilnius Gediminas Technical University)와 카우"
-"나스 기술 대학교(Kaunas University of Technology)(리투아니아)"
+"빌니우스 게디미나스 공과대학교(Vilnius Gediminas Technical University)와 카우나스 기술 대학교(Kaunas "
+"University of Technology)(리투아니아)"
#: projects.inc:480
msgid "Software testing"
@@ -1067,15 +1009,13 @@ msgid ""
"well as others Lithuanian academic institutions. Current applications "
"involve the study of Monte-Carlo based software testing."
msgstr ""
-"이 프로젝트의 목표는 Vilnius Gediminas 공과대학교와 같은 다른 리투아니아 연"
-"구 기관들의 과학자에게 강력한 분산 컴퓨팅 플랫폼을 제공하는 것입니다. 현 응"
-"용 프로그램은 몬테 카를로 이론에 기반한 소프트웨어 테스트를 수반합니다."
+"이 프로젝트의 목표는 Vilnius Gediminas 공과대학교와 같은 다른 리투아니아 연구 기관들의 과학자에게 강력한 분산 컴퓨팅 "
+"플랫폼을 제공하는 것입니다. 현 응용 프로그램은 몬테 카를로 이론에 기반한 소프트웨어 테스트를 수반합니다."
#: projects.inc:503
msgid "Mathematical Institute of Leiden University / Kennislink"
msgstr ""
-"Leiden 대학교 수학 연구소(Mathematical Institute of Leiden University) / "
-"Kennislink"
+"Leiden 대학교 수학 연구소(Mathematical Institute of Leiden University) / Kennislink"
#: projects.inc:505
msgid ""
@@ -1087,20 +1027,19 @@ msgid ""
"problems in mathematics. If it is proven to be true, a lot of other open "
"problems can be answered directly from it."
msgstr ""
-"'ABC 삼각형'을 찾습니다: 양의 정수 a, b, c는 다음과 같다. a+b=c, a < b "
-"< c, a, b, c는 공약수가 없으며 c > rad(abc)이다. 여기서 rad(n)은 n을 구성"
-"하는 소인수들의 곱을 나타냅니다. ABC 추측은 log(c)/log(rad(abc)) > h (h는 1보"
-"다 큰 임의의 실수)를 만족하는 a, b, c는 유한하다고 말하고 있습니다. ABC 추측"
-"은 현재 수학에서 가장 큰 미해결 문제 중 하나입니다. 만약 이 것이 사실로 증명"
-"되면 이 것에서 다른 수많은 미해결 문제들의 답을 직접적으로 찾을 수 있습니다."
+"'ABC 삼각형'을 찾습니다: 양의 정수 a, b, c는 다음과 같다. a+b=c, a < b < c, a, b, c는 "
+"공약수가 없으며 c > rad(abc)이다. 여기서 rad(n)은 n을 구성하는 소인수들의 곱을 나타냅니다. ABC 추측은 "
+"log(c)/log(rad(abc)) > h (h는 1보다 큰 임의의 실수)를 만족하는 a, b, c는 유한하다고 말하고 있습니다. "
+"ABC 추측은 현재 수학에서 가장 큰 미해결 문제 중 하나입니다. 만약 이 것이 사실로 증명되면 이 것에서 다른 수많은 미해결 문제들의 "
+"답을 직접적으로 찾을 수 있습니다."
#: projects.inc:513
msgid ""
"Primegrid has multiple projects searching for different forms of very large "
"prime numbers, including searching for the largest known prime number."
msgstr ""
-"Primegrid는 다른 형태의 매우 큰 소수를 찾는 복수 프로젝트입니다. 그중에는 알"
-"려진 소수 중 가장 큰 소수를 찾는 프로젝트도 포함됩니다."
+"Primegrid는 다른 형태의 매우 큰 소수를 찾는 복수 프로젝트입니다. 그중에는 알려진 소수 중 가장 큰 소수를 찾는 프로젝트도 "
+"포함됩니다."
#: projects.inc:519
msgid "Hochschule RheinMain University of Applied Sciences"
@@ -1116,9 +1055,7 @@ msgstr "소수 증명과 관련된 두가지 추측의 반례를 찾습니다"
msgid ""
"Find all the generalized binary number systems (in which bases are matrices "
"and digits are vectors) up to dimension 11."
-msgstr ""
-"11차원 이상에서 법칙화된 2진수 체계(행렬들로 이루어졌으며, 숫자는 벡터)를 모"
-"두 찾습니다."
+msgstr "11차원 이상에서 법칙화된 2진수 체계(행렬들로 이루어졌으며, 숫자는 벡터)를 모두 찾습니다."
#: ../html/inc/news.inc:40
msgid "Comment"
diff --git a/locale/lv/BOINC-Manager.po b/locale/lv/BOINC-Manager.po
index fb9dbce..071ef42 100644
--- a/locale/lv/BOINC-Manager.po
+++ b/locale/lv/BOINC-Manager.po
@@ -17,17 +17,18 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\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-BOINC-UTF8-Marker: 简体中文, 日本語\n"
"X-POOTLE-MTIME: 1394399823.0\n"
# 81%
#: AccountInfoPage.cpp:387
+#, c-format
#, c-format, c-format
msgid "Identify your account at %s"
msgstr "Identificējiet jūsu kontu %s"
@@ -2064,6 +2065,7 @@ msgid "%s - Language Selection"
msgstr "%s - valodas atlase"
#: DlgOptions.cpp:695
+#, c-format
#, c-format, c-format
msgid ""
"The %s's language has been changed. In order for this change to take "
@@ -2983,6 +2985,7 @@ msgid "Removing project..."
msgstr "Noņem projektu..."
#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#, c-format
#, c-format, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "Vai tiešām vēlaties atjaunināt projektu '%s'?"
@@ -3440,6 +3443,7 @@ msgstr ""
"(Progress: %s, Statuss: %s)"
#: ViewWork.cpp:485
+#, c-format
#, c-format, c-format
msgid "Are you sure you want to abort these %d tasks?"
msgstr "Vai tiešām vēlaties pārtaukt apstrādāt šos %d uzdevums?"
@@ -3607,6 +3611,7 @@ msgstr "Aizvērt"
# 83%
#: sg_DlgMessages.cpp:389
+#, c-format
#, c-format, c-format
msgid "%s - Notices"
msgstr "%s - Paziņojumi"
@@ -3830,6 +3835,7 @@ msgid "Pop up a menu of commands to apply to this task"
msgstr "Rādīt uznirstošo izvēlni ar komandām, ko pielietot šim uzdevumam"
#: sg_TaskPanel.cpp:701
+#, c-format
#, c-format, c-format
msgid "Application: %s"
msgstr "Lietojums: %s"
@@ -3854,6 +3860,7 @@ msgstr "Pagājis: %s"
# 84%
#: sg_TaskPanel.cpp:861
+#, c-format
#, c-format, c-format
msgid "Remaining (estimated): %s"
msgstr "Atlicis (paredzams): %s"
@@ -3946,6 +3953,7 @@ msgstr "Rādīt visu"
# 87%
#: mac/Mac_GUI.cpp:186
+#, c-format
#, c-format, c-format
msgid "Quit %s"
msgstr "Iziet %s"
diff --git a/locale/lv/BOINC-Web.po b/locale/lv/BOINC-Web.po
index d977dd8..7cd89c3 100644
--- a/locale/lv/BOINC-Web.po
+++ b/locale/lv/BOINC-Web.po
@@ -948,21 +948,21 @@ msgstr ""
#~ msgid "POEM at HOME"
#~ msgstr "Home"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "English"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "English"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
# poll-related stuff
# #######################################
#~ msgid "POLL_TITLE"
@@ -1259,9 +1259,9 @@ msgstr ""
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1326,9 +1326,9 @@ msgstr ""
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/ms/BOINC-Android.po b/locale/ms/BOINC-Android.po
index c810c5f..d9bd120 100644
--- a/locale/ms/BOINC-Android.po
+++ b/locale/ms/BOINC-Android.po
@@ -2,7 +2,6 @@
# Copyright (C) 2013 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL at ADDRESS>, 2013.
-#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
diff --git a/locale/ms/BOINC-Client.po b/locale/ms/BOINC-Client.po
index 9ae5b19..d3326a3 100644
--- a/locale/ms/BOINC-Client.po
+++ b/locale/ms/BOINC-Client.po
@@ -2,7 +2,6 @@
# 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: PACKAGE VERSION\n"
diff --git a/locale/ms/BOINC-Manager.po b/locale/ms/BOINC-Manager.po
index 64eed48..8e3f67b 100644
--- a/locale/ms/BOINC-Manager.po
+++ b/locale/ms/BOINC-Manager.po
@@ -2,7 +2,6 @@
# 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: PACKAGE VERSION\n"
diff --git a/locale/ms/BOINC-Project-Generic.po b/locale/ms/BOINC-Project-Generic.po
index a8258b0..27700af 100644
--- a/locale/ms/BOINC-Project-Generic.po
+++ b/locale/ms/BOINC-Project-Generic.po
@@ -1,10 +1,7 @@
# 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: PACKAGE VERSION\n"
diff --git a/locale/ms/BOINC-Setup.po b/locale/ms/BOINC-Setup.po
index 3c31664..701d86a 100644
--- a/locale/ms/BOINC-Setup.po
+++ b/locale/ms/BOINC-Setup.po
@@ -2,7 +2,6 @@
# 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: PACKAGE VERSION\n"
diff --git a/locale/nl/BOINC-Project-Generic.po b/locale/nl/BOINC-Project-Generic.po
index 5dff162..7ae8384 100644
--- a/locale/nl/BOINC-Project-Generic.po
+++ b/locale/nl/BOINC-Project-Generic.po
@@ -7344,18 +7344,18 @@ msgstr "(alle applicaties)"
#~ msgid "No such message."
#~ msgstr "Geen bericht gevonden."
-# Apps page (apps.php)
-# ########################################
+# Apps page (apps.php)
+# ########################################
#~ msgid "APPS_TITLE"
#~ msgstr "Applicaties"
-# Rules and Policies page (info.php)
-# ########################################
+# Rules and Policies page (info.php)
+# ########################################
#~ msgid "RULES_TITLE"
#~ msgstr "Lees onze regels en beleid"
-# Create account form (create_account_form.php)
-# ########################################
+# Create account form (create_account_form.php)
+# ########################################
#~ msgid "CREATE_AC_TITLE"
#~ msgstr "Maak een an account"
@@ -7365,9 +7365,9 @@ msgstr "(alle applicaties)"
#~ msgid "FORUM_TITLE_SHORT"
#~ msgstr "Forums"
-# ########################################
-# General stuff (create_account_form.php and others)
-# ########################################
+# ########################################
+# General stuff (create_account_form.php and others)
+# ########################################
#~ msgid "OPTIONAL"
#~ msgstr "Optioneel"
@@ -7398,19 +7398,19 @@ msgstr "(alle applicaties)"
#~ msgid "TEAM_TABLE_MEMBERS"
#~ msgstr "Leden"
-# ########################################
-# Forum
-# ########################################
+# ########################################
+# Forum
+# ########################################
#~ msgid "FORUM_POSTS"
#~ msgstr "Berichten"
-# Forum thread
-# ########################################
+# Forum thread
+# ########################################
#~ msgid "FORUM_THREAD_HIDDEN"
#~ msgstr "Deze discussie is verborgen voor administratieve doeleinden"
-# Forum search features
-# ########################################
+# Forum search features
+# ########################################
# Apps page (apps.php)
# ########################################
# Rules and Policies page (info.php)
diff --git a/locale/nl/BOINC-Web.po b/locale/nl/BOINC-Web.po
index d9bc8dc..12ba8ae 100644
--- a/locale/nl/BOINC-Web.po
+++ b/locale/nl/BOINC-Web.po
@@ -1778,11 +1778,11 @@ msgstr "Het nieuws is beschikbaar als %sRSS feed%s"
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "Nederlands"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "Dutch"
diff --git a/locale/pl/BOINC-Web.po b/locale/pl/BOINC-Web.po
index 856598a..09c52a2 100644
--- a/locale/pl/BOINC-Web.po
+++ b/locale/pl/BOINC-Web.po
@@ -1324,7 +1324,7 @@ msgstr ""
#~ msgid "TeraFLOPS."
#~ msgstr "TeraFLOPS."
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
diff --git a/locale/pt_BR/BOINC-Web.po b/locale/pt_BR/BOINC-Web.po
index 96f9b9e..9815050 100644
--- a/locale/pt_BR/BOINC-Web.po
+++ b/locale/pt_BR/BOINC-Web.po
@@ -944,7 +944,7 @@ msgstr ""
msgid "News is available as an %sRSS feed%s"
msgstr ""
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
# The charset used for the text in this file (please try to use UTF-8 if possible)
# #########################################
# Language: English (International)
@@ -962,9 +962,9 @@ msgstr ""
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1029,9 +1029,9 @@ msgstr ""
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
@@ -1072,9 +1072,9 @@ msgstr ""
#~ msgstr ""
#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
-# #######################################
-# download.php 2006/08/03 by je2bwm
-# #######################################
+# #######################################
+# download.php 2006/08/03 by je2bwm
+# #######################################
#~ msgid "DL_DOWNLOAD"
#~ msgstr "Baixe o BOINC"
@@ -1115,9 +1115,9 @@ msgstr ""
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC: computação para a ciência"
-# #############################################
-# system_requirements.php by je2bwm 2006/08/07
-# #############################################
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "Requisitos do sistema"
@@ -1186,9 +1186,9 @@ msgstr ""
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 MB de espaço em disco"
-# #############################################
-# release notes by je2bwm 2006/08/09
-# #############################################
+# #############################################
+# release notes by je2bwm 2006/08/09
+# #############################################
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "Notas da versão"
diff --git a/locale/ro/BOINC-Web.po b/locale/ro/BOINC-Web.po
index 144c61b..93582ce 100644
--- a/locale/ro/BOINC-Web.po
+++ b/locale/ro/BOINC-Web.po
@@ -1222,21 +1222,21 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
#~ msgid "POEM at HOME"
#~ msgstr "Home"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "English"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "English"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
# poll-related stuff
# #######################################
#~ msgid "POLL_TITLE"
@@ -1533,9 +1533,9 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1600,9 +1600,9 @@ msgstr "Ştirile sun disponibile ca un %sfeed RSS%s"
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/ru/BOINC-Manager.po b/locale/ru/BOINC-Manager.po
index a9f5ca6..ee1c26b 100644
--- a/locale/ru/BOINC-Manager.po
+++ b/locale/ru/BOINC-Manager.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-17 12:25-0800\n"
+"POT-Creation-Date: 2014-02-02 00:00-0800\n"
"PO-Revision-Date: 2013-11-20 17:57+0000\n"
"Last-Translator: Nikolay Saharov <saharovna at gmail.com>\n"
"Language-Team: Russia\n"
@@ -216,348 +216,348 @@ msgstr "Соединение установлено"
msgid "Disconnected"
msgstr "Отсутствует соединение"
-#: AdvancedFrame.cpp:318 sg_BoincSimpleFrame.cpp:115 sg_BoincSimpleGUI.cpp:103
+#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
#, c-format
msgid "Close the %s window"
msgstr "Закрыть окно %s"
-#: AdvancedFrame.cpp:321 sg_BoincSimpleFrame.cpp:118 sg_BoincSimpleGUI.cpp:106
+#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
msgid "&Close Window"
msgstr "Закрыть окно"
-#: AdvancedFrame.cpp:332 AdvancedFrame.cpp:339 AdvancedFrame.cpp:346
+#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
#, c-format
msgid "Exit %s"
msgstr "Выйти из %s"
-#: AdvancedFrame.cpp:367
+#: AdvancedFrame.cpp:371
msgid "&Notices\tCtrl+Shift+N"
msgstr "Уведомления\tCtrl+Shift+N"
-#: AdvancedFrame.cpp:368
+#: AdvancedFrame.cpp:372
msgid "Display notices"
msgstr "Показать уведомления"
-#: AdvancedFrame.cpp:373
+#: AdvancedFrame.cpp:377
msgid "&Projects\tCtrl+Shift+P"
msgstr "Проекты\tCtrl+Shift+P"
-#: AdvancedFrame.cpp:374
+#: AdvancedFrame.cpp:378
msgid "Display projects"
msgstr "Показать проекты"
-#: AdvancedFrame.cpp:379
+#: AdvancedFrame.cpp:383
msgid "&Tasks\tCtrl+Shift+T"
msgstr "Задания\tCtrl+Shift+T"
-#: AdvancedFrame.cpp:380
+#: AdvancedFrame.cpp:384
msgid "Display tasks"
msgstr "Показать задания"
-#: AdvancedFrame.cpp:385
+#: AdvancedFrame.cpp:389
msgid "Trans&fers\tCtrl+Shift+X"
msgstr "Передача\tCtrl+Shift+X"
-#: AdvancedFrame.cpp:386
+#: AdvancedFrame.cpp:390
msgid "Display transfers"
msgstr "Показать передачу данных"
-#: AdvancedFrame.cpp:391
+#: AdvancedFrame.cpp:395
msgid "&Statistics\tCtrl+Shift+S"
msgstr "Статистика\tCtrl+Shift+S"
-#: AdvancedFrame.cpp:392
+#: AdvancedFrame.cpp:396
msgid "Display statistics"
msgstr "Показать статистику"
-#: AdvancedFrame.cpp:397
+#: AdvancedFrame.cpp:401
msgid "&Disk usage\tCtrl+Shift+D"
msgstr "Диск\tCtrl+Shift+D"
-#: AdvancedFrame.cpp:398
+#: AdvancedFrame.cpp:402
msgid "Display disk usage"
msgstr "Показать использование диска"
-#: AdvancedFrame.cpp:405
+#: AdvancedFrame.cpp:409
msgid "Simple &View...\tCtrl+Shift+V"
msgstr "Упрощенный вид...\tCtrl+Shift+V"
-#: AdvancedFrame.cpp:406
+#: AdvancedFrame.cpp:410
msgid "Display the simple graphical interface."
msgstr "Изменить внешний вид на более простой и понятный."
-#: AdvancedFrame.cpp:420
+#: AdvancedFrame.cpp:424
msgid "&Add project or account manager..."
msgstr "Добавить проект или менеджер проектов..."
-#: AdvancedFrame.cpp:421 sg_ProjectPanel.cpp:76 sg_ProjectsComponent.cpp:106
+#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
msgid "Volunteer for any or all of 30+ projects in many areas of science"
msgstr ""
"Стать участником в любом или во всех 30+ проектах во многих областях науки"
# обновить данные
-#: AdvancedFrame.cpp:425
+#: AdvancedFrame.cpp:429
#, c-format
msgid "&Synchronize with %s"
msgstr "Синхронизироваться с %s"
-#: AdvancedFrame.cpp:429
+#: AdvancedFrame.cpp:433
#, c-format
msgid "Get current settings from %s"
msgstr "Обновить настройки с %s"
-#: AdvancedFrame.cpp:439
+#: AdvancedFrame.cpp:443
msgid "&Add project..."
msgstr "Добавить проект..."
-#: AdvancedFrame.cpp:440
+#: AdvancedFrame.cpp:444
msgid "Add a project"
msgstr "Добавить проект"
# ???
-#: AdvancedFrame.cpp:443
+#: AdvancedFrame.cpp:447
#, c-format
msgid "S&top using %s..."
msgstr "Отсоединиться от %s..."
-#: AdvancedFrame.cpp:449
+#: AdvancedFrame.cpp:453
msgid "Remove this computer from account manager control."
msgstr "Отсоединить этот компьютер от менеджера проектов."
-#: AdvancedFrame.cpp:454 sg_BoincSimpleFrame.cpp:174
+#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
msgid "&Options..."
msgstr "Настройки..."
-#: AdvancedFrame.cpp:455 sg_BoincSimpleFrame.cpp:175
+#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
msgid "Configure display options and proxy settings"
msgstr "Настройки графического интерфейса программы и прокси серверов"
-#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:168
+#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
msgid "Computing &preferences..."
msgstr "Настройки клиента..."
-#: AdvancedFrame.cpp:460 sg_BoincSimpleFrame.cpp:169
+#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
msgid "Configure computing preferences"
msgstr "Изменить локальные настройки вычислений подключенного клиента"
-#: AdvancedFrame.cpp:468
+#: AdvancedFrame.cpp:472
msgid "&Run always"
msgstr "Постоянная обработка"
-#: AdvancedFrame.cpp:469
+#: AdvancedFrame.cpp:473
msgid "Allow work regardless of preferences"
msgstr "Обработка заданий запущена всегда"
-#: AdvancedFrame.cpp:473
+#: AdvancedFrame.cpp:477
msgid "Run based on &preferences"
msgstr "График работы определяется настройками"
-#: AdvancedFrame.cpp:474
+#: AdvancedFrame.cpp:478
msgid "Allow work according to preferences"
msgstr "Обработка заданий выполняется в соответствии с настройками"
-#: AdvancedFrame.cpp:478
+#: AdvancedFrame.cpp:482
msgid "&Suspend"
msgstr "Приостановить обработку"
-#: AdvancedFrame.cpp:479
+#: AdvancedFrame.cpp:483
msgid "Stop work regardless of preferences"
msgstr "Приостанавливается обработка всех заданий во всех проектах"
-#: AdvancedFrame.cpp:504
+#: AdvancedFrame.cpp:508
msgid "Use GPU always"
msgstr "Постоянная обработка на ГП"
-#: AdvancedFrame.cpp:505
+#: AdvancedFrame.cpp:509
msgid "Allow GPU work regardless of preferences"
msgstr "Обработка заданий на ГП запущена всегда"
-#: AdvancedFrame.cpp:509
+#: AdvancedFrame.cpp:513
msgid "Use GPU based on preferences"
msgstr "График работы ГП определяется настройками"
-#: AdvancedFrame.cpp:510
+#: AdvancedFrame.cpp:514
msgid "Allow GPU work according to preferences"
msgstr "Обработка на ГП выполняется в соответствии с настройками"
-#: AdvancedFrame.cpp:514
+#: AdvancedFrame.cpp:518
msgid "Suspend GPU"
msgstr "Приостановить использование ГП"
-#: AdvancedFrame.cpp:515
+#: AdvancedFrame.cpp:519
msgid "Stop GPU work regardless of preferences"
msgstr "Остановить обработку заданий на ГП независимо от настроек"
-#: AdvancedFrame.cpp:539
+#: AdvancedFrame.cpp:543
msgid "Network activity always available"
msgstr "Подключен к интернету"
-#: AdvancedFrame.cpp:540
+#: AdvancedFrame.cpp:544
msgid "Allow network activity regardless of preferences"
msgstr ""
"Разрешается обмен данными через интернет в любой момент времени, независимо "
"от настроек"
-#: AdvancedFrame.cpp:544
+#: AdvancedFrame.cpp:548
msgid "Network activity based on preferences"
msgstr "Доступ в интернет определяется настройками"
-#: AdvancedFrame.cpp:545
+#: AdvancedFrame.cpp:549
msgid "Allow network activity according to preferences"
msgstr ""
"Обмен данными через интернет осуществляется в соответствии с настройками"
-#: AdvancedFrame.cpp:549
+#: AdvancedFrame.cpp:553
msgid "Network activity suspended"
msgstr "Работать автономно"
-#: AdvancedFrame.cpp:550
+#: AdvancedFrame.cpp:554
msgid "Stop BOINC network activity"
msgstr ""
"Запрещается обмен данными через интернет между BOINC и серверами проектов"
-#: AdvancedFrame.cpp:560
+#: AdvancedFrame.cpp:564
#, c-format
msgid "Connect to another computer running %s"
msgstr "Подключить другой компьютер с %s"
-#: AdvancedFrame.cpp:565
+#: AdvancedFrame.cpp:569
msgid "Select computer..."
msgstr "Сменить компьютер..."
-#: AdvancedFrame.cpp:570
+#: AdvancedFrame.cpp:574
msgid "Shut down connected client..."
msgstr "Завершить работу подключенного BOINC клиента..."
-#: AdvancedFrame.cpp:571
+#: AdvancedFrame.cpp:575
msgid "Shut down the currently connected client"
msgstr "Завершить работу подключенного BOINC-клиента"
-#: AdvancedFrame.cpp:575
+#: AdvancedFrame.cpp:579
msgid "Run CPU &benchmarks"
msgstr "Запустить тест производительности"
-#: AdvancedFrame.cpp:576
+#: AdvancedFrame.cpp:580
msgid "Runs BOINC CPU benchmarks"
msgstr "Запустить тест производительности процессора"
# ???
-#: AdvancedFrame.cpp:580
+#: AdvancedFrame.cpp:584
msgid "Do network communication"
msgstr "Повторить обмен данными с серверами проектов"
# ???
-#: AdvancedFrame.cpp:581
+#: AdvancedFrame.cpp:585
msgid "Do all pending network communication"
msgstr "Повторить все незавершённые обмены данными с серверами проектов"
# 94%
-#: AdvancedFrame.cpp:585
+#: AdvancedFrame.cpp:589
msgid "Read config files"
msgstr "Перезагрузить файлы настроек"
-#: AdvancedFrame.cpp:586
+#: AdvancedFrame.cpp:590
msgid "Read configuration info from cc_config.xml and any app_config.xml files"
msgstr ""
"Перезагрузить информацию о настройках из cc_config.xml и каких-либо файлов "
"app_config.xml"
-#: AdvancedFrame.cpp:590
+#: AdvancedFrame.cpp:594
msgid "Read local prefs file"
msgstr "Перезагрузить локальный файл общих настроек"
-#: AdvancedFrame.cpp:591
+#: AdvancedFrame.cpp:595
msgid "Read preferences from global_prefs_override.xml."
msgstr "Перезагрузить локальный файл общих настроек global_prefs_override.xml."
-#: AdvancedFrame.cpp:596
+#: AdvancedFrame.cpp:600
#, c-format
msgid "Launch another instance of %s..."
msgstr "Запустить другой экземпляр %s..."
-#: AdvancedFrame.cpp:600
+#: AdvancedFrame.cpp:604
#, c-format
msgid "Launch another %s"
msgstr "Запустить другой %s"
-#: AdvancedFrame.cpp:610
+#: AdvancedFrame.cpp:614
msgid "Event Log...\tCtrl+Shift+E"
msgstr "Просмотр событий...\t Ctrl+Shift+E"
-#: AdvancedFrame.cpp:611
+#: AdvancedFrame.cpp:615
msgid "Display diagnostic messages."
msgstr "Показать диагностические сообщения."
-#: AdvancedFrame.cpp:621 sg_BoincSimpleFrame.cpp:184 sg_BoincSimpleGUI.cpp:129
+#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
#, c-format
msgid "%s &help"
msgstr "Справка %s"
-#: AdvancedFrame.cpp:627 sg_BoincSimpleFrame.cpp:190 sg_BoincSimpleGUI.cpp:135
+#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
#, c-format
msgid "Show information about %s"
msgstr "Показать справку по %s"
-#: AdvancedFrame.cpp:639
+#: AdvancedFrame.cpp:643
#, c-format
msgid "&%s help"
msgstr "Справка %s"
-#: AdvancedFrame.cpp:645 sg_BoincSimpleFrame.cpp:208 sg_BoincSimpleGUI.cpp:153
+#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
#, c-format
msgid "Show information about the %s"
msgstr "Показать справку по программе %s"
-#: AdvancedFrame.cpp:657 sg_BoincSimpleFrame.cpp:220 sg_BoincSimpleGUI.cpp:165
+#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
#, c-format
msgid "%s &web site"
msgstr "&Веб-сайт %s"
-#: AdvancedFrame.cpp:663 sg_BoincSimpleFrame.cpp:226 sg_BoincSimpleGUI.cpp:171
+#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
#, c-format
msgid "Show information about BOINC and %s"
msgstr "Показать информацию о BOINC и %s"
-#: AdvancedFrame.cpp:675 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:238
+#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
#, c-format
msgid "&About %s..."
msgstr "О %s..."
-#: AdvancedFrame.cpp:681 sg_BoincSimpleFrame.cpp:244
+#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
msgid "Licensing and copyright information."
msgstr "Показать сведения о версии программы и авторских правах."
-#: AdvancedFrame.cpp:688 sg_BoincSimpleFrame.cpp:251 sg_BoincSimpleGUI.cpp:194
+#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
msgid "&File"
msgstr "Файл"
-#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255 sg_BoincSimpleGUI.cpp:199
+#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
msgid "&View"
msgstr "Вид"
-#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
+#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
msgid "&Tools"
msgstr "Сервис"
-#: AdvancedFrame.cpp:700
+#: AdvancedFrame.cpp:704
msgid "&Activity"
msgstr "Управление"
-#: AdvancedFrame.cpp:704
+#: AdvancedFrame.cpp:708
msgid "A&dvanced"
msgstr "Дополнительно"
-#: AdvancedFrame.cpp:708 DlgEventLog.cpp:331 sg_BoincSimpleFrame.cpp:263
-#: sg_BoincSimpleGUI.cpp:184 wizardex.cpp:374 wizardex.cpp:381
+#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
+#: wizardex.cpp:374 wizardex.cpp:381
msgid "&Help"
msgstr "Справка"
-#: AdvancedFrame.cpp:1195
+#: AdvancedFrame.cpp:1199
#, c-format
msgid "%s - Stop using %s"
msgstr "%s - Прекратить использование %s"
-#: AdvancedFrame.cpp:1200
+#: AdvancedFrame.cpp:1204
#, c-format
msgid ""
"If you stop using %s,\n"
@@ -572,12 +572,12 @@ msgstr ""
"\n"
"Вы действительно хотите прекратить использовать %s?"
-#: AdvancedFrame.cpp:1397
+#: AdvancedFrame.cpp:1401
#, c-format
msgid "%s - Shut down the current client..."
msgstr "%s - Завершение работы текущего BOINC клиента..."
-#: AdvancedFrame.cpp:1406
+#: AdvancedFrame.cpp:1410
#, c-format
msgid ""
"%s will shut down the current client\n"
@@ -586,27 +586,27 @@ msgstr ""
"%s остановит подключенного в данный момент клиента,\n"
"и запросит у Вас для подключения адрес другого компьютера."
-#: AdvancedFrame.cpp:1734 DlgAbout.cpp:119
+#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: AdvancedFrame.cpp:1743
+#: AdvancedFrame.cpp:1754
#, c-format
msgid "%s has successfully added %s"
msgstr "%s успешно добавил проект %s"
-#: AdvancedFrame.cpp:1882
+#: AdvancedFrame.cpp:1893
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: AdvancedFrame.cpp:1886
+#: AdvancedFrame.cpp:1897
#, c-format
msgid "Connecting to %s"
msgstr "Идёт подключение к %s"
-#: AdvancedFrame.cpp:1889
+#: AdvancedFrame.cpp:1900
#, c-format
msgid "Connected to %s (%s)"
msgstr "Подключен к %s (%s)"
@@ -644,26 +644,26 @@ msgstr ""
"\n"
"Посетите домашнюю страницу проекта для получения инструкций."
-#: AsyncRPC.cpp:1026
+#: AsyncRPC.cpp:1031
msgid "Communicating with BOINC client. Please wait ..."
msgstr "Устанавливается связь с BOINC клиентом. Пожалуйста подождите ..."
-#: AsyncRPC.cpp:1029
+#: AsyncRPC.cpp:1034
#, c-format
msgid "&Quit %s"
msgstr "Выйти из %s"
-#: AsyncRPC.cpp:1031
+#: AsyncRPC.cpp:1036
#, c-format
msgid "E&xit %s"
msgstr "Выйти из %s"
-#: AsyncRPC.cpp:1035
+#: AsyncRPC.cpp:1040
#, c-format
msgid "%s - Communication"
msgstr "%s - Установка связи"
-#: AsyncRPC.cpp:1051 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:438
+#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
msgid "Cancel"
msgstr "Отмена"
@@ -829,7 +829,7 @@ msgstr "%s разорвал подключение к интернету."
msgid "%s failed to disconnected from the Internet."
msgstr "%s не удалось разорвать подключение к интернету."
-#: BOINCGUIApp.cpp:342
+#: BOINCGUIApp.cpp:339
#, c-format
msgid ""
"You currently are not authorized to manage the client.\n"
@@ -850,7 +850,7 @@ msgstr ""
" - обратиться к Вашему администратору, чтобы он добавил Вас\n"
" в группу пользователей 'boinc_master'."
-#: BOINCGUIApp.cpp:348
+#: BOINCGUIApp.cpp:345
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
@@ -860,16 +860,16 @@ msgstr ""
"переустановите ПО %s.\n"
"(Код ошибки %d"
-#: BOINCGUIApp.cpp:354
+#: BOINCGUIApp.cpp:351
msgid " at "
msgstr " на "
-#: BOINCGUIApp.cpp:357 MainDocument.cpp:2475 MainDocument.cpp:2525
-#: MainDocument.cpp:2545 ViewTransfers.cpp:803
+#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
+#: MainDocument.cpp:2554 ViewTransfers.cpp:803
msgid ")"
msgstr ")"
-#: BOINCGUIApp.cpp:387
+#: BOINCGUIApp.cpp:384
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
@@ -877,69 +877,69 @@ msgstr ""
"Требуется перезагрузка для корректной работы клиента BOINC.\n"
"Пожалуйста, перезагрузите Ваш компьютер и попытайтесь еще раз."
-#: BOINCGUIApp.cpp:388 DlgAbout.cpp:153
+#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC менеджер"
-#: BOINCGUIApp.cpp:571
+#: BOINCGUIApp.cpp:572
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC менеджер был автоматически запущен операционной системой"
-#: BOINCGUIApp.cpp:573
+#: BOINCGUIApp.cpp:574
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "сворачивать BOINC менеджер в значок на панели задач при запуске"
-#: BOINCGUIApp.cpp:575
+#: BOINCGUIApp.cpp:576
msgid "Directory containing the BOINC Client executable"
msgstr "Каталог, содержащий исполняемый файл клиента BOINC"
-#: BOINCGUIApp.cpp:576
+#: BOINCGUIApp.cpp:577
msgid "BOINC data directory"
msgstr "Каталог данных BOINC"
-#: BOINCGUIApp.cpp:578
+#: BOINCGUIApp.cpp:579
msgid "Host name or IP address"
msgstr "Имя или IP-адрес компьютера"
-#: BOINCGUIApp.cpp:579
+#: BOINCGUIApp.cpp:580
msgid "GUI RPC port number"
msgstr "Номер порта GUI RPC"
-#: BOINCGUIApp.cpp:580
+#: BOINCGUIApp.cpp:581
msgid "Password"
msgstr "Пароль"
-#: BOINCGUIApp.cpp:581
+#: BOINCGUIApp.cpp:582
msgid "Startup BOINC with these optional arguments"
msgstr "запускать BOINC клиент с ключами запуска"
-#: BOINCGUIApp.cpp:582
+#: BOINCGUIApp.cpp:583
msgid "disable BOINC security users and permissions"
msgstr "отключить политику безопасности доступа пользователей к BOINC"
# Это описание ключа запуска BOINC managera. Не переводится.
-#: BOINCGUIApp.cpp:583
+#: BOINCGUIApp.cpp:584
msgid "set skin debugging mode to enable skin manager error messages"
msgstr ""
"включить режим отладки менеджера обложек для вывода сообщений об ошибках"
-#: BOINCGUIApp.cpp:584
+#: BOINCGUIApp.cpp:585
msgid "multiple instances of BOINC Manager allowed"
msgstr "разрешено несколько экземпляров менеджера BOINC"
-#: BOINCGUIApp.cpp:586
+#: BOINCGUIApp.cpp:587
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Не используется: обход ошибки в XCode 4.2"
-#: BOINCGUIApp.cpp:804
+#: BOINCGUIApp.cpp:814
msgid "(Automatic Detection)"
msgstr "(Автоопределение)"
-#: BOINCGUIApp.cpp:805
+#: BOINCGUIApp.cpp:815
msgid "(Unknown)"
msgstr "(Неизвестный)"
-#: BOINCGUIApp.cpp:806
+#: BOINCGUIApp.cpp:816
msgid "(User Defined)"
msgstr "(Пользовательский)"
@@ -968,7 +968,7 @@ msgid "E&xit"
msgstr "Выход"
#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
-#: sg_BoincSimpleFrame.cpp:754 sg_ProjectCommandPopup.cpp:110
+#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
#: sg_TaskCommandPopup.cpp:102
msgid "Resume"
msgstr "Запустить"
@@ -1142,64 +1142,64 @@ msgstr ""
"Открытая Инфраструктура для Распределенных Вычислений университета Беркли"
#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
-#: DlgOptions.cpp:396 DlgSelectComputer.cpp:162
+#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
msgid "&OK"
msgstr "OK"
-#: DlgAdvPreferences.cpp:542
-msgid "invalid float"
-msgstr "ошибка ввода числа"
+#: DlgAdvPreferences.cpp:544
+msgid "invalid number"
+msgstr ""
-#: DlgAdvPreferences.cpp:543
+#: DlgAdvPreferences.cpp:545
msgid "invalid time, format is HH:MM"
msgstr "ошибка ввода, формат времени ЧЧ:ММ"
-#: DlgAdvPreferences.cpp:544
+#: DlgAdvPreferences.cpp:546
msgid "invalid time interval, format is HH:MM-HH:MM"
msgstr "ошибка при задании интервала, правильный формат ЧЧ:ММ-ЧЧ:ММ"
-#: DlgAdvPreferences.cpp:664
+#: DlgAdvPreferences.cpp:751
msgid "invalid input value detected"
msgstr "обнаружено некорректное значение"
-#: DlgAdvPreferences.cpp:666
+#: DlgAdvPreferences.cpp:753
msgid "Validation Error"
msgstr "Ошибка проверки"
-#: DlgAdvPreferences.cpp:797 DlgAdvPreferences.cpp:803
-#: DlgAdvPreferences.cpp:809
+#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
+#: DlgAdvPreferences.cpp:897
msgid "Applications to add"
msgstr "Добавить приложения"
-#: DlgAdvPreferences.cpp:826
+#: DlgAdvPreferences.cpp:914
#, c-format
msgid "'%s' is not an executable application."
msgstr "'%s' не является исполняемым приложением."
-#: DlgAdvPreferences.cpp:827 DlgAdvPreferences.cpp:874
-#: DlgAdvPreferences.cpp:898
+#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
+#: DlgAdvPreferences.cpp:986
msgid "Add Exclusive App"
msgstr "Добавить привилегированное приложение"
-#: DlgAdvPreferences.cpp:839
+#: DlgAdvPreferences.cpp:927
msgid "Name of application to add?"
msgstr "Имя добавляемого приложения?"
-#: DlgAdvPreferences.cpp:839
+#: DlgAdvPreferences.cpp:927
msgid "Add exclusive app"
msgstr "Добавить привилегированное приложение"
-#: DlgAdvPreferences.cpp:873
+#: DlgAdvPreferences.cpp:961
#, c-format
msgid "Application names must end with '%s'"
msgstr "Имена приложений должны оканчиваться на '%s'"
-#: DlgAdvPreferences.cpp:897
+#: DlgAdvPreferences.cpp:985
#, c-format
msgid "'%s' is already in the list."
msgstr "'%s' уже в списке."
-#: DlgAdvPreferences.cpp:989
+#: DlgAdvPreferences.cpp:1077
msgid ""
"Do you really want to clear all local preferences?\n"
"(This will not affect exclusive applications.)"
@@ -1207,12 +1207,12 @@ msgstr ""
"Вы уверены, что хотите удалить все локальные настройки?\n"
"(Это не затронет привилегированные приложения.)"
-#: DlgAdvPreferences.cpp:990 sg_DlgPreferences.cpp:1035
+#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
msgid "Confirmation"
msgstr "Подтверждение"
# ???
-#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:951
+#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
#, c-format
msgid "%s - Preferences"
msgstr "%s - Настройки клиента"
@@ -1228,11 +1228,11 @@ msgstr ""
"Для возврата к настройкам с сайта проекта нажмите 'Удалить'\n"
"(не затронет привилегированные приложения)."
-#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:433
+#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
msgid "Clear"
msgstr "Удалить"
-#: DlgAdvPreferencesBase.cpp:66 sg_DlgPreferences.cpp:434
+#: DlgAdvPreferencesBase.cpp:66
msgid "clear all local preferences and close the dialog"
msgstr ""
"удалить локально хранимые настройки для данного компьютера и закрыть окно"
@@ -1253,7 +1253,7 @@ msgstr "диск и память"
msgid "exclusive applications"
msgstr "привилегированные приложения"
-#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:429
+#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
msgid "OK"
msgstr "OK"
@@ -1267,7 +1267,7 @@ msgstr "закрыть окно без сохранения изменений"
# было 'Вопросы и ответы'-для SETI
#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
-#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:790 sg_DlgPreferences.cpp:444
+#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
msgid "Help"
msgstr "Помощь"
@@ -1327,7 +1327,7 @@ msgstr ""
"обрабатывать задания"
#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
-#: sg_DlgPreferences.cpp:422
+#: sg_DlgPreferences.cpp:417
msgid "minutes"
msgstr "минут"
@@ -1344,7 +1344,7 @@ msgstr ""
msgid "percent (0 means no restriction)"
msgstr "процентов (0 - нет ограничений)"
-#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:495
+#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
msgid "Every day between hours of"
msgstr "Ежедневно с"
@@ -1353,8 +1353,8 @@ msgid "start work at this time"
msgstr "запустить обработку в это время"
# и
-#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:503
-#: sg_DlgPreferences.cpp:331 sg_DlgPreferences.cpp:353
+#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
+#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
msgid "and"
msgstr "до"
@@ -1362,43 +1362,43 @@ msgstr "до"
msgid "stop work at this time"
msgstr "остановить обработку в это время"
-#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:511
+#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
msgid "(no restriction if equal)"
msgstr "(ограничение не действует при равенстве значений)"
-#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:516
+#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
msgid "Day-of-week override:"
msgstr "По расписанию:"
-#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:521
+#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
msgid "check box to specify hours for this day of week"
msgstr "выберите день недели и укажите временной интервал"
-#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:527
+#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
msgid "Monday"
msgstr "Понедельник"
-#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:534
+#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
msgid "Tuesday"
msgstr "Вторник"
-#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:541
+#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
msgid "Wednesday"
msgstr "Среда"
-#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:548
+#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
msgid "Thursday"
msgstr "Четверг"
-#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:555
+#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
msgid "Friday"
msgstr "Пятница"
-#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:562
+#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
msgid "Saturday"
msgstr "Суббота"
-#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:569
+#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
msgid "Sunday"
msgstr "Воскресенье"
@@ -1420,9 +1420,9 @@ msgstr "В многопроцессорных системах использо
msgid "% of the processors (0 means ignore this setting)"
msgstr "% процессоров (0 означает игнорирование этого параметра)"
-#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:604
-#: DlgAdvPreferencesBase.cpp:626 DlgAdvPreferencesBase.cpp:647
-#: DlgAdvPreferencesBase.cpp:668 DlgAdvPreferencesBase.cpp:678
+#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
+#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
+#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
msgid "Use at most"
msgstr "Использовать не более"
@@ -1432,79 +1432,79 @@ msgstr "Использовать не более"
msgid "% CPU time"
msgstr "% времени каждого процессора (ЦП)"
-#: DlgAdvPreferencesBase.cpp:377
+#: DlgAdvPreferencesBase.cpp:378
msgid "General options"
msgstr "Общие параметры"
-#: DlgAdvPreferencesBase.cpp:385
+#: DlgAdvPreferencesBase.cpp:386
msgid "Maximum download rate"
msgstr "Ограничить скорость загрузки"
-#: DlgAdvPreferencesBase.cpp:391 DlgAdvPreferencesBase.cpp:400
+#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
msgid "KBytes/sec."
msgstr "кбайт/сек."
-#: DlgAdvPreferencesBase.cpp:394
+#: DlgAdvPreferencesBase.cpp:395
msgid "Maximum upload rate"
msgstr "Ограничить скорость отправки"
-#: DlgAdvPreferencesBase.cpp:405
+#: DlgAdvPreferencesBase.cpp:406
msgid "Transfer at most"
msgstr "Передавать не более"
-#: DlgAdvPreferencesBase.cpp:411
+#: DlgAdvPreferencesBase.cpp:412
msgid "Mbytes"
msgstr "Мбайт"
-#: DlgAdvPreferencesBase.cpp:414
+#: DlgAdvPreferencesBase.cpp:415
msgid "every"
msgstr "каждые"
-#: DlgAdvPreferencesBase.cpp:420 DlgAdvPreferencesBase.cpp:443
-#: DlgAdvPreferencesBase.cpp:462
+#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
+#: DlgAdvPreferencesBase.cpp:463
msgid "days"
msgstr "дней"
-#: DlgAdvPreferencesBase.cpp:428
+#: DlgAdvPreferencesBase.cpp:429
msgid "Minimum work buffer"
msgstr "Минимальный буфер"
-#: DlgAdvPreferencesBase.cpp:437
+#: DlgAdvPreferencesBase.cpp:438
msgid "Try to maintain enough tasks to keep busy for this many days"
msgstr ""
"Пытаться поддерживать достаточный объём заданий, чтобы оставаться занятым "
"работой в течение данного числа дней"
-#: DlgAdvPreferencesBase.cpp:449
+#: DlgAdvPreferencesBase.cpp:450
msgid "Max additional work buffer"
msgstr "Макс. дополнительный буфер"
-#: DlgAdvPreferencesBase.cpp:458
+#: DlgAdvPreferencesBase.cpp:459
msgid "In addition, maintain enough tasks for up to this many days"
msgstr ""
"Кроме того, поддерживать достаточный объём заданий вплоть до этого числа "
"дней"
# не проверять изображение файла
-#: DlgAdvPreferencesBase.cpp:465
+#: DlgAdvPreferencesBase.cpp:466
msgid "Skip image file verification"
msgstr "Не проверять загружаемые файлы"
-#: DlgAdvPreferencesBase.cpp:467
+#: DlgAdvPreferencesBase.cpp:468
msgid "check this if your Internet provider modifies image files"
msgstr ""
"выберите данный пункт если ваш интернет провайдер изменяет передаваемые "
"файлы"
-#: DlgAdvPreferencesBase.cpp:475
+#: DlgAdvPreferencesBase.cpp:476
msgid "Connect options"
msgstr "Параметры подключения"
-#: DlgAdvPreferencesBase.cpp:477
+#: DlgAdvPreferencesBase.cpp:478
msgid "Confirm before connecting to internet"
msgstr "Предупреждать перед подключением к интернету"
-#: DlgAdvPreferencesBase.cpp:479
+#: DlgAdvPreferencesBase.cpp:480
msgid ""
"if checked, a confirmation dialog will be displayed before trying to connect "
"to the Internet"
@@ -1512,11 +1512,11 @@ msgstr ""
"перед началом автоматического установления связи с интернетом BOINC спросит "
"можно ли установить соединение"
-#: DlgAdvPreferencesBase.cpp:483
+#: DlgAdvPreferencesBase.cpp:484
msgid "Disconnect when done"
msgstr "Разорвать соединение после завершения"
-#: DlgAdvPreferencesBase.cpp:485
+#: DlgAdvPreferencesBase.cpp:486
msgid ""
"if checked, BOINC hangs up when network usage is done\n"
"(only relevant for dialup-connection)"
@@ -1525,157 +1525,157 @@ msgstr ""
"операции\n"
"(для обладателей dial-up модемов)"
-#: DlgAdvPreferencesBase.cpp:491
+#: DlgAdvPreferencesBase.cpp:492
msgid "Network usage allowed"
msgstr "Доступ в интернет"
-#: DlgAdvPreferencesBase.cpp:499
+#: DlgAdvPreferencesBase.cpp:500
msgid "network usage start hour"
msgstr "начиная с данного времени разрешён доступ в интернет"
-#: DlgAdvPreferencesBase.cpp:507
+#: DlgAdvPreferencesBase.cpp:508
msgid "network usage stop hour"
msgstr "после данного времени доступ в интернет запрещён"
-#: DlgAdvPreferencesBase.cpp:597 DlgItemProperties.cpp:226
+#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
msgid "Disk usage"
msgstr "Использование диска"
-#: DlgAdvPreferencesBase.cpp:608
+#: DlgAdvPreferencesBase.cpp:609
msgid "the maximum disk space used by BOINC (in Gigabytes)"
msgstr ""
"ограничение на занимаемое BOINC и проектами пространство на диске (в "
"гигабайтах)"
-#: DlgAdvPreferencesBase.cpp:612
+#: DlgAdvPreferencesBase.cpp:613
msgid "Gigabytes disk space"
msgstr "Гбайт места на диске"
-#: DlgAdvPreferencesBase.cpp:615
+#: DlgAdvPreferencesBase.cpp:616
msgid "Leave at least"
msgstr "Оставлять не менее"
-#: DlgAdvPreferencesBase.cpp:619
+#: DlgAdvPreferencesBase.cpp:620
msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
msgstr ""
"минимальный объём дискового пространства, который должен оставаться "
"свободным (в гигабайтах)"
-#: DlgAdvPreferencesBase.cpp:623
+#: DlgAdvPreferencesBase.cpp:624
msgid "Gigabytes disk space free"
msgstr "Гбайт свободного места на диске"
-#: DlgAdvPreferencesBase.cpp:630
+#: DlgAdvPreferencesBase.cpp:631
msgid "BOINC uses at most this percentage of total disk space"
msgstr ""
"ограничение на занимаемое BOINC и проектами пространство на диске в "
"процентах от общего объёма диска"
-#: DlgAdvPreferencesBase.cpp:635
+#: DlgAdvPreferencesBase.cpp:636
#, no-c-format
msgid "% of total disk space"
msgstr "% от объёма диска"
-#: DlgAdvPreferencesBase.cpp:638
+#: DlgAdvPreferencesBase.cpp:639
msgid "Tasks checkpoint to disk at most every"
msgstr "Период сохранения на диск промежуточных результатов заданий"
-#: DlgAdvPreferencesBase.cpp:644
+#: DlgAdvPreferencesBase.cpp:645
msgid "seconds"
msgstr "секунд"
-#: DlgAdvPreferencesBase.cpp:654
+#: DlgAdvPreferencesBase.cpp:655
#, no-c-format
msgid "% of page file (swap space)"
msgstr "% виртуальной памяти (файл подкачки)"
-#: DlgAdvPreferencesBase.cpp:661
+#: DlgAdvPreferencesBase.cpp:662
msgid "Memory usage"
msgstr "Оперативная память"
-#: DlgAdvPreferencesBase.cpp:675
+#: DlgAdvPreferencesBase.cpp:676
#, no-c-format
msgid "% when computer is in use"
msgstr "% когда компьютер используется для работы"
-#: DlgAdvPreferencesBase.cpp:685
+#: DlgAdvPreferencesBase.cpp:686
#, no-c-format
msgid "% when computer is idle"
msgstr "% когда компьютер простаивает"
# ?
-#: DlgAdvPreferencesBase.cpp:690
+#: DlgAdvPreferencesBase.cpp:691
msgid "Leave applications in memory while suspended"
msgstr "Оставлять неактивные приложения в памяти"
-#: DlgAdvPreferencesBase.cpp:692
+#: DlgAdvPreferencesBase.cpp:693
msgid "if checked, suspended work units are left in memory"
msgstr "оставлять приложение в памяти на время приостановки обработки задания"
-#: DlgAdvPreferencesBase.cpp:712
+#: DlgAdvPreferencesBase.cpp:713
msgid ""
"Suspend processor and network usage when these applications are running:"
msgstr ""
"Приостановить использование процессора и сети, когда работают данные "
"приложения:"
-#: DlgAdvPreferencesBase.cpp:721
+#: DlgAdvPreferencesBase.cpp:722
msgid "Add..."
msgstr "Добавить..."
-#: DlgAdvPreferencesBase.cpp:722
+#: DlgAdvPreferencesBase.cpp:723
msgid "Add an application to this list"
msgstr "Добавить приложение в список"
-#: DlgAdvPreferencesBase.cpp:727 ViewProjects.cpp:202
+#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
#: sg_ProjectCommandPopup.cpp:85
msgid "Remove"
msgstr "Удалить"
-#: DlgAdvPreferencesBase.cpp:728
+#: DlgAdvPreferencesBase.cpp:729
msgid "Remove an application from this list"
msgstr "Удалить приложение из списка"
-#: DlgAdvPreferencesBase.cpp:737
+#: DlgAdvPreferencesBase.cpp:738
msgid "For advanced options, refer to "
msgstr "Для расширенных настроек, обратитесь к "
-#: DlgEventLog.cpp:218
+#: DlgEventLog.cpp:219
#, c-format
msgid "%s - Event Log"
msgstr "%s - Просмотр событий"
-#: DlgEventLog.cpp:231 ViewMessages.cpp:117 ViewProjects.cpp:219
-#: ViewStatistics.cpp:435 ViewStatistics.cpp:2007 ViewTransfers.cpp:182
+#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
+#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
#: ViewWork.cpp:232
msgid "Project"
msgstr "Проект"
-#: DlgEventLog.cpp:232 ViewMessages.cpp:118
+#: DlgEventLog.cpp:233 ViewMessages.cpp:118
msgid "Time"
msgstr "Время"
-#: DlgEventLog.cpp:233 ViewMessages.cpp:119
+#: DlgEventLog.cpp:234 ViewMessages.cpp:119
msgid "Message"
msgstr "Сообщение"
-#: DlgEventLog.cpp:289 DlgEventLog.cpp:353
+#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
msgid "&Show only this project"
msgstr "Показать только этот проект"
-#: DlgEventLog.cpp:293
+#: DlgEventLog.cpp:294
msgid "Copy &All"
msgstr "Копировать все"
-#: DlgEventLog.cpp:295 DlgEventLog.cpp:299 ViewMessages.cpp:89
+#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr "Копировать все сообщения в буфер обмена."
-#: DlgEventLog.cpp:304
+#: DlgEventLog.cpp:305
msgid "Copy &Selected"
msgstr "Копировать выделенное"
-#: DlgEventLog.cpp:307 DlgEventLog.cpp:315 ViewMessages.cpp:97
+#: 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."
@@ -1683,7 +1683,7 @@ msgstr ""
"Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и "
"CTRL для выделения нескольких сообщений."
-#: DlgEventLog.cpp:309 DlgEventLog.cpp:317 ViewMessages.cpp:99
+#: 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."
@@ -1691,25 +1691,24 @@ msgstr ""
"Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и "
"CTRL для выделения нескольких сообщений."
-#: DlgEventLog.cpp:324 DlgItemProperties.cpp:66
+#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
msgid "&Close"
msgstr "Закрыть"
-#: DlgEventLog.cpp:333 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:447
-#: sg_ProjectsComponent.cpp:142
+#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
#, c-format
msgid "Get help with %s"
msgstr "Получить справку по %s"
-#: DlgEventLog.cpp:347
+#: DlgEventLog.cpp:348
msgid "Show all &messages"
msgstr "Показать все сообщения"
-#: DlgEventLog.cpp:348 DlgEventLog.cpp:350
+#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
msgid "Show messages for all projects"
msgstr "Показать все сообщения"
-#: DlgEventLog.cpp:354 DlgEventLog.cpp:356
+#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
msgid "Show only the messages for the selected project"
msgstr "Показать сообщения только от выбранного проекта."
@@ -1763,7 +1762,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "Запомнить выбор и больше не показывать данное окно."
#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
-#: DlgSelectComputer.cpp:167 wizardex.cpp:378
+#: DlgSelectComputer.cpp:168 wizardex.cpp:378
msgid "&Cancel"
msgstr "Отмена"
@@ -1772,232 +1771,232 @@ msgid "Don't show this dialog again."
msgstr "Больше не показывать данное окно."
# ???
-#: DlgItemProperties.cpp:163 DlgItemProperties.cpp:166
-#: DlgItemProperties.cpp:169 DlgItemProperties.cpp:172
+#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
+#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
msgid "Don't fetch tasks for "
msgstr "Не запрашивать задания для"
-#: DlgItemProperties.cpp:163
+#: DlgItemProperties.cpp:168
msgid "Project preference"
msgstr "Настройка проекта"
-#: DlgItemProperties.cpp:166
+#: DlgItemProperties.cpp:171
msgid "Account manager preference"
msgstr "Настройка менеджера проектов"
-#: DlgItemProperties.cpp:169
+#: DlgItemProperties.cpp:174
msgid "Project has no apps for "
msgstr "У проекта нет приложений для"
-#: DlgItemProperties.cpp:172
+#: DlgItemProperties.cpp:177
msgid "Client configuration excludes "
msgstr "Конфигурация клиента исключает"
-#: DlgItemProperties.cpp:176
+#: DlgItemProperties.cpp:181
msgid " work fetch deferred for"
msgstr " запрос заданий отложен на"
-#: DlgItemProperties.cpp:177
+#: DlgItemProperties.cpp:182
msgid " work fetch deferral interval"
msgstr "интервал задержки запроса заданий"
# ???? уточнить
-#: DlgItemProperties.cpp:208
+#: DlgItemProperties.cpp:213
msgid "Properties of project "
msgstr "Информация о проекте "
-#: DlgItemProperties.cpp:212 DlgOptions.cpp:218
+#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
msgid "General"
msgstr "Общие"
-#: DlgItemProperties.cpp:213
+#: DlgItemProperties.cpp:218
msgid "Master URL"
msgstr "Адрес для подключения"
-#: DlgItemProperties.cpp:214
+#: DlgItemProperties.cpp:219
msgid "User name"
msgstr "Имя участника"
-#: DlgItemProperties.cpp:215
+#: DlgItemProperties.cpp:220
msgid "Team name"
msgstr "Команда"
-#: DlgItemProperties.cpp:216 ViewProjects.cpp:224
+#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
msgid "Resource share"
msgstr "Выделено ресурсов"
-#: DlgItemProperties.cpp:218
+#: DlgItemProperties.cpp:223
msgid "Scheduler RPC deferred for"
msgstr "Запрос к планировщику отложен на"
-#: DlgItemProperties.cpp:221
+#: DlgItemProperties.cpp:226
msgid "File downloads deferred for"
msgstr "Загрузка файлов отложена на"
-#: DlgItemProperties.cpp:224
+#: DlgItemProperties.cpp:229
msgid "File uploads deferred for"
msgstr "Отправка файлов отложена на"
-#: DlgItemProperties.cpp:227
+#: DlgItemProperties.cpp:232
msgid "Computer ID"
msgstr "Идентификатор компьютера"
-#: DlgItemProperties.cpp:229
+#: DlgItemProperties.cpp:234
msgid "Non CPU intensive"
msgstr "Без использования ЦП"
-#: DlgItemProperties.cpp:229 DlgItemProperties.cpp:231
-#: DlgItemProperties.cpp:232 DlgItemProperties.cpp:234
-#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:246
-#: DlgItemProperties.cpp:249 DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
+#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
+#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
+#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
msgid "yes"
msgstr "да"
-#: DlgItemProperties.cpp:231
+#: DlgItemProperties.cpp:236
msgid "Suspended via GUI"
msgstr "Приостановлен вручную"
-#: DlgItemProperties.cpp:231 DlgItemProperties.cpp:232
+#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
msgid "no"
msgstr "нет"
-#: DlgItemProperties.cpp:232
+#: DlgItemProperties.cpp:237
msgid "Don't request more work"
msgstr "Не запрашивать задания"
# ?
-#: DlgItemProperties.cpp:234
+#: DlgItemProperties.cpp:239
msgid "Scheduler call in progress"
msgstr "Сеанс связи с планировщиком"
-#: DlgItemProperties.cpp:237
+#: DlgItemProperties.cpp:242
msgid "Trickle-up pending"
msgstr "Ожидание промежуточной отправки"
# Общее количество очков набранных на данном хосте
-#: DlgItemProperties.cpp:240 DlgItemProperties.cpp:242
+#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
msgid "Host location"
msgstr "Размещение компьютера"
-#: DlgItemProperties.cpp:242
+#: DlgItemProperties.cpp:247
msgid "default"
msgstr "по умолчанию"
# ?
-#: DlgItemProperties.cpp:246
+#: DlgItemProperties.cpp:251
msgid "Added via account manager"
msgstr "Добавлен менеджером проектов"
# ?
-#: DlgItemProperties.cpp:249
+#: DlgItemProperties.cpp:254
msgid "Remove when tasks done"
msgstr "Будет удалён после завершения заданий"
# что именно завершено ???
-#: DlgItemProperties.cpp:252
+#: DlgItemProperties.cpp:257
msgid "Ended"
msgstr "Завершён"
-#: DlgItemProperties.cpp:254
+#: DlgItemProperties.cpp:259
msgid "Credit"
msgstr "Очки"
-#: DlgItemProperties.cpp:255
+#: DlgItemProperties.cpp:260
msgid "User"
msgstr "Участник"
-#: DlgItemProperties.cpp:262
+#: DlgItemProperties.cpp:267
msgid "Host"
msgstr "Компьютер (хост)"
-#: DlgItemProperties.cpp:271
+#: DlgItemProperties.cpp:276
msgid "Scheduling"
msgstr "Планировщик"
-#: DlgItemProperties.cpp:272
+#: DlgItemProperties.cpp:277
msgid "Scheduling priority"
msgstr "Приоритет планировщика"
-#: DlgItemProperties.cpp:273
+#: DlgItemProperties.cpp:278
msgid "CPU"
msgstr "ЦП"
-#: DlgItemProperties.cpp:297
+#: DlgItemProperties.cpp:302
msgid "Duration correction factor"
msgstr "Поправочный коэффициент продолжительности"
-#: DlgItemProperties.cpp:311
+#: DlgItemProperties.cpp:316
msgid "Properties of task "
msgstr "Информация о задании "
-#: DlgItemProperties.cpp:323 ViewWork.cpp:238
+#: DlgItemProperties.cpp:328 ViewWork.cpp:238
msgid "Application"
msgstr "Приложение"
-# ??
-#: DlgItemProperties.cpp:324
-msgid "Workunit name"
-msgstr "Имя задания"
+# Имя
+#: DlgItemProperties.cpp:329 ViewWork.cpp:239
+msgid "Name"
+msgstr "Задание"
-#: DlgItemProperties.cpp:325
+#: DlgItemProperties.cpp:330
msgid "State"
msgstr "Состояние"
-#: DlgItemProperties.cpp:328
+#: DlgItemProperties.cpp:333
msgid "Received"
msgstr "Получено"
-#: DlgItemProperties.cpp:331
+#: DlgItemProperties.cpp:336
msgid "Report deadline"
msgstr "Отправить до"
# не уверен
-#: DlgItemProperties.cpp:333
+#: DlgItemProperties.cpp:338
msgid "Resources"
msgstr "Выделено ресурсов"
-#: DlgItemProperties.cpp:336
+#: DlgItemProperties.cpp:341
msgid "Estimated computation size"
msgstr "Предполагаемый объём вычислений"
-#: DlgItemProperties.cpp:339
+#: DlgItemProperties.cpp:344
msgid "CPU time at last checkpoint"
msgstr "Время ЦП в контрольной точке"
-#: DlgItemProperties.cpp:340 DlgItemProperties.cpp:355
+#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
msgid "CPU time"
msgstr "Время ЦП"
-#: DlgItemProperties.cpp:342 DlgItemProperties.cpp:356
+#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
msgid "Elapsed time"
msgstr "Затрачено времени"
-#: DlgItemProperties.cpp:344
+#: DlgItemProperties.cpp:349
msgid "Estimated time remaining"
msgstr "Осталось до завершения"
-#: DlgItemProperties.cpp:345
+#: DlgItemProperties.cpp:350
msgid "Fraction done"
msgstr "Процент выполнения"
# не точно
-#: DlgItemProperties.cpp:346
+#: DlgItemProperties.cpp:351
msgid "Virtual memory size"
msgstr "Объём виртуальной памяти"
-#: DlgItemProperties.cpp:347
+#: DlgItemProperties.cpp:352
msgid "Working set size"
msgstr "Использование памяти"
-#: DlgItemProperties.cpp:349
+#: DlgItemProperties.cpp:354
msgid "Directory"
msgstr "Каталог"
-#: DlgItemProperties.cpp:352
+#: DlgItemProperties.cpp:357
msgid "Process ID"
msgstr "ID процесса"
-#: DlgItemProperties.cpp:426 ViewWork.cpp:1032 sg_TaskPanel.cpp:810
+#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
msgid "Local: "
msgstr "Локальное: "
@@ -2086,7 +2085,7 @@ msgstr "Оставить поля пустыми если не использу
msgid "User Name:"
msgstr "Имя пользователя:"
-#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:151
+#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
#: ProxyPage.cpp:346 ProxyPage.cpp:366
msgid "Password:"
msgstr "Пароль:"
@@ -2146,12 +2145,12 @@ msgstr ""
"Язык интерфейса программы %s был изменён. Для вступления в силу изменений "
"требуется перезапустить %s."
-#: DlgSelectComputer.cpp:90
+#: DlgSelectComputer.cpp:91
#, c-format
msgid "%s - Select Computer"
msgstr "%s - Подключение к компьютеру"
-#: DlgSelectComputer.cpp:124
+#: DlgSelectComputer.cpp:125
#, c-format
msgid ""
"Another instance of %s is already running \n"
@@ -2160,7 +2159,7 @@ msgstr ""
"На этом компьютере уже работает другой экземпляр %s.\n"
"Пожалуйста выберите клиента для наблюдения."
-#: DlgSelectComputer.cpp:142
+#: DlgSelectComputer.cpp:143
msgid "Host name:"
msgstr "Имя компьютера в сети или IP:"
@@ -2394,23 +2393,23 @@ msgid "Learn about the projects hosted at World Community Grid"
msgstr "Подробные описания проектов запущенных в рамках WCG"
# ипользуется внутри программы
-#: MainDocument.cpp:586
+#: MainDocument.cpp:583
msgid "Starting client"
msgstr "Запуск клиента"
-#: MainDocument.cpp:594
+#: MainDocument.cpp:591
msgid "Connecting to client"
msgstr "Подключение к клиенту"
-#: MainDocument.cpp:1186
+#: MainDocument.cpp:1195
msgid "Retrieving system state; please wait..."
msgstr "Обновляется информация о состоянии системы; пожалуйста подождите..."
-#: MainDocument.cpp:1807
+#: MainDocument.cpp:1816
msgid "Missing application"
msgstr "Отсутствует приложение"
-#: MainDocument.cpp:1808
+#: MainDocument.cpp:1817
msgid ""
"Please download and install the CoRD application from http://cord."
"sourceforge.net"
@@ -2418,190 +2417,190 @@ msgstr ""
"Пожалуйста загрузите и установите приложение CoRD с сайта "
"http://cord.sourceforge.net"
-#: MainDocument.cpp:2423
+#: MainDocument.cpp:2432
msgid "on batteries"
msgstr "питание от аккумуляторов"
-#: MainDocument.cpp:2424
+#: MainDocument.cpp:2433
msgid "computer is in use"
msgstr "компьютер используется для работы"
-#: MainDocument.cpp:2425
+#: MainDocument.cpp:2434
msgid "user request"
msgstr "запрос пользователя"
-#: MainDocument.cpp:2426
+#: MainDocument.cpp:2435
msgid "time of day"
msgstr "в зависимости от времени суток"
-#: MainDocument.cpp:2427
+#: MainDocument.cpp:2436
msgid "CPU benchmarks in progress"
msgstr "запущен тест производительности"
-#: MainDocument.cpp:2428
+#: MainDocument.cpp:2437
msgid "need disk space - check preferences"
msgstr "необходимо место на диске - проверьте настройки"
-#: MainDocument.cpp:2429
+#: MainDocument.cpp:2438
msgid "computer is not in use"
msgstr "компьютер не используется для работы"
# ипользуется внутри программы
-#: MainDocument.cpp:2430
+#: MainDocument.cpp:2439
msgid "starting up"
msgstr "запуск"
-#: MainDocument.cpp:2431
+#: MainDocument.cpp:2440
msgid "an exclusive app is running"
msgstr "выполняется эксклюзивное приложение"
-#: MainDocument.cpp:2432
+#: MainDocument.cpp:2441
msgid "CPU is busy"
msgstr "процессор занят"
-#: MainDocument.cpp:2433
+#: MainDocument.cpp:2442
msgid "network bandwidth limit exceeded"
msgstr "превышен лимит использования сети"
-#: MainDocument.cpp:2434
+#: MainDocument.cpp:2443
msgid "requested by operating system"
msgstr "запрошен операционной системой"
-#: MainDocument.cpp:2436
+#: MainDocument.cpp:2445
msgid "unknown reason"
msgstr "неизвестная причина"
-#: MainDocument.cpp:2458
+#: MainDocument.cpp:2467
msgid "GPU missing, "
msgstr "Отсутствие ГП, "
-#: MainDocument.cpp:2465
+#: MainDocument.cpp:2474
msgid "New"
msgstr "Новое"
-#: MainDocument.cpp:2469
+#: MainDocument.cpp:2478
msgid "Download failed"
msgstr "Ошибка загрузки данных"
-#: MainDocument.cpp:2471
+#: MainDocument.cpp:2480
msgid "Downloading"
msgstr "Загрузка данных"
-#: MainDocument.cpp:2473 MainDocument.cpp:2543
+#: MainDocument.cpp:2482 MainDocument.cpp:2552
msgid " (suspended - "
msgstr " (приостановлено - "
-#: MainDocument.cpp:2481
+#: MainDocument.cpp:2490
msgid "Project suspended by user"
msgstr "Проект приостановлен пользователем"
# длинно
-#: MainDocument.cpp:2483
+#: MainDocument.cpp:2492
msgid "Task suspended by user"
msgstr "Обработка задания приостановлена пользователем"
-#: MainDocument.cpp:2485
+#: MainDocument.cpp:2494
msgid "Suspended - "
msgstr "Приостановлено - "
# 75%
-#: MainDocument.cpp:2491
+#: MainDocument.cpp:2500
msgid "GPU suspended - "
msgstr "ГП приостановлен - "
-#: MainDocument.cpp:2498
+#: MainDocument.cpp:2507
msgid "Waiting for memory"
msgstr "Ожидание освобождения оперативной памяти"
# офигеть можно от такого объяснения
-#: MainDocument.cpp:2500
+#: MainDocument.cpp:2509
msgid "Waiting for shared memory"
msgstr "Ожидание освобождения разделяемой оперативной памяти (shared memory)"
-#: MainDocument.cpp:2503
+#: MainDocument.cpp:2512
msgid "Running, high priority"
msgstr "Работает, обработать в первую очередь"
-#: MainDocument.cpp:2505 sg_ImageButton.cpp:88
+#: MainDocument.cpp:2514
msgid "Running"
msgstr "Работает"
-#: MainDocument.cpp:2508
+#: MainDocument.cpp:2517
msgid " (non-CPU-intensive)"
msgstr " (без использования ЦП)"
# Приостановлено с последующим продолжением обработки
-#: MainDocument.cpp:2511
+#: MainDocument.cpp:2520
msgid "Waiting to run"
msgstr "Ждёт своей очереди"
-#: MainDocument.cpp:2513 MainDocument.cpp:2519
+#: MainDocument.cpp:2522 MainDocument.cpp:2528
msgid "Ready to start"
msgstr "Готово к запуску"
-#: MainDocument.cpp:2523
+#: MainDocument.cpp:2532
msgid " (Scheduler wait: "
msgstr "(Планировщик ожидает:"
-#: MainDocument.cpp:2527
+#: MainDocument.cpp:2536
msgid " (Scheduler wait)"
msgstr " (Планировщик ожидает)"
-#: MainDocument.cpp:2531
+#: MainDocument.cpp:2540
msgid " (Waiting for network access)"
msgstr "(Ожидание доступа к сети)"
-#: MainDocument.cpp:2535
+#: MainDocument.cpp:2544
msgid "Computation error"
msgstr "Ошибка вычислений"
-#: MainDocument.cpp:2539
+#: MainDocument.cpp:2548
msgid "Upload failed"
msgstr "Ошибка отправки данных"
-#: MainDocument.cpp:2541
+#: MainDocument.cpp:2550
msgid "Uploading"
msgstr "Отправка данных"
-#: MainDocument.cpp:2552
+#: MainDocument.cpp:2561
msgid "Aborted by user"
msgstr "Прервано пользователем"
# ???? уточнить
-#: MainDocument.cpp:2555
+#: MainDocument.cpp:2564
msgid "Aborted by project"
msgstr "Прервано проектом"
-#: MainDocument.cpp:2558
+#: MainDocument.cpp:2567
msgid "Aborted: not started by deadline"
msgstr "Прервано: не было запущено до крайнего срока"
-#: MainDocument.cpp:2561
+#: MainDocument.cpp:2570
msgid "Aborted: disk limit exceeded"
msgstr "Прервано: превышен предел используемого дискового пространства"
-#: MainDocument.cpp:2564
+#: MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
msgstr "Прервано: превышен предел времени выполнения"
-#: MainDocument.cpp:2567
+#: MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
msgstr "Прервано: превышен предел используемой памяти"
# ???
-#: MainDocument.cpp:2570
+#: MainDocument.cpp:2579
msgid "Aborted"
msgstr "Прервано"
-#: MainDocument.cpp:2575
+#: MainDocument.cpp:2584
msgid "Acknowledged"
msgstr "Признано"
-#: MainDocument.cpp:2577
+#: MainDocument.cpp:2586
msgid "Ready to report"
msgstr "Ожидается подтверждение о приеме данных"
-#: MainDocument.cpp:2579
+#: MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
msgstr "Ошибка: недопустимое состояние '%d'"
@@ -2664,57 +2663,57 @@ msgstr ""
"Проверьте правильность написания адреса\n"
"электронной почты и пароля и повторите ввод."
-#: NoticeListCtrl.cpp:221
+#: NoticeListCtrl.cpp:222
msgid "more..."
msgstr "больше..."
-#: ProjectInfoPage.cpp:467 ProjectInfoPage.cpp:766 ProjectInfoPage.cpp:770
+#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
msgid "All"
msgstr "Все"
-#: ProjectInfoPage.cpp:602
+#: ProjectInfoPage.cpp:615
msgid "Choose a project"
msgstr "Выбор проекта"
-#: ProjectInfoPage.cpp:606
+#: ProjectInfoPage.cpp:619
msgid "To choose a project, click its name or type its URL below."
msgstr ""
"Выберите понравившийся проект щёлкнув на его\n"
"названии, или введите его адрес URL в поле ниже."
-#: ProjectInfoPage.cpp:610
+#: ProjectInfoPage.cpp:623
msgid "Categories:"
msgstr "Категории:"
-#: ProjectInfoPage.cpp:614 sg_ProjectPanel.cpp:89
+#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
msgid "Projects:"
msgstr "Проекты:"
-#: ProjectInfoPage.cpp:618
+#: ProjectInfoPage.cpp:631
msgid "Project details"
msgstr "Описание проекта"
-#: ProjectInfoPage.cpp:622
+#: ProjectInfoPage.cpp:635
msgid "Research area:"
msgstr "Научная область:"
-#: ProjectInfoPage.cpp:626
+#: ProjectInfoPage.cpp:639
msgid "Organization:"
msgstr "Организация:"
-#: ProjectInfoPage.cpp:630
+#: ProjectInfoPage.cpp:643
msgid "Web site:"
msgstr "Веб-сайт:"
-#: ProjectInfoPage.cpp:634
+#: ProjectInfoPage.cpp:647
msgid "Supported systems:"
msgstr "Поддерживаемые платформы:"
-#: ProjectInfoPage.cpp:638
+#: ProjectInfoPage.cpp:651
msgid "Project URL:"
msgstr "URL-адрес проекта:"
-#: ProjectInfoPage.cpp:814
+#: ProjectInfoPage.cpp:826
msgid ""
"This project may not have work for your type of computer. Do you want to "
"add it anyway?"
@@ -2722,7 +2721,7 @@ msgstr ""
"Возможно, что данный проект не поддерживает тип вашего компьютера или "
"операционную систему. Вы всё равно хотите его добавить?"
-#: ProjectInfoPage.cpp:838
+#: ProjectInfoPage.cpp:850
msgid "You already added this project. Please choose a different project."
msgstr "Этот проект уже добавлен. Выберите другой проект."
@@ -2731,12 +2730,12 @@ msgstr "Этот проект уже добавлен. Выберите друг
msgid "Communicating with project."
msgstr "Установка связи с проектом."
-#: ProjectProcessingPage.cpp:507
+#: ProjectProcessingPage.cpp:509
msgid "Required files not found on the server."
msgstr "Необходимые файлы не найдены на сервере."
# что бы это значило???
-#: ProjectProcessingPage.cpp:510 ProjectProcessingPage.cpp:572
+#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
msgid "An internal server error has occurred."
msgstr "Произошла внутренняя ошибка сервера."
@@ -2846,8 +2845,8 @@ msgid "I agree to the terms of use."
msgstr "Я согласен с условиями."
#: TermsOfUsePage.cpp:237
-msgid "I do not agree with the terms of use."
-msgstr "Я не согласен с условиями использования."
+msgid "I do not agree to the terms of use."
+msgstr ""
#: UnavailablePage.cpp:183
msgid "Project temporarily unavailable"
@@ -2944,7 +2943,7 @@ msgstr "Компьютер (хост) с именем: '%s' не найден."
msgid "'%s' does not contain a valid path."
msgstr "Указанный путь: '%s' не существует."
-#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1976
+#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
#: ViewTransfers.cpp:160 ViewWork.cpp:183
msgid "Commands"
msgstr "Действия"
@@ -2997,7 +2996,7 @@ msgstr "Получение уведомлений; пожалуйста подо
msgid "There are no notices at this time."
msgstr "На данный момент нет уведомлений."
-#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:772
+#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
msgid "Notices"
msgstr "Уведомления"
@@ -3015,7 +3014,7 @@ msgstr ""
"(возможно) закачке новых заданий."
#: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
-#: sg_BoincSimpleFrame.cpp:753 sg_ProjectCommandPopup.cpp:67
+#: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
#: sg_ProjectCommandPopup.cpp:113 sg_TaskCommandPopup.cpp:66
#: sg_TaskCommandPopup.cpp:106
msgid "Suspend"
@@ -3128,13 +3127,11 @@ msgid "Removing project..."
msgstr "Удаление проекта..."
#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
-#: sg_StatImageLoader.cpp:192
#, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "Вы действительно хотите удалить проект '%s'?"
#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
-#: sg_StatImageLoader.cpp:138 sg_StatImageLoader.cpp:198
msgid "Remove Project"
msgstr "Удалить проект"
@@ -3266,138 +3263,138 @@ msgid "used by other programs: "
msgstr "занято другими данными: "
# Общее количество очков набранных участником
-#: ViewStatistics.cpp:1203
+#: ViewStatistics.cpp:1205
msgid "User Total"
msgstr "Общее количество очков участника"
# Среднее количество очков набираемых участником за день
-#: ViewStatistics.cpp:1204
+#: ViewStatistics.cpp:1206
msgid "User Average"
msgstr "Среднее количество очков за день"
# Общее количество очков набранных на данном хосте
-#: ViewStatistics.cpp:1205
+#: ViewStatistics.cpp:1207
msgid "Host Total"
msgstr "Общее количество очков для хоста"
# Среднее количество очков набираемых данным хостом за день
-#: ViewStatistics.cpp:1206
+#: ViewStatistics.cpp:1208
msgid "Host Average"
msgstr "Среднее количество очков за день для хоста"
-#: ViewStatistics.cpp:1353
+#: ViewStatistics.cpp:1355
#, c-format
msgid "Last update: %.0f days ago"
msgstr "Информация обновлялась: %.0f дн. назад"
-#: ViewStatistics.cpp:1980
+#: ViewStatistics.cpp:1982
msgid "Show user total"
msgstr "Всего очков"
-#: ViewStatistics.cpp:1981
+#: ViewStatistics.cpp:1983
msgid "Show total credit for user"
msgstr "Показать общее количество очков набранных участником"
-#: ViewStatistics.cpp:1987
+#: ViewStatistics.cpp:1989
msgid "Show user average"
msgstr "В среднем за день"
-#: ViewStatistics.cpp:1988
+#: ViewStatistics.cpp:1990
msgid "Show average credit for user"
msgstr "Показать среднее количество очков набираемых участником за день"
-#: ViewStatistics.cpp:1994
+#: ViewStatistics.cpp:1996
msgid "Show host total"
msgstr "Всего очков для хоста"
-#: ViewStatistics.cpp:1995
+#: ViewStatistics.cpp:1997
msgid "Show total credit for host"
msgstr "Показать общее количество очков набранных на данном хосте"
-#: ViewStatistics.cpp:2001
+#: ViewStatistics.cpp:2003
msgid "Show host average"
msgstr "В среднем для хоста"
-#: ViewStatistics.cpp:2002
+#: ViewStatistics.cpp:2004
msgid "Show average credit for host"
msgstr "Показать среднее количество очков набираемых данным хостом за день"
-#: ViewStatistics.cpp:2011
+#: ViewStatistics.cpp:2013
msgid "< &Previous project"
msgstr "< Предыдущий"
-#: ViewStatistics.cpp:2012
+#: ViewStatistics.cpp:2014
msgid "Show chart for previous project"
msgstr "Показать предыдущий проект (вверх)"
-#: ViewStatistics.cpp:2017
+#: ViewStatistics.cpp:2019
msgid "&Next project >"
msgstr "Следующий >"
-#: ViewStatistics.cpp:2018
+#: ViewStatistics.cpp:2020
msgid "Show chart for next project"
msgstr "Показать следующий проект (вниз)"
-#: ViewStatistics.cpp:2024 ViewStatistics.cpp:2414
+#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
msgid "Hide project list"
msgstr "Скрыть список проектов"
-#: ViewStatistics.cpp:2025 ViewStatistics.cpp:2414
+#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
msgid "Use entire area for graphs"
msgstr "Использовать всю область для графиков"
-#: ViewStatistics.cpp:2030
+#: ViewStatistics.cpp:2032
msgid "Mode view"
msgstr "Вид графиков"
-#: ViewStatistics.cpp:2034
+#: ViewStatistics.cpp:2036
msgid "One project"
msgstr "Один проект"
-#: ViewStatistics.cpp:2035
+#: ViewStatistics.cpp:2037
msgid "Show one chart with selected project"
msgstr "Показать один выбранный проект"
-#: ViewStatistics.cpp:2041
+#: ViewStatistics.cpp:2043
msgid "All projects (separate)"
msgstr "Все проекты (по отдельности)"
-#: ViewStatistics.cpp:2042
+#: ViewStatistics.cpp:2044
msgid "Show all projects, one chart per project"
msgstr "Показать все проекты, каждый проект на отдельном графике"
-#: ViewStatistics.cpp:2048
+#: ViewStatistics.cpp:2050
msgid "All projects (together)"
msgstr "Все проекты (вместе)"
-#: ViewStatistics.cpp:2049
+#: ViewStatistics.cpp:2051
msgid "Show one chart with all projects"
msgstr "Показать все проекты на одном графике"
-#: ViewStatistics.cpp:2055
+#: ViewStatistics.cpp:2057
msgid "All projects (sum)"
msgstr "Все проекты (в сумме)"
-#: ViewStatistics.cpp:2056
+#: ViewStatistics.cpp:2058
msgid "Show one chart with sum of projects"
msgstr "Показать сумму по проектам на одном графике"
-#: ViewStatistics.cpp:2077
+#: ViewStatistics.cpp:2079
msgid "Statistics"
msgstr "Статистика"
-#: ViewStatistics.cpp:2101 ViewStatistics.cpp:2122 ViewStatistics.cpp:2143
-#: ViewStatistics.cpp:2165 ViewStatistics.cpp:2186 ViewStatistics.cpp:2207
-#: ViewStatistics.cpp:2228 ViewStatistics.cpp:2249 ViewStatistics.cpp:2270
-#: ViewStatistics.cpp:2294
+#: 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 "Обновляется график..."
-#: ViewStatistics.cpp:2418
+#: ViewStatistics.cpp:2420
msgid "Show project list"
msgstr "Показать список проектов"
-#: ViewStatistics.cpp:2418
+#: ViewStatistics.cpp:2420
msgid "Uses smaller area for graphs"
msgstr "Использовать меньшую область для графиков"
@@ -3521,7 +3518,7 @@ msgstr "Показать активные задания"
msgid "Show only active tasks."
msgstr "Показать только активные задания."
-#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60 sg_ViewTabPage.cpp:424
+#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
msgid "Show graphics"
msgstr "Показать графику"
@@ -3567,11 +3564,6 @@ msgstr "Осталось (приблизительно)"
msgid "Deadline"
msgstr "Отправить до"
-# Имя
-#: ViewWork.cpp:239
-msgid "Name"
-msgstr "Задание"
-
#: ViewWork.cpp:264
msgid "Tasks"
msgstr "Задания"
@@ -3724,107 +3716,43 @@ msgstr "Прервать процесс подключения?"
msgid "Question"
msgstr "Вопрос"
-#: sg_BoincSimpleFrame.cpp:145 sg_BoincSimpleGUI.cpp:119
+#: sg_BoincSimpleFrame.cpp:149
msgid "Advanced View...\tCtrl+Shift+A"
msgstr "Полный вид...\tCtrl+Shift+A"
-#: sg_BoincSimpleFrame.cpp:146
+#: sg_BoincSimpleFrame.cpp:150
msgid "Display the advanced graphical interface."
msgstr "Изменить внешний вид на более продвинутый."
-#: sg_BoincSimpleFrame.cpp:153
+#: sg_BoincSimpleFrame.cpp:157
msgid "Skin"
msgstr "Обложка"
-#: sg_BoincSimpleFrame.cpp:155
+#: sg_BoincSimpleFrame.cpp:159
msgid "Select the appearance of the user interface."
msgstr "Выберите внешний вид пользовательского интерфейса."
-#: sg_BoincSimpleFrame.cpp:202 sg_BoincSimpleGUI.cpp:147
+#: sg_BoincSimpleFrame.cpp:206
#, c-format
msgid "&%s"
msgstr "&%s"
-#: sg_BoincSimpleFrame.cpp:386
+#: sg_BoincSimpleFrame.cpp:390
msgid "Default"
msgstr "По умолчанию"
-#: sg_BoincSimpleFrame.cpp:755
+#: sg_BoincSimpleFrame.cpp:759
msgid "Suspend Computing"
msgstr "Приостановить вычисления"
-#: sg_BoincSimpleFrame.cpp:756
+#: sg_BoincSimpleFrame.cpp:760
msgid "Resume Computing"
msgstr "Возобновить вычисления"
-#: sg_BoincSimpleFrame.cpp:773
+#: sg_BoincSimpleFrame.cpp:777
msgid "Open a window to view notices from projects or BOINC"
msgstr "Открыть окно просмотра уведомлений проектов и BOINC"
-#: sg_BoincSimpleGUI.cpp:120
-msgid "Display the advanced (accessible) graphical interface."
-msgstr ""
-"Изменить внешний вид на расширенный (Будут полностью доступны все функции "
-"управления)."
-
-# ?????? это о чём
-#: sg_ClientStateIndicator.cpp:288 sg_TaskPanel.cpp:1210
-msgid "Retrieving current status."
-msgstr "Проверка текущего состояния."
-
-# ?
-#: sg_ClientStateIndicator.cpp:291 sg_TaskPanel.cpp:451
-msgid "You don't have any projects. Please Add a Project."
-msgstr "BOINC не подключен ни к одному проекту. Пожалуйста добавьте проект."
-
-#: sg_ClientStateIndicator.cpp:294 sg_TaskPanel.cpp:1216
-msgid "Downloading work from the server."
-msgstr "Загрузка заданий с сервера проекта."
-
-# ноутбук
-#: sg_ClientStateIndicator.cpp:299 sg_TaskPanel.cpp:1221
-msgid "Processing Suspended: Running On Batteries."
-msgstr "Обработка приостановлена: работа компьютера от батарей."
-
-#: sg_ClientStateIndicator.cpp:301 sg_TaskPanel.cpp:1223
-msgid "Processing Suspended: User Active."
-msgstr "Обработка приостановлена: пользователь работает."
-
-#: sg_ClientStateIndicator.cpp:303 sg_TaskPanel.cpp:1225
-msgid "Processing Suspended: User paused processing."
-msgstr "Обработка приостановлена: по инициативе пользователя."
-
-#: sg_ClientStateIndicator.cpp:305 sg_TaskPanel.cpp:1227
-msgid "Processing Suspended: Time of Day."
-msgstr "Обработка приостановлена: запрещённое время суток."
-
-#: sg_ClientStateIndicator.cpp:307 sg_TaskPanel.cpp:1229
-msgid "Processing Suspended: Benchmarks Running."
-msgstr "Обработка приостановлена: запущен тест производительности."
-
-#: sg_ClientStateIndicator.cpp:309 sg_TaskPanel.cpp:1231
-msgid "Processing Suspended."
-msgstr "Обработка приостановлена."
-
-# Оригинальная фраза не соостветствует смыслу того места где появляется.
-#: sg_ClientStateIndicator.cpp:313 sg_TaskPanel.cpp:1235
-msgid "Waiting to contact project servers."
-msgstr "Подождите пожалуйста."
-
-# ??? для тех кто не заметил, в предыдущей аналогичной фразе есть точка
-#: sg_ClientStateIndicator.cpp:317 sg_ClientStateIndicator.cpp:325
-#: sg_TaskPanel.cpp:1239 sg_TaskPanel.cpp:1248
-msgid "Retrieving current status"
-msgstr "Проверка текущего состояния"
-
-#: sg_ClientStateIndicator.cpp:320 sg_TaskPanel.cpp:1243
-msgid "No work available to process"
-msgstr "Нет заданий для обработки"
-
-#: sg_ClientStateIndicator.cpp:322 sg_TaskPanel.cpp:1245
-msgid "Unable to connect to the core client"
-msgstr "Не удалось подключиться к BOINC клиенту"
-
#: sg_DlgMessages.cpp:146
msgid "Close"
msgstr "Закрыть"
@@ -3843,162 +3771,125 @@ msgid "Click OK to set preferences."
msgstr "Для сохранения настроек нажмите 'OK'."
#: sg_DlgPreferences.cpp:278
-msgid "Click Clear to restore web-based settings."
-msgstr "Для возврата к настройкам с сайта проекта нажмите 'Удалить'."
+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 "
-msgstr "Для дополнительных параметров выберите Настройки клиента в "
-
-#: sg_DlgPreferences.cpp:290
-msgid "the Advanced View."
-msgstr "Полном виде."
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
-#: sg_DlgPreferences.cpp:318
+#: sg_DlgPreferences.cpp:313
msgid "Do work only between:"
msgstr "Обрабатывать только с"
-#: sg_DlgPreferences.cpp:340
+#: sg_DlgPreferences.cpp:335
msgid "Connect to internet only between:"
msgstr "Доступ в интернет только с"
-#: sg_DlgPreferences.cpp:362 sg_DlgPreferences.cpp:379
+#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
msgid "Use no more than:"
msgstr "Использовать не более:"
-#: sg_DlgPreferences.cpp:375
+#: sg_DlgPreferences.cpp:370
msgid "of disk space"
msgstr "места на диске"
-#: sg_DlgPreferences.cpp:392
+#: sg_DlgPreferences.cpp:387
msgid "of the processor"
msgstr "процессора"
# ...отопления
-#: sg_DlgPreferences.cpp:396
+#: sg_DlgPreferences.cpp:391
msgid "Do work while on battery?"
msgstr "Работать на батареях?"
-#: sg_DlgPreferences.cpp:409
+#: sg_DlgPreferences.cpp:404
msgid "Do work after idle for:"
msgstr "Запуск обработки при простое:"
+#: sg_DlgPreferences.cpp:429
+msgid "Clear all local preferences listed above and close the dialog"
+msgstr ""
+
# ?
-#: 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
+#: 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 "всегда"
-#: sg_DlgPreferences.cpp:643
+#: sg_DlgPreferences.cpp:638
msgid "100 MB"
msgstr "100 Мб"
-#: sg_DlgPreferences.cpp:644
+#: sg_DlgPreferences.cpp:639
msgid "200 MB"
msgstr "200 Мб"
-#: sg_DlgPreferences.cpp:645
+#: sg_DlgPreferences.cpp:640
msgid "500 MB"
msgstr "500 Мб"
-#: sg_DlgPreferences.cpp:646
+#: sg_DlgPreferences.cpp:641
msgid "1 GB"
msgstr "1 Гб"
-#: sg_DlgPreferences.cpp:647
+#: sg_DlgPreferences.cpp:642
msgid "2 GB"
msgstr "2 Гб"
-#: sg_DlgPreferences.cpp:648
+#: sg_DlgPreferences.cpp:643
msgid "5 GB"
msgstr "5 Гб"
-#: sg_DlgPreferences.cpp:649
+#: sg_DlgPreferences.cpp:644
msgid "10 GB"
msgstr "10 Гб"
-#: sg_DlgPreferences.cpp:650
+#: sg_DlgPreferences.cpp:645
msgid "20 GB"
msgstr "20 Гб"
-#: sg_DlgPreferences.cpp:651
+#: sg_DlgPreferences.cpp:646
msgid "50 GB"
msgstr "50 Гб"
-#: sg_DlgPreferences.cpp:652
+#: sg_DlgPreferences.cpp:647
msgid "100 GB"
msgstr "100 Гб"
-#: sg_DlgPreferences.cpp:722
+#: sg_DlgPreferences.cpp:717
#, c-format
msgid "%d MB"
msgstr "%d МБ"
-#: sg_DlgPreferences.cpp:724
+#: sg_DlgPreferences.cpp:719
#, c-format
msgid "%4.2f GB"
msgstr "%4.2f ГБ"
-#: sg_DlgPreferences.cpp:765
+#: sg_DlgPreferences.cpp:760
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: sg_DlgPreferences.cpp:801
+#: sg_DlgPreferences.cpp:796
msgid "0 (Run Always)"
msgstr "0 (работать всегда)"
-#: sg_DlgPreferences.cpp:804
+#: sg_DlgPreferences.cpp:799
#, c-format
msgid "%d"
msgstr "%d"
# ?
-#: sg_DlgPreferences.cpp:1034
+#: sg_DlgPreferences.cpp:1029
msgid "Do you really want to clear all local preferences?\n"
msgstr "Вы действительно хотите удалить все локально хранимые настройки?\n"
-#: sg_ImageButton.cpp:90
-msgid "Paused: Other work running"
-msgstr "Пауза: обрабатывается другое задание"
-
-# Resume это картинка !!! - зависит от скина
-#: sg_ImageButton.cpp:92
-msgid "Paused: User initiated. Click 'Resume' to continue"
-msgstr ""
-"Пауза: запрошено пользователем. Нажмите 'Продолжить' для возобновления "
-"обработки"
-
-#: sg_ImageButton.cpp:94
-msgid "Paused: User active"
-msgstr "Пауза: пользователь работает"
-
-#: sg_ImageButton.cpp:96
-msgid "Paused: Computer on battery"
-msgstr "Пауза: работа компьютера от батарей"
-
-#: sg_ImageButton.cpp:98
-msgid "Paused: Time of Day"
-msgstr "Пауза: запрещённое время суток"
-
-#: sg_ImageButton.cpp:100
-msgid "Paused: Benchmarks running"
-msgstr "Пауза: запущен тест производительности"
-
-#: sg_ImageButton.cpp:102
-msgid "Paused"
-msgstr "Пауза"
-
-#: sg_ImageButton.cpp:104
-msgid "Paused: Application start delayed"
-msgstr "Пауза: запуск приложения отложен"
-
-#: sg_ImageButton.cpp:132
-msgid "Click to show project graphics"
-msgstr "Нажмите чтобы показать окно приложения с графической информацией"
-
#: sg_ProjectPanel.cpp:72
msgid "Add Project"
msgstr "Добавить проект"
@@ -4011,7 +3902,7 @@ msgstr "Синхронзировать"
msgid "Work done for this project"
msgstr "Для этого проекта работа завершена"
-#: sg_ProjectPanel.cpp:77 sg_ProjectsComponent.cpp:123
+#: sg_ProjectPanel.cpp:77
msgid "Synchronize projects with account manager system"
msgstr ""
"Синхронизация информации о проектах и настройках между BOINC клиентом и "
@@ -4039,35 +3930,6 @@ msgstr "Показать меню веб-сайтов для проекта %s"
msgid "Pop up a menu of commands to apply to project %s"
msgstr "Показать меню команд, применимых к проекту %s"
-#: sg_ProjectsComponent.cpp:196 sg_ProjectsComponent.cpp:207
-msgid "Open a window to view messages"
-msgstr "Открыть окно с сообщениями"
-
-#: sg_ProjectsComponent.cpp:225
-msgid "Stop all activity"
-msgstr "Приостановить всю обработку и сетевую активность"
-
-#: sg_ProjectsComponent.cpp:237
-msgid "Resume activity"
-msgstr "Возобновить обработку"
-
-#: sg_ProjectsComponent.cpp:254
-msgid "Open a window to set your preferences"
-msgstr "Открыть окно настроек клиента"
-
-#: sg_ProjectsComponent.cpp:271
-msgid "Switch to the BOINC advanced view"
-msgstr "Изменить внешний вид BOINC менеджера на более подробный"
-
-#: sg_ProjectsComponent.cpp:298
-msgid "My Projects:"
-msgstr "Проекты:"
-
-#: sg_StatImageLoader.cpp:101
-#, c-format
-msgid "%s. Work done by %s: %0.2f"
-msgstr "%s. Участником %s заработано: %0.2f очков"
-
#: sg_TaskCommandPopup.cpp:67
msgid "Suspend this task."
msgstr "Приостановить это задание."
@@ -4085,94 +3947,123 @@ msgstr ""
"Вы уверены, что хотите прервать обработку этого задания '%s'?\n"
"(Прогресс: %.1lf%%, Состояние: %s)"
-#: sg_TaskPanel.cpp:452
+# ?
+#: sg_TaskPanel.cpp:464
+msgid "You don't have any projects. Please Add a Project."
+msgstr "BOINC не подключен ни к одному проекту. Пожалуйста добавьте проект."
+
+#: sg_TaskPanel.cpp:465
msgid "Not available"
msgstr "Недоступно"
-#: sg_TaskPanel.cpp:463
+#: sg_TaskPanel.cpp:476
msgid "Tasks:"
msgstr "Задания:"
-#: sg_TaskPanel.cpp:469
+#: sg_TaskPanel.cpp:482
msgid "Select a task to access"
msgstr "Выбрать задание для доступа"
-#: sg_TaskPanel.cpp:480
+#: sg_TaskPanel.cpp:493
msgid "From:"
msgstr "От:"
-#: sg_TaskPanel.cpp:534
+#: sg_TaskPanel.cpp:547
msgid "This task's progress"
msgstr "Прогресс этого задания"
-#: sg_TaskPanel.cpp:552
+#: sg_TaskPanel.cpp:565
msgid "Task Commands"
msgstr "Команды задания"
-#: sg_TaskPanel.cpp:553
+#: sg_TaskPanel.cpp:566
msgid "Pop up a menu of commands to apply to this task"
msgstr "Показать меню команд, применимых к этому заданию"
-#: sg_TaskPanel.cpp:688
+#: sg_TaskPanel.cpp:701
#, c-format
msgid "Application: %s"
msgstr "Приложение: %s"
-#: sg_TaskPanel.cpp:711
+#: sg_TaskPanel.cpp:724
#, c-format
msgid "%.3f%%"
msgstr "%.3f%%"
-#: sg_TaskPanel.cpp:719
+#: sg_TaskPanel.cpp:732
msgid "Application: Not available"
msgstr "Приложение: недоступно"
-#: sg_TaskPanel.cpp:819
+#: sg_TaskPanel.cpp:832
msgid "Not Available"
msgstr "Недоступно"
-#: sg_TaskPanel.cpp:834
+#: sg_TaskPanel.cpp:847
#, c-format
msgid "Elapsed: %s"
msgstr "Затрачено: %s"
-#: sg_TaskPanel.cpp:848
+#: sg_TaskPanel.cpp:861
#, c-format
msgid "Remaining (estimated): %s"
msgstr "Осталось (приблизительно): %s"
-#: sg_TaskPanel.cpp:863
+#: sg_TaskPanel.cpp:876
#, c-format
msgid "Status: %s"
msgstr "Статус: %s"
-#: sg_ViewTabPage.cpp:140 sg_ViewTabPage.cpp:280
-#, c-format
-msgid "%.1lf"
-msgstr "%.1lf"
+# ?????? это о чём
+#: sg_TaskPanel.cpp:1223
+msgid "Retrieving current status."
+msgstr "Проверка текущего состояния."
-#: sg_ViewTabPage.cpp:409
-#, c-format
-msgid "%d hr %d min %d sec"
-msgstr "%d часов %d минут %d секунд"
+#: sg_TaskPanel.cpp:1229
+msgid "Downloading work from the server."
+msgstr "Загрузка заданий с сервера проекта."
-#: sg_ViewTabPage.cpp:423
-msgid "Are you sure you want to display graphics on a remote machine?"
-msgstr ""
-"Вы уверены, что хотите показать графическое окно для приложения на удаленном "
-"компьютере?"
+# ноутбук
+#: sg_TaskPanel.cpp:1234
+msgid "Processing Suspended: Running On Batteries."
+msgstr "Обработка приостановлена: работа компьютера от батарей."
+
+#: sg_TaskPanel.cpp:1236
+msgid "Processing Suspended: User Active."
+msgstr "Обработка приостановлена: пользователь работает."
+
+#: sg_TaskPanel.cpp:1238
+msgid "Processing Suspended: User paused processing."
+msgstr "Обработка приостановлена: по инициативе пользователя."
-#: sg_ViewTabPage.cpp:446
-msgid "Application: "
-msgstr "Приложение: "
+#: sg_TaskPanel.cpp:1240
+msgid "Processing Suspended: Time of Day."
+msgstr "Обработка приостановлена: запрещённое время суток."
-#: sg_ViewTabPage.cpp:449 sg_ViewTabPage.cpp:453
-msgid "Time Remaining: "
-msgstr "Осталось: "
+#: sg_TaskPanel.cpp:1242
+msgid "Processing Suspended: Benchmarks Running."
+msgstr "Обработка приостановлена: запущен тест производительности."
-#: sg_ViewTabPage.cpp:452
-msgid "Elapsed Time: "
-msgstr "Затрачено: "
+#: sg_TaskPanel.cpp:1244
+msgid "Processing Suspended."
+msgstr "Обработка приостановлена."
+
+# Оригинальная фраза не соостветствует смыслу того места где появляется.
+#: sg_TaskPanel.cpp:1248
+msgid "Waiting to contact project servers."
+msgstr "Подождите пожалуйста."
+
+# ??? для тех кто не заметил, в предыдущей аналогичной фразе есть точка
+#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+msgid "Retrieving current status"
+msgstr "Проверка текущего состояния"
+
+#: sg_TaskPanel.cpp:1256
+msgid "No work available to process"
+msgstr "Нет заданий для обработки"
+
+#: sg_TaskPanel.cpp:1258
+msgid "Unable to connect to the core client"
+msgstr "Не удалось подключиться к BOINC клиенту"
#: wizardex.cpp:377 wizardex.cpp:553
msgid "&Next >"
@@ -4212,6 +4103,104 @@ msgstr "Показать все"
msgid "Quit %s"
msgstr "Выйти из %s"
+#~ msgid "invalid float"
+#~ msgstr "ошибка ввода числа"
+
+# ??
+#~ msgid "Workunit name"
+#~ msgstr "Имя задания"
+
+#~ msgid "I do not agree with the terms of use."
+#~ msgstr "Я не согласен с условиями использования."
+
+#~ msgid "Display the advanced (accessible) graphical interface."
+#~ msgstr ""
+#~ "Изменить внешний вид на расширенный (Будут полностью доступны все функции "
+#~ "управления)."
+
+#~ msgid "Click Clear to restore web-based settings."
+#~ msgstr "Для возврата к настройкам с сайта проекта нажмите 'Удалить'."
+
+#~ msgid "For additional settings, select Computing Preferences in "
+#~ msgstr "Для дополнительных параметров выберите Настройки клиента в "
+
+#~ msgid "the Advanced View."
+#~ msgstr "Полном виде."
+
+#~ msgid "Paused: Other work running"
+#~ msgstr "Пауза: обрабатывается другое задание"
+
+# Resume это картинка !!! - зависит от скина
+#~ msgid "Paused: User initiated. Click 'Resume' to continue"
+#~ msgstr ""
+#~ "Пауза: запрошено пользователем. Нажмите 'Продолжить' для возобновления "
+#~ "обработки"
+
+#~ msgid "Paused: User active"
+#~ msgstr "Пауза: пользователь работает"
+
+#~ msgid "Paused: Computer on battery"
+#~ msgstr "Пауза: работа компьютера от батарей"
+
+#~ msgid "Paused: Time of Day"
+#~ msgstr "Пауза: запрещённое время суток"
+
+#~ msgid "Paused: Benchmarks running"
+#~ msgstr "Пауза: запущен тест производительности"
+
+#~ msgid "Paused"
+#~ msgstr "Пауза"
+
+#~ msgid "Paused: Application start delayed"
+#~ msgstr "Пауза: запуск приложения отложен"
+
+#~ msgid "Click to show project graphics"
+#~ msgstr "Нажмите чтобы показать окно приложения с графической информацией"
+
+#~ msgid "Open a window to view messages"
+#~ msgstr "Открыть окно с сообщениями"
+
+#~ msgid "Stop all activity"
+#~ msgstr "Приостановить всю обработку и сетевую активность"
+
+#~ msgid "Resume activity"
+#~ msgstr "Возобновить обработку"
+
+#~ msgid "Open a window to set your preferences"
+#~ msgstr "Открыть окно настроек клиента"
+
+#~ msgid "Switch to the BOINC advanced view"
+#~ msgstr "Изменить внешний вид BOINC менеджера на более подробный"
+
+#~ msgid "My Projects:"
+#~ msgstr "Проекты:"
+
+#, c-format
+#~ msgid "%s. Work done by %s: %0.2f"
+#~ msgstr "%s. Участником %s заработано: %0.2f очков"
+
+#, c-format
+#~ msgid "%.1lf"
+#~ msgstr "%.1lf"
+
+#, c-format
+#~ msgid "%d hr %d min %d sec"
+#~ msgstr "%d часов %d минут %d секунд"
+
+#~ msgid "Are you sure you want to display graphics on a remote machine?"
+#~ msgstr ""
+#~ "Вы уверены, что хотите показать графическое окно для приложения на удаленном "
+#~ "компьютере?"
+
+#~ msgid "Application: "
+#~ msgstr "Приложение: "
+
+#~ msgid "Time Remaining: "
+#~ msgstr "Осталось: "
+
+#~ msgid "Elapsed Time: "
+#~ msgstr "Затрачено: "
+
#~ msgid "Account manager website"
#~ msgstr "Вебсайт менеджера проектов"
diff --git a/locale/ru/BOINC-Project-Generic.po b/locale/ru/BOINC-Project-Generic.po
index 926ae5e..91227fa 100644
--- a/locale/ru/BOINC-Project-Generic.po
+++ b/locale/ru/BOINC-Project-Generic.po
@@ -6,7 +6,7 @@ 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: 2013-10-29 10:57 PDT\n"
+"POT-Creation-Date: 2014-01-10 00:00 PST\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"
@@ -196,19 +196,19 @@ msgstr "Найти в форумах"
msgid "Advanced search"
msgstr "Расширенный поиск"
-#: ../inc/forum.inc:132 ../inc/user.inc:252 ../user/pm.php:69
+#: ../inc/forum.inc:132 ../inc/user.inc:253 ../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:119
+#: ../user/forum_forum.php:71 ../user/sample_index.php:130
msgid "Questions and Answers"
msgstr "Вопросы и ответы"
-#: ../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
+#: ../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
#: ../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:330 ../user/forum_forum.php:174
+#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
msgid "hidden"
msgstr "скрыто"
@@ -491,7 +491,7 @@ msgstr "Нельзя написать сообщение в скрытом об
msgid "Thread"
msgstr "Обсуждение"
-#: ../inc/forum.inc:1174 ../inc/team.inc:127 ../user/forum_forum.php:136
+#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../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:127 ../user/forum_forum.php:139
+#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../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:329
+#: ../user/server_status.php:314
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: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
+#: ../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
#: ../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:29
+#: ../user/host_app_versions.php:30
msgid "Unknown"
msgstr "Неизвестно"
@@ -706,7 +706,7 @@ msgstr "Неизвестно"
msgid "Average download rate"
msgstr "Средняя скорость загрузки данных"
-#: ../inc/host.inc:169 ../user/host_app_versions.php:64
+#: ../inc/host.inc:169 ../user/host_app_versions.php:65
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:356
+#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
#: ../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:215
-#: ../inc/team.inc:224 ../inc/team.inc:226 ../inc/team.inc:362
-#: ../inc/team.inc:367 ../inc/user.inc:139
+#: ../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
#: ../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: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
+#: ../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
#: ../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:67
+#: ../inc/host.inc:745 ../user/merge_by_name.php:65
msgid "Merge computers by name"
msgstr "Объединить компьютеры по имени"
@@ -918,12 +918,12 @@ msgstr "Входящие"
msgid "Write"
msgstr "Написать"
-#: ../inc/pm.inc:33 ../inc/user.inc:377
+#: ../inc/pm.inc:33 ../inc/user.inc:378
msgid "Send private message"
msgstr "Отправить личное сообщение"
#: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
-#: ../user/ffmail_form.php:59 ../user/forum_edit.php:99
+#: ../user/ffmail_form.php:58 ../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:258
+#: ../inc/util.inc:274
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.0+ %2"
-msgstr "Использовать ГП Intel %1 начиная с версии 7.0+ %2"
+msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
+msgstr ""
#: ../inc/prefs.inc:358
msgid ""
@@ -1330,7 +1330,7 @@ msgstr "Определённые параметры проекта"
msgid "Primary (default) preferences"
msgstr "Основные настройки (по умолчанию)"
-#: ../inc/prefs.inc:871 ../user/add_venue.php:43 ../user/add_venue.php:67
+#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
#: ../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:192
+#: ../inc/profile.inc:193
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:196
+#: ../inc/profile.inc:197
msgid "User is banished"
msgstr "Пользователь заблокирован"
-#: ../inc/profile.inc:210
+#: ../inc/profile.inc:211
msgid "No profile exists for that user ID."
msgstr "Профиль не существует для пользователя с этим ID."
-#: ../inc/profile.inc:218 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:313
msgid "Edit your profile"
msgstr "Редактировать профиль"
-#: ../inc/profile.inc:261
+#: ../inc/profile.inc:262
msgid "Your feedback on this profile"
msgstr "Ваш отзыв на этот профиль"
-#: ../inc/profile.inc:263
+#: ../inc/profile.inc:264
msgid "Recommend this profile for User of the Day:"
msgstr "Рекомендовать этот профиль в качестве Пользователя дня:"
-#: ../inc/profile.inc:264
+#: ../inc/profile.inc:265
msgid "I %1like%2 this profile"
msgstr "Мне %1нравится%2 этот профиль"
-#: ../inc/profile.inc:267
+#: ../inc/profile.inc:268
msgid "Alert administrators to an offensive profile:"
msgstr "Предупредить администраторов об оскорбительном профиле:"
-#: ../inc/profile.inc:268
+#: ../inc/profile.inc:269
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
+#: ../inc/result.inc:53 ../user/host_app_versions.php:26
msgid "NVIDIA GPU"
msgstr "ГП NVIDIA"
@@ -1447,7 +1447,7 @@ msgstr "ГП NVIDIA"
msgid "ATI GPU"
msgstr "ГП ATI"
-#: ../inc/result.inc:57
+#: ../inc/result.inc:57 ../user/host_app_versions.php:28
msgid "Intel GPU"
msgstr "ГП Intel"
@@ -1701,7 +1701,7 @@ msgstr "Время подтверждения<br />или крайний сро
msgid "explain"
msgstr "объяснить"
-#: ../inc/result.inc:376 ../user/server_status.php:256
+#: ../inc/result.inc:376 ../user/server_status.php:241
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: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
+#: ../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
#: ../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:454
+#: ../inc/team.inc:49 ../inc/team.inc:453
msgid "Type of team"
msgstr "Тип команды"
@@ -1811,7 +1811,7 @@ msgstr "Тип команды"
msgid "Show only active teams"
msgstr "Показать только активные команды"
-#: ../inc/team.inc:52 ../user/profile_menu.php:77 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../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:556 ../inc/user.inc:280
-#: ../inc/user.inc:370
+#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
+#: ../inc/user.inc:371
msgid "None"
msgstr "Нет"
@@ -1856,27 +1856,27 @@ msgstr "Описание"
msgid "Web site"
msgstr "Вебсайт"
-#: ../inc/team.inc:119
+#: ../inc/team.inc:120
msgid "Cross-project stats"
msgstr "Объединенная статистика по проектам"
-#: ../inc/team.inc:122 ../inc/team.inc:373 ../user/team_search.php:71
+#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
msgid "Type"
msgstr "Тип"
-#: ../inc/team.inc:126 ../user/team_manage.php:63
+#: ../inc/team.inc:127 ../user/team_manage.php:63
msgid "Message board"
msgstr "Доска сообщений"
-#: ../inc/team.inc:127 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
msgid "Threads"
msgstr "Обсуждения"
-#: ../inc/team.inc:135
+#: ../inc/team.inc:136
msgid "Join this team"
msgstr "Присоединиться к этой команде"
-#: ../inc/team.inc:136
+#: ../inc/team.inc:137
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:139
+#: ../inc/team.inc:140
msgid "Not accepting new members"
msgstr "Не принимать новых участников"
-#: ../inc/team.inc:146
+#: ../inc/team.inc:147
msgid "Foundership change requested"
msgstr "Запрошена смена основателя"
-#: ../inc/team.inc:147
+#: ../inc/team.inc:148
msgid "Respond by %1"
msgstr "Ответить до %1"
-#: ../inc/team.inc:151
+#: ../inc/team.inc:152
msgid "Team foundership change"
msgstr "Смена основателя команды"
-#: ../inc/team.inc:155 ../inc/team.inc:358
+#: ../inc/team.inc:156 ../inc/team.inc:359
msgid "Members"
msgstr "Участники"
-#: ../inc/team.inc:156 ../inc/team.inc:253
+#: ../inc/team.inc:157 ../inc/team.inc:254
msgid "Founder"
msgstr "Основатель"
-#: ../inc/team.inc:168
+#: ../inc/team.inc:169
msgid "Admins"
msgstr "Администраторы"
-#: ../inc/team.inc:183
+#: ../inc/team.inc:184
msgid "New members in last day"
msgstr "Новые участники за последний день"
-#: ../inc/team.inc:184
+#: ../inc/team.inc:185
msgid "Total members"
msgstr "Всего участников"
-#: ../inc/team.inc:184 ../inc/team.inc:185 ../inc/team.inc:186
+#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
msgid "view"
msgstr "просмотр"
-#: ../inc/team.inc:185
+#: ../inc/team.inc:186
msgid "Active members"
msgstr "Активных участников"
-#: ../inc/team.inc:186
+#: ../inc/team.inc:187
msgid "Members with credit"
msgstr "Участников с заработанными очками"
-#: ../inc/team.inc:255
+#: ../inc/team.inc:256
msgid "Admin"
msgstr "Администратор"
-#: ../inc/team.inc:276 ../user/forum_user_posts.php:122
+#: ../inc/team.inc:277 ../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:280 ../user/forum_user_posts.php:131
+#: ../inc/team.inc:281 ../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:288
+#: ../inc/team.inc:289
msgid "No such team."
msgstr "Нет такой команды."
-#: ../inc/team.inc:301
+#: ../inc/team.inc:302
msgid "This operation requires foundership."
msgstr "Эта операция требует прав основателя."
-#: ../inc/team.inc:325
+#: ../inc/team.inc:326
msgid "This operation requires team admin privileges"
msgstr "Эта операция требует прав администратора команды"
@@ -1970,7 +1970,7 @@ msgstr ""
"здесь, то они будут скоро перезаписаны. Поэтому редактируйте %1глобальную "
"команду BOINC%2."
-#: ../inc/team.inc:429
+#: ../inc/team.inc:428
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:433
+#: ../inc/team.inc:432
msgid "Team name, text version"
msgstr "Название команды, текстовая версия"
-#: ../inc/team.inc:434
+#: ../inc/team.inc:433
msgid "Don't use HTML tags."
msgstr "Не использовать тэги HTML."
-#: ../inc/team.inc:437
+#: ../inc/team.inc:436
msgid "Team name, HTML version"
msgstr "Название команды, HTML версия"
-#: ../inc/team.inc:439 ../inc/team.inc:449
+#: ../inc/team.inc:438 ../inc/team.inc:448
msgid "You may use %1limited HTML tags%2."
msgstr "Вы можете использовать %1ограниченные тэги HTML%2."
-#: ../inc/team.inc:440
+#: ../inc/team.inc:439
msgid "If you don't know HTML, leave this box blank."
msgstr "Если Вы не знаете HTML, оставьте это поле пустым."
-#: ../inc/team.inc:443
+#: ../inc/team.inc:442
msgid "URL of team web page, if any"
msgstr "URL веб-страницы команды, если есть"
-#: ../inc/team.inc:443
+#: ../inc/team.inc:442
msgid "without \"http://\""
msgstr "без \"http://\""
-#: ../inc/team.inc:444
+#: ../inc/team.inc:443
msgid "This URL will be linked to from the team's page on this site."
msgstr "Этот URL будет вызываться со страницы команды на этом сайте."
-#: ../inc/team.inc:447
+#: ../inc/team.inc:446
msgid "Description of team"
msgstr "Описание команды"
-#: ../inc/team.inc:463
+#: ../inc/team.inc:462
msgid "Accept new members?"
msgstr "Принимать новых участников?"
-#: ../inc/uotd.inc:27
+#: ../inc/uotd.inc:28
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:242 ../inc/user.inc:328 ../inc/user.inc:401
+#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
#: ../user/view_profile.php:64
msgid "View"
msgstr "Просмотр"
@@ -2068,8 +2068,8 @@ msgstr "Объединенная статистика по проектам"
msgid "Account"
msgstr "Учётная запись"
-#: ../inc/user.inc:165 ../inc/user.inc:280 ../inc/user.inc:368
-#: ../inc/user.inc:370 ../user/user_search.php:139
+#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
+#: ../inc/user.inc:371 ../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:48
+#: ../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 "Адрес email"
-#: ../inc/user.inc:203 ../inc/user.inc:321
+#: ../inc/user.inc:203 ../inc/user.inc:322
msgid "URL"
msgstr "URL"
@@ -2106,7 +2106,7 @@ msgstr "URL"
msgid "Postal code"
msgstr "Почтовый индекс"
-#: ../inc/user.inc:207 ../inc/user.inc:315
+#: ../inc/user.inc:207 ../inc/user.inc:316
msgid "%1 member since"
msgstr "Участник %1 с"
@@ -2126,7 +2126,7 @@ msgstr "пароль"
msgid "other account info"
msgstr "другая учётная информация"
-#: ../inc/user.inc:213 ../inc/user.inc:314
+#: ../inc/user.inc:213 ../inc/user.inc:315
msgid "User ID"
msgstr "ID пользователя"
@@ -2162,129 +2162,129 @@ msgstr "Настройки сообщества"
msgid "Preferences for this project"
msgstr "Настройки для этого проекта"
-#: ../inc/user.inc:233 ../user/prefs.php:32
+#: ../inc/user.inc:233 ../user/prefs.php:29
msgid "%1 preferences"
msgstr "Настройки %1"
#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:114
+#: ../user/sample_index.php:125
msgid "Community"
msgstr "Сообщество"
-#: ../inc/user.inc:242 ../user/pm.php:107 ../user/pm.php:147
+#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
msgid "Delete"
msgstr "Удалить"
-#: ../inc/user.inc:244
+#: ../inc/user.inc:245
msgid "Create"
msgstr "Создать"
-#: ../inc/user.inc:246 ../inc/user.inc:401 ../inc/util.inc:498
+#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
msgid "Profile"
msgstr "Профиль"
-#: ../inc/user.inc:249 ../inc/user.inc:374
+#: ../inc/user.inc:250 ../inc/user.inc:375
msgid "%1 posts"
msgstr "%1 сообщений"
-#: ../inc/user.inc:261 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
msgid "Notifications"
msgstr "Уведомления"
-#: ../inc/user.inc:268
+#: ../inc/user.inc:269
msgid "Quit team"
msgstr "Выйти из команды"
-#: ../inc/user.inc:270 ../inc/user.inc:287
+#: ../inc/user.inc:271 ../inc/user.inc:288
msgid "Administer"
msgstr "Управление"
-#: ../inc/user.inc:276 ../inc/user.inc:289
+#: ../inc/user.inc:277 ../inc/user.inc:290
msgid "(foundership change request pending)"
msgstr "(запрос на смену основателя в ожидании)"
-#: ../inc/user.inc:278
+#: ../inc/user.inc:279
msgid "Member of team"
msgstr "Участник команды"
-#: ../inc/user.inc:280
+#: ../inc/user.inc:281
msgid "find a team"
msgstr "найти команду"
-#: ../inc/user.inc:291
+#: ../inc/user.inc:292
msgid "Founder but not member of"
msgstr "Основатель, но не участник"
-#: ../inc/user.inc:297
+#: ../inc/user.inc:298
msgid "Find friends"
msgstr "Найти друзей"
-#: ../inc/user.inc:304 ../inc/user.inc:306 ../inc/user.inc:384
-#: ../inc/user.inc:386 ../inc/user.inc:395
+#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
+#: ../inc/user.inc:387 ../inc/user.inc:396
msgid "Friends"
msgstr "Друзья"
-#: ../inc/user.inc:328 ../inc/user.inc:330 ../user/server_status.php:408
+#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
msgid "Computers"
msgstr "Компьютеры"
-#: ../inc/user.inc:337
+#: ../inc/user.inc:338
msgid "Donor"
msgstr "Донор"
-#: ../inc/user.inc:377
+#: ../inc/user.inc:378
msgid "Contact"
msgstr "Контакт"
-#: ../inc/user.inc:380
+#: ../inc/user.inc:381
msgid "This person is a friend"
msgstr "Персона является другом"
-#: ../inc/user.inc:381 ../user/friend.php:238
+#: ../inc/user.inc:382 ../user/friend.php:238
msgid "Cancel friendship"
msgstr "Прекратить дружбу"
-#: ../inc/user.inc:384 ../user/friend.php:37
+#: ../inc/user.inc:385 ../user/friend.php:37
msgid "Request pending"
msgstr "Запрос в ожидании"
-#: ../inc/user.inc:386
+#: ../inc/user.inc:387
msgid "Add as friend"
msgstr "Добавить друга"
-#: ../inc/user.inc:445
+#: ../inc/user.inc:446
msgid "user name cannot have leading or trailing white space"
msgstr "имя пользователя не может иметь начальные или конечные пробелы"
-#: ../inc/user.inc:449
+#: ../inc/user.inc:450
msgid "user name must be nonempty"
msgstr "имя пользователя не может быть пустым"
-#: ../inc/user.inc:453
+#: ../inc/user.inc:454
msgid "user name may not contain HTML tags"
msgstr "имя пользователя не должно содержать тэги HTML"
-#: ../inc/util.inc:116
+#: ../inc/util.inc:131
msgid "log out"
msgstr "выйти"
-#: ../inc/util.inc:118
+#: ../inc/util.inc:133
msgid "log in"
msgstr "войти"
-#: ../inc/util.inc:188 ../user/login_form.php:30 ../user/login_form.php:55
+#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
msgid "Log in"
msgstr "Войти"
-#: ../inc/util.inc:189 ../user/create_account_form.php:31
+#: ../inc/util.inc:205 ../user/create_account_form.php:40
msgid "Create an account"
msgstr "Создание учётной записи"
-#: ../inc/util.inc:190
+#: ../inc/util.inc:206
msgid "Server status page"
msgstr "Информация о состоянии сервера"
-#: ../inc/util.inc:232
+#: ../inc/util.inc:248
msgid ""
"A database error occurred while handling your request; please try again "
"later."
@@ -2292,60 +2292,56 @@ msgstr ""
"Произошла ошибка базы данных во время обработки вашего запроса; пожалуйста "
"попробуйте ещё раз позже."
-#: ../inc/util.inc:241
+#: ../inc/util.inc:257
msgid "Unable to handle request"
msgstr "Невозможно обработать запрос"
-#: ../inc/util.inc:261
+#: ../inc/util.inc:277
msgid "hours"
msgstr "часов"
-#: ../inc/util.inc:264
+#: ../inc/util.inc:280
msgid "min"
msgstr "мин."
-#: ../inc/util.inc:267
+#: ../inc/util.inc:283
msgid "sec"
msgstr "сек."
-#: ../inc/util.inc:428
+#: ../inc/util.inc:444
msgid "Link has timed out. Please click Back, refresh the page, and try again."
msgstr ""
"Ссылка просрочена. Пожалуйста щёлкните Назад, обновите страницу, и "
"попробуйте ещё раз."
-#: ../inc/util.inc:497
+#: ../inc/util.inc:513
msgid "View the profile of %1"
msgstr "Посмотреть профиль участника %1"
-#: ../inc/util.inc:553
+#: ../inc/util.inc:569
msgid "Use BBCode tags to format your text"
msgstr "Используйте тэги BBCode для форматирования Вашего текста"
-#: ../inc/util.inc:780
+#: ../inc/util.inc:796
msgid "Project down for maintenance"
msgstr "Проект остановлен для обслуживания"
-#: ../inc/util.inc:783
+#: ../inc/util.inc:799
msgid "%1 is temporarily shut down for maintenance. Please try again later."
msgstr ""
"%1 временно остановлен для обслуживания. Пожалуйста попробуйте ещё раз "
"позже."
-#: ../inc/util.inc:801
+#: ../inc/util.inc:817
msgid "Unable to connect to database - please try again later"
msgstr ""
"Невозможно подключиться к базе данных - пожалуйста попробуйте ещё раз позже"
-#: ../inc/util.inc:802
-msgid "Error:"
-msgstr "Ошибка:"
-
-#: ../inc/util.inc:806
+#: ../inc/util.inc:821
msgid "Unable to select database - please try again later"
msgstr "Невозможно выбрать базу данных - пожалуйста попробуйте ещё раз позже"
-#: ../inc/util_ops.inc:136 ../user/get_passwd.php:72
+#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
msgid "Stay logged in on this computer"
msgstr "Оставаться авторизованным на этом компьютере"
@@ -2353,21 +2349,21 @@ msgstr "Оставаться авторизованным на этом комп
msgid "Finish account setup"
msgstr "Завершение настройки учётной записи"
-#: ../user/account_finish.php:41 ../user/create_account_form.php:80
+#: ../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 ""
"Идентифицирует Вас на нашем web-сайте. Введите Ваше настоящее имя или "
"псевдоним."
-#: ../user/account_finish.php:45 ../user/create_account_form.php:99
+#: ../user/account_finish.php:45 ../user/create_account_form.php:98
msgid "Select the country you want to represent, if any."
msgstr "Выберите страну, которую представляете, если хотите."
-#: ../user/account_finish.php:51 ../user/create_account_form.php:105
+#: ../user/account_finish.php:51 ../user/create_account_form.php:104
msgid "Postal or ZIP Code"
msgstr "Почтовый индекс или ZIP-код"
-#: ../user/account_finish.php:51 ../user/create_account_form.php:105
+#: ../user/account_finish.php:51 ../user/create_account_form.php:104
msgid "Optional"
msgstr "Необязательно"
@@ -2379,12 +2375,12 @@ msgstr "Вы должны указать имя для вашей учётной
msgid "HTML tags not allowed in name"
msgstr "Тэги HTML недопустимы в Вашем имени"
-#: ../user/add_venue.php:85
+#: ../user/add_venue.php:81
msgid "Add %1 preferences for %2"
msgstr "Добавить настройки %1 для конфигурации %2"
#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:109
+#: ../user/sample_index.php:120
msgid "Applications"
msgstr "Приложения"
@@ -2548,16 +2544,16 @@ msgstr "Команды"
msgid "create or join a team"
msgstr "создать или присоединиться к команде"
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:180
+#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
msgid "User of the day"
msgstr "Пользователь Дня"
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:254
+#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
msgid "Server status"
msgstr "Статус сервера"
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:35
-#: ../user/sample_index.php:116
+#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
+#: ../user/sample_index.php:127
msgid "Profiles"
msgstr "Профили"
@@ -2592,7 +2588,7 @@ msgid "Languages"
msgstr "Языки"
#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:74
+#: ../user/sample_index.php:79
msgid "Read our rules and policies"
msgstr "Прочтите наши правила и политику"
@@ -2604,65 +2600,46 @@ msgstr "Не удалось создать учётную запись"
msgid "Click your browser's <b>Back</b> button to try again."
msgstr "Нажмите кнопку <b>Назад</b> вашего браузера, чтобы попытаться ещё раз."
-#: ../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
+#: ../user/create_account_action.php:47
msgid "Your reCAPTCHA response was not correct. Please try again."
msgstr "Ваш ответ reCAPTCHA был неправилен. Пожалуйста попробуйте ещё раз."
-#: ../user/create_account_action.php:77
+#: ../user/create_account_action.php:70
msgid "You must supply an invitation code to create an account."
msgstr "Чтобы создать учётную запись, Вы должны указать пригласительный код."
-#: ../user/create_account_action.php:80
+#: ../user/create_account_action.php:73
msgid "The invitation code you gave is not valid."
msgstr "Указанный Вами пригласительный код не действителен."
-#: ../user/create_account_action.php:91
+#: ../user/create_account_action.php:84
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:95
+#: ../user/create_account_action.php:88
msgid "There's already an account with that email address."
msgstr "Уже имеется учётная запись с таким же адресом электронной почты."
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
msgid "New passwords are different"
msgstr "Новые пароли отличаются"
-#: ../user/create_account_action.php:108 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
msgid "Passwords may only include ASCII characters."
msgstr "Пароли могут содержать только ASCII-символы."
-#: ../user/create_account_action.php:113 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:106 ../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:134
+#: ../user/create_account_action.php:127
msgid "Couldn't create account"
msgstr "Не удалось создать учётную запись"
-#: ../user/create_account_form.php:37
-msgid "Account creation is currently disabled. Please try again later."
-msgstr ""
-"Создание учётной записи в данный момент запрещено. Пожалуйста, попробуйте "
-"ещё раз немного позднее."
-
-#: ../user/create_account_form.php:46
+#: ../user/create_account_form.php:44
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."
@@ -2671,7 +2648,7 @@ msgstr ""
"этого запустите BOINC, выберите Добавить проект, и введите свой e-mail и "
"пароль."
-#: ../user/create_account_form.php:62
+#: ../user/create_account_form.php:61
msgid ""
"This account will belong to the team %1 and will have the project "
"preferences of its founder."
@@ -2679,40 +2656,40 @@ msgstr ""
"Эта учётная запись будет относиться к команде '%1' и будет иметь настройки "
"проекта как у её основателя."
-#: ../user/create_account_form.php:74
+#: ../user/create_account_form.php:73
msgid "Invitation Code"
msgstr "Пригласительный код"
-#: ../user/create_account_form.php:74
+#: ../user/create_account_form.php:73
msgid "A valid invitation code is required to create an account."
msgstr ""
"Для создания учётной записи необходим действительный пригласительный код."
-#: ../user/create_account_form.php:84
+#: ../user/create_account_form.php:83
msgid "Email Address"
msgstr "Адрес электронной почты"
-#: ../user/create_account_form.php:84
+#: ../user/create_account_form.php:83
msgid "Must be a valid address of the form 'name at domain'."
msgstr "Должен быть действительным адресом в форме 'name at domain'."
-#: ../user/create_account_form.php:93 ../user/edit_email_form.php:49
+#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
msgid "Password"
msgstr "Пароль"
-#: ../user/create_account_form.php:94
+#: ../user/create_account_form.php:93
msgid "Must be at least %1 characters"
msgstr "Должно быть по крайней мере %1 символов"
-#: ../user/create_account_form.php:97
+#: ../user/create_account_form.php:96
msgid "Confirm password"
msgstr "Подтвердите пароль"
-#: ../user/create_account_form.php:114
+#: ../user/create_account_form.php:113
msgid "Please enter the words shown in the image"
msgstr "Пожалуйста, введите слова, показанные на картинке"
-#: ../user/create_account_form.php:120
+#: ../user/create_account_form.php:119
msgid "Create account"
msgstr "Создать учётную запись"
@@ -2879,7 +2856,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:55 ../user/user_search.php:59
+#: ../user/prefs_remove.php:52 ../user/user_search.php:59
#: ../user/user_search.php:64
msgid "Yes"
msgstr "Да"
@@ -3113,23 +3090,23 @@ msgstr ""
"Невозможно обновить ваш адрес электронной почты из-за проблем с базой "
"данных. Пожалуйста попробуйте ещё раз позже."
-#: ../user/edit_email_form.php:29 ../user/edit_email_form.php:53
+#: ../user/edit_email_form.php:27 ../user/edit_email_form.php:51
msgid "Change email address"
msgstr "Поменять адрес email"
-#: ../user/edit_email_form.php:38
+#: ../user/edit_email_form.php:36
msgid "Change the email address of your account"
msgstr "Изменение адреса электронной почты вашей учётной записи"
-#: ../user/edit_email_form.php:39
+#: ../user/edit_email_form.php:37
msgid "New email address"
msgstr "Новый адрес email"
-#: ../user/edit_email_form.php:40
+#: ../user/edit_email_form.php:38
msgid "Must be a valid address of the form 'name at domain'"
msgstr "Должен быть действительным адресом в форме 'name at domain'"
-#: ../user/edit_email_form.php:50
+#: ../user/edit_email_form.php:48
msgid "No password?"
msgstr "Нет пароля?"
@@ -3350,8 +3327,8 @@ msgstr "Не найдена учётная запись с таким адрес
msgid "Invalid password"
msgstr "Неправильный пароль"
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:28
-#: ../user/edit_passwd_form.php:58
+#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:55
msgid "Change password"
msgstr "Поменять пароль"
@@ -3367,35 +3344,35 @@ msgstr ""
"Невозможно обновить ваш пароль из-за проблем с базой данных. Пожалуйста "
"попробуйте ещё раз позже."
-#: ../user/edit_passwd_form.php:42
+#: ../user/edit_passwd_form.php:39
msgid "You can identify yourself using either"
msgstr "Вы можете идентифицировать себя используя"
-#: ../user/edit_passwd_form.php:44
+#: ../user/edit_passwd_form.php:41
msgid "your email address and old password"
msgstr "Ваш адрес email и старый пароль"
-#: ../user/edit_passwd_form.php:45
+#: ../user/edit_passwd_form.php:42
msgid "your account key"
msgstr "Ваш ключ учётной записи"
-#: ../user/edit_passwd_form.php:49
+#: ../user/edit_passwd_form.php:46
msgid "Current password"
msgstr "Текущий пароль"
-#: ../user/edit_passwd_form.php:51
+#: ../user/edit_passwd_form.php:48
msgid "<b>OR</b>: Account key"
msgstr "<b>ИЛИ</b>: Ключ учётной записи"
-#: ../user/edit_passwd_form.php:52
+#: ../user/edit_passwd_form.php:49
msgid "Get account key by email"
msgstr "Получить ключ учётной записи по электронной почте"
-#: ../user/edit_passwd_form.php:56
+#: ../user/edit_passwd_form.php:53
msgid "New password"
msgstr "Новый пароль"
-#: ../user/edit_passwd_form.php:57
+#: ../user/edit_passwd_form.php:54
msgid "New password, again"
msgstr "Новый пароль, ещё раз"
@@ -3411,23 +3388,23 @@ msgstr "Вы должны указать имя для вашей учётной
msgid "Couldn't update user info."
msgstr "Невозможно обновить информацию о пользователе."
-#: ../user/edit_user_info_form.php:29
+#: ../user/edit_user_info_form.php:27
msgid "Edit account information"
msgstr "Редактировать учётную информацию"
-#: ../user/edit_user_info_form.php:34
+#: ../user/edit_user_info_form.php:32
msgid "Name %1 real name or nickname%2"
msgstr "Имя %1 настоящее имя или псевдоним%2"
-#: ../user/edit_user_info_form.php:37
+#: ../user/edit_user_info_form.php:35
msgid "URL %1 of your web page; optional%2"
msgstr "URL %1 вашей веб-страницы; необязательно%2"
-#: ../user/edit_user_info_form.php:45
+#: ../user/edit_user_info_form.php:43
msgid "Postal (ZIP) code %1 Optional%2"
msgstr "Почтовый (ZIP) индекс %1 необязательно%2"
-#: ../user/edit_user_info_form.php:49
+#: ../user/edit_user_info_form.php:47
msgid "Update info"
msgstr "Обновить информацию"
@@ -3651,23 +3628,21 @@ msgstr ""
"Вы забыли ввести имена и/или адреса электронной почты ваших друзей; "
"пожалуйста %1вернитесь в форму%2 и введите их."
-#: ../user/ffmail_form.php:31
+#: ../user/ffmail_form.php:30
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:34
+#: ../user/ffmail_form.php:33
msgid "Tell your friends about %1"
msgstr "Расскажите своим друзьям о %1"
-#: ../user/ffmail_form.php:38
+#: ../user/ffmail_form.php:37
msgid "Help us by telling your friends, family and coworkers about %1"
msgstr "Окажите нам помощь, расскажите своим друзьям, семье и сотрудникам о %1"
-#: ../user/ffmail_form.php:40
+#: ../user/ffmail_form.php:39
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 "
@@ -3677,27 +3652,27 @@ msgstr ""
"вашему мнению, могут быть заинтересованы в %1. Мы отправим им письмо от "
"вашего имени, и если Вы пожелаете, Вы можете добавить своё сообщение."
-#: ../user/ffmail_form.php:43
+#: ../user/ffmail_form.php:42
msgid "Your name:"
msgstr "Ваше имя:"
-#: ../user/ffmail_form.php:43
+#: ../user/ffmail_form.php:42
msgid "Your email address:"
msgstr "Ваш адрес электронной почты:"
-#: ../user/ffmail_form.php:49
+#: ../user/ffmail_form.php:48
msgid "Friend's name:"
msgstr "Имя друга:"
-#: ../user/ffmail_form.php:49
+#: ../user/ffmail_form.php:48
msgid "Friend's email address:"
msgstr "Адрес электронной почты друга:"
-#: ../user/ffmail_form.php:57
+#: ../user/ffmail_form.php:56
msgid "Additional message (optional)"
msgstr "Дополнительное сообщение (необязательно)"
-#: ../user/ffmail_form.php:60
+#: ../user/ffmail_form.php:59
msgid "Send"
msgstr "Отправить"
@@ -4767,51 +4742,47 @@ msgstr ""
msgid "If you have not already done so, %1download BOINC client software%2."
msgstr "Если Вы этого ещё не сделали, %1загрузите клиентское ПО BOINC%2."
-#: ../user/host_app_versions.php:26
-msgid "nvidia GPU"
-msgstr "ГП NVIDIA"
-
-#: ../user/host_app_versions.php:36
+#: ../user/host_app_versions.php:37
msgid "Anonymous platform, missing app"
msgstr "анонимная платформа, приложение отсутствует"
-#: ../user/host_app_versions.php:39
+#: ../user/host_app_versions.php:40
msgid "anonymous platform"
msgstr "анонимная платформа"
-#: ../user/host_app_versions.php:42
+#: ../user/host_app_versions.php:43
msgid "Missing app version"
msgstr "Версия приложения отсутствует"
-#: ../user/host_app_versions.php:44
+#: ../user/host_app_versions.php:45
msgid "Missing app"
msgstr "Приложение отсутствует"
-#: ../user/host_app_versions.php:46
+#: ../user/host_app_versions.php:47
msgid "Missing platform"
msgstr "Платформа отсутствует"
-#: ../user/host_app_versions.php:55
+#: ../user/host_app_versions.php:56
msgid "Number of tasks completed"
msgstr "Число завершённых заданий"
-#: ../user/host_app_versions.php:56
+#: ../user/host_app_versions.php:57
msgid "Max tasks per day"
msgstr "Максимум заданий в день"
-#: ../user/host_app_versions.php:57
+#: ../user/host_app_versions.php:58
msgid "Number of tasks today"
msgstr "Число заданий сегодня"
-#: ../user/host_app_versions.php:58
+#: ../user/host_app_versions.php:59
msgid "Consecutive valid tasks"
msgstr "Правильные задания завершённые подряд"
-#: ../user/host_app_versions.php:62
+#: ../user/host_app_versions.php:63
msgid "Average processing rate"
msgstr "Средняя скорость обработки"
-#: ../user/host_app_versions.php:71
+#: ../user/host_app_versions.php:72
msgid "Application details for host %1"
msgstr "Подробная информация о приложениях для компьютера %1"
@@ -5229,35 +5200,35 @@ msgstr "Адрес email:"
msgid "forgot email address?"
msgstr "забыли адрес email?"
-#: ../user/login_form.php:47
+#: ../user/login_form.php:48
msgid "Password:"
msgstr "Пароль:"
-#: ../user/login_form.php:47
+#: ../user/login_form.php:48
msgid "forgot password?"
msgstr "забыли пароль?"
-#: ../user/login_form.php:50
+#: ../user/login_form.php:51
msgid "Stay logged in"
msgstr "Оставаться авторизованным"
-#: ../user/login_form.php:56
+#: ../user/login_form.php:62
msgid "or %1create an account%2."
msgstr "или %1создать учётную запись%2."
-#: ../user/merge_by_name.php:33
+#: ../user/merge_by_name.php:31
msgid "Processing %1"
msgstr "Обработка %1"
-#: ../user/merge_by_name.php:45
+#: ../user/merge_by_name.php:43
msgid "Merged %1 into %2"
msgstr "%1 объединён с %2"
-#: ../user/merge_by_name.php:74
+#: ../user/merge_by_name.php:72
msgid "Return to the list of your computers"
msgstr "Вернуться к списку ваших компьютеров"
-#: ../user/merge_by_name.php:78
+#: ../user/merge_by_name.php:76
msgid ""
"This operation merges computers based on their domain name.\n"
" <p>\n"
@@ -5273,11 +5244,11 @@ msgstr ""
"Несовместимые компьютеры не будут объединены.\n"
"<p>"
-#: ../user/merge_by_name.php:84
+#: ../user/merge_by_name.php:82
msgid "Go ahead and do this"
msgstr "Вперёд, сделать это"
-#: ../user/merge_by_name.php:85
+#: ../user/merge_by_name.php:83
msgid "Return to the list of computers"
msgstr "Вернуться к списку компьютеров"
@@ -5527,7 +5498,7 @@ msgstr "Чтобы разблокировать, посетите %1настро
msgid "Unknown action"
msgstr "Неизвестное действие"
-#: ../user/prefs.php:35
+#: ../user/prefs.php:32
msgid ""
"Your preferences have been updated, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5537,7 +5508,7 @@ msgstr ""
" будут задействованы, когда ваш компьютер свяжется с %1,\n"
" или Вы выполните команду %2Обновить%3 из Менеджера BOINC."
-#: ../user/prefs.php:44
+#: ../user/prefs.php:41
msgid ""
"Your preferences have been reset to the defaults, and\n"
" will take effect when your computer communicates with %1\n"
@@ -5555,25 +5526,25 @@ msgstr "%1 для конфигурации %2"
msgid "Back to preferences"
msgstr "Назад к настройкам"
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:45
msgid "Confirm delete preferences"
msgstr "Подтверждение удаления настроек"
-#: ../user/prefs_remove.php:51
+#: ../user/prefs_remove.php:48
msgid "Are you sure you want to delete your separate %1 preferences for %2?"
msgstr ""
"Вы уверены, что хотите удалить ваши отдельные настройки %1 для конфигурации "
"%2?"
-#: ../user/prefs_remove.php:55
+#: ../user/prefs_remove.php:52
msgid "Remove preferences"
msgstr "Удалить настройки"
-#: ../user/prefs_remove.php:57
+#: ../user/prefs_remove.php:54
msgid "Cancel"
msgstr "Отмена"
-#: ../user/profile_menu.php:38
+#: ../user/profile_menu.php:35
msgid ""
"%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
"community."
@@ -5581,7 +5552,7 @@ msgstr ""
"%1Профили%2 позволяют людям разделять биографические данные и личные мнения "
"с сообществом %3."
-#: ../user/profile_menu.php:39
+#: ../user/profile_menu.php:36
msgid ""
"Explore the diversity of your fellow volunteers, and contribute your own "
"views for others to enjoy."
@@ -5589,7 +5560,7 @@ msgstr ""
"Исследуйте разнообразие ваших единомышленников-добровольцев, и представьте "
"вашу собственную точку зрения другим."
-#: ../user/profile_menu.php:40
+#: ../user/profile_menu.php:37
msgid ""
"If you haven't already, you can %1create your own user profile%2 for others "
"to see!"
@@ -5597,23 +5568,23 @@ msgstr ""
"Если Вы этого еще не сделали, Вы можете %1создать свой собственный профиль "
"пользователя%2, чтобы другие смогли его увидеть!"
-#: ../user/profile_menu.php:45
+#: ../user/profile_menu.php:42
msgid "User of the Day"
msgstr "Пользователь Дня"
-#: ../user/profile_menu.php:58
+#: ../user/profile_menu.php:57
msgid "User Profile Explorer"
msgstr "Обозреватель профилей пользователей"
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:60
msgid "View the %1User Picture Gallery%2."
msgstr "Посмотреть %1Галерею картинок пользователей%2."
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:61
msgid "Browse profiles %1by country%2."
msgstr "Просмотреть профили %1по странам%2."
-#: ../user/profile_menu.php:63
+#: ../user/profile_menu.php:62
msgid ""
"Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
"without pictures%2."
@@ -5621,19 +5592,19 @@ msgstr ""
"Просмотреть профили %1в случайном порядке%2, %3в случайном порядке с "
"картинками%2, или %4в случайном порядке без картинок%2."
-#: ../user/profile_menu.php:67
+#: ../user/profile_menu.php:66
msgid "Alphabetical profile listings:"
msgstr "Алфавитные списки профилей:"
-#: ../user/profile_menu.php:73
+#: ../user/profile_menu.php:72
msgid "Search profile text"
msgstr "Поиск по тексту профиля"
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:98
msgid "No profiles"
msgstr "Нет профилей"
-#: ../user/profile_menu.php:100
+#: ../user/profile_menu.php:99
msgid "No profiles matched your query."
msgstr "Нет профилей, соответствующих Вашему запросу."
@@ -5717,135 +5688,135 @@ msgstr "Не работает"
msgid "Disabled"
msgstr "Отключен"
-#: ../user/server_status.php:246
+#: ../user/server_status.php:231
msgid "Project status"
msgstr "Статус проекта"
-#: ../user/server_status.php:248
+#: ../user/server_status.php:233
msgid "Server software version: %1"
msgstr "Версия серверного ПО: %1"
-#: ../user/server_status.php:256
+#: ../user/server_status.php:241
msgid "Program"
msgstr "Программа"
-#: ../user/server_status.php:256
+#: ../user/server_status.php:241
msgid "Host"
msgstr "Имя сервера"
-#: ../user/server_status.php:267
+#: ../user/server_status.php:252
msgid "data-driven web pages"
msgstr "Веб-страницы, управляемые данными"
-#: ../user/server_status.php:273
+#: ../user/server_status.php:258
msgid "upload/download server"
msgstr "Сервер загрузки/выгрузки"
-#: ../user/server_status.php:276
+#: ../user/server_status.php:261
msgid "scheduler"
msgstr "Планировщик"
-#: ../user/server_status.php:309
+#: ../user/server_status.php:294
msgid "Running:"
msgstr "Работает:"
-#: ../user/server_status.php:310
+#: ../user/server_status.php:295
msgid "Program is operating normally"
msgstr "Программа работает нормально"
-#: ../user/server_status.php:311
+#: ../user/server_status.php:296
msgid "Not Running:"
msgstr "Не работает:"
-#: ../user/server_status.php:312
+#: ../user/server_status.php:297
msgid "Program failed or the project is down"
msgstr "Программа завершилась с ошибкой или проект выключен"
-#: ../user/server_status.php:313
+#: ../user/server_status.php:298
msgid "Disabled:"
msgstr "Отключен:"
-#: ../user/server_status.php:314
+#: ../user/server_status.php:299
msgid "Program is disabled"
msgstr "Программа была остановлена"
-#: ../user/server_status.php:318
+#: ../user/server_status.php:303
msgid "Computing status"
msgstr "Статус вычислений"
-#: ../user/server_status.php:324
+#: ../user/server_status.php:309
msgid "The database server is not accessible"
msgstr "Сервер базы данных не доступен"
-#: ../user/server_status.php:341
+#: ../user/server_status.php:326
msgid "Tasks ready to send"
msgstr "Задания, готовые к отправке"
-#: ../user/server_status.php:346 ../user/workunit.php:55
+#: ../user/server_status.php:331 ../user/workunit.php:55
msgid "Tasks in progress"
msgstr "Задания обрабатываются"
-#: ../user/server_status.php:351
+#: ../user/server_status.php:336
msgid "Workunits waiting for validation"
msgstr "Задачи, ожидающие проверки"
-#: ../user/server_status.php:356
+#: ../user/server_status.php:341
msgid "Workunits waiting for assimilation"
msgstr "Задачи, ожидающие слияния"
-#: ../user/server_status.php:361
+#: ../user/server_status.php:346
msgid "Workunits waiting for file deletion"
msgstr "Задачи, ожидающие удаления"
-#: ../user/server_status.php:366
+#: ../user/server_status.php:351
msgid "Tasks waiting for file deletion"
msgstr "Задания, ожидающие удаления"
-#: ../user/server_status.php:383
+#: ../user/server_status.php:367
msgid "Transitioner backlog (hours)"
msgstr "Отставание в обработке (часы)"
-#: ../user/server_status.php:390
+#: ../user/server_status.php:374
msgid "Users"
msgstr "Участников"
-#: ../user/server_status.php:393 ../user/server_status.php:411
+#: ../user/server_status.php:377 ../user/server_status.php:395
msgid "with recent credit"
msgstr "с недавними очками"
-#: ../user/server_status.php:398 ../user/server_status.php:416
+#: ../user/server_status.php:382 ../user/server_status.php:400
msgid "with credit"
msgstr "с очками"
-#: ../user/server_status.php:403 ../user/server_status.php:421
+#: ../user/server_status.php:387 ../user/server_status.php:405
msgid "registered in past 24 hours"
msgstr "зарегистрировались за последние 24 ч."
-#: ../user/server_status.php:427
+#: ../user/server_status.php:411
msgid "current GigaFLOPs"
msgstr "текущая скорость (гигафлопс)"
-#: ../user/server_status.php:436
+#: ../user/server_status.php:420
msgid "Tasks by application"
msgstr "Распределение заданий по приложениям"
-#: ../user/server_status.php:439 ../user/workunit.php:40
+#: ../user/server_status.php:423 ../user/workunit.php:40
msgid "application"
msgstr "приложение"
-#: ../user/server_status.php:440
+#: ../user/server_status.php:424
msgid "unsent"
msgstr "неотправленных"
-#: ../user/server_status.php:441
+#: ../user/server_status.php:425
msgid "in progress"
msgstr "в обработке"
-#: ../user/server_status.php:442
+#: ../user/server_status.php:426
msgid "avg runtime of last 100 results in h (min-max)"
msgstr "среднее время обработки последних 100 результатов (в ч.) (мин.-макс.)"
-#: ../user/server_status.php:443
+#: ../user/server_status.php:427
msgid "users in last 24h"
msgstr "пользователей за последние 24ч."
@@ -6042,7 +6013,7 @@ msgid "Couldn't add admin"
msgstr "Невозможно добавить администратора"
#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:28
+#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
msgid "No such team"
msgstr "Нет такой команды"
@@ -6123,6 +6094,10 @@ 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 "Вы должны выбрать непустое название команды"
@@ -6435,7 +6410,7 @@ msgstr ""
"запросы не разрешены. Пожалуйста, попробуйте ещё раз позже."
#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:31
+#: ../user/team_join_form.php:29
msgid "The team %1 is not joinable."
msgstr "Команда %1 не допускает присоединений."
@@ -6460,25 +6435,25 @@ msgstr "Присоединение к команде %1."
msgid "You have joined %1."
msgstr "Вы присоединились к команде %1."
-#: ../user/team_join_form.php:34
+#: ../user/team_join_form.php:32
msgid "Join %1"
msgstr "Присоединение к команде %1."
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:33
msgid "Please note:"
msgstr "Пожалуйста, примите во внимание:"
-#: ../user/team_join_form.php:37
+#: ../user/team_join_form.php:35
msgid "Joining a team gives its founder access to your email address."
msgstr ""
"Присоединение к команде дает доступ её основателю к вашему адресу "
"электронной почты."
-#: ../user/team_join_form.php:38
+#: ../user/team_join_form.php:36
msgid "Joining a team does not affect your account's credit."
msgstr "Присоединение к команде не повлияет на очки вашей учётной записи."
-#: ../user/team_join_form.php:45
+#: ../user/team_join_form.php:43
msgid "Join team"
msgstr "Присоединиться к команде"
@@ -6626,19 +6601,19 @@ msgstr "Предел превышен: Можно показать только
msgid "Members of %1"
msgstr "Участники команды %1"
-#: ../user/team_quit_action.php:34
+#: ../user/team_quit_action.php:32
msgid "Unable to quit team"
msgstr "Невозможно выйти из команды"
-#: ../user/team_quit_action.php:35
+#: ../user/team_quit_action.php:33
msgid "Team doesn't exist, or you don't belong to it."
msgstr "Команда не существует, или Вы не принадлежите ей."
-#: ../user/team_quit_form.php:33
+#: ../user/team_quit_form.php:31
msgid "Quit %1"
msgstr "Выход из команды %1"
-#: ../user/team_quit_form.php:34
+#: ../user/team_quit_form.php:32
msgid ""
"<strong>Please note before quitting a team:</strong>\n"
" <ul>\n"
@@ -6655,7 +6630,7 @@ msgstr ""
" <li>Выход из команды никак не повлияет на вашу личную статистику.\n"
" </ul>"
-#: ../user/team_quit_form.php:42
+#: ../user/team_quit_form.php:40
msgid "Quit Team"
msgstr "Выйти из команды"
@@ -7079,6 +7054,37 @@ 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/locale/ru/BOINC-Setup.po b/locale/ru/BOINC-Setup.po
index 2baebba..7462405 100644
--- a/locale/ru/BOINC-Setup.po
+++ b/locale/ru/BOINC-Setup.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-15 22:27-0700\n"
+"POT-Creation-Date: 2014-01-26 00:00-0800\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"
@@ -22,24 +22,24 @@ msgstr ""
"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
"X-Poedit-KeywordsList: _\n"
-#: Installer.cpp:132
+#: Installer.cpp:124
#, c-format
-msgid "Sorry, this version of %s requires system 10.4 or higher."
-msgstr "Извините, данная версия %s требует систему 10.4 или выше."
+msgid "Sorry, this version of %s requires system 10.5 or higher."
+msgstr ""
-#: PostInstall.cpp:131 PostInstall.cpp:1211
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
msgid "Yes"
msgstr "Да"
-#: PostInstall.cpp:132 PostInstall.cpp:1212
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
msgid "No"
msgstr "Нет"
-#: PostInstall.cpp:134
+#: PostInstall.cpp:133
msgid "Should BOINC run even when no user is logged in?"
msgstr "Должен ли BOINC работать, даже если пользователь не вошёл в систему?"
-#: PostInstall.cpp:1491
+#: PostInstall.cpp:1416
#, c-format
msgid ""
"Users who are permitted to administer this computer will automatically be "
@@ -54,22 +54,22 @@ msgstr ""
"Хотите ли вы, чтобы простые пользователи без административных прав также "
"могли запускать и управлять %s на этом компьютере Mac?"
-#: PostInstall.cpp:1519
+#: PostInstall.cpp:1444
#, c-format
msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
msgstr ""
"Вы хотите установить %s как скринсейвер для всех пользователей %s на этом "
"Mac?"
-#: uninstall.cpp:80
+#: uninstall.cpp:82
msgid "OK"
msgstr "ОК"
-#: uninstall.cpp:130
+#: uninstall.cpp:136
msgid "Permission error after relaunch"
msgstr "Ошибка доступа после перезапуска"
-#: uninstall.cpp:135
+#: uninstall.cpp:141
msgid ""
"Removal may take several minutes.\n"
"Please be patient."
@@ -77,7 +77,7 @@ msgstr ""
"Удаление может занять несколько минут.\n"
"Пожалуйста, подождите."
-#: uninstall.cpp:150
+#: uninstall.cpp:156
#, c-format
msgid ""
"Are you sure you want to completely remove %s from your computer?\n"
@@ -88,21 +88,27 @@ msgstr ""
"\n"
"Будут удалены исполняемые файлы, но файлы данных %s останутся."
-#: uninstall.cpp:157
+#: uninstall.cpp:163
#, c-format
msgid "Canceled: %s has not been touched."
msgstr "Отменено: %s не был изменён."
-#: uninstall.cpp:168
+#: uninstall.cpp:174
#, c-format
msgid "An error occurred: error code %d"
msgstr "Произошла ошибка: код ошибки %d"
-#: uninstall.cpp:224
+#: uninstall.cpp:230
msgid "name of user"
msgstr "имя пользователя"
-#: uninstall.cpp:261
+#: uninstall.cpp:272
+msgid ""
+"Do you also want to remove VirtualBox from your computer?\n"
+"(VirtualBox was installed along with BOINC.)"
+msgstr ""
+
+#: uninstall.cpp:312
#, c-format
msgid ""
"Removal completed.\n"
@@ -121,7 +127,7 @@ msgstr ""
"для каждого пользователя, файл\n"
"\"%s\"."
-#: uninstall.cpp:796
+#: uninstall.cpp:840
#, c-format
msgid ""
"Enter your administrator password to completely remove %s from you "
@@ -131,14 +137,18 @@ msgstr ""
"Для полного удаления %s с вашего компьютера введите пароль администратора.\n"
"\n"
-#: uninstall.cpp:1555
+#: uninstall.cpp:1616
msgid "Cancel"
msgstr "Отмена"
-#: uninstall.cpp:1556
+#: uninstall.cpp:1617
msgid "Continue..."
msgstr "Продолжить..."
+#, c-format
+#~ msgid "Sorry, this version of %s requires system 10.4 or higher."
+#~ msgstr "Извините, данная версия %s требует систему 10.4 или выше."
+
#~ msgid ""
#~ "Removal completed.\n"
#~ "\n"
diff --git a/locale/ru/BOINC-Web.po b/locale/ru/BOINC-Web.po
index 0a75679..7bcb31b 100644
--- a/locale/ru/BOINC-Web.po
+++ b/locale/ru/BOINC-Web.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
-"POT-Creation-Date: 2013-11-12 00:00 PST\n"
+"POT-Creation-Date: 2014-02-01 00:00 PST\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"
@@ -100,8 +100,8 @@ msgid ""
"We recommend that you download BOINC from the Google Play Store or Amazon "
"Appstore, not from here."
msgstr ""
-"Мы рекомендуем Вам скачать BOINC из магазина Google Play или Amazon Appstore,"
-" а не отсюда."
+"Мы рекомендуем Вам скачать BOINC из магазина Google Play или Amazon "
+"Appstore, а не отсюда."
#: download.php:167
msgid "System requirements"
@@ -466,16 +466,16 @@ msgid "Cognitive science and artifical intelligence"
msgstr "Когнитивная наука и искусственный интеллект"
# 85%
-#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435
-#: projects.inc:442 projects.inc:489
+#: projects.inc:60 projects.inc:364 projects.inc:408 projects.inc:457
+#: projects.inc:464 projects.inc:511
msgid "Private"
msgstr "Частный"
-#: projects.inc:51
+#: projects.inc:61
msgid "Artificial intelligence"
msgstr "Искусственный интеллект"
-#: projects.inc:52
+#: projects.inc:62
msgid ""
"Parse and convert semantic nets for use in FreeHAL, an artificial "
"intelligence that uses semantic networks, stemmers, part of speech "
@@ -488,19 +488,19 @@ msgstr ""
"несущих основной смысловой нагрузки, для имитации поведения человека во "
"время разговоров."
-#: projects.inc:58
+#: projects.inc:69
msgid "Biology and Medicine"
msgstr "Биология и Медицина"
-#: projects.inc:71
+#: projects.inc:82
msgid "University College Dublin"
msgstr "Университетский Колледж Дублина"
-#: projects.inc:72
+#: projects.inc:83
msgid "Antimalarial drug discovery"
msgstr "Поиск лекарств против малярии"
-#: projects.inc:73
+#: projects.inc:84
msgid ""
"The parasite that causes malaria continues to evolve resistance to available "
"medication. We therefore urgently need to discover new drugs to replace "
@@ -514,15 +514,15 @@ msgstr ""
"НОВЫЕ белки в паразите. Проект FightMalaria at Home нацелен на открытие таких "
"новых мишеней."
-#: projects.inc:79
+#: projects.inc:90
msgid "University of Karlsruhe (Germany)"
msgstr "Университет Карлсруэ (Германия)"
-#: projects.inc:80
+#: projects.inc:91
msgid "Protein structure prediction"
msgstr "Предсказание структуры белков"
-#: projects.inc:81
+#: projects.inc:92
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 +536,15 @@ msgstr ""
"сбоями или объединением белков, и для разработки новых лекарств на основе "
"трёхмерной структуры биологически важных белков."
-#: projects.inc:87
+#: projects.inc:98
msgid "University of Delaware"
msgstr "Университет Делавера"
-#: projects.inc:88
+#: projects.inc:99
msgid "Study of protein - ligand interactions"
msgstr "Исследование белок - лиганд взаимодействия"
-#: projects.inc:89
+#: projects.inc:100
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 +556,15 @@ msgstr ""
"белок-лиганд на атомарном уровне и, в результате, будет искать идеи для "
"открытия новых лекарственных препаратов."
-#: projects.inc:103
+#: projects.inc:114
msgid "Barcelona Biomedical Research Park (PRBB)"
msgstr "Барселонский Биомедицинский Парк Исследований (PRBB)"
-#: projects.inc:104
+#: projects.inc:115
msgid "Molecular simulations of proteins"
msgstr "Молекулярное моделирование белков"
-#: projects.inc:105
+#: projects.inc:116
msgid ""
"GPUGrid.net opens novel computational scenarios by the first full-atom "
"molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. "
@@ -578,15 +578,15 @@ msgstr ""
"новых высот в вычислительной биологии для биомедицинских научных "
"исследований."
-#: projects.inc:111
+#: projects.inc:122
msgid "Technion, Israel"
msgstr "Технион, Израиль"
-#: projects.inc:112
+#: projects.inc:123
msgid "Genetic linkage analysis"
msgstr "Анализ генетических связей"
-#: projects.inc:113
+#: projects.inc:124
msgid ""
"Superlink at Technion helps geneticists all over the world find disease-"
"provoking genes causing some types of diabetes, hypertension (high blood "
@@ -596,16 +596,16 @@ msgstr ""
"болезнь гены, вызывающие некоторые типы диабета, гипертонии (высокое "
"кровяное давление), рака, шизофрении и многих других."
-#: projects.inc:127
+#: projects.inc:138
msgid ""
"University of Maryland Center for Bioinformatics and Computational Biology"
msgstr "Центр биоинформатики и вычислительной биологии университета Мэриленда"
-#: projects.inc:128
+#: projects.inc:139
msgid "Life science research"
msgstr "Исследования в науке о жизни"
-#: projects.inc:129
+#: projects.inc:140
msgid ""
"The Lattice Project supplies computing power to scientists at the University "
"of Maryland studying evolutionary relationships based on DNA sequence data; "
@@ -618,15 +618,15 @@ msgstr ""
"последовательности белков; а также биологическое разнообразие в "
"заповедниках."
-#: projects.inc:135
+#: projects.inc:146
msgid "The Swiss Tropical Institute"
msgstr "Швейцарский Тропический Институт"
-#: projects.inc:136
+#: projects.inc:147
msgid "Epidemiology"
msgstr "Эпидемиология"
-#: projects.inc:137
+#: projects.inc:148
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 +645,15 @@ msgstr ""
"разнообразным набором параметров, связанных с биологическими и социальными "
"факторами, которые влияют на распространение болезни."
-#: projects.inc:159
+#: projects.inc:170
msgid "University of Washington"
msgstr "Университет Вашингтона"
-#: projects.inc:160 projects.inc:168
+#: projects.inc:171 projects.inc:179
msgid "Biology"
msgstr "Биология"
-#: projects.inc:161
+#: projects.inc:172
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 +669,11 @@ msgstr ""
"помощи. Вы также поможете нам при проектировании новых белков для борьбы с "
"болезнями типа ВИЧ, малярии, рака и Альцгеймера."
-#: projects.inc:167
+#: projects.inc:178
msgid "University of Vienna"
msgstr "Университет Вены"
-#: projects.inc:169
+#: projects.inc:180
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 +683,19 @@ msgstr ""
"данных результатов, которые играют ключевую роль во многих биоинформационных "
"научно-исследовательских проектах."
-#: projects.inc:175
+#: projects.inc:186
msgid "Earth Sciences"
msgstr "Наука о Земле"
-#: projects.inc:187
+#: projects.inc:198
msgid "Oxford University"
msgstr "Оксфордский Университет"
-#: projects.inc:188
+#: projects.inc:199
msgid "Climate study"
msgstr "Изучение климата"
-#: projects.inc:189
+#: projects.inc:200
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 "
@@ -716,16 +716,25 @@ msgstr ""
"измениться климат в следующем столетии при широком диапазоне различных "
"сценариев."
-# 75%
-#: projects.inc:196
-msgid "Astronomy, Physics, and Chemistry"
-msgstr "Астрономия, Физика, и Химия"
+#: projects.inc:207
+msgid "Physical Science"
+msgstr ""
+
+#: projects.inc:213
+msgid "Mechanical engineering"
+msgstr ""
-#: projects.inc:202 projects.inc:241 projects.inc:249
+#: projects.inc:214
+msgid ""
+"Currently we are calculating the optimum design of a structure call the 52 "
+"bar truss"
+msgstr ""
+
+#: projects.inc:224 projects.inc:263 projects.inc:271
msgid "Astronomy"
msgstr "Астрономия"
-#: projects.inc:203
+#: projects.inc:225
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 "
@@ -743,15 +752,15 @@ msgstr ""
"распределения спектральной энергии (SED), применив для этого распределённые "
"вычисления."
-#: projects.inc:225
+#: projects.inc:247
msgid "University of Texas at Austin"
msgstr "Техасский Университет в Остине"
-#: projects.inc:226 projects.inc:257
+#: projects.inc:248 projects.inc:279
msgid "Chemistry"
msgstr "Химия"
-#: projects.inc:227
+#: projects.inc:249
msgid ""
"A common problem in theoretical chemistry, condensed matter physics and "
"materials science is the calculation of the time evolution of an atomic "
@@ -774,11 +783,11 @@ msgstr ""
"заинтересована в расчётах длительной динамики систем."
# 95%
-#: projects.inc:240
+#: projects.inc:262
msgid "University of Illinois at Urbana-Champaign"
msgstr "Университет штата Иллинойс в Urbana-Champаign"
-#: projects.inc:242
+#: projects.inc:264
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 "
@@ -788,11 +797,11 @@ msgstr ""
"описывает нашу Вселенную, и найти диапазон моделей, которые соглашаются с "
"доступными данными астрономической физики элементарных частиц."
-#: projects.inc:248
+#: projects.inc:270
msgid "Rensselaer Polytechnic Institute"
msgstr "Ренсселеровский политехнический институт"
-#: projects.inc:250
+#: projects.inc:272
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 "
@@ -802,11 +811,11 @@ msgstr ""
"модель галактики Млечный путь используя данные, собранные Слоановским "
"цифровым обзором неба."
-#: projects.inc:256
+#: projects.inc:278
msgid "Leiden University, The Netherlands"
msgstr "Лейденский Университет, Нидерланды"
-#: projects.inc:258
+#: projects.inc:280
msgid ""
"Surface science calculations using Classical Dynamics. Leiden Classical "
"allows volunteers, students and other scientist to submit their personal "
@@ -823,15 +832,15 @@ msgstr ""
"обоснованность закона идеального газа, фактически производя моделирование "
"посредством сети."
-#: projects.inc:272
+#: projects.inc:294
msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
msgstr "Университет Висконсина - Милуоки, Институт Макса Планка"
-#: projects.inc:273
+#: projects.inc:295
msgid "Astrophysics"
msgstr "Астрофизика"
-#: projects.inc:274
+#: projects.inc:296
msgid ""
"Search for spinning neutron stars (also called pulsars) using data from the "
"LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
@@ -845,15 +854,15 @@ msgstr ""
"поддержанный Американским Физическим Обществом (APS) и множеством "
"международных организаций."
-#: projects.inc:288 projects.inc:296
+#: projects.inc:310 projects.inc:318
msgid "CERN (European Organization for Nuclear Research)"
msgstr "CERN (Европейская Организация Ядерных Исследований)"
-#: projects.inc:289 projects.inc:297
+#: projects.inc:311 projects.inc:319
msgid "Physics"
msgstr "Физика"
-#: projects.inc:290
+#: projects.inc:312
msgid ""
"The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
"European Organization for Nuclear Research, the world's largest particle "
@@ -867,7 +876,7 @@ msgstr ""
"для исследования поведения элементарных частиц. LHC at home выполняет "
"моделирование для улучшения проекта LHC и его датчиков."
-#: projects.inc:298
+#: projects.inc:320
msgid ""
"This project uses CERN-developed virtual machine technology for full-fledged "
"LHC event physics simulation on volunteer computers. Requires that you "
@@ -877,15 +886,15 @@ msgstr ""
"для моделирования физики полноценных событий LHC на компьютерах "
"добровольцев. Требуется установка VirtualBox на вашем компьютере"
-#: projects.inc:304
+#: projects.inc:326
msgid "University of California, Berkeley"
msgstr "Университет Калифорнии, Беркли"
-#: projects.inc:305
+#: projects.inc:327
msgid "Astrophysics, astrobiology"
msgstr "Астрофизика, астробиология"
-#: projects.inc:306
+#: projects.inc:328
msgid ""
"SETI (Search for Extraterrestrial Intelligence) is a scientific area whose "
"goal is to detect intelligent life outside Earth. One approach, known as "
@@ -900,15 +909,15 @@ msgstr ""
"Естественные источники таких сигналов не известны, поэтому их обнаружение "
"может дать подтверждение о существовании внеземной технологии."
-#: projects.inc:320
+#: projects.inc:342
msgid "Bielefeld University of Applied Sciences"
msgstr "Университет Прикладных Наук Бельфелда"
-#: projects.inc:321
+#: projects.inc:343
msgid "Chemical engineering and nanotechnology"
msgstr "Химическая технология и нанотехнология"
-#: projects.inc:322
+#: projects.inc:344
msgid ""
"The study of molecular magnets and controlled nanoscale magnetism. These "
"magnetic molecules may be used to develop tiny magnetic switches, with "
@@ -920,19 +929,19 @@ msgstr ""
"крошечных магнитных выключателей, с применением в медицине (типа местной "
"химиотерапии опухолей) и в биотехнологии."
-#: projects.inc:329
+#: projects.inc:351
msgid "Multiple applications"
msgstr "Различные приложения"
-#: projects.inc:334
+#: projects.inc:356
msgid "Chinese Academy of Sciences"
msgstr "Китайская Академия Наук"
-#: projects.inc:335
+#: projects.inc:357
msgid "Physics, biochemistry, and others"
msgstr "Физика, биохимия, и другие"
-#: projects.inc:336
+#: projects.inc:358
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 "
@@ -942,11 +951,11 @@ msgstr ""
"принять технологии добровольных вычислений и добровольных размышлений в их "
"исследованиях."
-#: projects.inc:343
+#: projects.inc:365
msgid "Mathematics, physics, evolution"
msgstr "Математика, физика, эволюция"
-#: projects.inc:344
+#: projects.inc:366
msgid ""
"Yoyo at home is an adapter between BOINC and several existing volunteer "
"computing projects: ECM, Muon, Evolution at home, and distributed.net"
@@ -954,15 +963,15 @@ msgstr ""
"Yoyo at home - адаптер между BOINC и несколькими существующими добровольными "
"распределёнными проектами: ECM, Muon, Evolution at home, и distributed.net"
-#: projects.inc:349 projects.inc:505
+#: projects.inc:371 projects.inc:527
msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
msgstr "Лаборатория Параллельных и Распределенных Систем MTA-SZTAKI (Венгрия)"
-#: projects.inc:350
+#: projects.inc:372
msgid "European research projects"
msgstr "Европейские исследовательские проекты"
-#: projects.inc:351
+#: projects.inc:373
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 "
@@ -974,27 +983,27 @@ msgstr ""
"добровольцами этого проекта. Научные проекты, поддерживаемые данным "
"проектом, включают в себя математику, физику, биологию и т.д."
-#: projects.inc:357
+#: projects.inc:379
msgid "Spanish universities and research centers"
msgstr "Испанские университеты и исследовательские центры"
-#: projects.inc:358
+#: projects.inc:380
msgid "Various Spanish research projects"
msgstr "Различные испанские исследовательские проекты"
-#: projects.inc:359
+#: projects.inc:381
msgid "Research in physics, material science, and biomedicine"
msgstr "Исследования в физике, материаловедении, и биомедицине"
-#: projects.inc:365
+#: projects.inc:387
msgid "IBM Corporate Citizenship"
msgstr "Корпоративное Гражданство IBM"
-#: projects.inc:366
+#: projects.inc:388
msgid "Medical, environmental and other humanitarian research"
msgstr "Медицинские, экологические и другие гуманитарные исследования"
-#: projects.inc:367
+#: projects.inc:389
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 "
@@ -1007,27 +1016,27 @@ msgstr ""
"тропические и забытые болезни, солнечную энергию, чистую воду и многое "
"другое."
-#: projects.inc:373
+#: projects.inc:395
msgid "Mathematics, computing, and games"
msgstr "Математика, информатика, и игры"
-#: projects.inc:379
+#: projects.inc:401
msgid "Computer Science"
msgstr "Наука о компьютерах"
-#: projects.inc:387
+#: projects.inc:409
msgid "Mathematics, Physics, Artificial Intelligence"
msgstr "Математика, Физика, Искусственный Интеллект"
-#: projects.inc:388
+#: projects.inc:410
msgid "Simulation of quantum computing; Goldbach's conjecture."
msgstr "Моделирование квантовых компьютеров; предположение Гольдбаха."
-#: projects.inc:428 projects.inc:436
+#: projects.inc:450 projects.inc:458
msgid "Cryptography"
msgstr "Криптография"
-#: projects.inc:437
+#: projects.inc:459
msgid ""
"Attempt to decode 3 original Enigma messages. The signals were intercepted "
"in the North Atlantic in 1942 and are believed to be unbroken."
@@ -1036,24 +1045,24 @@ msgstr ""
"перехвачены в Североатлантическом океане в 1942 году и считалось, что их "
"невозможно взломать."
-#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498
-#: projects.inc:506 projects.inc:546
+#: projects.inc:465 projects.inc:504 projects.inc:512 projects.inc:520
+#: projects.inc:528 projects.inc:568
msgid "Mathematics"
msgstr "Математика"
-#: projects.inc:444
+#: projects.inc:466
msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
msgstr "Исследование Гипотезы Коллатца, неразрешенной гипотезы в математике"
-#: projects.inc:449
+#: projects.inc:471
msgid "California State University Fullerton"
msgstr "Калифорнийский государственный университет Фуллертон"
-#: projects.inc:450
+#: projects.inc:472
msgid "Factorization of large integers"
msgstr "Разложение на множители больших целых чисел"
-#: projects.inc:451
+#: projects.inc:473
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 "
@@ -1069,7 +1078,7 @@ msgstr ""
"3 * 5 или 35 = 5 * 7. NFS at Home является продолжением этого опыта, только с "
"целыми числами, состоящими из сотен цифр."
-#: projects.inc:457
+#: projects.inc:479
msgid ""
"Vilnius Gediminas Technical University and Kaunas University of Technology "
"(Lithuania)"
@@ -1077,11 +1086,11 @@ msgstr ""
"Вильнюсский Технический Университет и Каунасский Университет Технологий "
"(Литва)"
-#: projects.inc:458
+#: projects.inc:480
msgid "Software testing"
msgstr "Тестирование программного обеспечения"
-#: projects.inc:459
+#: projects.inc:481
msgid ""
"The aim of this project is to provide a powerful distributed computing "
"platform for scientists of Vilnius Gediminas Technical University (VGTU) as "
@@ -1094,11 +1103,11 @@ msgstr ""
"приложения включают изучение тестирования программного обеспечения, "
"основанного на методе Монте-Карло."
-#: projects.inc:481
+#: projects.inc:503
msgid "Mathematical Institute of Leiden University / Kennislink"
msgstr "Математический Институт Лейденского Университета / Кеннислинк"
-#: projects.inc:483
+#: projects.inc:505
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 "
@@ -1116,7 +1125,7 @@ msgstr ""
"математике в настоящее время. Если она будет доказана, многие другие "
"открытые проблемы могут быть решены непосредственно через неё."
-#: projects.inc:491
+#: projects.inc:513
msgid ""
"Primegrid has multiple projects searching for different forms of very large "
"prime numbers, including searching for the largest known prime number."
@@ -1124,11 +1133,11 @@ msgstr ""
"Primegrid поддерживает множество проектов, ищущих различные формы очень "
"больших простых чисел, включая поиск крупнейшего известного простого числа."
-#: projects.inc:497
+#: projects.inc:519
msgid "Hochschule RheinMain University of Applied Sciences"
msgstr "Университет Прикладных Наук РейнМэйн"
-#: projects.inc:499
+#: projects.inc:521
msgid ""
"Search for counterexamples to two conjectures related to the identification "
"of prime numbers"
@@ -1136,7 +1145,7 @@ msgstr ""
"Поиск контрпримеров к двум теоремам, связанным с идентификацией главных "
"чисел"
-#: projects.inc:507
+#: projects.inc:529
msgid ""
"Find all the generalized binary number systems (in which bases are matrices "
"and digits are vectors) up to dimension 11."
@@ -1153,6 +1162,10 @@ msgstr "Комментарий"
msgid "News is available as an %sRSS feed%s"
msgstr "Новости доступны в формате %sленты RSS%s"
+# 75%
+#~ msgid "Astronomy, Physics, and Chemistry"
+#~ msgstr "Астрономия, Физика, и Химия"
+
#~ msgid "Browser default"
#~ msgstr "как в браузере"
diff --git a/locale/sk/BOINC-Web.po b/locale/sk/BOINC-Web.po
index 61980f1..6569f95 100644
--- a/locale/sk/BOINC-Web.po
+++ b/locale/sk/BOINC-Web.po
@@ -1032,7 +1032,7 @@ msgstr ""
#~ msgid "University of Muenster (Germany)"
#~ msgstr "Univerzita v Karlsruhe (Nemecko)"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
# The charset used for the text in this file (please try to use UTF-8 if possible)
# ########################################
# Jazyk: Slovak (Medzinárodne)
@@ -1073,9 +1073,9 @@ msgstr ""
#~ msgstr ""
#~ "Open-source software for %svolunteer computing%s and %sgrid computing%s"
-# ######################################
-# download.php 2006/08/03 by je2bwm
-# ######################################
+# ######################################
+# download.php 2006/08/03 by je2bwm
+# ######################################
#~ msgid "DL_DOWNLOAD"
#~ msgstr "Stiahnuť BOINC"
@@ -1116,9 +1116,9 @@ msgstr ""
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC: výpočty pre vedu"
-# ############################################
-# system_requirements.php by je2bwm 2006/08/07
-# ############################################
+# ############################################
+# system_requirements.php by je2bwm 2006/08/07
+# ############################################
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "Systemové požiadavky"
@@ -1188,9 +1188,9 @@ msgstr ""
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 MB voľného miesta na disku"
-# ############################################
-# release notes by je2bwm 2006/08/09
-# ############################################
+# ############################################
+# release notes by je2bwm 2006/08/09
+# ############################################
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "Poznámky k vydaniu"
diff --git a/locale/sv_SE/BOINC-Web.po b/locale/sv_SE/BOINC-Web.po
index 0718ecb..1d233a7 100644
--- a/locale/sv_SE/BOINC-Web.po
+++ b/locale/sv_SE/BOINC-Web.po
@@ -921,21 +921,21 @@ msgstr ""
#~ msgid "The Lattice Project"
#~ msgstr "BOINC-projektet"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# The name of this language in this language
+# The name of this language in this language
#~ msgid "LANG_NAME_NATIVE"
#~ msgstr "English"
-# The name of this language in an international language (English)
+# The name of this language in an international language (English)
#~ msgid "LANG_NAME_INTERNATIONAL"
#~ msgstr "English"
-# #######################################
-# poll-related stuff
-# #######################################
+# #######################################
+# poll-related stuff
+# #######################################
# poll-related stuff
# #######################################
#~ msgid "POLL_TITLE"
@@ -1232,9 +1232,9 @@ msgstr ""
#~ "institutions). The server is chosen randomly - if a download fails, "
#~ "reload this page and try again. "
-# #############################################
-# help.php
-# #############################################
+# #############################################
+# help.php
+# #############################################
#~ msgid "HELP_TITLE"
#~ msgstr "Getting help with BOINC"
@@ -1299,9 +1299,9 @@ msgstr ""
#~ "If you're already a Help Volunteer: to edit your settings, %sclick here"
#~ "%s. "
-# #############################################
-# index.php
-# #############################################
+# #############################################
+# index.php
+# #############################################
#~ msgid "HOME_HEADING1"
#~ msgstr "Volunteer"
diff --git a/locale/uk/BOINC-Web.mo b/locale/uk/BOINC-Web.mo
index cd9b75e..fb96973 100644
Binary files a/locale/uk/BOINC-Web.mo and b/locale/uk/BOINC-Web.mo differ
diff --git a/locale/uk/BOINC-Web.po b/locale/uk/BOINC-Web.po
index 6fd9adb..a898b86 100644
--- a/locale/uk/BOINC-Web.po
+++ b/locale/uk/BOINC-Web.po
@@ -7,8 +7,8 @@ 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-02-26 13:36+0000\n"
-"Last-Translator: point <Kobzar at icn.od.ua>\n"
+"PO-Revision-Date: 2014-04-30 20:06+0000\n"
+"Last-Translator: Олег <pukish_oleg at ukr.net>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"Language: uk\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: 1393421799.0\n"
+"X-POOTLE-MTIME: 1398888418.0\n"
#: docutil.php:21
msgid "Search"
@@ -722,6 +722,7 @@ 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/zh_CN/BOINC-Android.po b/locale/zh_CN/BOINC-Android.po
index 138ca9d..a63ebcd 100644
--- a/locale/zh_CN/BOINC-Android.po
+++ b/locale/zh_CN/BOINC-Android.po
@@ -18,8 +18,6 @@ msgstr ""
"X-Generator: Pootle 2.5.0\n"
"Generated-By: Babel 1.0dev\n"
"X-POOTLE-MTIME: 1391481846.0\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: CHINA\n"
#. app global
msgctxt "app_name"
@@ -107,7 +105,9 @@ msgid "Terms of use for"
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."
+msgid ""
+"By creating an account with this project, you accept the terms of use as "
+"shown above."
msgstr "通过创建该项目的账户，即表示你接受了上述使用条款。"
msgctxt "attachproject_login_category_login"
@@ -503,7 +503,9 @@ msgid "Max. battery temperature"
msgstr "最高电池温度"
msgctxt "battery_temperature_max_description"
-msgid "BOINC suspends computation above defined battery temperature. It is not recommended to change this value."
+msgid ""
+"BOINC suspends computation above defined battery temperature. It is not "
+"recommended to change this value."
msgstr "BOINC 会在电池温度高于设定值时暂停计算，不建议修改。"
msgctxt "prefs_disk_max_pct_header"
@@ -1115,4 +1117,3 @@ msgid ""
msgstr ""
"© 2003–2013 加州大学，伯克利分校。\n"
"保留所有权利。"
-
diff --git a/locale/zh_CN/BOINC-Manager.po b/locale/zh_CN/BOINC-Manager.po
index 85c6afa..b07fc78 100644
--- a/locale/zh_CN/BOINC-Manager.po
+++ b/locale/zh_CN/BOINC-Manager.po
@@ -488,6 +488,7 @@ msgid "Show information about the %s"
msgstr "查看 %s 的信息"
#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
+#, c-format
#, c-format, c-format
msgid "%s &web site"
msgstr "%s 网站(&W)"
@@ -3680,6 +3681,7 @@ msgid "Project Commands"
msgstr "项目命令"
#: sg_ProjectPanel.cpp:267
+#, c-format
#, c-format, c-format
msgid "Pop up a menu of web sites for project %s"
msgstr "弹出一个 %s 项目的网站菜单"
diff --git a/locale/zh_CN/BOINC-Setup.po b/locale/zh_CN/BOINC-Setup.po
index ea4698e..3987f9b 100644
--- a/locale/zh_CN/BOINC-Setup.po
+++ b/locale/zh_CN/BOINC-Setup.po
@@ -23,6 +23,7 @@ msgstr ""
"X-Poedit-KeywordsList: _\n"
#: Installer.cpp:124
+#, c-format
#, c-format, c-format
msgid "Sorry, this version of %s requires system 10.5 or higher."
msgstr "对不起，%s 要求 10.5 或更高的操作系统版本。"
diff --git a/locale/zh_TW/BOINC-Web.po b/locale/zh_TW/BOINC-Web.po
index 6d472cd..c9e6dab 100644
--- a/locale/zh_TW/BOINC-Web.po
+++ b/locale/zh_TW/BOINC-Web.po
@@ -1275,7 +1275,7 @@ msgstr "可以透過 %sRSS feed%s 來查看新聞"
#~ msgid "TeraFLOPS."
#~ msgstr "TFLOPS。"
-# The charset used for the text in this file (please try to use UTF-8 if possible)
+# The charset used for the text in this file (please try to use UTF-8 if possible)
# #########################################
# Language: English (International)
# FileID : $Id$
@@ -1285,9 +1285,9 @@ msgstr "可以透過 %sRSS feed%s 來查看新聞"
#~ msgid "CHARSET"
#~ msgstr "UTF-8"
-# #######################################
-# download.php 2006/08/03 by je2bwm
-# #######################################
+# #######################################
+# download.php 2006/08/03 by je2bwm
+# #######################################
#~ msgid "DL_DOWNLOAD"
#~ msgstr "下載 BOINC"
@@ -1330,9 +1330,9 @@ msgstr "可以透過 %sRSS feed%s 來查看新聞"
#~ msgid "DL_DOWNLOAD_TITLE"
#~ msgstr "BOINC: 為科學運算"
-# #############################################
-# system_requirements.php by je2bwm 2006/08/07
-# #############################################
+# #############################################
+# system_requirements.php by je2bwm 2006/08/07
+# #############################################
#~ msgid "SRQ_PAGE_TITLE"
#~ msgstr "系統需求"
@@ -1401,9 +1401,9 @@ msgstr "可以透過 %sRSS feed%s 來查看新聞"
#~ msgid "SRQ_LINUX_REQ_DISK"
#~ msgstr "50 MB 磁碟空間"
-# #############################################
-# release_notes.php
-# #############################################
+# #############################################
+# release_notes.php
+# #############################################
#~ msgid "RLN_PAGE_TITLE"
#~ msgstr "發行資訊"
diff --git a/samples/nvcuda/Makefile b/samples/nvcuda/Makefile
index aadf9db..c133a72 100644
--- a/samples/nvcuda/Makefile
+++ b/samples/nvcuda/Makefile
@@ -1,13 +1,13 @@
-# makefile for cuda BOINC example application on Linux.
-
-# Add source files here
-EXECUTABLE := example_app_nvcuda
-# Cuda source files (compiled with cudacc)
-CUFILES := cuda_kernel.cu
-# C/C++ source files (compiled with gcc / c++)
-CCFILES := cuda.cpp\
-
-################################################################################
-# Rules and targets
-
-include common.mk
+# makefile for cuda BOINC example application on Linux.
+
+# Add source files here
+EXECUTABLE := example_app_nvcuda
+# Cuda source files (compiled with cudacc)
+CUFILES := cuda_kernel.cu
+# C/C++ source files (compiled with gcc / c++)
+CCFILES := cuda.cpp\
+
+################################################################################
+# Rules and targets
+
+include common.mk
diff --git a/samples/nvcuda/Makefile_mac b/samples/nvcuda/Makefile_mac
index f02eb7e..76f66e1 100644
--- a/samples/nvcuda/Makefile_mac
+++ b/samples/nvcuda/Makefile_mac
@@ -1,13 +1,13 @@
-# makefile for cuda BOINC example application on Macintosh.
-
-# Add source files here
-EXECUTABLE := example_app_nvcuda_mac
-# Cuda source files (compiled with cudacc)
-CUFILES := cuda_kernel.cu
-# C/C++ source files (compiled with gcc / c++)
-CCFILES := cuda.cpp \
-
-################################################################################
-# Rules and targets
-
+# makefile for cuda BOINC example application on Macintosh.
+
+# Add source files here
+EXECUTABLE := example_app_nvcuda_mac
+# Cuda source files (compiled with cudacc)
+CUFILES := cuda_kernel.cu
+# C/C++ source files (compiled with gcc / c++)
+CCFILES := cuda.cpp \
+
+################################################################################
+# Rules and targets
+
include common_mac.mk
\ No newline at end of file
diff --git a/samples/nvcuda/common_mac.mk b/samples/nvcuda/common_mac.mk
index cbc28e8..d0901c2 100644
--- a/samples/nvcuda/common_mac.mk
+++ b/samples/nvcuda/common_mac.mk
@@ -1,472 +1,472 @@
-.SUFFIXES : .cu .cu_dbg.o .c_dbg.o .cpp_dbg.o .cu_rel.o .c_rel.o .cpp_rel.o .cubin .ptx
-
-# Add new SM Versions here as devices with new Compute Capability are released
-SM_VERSIONS := 10 11 12 13 20
-
-CUDA_INSTALL_PATH ?= /usr/local/cuda
-
-ifdef cuda-install
- CUDA_INSTALL_PATH := $(cuda-install)
-endif
-
-# detect OS
-OSUPPER = $(shell uname -s 2>/dev/null | tr [:lower:] [:upper:])
-OSLOWER = $(shell uname -s 2>/dev/null | tr [:upper:] [:lower:])
-
-# 'linux' is output for Linux system, 'darwin' for OS X
-DARWIN = $(strip $(findstring DARWIN, $(OSUPPER)))
-ifneq ($(DARWIN),)
- SNOWLEOPARD = $(strip $(findstring 10.6, $(shell egrep "<string>10\.6" /System/Library/CoreServices/SystemVersion.plist)))
-endif
-
-# detect 32-bit or 64-bit platform
-HP_64 = $(shell uname -m | grep 64)
-OSARCH= $(shell uname -m)
-
-# Basic directory setup for SDK
-# (override directories only if they are not already defined)
-SRCDIR ?=
-ROOTDIR ?= /Developer/GPU\ Computing
-ROOTBINDIR ?= ../../samples/nvcuda
-BINDIR ?= $(ROOTBINDIR)/$(OSLOWER)
-ROOTOBJDIR ?= obj
-
-# BOINC directory
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment
-BOINC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac
-FRAMEWORKS_DIR = /System/Library/Frameworks
-
-LIBDIR := $(ROOTDIR)/C/lib
-COMMONDIR := $(ROOTDIR)/C/common
-SHAREDDIR := $(ROOTDIR)/shared/
-
-# Includes
-INCLUDES += -I. -I$(CUDA_INSTALL_PATH)/include -I$(COMMONDIR)/inc -I$(SHAREDDIR)/inc -I$(BOINC_CONFIG_DIR) -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR)
-
-# Compilers
-NVCC := $(CUDA_INSTALL_PATH)/bin/nvcc
-CXX := g++
-CC := gcc
-# MODIFIED - edits LINK to have #(INCLUDES)
-LINK := g++ -fPIC $(INCLUDES)
-
-# Warning flags
-CXXWARN_FLAGS := \
- -W -Wall \
- -Wimplicit \
- -Wswitch \
- -Wformat \
- -Wchar-subscripts \
- -Wparentheses \
- -Wmultichar \
- -Wtrigraphs \
- -Wpointer-arith \
- -Wcast-align \
- -Wreturn-type \
- -Wno-unused-function \
- $(SPACE)
-
-CWARN_FLAGS := $(CXXWARN_FLAGS) \
- -Wstrict-prototypes \
- -Wmissing-prototypes \
- -Wmissing-declarations \
- -Wnested-externs \
- -Wmain \
-
-# architecture flag for nvcc and gcc compilers build
-CUBIN_ARCH_FLAG :=
-CXX_ARCH_FLAGS :=
-NVCCFLAGS :=
-LIB_ARCH := $(OSARCH)
-
-# Determining the necessary Cross-Compilation Flags
-# 32-bit OS, but we target 64-bit cross compilation
-ifeq ($(x86_64),1)
- NVCCFLAGS += -m64
- LIB_ARCH = x86_64
- CUDPPLIB_SUFFIX = x86_64
- ifneq ($(DARWIN),)
- CXX_ARCH_FLAGS += -arch x86_64
- else
- CXX_ARCH_FLAGS += -m64
- endif
-else
-# 64-bit OS, and we target 32-bit cross compilation
- ifeq ($(i386),1)
- NVCCFLAGS += -m32
- LIB_ARCH = i386
- CUDPPLIB_SUFFIX = i386
- ifneq ($(DARWIN),)
- CXX_ARCH_FLAGS += -arch i386
- else
- CXX_ARCH_FLAGS += -m32
- endif
- else
- ifeq "$(strip $(HP_64))" ""
- LIB_ARCH = i386
- CUDPPLIB_SUFFIX = i386
- NVCCFLAGS += -m32
- ifneq ($(DARWIN),)
- CXX_ARCH_FLAGS += -arch i386
- else
- CXX_ARCH_FLAGS += -m32
- endif
- else
- LIB_ARCH = x86_64
- CUDPPLIB_SUFFIX = x86_64
- NVCCFLAGS += -m64
- ifneq ($(DARWIN),)
- CXX_ARCH_FLAGS += -arch x86_64
- else
- CXX_ARCH_FLAGS += -m64
- endif
- endif
- endif
-endif
-
-
-ifeq ($(noinline),1)
- NVCCFLAGS += -Xopencc -noinline
- # Compiler-specific flags, when using noinline, we don't build for SM1x
- GENCODE_SM10 :=
- GENCODE_SM20 := -gencode=arch=compute_20,code=\"sm_20,compute_20\"
-else
- # Compiler-specific flags (by default, we always use sm_10 and sm_20), unless we use the SMVERSION template
- GENCODE_SM10 := -gencode=arch=compute_10,code=\"sm_10,compute_10\"
- GENCODE_SM20 := -gencode=arch=compute_20,code=\"sm_20,compute_20\"
-endif
-
-CXXFLAGS += $(CXXWARN_FLAGS) $(CXX_ARCH_FLAGS)
-CFLAGS += $(CWARN_FLAGS) $(CXX_ARCH_FLAGS)
-LINKFLAGS +=
-LINK += $(LINKFLAGS) $(CXX_ARCH_FLAGS)
-
-# This option for Mac allows CUDA applications to work without requiring to set DYLD_LIBRARY_PATH
-ifneq ($(DARWIN),)
- LINK += -Xlinker -rpath $(CUDA_INSTALL_PATH)/lib
-endif
-
-# Common flags
-COMMONFLAGS += $(INCLUDES) -DUNIX
-
-# Debug/release configuration
-ifeq ($(dbg),1)
- COMMONFLAGS += -g
- NVCCFLAGS += -D_DEBUG
- CXXFLAGS += -D_DEBUG
- CFLAGS += -D_DEBUG
- BINSUBDIR := debug
- LIBSUFFIX := D
-else
- COMMONFLAGS += -O2
- BINSUBDIR := release
- LIBSUFFIX :=
- NVCCFLAGS += --compiler-options -fno-strict-aliasing
- CXXFLAGS += -fno-strict-aliasing
- CFLAGS += -fno-strict-aliasing
-endif
-
-# architecture flag for cubin build
-CUBIN_ARCH_FLAG :=
-
-# OpenGL is used or not (if it is used, then it is necessary to include GLEW)
-ifeq ($(USEGLLIB),1)
- ifneq ($(DARWIN),)
- OPENGLLIB := -L/System/Library/Frameworks/OpenGL.framework/Libraries
- OPENGLLIB += -lGL -lGLU $(COMMONDIR)/lib/$(OSLOWER)/libGLEW.a
- else
-# this case for linux platforms
- OPENGLLIB := -lGL -lGLU -lX11 -lXi -lXmu
-# check if x86_64 flag has been set, otherwise, check HP_64 is i386/x86_64
- ifeq ($(x86_64),1)
- OPENGLLIB += -lGLEW_x86_64 -L/usr/X11R6/lib64
- else
- ifeq ($(i386),)
- ifeq "$(strip $(HP_64))" ""
- OPENGLLIB += -lGLEW -L/usr/X11R6/lib
- else
- OPENGLLIB += -lGLEW_x86_64 -L/usr/X11R6/lib64
- endif
- endif
- endif
-# check if i386 flag has been set, otehrwise check HP_64 is i386/x86_64
- ifeq ($(i386),1)
- OPENGLLIB += -lGLEW -L/usr/X11R6/lib
- else
- ifeq ($(x86_64),)
- ifeq "$(strip $(HP_64))" ""
- OPENGLLIB += -lGLEW -L/usr/X11R6/lib
- else
- OPENGLLIB += -lGLEW_x86_64 -L/usr/X11R6/lib64
- endif
- endif
- endif
- endif
-endif
-
-ifeq ($(USEGLUT),1)
- ifneq ($(DARWIN),)
- OPENGLLIB += -framework GLUT
- else
- ifeq ($(x86_64),1)
- OPENGLLIB += -lglut -L/usr/lib64
- endif
- ifeq ($(i386),1)
- OPENGLLIB += -lglut -L/usr/lib
- endif
-
- ifeq ($(x86_64),)
- ifeq ($(i386),)
- OPENGLLIB += -lglut
- endif
- endif
- endif
-endif
-
-ifeq ($(USEPARAMGL),1)
- PARAMGLLIB := -lparamgl_$(LIB_ARCH)$(LIBSUFFIX)
-endif
-
-ifeq ($(USERENDERCHECKGL),1)
- RENDERCHECKGLLIB := -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX)
-endif
-
-ifeq ($(USECUDPP), 1)
- CUDPPLIB := -lcudpp_$(CUDPPLIB_SUFFIX)$(LIBSUFFIX)
-
- ifeq ($(emu), 1)
- CUDPPLIB := $(CUDPPLIB)_emu
- endif
-endif
-
-ifeq ($(USENVCUVID), 1)
- ifneq ($(DARWIN),)
- NVCUVIDLIB := -L../../common/lib/darwin -lnvcuvid
- endif
-endif
-
-# Libs
-ifneq ($(DARWIN),)
- LIB := -L$(CUDA_INSTALL_PATH)/lib -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib $(NVCUVIDLIB)
-else
- ifeq "$(strip $(HP_64))" ""
- ifeq ($(x86_64),1)
- LIB := -L$(CUDA_INSTALL_PATH)/lib64 -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
- else
- LIB := -L$(CUDA_INSTALL_PATH)/lib -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
- endif
- else
- ifeq ($(i386),1)
- LIB := -L$(CUDA_INSTALL_PATH)/lib -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
- else
- LIB := -L$(CUDA_INSTALL_PATH)/lib64 -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
- endif
- endif
-endif
-
-# If dynamically linking to CUDA and CUDART, we exclude the libraries from the LIB
-ifeq ($(USECUDADYNLIB),1)
- LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) $(CUDPPLIB) ${LIB} -ldl -rdynamic
-else
-# static linking, we will statically link against CUDA and CUDART
- ifeq ($(USEDRVAPI),1)
- LIB += -lcuda ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) $(CUDPPLIB) ${LIB}
- else
- ifeq ($(emu),1)
- LIB += -lcudartemu
- else
- LIB += -lcudart
- endif
- LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) $(CUDPPLIB) ${LIB}
- endif
-endif
-
-ifeq ($(USECUFFT),1)
- ifeq ($(emu),1)
- LIB += -lcufftemu
- else
- LIB += -lcufft
- endif
-endif
-
-ifeq ($(USECUBLAS),1)
- ifeq ($(emu),1)
- LIB += -lcublasemu
- else
- LIB += -lcublas
- endif
-endif
-
-# Lib/exe configuration
-ifneq ($(STATIC_LIB),)
- TARGETDIR := $(LIBDIR)
- TARGET := $(subst .a,_$(LIB_ARCH)$(LIBSUFFIX).a,$(LIBDIR)/$(STATIC_LIB))
- LINKLINE = ar rucv $(TARGET) $(OBJS)
-else
- ifneq ($(OMIT_CUTIL_LIB),1)
-
-#MODIFIED - add - lboinc and -lboinc_api below
- LIB += -lcutil_$(LIB_ARCH)$(LIBSUFFIX) -lshrutil_$(LIB_ARCH)$(LIBSUFFIX) -lboinc_api -L$(BOINC_BUILD_DIR) -lboinc -L$(BOINC_BUILD_DIR)
- endif
- # Device emulation configuration
- ifeq ($(emu), 1)
- NVCCFLAGS += -deviceemu
- CUDACCFLAGS +=
- BINSUBDIR := emu$(BINSUBDIR)
- # consistency, makes developing easier
- CXXFLAGS += -D__DEVICE_EMULATION__
- CFLAGS += -D__DEVICE_EMULATION__
- endif
- TARGETDIR := $(BINDIR)/$(BINSUBDIR)
- TARGET := $(TARGETDIR)/$(EXECUTABLE)
- LINKLINE = $(LINK) -o $(TARGET) $(OBJS) $(LIB)
-endif
-
-# check if verbose
-ifeq ($(verbose), 1)
- VERBOSE :=
-else
- VERBOSE := @
-endif
-
-################################################################################
-# Check for input flags and set compiler flags appropriately
-################################################################################
-ifeq ($(fastmath), 1)
- NVCCFLAGS += -use_fast_math
-endif
-
-ifeq ($(nvccverbose), 1)
- NVCCFLAGS += -v
-endif
-
-ifeq ($(keep), 1)
- NVCCFLAGS += -keep
- NVCC_KEEP_CLEAN := *.i* *.cubin *.cu.c *.cudafe* *.fatbin.c *.ptx
-endif
-
-ifdef maxregisters
- NVCCFLAGS += -maxrregcount $(maxregisters)
-endif
-
-# Add cudacc flags
-NVCCFLAGS += $(CUDACCFLAGS)
-
-# Add common flags
-NVCCFLAGS += $(COMMONFLAGS)
-CXXFLAGS += $(COMMONFLAGS)
-CFLAGS += $(COMMONFLAGS)
-
-ifeq ($(nvcc_warn_verbose),1)
- NVCCFLAGS += $(addprefix --compiler-options ,$(CXXWARN_FLAGS))
- NVCCFLAGS += --compiler-options -fno-strict-aliasing
-endif
-
-################################################################################
-# Set up object files
-################################################################################
-OBJDIR := $(ROOTOBJDIR)/$(LIB_ARCH)/$(BINSUBDIR)
-OBJS += $(patsubst %.cpp,$(OBJDIR)/%.cpp.o,$(notdir $(CCFILES)))
-OBJS += $(patsubst %.c,$(OBJDIR)/%.c.o,$(notdir $(CFILES)))
-OBJS += $(patsubst %.cu,$(OBJDIR)/%.cu.o,$(notdir $(CUFILES)))
-
-################################################################################
-# Set up cubin output files
-################################################################################
-CUBINDIR := $(SRCDIR)data
-CUBINS += $(patsubst %.cu,$(CUBINDIR)/%.cubin,$(notdir $(CUBINFILES)))
-
-################################################################################
-# Set up PTX output files
-################################################################################
-PTXDIR := $(SRCDIR)data
-PTXBINS += $(patsubst %.cu,$(PTXDIR)/%.ptx,$(notdir $(PTXFILES)))
-
-################################################################################
-# Rules
-################################################################################
-$(OBJDIR)/%.c.o : $(SRCDIR)%.c $(C_DEPS)
- $(VERBOSE)$(CC) $(CFLAGS) -o $@ -c $<
-
-$(OBJDIR)/%.cpp.o : $(SRCDIR)%.cpp $(C_DEPS)
- $(VERBOSE)$(CXX) $(CXXFLAGS) -o $@ -c $<
-
-# Default arch includes gencode for sm_10, sm_20, and other archs from GENCODE_ARCH declared in the makefile
-$(OBJDIR)/%.cu.o : $(SRCDIR)%.cu $(CU_DEPS)
- $(VERBOSE)$(NVCC) $(GENCODE_SM10) $(GENCODE_ARCH) $(GENCODE_SM20) $(NVCCFLAGS) $(SMVERSIONFLAGS) -o $@ -c $<
-
-# Default arch includes gencode for sm_10, sm_20, and other archs from GENCODE_ARCH declared in the makefile
-$(CUBINDIR)/%.cubin : $(SRCDIR)%.cu cubindirectory
- $(VERBOSE)$(NVCC) $(GENCODE_SM10) $(GENCODE_ARCH) $(GENCODE_SM20) $(CUBIN_ARCH_FLAG) $(NVCCFLAGS) $(SMVERSIONFLAGS) -o $@ -cubin $<
-
-$(PTXDIR)/%.ptx : $(SRCDIR)%.cu ptxdirectory
- $(VERBOSE)$(NVCC) $(CUBIN_ARCH_FLAG) $(NVCCFLAGS) $(SMVERSIONFLAGS) -o $@ -ptx $<
-
-#
-# The following definition is a template that gets instantiated for each SM
-# version (sm_10, sm_13, etc.) stored in SMVERSIONS. It does 2 things:
-# 1. It adds to OBJS a .cu_sm_XX.o for each .cu file it finds in CUFILES_sm_XX.
-# 2. It generates a rule for building .cu_sm_XX.o files from the corresponding
-# .cu file.
-#
-# The intended use for this is to allow Makefiles that use common.mk to compile
-# files to different Compute Capability targets (aka SM arch version). To do
-# so, in the Makefile, list files for each SM arch separately, like so:
-# This will be used over the default rule abov
-#
-# CUFILES_sm_10 := mycudakernel_sm10.cu app.cu
-# CUFILES_sm_12 := anothercudakernel_sm12.cu
-#
-define SMVERSION_template
-#OBJS += $(patsubst %.cu,$(OBJDIR)/%.cu_$(1).o,$(notdir $(CUFILES_$(1))))
-OBJS += $(patsubst %.cu,$(OBJDIR)/%.cu_$(1).o,$(notdir $(CUFILES_sm_$(1))))
-$(OBJDIR)/%.cu_$(1).o : $(SRCDIR)%.cu $(CU_DEPS)
-# $(VERBOSE)$(NVCC) -o $$@ -c $$< $(NVCCFLAGS) $(1)
- # if we have noinline enabled, we only turn this enable this for SM 2.x architectures
- ifeq ($(noinline),1)
- $(VERBOSE)$(NVCC) $(GENCODE_SM20) -o $$@ -c $$< $(NVCCFLAGS)
- else
- $(VERBOSE)$(NVCC) -gencode=arch=compute_$(1),code=\"sm_$(1),compute_$(1)\" $(GENCODE_SM20) -o $$@ -c $$< $(NVCCFLAGS)
- endif
-endef
-
-# This line invokes the above template for each arch version stored in
-# SM_VERSIONS. The call funtion invokes the template, and the eval
-# function interprets it as make commands.
-$(foreach smver,$(SM_VERSIONS),$(eval $(call SMVERSION_template,$(smver))))
-
-$(TARGET): makedirectories $(OBJS) $(CUBINS) $(PTXBINS) Makefile_mac
- $(VERBOSE)$(LINKLINE)
-
-cubindirectory:
- $(VERBOSE)mkdir -p $(CUBINDIR)
-
-ptxdirectory:
- $(VERBOSE)mkdir -p $(PTXDIR)
-
-makedirectories:
- $(VERBOSE)mkdir -p $(LIBDIR)
- $(VERBOSE)mkdir -p $(OBJDIR)
- $(VERBOSE)mkdir -p $(TARGETDIR)
-
-
-tidy :
- $(VERBOSE)find . | egrep "#" | xargs rm -f
- $(VERBOSE)find . | egrep "\~" | xargs rm -f
-
-clean : tidy
-#MODIFIED $(VERBOSE)rm -f $(OBJS)
- $(VERBOSE)rm -f $(CUBINS)
- $(VERBOSE)rm -f $(PTXBINS)
- $(VERBOSE)rm -f $(TARGET)
- $(VERBOSE)rm -f $(NVCC_KEEP_CLEAN)
- $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.ppm
- $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.pgm
- $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.bin
- $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.bmp
-
-clobber : clean
+.SUFFIXES : .cu .cu_dbg.o .c_dbg.o .cpp_dbg.o .cu_rel.o .c_rel.o .cpp_rel.o .cubin .ptx
+
+# Add new SM Versions here as devices with new Compute Capability are released
+SM_VERSIONS := 10 11 12 13 20
+
+CUDA_INSTALL_PATH ?= /usr/local/cuda
+
+ifdef cuda-install
+ CUDA_INSTALL_PATH := $(cuda-install)
+endif
+
+# detect OS
+OSUPPER = $(shell uname -s 2>/dev/null | tr [:lower:] [:upper:])
+OSLOWER = $(shell uname -s 2>/dev/null | tr [:upper:] [:lower:])
+
+# 'linux' is output for Linux system, 'darwin' for OS X
+DARWIN = $(strip $(findstring DARWIN, $(OSUPPER)))
+ifneq ($(DARWIN),)
+ SNOWLEOPARD = $(strip $(findstring 10.6, $(shell egrep "<string>10\.6" /System/Library/CoreServices/SystemVersion.plist)))
+endif
+
+# detect 32-bit or 64-bit platform
+HP_64 = $(shell uname -m | grep 64)
+OSARCH= $(shell uname -m)
+
+# Basic directory setup for SDK
+# (override directories only if they are not already defined)
+SRCDIR ?=
+ROOTDIR ?= /Developer/GPU\ Computing
+ROOTBINDIR ?= ../../samples/nvcuda
+BINDIR ?= $(ROOTBINDIR)/$(OSLOWER)
+ROOTOBJDIR ?= obj
+
+# BOINC directory
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment
+BOINC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac
+FRAMEWORKS_DIR = /System/Library/Frameworks
+
+LIBDIR := $(ROOTDIR)/C/lib
+COMMONDIR := $(ROOTDIR)/C/common
+SHAREDDIR := $(ROOTDIR)/shared/
+
+# Includes
+INCLUDES += -I. -I$(CUDA_INSTALL_PATH)/include -I$(COMMONDIR)/inc -I$(SHAREDDIR)/inc -I$(BOINC_CONFIG_DIR) -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR)
+
+# Compilers
+NVCC := $(CUDA_INSTALL_PATH)/bin/nvcc
+CXX := g++
+CC := gcc
+# MODIFIED - edits LINK to have #(INCLUDES)
+LINK := g++ -fPIC $(INCLUDES)
+
+# Warning flags
+CXXWARN_FLAGS := \
+ -W -Wall \
+ -Wimplicit \
+ -Wswitch \
+ -Wformat \
+ -Wchar-subscripts \
+ -Wparentheses \
+ -Wmultichar \
+ -Wtrigraphs \
+ -Wpointer-arith \
+ -Wcast-align \
+ -Wreturn-type \
+ -Wno-unused-function \
+ $(SPACE)
+
+CWARN_FLAGS := $(CXXWARN_FLAGS) \
+ -Wstrict-prototypes \
+ -Wmissing-prototypes \
+ -Wmissing-declarations \
+ -Wnested-externs \
+ -Wmain \
+
+# architecture flag for nvcc and gcc compilers build
+CUBIN_ARCH_FLAG :=
+CXX_ARCH_FLAGS :=
+NVCCFLAGS :=
+LIB_ARCH := $(OSARCH)
+
+# Determining the necessary Cross-Compilation Flags
+# 32-bit OS, but we target 64-bit cross compilation
+ifeq ($(x86_64),1)
+ NVCCFLAGS += -m64
+ LIB_ARCH = x86_64
+ CUDPPLIB_SUFFIX = x86_64
+ ifneq ($(DARWIN),)
+ CXX_ARCH_FLAGS += -arch x86_64
+ else
+ CXX_ARCH_FLAGS += -m64
+ endif
+else
+# 64-bit OS, and we target 32-bit cross compilation
+ ifeq ($(i386),1)
+ NVCCFLAGS += -m32
+ LIB_ARCH = i386
+ CUDPPLIB_SUFFIX = i386
+ ifneq ($(DARWIN),)
+ CXX_ARCH_FLAGS += -arch i386
+ else
+ CXX_ARCH_FLAGS += -m32
+ endif
+ else
+ ifeq "$(strip $(HP_64))" ""
+ LIB_ARCH = i386
+ CUDPPLIB_SUFFIX = i386
+ NVCCFLAGS += -m32
+ ifneq ($(DARWIN),)
+ CXX_ARCH_FLAGS += -arch i386
+ else
+ CXX_ARCH_FLAGS += -m32
+ endif
+ else
+ LIB_ARCH = x86_64
+ CUDPPLIB_SUFFIX = x86_64
+ NVCCFLAGS += -m64
+ ifneq ($(DARWIN),)
+ CXX_ARCH_FLAGS += -arch x86_64
+ else
+ CXX_ARCH_FLAGS += -m64
+ endif
+ endif
+ endif
+endif
+
+
+ifeq ($(noinline),1)
+ NVCCFLAGS += -Xopencc -noinline
+ # Compiler-specific flags, when using noinline, we don't build for SM1x
+ GENCODE_SM10 :=
+ GENCODE_SM20 := -gencode=arch=compute_20,code=\"sm_20,compute_20\"
+else
+ # Compiler-specific flags (by default, we always use sm_10 and sm_20), unless we use the SMVERSION template
+ GENCODE_SM10 := -gencode=arch=compute_10,code=\"sm_10,compute_10\"
+ GENCODE_SM20 := -gencode=arch=compute_20,code=\"sm_20,compute_20\"
+endif
+
+CXXFLAGS += $(CXXWARN_FLAGS) $(CXX_ARCH_FLAGS)
+CFLAGS += $(CWARN_FLAGS) $(CXX_ARCH_FLAGS)
+LINKFLAGS +=
+LINK += $(LINKFLAGS) $(CXX_ARCH_FLAGS)
+
+# This option for Mac allows CUDA applications to work without requiring to set DYLD_LIBRARY_PATH
+ifneq ($(DARWIN),)
+ LINK += -Xlinker -rpath $(CUDA_INSTALL_PATH)/lib
+endif
+
+# Common flags
+COMMONFLAGS += $(INCLUDES) -DUNIX
+
+# Debug/release configuration
+ifeq ($(dbg),1)
+ COMMONFLAGS += -g
+ NVCCFLAGS += -D_DEBUG
+ CXXFLAGS += -D_DEBUG
+ CFLAGS += -D_DEBUG
+ BINSUBDIR := debug
+ LIBSUFFIX := D
+else
+ COMMONFLAGS += -O2
+ BINSUBDIR := release
+ LIBSUFFIX :=
+ NVCCFLAGS += --compiler-options -fno-strict-aliasing
+ CXXFLAGS += -fno-strict-aliasing
+ CFLAGS += -fno-strict-aliasing
+endif
+
+# architecture flag for cubin build
+CUBIN_ARCH_FLAG :=
+
+# OpenGL is used or not (if it is used, then it is necessary to include GLEW)
+ifeq ($(USEGLLIB),1)
+ ifneq ($(DARWIN),)
+ OPENGLLIB := -L/System/Library/Frameworks/OpenGL.framework/Libraries
+ OPENGLLIB += -lGL -lGLU $(COMMONDIR)/lib/$(OSLOWER)/libGLEW.a
+ else
+# this case for linux platforms
+ OPENGLLIB := -lGL -lGLU -lX11 -lXi -lXmu
+# check if x86_64 flag has been set, otherwise, check HP_64 is i386/x86_64
+ ifeq ($(x86_64),1)
+ OPENGLLIB += -lGLEW_x86_64 -L/usr/X11R6/lib64
+ else
+ ifeq ($(i386),)
+ ifeq "$(strip $(HP_64))" ""
+ OPENGLLIB += -lGLEW -L/usr/X11R6/lib
+ else
+ OPENGLLIB += -lGLEW_x86_64 -L/usr/X11R6/lib64
+ endif
+ endif
+ endif
+# check if i386 flag has been set, otehrwise check HP_64 is i386/x86_64
+ ifeq ($(i386),1)
+ OPENGLLIB += -lGLEW -L/usr/X11R6/lib
+ else
+ ifeq ($(x86_64),)
+ ifeq "$(strip $(HP_64))" ""
+ OPENGLLIB += -lGLEW -L/usr/X11R6/lib
+ else
+ OPENGLLIB += -lGLEW_x86_64 -L/usr/X11R6/lib64
+ endif
+ endif
+ endif
+ endif
+endif
+
+ifeq ($(USEGLUT),1)
+ ifneq ($(DARWIN),)
+ OPENGLLIB += -framework GLUT
+ else
+ ifeq ($(x86_64),1)
+ OPENGLLIB += -lglut -L/usr/lib64
+ endif
+ ifeq ($(i386),1)
+ OPENGLLIB += -lglut -L/usr/lib
+ endif
+
+ ifeq ($(x86_64),)
+ ifeq ($(i386),)
+ OPENGLLIB += -lglut
+ endif
+ endif
+ endif
+endif
+
+ifeq ($(USEPARAMGL),1)
+ PARAMGLLIB := -lparamgl_$(LIB_ARCH)$(LIBSUFFIX)
+endif
+
+ifeq ($(USERENDERCHECKGL),1)
+ RENDERCHECKGLLIB := -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX)
+endif
+
+ifeq ($(USECUDPP), 1)
+ CUDPPLIB := -lcudpp_$(CUDPPLIB_SUFFIX)$(LIBSUFFIX)
+
+ ifeq ($(emu), 1)
+ CUDPPLIB := $(CUDPPLIB)_emu
+ endif
+endif
+
+ifeq ($(USENVCUVID), 1)
+ ifneq ($(DARWIN),)
+ NVCUVIDLIB := -L../../common/lib/darwin -lnvcuvid
+ endif
+endif
+
+# Libs
+ifneq ($(DARWIN),)
+ LIB := -L$(CUDA_INSTALL_PATH)/lib -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib $(NVCUVIDLIB)
+else
+ ifeq "$(strip $(HP_64))" ""
+ ifeq ($(x86_64),1)
+ LIB := -L$(CUDA_INSTALL_PATH)/lib64 -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
+ else
+ LIB := -L$(CUDA_INSTALL_PATH)/lib -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
+ endif
+ else
+ ifeq ($(i386),1)
+ LIB := -L$(CUDA_INSTALL_PATH)/lib -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
+ else
+ LIB := -L$(CUDA_INSTALL_PATH)/lib64 -L$(LIBDIR) -L$(COMMONDIR)/lib/$(OSLOWER) -L$(SHAREDDIR)/lib
+ endif
+ endif
+endif
+
+# If dynamically linking to CUDA and CUDART, we exclude the libraries from the LIB
+ifeq ($(USECUDADYNLIB),1)
+ LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) $(CUDPPLIB) ${LIB} -ldl -rdynamic
+else
+# static linking, we will statically link against CUDA and CUDART
+ ifeq ($(USEDRVAPI),1)
+ LIB += -lcuda ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) $(CUDPPLIB) ${LIB}
+ else
+ ifeq ($(emu),1)
+ LIB += -lcudartemu
+ else
+ LIB += -lcudart
+ endif
+ LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) $(CUDPPLIB) ${LIB}
+ endif
+endif
+
+ifeq ($(USECUFFT),1)
+ ifeq ($(emu),1)
+ LIB += -lcufftemu
+ else
+ LIB += -lcufft
+ endif
+endif
+
+ifeq ($(USECUBLAS),1)
+ ifeq ($(emu),1)
+ LIB += -lcublasemu
+ else
+ LIB += -lcublas
+ endif
+endif
+
+# Lib/exe configuration
+ifneq ($(STATIC_LIB),)
+ TARGETDIR := $(LIBDIR)
+ TARGET := $(subst .a,_$(LIB_ARCH)$(LIBSUFFIX).a,$(LIBDIR)/$(STATIC_LIB))
+ LINKLINE = ar rucv $(TARGET) $(OBJS)
+else
+ ifneq ($(OMIT_CUTIL_LIB),1)
+
+#MODIFIED - add - lboinc and -lboinc_api below
+ LIB += -lcutil_$(LIB_ARCH)$(LIBSUFFIX) -lshrutil_$(LIB_ARCH)$(LIBSUFFIX) -lboinc_api -L$(BOINC_BUILD_DIR) -lboinc -L$(BOINC_BUILD_DIR)
+ endif
+ # Device emulation configuration
+ ifeq ($(emu), 1)
+ NVCCFLAGS += -deviceemu
+ CUDACCFLAGS +=
+ BINSUBDIR := emu$(BINSUBDIR)
+ # consistency, makes developing easier
+ CXXFLAGS += -D__DEVICE_EMULATION__
+ CFLAGS += -D__DEVICE_EMULATION__
+ endif
+ TARGETDIR := $(BINDIR)/$(BINSUBDIR)
+ TARGET := $(TARGETDIR)/$(EXECUTABLE)
+ LINKLINE = $(LINK) -o $(TARGET) $(OBJS) $(LIB)
+endif
+
+# check if verbose
+ifeq ($(verbose), 1)
+ VERBOSE :=
+else
+ VERBOSE := @
+endif
+
+################################################################################
+# Check for input flags and set compiler flags appropriately
+################################################################################
+ifeq ($(fastmath), 1)
+ NVCCFLAGS += -use_fast_math
+endif
+
+ifeq ($(nvccverbose), 1)
+ NVCCFLAGS += -v
+endif
+
+ifeq ($(keep), 1)
+ NVCCFLAGS += -keep
+ NVCC_KEEP_CLEAN := *.i* *.cubin *.cu.c *.cudafe* *.fatbin.c *.ptx
+endif
+
+ifdef maxregisters
+ NVCCFLAGS += -maxrregcount $(maxregisters)
+endif
+
+# Add cudacc flags
+NVCCFLAGS += $(CUDACCFLAGS)
+
+# Add common flags
+NVCCFLAGS += $(COMMONFLAGS)
+CXXFLAGS += $(COMMONFLAGS)
+CFLAGS += $(COMMONFLAGS)
+
+ifeq ($(nvcc_warn_verbose),1)
+ NVCCFLAGS += $(addprefix --compiler-options ,$(CXXWARN_FLAGS))
+ NVCCFLAGS += --compiler-options -fno-strict-aliasing
+endif
+
+################################################################################
+# Set up object files
+################################################################################
+OBJDIR := $(ROOTOBJDIR)/$(LIB_ARCH)/$(BINSUBDIR)
+OBJS += $(patsubst %.cpp,$(OBJDIR)/%.cpp.o,$(notdir $(CCFILES)))
+OBJS += $(patsubst %.c,$(OBJDIR)/%.c.o,$(notdir $(CFILES)))
+OBJS += $(patsubst %.cu,$(OBJDIR)/%.cu.o,$(notdir $(CUFILES)))
+
+################################################################################
+# Set up cubin output files
+################################################################################
+CUBINDIR := $(SRCDIR)data
+CUBINS += $(patsubst %.cu,$(CUBINDIR)/%.cubin,$(notdir $(CUBINFILES)))
+
+################################################################################
+# Set up PTX output files
+################################################################################
+PTXDIR := $(SRCDIR)data
+PTXBINS += $(patsubst %.cu,$(PTXDIR)/%.ptx,$(notdir $(PTXFILES)))
+
+################################################################################
+# Rules
+################################################################################
+$(OBJDIR)/%.c.o : $(SRCDIR)%.c $(C_DEPS)
+ $(VERBOSE)$(CC) $(CFLAGS) -o $@ -c $<
+
+$(OBJDIR)/%.cpp.o : $(SRCDIR)%.cpp $(C_DEPS)
+ $(VERBOSE)$(CXX) $(CXXFLAGS) -o $@ -c $<
+
+# Default arch includes gencode for sm_10, sm_20, and other archs from GENCODE_ARCH declared in the makefile
+$(OBJDIR)/%.cu.o : $(SRCDIR)%.cu $(CU_DEPS)
+ $(VERBOSE)$(NVCC) $(GENCODE_SM10) $(GENCODE_ARCH) $(GENCODE_SM20) $(NVCCFLAGS) $(SMVERSIONFLAGS) -o $@ -c $<
+
+# Default arch includes gencode for sm_10, sm_20, and other archs from GENCODE_ARCH declared in the makefile
+$(CUBINDIR)/%.cubin : $(SRCDIR)%.cu cubindirectory
+ $(VERBOSE)$(NVCC) $(GENCODE_SM10) $(GENCODE_ARCH) $(GENCODE_SM20) $(CUBIN_ARCH_FLAG) $(NVCCFLAGS) $(SMVERSIONFLAGS) -o $@ -cubin $<
+
+$(PTXDIR)/%.ptx : $(SRCDIR)%.cu ptxdirectory
+ $(VERBOSE)$(NVCC) $(CUBIN_ARCH_FLAG) $(NVCCFLAGS) $(SMVERSIONFLAGS) -o $@ -ptx $<
+
+#
+# The following definition is a template that gets instantiated for each SM
+# version (sm_10, sm_13, etc.) stored in SMVERSIONS. It does 2 things:
+# 1. It adds to OBJS a .cu_sm_XX.o for each .cu file it finds in CUFILES_sm_XX.
+# 2. It generates a rule for building .cu_sm_XX.o files from the corresponding
+# .cu file.
+#
+# The intended use for this is to allow Makefiles that use common.mk to compile
+# files to different Compute Capability targets (aka SM arch version). To do
+# so, in the Makefile, list files for each SM arch separately, like so:
+# This will be used over the default rule abov
+#
+# CUFILES_sm_10 := mycudakernel_sm10.cu app.cu
+# CUFILES_sm_12 := anothercudakernel_sm12.cu
+#
+define SMVERSION_template
+#OBJS += $(patsubst %.cu,$(OBJDIR)/%.cu_$(1).o,$(notdir $(CUFILES_$(1))))
+OBJS += $(patsubst %.cu,$(OBJDIR)/%.cu_$(1).o,$(notdir $(CUFILES_sm_$(1))))
+$(OBJDIR)/%.cu_$(1).o : $(SRCDIR)%.cu $(CU_DEPS)
+# $(VERBOSE)$(NVCC) -o $$@ -c $$< $(NVCCFLAGS) $(1)
+ # if we have noinline enabled, we only turn this enable this for SM 2.x architectures
+ ifeq ($(noinline),1)
+ $(VERBOSE)$(NVCC) $(GENCODE_SM20) -o $$@ -c $$< $(NVCCFLAGS)
+ else
+ $(VERBOSE)$(NVCC) -gencode=arch=compute_$(1),code=\"sm_$(1),compute_$(1)\" $(GENCODE_SM20) -o $$@ -c $$< $(NVCCFLAGS)
+ endif
+endef
+
+# This line invokes the above template for each arch version stored in
+# SM_VERSIONS. The call funtion invokes the template, and the eval
+# function interprets it as make commands.
+$(foreach smver,$(SM_VERSIONS),$(eval $(call SMVERSION_template,$(smver))))
+
+$(TARGET): makedirectories $(OBJS) $(CUBINS) $(PTXBINS) Makefile_mac
+ $(VERBOSE)$(LINKLINE)
+
+cubindirectory:
+ $(VERBOSE)mkdir -p $(CUBINDIR)
+
+ptxdirectory:
+ $(VERBOSE)mkdir -p $(PTXDIR)
+
+makedirectories:
+ $(VERBOSE)mkdir -p $(LIBDIR)
+ $(VERBOSE)mkdir -p $(OBJDIR)
+ $(VERBOSE)mkdir -p $(TARGETDIR)
+
+
+tidy :
+ $(VERBOSE)find . | egrep "#" | xargs rm -f
+ $(VERBOSE)find . | egrep "\~" | xargs rm -f
+
+clean : tidy
+#MODIFIED $(VERBOSE)rm -f $(OBJS)
+ $(VERBOSE)rm -f $(CUBINS)
+ $(VERBOSE)rm -f $(PTXBINS)
+ $(VERBOSE)rm -f $(TARGET)
+ $(VERBOSE)rm -f $(NVCC_KEEP_CLEAN)
+ $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.ppm
+ $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.pgm
+ $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.bin
+ $(VERBOSE)rm -f $(ROOTBINDIR)/$(OSLOWER)/$(BINSUBDIR)/*.bmp
+
+clobber : clean
$(VERBOSE)rm -rf $(ROOTOBJDIR)
\ No newline at end of file
diff --git a/samples/nvcuda/cuda_kernel.cu b/samples/nvcuda/cuda_kernel.cu
index e04ff8b..4693777 100644
--- a/samples/nvcuda/cuda_kernel.cu
+++ b/samples/nvcuda/cuda_kernel.cu
@@ -1,132 +1,132 @@
-// 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/>.
-//
-// This file contains kernel definition for matrix inversion. The external function
-// "invert" serves as an interface between cuda_kernel.cu and cuda.cpp
-//
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
-// Contributor: Tuan Le (tuanle86 at berkeley.edu)
-
-// When VERIFY is defined, the sum of squared errors is calculated between the
-// identity matrix and the product A * incerse(A). For debugging...
-//#define VERIFY 1
-#include <stdio.h>
-#include <cmath>
-#include <time.h>
-#include "cuda_config.h"
-
-__global__ void GEStep1A(REAL * AI, int i, int n2, int lda2) {
- int k = blockIdx.x * blockDim.x + threadIdx.x;
- if (k>i && k < n2 && AI[i*lda2+k]!=0) {
- REAL multiplyer = -AI[i*lda2+k]/AI[i*lda2+i];
- int n = n2 / 2;
- for (int j = i+1; j < n; j++) {
- AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
- }
- }
-}
-
-__global__ void GEStep2(REAL * AI,REAL diag,int i, int n2, int lda2) {
- int k = blockIdx.x * blockDim.x + threadIdx.x;
- if (k < n2) {
- AI[i*lda2+k] /= diag;
- }
-}
-
-__global__ void GEStep3(REAL * AI,int i, int n2, int lda2) {
- int k = blockIdx.x * blockDim.x + threadIdx.x;
- if (k > i && k < n2) {
- REAL multiplyer = -AI[i*lda2+k];
- for (int j = 0; j < i; j++) {
- AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
- }
- }
-}
-
-/* Helper function for invert. Kernel calls are made in this function */
-void invertge(REAL * AI_d, int lda, int n) {
- int lda2 = lda * 2;
- // perform elementary row operations till A in AI becomes identity matrix
- for (int i = 0; i < n; i++) {
- GEStep1A<<<(int)ceil((float)(1+(2*n-1)/32)),32>>>(AI_d,i,n*2, lda2);
- CUDACHECK;
- cudaThreadSynchronize();
- }
-
- for (int i = n-1; i >= 0; i--) {
- REAL diag = 1.0;
- SAFECALL(cudaMemcpy(&diag, &AI_d[i*lda2+i], sizeof(REAL), cudaMemcpyDeviceToHost));
- GEStep2<<<(int)ceil((float)(1+(n*2-1)/32)),32>>>(AI_d,diag,i,n*2, lda2);
- CUDACHECK;
-
- GEStep3<<<(int)ceil((float)(1+(n*2-1)/32)),32>>>(AI_d,i,n*2, lda2);
- CUDACHECK;
- cudaThreadSynchronize();
- CUDACHECK;
- }
-}
-
-/* inverts nxn matrix A and stores result back in A */
-extern void invert(REAL * A, int n) {
- fprintf(stderr,"starting inversion n = %d ", n);
- volatile clock_t gputime;
- gputime=clock();
-
- int lda = ((n+15)&~15|16);
- REAL * AI = (REAL *)malloc(sizeof(REAL)*(n*lda*2));
- memset(AI,0,sizeof(REAL)*n*lda*2);
- for (int i = 0; i < n; i++) {
- memcpy(&AI[lda*i*2], &A[n*i], sizeof(REAL)*n);
- AI[lda*i*2+n+i] = 1;
- }
-
- REAL * AI_d;
- SAFECALL(cudaMalloc((void **) &AI_d, sizeof(REAL)*n*lda*2));
- SAFECALL(cudaMemcpy(AI_d, AI, sizeof(REAL)*n*lda*2, cudaMemcpyHostToDevice));
-
- invertge(AI_d, lda, n);
- SAFECALL(cudaMemcpy(AI, AI_d, sizeof(REAL)*n*lda*2, cudaMemcpyDeviceToHost));
- cudaFree(AI_d);
- gputime=clock()-gputime;fprintf(stderr, " %7.1f ms ",gputime/1.e3f);
- fprintf(stderr, " %7.2f Gflops", 1e-3*(3.0)*n*n*n/3.0/gputime);
-
-#ifdef VERIFY
- // let's verify that
- REAL error=0.0;
- // multiply inverse*xcopy, should be Identity matrix
- for (int k = 0; k < n; k++) {
- for (int j = 0; j < n; j++) {
- REAL sum = 0;
- for (int i = 0; i < n; i++) {
- sum += AI[j*lda*2+n+i]*A[i*n+k];
- }
- if (j!=k) {
- error += sum * sum;
- } else {
- error += (1.0-sum) * (1.0-sum);
- }
- }
- }
- fprintf(stderr, " %6.2f SSE", error);
-#endif
-
- for (int i = 0; i < n; i++) {
- memcpy(&A[n*i], &AI[lda*i*2+n], sizeof(REAL)*n);
- }
- free(AI);
- fprintf(stderr," done!\n");
-}
+// 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/>.
+//
+// This file contains kernel definition for matrix inversion. The external function
+// "invert" serves as an interface between cuda_kernel.cu and cuda.cpp
+//
+// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
+// Contributor: Tuan Le (tuanle86 at berkeley.edu)
+
+// When VERIFY is defined, the sum of squared errors is calculated between the
+// identity matrix and the product A * incerse(A). For debugging...
+//#define VERIFY 1
+#include <stdio.h>
+#include <cmath>
+#include <time.h>
+#include "cuda_config.h"
+
+__global__ void GEStep1A(REAL * AI, int i, int n2, int lda2) {
+ int k = blockIdx.x * blockDim.x + threadIdx.x;
+ if (k>i && k < n2 && AI[i*lda2+k]!=0) {
+ REAL multiplyer = -AI[i*lda2+k]/AI[i*lda2+i];
+ int n = n2 / 2;
+ for (int j = i+1; j < n; j++) {
+ AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
+ }
+ }
+}
+
+__global__ void GEStep2(REAL * AI,REAL diag,int i, int n2, int lda2) {
+ int k = blockIdx.x * blockDim.x + threadIdx.x;
+ if (k < n2) {
+ AI[i*lda2+k] /= diag;
+ }
+}
+
+__global__ void GEStep3(REAL * AI,int i, int n2, int lda2) {
+ int k = blockIdx.x * blockDim.x + threadIdx.x;
+ if (k > i && k < n2) {
+ REAL multiplyer = -AI[i*lda2+k];
+ for (int j = 0; j < i; j++) {
+ AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
+ }
+ }
+}
+
+/* Helper function for invert. Kernel calls are made in this function */
+void invertge(REAL * AI_d, int lda, int n) {
+ int lda2 = lda * 2;
+ // perform elementary row operations till A in AI becomes identity matrix
+ for (int i = 0; i < n; i++) {
+ GEStep1A<<<(int)ceil((float)(1+(2*n-1)/32)),32>>>(AI_d,i,n*2, lda2);
+ CUDACHECK;
+ cudaThreadSynchronize();
+ }
+
+ for (int i = n-1; i >= 0; i--) {
+ REAL diag = 1.0;
+ SAFECALL(cudaMemcpy(&diag, &AI_d[i*lda2+i], sizeof(REAL), cudaMemcpyDeviceToHost));
+ GEStep2<<<(int)ceil((float)(1+(n*2-1)/32)),32>>>(AI_d,diag,i,n*2, lda2);
+ CUDACHECK;
+
+ GEStep3<<<(int)ceil((float)(1+(n*2-1)/32)),32>>>(AI_d,i,n*2, lda2);
+ CUDACHECK;
+ cudaThreadSynchronize();
+ CUDACHECK;
+ }
+}
+
+/* inverts nxn matrix A and stores result back in A */
+extern void invert(REAL * A, int n) {
+ fprintf(stderr,"starting inversion n = %d ", n);
+ volatile clock_t gputime;
+ gputime=clock();
+
+ int lda = ((n+15)&~15|16);
+ REAL * AI = (REAL *)malloc(sizeof(REAL)*(n*lda*2));
+ memset(AI,0,sizeof(REAL)*n*lda*2);
+ for (int i = 0; i < n; i++) {
+ memcpy(&AI[lda*i*2], &A[n*i], sizeof(REAL)*n);
+ AI[lda*i*2+n+i] = 1;
+ }
+
+ REAL * AI_d;
+ SAFECALL(cudaMalloc((void **) &AI_d, sizeof(REAL)*n*lda*2));
+ SAFECALL(cudaMemcpy(AI_d, AI, sizeof(REAL)*n*lda*2, cudaMemcpyHostToDevice));
+
+ invertge(AI_d, lda, n);
+ SAFECALL(cudaMemcpy(AI, AI_d, sizeof(REAL)*n*lda*2, cudaMemcpyDeviceToHost));
+ cudaFree(AI_d);
+ gputime=clock()-gputime;fprintf(stderr, " %7.1f ms ",gputime/1.e3f);
+ fprintf(stderr, " %7.2f Gflops", 1e-3*(3.0)*n*n*n/3.0/gputime);
+
+#ifdef VERIFY
+ // let's verify that
+ REAL error=0.0;
+ // multiply inverse*xcopy, should be Identity matrix
+ for (int k = 0; k < n; k++) {
+ for (int j = 0; j < n; j++) {
+ REAL sum = 0;
+ for (int i = 0; i < n; i++) {
+ sum += AI[j*lda*2+n+i]*A[i*n+k];
+ }
+ if (j!=k) {
+ error += sum * sum;
+ } else {
+ error += (1.0-sum) * (1.0-sum);
+ }
+ }
+ }
+ fprintf(stderr, " %6.2f SSE", error);
+#endif
+
+ for (int i = 0; i < n; i++) {
+ memcpy(&A[n*i], &AI[lda*i*2+n], sizeof(REAL)*n);
+ }
+ free(AI);
+ fprintf(stderr," done!\n");
+}
diff --git a/samples/openclapp/Makefile_AMD b/samples/openclapp/Makefile_AMD
index 8bbe87f..6559442 100644
--- a/samples/openclapp/Makefile_AMD
+++ b/samples/openclapp/Makefile_AMD
@@ -1,44 +1,44 @@
-# makefile for openclapp BOINC example appication using AMD GPU on Linux.
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
- -I$(BOINC_DIR) \
- -I$(BOINC_LIB_DIR) \
- -I$(BOINC_API_DIR) \
- -I$(AMDAPPSDKROOT)/include \
- -L. \
- -L$(BOINC_LIB_DIR) \
- -L$(BOINC_API_DIR) \
- -L$(AMDAPPSDKROOT)/lib/x86 \
- -L/lib/i386-linux-gnu
-## The above 2 lines work around an Ubuntu LD_LIBRARY_PATH bug described in:
-## <https://help.ubuntu.com/community/EnvironmentVariables#File-location_related_variables>
-
-PROGS = openclapp \
-
-all: $(PROGS)
-
-libstdc++.a:
- ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
- /bin/rm -f $(PROGS) *.o libstdc++.a
-
-distclean:
- /bin/rm -f $(PROGS) *.o libstdc++.a
-
-install: openclapp
-
-openclapp: openclapp.o boinc_opencl.o libstdc++.a
- $(CXX) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
- libstdc++.a -lOpenCL -lboinc_api -lboinc -lpthread
-
-openclapp.o: openclapp.cpp openclapp.hpp
- $(CXX) $(CXXFLAGS) -c openclapp.cpp
-
-boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
- $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
-
+# makefile for openclapp BOINC example appication using AMD GPU on Linux.
+
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -I$(AMDAPPSDKROOT)/include \
+ -L. \
+ -L$(BOINC_LIB_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L$(AMDAPPSDKROOT)/lib/x86 \
+ -L/lib/i386-linux-gnu
+## The above 2 lines work around an Ubuntu LD_LIBRARY_PATH bug described in:
+## <https://help.ubuntu.com/community/EnvironmentVariables#File-location_related_variables>
+
+PROGS = openclapp \
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+install: openclapp
+
+openclapp: openclapp.o boinc_opencl.o libstdc++.a
+ $(CXX) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
+ libstdc++.a -lOpenCL -lboinc_api -lboinc -lpthread
+
+openclapp.o: openclapp.cpp openclapp.hpp
+ $(CXX) $(CXXFLAGS) -c openclapp.cpp
+
+boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
+ $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
+
diff --git a/samples/openclapp/Makefile_NVIDIA b/samples/openclapp/Makefile_NVIDIA
index 66ea2c6..9a1d4cb 100644
--- a/samples/openclapp/Makefile_NVIDIA
+++ b/samples/openclapp/Makefile_NVIDIA
@@ -1,44 +1,44 @@
-# makefile for openclapp BOINC example appication using NVIDIA GPU on Linux.
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-
-CXXFLAGS = -g \
- -I$(BOINC_DIR) \
- -I$(BOINC_LIB_DIR) \
- -I$(BOINC_API_DIR) \
- -I/usr/local/cuda/include \
- -L$(BOINC_LIB_DIR) \
- -L$(BOINC_API_DIR) \
- -L. \
- -L/usr/local/cuda/lib \
- -L/lib/i386-linux-gnu
-## The above 2 lines work around an Ubuntu LD_LIBRARY_PATH bug described in:
-## <https://help.ubuntu.com/community/EnvironmentVariables#File-location_related_variables>
-
-PROGS = openclapp \
-
-all: $(PROGS)
-
-libstdc++.a:
- ln -s `g++ -print-file-name=libstdc++.a`
-
-clean:
- /bin/rm -f $(PROGS) *.o libstdc++.a
-
-distclean:
- /bin/rm -f $(PROGS) *.o libstdc++.a
-
-install: openclapp
-
-openclapp: openclapp.o boinc_opencl.o libstdc++.a
- $(CXX) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
- libstdc++.a -lOpenCL -lboinc_api -lboinc -lpthread
-
-openclapp.o: openclapp.cpp openclapp.hpp
- $(CXX) $(CXXFLAGS) -c openclapp.cpp
-
-boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
- $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
-
+# makefile for openclapp BOINC example appication using NVIDIA GPU on Linux.
+
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -I/usr/local/cuda/include \
+ -L$(BOINC_LIB_DIR) \
+ -L$(BOINC_API_DIR) \
+ -L. \
+ -L/usr/local/cuda/lib \
+ -L/lib/i386-linux-gnu
+## The above 2 lines work around an Ubuntu LD_LIBRARY_PATH bug described in:
+## <https://help.ubuntu.com/community/EnvironmentVariables#File-location_related_variables>
+
+PROGS = openclapp \
+
+all: $(PROGS)
+
+libstdc++.a:
+ ln -s `g++ -print-file-name=libstdc++.a`
+
+clean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+distclean:
+ /bin/rm -f $(PROGS) *.o libstdc++.a
+
+install: openclapp
+
+openclapp: openclapp.o boinc_opencl.o libstdc++.a
+ $(CXX) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
+ libstdc++.a -lOpenCL -lboinc_api -lboinc -lpthread
+
+openclapp.o: openclapp.cpp openclapp.hpp
+ $(CXX) $(CXXFLAGS) -c openclapp.cpp
+
+boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
+ $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
+
diff --git a/samples/openclapp/Makefile_mac b/samples/openclapp/Makefile_mac
index f352b11..4e5b390 100644
--- a/samples/openclapp/Makefile_mac
+++ b/samples/openclapp/Makefile_mac
@@ -1,43 +1,43 @@
-# makefile for openclapp BOINC example appication on Mac OS X 10.7
-# To build:
-# cd to the boinc/samples/openclapp directory
-# make -f Makefile_mac [clean] all
-#
-
-
-BOINC_DIR = ../..
-BOINC_API_DIR = $(BOINC_DIR)/api
-BOINC_LIB_DIR = $(BOINC_DIR)/lib
-BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment
-BOINC_MAC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac
-
-CXXFLAGS = -g \
- -I$(BOINC_DIR) \
- -I$(BOINC_LIB_DIR) \
- -I$(BOINC_API_DIR) \
- -I$(BOINC_MAC_CONFIG_DIR)
-
-PROGS = openclapp \
-
-all: $(PROGS)
-
-clean:
- /bin/rm -f $(PROGS) *.o
-
-distclean:
- /bin/rm -f $(PROGS) *.o
-
-install: openclapp
-
-openclapp: openclapp.o boinc_opencl.o
- $(CXX) $(CXXFLAGS) -o openclapp openclapp.o \
- boinc_opencl.o \
- -framework OpenCL \
- -lboinc_api -L$(BOINC_BUILD_DIR) \
- -lboinc -L$(BOINC_BUILD_DIR)
-
-openclapp.o: openclapp.cpp openclapp.hpp
- $(CXX) $(CXXFLAGS) -c openclapp.cpp
-
-boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
- $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
+# makefile for openclapp BOINC example appication on Mac OS X 10.7
+# To build:
+# cd to the boinc/samples/openclapp directory
+# make -f Makefile_mac [clean] all
+#
+
+
+BOINC_DIR = ../..
+BOINC_API_DIR = $(BOINC_DIR)/api
+BOINC_LIB_DIR = $(BOINC_DIR)/lib
+BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment
+BOINC_MAC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac
+
+CXXFLAGS = -g \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \
+ -I$(BOINC_API_DIR) \
+ -I$(BOINC_MAC_CONFIG_DIR)
+
+PROGS = openclapp \
+
+all: $(PROGS)
+
+clean:
+ /bin/rm -f $(PROGS) *.o
+
+distclean:
+ /bin/rm -f $(PROGS) *.o
+
+install: openclapp
+
+openclapp: openclapp.o boinc_opencl.o
+ $(CXX) $(CXXFLAGS) -o openclapp openclapp.o \
+ boinc_opencl.o \
+ -framework OpenCL \
+ -lboinc_api -L$(BOINC_BUILD_DIR) \
+ -lboinc -L$(BOINC_BUILD_DIR)
+
+openclapp.o: openclapp.cpp openclapp.hpp
+ $(CXX) $(CXXFLAGS) -c openclapp.cpp
+
+boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
+ $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
diff --git a/samples/openclapp/openclapp.hpp b/samples/openclapp/openclapp.hpp
index 049bc55..2170722 100644
--- a/samples/openclapp/openclapp.hpp
+++ b/samples/openclapp/openclapp.hpp
@@ -1,228 +1,228 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
-//
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues.
-// Original contributor: Tuan Le (tuanle86 at berkeley.edu)
-
-#ifndef OPENCLAPP_H_
-#define OPENCLAPP_H_
-
-#ifdef __APPLE__
-#include <OpenCL/opencl.h>
-#else
-#include <CL/opencl.h>
-#endif
-
-#include <string.h>
-#include <cmath>
-#include <time.h>
-#include <cstdlib>
-#include <iostream>
-#include <string>
-#include <fstream>
-
-#define INPUT_FILENAME "input"
-#define OUTPUT_FILENAME "output"
-#define KERNELS_FILENAME "openclapp_kernels.cl"
-#define KERNELS_FILEPATH "../../openclapp_kernels.cl" // for Linux and Mac
-#define CHECKPOINT_FILE "matrix_inversion_state"
-
-#define LOCAL_WORK_SIZE 1
-#define GLOBAL_WORK_SIZE 400
-#define MATRIX_SIZE 10
-#define NUM_ITERATIONS 501 // execute the kernel NUM_ITERATIONS times
-
-#ifdef _WIN32
-#include "boinc_win.h"
-#else
-#ifndef __APPLE__
-#include "config.h"
-#endif
-#include <cstdio>
-#include <cctype>
-#include <ctime>
-#include <cstring>
-#include <cstdlib>
-#include <csignal>
-#include <unistd.h>
-#endif
-
-#include "str_util.h"
-#include "util.h"
-#include "filesys.h"
-#include "boinc_api.h"
-#include "mfile.h"
-#include "graphics2.h"
-
-struct UC_SHMEM {
- double update_time;
- double fraction_done;
- double cpu_time;
- BOINC_STATUS status;
- int countdown;
- // graphics app sets this to 5 repeatedly,
- // main program decrements it once/sec.
- // If it's zero, don't bother updating shmem
-};
-
-#ifdef APP_GRAPHICS
-UC_SHMEM* shmem;
-#endif
-
-/*** GLOBALS ***/
-
-bool run_slow = false;
-bool early_exit = false;
-bool early_crash = false;
-bool early_sleep = false;
-double cpu_time = 20, comp_result;
-bool isStateFileInUse = false;
-const char *source;
-
-size_t globalThreads[1]; // 1D var for Total # of work items
-size_t localThreads[1]; // 1D var for # of work items in the work group
-
-/*
- * Input data is stored here.
- */
-cl_float *input;
-
-/*
- * Output data is stored here.
- */
-cl_float *output;
-
-/* problem size for a 2D matrix. */
-// Note: we will handle the problem as a 1D matrix.
-cl_uint width;
-cl_uint height;
-
-/* The memory buffer that is used as input/output for OpenCL kernel */
-cl_mem inputBuffer; //in this sample app, we will read the result
- //from the device back to host from inputBuffer as well.
-cl_context context;
-cl_command_queue commandQueue;
-
-cl_program program;
-
-/* This program uses three kernels */
-cl_kernel GEStep1A_kernel;
-cl_kernel GEStep2_kernel;
-cl_kernel GEStep3_kernel;
-
-/*** FUNCTION DECLARATIONS ***/
-
-/*
- * Create an input file filled with random data of type cl_float.
- */
-void generate_random_input_file(int n);
-
-/*
- * Parse the input file and determine the size of the matrix.
- * This is an nxn matrix. Note: if width<> height, the matrix is
- * non-invertible.
- */
-int get_matrix_size(FILE *infile);
-
-/*
- * Read the float values from input file into "input" array.
- */
-void fetch_elements_into_host_memory(FILE *infile, cl_float *input);
-
-/*
- * BOINC functions
- */
-
-/* Do a billion floating-point ops */
-static double do_a_giga_flop(int foo);
-
-/* Save the computation state into checkpoint file */
-int do_checkpoint(MFILE& mf, int n, cl_float *input, int matrixSize);
-
-#ifdef APP_GRAPHICS
-void update_shmem() {
- if (!shmem) return;
-
- // always do this; otherwise a graphics app will immediately
- // assume we're not alive
- shmem->update_time = dtime();
-
- // Check whether a graphics app is running,
- // and don't bother updating shmem if so.
- // This doesn't matter here,
- // but may be worth doing if updating shmem is expensive.
- //
- if (shmem->countdown > 0) {
- // the graphics app sets this to 5 every time it renders a frame
- shmem->countdown--;
- } else {
- return;
- }
- shmem->fraction_done = boinc_get_fraction_done();
- shmem->cpu_time = boinc_worker_thread_cpu_time();;
- boinc_get_status(&shmem->status);
-}
-#endif
-
-/*
- * OpenCL related initialisations are done here.
- * Context, Device list, Command Queue are set up.
- * Calls are made to set up OpenCL memory buffers that this program uses
- * and to load the programs into memory and get kernel handles.
- */
-int initialize_cl(int argc, char * argv[]);
-
-int initialize_host(FILE *infile);
-
-/*
- * Read the file which contains kernel definitions, and stores the file content
- * into a char array which is used as an argument to clCreateProgramWithSource.
- */
-char *convert_to_string(const char * filename);
-
-/*
- * This is called once the OpenCL context, memory etc. are set up,
- * the program is loaded into memory and the kernel handles are ready.
- *
- * It sets the values for kernels' arguments and enqueues calls to the kernels
- * on to the command queue and waits till the calls have finished execution.
- *
- * It also gets kernel start and end time if profiling is enabled.
- */
-int run_cl_kernels(void);
-
-/* Releases OpenCL resources (Context, Memory etc.) */
-int cleanup_cl(void);
-
-/* Releases program's resources */
-void cleanup_host(void);
-
-/* Write the result to output file */
-void print_to_file(MFILE *out, float *h_odata, int n);
-
-/*
- * Functions used to inverst matrix. Call kernels inside.
- */
-void invert(cl_float * input,
- cl_float *output,
- int n);
-
-void invertge(cl_float * AI_d,
- int lda,
- int n);
-
-#endif /* #ifndef OPENCLAPP_H_ */
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
+//
+// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues.
+// Original contributor: Tuan Le (tuanle86 at berkeley.edu)
+
+#ifndef OPENCLAPP_H_
+#define OPENCLAPP_H_
+
+#ifdef __APPLE__
+#include <OpenCL/opencl.h>
+#else
+#include <CL/opencl.h>
+#endif
+
+#include <string.h>
+#include <cmath>
+#include <time.h>
+#include <cstdlib>
+#include <iostream>
+#include <string>
+#include <fstream>
+
+#define INPUT_FILENAME "input"
+#define OUTPUT_FILENAME "output"
+#define KERNELS_FILENAME "openclapp_kernels.cl"
+#define KERNELS_FILEPATH "../../openclapp_kernels.cl" // for Linux and Mac
+#define CHECKPOINT_FILE "matrix_inversion_state"
+
+#define LOCAL_WORK_SIZE 1
+#define GLOBAL_WORK_SIZE 400
+#define MATRIX_SIZE 10
+#define NUM_ITERATIONS 501 // execute the kernel NUM_ITERATIONS times
+
+#ifdef _WIN32
+#include "boinc_win.h"
+#else
+#ifndef __APPLE__
+#include "config.h"
+#endif
+#include <cstdio>
+#include <cctype>
+#include <ctime>
+#include <cstring>
+#include <cstdlib>
+#include <csignal>
+#include <unistd.h>
+#endif
+
+#include "str_util.h"
+#include "util.h"
+#include "filesys.h"
+#include "boinc_api.h"
+#include "mfile.h"
+#include "graphics2.h"
+
+struct UC_SHMEM {
+ double update_time;
+ double fraction_done;
+ double cpu_time;
+ BOINC_STATUS status;
+ int countdown;
+ // graphics app sets this to 5 repeatedly,
+ // main program decrements it once/sec.
+ // If it's zero, don't bother updating shmem
+};
+
+#ifdef APP_GRAPHICS
+UC_SHMEM* shmem;
+#endif
+
+/*** GLOBALS ***/
+
+bool run_slow = false;
+bool early_exit = false;
+bool early_crash = false;
+bool early_sleep = false;
+double cpu_time = 20, comp_result;
+bool isStateFileInUse = false;
+const char *source;
+
+size_t globalThreads[1]; // 1D var for Total # of work items
+size_t localThreads[1]; // 1D var for # of work items in the work group
+
+/*
+ * Input data is stored here.
+ */
+cl_float *input;
+
+/*
+ * Output data is stored here.
+ */
+cl_float *output;
+
+/* problem size for a 2D matrix. */
+// Note: we will handle the problem as a 1D matrix.
+cl_uint width;
+cl_uint height;
+
+/* The memory buffer that is used as input/output for OpenCL kernel */
+cl_mem inputBuffer; //in this sample app, we will read the result
+ //from the device back to host from inputBuffer as well.
+cl_context context;
+cl_command_queue commandQueue;
+
+cl_program program;
+
+/* This program uses three kernels */
+cl_kernel GEStep1A_kernel;
+cl_kernel GEStep2_kernel;
+cl_kernel GEStep3_kernel;
+
+/*** FUNCTION DECLARATIONS ***/
+
+/*
+ * Create an input file filled with random data of type cl_float.
+ */
+void generate_random_input_file(int n);
+
+/*
+ * Parse the input file and determine the size of the matrix.
+ * This is an nxn matrix. Note: if width<> height, the matrix is
+ * non-invertible.
+ */
+int get_matrix_size(FILE *infile);
+
+/*
+ * Read the float values from input file into "input" array.
+ */
+void fetch_elements_into_host_memory(FILE *infile, cl_float *input);
+
+/*
+ * BOINC functions
+ */
+
+/* Do a billion floating-point ops */
+static double do_a_giga_flop(int foo);
+
+/* Save the computation state into checkpoint file */
+int do_checkpoint(MFILE& mf, int n, cl_float *input, int matrixSize);
+
+#ifdef APP_GRAPHICS
+void update_shmem() {
+ if (!shmem) return;
+
+ // always do this; otherwise a graphics app will immediately
+ // assume we're not alive
+ shmem->update_time = dtime();
+
+ // Check whether a graphics app is running,
+ // and don't bother updating shmem if so.
+ // This doesn't matter here,
+ // but may be worth doing if updating shmem is expensive.
+ //
+ if (shmem->countdown > 0) {
+ // the graphics app sets this to 5 every time it renders a frame
+ shmem->countdown--;
+ } else {
+ return;
+ }
+ shmem->fraction_done = boinc_get_fraction_done();
+ shmem->cpu_time = boinc_worker_thread_cpu_time();;
+ boinc_get_status(&shmem->status);
+}
+#endif
+
+/*
+ * OpenCL related initialisations are done here.
+ * Context, Device list, Command Queue are set up.
+ * Calls are made to set up OpenCL memory buffers that this program uses
+ * and to load the programs into memory and get kernel handles.
+ */
+int initialize_cl(int argc, char * argv[]);
+
+int initialize_host(FILE *infile);
+
+/*
+ * Read the file which contains kernel definitions, and stores the file content
+ * into a char array which is used as an argument to clCreateProgramWithSource.
+ */
+char *convert_to_string(const char * filename);
+
+/*
+ * This is called once the OpenCL context, memory etc. are set up,
+ * the program is loaded into memory and the kernel handles are ready.
+ *
+ * It sets the values for kernels' arguments and enqueues calls to the kernels
+ * on to the command queue and waits till the calls have finished execution.
+ *
+ * It also gets kernel start and end time if profiling is enabled.
+ */
+int run_cl_kernels(void);
+
+/* Releases OpenCL resources (Context, Memory etc.) */
+int cleanup_cl(void);
+
+/* Releases program's resources */
+void cleanup_host(void);
+
+/* Write the result to output file */
+void print_to_file(MFILE *out, float *h_odata, int n);
+
+/*
+ * Functions used to inverst matrix. Call kernels inside.
+ */
+void invert(cl_float * input,
+ cl_float *output,
+ int n);
+
+void invertge(cl_float * AI_d,
+ int lda,
+ int n);
+
+#endif /* #ifndef OPENCLAPP_H_ */
diff --git a/samples/openclapp/openclapp_kernels.cl b/samples/openclapp/openclapp_kernels.cl
index e93ce7d..9dabb5a 100644
--- a/samples/openclapp/openclapp_kernels.cl
+++ b/samples/openclapp/openclapp_kernels.cl
@@ -1,50 +1,50 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
-//
-// This file contains kernel definition for matrix inversion.
-//
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
-// Contributor: Tuan Le (tuanle86 at berkeley.edu)
-
-__kernel void GEStep1A(__global float * AI, int i, int n2, int lda2) {
- //int k = get_group_id(0) * get_local_size(0) + get_local_id(0);
- int k=get_global_id(0);
- if (k>i && k < n2 && AI[i*lda2+k]!=0) {
- float multiplyer = -AI[i*lda2+k]/AI[i*lda2+i];
- int n = n2 / 2;
- for (int j = i+1; j < n; j++) {
- AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
- }
- }
-}
-
-__kernel void GEStep2(__global float * AI,float diag,int i, int n2, int lda2) {
- int k = get_global_id(0);
- if (k < n2) {
- AI[i*lda2+k] /= diag;
- }
-}
-
-__kernel void GEStep3(__global float * AI,int i, int n2, int lda2) {
- int k = get_global_id(0);
- if (k > i && k < n2) {
- float multiplyer = -AI[i*lda2+k];
- for (int j = 0; j < i; j++) {
- AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
- }
- }
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
+//
+// This file contains kernel definition for matrix inversion.
+//
+// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
+// Contributor: Tuan Le (tuanle86 at berkeley.edu)
+
+__kernel void GEStep1A(__global float * AI, int i, int n2, int lda2) {
+ //int k = get_group_id(0) * get_local_size(0) + get_local_id(0);
+ int k=get_global_id(0);
+ if (k>i && k < n2 && AI[i*lda2+k]!=0) {
+ float multiplyer = -AI[i*lda2+k]/AI[i*lda2+i];
+ int n = n2 / 2;
+ for (int j = i+1; j < n; j++) {
+ AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
+ }
+ }
+}
+
+__kernel void GEStep2(__global float * AI,float diag,int i, int n2, int lda2) {
+ int k = get_global_id(0);
+ if (k < n2) {
+ AI[i*lda2+k] /= diag;
+ }
+}
+
+__kernel void GEStep3(__global float * AI,int i, int n2, int lda2) {
+ int k = get_global_id(0);
+ if (k > i && k < n2) {
+ float multiplyer = -AI[i*lda2+k];
+ for (int j = 0; j < i; j++) {
+ AI[j*lda2+k] += multiplyer*AI[j*lda2+i];
+ }
+ }
}
\ No newline at end of file
diff --git a/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c b/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c
index 7780d4b..4db9b6b 100644
--- a/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c
+++ b/samples/vboxwrapper/deprecated/mscom/VirtualBox_i.c
@@ -1,468 +1,468 @@
-
-
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
- /* File created by MIDL compiler version 6.00.0361 */
-/* at Fri Oct 8 15:47:06 2010
- */
-/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
- Oicf, W1, Zp8, env=Win32 (32b run)
- protocol : dce , ms_ext, c_ext, robust
- error checks: allocation ref bounds_check enum stub_data
- VC __declspec() decoration level:
- __declspec(uuid()), __declspec(selectany), __declspec(novtable)
- DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING( )
-
-#if !defined(_M_IA64) && !defined(_M_AMD64)
-
-
-#pragma warning( disable: 4049 ) /* more than 64k source lines */
-
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifdef _MIDL_USE_GUIDDEF_
-
-#ifndef INITGUID
-#define INITGUID
-#include <guiddef.h>
-#undef INITGUID
-#else
-#include <guiddef.h>
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
- DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
-
-#else // !_MIDL_USE_GUIDDEF_
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
- unsigned long x;
- unsigned short s1;
- unsigned short s2;
- unsigned char c[8];
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
- const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-
-#endif !_MIDL_USE_GUIDDEF_
-
-MIDL_DEFINE_GUID(IID, LIBID_VirtualBox,0x46137EEC,0x703B,0x4fe5,0xAF,0xD4,0x7C,0x9B,0xBB,0xBA,0x02,0x59);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxErrorInfo,0x4b86d186,0x407e,0x4f9e,0x8b,0xe8,0xe5,0x00,0x61,0xbe,0x87,0x25);
-
-
-MIDL_DEFINE_GUID(IID, IID_ILocalOwner,0x308FF42A,0xDC45,0x49D4,0xA9,0x50,0xB1,0xEE,0xE5,0xE0,0x0B,0xB5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxCallback,0x7f6a65b6,0xad5d,0x4a67,0x88,0x72,0x0b,0x11,0xcb,0x7e,0xa9,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDHCPServer,0x6cfe387c,0x74fb,0x4ca7,0xbf,0xf6,0x97,0x3b,0xec,0x8a,0xf7,0xa3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBox,0x3f36e024,0x7fed,0x4f20,0xa0,0x2c,0x91,0x58,0xa8,0x2b,0x44,0xe6);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVFSExplorer,0x2bb864a1,0x02a3,0x4474,0xa1,0xd4,0xfb,0x5f,0x23,0xb7,0x42,0xe1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAppliance,0xe3ba9ab9,0xac2c,0x4266,0x8b,0xd2,0x91,0xc4,0xbf,0x72,0x1c,0xeb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualSystemDescription,0xd7525e6c,0x531a,0x4c51,0x8e,0x04,0x41,0x23,0x50,0x83,0xa3,0xd8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalMachineControl,0x26604a54,0x8628,0x491b,0xa0,0xea,0xe1,0x39,0x2a,0x16,0xd1,0x3b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IBIOSSettings,0x38b54279,0xdc35,0x4f5e,0xa4,0x31,0x83,0x5b,0x86,0x7c,0x6b,0x5e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachine,0x6d9212cb,0xa5c0,0x48b7,0xbb,0xc1,0x3f,0xa2,0xba,0x2e,0xe6,0xd2);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsoleCallback,0x60703f8d,0x81e4,0x4b45,0xa1,0x47,0xdc,0xfd,0x07,0x69,0x2b,0x19);
-
-
-MIDL_DEFINE_GUID(IID, IID_IRemoteDisplayInfo,0xb3741084,0x806f,0x4c3b,0x8c,0x42,0xeb,0xad,0x1a,0x81,0xe4,0x5a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsole,0x6375231a,0xc17c,0x464b,0x92,0xcb,0xae,0x9e,0x12,0x8d,0x71,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostNetworkInterface,0xce6fae58,0x7642,0x4102,0xb5,0xdb,0xc9,0x00,0x5c,0x23,0x20,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHost,0x35b004f4,0x7806,0x4009,0xbf,0xa8,0xd1,0x30,0x8a,0xdb,0xa7,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISystemProperties,0x07c3ffd8,0x8f59,0x49cc,0xb6,0x08,0x53,0xa3,0x32,0xe8,0x5c,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuestOSType,0xe3f6727e,0xa09b,0x41ea,0xa8,0x24,0x86,0x4a,0x17,0x64,0x72,0xf3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuest,0xd915dff1,0xed38,0x495a,0x91,0xf1,0xab,0x6c,0x53,0x93,0x24,0x68);
-
-
-MIDL_DEFINE_GUID(IID, IID_IProgress,0x856aa038,0x853f,0x42e2,0xac,0xf7,0x6e,0x7b,0x02,0xdb,0xe2,0x94);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISnapshot,0x1a2d0551,0x58a4,0x4107,0x85,0x7e,0xef,0x41,0x4f,0xc4,0x2f,0xfc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumAttachment,0xe58eb3eb,0x8627,0x428b,0xbd,0xf8,0x34,0x48,0x7c,0x84,0x8d,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMedium,0x1d578f43,0x5ef1,0x4415,0xb5,0x56,0x75,0x92,0xd3,0xcc,0xdc,0x8f);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumFormat,0x89f52554,0xd469,0x4799,0x9f,0xad,0x17,0x05,0xe8,0x6a,0x08,0xb1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IKeyboard,0x2d1a531b,0x4c6e,0x49cc,0x8a,0xf6,0x5c,0x85,0x7b,0x78,0xb5,0xd7);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMouse,0x7c0f2eae,0xf92d,0x498c,0xb8,0x02,0xe1,0xa3,0x76,0x37,0x74,0xdc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebuffer,0xb7ed347a,0x5765,0x40a0,0xae,0x1c,0xf5,0x43,0xeb,0x4d,0xde,0xaf);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebufferOverlay,0x0bcc1c7e,0xe415,0x47d2,0xbf,0xdb,0xe4,0xc7,0x05,0xfb,0x0f,0x47);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDisplay,0x1fa79e39,0x0cc9,0x4ab3,0x9d,0xf3,0xed,0x3e,0x96,0xb4,0x24,0x96);
-
-
-MIDL_DEFINE_GUID(IID, IID_INetworkAdapter,0x5bdb9df8,0xa5e1,0x4322,0xa1,0x39,0xb7,0xa4,0xa7,0x34,0xc7,0x90);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISerialPort,0x937f6970,0x5103,0x4745,0xb7,0x8e,0xd2,0x8d,0xcf,0x14,0x79,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IParallelPort,0x0c925f06,0xdd10,0x4b77,0x8d,0xe8,0x29,0x4d,0x73,0x8c,0x32,0x14);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachineDebugger,0xb0b2a2dd,0x0627,0x4502,0x91,0xc2,0xdd,0xc5,0xe7,0x76,0x09,0xe0);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBController,0x6fdcccc5,0xabd3,0x4fec,0x93,0x87,0x2a,0xd3,0x91,0x4f,0xc4,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDevice,0xf8967b0b,0x4483,0x400f,0x92,0xb5,0x8b,0x67,0x5d,0x98,0xa8,0x5b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDeviceFilter,0xd6831fb4,0x1a94,0x4c2c,0x96,0xef,0x8d,0x0d,0x61,0x92,0x06,0x6d);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDevice,0x173b4b44,0xd268,0x4334,0xa0,0x0d,0xb6,0x52,0x1c,0x9a,0x74,0x0a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDeviceFilter,0x4cc70246,0xd74a,0x400f,0x82,0x22,0x39,0x00,0x48,0x9c,0x03,0x74);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAudioAdapter,0x921873db,0x5f3f,0x4b69,0x91,0xf9,0x7b,0xe9,0xe5,0x35,0xa2,0xcb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVRDPServer,0x7aeeb530,0x0b08,0x41fe,0x83,0x5d,0x9b,0xe9,0xec,0x1d,0xbe,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISharedFolder,0x64637bb2,0x9e17,0x471c,0xb8,0xf3,0xf8,0x96,0x8d,0xd9,0x88,0x4e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalSessionControl,0xab161f72,0xe4b3,0x44e6,0xa9,0x19,0x22,0x56,0x47,0x4b,0xda,0x66);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISession,0x12F4DCDB,0x12B2,0x4EC1,0xB7,0xCD,0xDD,0xD9,0xF6,0xC5,0xBF,0x4D);
-
-
-MIDL_DEFINE_GUID(IID, IID_IStorageController,0xfd93adc0,0xbbaa,0x4256,0x9e,0x6e,0x00,0xe2,0x9f,0x91,0x51,0xc9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceMetric,0x2a1a60ae,0x9345,0x4019,0xad,0x53,0xd3,0x4b,0xa4,0x1c,0xbf,0xe9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceCollector,0xe22e1acb,0xac4a,0x43bb,0xa3,0x1c,0x17,0x32,0x16,0x59,0xb0,0xc6);
-
-
-MIDL_DEFINE_GUID(IID, IID_INATEngine,0x4b286616,0xeb03,0x11de,0xb0,0xfb,0x17,0x01,0xec,0xa4,0x22,0x46);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_VirtualBox,0xB1A7A4F2,0x47B9,0x4A1E,0x82,0xB2,0x07,0xCC,0xD5,0x32,0x3C,0x3F);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_Session,0x3C02F46D,0xC9D2,0x4F11,0xA3,0x84,0x53,0xF0,0xCF,0x91,0x72,0x14);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_CallbackWrapper,0x49EE8561,0x5563,0x4715,0xB1,0x8C,0xA4,0xB1,0xA4,0x90,0xDA,0xFE);
-
-#undef MIDL_DEFINE_GUID
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/
-
-
-
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
- /* File created by MIDL compiler version 6.00.0361 */
-/* at Fri Oct 8 15:47:06 2010
- */
-/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
- Oicf, W1, Zp8, env=Win64 (32b run,appending)
- protocol : dce , ms_ext, c_ext, robust
- error checks: allocation ref bounds_check enum stub_data
- VC __declspec() decoration level:
- __declspec(uuid()), __declspec(selectany), __declspec(novtable)
- DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING( )
-
-#if defined(_M_IA64) || defined(_M_AMD64)
-
-
-#pragma warning( disable: 4049 ) /* more than 64k source lines */
-
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifdef _MIDL_USE_GUIDDEF_
-
-#ifndef INITGUID
-#define INITGUID
-#include <guiddef.h>
-#undef INITGUID
-#else
-#include <guiddef.h>
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
- DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
-
-#else // !_MIDL_USE_GUIDDEF_
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
- unsigned long x;
- unsigned short s1;
- unsigned short s2;
- unsigned char c[8];
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
- const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-
-#endif !_MIDL_USE_GUIDDEF_
-
-MIDL_DEFINE_GUID(IID, LIBID_VirtualBox,0x46137EEC,0x703B,0x4fe5,0xAF,0xD4,0x7C,0x9B,0xBB,0xBA,0x02,0x59);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxErrorInfo,0x4b86d186,0x407e,0x4f9e,0x8b,0xe8,0xe5,0x00,0x61,0xbe,0x87,0x25);
-
-
-MIDL_DEFINE_GUID(IID, IID_ILocalOwner,0x308FF42A,0xDC45,0x49D4,0xA9,0x50,0xB1,0xEE,0xE5,0xE0,0x0B,0xB5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBoxCallback,0x7f6a65b6,0xad5d,0x4a67,0x88,0x72,0x0b,0x11,0xcb,0x7e,0xa9,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDHCPServer,0x6cfe387c,0x74fb,0x4ca7,0xbf,0xf6,0x97,0x3b,0xec,0x8a,0xf7,0xa3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualBox,0x3f36e024,0x7fed,0x4f20,0xa0,0x2c,0x91,0x58,0xa8,0x2b,0x44,0xe6);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVFSExplorer,0x2bb864a1,0x02a3,0x4474,0xa1,0xd4,0xfb,0x5f,0x23,0xb7,0x42,0xe1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAppliance,0xe3ba9ab9,0xac2c,0x4266,0x8b,0xd2,0x91,0xc4,0xbf,0x72,0x1c,0xeb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVirtualSystemDescription,0xd7525e6c,0x531a,0x4c51,0x8e,0x04,0x41,0x23,0x50,0x83,0xa3,0xd8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalMachineControl,0x26604a54,0x8628,0x491b,0xa0,0xea,0xe1,0x39,0x2a,0x16,0xd1,0x3b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IBIOSSettings,0x38b54279,0xdc35,0x4f5e,0xa4,0x31,0x83,0x5b,0x86,0x7c,0x6b,0x5e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachine,0x6d9212cb,0xa5c0,0x48b7,0xbb,0xc1,0x3f,0xa2,0xba,0x2e,0xe6,0xd2);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsoleCallback,0x60703f8d,0x81e4,0x4b45,0xa1,0x47,0xdc,0xfd,0x07,0x69,0x2b,0x19);
-
-
-MIDL_DEFINE_GUID(IID, IID_IRemoteDisplayInfo,0xb3741084,0x806f,0x4c3b,0x8c,0x42,0xeb,0xad,0x1a,0x81,0xe4,0x5a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IConsole,0x6375231a,0xc17c,0x464b,0x92,0xcb,0xae,0x9e,0x12,0x8d,0x71,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostNetworkInterface,0xce6fae58,0x7642,0x4102,0xb5,0xdb,0xc9,0x00,0x5c,0x23,0x20,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHost,0x35b004f4,0x7806,0x4009,0xbf,0xa8,0xd1,0x30,0x8a,0xdb,0xa7,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISystemProperties,0x07c3ffd8,0x8f59,0x49cc,0xb6,0x08,0x53,0xa3,0x32,0xe8,0x5c,0xc3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuestOSType,0xe3f6727e,0xa09b,0x41ea,0xa8,0x24,0x86,0x4a,0x17,0x64,0x72,0xf3);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGuest,0xd915dff1,0xed38,0x495a,0x91,0xf1,0xab,0x6c,0x53,0x93,0x24,0x68);
-
-
-MIDL_DEFINE_GUID(IID, IID_IProgress,0x856aa038,0x853f,0x42e2,0xac,0xf7,0x6e,0x7b,0x02,0xdb,0xe2,0x94);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISnapshot,0x1a2d0551,0x58a4,0x4107,0x85,0x7e,0xef,0x41,0x4f,0xc4,0x2f,0xfc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumAttachment,0xe58eb3eb,0x8627,0x428b,0xbd,0xf8,0x34,0x48,0x7c,0x84,0x8d,0xe5);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMedium,0x1d578f43,0x5ef1,0x4415,0xb5,0x56,0x75,0x92,0xd3,0xcc,0xdc,0x8f);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMediumFormat,0x89f52554,0xd469,0x4799,0x9f,0xad,0x17,0x05,0xe8,0x6a,0x08,0xb1);
-
-
-MIDL_DEFINE_GUID(IID, IID_IKeyboard,0x2d1a531b,0x4c6e,0x49cc,0x8a,0xf6,0x5c,0x85,0x7b,0x78,0xb5,0xd7);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMouse,0x7c0f2eae,0xf92d,0x498c,0xb8,0x02,0xe1,0xa3,0x76,0x37,0x74,0xdc);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebuffer,0xb7ed347a,0x5765,0x40a0,0xae,0x1c,0xf5,0x43,0xeb,0x4d,0xde,0xaf);
-
-
-MIDL_DEFINE_GUID(IID, IID_IFramebufferOverlay,0x0bcc1c7e,0xe415,0x47d2,0xbf,0xdb,0xe4,0xc7,0x05,0xfb,0x0f,0x47);
-
-
-MIDL_DEFINE_GUID(IID, IID_IDisplay,0x1fa79e39,0x0cc9,0x4ab3,0x9d,0xf3,0xed,0x3e,0x96,0xb4,0x24,0x96);
-
-
-MIDL_DEFINE_GUID(IID, IID_INetworkAdapter,0x5bdb9df8,0xa5e1,0x4322,0xa1,0x39,0xb7,0xa4,0xa7,0x34,0xc7,0x90);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISerialPort,0x937f6970,0x5103,0x4745,0xb7,0x8e,0xd2,0x8d,0xcf,0x14,0x79,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IParallelPort,0x0c925f06,0xdd10,0x4b77,0x8d,0xe8,0x29,0x4d,0x73,0x8c,0x32,0x14);
-
-
-MIDL_DEFINE_GUID(IID, IID_IMachineDebugger,0xb0b2a2dd,0x0627,0x4502,0x91,0xc2,0xdd,0xc5,0xe7,0x76,0x09,0xe0);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBController,0x6fdcccc5,0xabd3,0x4fec,0x93,0x87,0x2a,0xd3,0x91,0x4f,0xc4,0xa8);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDevice,0xf8967b0b,0x4483,0x400f,0x92,0xb5,0x8b,0x67,0x5d,0x98,0xa8,0x5b);
-
-
-MIDL_DEFINE_GUID(IID, IID_IUSBDeviceFilter,0xd6831fb4,0x1a94,0x4c2c,0x96,0xef,0x8d,0x0d,0x61,0x92,0x06,0x6d);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDevice,0x173b4b44,0xd268,0x4334,0xa0,0x0d,0xb6,0x52,0x1c,0x9a,0x74,0x0a);
-
-
-MIDL_DEFINE_GUID(IID, IID_IHostUSBDeviceFilter,0x4cc70246,0xd74a,0x400f,0x82,0x22,0x39,0x00,0x48,0x9c,0x03,0x74);
-
-
-MIDL_DEFINE_GUID(IID, IID_IAudioAdapter,0x921873db,0x5f3f,0x4b69,0x91,0xf9,0x7b,0xe9,0xe5,0x35,0xa2,0xcb);
-
-
-MIDL_DEFINE_GUID(IID, IID_IVRDPServer,0x7aeeb530,0x0b08,0x41fe,0x83,0x5d,0x9b,0xe9,0xec,0x1d,0xbe,0x5c);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISharedFolder,0x64637bb2,0x9e17,0x471c,0xb8,0xf3,0xf8,0x96,0x8d,0xd9,0x88,0x4e);
-
-
-MIDL_DEFINE_GUID(IID, IID_IInternalSessionControl,0xab161f72,0xe4b3,0x44e6,0xa9,0x19,0x22,0x56,0x47,0x4b,0xda,0x66);
-
-
-MIDL_DEFINE_GUID(IID, IID_ISession,0x12F4DCDB,0x12B2,0x4EC1,0xB7,0xCD,0xDD,0xD9,0xF6,0xC5,0xBF,0x4D);
-
-
-MIDL_DEFINE_GUID(IID, IID_IStorageController,0xfd93adc0,0xbbaa,0x4256,0x9e,0x6e,0x00,0xe2,0x9f,0x91,0x51,0xc9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceMetric,0x2a1a60ae,0x9345,0x4019,0xad,0x53,0xd3,0x4b,0xa4,0x1c,0xbf,0xe9);
-
-
-MIDL_DEFINE_GUID(IID, IID_IPerformanceCollector,0xe22e1acb,0xac4a,0x43bb,0xa3,0x1c,0x17,0x32,0x16,0x59,0xb0,0xc6);
-
-
-MIDL_DEFINE_GUID(IID, IID_INATEngine,0x4b286616,0xeb03,0x11de,0xb0,0xfb,0x17,0x01,0xec,0xa4,0x22,0x46);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_VirtualBox,0xB1A7A4F2,0x47B9,0x4A1E,0x82,0xB2,0x07,0xCC,0xD5,0x32,0x3C,0x3F);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_Session,0x3C02F46D,0xC9D2,0x4F11,0xA3,0x84,0x53,0xF0,0xCF,0x91,0x72,0x14);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_CallbackWrapper,0x49EE8561,0x5563,0x4715,0xB1,0x8C,0xA4,0xB1,0xA4,0x90,0xDA,0xFE);
-
-#undef MIDL_DEFINE_GUID
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* defined(_M_IA64) || defined(_M_AMD64)*/
-
+
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Fri Oct 8 15:47:06 2010
+ */
+/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
+ Oicf, W1, Zp8, env=Win32 (32b run)
+ protocol : dce , ms_ext, c_ext, robust
+ error checks: allocation ref bounds_check enum stub_data
+ VC __declspec() decoration level:
+ __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+ DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING( )
+
+#if !defined(_M_IA64) && !defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 ) /* more than 64k source lines */
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
+#define INITGUID
+#include <guiddef.h>
+#undef INITGUID
+#else
+#include <guiddef.h>
+#endif
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+ DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
+
+#else // !_MIDL_USE_GUIDDEF_
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+ unsigned long x;
+ unsigned short s1;
+ unsigned short s2;
+ unsigned char c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+ const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+#endif !_MIDL_USE_GUIDDEF_
+
+MIDL_DEFINE_GUID(IID, LIBID_VirtualBox,0x46137EEC,0x703B,0x4fe5,0xAF,0xD4,0x7C,0x9B,0xBB,0xBA,0x02,0x59);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualBoxErrorInfo,0x4b86d186,0x407e,0x4f9e,0x8b,0xe8,0xe5,0x00,0x61,0xbe,0x87,0x25);
+
+
+MIDL_DEFINE_GUID(IID, IID_ILocalOwner,0x308FF42A,0xDC45,0x49D4,0xA9,0x50,0xB1,0xEE,0xE5,0xE0,0x0B,0xB5);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualBoxCallback,0x7f6a65b6,0xad5d,0x4a67,0x88,0x72,0x0b,0x11,0xcb,0x7e,0xa9,0x5c);
+
+
+MIDL_DEFINE_GUID(IID, IID_IDHCPServer,0x6cfe387c,0x74fb,0x4ca7,0xbf,0xf6,0x97,0x3b,0xec,0x8a,0xf7,0xa3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualBox,0x3f36e024,0x7fed,0x4f20,0xa0,0x2c,0x91,0x58,0xa8,0x2b,0x44,0xe6);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVFSExplorer,0x2bb864a1,0x02a3,0x4474,0xa1,0xd4,0xfb,0x5f,0x23,0xb7,0x42,0xe1);
+
+
+MIDL_DEFINE_GUID(IID, IID_IAppliance,0xe3ba9ab9,0xac2c,0x4266,0x8b,0xd2,0x91,0xc4,0xbf,0x72,0x1c,0xeb);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualSystemDescription,0xd7525e6c,0x531a,0x4c51,0x8e,0x04,0x41,0x23,0x50,0x83,0xa3,0xd8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IInternalMachineControl,0x26604a54,0x8628,0x491b,0xa0,0xea,0xe1,0x39,0x2a,0x16,0xd1,0x3b);
+
+
+MIDL_DEFINE_GUID(IID, IID_IBIOSSettings,0x38b54279,0xdc35,0x4f5e,0xa4,0x31,0x83,0x5b,0x86,0x7c,0x6b,0x5e);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMachine,0x6d9212cb,0xa5c0,0x48b7,0xbb,0xc1,0x3f,0xa2,0xba,0x2e,0xe6,0xd2);
+
+
+MIDL_DEFINE_GUID(IID, IID_IConsoleCallback,0x60703f8d,0x81e4,0x4b45,0xa1,0x47,0xdc,0xfd,0x07,0x69,0x2b,0x19);
+
+
+MIDL_DEFINE_GUID(IID, IID_IRemoteDisplayInfo,0xb3741084,0x806f,0x4c3b,0x8c,0x42,0xeb,0xad,0x1a,0x81,0xe4,0x5a);
+
+
+MIDL_DEFINE_GUID(IID, IID_IConsole,0x6375231a,0xc17c,0x464b,0x92,0xcb,0xae,0x9e,0x12,0x8d,0x71,0xc3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHostNetworkInterface,0xce6fae58,0x7642,0x4102,0xb5,0xdb,0xc9,0x00,0x5c,0x23,0x20,0xa8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHost,0x35b004f4,0x7806,0x4009,0xbf,0xa8,0xd1,0x30,0x8a,0xdb,0xa7,0xe5);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISystemProperties,0x07c3ffd8,0x8f59,0x49cc,0xb6,0x08,0x53,0xa3,0x32,0xe8,0x5c,0xc3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IGuestOSType,0xe3f6727e,0xa09b,0x41ea,0xa8,0x24,0x86,0x4a,0x17,0x64,0x72,0xf3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IGuest,0xd915dff1,0xed38,0x495a,0x91,0xf1,0xab,0x6c,0x53,0x93,0x24,0x68);
+
+
+MIDL_DEFINE_GUID(IID, IID_IProgress,0x856aa038,0x853f,0x42e2,0xac,0xf7,0x6e,0x7b,0x02,0xdb,0xe2,0x94);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISnapshot,0x1a2d0551,0x58a4,0x4107,0x85,0x7e,0xef,0x41,0x4f,0xc4,0x2f,0xfc);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMediumAttachment,0xe58eb3eb,0x8627,0x428b,0xbd,0xf8,0x34,0x48,0x7c,0x84,0x8d,0xe5);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMedium,0x1d578f43,0x5ef1,0x4415,0xb5,0x56,0x75,0x92,0xd3,0xcc,0xdc,0x8f);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMediumFormat,0x89f52554,0xd469,0x4799,0x9f,0xad,0x17,0x05,0xe8,0x6a,0x08,0xb1);
+
+
+MIDL_DEFINE_GUID(IID, IID_IKeyboard,0x2d1a531b,0x4c6e,0x49cc,0x8a,0xf6,0x5c,0x85,0x7b,0x78,0xb5,0xd7);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMouse,0x7c0f2eae,0xf92d,0x498c,0xb8,0x02,0xe1,0xa3,0x76,0x37,0x74,0xdc);
+
+
+MIDL_DEFINE_GUID(IID, IID_IFramebuffer,0xb7ed347a,0x5765,0x40a0,0xae,0x1c,0xf5,0x43,0xeb,0x4d,0xde,0xaf);
+
+
+MIDL_DEFINE_GUID(IID, IID_IFramebufferOverlay,0x0bcc1c7e,0xe415,0x47d2,0xbf,0xdb,0xe4,0xc7,0x05,0xfb,0x0f,0x47);
+
+
+MIDL_DEFINE_GUID(IID, IID_IDisplay,0x1fa79e39,0x0cc9,0x4ab3,0x9d,0xf3,0xed,0x3e,0x96,0xb4,0x24,0x96);
+
+
+MIDL_DEFINE_GUID(IID, IID_INetworkAdapter,0x5bdb9df8,0xa5e1,0x4322,0xa1,0x39,0xb7,0xa4,0xa7,0x34,0xc7,0x90);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISerialPort,0x937f6970,0x5103,0x4745,0xb7,0x8e,0xd2,0x8d,0xcf,0x14,0x79,0xa8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IParallelPort,0x0c925f06,0xdd10,0x4b77,0x8d,0xe8,0x29,0x4d,0x73,0x8c,0x32,0x14);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMachineDebugger,0xb0b2a2dd,0x0627,0x4502,0x91,0xc2,0xdd,0xc5,0xe7,0x76,0x09,0xe0);
+
+
+MIDL_DEFINE_GUID(IID, IID_IUSBController,0x6fdcccc5,0xabd3,0x4fec,0x93,0x87,0x2a,0xd3,0x91,0x4f,0xc4,0xa8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IUSBDevice,0xf8967b0b,0x4483,0x400f,0x92,0xb5,0x8b,0x67,0x5d,0x98,0xa8,0x5b);
+
+
+MIDL_DEFINE_GUID(IID, IID_IUSBDeviceFilter,0xd6831fb4,0x1a94,0x4c2c,0x96,0xef,0x8d,0x0d,0x61,0x92,0x06,0x6d);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHostUSBDevice,0x173b4b44,0xd268,0x4334,0xa0,0x0d,0xb6,0x52,0x1c,0x9a,0x74,0x0a);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHostUSBDeviceFilter,0x4cc70246,0xd74a,0x400f,0x82,0x22,0x39,0x00,0x48,0x9c,0x03,0x74);
+
+
+MIDL_DEFINE_GUID(IID, IID_IAudioAdapter,0x921873db,0x5f3f,0x4b69,0x91,0xf9,0x7b,0xe9,0xe5,0x35,0xa2,0xcb);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVRDPServer,0x7aeeb530,0x0b08,0x41fe,0x83,0x5d,0x9b,0xe9,0xec,0x1d,0xbe,0x5c);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISharedFolder,0x64637bb2,0x9e17,0x471c,0xb8,0xf3,0xf8,0x96,0x8d,0xd9,0x88,0x4e);
+
+
+MIDL_DEFINE_GUID(IID, IID_IInternalSessionControl,0xab161f72,0xe4b3,0x44e6,0xa9,0x19,0x22,0x56,0x47,0x4b,0xda,0x66);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISession,0x12F4DCDB,0x12B2,0x4EC1,0xB7,0xCD,0xDD,0xD9,0xF6,0xC5,0xBF,0x4D);
+
+
+MIDL_DEFINE_GUID(IID, IID_IStorageController,0xfd93adc0,0xbbaa,0x4256,0x9e,0x6e,0x00,0xe2,0x9f,0x91,0x51,0xc9);
+
+
+MIDL_DEFINE_GUID(IID, IID_IPerformanceMetric,0x2a1a60ae,0x9345,0x4019,0xad,0x53,0xd3,0x4b,0xa4,0x1c,0xbf,0xe9);
+
+
+MIDL_DEFINE_GUID(IID, IID_IPerformanceCollector,0xe22e1acb,0xac4a,0x43bb,0xa3,0x1c,0x17,0x32,0x16,0x59,0xb0,0xc6);
+
+
+MIDL_DEFINE_GUID(IID, IID_INATEngine,0x4b286616,0xeb03,0x11de,0xb0,0xfb,0x17,0x01,0xec,0xa4,0x22,0x46);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_VirtualBox,0xB1A7A4F2,0x47B9,0x4A1E,0x82,0xB2,0x07,0xCC,0xD5,0x32,0x3C,0x3F);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_Session,0x3C02F46D,0xC9D2,0x4F11,0xA3,0x84,0x53,0xF0,0xCF,0x91,0x72,0x14);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_CallbackWrapper,0x49EE8561,0x5563,0x4715,0xB1,0x8C,0xA4,0xB1,0xA4,0x90,0xDA,0xFE);
+
+#undef MIDL_DEFINE_GUID
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/
+
+
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Fri Oct 8 15:47:06 2010
+ */
+/* Compiler settings for Z:\home\vbox\tinderbox\3.2-sdk\out\linux.amd64\release\bin\sdk\bindings\mscom\idl\VirtualBox.idl:
+ Oicf, W1, Zp8, env=Win64 (32b run,appending)
+ protocol : dce , ms_ext, c_ext, robust
+ error checks: allocation ref bounds_check enum stub_data
+ VC __declspec() decoration level:
+ __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+ DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING( )
+
+#if defined(_M_IA64) || defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 ) /* more than 64k source lines */
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
+#define INITGUID
+#include <guiddef.h>
+#undef INITGUID
+#else
+#include <guiddef.h>
+#endif
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+ DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
+
+#else // !_MIDL_USE_GUIDDEF_
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+ unsigned long x;
+ unsigned short s1;
+ unsigned short s2;
+ unsigned char c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+ const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+#endif !_MIDL_USE_GUIDDEF_
+
+MIDL_DEFINE_GUID(IID, LIBID_VirtualBox,0x46137EEC,0x703B,0x4fe5,0xAF,0xD4,0x7C,0x9B,0xBB,0xBA,0x02,0x59);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualBoxErrorInfo,0x4b86d186,0x407e,0x4f9e,0x8b,0xe8,0xe5,0x00,0x61,0xbe,0x87,0x25);
+
+
+MIDL_DEFINE_GUID(IID, IID_ILocalOwner,0x308FF42A,0xDC45,0x49D4,0xA9,0x50,0xB1,0xEE,0xE5,0xE0,0x0B,0xB5);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualBoxCallback,0x7f6a65b6,0xad5d,0x4a67,0x88,0x72,0x0b,0x11,0xcb,0x7e,0xa9,0x5c);
+
+
+MIDL_DEFINE_GUID(IID, IID_IDHCPServer,0x6cfe387c,0x74fb,0x4ca7,0xbf,0xf6,0x97,0x3b,0xec,0x8a,0xf7,0xa3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualBox,0x3f36e024,0x7fed,0x4f20,0xa0,0x2c,0x91,0x58,0xa8,0x2b,0x44,0xe6);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVFSExplorer,0x2bb864a1,0x02a3,0x4474,0xa1,0xd4,0xfb,0x5f,0x23,0xb7,0x42,0xe1);
+
+
+MIDL_DEFINE_GUID(IID, IID_IAppliance,0xe3ba9ab9,0xac2c,0x4266,0x8b,0xd2,0x91,0xc4,0xbf,0x72,0x1c,0xeb);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVirtualSystemDescription,0xd7525e6c,0x531a,0x4c51,0x8e,0x04,0x41,0x23,0x50,0x83,0xa3,0xd8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IInternalMachineControl,0x26604a54,0x8628,0x491b,0xa0,0xea,0xe1,0x39,0x2a,0x16,0xd1,0x3b);
+
+
+MIDL_DEFINE_GUID(IID, IID_IBIOSSettings,0x38b54279,0xdc35,0x4f5e,0xa4,0x31,0x83,0x5b,0x86,0x7c,0x6b,0x5e);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMachine,0x6d9212cb,0xa5c0,0x48b7,0xbb,0xc1,0x3f,0xa2,0xba,0x2e,0xe6,0xd2);
+
+
+MIDL_DEFINE_GUID(IID, IID_IConsoleCallback,0x60703f8d,0x81e4,0x4b45,0xa1,0x47,0xdc,0xfd,0x07,0x69,0x2b,0x19);
+
+
+MIDL_DEFINE_GUID(IID, IID_IRemoteDisplayInfo,0xb3741084,0x806f,0x4c3b,0x8c,0x42,0xeb,0xad,0x1a,0x81,0xe4,0x5a);
+
+
+MIDL_DEFINE_GUID(IID, IID_IConsole,0x6375231a,0xc17c,0x464b,0x92,0xcb,0xae,0x9e,0x12,0x8d,0x71,0xc3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHostNetworkInterface,0xce6fae58,0x7642,0x4102,0xb5,0xdb,0xc9,0x00,0x5c,0x23,0x20,0xa8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHost,0x35b004f4,0x7806,0x4009,0xbf,0xa8,0xd1,0x30,0x8a,0xdb,0xa7,0xe5);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISystemProperties,0x07c3ffd8,0x8f59,0x49cc,0xb6,0x08,0x53,0xa3,0x32,0xe8,0x5c,0xc3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IGuestOSType,0xe3f6727e,0xa09b,0x41ea,0xa8,0x24,0x86,0x4a,0x17,0x64,0x72,0xf3);
+
+
+MIDL_DEFINE_GUID(IID, IID_IGuest,0xd915dff1,0xed38,0x495a,0x91,0xf1,0xab,0x6c,0x53,0x93,0x24,0x68);
+
+
+MIDL_DEFINE_GUID(IID, IID_IProgress,0x856aa038,0x853f,0x42e2,0xac,0xf7,0x6e,0x7b,0x02,0xdb,0xe2,0x94);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISnapshot,0x1a2d0551,0x58a4,0x4107,0x85,0x7e,0xef,0x41,0x4f,0xc4,0x2f,0xfc);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMediumAttachment,0xe58eb3eb,0x8627,0x428b,0xbd,0xf8,0x34,0x48,0x7c,0x84,0x8d,0xe5);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMedium,0x1d578f43,0x5ef1,0x4415,0xb5,0x56,0x75,0x92,0xd3,0xcc,0xdc,0x8f);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMediumFormat,0x89f52554,0xd469,0x4799,0x9f,0xad,0x17,0x05,0xe8,0x6a,0x08,0xb1);
+
+
+MIDL_DEFINE_GUID(IID, IID_IKeyboard,0x2d1a531b,0x4c6e,0x49cc,0x8a,0xf6,0x5c,0x85,0x7b,0x78,0xb5,0xd7);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMouse,0x7c0f2eae,0xf92d,0x498c,0xb8,0x02,0xe1,0xa3,0x76,0x37,0x74,0xdc);
+
+
+MIDL_DEFINE_GUID(IID, IID_IFramebuffer,0xb7ed347a,0x5765,0x40a0,0xae,0x1c,0xf5,0x43,0xeb,0x4d,0xde,0xaf);
+
+
+MIDL_DEFINE_GUID(IID, IID_IFramebufferOverlay,0x0bcc1c7e,0xe415,0x47d2,0xbf,0xdb,0xe4,0xc7,0x05,0xfb,0x0f,0x47);
+
+
+MIDL_DEFINE_GUID(IID, IID_IDisplay,0x1fa79e39,0x0cc9,0x4ab3,0x9d,0xf3,0xed,0x3e,0x96,0xb4,0x24,0x96);
+
+
+MIDL_DEFINE_GUID(IID, IID_INetworkAdapter,0x5bdb9df8,0xa5e1,0x4322,0xa1,0x39,0xb7,0xa4,0xa7,0x34,0xc7,0x90);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISerialPort,0x937f6970,0x5103,0x4745,0xb7,0x8e,0xd2,0x8d,0xcf,0x14,0x79,0xa8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IParallelPort,0x0c925f06,0xdd10,0x4b77,0x8d,0xe8,0x29,0x4d,0x73,0x8c,0x32,0x14);
+
+
+MIDL_DEFINE_GUID(IID, IID_IMachineDebugger,0xb0b2a2dd,0x0627,0x4502,0x91,0xc2,0xdd,0xc5,0xe7,0x76,0x09,0xe0);
+
+
+MIDL_DEFINE_GUID(IID, IID_IUSBController,0x6fdcccc5,0xabd3,0x4fec,0x93,0x87,0x2a,0xd3,0x91,0x4f,0xc4,0xa8);
+
+
+MIDL_DEFINE_GUID(IID, IID_IUSBDevice,0xf8967b0b,0x4483,0x400f,0x92,0xb5,0x8b,0x67,0x5d,0x98,0xa8,0x5b);
+
+
+MIDL_DEFINE_GUID(IID, IID_IUSBDeviceFilter,0xd6831fb4,0x1a94,0x4c2c,0x96,0xef,0x8d,0x0d,0x61,0x92,0x06,0x6d);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHostUSBDevice,0x173b4b44,0xd268,0x4334,0xa0,0x0d,0xb6,0x52,0x1c,0x9a,0x74,0x0a);
+
+
+MIDL_DEFINE_GUID(IID, IID_IHostUSBDeviceFilter,0x4cc70246,0xd74a,0x400f,0x82,0x22,0x39,0x00,0x48,0x9c,0x03,0x74);
+
+
+MIDL_DEFINE_GUID(IID, IID_IAudioAdapter,0x921873db,0x5f3f,0x4b69,0x91,0xf9,0x7b,0xe9,0xe5,0x35,0xa2,0xcb);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVRDPServer,0x7aeeb530,0x0b08,0x41fe,0x83,0x5d,0x9b,0xe9,0xec,0x1d,0xbe,0x5c);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISharedFolder,0x64637bb2,0x9e17,0x471c,0xb8,0xf3,0xf8,0x96,0x8d,0xd9,0x88,0x4e);
+
+
+MIDL_DEFINE_GUID(IID, IID_IInternalSessionControl,0xab161f72,0xe4b3,0x44e6,0xa9,0x19,0x22,0x56,0x47,0x4b,0xda,0x66);
+
+
+MIDL_DEFINE_GUID(IID, IID_ISession,0x12F4DCDB,0x12B2,0x4EC1,0xB7,0xCD,0xDD,0xD9,0xF6,0xC5,0xBF,0x4D);
+
+
+MIDL_DEFINE_GUID(IID, IID_IStorageController,0xfd93adc0,0xbbaa,0x4256,0x9e,0x6e,0x00,0xe2,0x9f,0x91,0x51,0xc9);
+
+
+MIDL_DEFINE_GUID(IID, IID_IPerformanceMetric,0x2a1a60ae,0x9345,0x4019,0xad,0x53,0xd3,0x4b,0xa4,0x1c,0xbf,0xe9);
+
+
+MIDL_DEFINE_GUID(IID, IID_IPerformanceCollector,0xe22e1acb,0xac4a,0x43bb,0xa3,0x1c,0x17,0x32,0x16,0x59,0xb0,0xc6);
+
+
+MIDL_DEFINE_GUID(IID, IID_INATEngine,0x4b286616,0xeb03,0x11de,0xb0,0xfb,0x17,0x01,0xec,0xa4,0x22,0x46);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_VirtualBox,0xB1A7A4F2,0x47B9,0x4A1E,0x82,0xB2,0x07,0xCC,0xD5,0x32,0x3C,0x3F);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_Session,0x3C02F46D,0xC9D2,0x4F11,0xA3,0x84,0x53,0xF0,0xCF,0x91,0x72,0x14);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_CallbackWrapper,0x49EE8561,0x5563,0x4715,0xB1,0x8C,0xA4,0xB1,0xA4,0x90,0xDA,0xFE);
+
+#undef MIDL_DEFINE_GUID
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif /* defined(_M_IA64) || defined(_M_AMD64)*/
+
diff --git a/samples/wrapper/regexp_report.c b/samples/wrapper/regexp_report.c
index 03d12dd..bc93b86 100644
--- a/samples/wrapper/regexp_report.c
+++ b/samples/wrapper/regexp_report.c
@@ -35,7 +35,7 @@ subject to the following restrictions:
void re_report(const char* error)
{
- // trace errors
+ // trace errors
fprintf(stderr, "REGEXP ERROR: %s\n", error);
}
diff --git a/sched/Makefile.am b/sched/Makefile.am
index 0142a32..c023eb2 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -12,6 +12,7 @@ libsched_sources = \
credit.cpp \
sched_shmem.cpp \
sched_util.cpp \
+ sched_util_basic.cpp \
sched_config.cpp \
sched_limit.cpp \
sched_msgs.cpp \
@@ -266,8 +267,8 @@ trickle_echo_LDADD = $(SERVERLIBS)
update_stats_SOURCES = update_stats.cpp
update_stats_LDADD = $(SERVERLIBS)
-file_upload_handler_SOURCES = file_upload_handler.cpp
-file_upload_handler_LDADD = $(SERVERLIBS)
+file_upload_handler_SOURCES = file_upload_handler.cpp sched_msgs.cpp sched_config.cpp sched_util_basic.cpp sched_limit.cpp
+file_upload_handler_LDADD = $(FUHLIBS)
make_work_SOURCES = make_work.cpp
make_work_LDADD = $(SERVERLIBS)
diff --git a/sched/sched_util.cpp b/sched/sched_util.cpp
index 309b21b..38dc8e0 100644
--- a/sched/sched_util.cpp
+++ b/sched/sched_util.cpp
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// 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
@@ -15,205 +15,11 @@
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
-// Utility functions for server software (not just scheduler)
-
#include "config.h"
-#include <cstdlib>
-#include <csignal>
-#include <cerrno>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
-#include "error_numbers.h"
-#include "filesys.h"
-#include "md5_file.h"
-#include "util.h"
-#include "sched_config.h"
-#include "sched_msgs.h"
+#include "boinc_db.h"
#include "sched_util.h"
-#ifdef _USING_FCGI_
-#include "boinc_fcgi.h"
-#endif
-
-const char* STOP_DAEMONS_FILENAME = "stop_daemons";
- // NOTE: this must be same as in the "start" script
-const char* STOP_SCHED_FILENAME = "stop_sched";
- // NOTE: this must be same as in the "start" script
-const int STOP_SIGNAL = SIGHUP;
- // NOTE: this must be same as in the "start" script
-
-void write_pid_file(const char* filename) {
-#ifndef _USING_FCGI_
- FILE* fpid = fopen(filename, "w");
-#else
- FCGI_FILE* fpid = FCGI::fopen(filename,"w");
-#endif
-
- if (!fpid) {
- log_messages.printf(MSG_CRITICAL, "Couldn't write pid file\n");
- return;
- }
- fprintf(fpid, "%d\n", (int)getpid());
- fclose(fpid);
-}
-
-// caught_sig_int will be set to true if STOP_SIGNAL (normally SIGHUP)
-// is caught.
-bool caught_stop_signal = false;
-static void stop_signal_handler(int) {
- fprintf(stderr, "GOT STOP SIGNAL\n");
- caught_stop_signal = true;
-}
-
-void install_stop_signal_handler() {
- signal(STOP_SIGNAL, stop_signal_handler);
- // handler is now default again so hitting ^C again will kill the program.
-}
-
-void check_stop_daemons() {
- if (caught_stop_signal) {
- log_messages.printf(MSG_NORMAL, "Quitting due to SIGHUP\n");
- exit(0);
- }
- const char *stop_file = config.project_path(STOP_DAEMONS_FILENAME);
- if (boinc_file_exists(stop_file)) {
- log_messages.printf(MSG_NORMAL,
- "Quitting because trigger file '%s' is present\n",
- stop_file
- );
- exit(0);
- }
-}
-
-// sleep for n seconds, but check every second for trigger file
-//
-void daemon_sleep(int nsecs) {
- for (int i=0; i<nsecs; i++) {
- check_stop_daemons();
- sleep(1);
- }
-}
-
-bool check_stop_sched() {
- return boinc_file_exists(config.project_path(STOP_SCHED_FILENAME));
-}
-
-// try to open a file.
-// On failure:
-// return ERR_FOPEN if the dir is there but not file
-// (this is generally a nonrecoverable failure)
-// return ERR_OPENDIR if dir is not there.
-// (this is generally a recoverable error,
-// like NFS mount failure, that may go away later)
-//
-#ifndef _USING_FCGI_
-int try_fopen(const char* path, FILE*& f, const char* mode) {
-#else
-int try_fopen(const char* path, FCGI_FILE*& f, const char *mode) {
-#endif
- const char* p;
- DIR* d;
- char dirpath[MAXPATHLEN];
-
-#ifndef _USING_FCGI_
- f = fopen(path, mode);
-#else
- f = FCGI::fopen(path, mode);
-#endif
-
- if (!f) {
- memset(dirpath, '\0', sizeof(dirpath));
- p = strrchr(path, '/');
- if (p) {
- strncpy(dirpath, path, (int)(p-path));
- } else {
- strcpy(dirpath, ".");
- }
- if ((d = opendir(dirpath)) == NULL) {
- return ERR_OPENDIR;
- } else {
- closedir(d);
- return ERR_FOPEN;
- }
- }
- return 0;
-}
-
-void get_log_path(char* p, const char* filename) {
- char host[256];
- const char *dir;
-
- gethostname(host, 256);
- char* q = strchr(host, '.');
- if (q) *q=0;
- dir = config.project_path("log_%s", host);
- sprintf(p, "%s/%s", dir, filename);
- mode_t old_mask = umask(0);
- mkdir(dir, 01770);
- // make log_x directory sticky and group-rwx
- // so that whatever apache puts there will be owned by us
- umask(old_mask);
-}
-
-static void filename_hash(const char* filename, int fanout, char* dir) {
- std::string s = md5_string((const unsigned char*)filename, strlen(filename));
- int x = strtol(s.substr(1, 7).c_str(), 0, 16);
- sprintf(dir, "%x", x % fanout);
-}
-
-// given a filename, compute its path in a directory hierarchy
-// If create is true, create the directory if needed
-//
-int dir_hier_path(
- const char* filename, const char* root, int fanout,
- char* path, bool create
-) {
- char dir[256], dirpath[MAXPATHLEN];
- int retval;
-
- if (fanout==0) {
- sprintf(path, "%s/%s", root, filename);
- return 0;
- }
-
- filename_hash(filename, fanout, dir);
-
- sprintf(dirpath, "%s/%s", root, dir);
- if (create) {
- retval = boinc_mkdir(dirpath);
- if (retval && (errno != EEXIST)) {
- fprintf(stderr, "boinc_mkdir(%s): %s: errno %d\n",
- dirpath, boincerror(retval), errno
- );
- return ERR_MKDIR;
- }
- }
- sprintf(path, "%s/%s", dirpath, filename);
- return 0;
-}
-
-// same, but the output is a URL (used by tools/backend_lib.C)
-//
-int dir_hier_url(
- const char* filename, const char* root, int fanout,
- char* result
-) {
- char dir[256];
-
- if (fanout==0) {
- sprintf(result, "%s/%s", root, filename);
- return 0;
- }
-
- filename_hash(filename, fanout, dir);
- sprintf(result, "%s/%s/%s", root, dir, filename);
- return 0;
-}
-
void compute_avg_turnaround(HOST& host, double turnaround) {
double new_avg;
if (host.avg_turnaround == 0) {
@@ -243,26 +49,6 @@ int PERF_INFO::get_from_db() {
return 0;
}
-// Request lock on the given file with given fd. Returns:
-// 0 if we get lock
-// PID (>0) if another process has lock
-// -1 if error
-//
-int mylockf(int fd) {
- struct flock fl;
- fl.l_type=F_WRLCK;
- fl.l_whence=SEEK_SET;
- fl.l_start=0;
- fl.l_len=0;
- if (-1 != fcntl(fd, F_SETLK, &fl)) return 0;
-
- // if lock failed, find out why
- errno=0;
- fcntl(fd, F_GETLK, &fl);
- if (fl.l_pid>0) return fl.l_pid;
- return -1;
-}
-
int count_results(char* query, int& n) {
DB_RESULT result;
return result.count(n, query);
@@ -287,35 +73,6 @@ int count_unsent_results(int& n, int appid, int size_class) {
return count_results(query, n);
}
-bool is_arg(const char* x, const char* y) {
- char buf[256];
- strcpy(buf, "--");
- strcat(buf, y);
- if (!strcmp(buf, x)) return true;
- if (!strcmp(buf+1, x)) return true;
- return false;
-}
-
-// the following is used, among other things,
-// to enforce limits on in-progress jobs
-// for GPUs and CPUs (see handle_request.cpp)
-//
-int plan_class_to_proc_type(const char* plan_class) {
- if (strstr(plan_class, "cuda")) {
- return PROC_TYPE_NVIDIA_GPU;
- }
- if (strstr(plan_class, "nvidia")) {
- return PROC_TYPE_NVIDIA_GPU;
- }
- if (strstr(plan_class, "ati")) {
- return PROC_TYPE_AMD_GPU;
- }
- if (strstr(plan_class, "intel_gpu")) {
- return PROC_TYPE_INTEL_GPU;
- }
- return PROC_TYPE_CPU;
-}
-
// Arrange that further results for this workunit
// will be sent only to hosts with the given user ID.
// This could be used, for example, so that late workunits
@@ -367,43 +124,3 @@ int restrict_wu_to_user(WORKUNIT& _wu, int userid) {
int min_transition_time(double& x) {
return boinc_db.get_double("select min(transition_time) from workunit", x);
}
-
-#ifdef GCL_SIMULATOR
-
-void simulator_signal_handler(int signum) {
- FILE *fsim;
- char currenttime[64];
- fsim = fopen(config.project_path("simulator/sim_time.txt"),"r");
- if(fsim){
- fscanf(fsim,"%s", currenttime);
- simtime = atof(currenttime);
- fclose(fsim);
- }
- log_messages.printf(MSG_NORMAL,
- "Invoked by the simulator at time %.0f... \n", simtime
- );
-}
-
-int itime() {
- return (int) simtime;
-}
-
-void continue_simulation(const char *daemonname){
- char daemonfilelok[64];
- char daemonfile[64];
- sprintf(daemonfile, strcat((char*)config.project_path("simulator/"),"sim_%s.txt"),daemonname);
- sprintf(daemonfilelok, strcat((char*)config.project_path("simulator/"),"sim_%s.lok"),daemonname);
- FILE *fsimlok = fopen(daemonfilelok, "w");
- if (fsimlok){
- fclose(fsimlok);
- FILE *fsim = fopen(daemonfile, "w");
- if (fsim) {
- fclose(fsim);
- }
- }
- remove(daemonfilelok);
-}
-
-#endif
-
-const char *BOINC_RCSID_affa6ef1e4 = "$Id$";
diff --git a/sched/sched_util.h b/sched/sched_util.h
index 28b4f0d..e47f934 100644
--- a/sched/sched_util.h
+++ b/sched/sched_util.h
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// 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
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
-// general back-end utility functions (not scheduler-specific)
+// server utility functions that refer to the DB
#ifndef SCHED_UTIL_H
#define SCHED_UTIL_H
@@ -23,36 +23,7 @@
#include "boinc_db_types.h"
#include "util.h"
-// "average credit" uses an exponential decay so that recent
-// activity is weighted more heavily.
-// CREDIT_HALF_LIFE is the "half-life" period:
-// the average decreases by 1/2 if idle for this period.
-//
-#define SECONDS_IN_DAY (3600*24)
-#define CREDIT_HALF_LIFE (SECONDS_IN_DAY*7)
-
-extern void write_pid_file(const char* filename);
-extern void set_debug_level(int);
-extern void check_stop_daemons();
-extern void daemon_sleep(int);
-extern bool check_stop_sched();
-extern void install_stop_signal_handler();
-extern int try_fopen(const char* path, FILE*& f, const char* mode);
-extern void get_log_path(char*, const char*);
-
-// convert filename to path in a hierarchical directory system
-//
-extern int dir_hier_path(
- const char* filename, const char* root, int fanout,
- char* result, bool create=false
-);
-
-// convert filename to URL in a hierarchical directory system
-//
-extern int dir_hier_url(
- const char* filename, const char* root, int fanout,
- char* result
-);
+#include "sched_util_basic.h"
extern void compute_avg_turnaround(HOST& host, double turnaround);
@@ -65,15 +36,6 @@ struct PERF_INFO {
int get_from_db();
};
-// returns zero if we get lock on file with file descriptor fd.
-// returns < 0 if error
-// returns PID > 0 if another process has lock
-//
-extern int mylockf(int fd);
-
-extern int count_workunits(int&, const char* query);
-extern int count_unsent_results(int&, int appid, int size_class=-1);
-
// Return a value for host_app_version.app_version_id.
// if the app version is anonymous platform,
// make a "pseudo ID" that combines the app ID and the resource type
@@ -86,19 +48,9 @@ inline int generalized_app_version_id(int avid, int appid) {
return avid;
}
-// return true if x is -y or --y (for argv processing)
-//
-extern bool is_arg(const char*, const char*);
-
-extern int plan_class_to_proc_type(const char* plan_class);
-
+extern int count_workunits(int&, const char* query);
+extern int count_unsent_results(int&, int appid, int size_class=-1);
extern int restrict_wu_to_user(WORKUNIT& wu, int userid);
-
extern int min_transition_time(double&);
-#ifdef GCL_SIMULATOR
-extern void simulator_signal_handler(int signum);
-extern void continue_simulation(const char *daemonname);
-#endif
-
#endif
diff --git a/sched/sched_util.cpp b/sched/sched_util_basic.cpp
similarity index 73%
copy from sched/sched_util.cpp
copy to sched/sched_util_basic.cpp
index 309b21b..9b20b57 100644
--- a/sched/sched_util.cpp
+++ b/sched/sched_util_basic.cpp
@@ -214,35 +214,6 @@ int dir_hier_url(
return 0;
}
-void compute_avg_turnaround(HOST& host, double turnaround) {
- double new_avg;
- if (host.avg_turnaround == 0) {
- new_avg = turnaround;
- } else {
- new_avg = .7*host.avg_turnaround + .3*turnaround;
- }
- host.avg_turnaround = new_avg;
-}
-
-int PERF_INFO::get_from_db() {
- int retval, n;
- DB_HOST host;
-
- host_fpops_mean = 2.2e9;
- host_fpops_stddev = .7e9;
- host_fpops_50_percentile = 3.3e9;
- host_fpops_95_percentile = 3.3e9;
-
- retval = host.count(n);
- if (retval) return retval;
- if (n < 10) return 0;
- retval = host.fpops_mean(host_fpops_mean);
- retval = host.fpops_stddev(host_fpops_stddev);
- retval = host.fpops_percentile(50, host_fpops_50_percentile);
- retval = host.fpops_percentile(95, host_fpops_95_percentile);
- return 0;
-}
-
// Request lock on the given file with given fd. Returns:
// 0 if we get lock
// PID (>0) if another process has lock
@@ -263,30 +234,6 @@ int mylockf(int fd) {
return -1;
}
-int count_results(char* query, int& n) {
- DB_RESULT result;
- return result.count(n, query);
-}
-
-int count_workunits(int& n, const char* query) {
- DB_WORKUNIT workunit;
- return workunit.count(n, query);
-}
-
-int count_unsent_results(int& n, int appid, int size_class) {
- char query[1024], buf[256];
- sprintf(query, "where server_state<=%d", RESULT_SERVER_STATE_UNSENT);
- if (appid) {
- sprintf(buf, " and appid=%d", appid);
- strcat(query, buf);
- }
- if (size_class >= 0) {
- sprintf(buf, " and size_class=%d", size_class);
- strcat(query, buf);
- }
- return count_results(query, n);
-}
-
bool is_arg(const char* x, const char* y) {
char buf[256];
strcpy(buf, "--");
@@ -316,58 +263,6 @@ int plan_class_to_proc_type(const char* plan_class) {
return PROC_TYPE_CPU;
}
-// Arrange that further results for this workunit
-// will be sent only to hosts with the given user ID.
-// This could be used, for example, so that late workunits
-// are sent only to cloud or cluster resources
-//
-int restrict_wu_to_user(WORKUNIT& _wu, int userid) {
- DB_RESULT result;
- DB_ASSIGNMENT asg;
- DB_WORKUNIT wu;
- wu = _wu;
- char buf[256];
- int retval;
-
- // mark unsent results as DIDNT_NEED
- //
- sprintf(buf, "where workunitid=%d and server_state=%d",
- wu.id, RESULT_SERVER_STATE_UNSENT
- );
- while (!result.enumerate(buf)) {
- char buf2[256];
- sprintf(buf2, "server_state=%d, outcome=%d",
- RESULT_SERVER_STATE_OVER,
- RESULT_OUTCOME_DIDNT_NEED
- );
- result.update_field(buf2);
- }
-
- // mark the WU as TRANSITION_NO_NEW_RESULTS
- //
- sprintf(buf, "transitioner_flags=%d", TRANSITION_NO_NEW_RESULTS);
- retval = wu.update_field(buf);
- if (retval) return retval;
-
- // create an assignment record
- //
- asg.clear();
- asg.create_time = time(0);
- asg.target_id = userid;
- asg.target_type = ASSIGN_USER;
- asg.multi = 0;
- asg.workunitid = wu.id;
- retval = asg.insert();
- return retval;
-}
-
-// return the min transition time.
-// This lets you check if the transitioner is backed up.
-//
-int min_transition_time(double& x) {
- return boinc_db.get_double("select min(transition_time) from workunit", x);
-}
-
#ifdef GCL_SIMULATOR
void simulator_signal_handler(int signum) {
diff --git a/sched/sched_util.h b/sched/sched_util_basic.h
similarity index 70%
copy from sched/sched_util.h
copy to sched/sched_util_basic.h
index 28b4f0d..d71f27d 100644
--- a/sched/sched_util.h
+++ b/sched/sched_util_basic.h
@@ -1,6 +1,6 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// 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
@@ -16,11 +16,11 @@
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
// general back-end utility functions (not scheduler-specific)
+// No database-related stuff here; put that in sched_util.h
-#ifndef SCHED_UTIL_H
-#define SCHED_UTIL_H
+#ifndef SCHED_UTIL_BASIC_H
+#define SCHED_UTIL_BASIC_H
-#include "boinc_db_types.h"
#include "util.h"
// "average credit" uses an exponential decay so that recent
@@ -54,48 +54,18 @@ extern int dir_hier_url(
char* result
);
-extern void compute_avg_turnaround(HOST& host, double turnaround);
-
-struct PERF_INFO {
- double host_fpops_mean;
- double host_fpops_stddev;
- double host_fpops_50_percentile;
- double host_fpops_95_percentile;
-
- int get_from_db();
-};
-
// returns zero if we get lock on file with file descriptor fd.
// returns < 0 if error
// returns PID > 0 if another process has lock
//
extern int mylockf(int fd);
-extern int count_workunits(int&, const char* query);
-extern int count_unsent_results(int&, int appid, int size_class=-1);
-
-// Return a value for host_app_version.app_version_id.
-// if the app version is anonymous platform,
-// make a "pseudo ID" that combines the app ID and the resource type
-// else just used the app_version ID
-//
-inline int generalized_app_version_id(int avid, int appid) {
- if (avid < 0) {
- return appid*1000000 - avid;
- }
- return avid;
-}
-
// return true if x is -y or --y (for argv processing)
//
extern bool is_arg(const char*, const char*);
extern int plan_class_to_proc_type(const char* plan_class);
-extern int restrict_wu_to_user(WORKUNIT& wu, int userid);
-
-extern int min_transition_time(double&);
-
#ifdef GCL_SIMULATOR
extern void simulator_signal_handler(int signum);
extern void continue_simulation(const char *daemonname);
diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp
index f095c3d..2d7d4a0 100644
--- a/sched/sched_version.cpp
+++ b/sched/sched_version.cpp
@@ -327,7 +327,7 @@ void estimate_flops_anon_platform() {
// <estimate_flops_from_hav_pfc> is not set use elapsed time,
// otherwise use pfc_avg.
// 2) if we have statistics for app version elapsed time, use those.
-// 3) else use a conservative estimate (p_fpops*(cpus+gpus))
+// 3) else use a conservative estimate (p_fpops*(cpu usage + gpu usage))
// This prevents jobs from aborting with "time limit exceeded"
// even if the estimate supplied by the plan class function is way off
//
diff --git a/version.log b/version.log
index b3b293d..fac714a 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-6.11.1
+6.11.1
--
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