Resolves merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/devices/temp_freebsd.go b/devices/temp_freebsd.go
index 3e659be..e87dcb3 100644
--- a/devices/temp_freebsd.go
+++ b/devices/temp_freebsd.go
@@ -13,7 +13,7 @@ import (
 
 func init() {
 	if len(devs()) == 0 {
-		log.Println("temp: no thermal sensors found")
+		log.Println(tr.Value("error.nodevfound", "thermal sensors"))
 		return
 	}
 	RegisterTemp(update)
@@ -58,13 +58,13 @@ func devs() []string {
 	// Check that thermal sensors are really available; they aren't in VMs
 	bs, err := exec.Command("sysctl", "-a").Output()
 	if err != nil {
-		log.Printf("temp: failure to get system information %s", err.Error())
+		log.Printf(tr.Value("error.fatalfetch", "temp", err.Error()))
 		return []string{}
 	}
 	for k, _ := range sensorOIDS {
 		idx := strings.Index(string(bs), k)
 		if idx < 0 {
-			log.Printf("temp: no device %s found", k)
+			log.Printf(tr.Value("error.nodevfound", k))
 		} else {
 			rv = append(rv, k)
 		}