Cleanup all platform's proccessor.c, use translatable labels.

Signed-off-by: Burt P <pburt0@gmail.com>

11 files changed, 321 insertions, 250 deletions

diff --git a/modules/devices/alpha/processor.c b/modules/devices/alpha/processor.c
index f55526f7..71e886e7 100644
--- a/modules/devices/alpha/processor.c
+++ b/modules/devices/alpha/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,26 +36,26 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("cpu model", processor->model_name);
-	    get_float("BogoMIPS", processor->bogomips);
-	    get_str("platform string", processor->strmodel);
+            get_str("cpu model", processor->model_name);
+            get_float("BogoMIPS", processor->bogomips);
+            get_str("platform string", processor->strmodel);
 
-	}
-	g_strfreev(tmp);
+        }
+        g_strfreev(tmp);
     }
-    
+
     gchar *tmp = g_strconcat("Alpha ", processor->model_name, NULL);
     g_free(processor->model_name);
     processor->model_name = tmp;
@@ -59,20 +69,17 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
+    Processor *processor = (Processor *)processors->data;
 
-	return g_strdup_printf("[Processor]\n"
-                               "Model=%s\n"
-	                       "Platform String=%s\n"
-	                       "BogoMIPS=%.2f"
-	                       "Byte Order=%s\n",
-			       processor->model_name,
-			       processor->strmodel,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian"
-#else
-                               "Big Endian"
-#endif
-                              );
+    return g_strdup_printf("[%s]\n"
+                        "%s=%s\n"
+                        "%s=%s\n"
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n",     /* byte order */
+                    _("Processor"),
+                    _("Model"), processor->model_name,
+                    _("Platform String"), processor->strmodel,
+                    _("BogoMips"), processor->bogomips,
+                    _("Byte Order"), byte_order_str()
+                    );
 }
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c
index ceb2a252..410c3a71 100644
--- a/modules/devices/arm/processor.c
+++ b/modules/devices/arm/processor.c
@@ -54,6 +54,14 @@ static gint get_cpu_int(const char* item, int cpuid) {
     return ret;
 }
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
 int processor_has_flag(gchar * strflags, gchar * strflag)
 {
     gchar **flags;
@@ -317,12 +325,7 @@ processor_get_detailed_info(Processor *processor)
                    _("Mode"), arm_mode_str[processor->mode],
                    _("Frequency"), processor->cpu_mhz, _("MHz"),
                    _("BogoMips"), processor->bogomips,
-                   _("Byte Order"),
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                   _("Little Endian"),
-#else
-                   _("Big Endian"),
-#endif
+                   _("Byte Order"), byte_order_str(),
                    tmp_topology,
                    tmp_cpufreq,
                    _("ARM"),
diff --git a/modules/devices/ia64/processor.c b/modules/devices/ia64/processor.c
index 55e5e3a8..7a05c51a 100644
--- a/modules/devices/ia64/processor.c
+++ b/modules/devices/ia64/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,29 +36,29 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("vendor", processor->model_name);
-	    get_str("arch", processor->vendor_id);
-	    get_str("family", processor->strmodel);
-	    get_float("BogoMIPS", processor->bogomips);
+            get_str("vendor", processor->model_name);
+            get_str("arch", processor->vendor_id);
+            get_str("family", processor->strmodel);
+            get_float("BogoMIPS", processor->bogomips);
 
-	}
-	g_strfreev(tmp);
+        }
+        g_strfreev(tmp);
     }
 
     processor->cpu_mhz = 0.0f;
-    
+
     fclose(cpuinfo);
 
     return g_slist_append(NULL, processor);
@@ -57,22 +67,19 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
-        
-	return g_strdup_printf("[Processor]\n"
-                               "Model=%s\n"
-	                       "Architecture=%s\n"
-	                       "Family=%sMHz\n"
-			       "BogoMIPS=%s\n"
-	                       "Byte Order=%s\n",
-			       processor->model_name,
-			       processor->vendor_id,
-			       processor->strmodel,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian"
-#else
-                               "Big Endian"
-#endif
+    Processor *processor = (Processor *)processors->data;
+
+    return g_strdup_printf("[%s]\n"
+                        "%s=%s\n"
+                        "%s=%s\n"
+                        "%s=%s %s\n"
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n",     /* byte order */
+                    _("Processor"),
+                    _("Model"), processor->model_name,
+                    _("Architecture"), processor->vendor_id,    /* ?? */
+                    _("Family"), processor->strmodel, _("MHz"), /* MHz?? */
+                    _("BogoMips"), processor->bogomips,
+                    _("Byte Order"), byte_order_str()
                               );
 }
