clean up strings

1 files changed, 77 insertions, 132 deletions

diff --git a/po/powertop.pot b/po/powertop.pot
index 7b1379c..6b6dcda 100644
--- a/po/powertop.pot
+++ b/po/powertop.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: powertop 2.0\n"
 "Report-Msgid-Bugs-To: \"power@bughost.org\"\n"
-"POT-Creation-Date: 2012-05-10 12:53-0700\n"
+"POT-Creation-Date: 2012-05-30 09:39-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:139
+#: src/parameters/persistent.cpp:46
 msgid "Cannot save to file "
 msgstr ""
 
-#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:164
+#: src/parameters/persistent.cpp:78
 msgid "Cannot load from file "
 msgstr ""
 
-#: src/parameters/persistent.cpp:122
+#: src/parameters/persistent.cpp:123
 #, c-format
 msgid "Loaded %i prior measurements\n"
 msgstr ""
 
+#: src/parameters/persistent.cpp:140
+msgid "Cannot save to file"
+msgstr ""
+
+#: src/parameters/persistent.cpp:165
+msgid "Cannot load from file"
+msgstr ""
+
 #: src/display.cpp:71
 msgid "Overview"
 msgstr ""
@@ -77,6 +85,16 @@ msgstr ""
 msgid "cpu package"
 msgstr ""
 
+#: src/cpu/cpu.cpp:925
+#, c-format
+msgid "cpu_idle event returned no state?\n"
+msgstr ""
+
+#: src/cpu/cpu.cpp:940
+#, c-format
+msgid "power or cpu_frequecny event returned no state?\n"
+msgstr ""
+
 #: src/cpu/cpu_linux.cpp:92
 msgid "C0 polling"
 msgstr ""
@@ -97,32 +115,14 @@ msgstr ""
 msgid "  Package"
 msgstr ""
 
-#: src/cpu/intel_cpus.cpp:103
-msgid "C3 (cc3)"
-msgstr ""
-
-#: src/cpu/intel_cpus.cpp:104
-msgid "C6 (cc6)"
-msgstr ""
-
-#: src/cpu/intel_cpus.cpp:106
-msgid "C7 (cc7)"
-msgstr ""
-
-#: src/cpu/intel_cpus.cpp:351
-msgid "C2 (pc2)"
-msgstr ""
-
-#: src/cpu/intel_cpus.cpp:353
-msgid "C3 (pc3)"
-msgstr ""
-
-#: src/cpu/intel_cpus.cpp:354
-msgid "C6 (pc6)"
+#: src/cpu/intel_cpus.cpp:69
+#, c-format
+msgid "msr reg not found"
 msgstr ""
 
-#: src/cpu/intel_cpus.cpp:356
-msgid "C7 (pc7)"
+#: src/cpu/intel_cpus.cpp:79
+#, c-format
+msgid "pread cpu%d 0x%llx : "
 msgstr ""
 
 #: src/cpu/intel_cpus.cpp:529
@@ -134,101 +134,50 @@ msgstr ""
 msgid "Actual"
 msgstr ""
 
-#: src/devlist.cpp:309
-#, c-format
-msgid ""
-"<h2>Process device activity</h2>\n"
-" <table width=\"100%%\">\n"
-msgstr ""
-
-#: src/devlist.cpp:310
-#, c-format
-msgid ""
-"<tr><th class=\"device\" width=\"40%%\">Process</th><th class=\"device"
-"\">Device</th></tr>\n"
-msgstr ""
-
-#: src/devlist.cpp:312
-#, c-format
-msgid ""
-"**Process Device Activity**, \n"
-"\n"
-msgstr ""
-
-#: src/devlist.cpp:313
-#, c-format
-msgid "Process, Device, \n"
-msgstr ""
-
-#: src/lib.cpp:82
-#, c-format
-msgid "%9lli"
-msgstr ""
-
-#: src/lib.cpp:86
-#, c-format
-msgid "%4lli MHz"
-msgstr ""
-
-#: src/lib.cpp:88
-#, c-format
-msgid "%6lli MHz"
-msgstr ""
-
-#: src/lib.cpp:93
-#, c-format
-msgid "%4.2f GHz"
-msgstr ""
-
-#: src/lib.cpp:95
-#, c-format
-msgid "%3.1f GHz"
-msgstr ""
-
-#: src/lib.cpp:241
+#: src/lib.cpp:257
 #, c-format
 msgid "%7sW"
 msgstr ""
 
