diff --git a/build.sbt b/build.sbt index 9582596..e8806b5 100644 --- a/build.sbt +++ b/build.sbt @@ -11,9 +11,6 @@ scalaVersion in ThisBuild := "2.12.2" scalacOptions in ThisBuild ++= Seq("-unchecked", "-deprecation", "-feature") //scalaJSUseMainModuleInitializer := true - -val akkaVersion = "2.4.19" -val akkHttpVersion = "10.0.9" val http4sVersion = "0.17.0" lazy val root = project.in(file(".")). diff --git a/js/src/main/scala/at/happywetter/boinc/web/pages/boinc/BoincGlobalPrefsLayout.scala b/js/src/main/scala/at/happywetter/boinc/web/pages/boinc/BoincGlobalPrefsLayout.scala index 2d8f596..430f6eb 100644 --- a/js/src/main/scala/at/happywetter/boinc/web/pages/boinc/BoincGlobalPrefsLayout.scala +++ b/js/src/main/scala/at/happywetter/boinc/web/pages/boinc/BoincGlobalPrefsLayout.scala @@ -60,7 +60,7 @@ class BoincGlobalPrefsLayout(params: js.Dictionary[String]) extends BoincPageLay div( id := "global_prefs", Style.root_pane, h2(BoincClientLayout.Style.pageHeader, "global_prefs".localize), - h4(BoincClientLayout.Style.h4_without_line, "global_prefs_computing"), + h4(BoincClientLayout.Style.h4_without_line, "global_prefs_computing".localize), label("global_prefs_cpu_cores".localize, `for` := "NcpuPct"), input(Style.input, id := "NcpuPct", value := f.maxNCpuPct), br(), @@ -71,9 +71,9 @@ class BoincGlobalPrefsLayout(params: js.Dictionary[String]) extends BoincPageLay input(Style.input, value := f.cpuSchedulingPeriodMinutes, id := "shedPeriod"), h4(Style.h4, "global_prefs_pause".localize), - label(input(`type` := "checkbox", checked := (if(f.runOnBatteries) "true" else "false")), "global_prefs_on_batteries".localize), br(), - label(input(`type` := "checkbox", checked := (if(f.runIfUserActive) "true" else "false")), "global_prefs_cpu_active".localize), br(), - label(input(`type` := "checkbox", checked := (if(f.runGPUIfUserActive) "true" else "false")), "global_prefs_gpu_active".localize), br(), + label(input(`type` := "checkbox", checked := (if(!f.runOnBatteries) "true" else "false")), "global_prefs_on_batteries".localize), br(), + label(input(`type` := "checkbox", checked := (if(!f.runIfUserActive) "true" else "false")), "global_prefs_cpu_active".localize), br(), + label(input(`type` := "checkbox", checked := (if(!f.runGPUIfUserActive) "true" else "false")), "global_prefs_gpu_active".localize), br(), h4(Style.h4, "global_prefs_save_time".localize), label("global_prefs_workbuffer_days".localize, `for` := "workBufferDays"), diff --git a/jvm/src/main/resources/resources/lang/de.conf b/jvm/src/main/resources/resources/lang/de.conf index 2a85eef..dbbf3c8 100644 --- a/jvm/src/main/resources/resources/lang/de.conf +++ b/jvm/src/main/resources/resources/lang/de.conf @@ -170,4 +170,32 @@ wu_dialog_used_disk: "Größe des Arbeitspakets" wu_dialog_slot: "Slot:" wu_dialog_pid: "Prozess ID:" wu_dialog_version: "Version" -wu_dialog_plan_class: "Planungsklasse" \ No newline at end of file +wu_dialog_plan_class: "Planungsklasse" + +global_prefs: "Einstellungen" +global_prefs_computing: "Berechnungen" +global_prefs_cpu_cores: "Prozent der genuzten CPU Kerne" +global_prefs_cpu_usage: "Prozent der genutzen CPU Zeit" +global_prefs_sheduling_period: "Minuten nach denen die Aufgaben gewechselt werden sollen" +global_prefs_pause: "Wann unterbrochen werden soll" +global_prefs_on_batteries: "Im Akkumodus unterbrechen" +global_prefs_cpu_active: "Während der Benutztung" +global_prefs_gpu_active: "Halte den GPU während der Benutzung an" +global_prefs_save_time: "Arbeitspakete" +global_prefs_workbuffer_days: "Arbeitsbuffer in Tagen" +global_prefs_add_buffer_days: "Zusätzlicher Arbeitsbuffer in Tagen" +global_prefs_disk_interval: "Speicherinterval in Sekunden" +global_prefs_network: "Netzwerk" +global_prefs_max_bytes_down: "Maximaler Download in KByte/s" +global_prefs_max_bytes_up: "Maximaler Upload in KByte/s" +global_prefs_max_bytes: "Maximale Übertragungsmenge" +global_prefs_max_bytes_period: "Anzahl der Tage für das Übertragungslimit" +global_prefs_dont_verify_images: "Prüfe keine Bilddatein" +global_prefs_disk: "Festplatte" +global_prefs_min_disk_free: "Minimaler freier Festplattenspeicher" +global_prefs_max_disk_usage: "Maximale Festplattennutzung in GB" +global_prefs_max_disk_usage_pct: "Maximale Festplattennutzung in Prozent" +global_prefs_memory: "Arbeitsspeicher" +global_prefs_ram_used_busy: "RAM Verbrauch in Prozent wenn benutzt" +global_prefs_ram_used_idle: "RAM Verbrauch in Prozent wenn im Leerlauf" +global_prefs_leave_apps_in_memory: "Lasse Anwendungen im Speicher" \ No newline at end of file diff --git a/jvm/src/main/resources/resources/lang/en.conf b/jvm/src/main/resources/resources/lang/en.conf index a151781..ffae72f 100644 --- a/jvm/src/main/resources/resources/lang/en.conf +++ b/jvm/src/main/resources/resources/lang/en.conf @@ -170,4 +170,32 @@ wu_dialog_used_disk: "Size of Task" wu_dialog_slot: "Slot:" wu_dialog_pid: "Process ID:" wu_dialog_version: "Version" -wu_dialog_plan_class: "Plann Class" \ No newline at end of file +wu_dialog_plan_class: "Plann Class" + +global_prefs: "Settings" +global_prefs_computing: "Computing" +global_prefs_cpu_cores: "Percent of used CPU Cores" +global_prefs_cpu_usage: "Percent of used CPU Time" +global_prefs_sheduling_period: "Minutes after which the Tasks should be switched" +global_prefs_pause: "When to interrupt" +global_prefs_on_batteries: "In battery mode" +global_prefs_cpu_active: "While in use" +global_prefs_gpu_active: "Pause GPU while in use" +global_prefs_save_time: "Workunits" +global_prefs_workbuffer_days: "Working buffer in Days" +global_prefs_add_buffer_days: "Additional working buffer in Days" +global_prefs_disk_interval: "Save interval in seconds" +global_prefs_network: "Network" +global_prefs_max_bytes_down: "Maximum download speed in KByte/s" +global_prefs_max_bytes_up: "Maximaler upload speed in KByte/s" +global_prefs_max_bytes: "Maximum Transfer volume" +global_prefs_max_bytes_period: "Number of Days for the Transfer volume" +global_prefs_dont_verify_images: "Don't check Image files" +global_prefs_disk: "Disk" +global_prefs_min_disk_free: "Minimum free Disk space" +global_prefs_max_disk_usage: "Maximum Disk usage in GB" +global_prefs_max_disk_usage_pct: "Maximum Disk usage in percent" +global_prefs_memory: "Memory" +global_prefs_ram_used_busy: "RAM usage in percent while in usage" +global_prefs_ram_used_idle: "RAM usage in percent while in idle" +global_prefs_leave_apps_in_memory: "Leave Tasks in Memory" \ No newline at end of file