diff --git a/modules/devices/m68k/processor.c b/modules/devices/m68k/processor.c
index d9902428..2137b9a4 100644
--- a/modules/devices/m68k/processor.c
+++ b/modules/devices/m68k/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,32 +36,32 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("CPU", processor->model_name);
-	    get_float("Clocking", processor->cpu_mhz);
-	    get_float("bogomips", processor->bogomips);
+            get_str("CPU", processor->model_name);
+            get_float("Clocking", processor->cpu_mhz);
+            get_float("bogomips", processor->bogomips);
 
-	    get_str("FPU", processor->has_fpu);
-	}
-	g_strfreev(tmp);
+            get_str("FPU", processor->has_fpu); /* not used? */
+        }
+        g_strfreev(tmp);
     }
-    
+
     gchar *tmp;
     tmp = g_strconcat("Motorola ", processor->model_name, NULL);
     g_free(processor->model_name);
     processor->model_name = tmp;
-    
+
     fclose(cpuinfo);
 
     return g_slist_append(NULL, processor);
@@ -60,20 +70,16 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
-        
-	return g_strdup_printf("[Processor]\n"
-	                       "Name=%s\n"
-			       "Frequency=%.2fMHz\n"
-			       "BogoMips=%.2f\n"
-			       "Byte Order=%s\n",
-			       processor->model_name,
-			       processor->cpu_mhz,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian"
-#else
-                               "Big Endian"
-#endif
-                               );
+    Processor *processor = (Processor *)processors->data;
+
+    return g_strdup_printf("[Processor]\n"
+                        "%s=%s\n"
+                        "%s=%.2f %s\n" /* frequency */
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n",     /* byte order */
+                    _("Model"), processor->model_name,
+                    _("Frequency"), processor->cpu_mhz, _("MHz"),
+                    _("BogoMips"), processor->bogomips,
+                    _("Byte Order"), byte_order_str()
+                        );
 }
diff --git a/modules/devices/mips/processor.c b/modules/devices/mips/processor.c
index 86c9b958..4a0498ce 100644
--- a/modules/devices/mips/processor.c
+++ b/modules/devices/mips/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,24 +36,24 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("system type", processor->model_name);
-	    get_str("cpu model", processor->vendor_id);
-	    get_float("cpu MHz", processor->cpu_mhz);
-	    get_float("BogoMIPS", processor->bogomips);
-	}
-	g_strfreev(tmp);
+            get_str("system type", processor->model_name);
+            get_str("cpu model", processor->vendor_id);
+            get_float("cpu MHz", processor->cpu_mhz);
+            get_float("BogoMIPS", processor->bogomips);
+        }
+        g_strfreev(tmp);
     }
 
     fclose(cpuinfo);
@@ -54,22 +64,19 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
-        
-	return g_strdup_printf("[Processor]\n"
-	                       "System Type=%s\n"
-	                       "CPU Model=%s\n"
-                               "Frequency=%.2fMHz\n"
-			       "BogoMIPS=%.2f\n"
-			       "Byte Order=%s\n",
-			       processor->model_name,
-			       processor->vendor_id,
-			       processor->cpu_mhz,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian"
-#else
-                               "Big Endian"
-#endif
-			       );
+    Processor *processor = (Processor *)processors->data;
+
+    return g_strdup_printf("[%s]\n"
+                        "%s=%s\n"
+                        "%s=%s\n"
+                        "%s=%.2f %s\n" /* frequency */
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n",     /* byte order */
+                    _("Processor"),
+                    _("System Type"), processor->model_name,
+                    _("Model"), processor->vendor_id,
+                    _("Frequency"), processor->cpu_mhz _("MHz"),
+                    _("BogoMips"), processor->bogomips,
+                    _("Byte Order"), byte_order_str()
+                   );
 }
diff --git a/modules/devices/parisc/processor.c b/modules/devices/parisc/processor.c
index 83672126..66a75fe5 100644
--- a/modules/devices/parisc/processor.c
+++ b/modules/devices/parisc/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processors_scan(void)
 {
@@ -26,30 +36,30 @@ processors_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("cpu family", processor->model_name);
-	    get_str("cpu", processor->vendor_id);
-	    get_float("cpu MHz", processor->cpu_mhz);
-	    get_float("bogomips", processor->bogomips);
-	    
-	    get_str("model name", processor->strmodel);
-	    
-	    get_int("I-cache", processor->has_fpu);
-	    get_int("D-cache", processor->flags);
+            get_str("cpu family", processor->model_name);
+            get_str("cpu", processor->vendor_id);
+            get_float("cpu MHz", processor->cpu_mhz);
+            get_float("bogomips", processor->bogomips);
 
-	}
-	g_strfreev(tmp);
+            get_str("model name", processor->strmodel);
+
+            get_int("I-cache", processor->has_fpu);
+            get_int("D-cache", processor->flags);
+
+        }
+        g_strfreev(tmp);
     }
 
     fclose(cpuinfo);