-#: src/lib.cpp:244
+#: src/lib.cpp:260
 #, c-format
 msgid "    0 mW"
 msgstr ""
 
-#: src/lib.cpp:353
+#: src/lib.cpp:369
 msgid "PS/2 Touchpad / Keyboard / Mouse"
 msgstr ""
 
-#: src/lib.cpp:354
+#: src/lib.cpp:370
 msgid "SATA controller"
 msgstr ""
 
-#: src/lib.cpp:355
+#: src/lib.cpp:371
 msgid "Intel built in USB hub"
 msgstr ""
 
-#: src/process/do_process.cpp:816
+#: src/process/do_process.cpp:818
 #, c-format
 msgid ""
 "Estimated power: %5.1f    Measured power: %5.1f    Sum: %5.1f\n"
 "\n"
 msgstr ""
 
-#: src/process/do_process.cpp:824 src/devices/device.cpp:171
+#: src/process/do_process.cpp:829 src/devices/device.cpp:171
 #, c-format
 msgid "The battery reports a discharge rate of %sW\n"
 msgstr ""
 
-#: src/process/do_process.cpp:829
+#: src/process/do_process.cpp:834
 #, c-format
-msgid "The estimated remaining time is %i minutes\n"
+msgid "The estimated remaining time is %i hours, %i minutes\n"
 msgstr ""
 
-#: src/process/do_process.cpp:842
+#: src/process/do_process.cpp:847
 msgid "Power est.      Usage       Events/s    Category       Description\n"
 msgstr ""
 
-#: src/process/do_process.cpp:844
+#: src/process/do_process.cpp:849
 msgid "                Usage       Events/s    Category       Description\n"
 msgstr ""
 
@@ -242,15 +191,6 @@ msgstr ""
 msgid "as well as support for trace points in the kernel:\n"
 msgstr ""
 
-#: src/perf/perf.cpp:123
-#, c-format
-msgid ""
-"CONFIG_PERF_EVENTS=y\n"
-"CONFIG_PERF_COUNTERS=y\n"
-"CONFIG_TRACEPOINTS=y\n"
-"CONFIG_TRACING=y\n"
-msgstr ""
-
 #: src/devices/device.cpp:177
 #, c-format
 msgid "System baseline power is estimated at %sW\n"
@@ -406,159 +346,164 @@ msgstr ""
 msgid "Autosuspend for USB device %s [%s]"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:297
+#: src/calibrate/calibrate.cpp:291
 #, c-format
 msgid "Cannot create temp file\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:316
+#: src/calibrate/calibrate.cpp:310
 #, c-format
 msgid "Calibrating: CPU usage on %i threads\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:331
+#: src/calibrate/calibrate.cpp:325
 #, c-format
 msgid "Calibrating: CPU wakeup power consumption\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:348
+#: src/calibrate/calibrate.cpp:342
 #, c-format
 msgid "Calibrating USB devices\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:350 src/calibrate/calibrate.cpp:367
-#: src/calibrate/calibrate.cpp:375 src/calibrate/calibrate.cpp:392
+#: src/calibrate/calibrate.cpp:344 src/calibrate/calibrate.cpp:361
+#: src/calibrate/calibrate.cpp:369 src/calibrate/calibrate.cpp:386
 #, c-format
 msgid ".... device %s \n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:365
+#: src/calibrate/calibrate.cpp:359
 #, c-format
 msgid "Calibrating radio devices\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:389
+#: src/calibrate/calibrate.cpp:383
 #, c-format
 msgid "Calibrating backlight\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:413 src/calibrate/calibrate.cpp:421
