x86,arm,ppc: more processor info strings translatable

Additional labels made translatable and some cleanup.

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

3 files changed, 52 insertions, 43 deletions

diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c
index c825c167..04547d3b 100644
--- a/modules/devices/arm/processor.c
+++ b/modules/devices/arm/processor.c
@@ -293,18 +293,13 @@ processor_get_detailed_info(Processor *processor)
                    _("Driver"), processor->scaling_driver);
     }
 
-    ret = g_strdup_printf("[Processor]\n"
-                           "Linux Name=%s\n"
-                           "Decoded Name=%s\n"
-                           "Mode=%s\n"
-                   "BogoMips=%.2f\n"
-                   "Endianesss="
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                       "Little Endian"
-#else
-                       "Big Endian"
-#endif
-                       "\n"
+    ret = g_strdup_printf("[%s]\n"
+                       "Linux Name=%s\n"
+                       "Decoded Name=%s\n"
+                       "Mode=%s\n"
+                       "%s=%.2f %s\n"
+                       "%s=%.2f\n"
+                       "%s=%s\n"
                        "%s" /* topology */
                        "%s" /* frequency scaling */
                        "[ARM]\n"
@@ -313,13 +308,21 @@ processor_get_detailed_info(Processor *processor)
                        "Architecture=[%s] %s\n"
                        "Variant=%s\n"
                        "Revision=%s\n"
-                       "[Capabilities]\n"
+                       "[%s]\n" /* flags */
                        "%s"
-                       "%s",
+                       "%s", /* empty */
+                   _("Processor"),
                    processor->model_name,
                    processor->decoded_name,
                    arm_mode_str[processor->mode],
-                   processor->bogomips,
+                   _("Frequency"), processor->cpu_mhz, _("MHz"),
+                   _("BogoMips"), processor->bogomips,
+                   _("Byte Order"),
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                   _("Little Endian"),
+#else
+                   _("Big Endian"),
+#endif
                    tmp_topology,
                    tmp_cpufreq,
                    processor->cpu_implementer, (tmp_imp) ? tmp_imp : "",
@@ -327,7 +330,7 @@ processor_get_detailed_info(Processor *processor)
                    processor->cpu_architecture, (tmp_arch) ? tmp_arch : "",
                    processor->cpu_variant,
                    processor->cpu_revision,
-                   tmp_flags,
+                   _("Capabilities"), tmp_flags,
                     "");
     g_free(tmp_flags);
     g_free(tmp_cpufreq);
diff --git a/modules/devices/ppc/processor.c b/modules/devices/ppc/processor.c
index eabbbabf..08f12112 100644
--- a/modules/devices/ppc/processor.c
+++ b/modules/devices/ppc/processor.c
@@ -205,25 +205,26 @@ processor_get_detailed_info(Processor *processor)
                    _("Driver"), processor->scaling_driver);
     }
 
-    ret = g_strdup_printf("[Processor]\n"
-                           "Model=%s\n"
-                           "Revision=%s\n"
-                   "Frequency=%.2f MHz\n"
-                   "BogoMips=%.2f\n"
-                   "Byte Order="
+    ret = g_strdup_printf("[%s]\n"
+                   "Model=%s\n"
+                   "Revision=%s\n"
+                   "%s=%.2f %s\n"
+                   "%s=%.2f\n"
+                   "%s=%s\n"
+                   "%s" /* topology */
+                   "%s" /* frequency scaling */
+                   "%s",/* empty */
+                   _("Processor"),
+                   processor->model_name,
+                   processor->revision,
+                   _("Frequency"), processor->cpu_mhz, _("MHz"),
+                   _("BogoMips"), processor->bogomips,
+                   _("Byte Order"),
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                       "Little Endian"
+                   _("Little Endian"),
 #else
-                       "Big Endian"
+                   _("Big Endian"),
 #endif
-                       "\n"
-                       "%s" /* topology */
-                       "%s" /* frequency scaling */
-                       "%s",/* empty */
-                   processor->model_name,
-                   processor->revision,
-                   processor->cpu_mhz,
-                   processor->bogomips,
                    tmp_topology,
                    tmp_cpufreq,
                     "");
diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c
index 12780157..6d22ba8f 100644
--- a/modules/devices/x86/processor.c
+++ b/modules/devices/x86/processor.c
@@ -793,27 +793,28 @@ gchar *processor_get_detailed_info(Processor * processor)
                    _("Driver"), processor->scaling_driver);
     }
 
-    ret = g_strdup_printf(_("[Processor]\n"
+    ret = g_strdup_printf(_("[%s]\n"
                        "Name=%s\n"
                        "Family, model, stepping=%d, %d, %d (%s)\n"
                        "Vendor=%s\n"
                        "[Configuration]\n"
                        "Cache Size=%dkb\n"
-                       "Frequency=%.2fMHz\n"
-                       "BogoMIPS=%.2f\n"
-                       "Byte Order=%s\n"
+                       "%s=%.2f %s\n"
+                       "%s=%.2f\n"
+                       "%s=%s\n"
                        "%s" /* topology */
                        "%s" /* frequency scaling */
                        "[Features]\n"
                        "Has FPU=%s\n"
                        "[Cache]\n"
                        "%s\n"
-                       "[Power Management]\n"
+                       "[%s]\n" /* pm */
                        "%s"
-                       "[Bugs]\n"
+                       "[%s]\n" /* bugs */
                        "%s"
-                       "[Capabilities]\n"
+                       "[%s]\n" /* flags */
                        "%s"),
+                   _("Processor"),
                    processor->model_name,
                    processor->family,
                    processor->model,
@@ -821,17 +822,21 @@ gchar *processor_get_detailed_info(Processor * processor)
                    processor->strmodel,
                    vendor_get_name(processor->vendor_id),
                    processor->cache_size,
-                   processor->cpu_mhz, processor->bogomips,
+                   _("Frequency"), processor->cpu_mhz, _("MHz"),
+                   _("BogoMips"), processor->bogomips,
+                   _("Byte Order"),
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                       "Little Endian",
+                   _("Little Endian"),
 #else
-                       "Big Endian",
+                   _("Big Endian"),
 #endif
                    tmp_topology,
                    tmp_cpufreq,
                    processor->has_fpu  ? processor->has_fpu  : "no",
                    cache_info,
-                   tmp_pm, tmp_bugs, tmp_flags);
+                   _("Power Management"), tmp_pm,
+                   _("Bug Workarounds"), tmp_bugs,
+                   _("Capabilities"), tmp_flags );
     g_free(tmp_flags);
     g_free(tmp_bugs);
     g_free(tmp_pm);