@@ -61,27 +71,25 @@ gchar *
 processor_get_info(GSList *processors)
 {
         Processor *processor = (Processor *)processors->data;
-        
-	return  g_strdup_printf("[Processor]\n"
-	                       "CPU Family=%s\n"
-	                       "CPU=%s\n"
-                               "Frequency=%.2fMHz\n"
-			       "Bogomips=%.2f\n"
-			       "Model Name=%s\n"
-			       "Byte Order=%s\n"
-			       "[Cache]\n"
-			       "I-Cache=%s\n"
-			       "D-Cache=%s\n",
-			       processor->model_name,
-			       processor->vendor_id,
-			       processor->cpu_mhz,
-			       processor->bogomips,
-			       processor->strmodel,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian",
-#else
-                               "Big Endian",
-#endif
-			       processor->has_fpu,
-			       processor->flags);
+
+    return  g_strdup_printf("[%s]\n"
+                        "CPU Family=%s\n"
+                        "CPU=%s\n"
+                        "%s=%s\n"      /* model name */
+                        "%s=%.2f %s\n" /* frequency */
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n"      /* byte order */
+                        "[%s]\n"
+                        "I-Cache=%s\n"
+                        "D-Cache=%s\n",
+                   _("Processor"),
+                   processor->model_name,
+                   processor->vendor_id,
+                   _("Model Name"), processor->strmodel,
+                   _("Frequency"), processor->cpu_mhz _("MHz"),
+                   _("BogoMips"), processor->bogomips,
+                   _("Byte Order"), byte_order_str(),
+                   _("Cache"),
+                   processor->has_fpu,
+                   processor->flags);
 }
diff --git a/modules/devices/ppc/processor.c b/modules/devices/ppc/processor.c
index ed34855b..10a53a65 100644
--- a/modules/devices/ppc/processor.c
+++ b/modules/devices/ppc/processor.c
@@ -39,6 +39,14 @@ static gint get_cpu_int(const char* item, int cpuid) {
     return ret;
 }
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
 #define PROC_CPUINFO "/proc/cpuinfo"
 
 GSList *
@@ -219,12 +227,7 @@ processor_get_detailed_info(Processor *processor)
                    _("Revision"), processor->revision,
                    _("Frequency"), processor->cpu_mhz, _("MHz"),
                    _("BogoMips"), processor->bogomips,
-                   _("Byte Order"),
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                   _("Little Endian"),
-#else
-                   _("Big Endian"),
-#endif
+                   _("Byte Order"), byte_order_str(),
                    tmp_topology,
                    tmp_cpufreq,
                     "");
diff --git a/modules/devices/s390/processor.c b/modules/devices/s390/processor.c
index 99f1c8bd..b47fa67b 100644
--- a/modules/devices/s390/processor.c
+++ b/modules/devices/s390/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,28 +36,28 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("vendor_id", processor->vendor_id);
-	    get_float("# processors", processor->cache_size);
-	    get_int("bogomips per cpu", processor->bogomips);
+            get_str("vendor_id", processor->vendor_id);
+            get_float("# processors", processor->cache_size);
+            get_int("bogomips per cpu", processor->bogomips);
 
-	}
-	g_strfreev(tmp);
+        }
+        g_strfreev(tmp);
     }
 
     processor->cpu_mhz = 0.0f;
-    
+
     processor->model_name = g_strconcat("S390 ", processor->vendor_id, NULL);
     g_free(processor->vendor_id);
 
@@ -59,20 +69,17 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
-        
-	return g_strdup_printf("[Processor]\n"
-                               "Model=%s\n"
-	                       "Processors=%d\n"
-	                       "BogoMips per CPU=%.2f"
-	                       "Byte Order=%s\n",
-			       processor->model_name,
-			       processor->cache_size,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian"
-#else
-                               "Big Endian"
-#endif
-                              );
+    Processor *processor = (Processor *)processors->data;
+
+    return g_strdup_printf("[%s]\n"
+                        "%s=%s\n"      /* model */
+                        "%s=%d\n"      /* proc count */
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n",     /* byte order */
+                        _("Processor"),
+                        _("Model"), processor->model_name,
+                        _("Processors"), processor->cache_size,
+                        _("BogoMips"), processor->bogomips,
+                        _("Byte Order"), byte_order_str()
+                        );
 }