+#: src/calibrate/calibrate.cpp:407 src/calibrate/calibrate.cpp:415
 #, c-format
 msgid "Calibrating idle\n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:432
+#: src/calibrate/calibrate.cpp:426
 #, c-format
 msgid "Calibrating: disk usage \n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:457
+#: src/calibrate/calibrate.cpp:451
 msgid "Starting PowerTOP power estimate calibration \n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:480
+#: src/calibrate/calibrate.cpp:474
 msgid "Finishing PowerTOP power estimate calibration \n"
 msgstr ""
 
-#: src/calibrate/calibrate.cpp:484
+#: src/calibrate/calibrate.cpp:478
 #, c-format
 msgid "Parameters after calibration:\n"
 msgstr ""
 
-#: src/main.cpp:83
+#: src/main.cpp:84
 #, c-format
-msgid "Powertop version"
+msgid "PowerTOP version"
 msgstr ""
 
-#: src/main.cpp:89
+#: src/main.cpp:90
 msgid "Set refresh time out"
 msgstr ""
 
-#: src/main.cpp:102
+#: src/main.cpp:103
 #, c-format
 msgid ""
 "Usage: powertop [OPTIONS]\n"
 "\n"
 msgstr ""
 
-#: src/main.cpp:103
+#: src/main.cpp:104
 #, c-format
 msgid "--debug \t\t run in \"debug\" mode\n"
 msgstr ""
 
-#: src/main.cpp:104
+#: src/main.cpp:105
 #, c-format
 msgid "--version \t\t print version information\n"
 msgstr ""
 
-#: src/main.cpp:105
+#: src/main.cpp:106
 #, c-format
 msgid "--calibrate \t\t runs powertop in calibration mode\n"
 msgstr ""
 
-#: src/main.cpp:106
+#: src/main.cpp:107
 #, c-format
 msgid "--extech=devnode \t uses an Extech Power Analyzer for measurements\n"
 msgstr ""
 
-#: src/main.cpp:107
+#: src/main.cpp:108
 #, c-format
 msgid "--html[=FILENAME] \t generate a html report\n"
 msgstr ""
 
-#: src/main.cpp:108
+#: src/main.cpp:109
 #, c-format
 msgid "--csv[=FILENAME] \t generate a csv report\n"
 msgstr ""
 
-#: src/main.cpp:109
+#: src/main.cpp:110
 #, c-format
 msgid "--time[=secs] \t\t generate a report for 'x' secs\n"
 msgstr ""
 
-#: src/main.cpp:110
+#: src/main.cpp:111
 #, c-format
 msgid "--iteration[=iterations] number of times to run each test\n"
 msgstr ""
 
-#: src/main.cpp:111
+#: src/main.cpp:112
 #, c-format
 msgid "--help \t\t\t print this help menu\n"
 msgstr ""
 
-#: src/main.cpp:113
+#: src/main.cpp:114
 #, c-format
 msgid ""
 "For more help please refer to the README\n"
 "\n"
 msgstr ""
 
-#: src/main.cpp:251
+#: src/main.cpp:224
+#, c-format
+msgid "Out of memory. Aborting...\n"
+msgstr ""
+
+#: src/main.cpp:252
 #, c-format
 msgid "Preparing to take measurements\n"
 msgstr ""
 
-#: src/main.cpp:254
+#: src/main.cpp:255
 #, c-format
 msgid "Measuring %d time(s) for %d seconds each\n"
 msgstr ""
 
-#: src/main.cpp:277
+#: src/main.cpp:278
 #, c-format
 msgid "PowerTOP "
 msgstr ""
 
-#: src/main.cpp:278 src/main.cpp:367
+#: src/main.cpp:279 src/main.cpp:307
 #, c-format
 msgid "exiting...\n"
 msgstr ""
 
-#: src/main.cpp:366
+#: src/main.cpp:306
 #, c-format
 msgid "Failed to mount debugfs!\n"
 msgstr ""
 
-#: src/main.cpp:433
+#: src/main.cpp:443
 #, c-format
 msgid "Leaving PowerTOP\n"
 msgstr ""