diff --git a/modules/devices/sh/processor.c b/modules/devices/sh/processor.c
index cbd9a60a..3f91efbd 100644
--- a/modules/devices/sh/processor.c
+++ b/modules/devices/sh/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,24 +36,24 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("machine", processor->model_name);
-	    get_str("cpu type", processor->vendor_id);
-	    get_float("bogomips", processor->bogomips);
-	    processor->cpu_mhz = processor->bogomips;
-	}
-	g_strfreev(tmp);
+            get_str("machine", processor->model_name);
+            get_str("cpu type", processor->vendor_id);
+            get_float("bogomips", processor->bogomips);
+            processor->cpu_mhz = processor->bogomips;
+        }
+        g_strfreev(tmp);
     }
 
     fclose(cpuinfo);
@@ -54,22 +64,19 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
-        
-	return g_strdup_printf("[Processor]\n"
-	                       "System Type=%s\n"
-	                       "CPU Model=%s\n"
-                               "Frequency=%.2fMHz\n"
-			       "BogoMIPS=%.2f\n"
-			       "Byte Order=%s\n",
-			       processor->model_name,
-			       processor->vendor_id,
-			       processor->cpu_mhz,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian"
-#else
-                               "Big Endian"
-#endif
-			       );
+    Processor *processor = (Processor *)processors->data;
+
+    return g_strdup_printf("[%s]\n"
+                        "%s=%s\n"
+                        "%s=%s\n"
+                        "%s=%.2f %s\n" /* frequency */
+                        "%s=%.2f\n"    /* bogomips */
+                        "%s=%s\n",     /* byte order */
+                    _("Processor"),
+                    _("System Type"), processor->model_name,
+                    _("Model"), processor->vendor_id,
+                    _("Frequency"), processor->cpu_mhz, _("MHz"),
+                    _("BogoMips"), processor->bogomips,
+                    _("Byte Order"), byte_order_str()
+                   );
 }
diff --git a/modules/devices/sparc/processor.c b/modules/devices/sparc/processor.c
index 594117a7..0557c0b6 100644
--- a/modules/devices/sparc/processor.c
+++ b/modules/devices/sparc/processor.c
@@ -19,6 +19,16 @@
 #include "hardinfo.h"
 #include "devices.h"
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
+#define PROC_CPUINFO "/proc/cpuinfo"
+
 GSList *
 processor_scan(void)
 {
@@ -26,22 +36,22 @@ processor_scan(void)
     FILE *cpuinfo;
     gchar buffer[128];
 
-    cpuinfo = fopen("/proc/cpuinfo", "r");
+    cpuinfo = fopen(PROC_CPUINFO, "r");
     if (!cpuinfo)
-	return NULL;
+        return NULL;
 
     processor = g_new0(Processor, 1);
     while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
+        gchar **tmp = g_strsplit(buffer, ":", 2);
 
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
+        if (tmp[0] && tmp[1]) {
+            tmp[0] = g_strstrip(tmp[0]);
+            tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("cpu", processor->model_name);
-	    get_str("fpu", processor->has_fpu);
-	}
-	g_strfreev(tmp);
+            get_str("cpu", processor->model_name);
+            get_str("fpu", processor->has_fpu);
+        }
+        g_strfreev(tmp);
     }
 
     fclose(cpuinfo);
@@ -54,11 +64,14 @@ processor_scan(void)
 gchar *
 processor_get_info(GSList *processors)
 {
-        Processor *processor = (Processor *)processors->data;
-        
-	return g_strdup_printf("[Processor]\n"
-	                       "CPU=%s\n"
-	                       "FPU=%s\n",
-			       processor->model_name,
-			       processor->has_fpu);
+    Processor *processor = (Processor *)processors->data;
+
+    return g_strdup_printf("[%s]\n"
+                           "CPU=%s\n"
+                           "FPU=%s\n"
+                           "%s=%s\n", /* byte order */
+                   _("Processor"),
+                   processor->model_name,
+                   processor->has_fpu,
+                   _("Byte Order"), byte_order_str() );
 }
diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c
index 622e1f92..f8543c17 100644
--- a/modules/devices/x86/processor.c
+++ b/modules/devices/x86/processor.c
@@ -246,6 +246,14 @@ static gint get_cpu_int(const char* item, int cpuid) {
     return ret;
 }
 
+gchar *byte_order_str() {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    return _("Little Endian");
+#else
+    return _("Big Endian");
+#endif
+}
+
 GSList *processor_scan(void)
 {
     GSList *procs = NULL, *l = NULL;
@@ -824,12 +832,7 @@ gchar *processor_get_detailed_info(Processor * processor)
                    _("Cache Size"), processor->cache_size, _("kb"),
                    _("Frequency"), processor->cpu_mhz, _("MHz"),
                    _("BogoMips"), processor->bogomips,
-                   _("Byte Order"),
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                   _("Little Endian"),
-#else
-                   _("Big Endian"),
-#endif
+                   _("Byte Order"), byte_order_str(),
                    tmp_topology,
                    tmp_cpufreq,
                    _("Cache"), cache_info,