update powertop.pot file, fix help menu.

4 files changed, 965 insertions, 574 deletions

diff --git a/po/hu_HU.po b/po/hu_HU.po
index 5bea304..2cc19bf 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,33 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Intel Corporation
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Márton Németh <nemeth.marton@gmail.com>, 2012.
 # Márton Németh <nm127@freemail.hu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: PowerTOP\n"
-"Report-Msgid-Bugs-To: \"power@bughost.org\"\n"
-"POT-Creation-Date: 2012-05-10 12:53-0700\n"
+"Report-Msgid-Bugs-To: \"powertop@lists.01.org\"\n"
+"POT-Creation-Date: 2012-05-31 14:03-0700\n"
 "PO-Revision-Date: 2012-05-30 06:43+0000\n"
 "Last-Translator: Márton Németh <nemeth.marton@gmail.com>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/PowerTOP/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.net/projects/p/"
+"PowerTOP/language/hu_HU/)\n"
+"Language: hu_HU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:139
+#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140
 msgid "Cannot save to file "
 msgstr "Nem lehet menteni a következő fájlba: "
 
-#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:164
+#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:165
 msgid "Cannot load from file "
 msgstr "Nem lehet betölteni a következő fájlból: "
 
-#: src/parameters/persistent.cpp:122
+#: src/parameters/persistent.cpp:123
 #, c-format
 msgid "Loaded %i prior measurements\n"
 msgstr "%i korábbi mérés betöltve\n"
@@ -49,8 +50,8 @@ msgid "Device stats"
 msgstr "Eszközstatisztika"
 
 #: src/display.cpp:131
-msgid " <ESC> Exit | "
-msgstr " <ESC> Kilépés | "
+msgid "Exit"
+msgstr ""
 
 #: src/cpu/cpu_core.cpp:46 src/cpu/cpu_core.cpp:190 src/cpu/intel_cpus.cpp:296
 #, c-format
@@ -79,6 +80,16 @@ msgstr "CPU tok %i"
 msgid "cpu package"
 msgstr "CPU tok"
 
+#: 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 "C0 ciklikus lekérdezés"
@@ -99,33 +110,15 @@ msgstr "tok"
 msgid "  Package"
 msgstr "  tok"
 
-#: src/cpu/intel_cpus.cpp:103
-msgid "C3 (cc3)"
-msgstr "C3 (cc3)"
-
-#: src/cpu/intel_cpus.cpp:104
-msgid "C6 (cc6)"
-msgstr "C6 (cc6)"
-
-#: src/cpu/intel_cpus.cpp:106
-msgid "C7 (cc7)"
-msgstr "C7 (cc7)"
-
-#: src/cpu/intel_cpus.cpp:351
-msgid "C2 (pc2)"
-msgstr "C2 (pc2)"
-
-#: src/cpu/intel_cpus.cpp:353
-msgid "C3 (pc3)"
-msgstr "C3 (pc3)"
-
-#: src/cpu/intel_cpus.cpp:354
-msgid "C6 (pc6)"
-msgstr "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)"
-msgstr "C7 (pc7)"
+#: src/cpu/intel_cpus.cpp:79
+#, c-format
+msgid "pread cpu%d 0x%llx : "
+msgstr ""
 
 #: src/cpu/intel_cpus.cpp:529
 msgid "C0 active"
@@ -136,123 +129,144 @@ msgstr "C0 aktív"
 msgid "Actual"
 msgstr "Aktuális"
 
-#: src/devlist.cpp:309
-#, c-format
-msgid ""
-"<h2>Process device activity</h2>\n"
-" <table width=\"100%%\">\n"
-msgstr "<h2>Folyamatok eszközaktivitása</h2>\n <table width=\"100%%\">\n"
-
-#: src/devlist.cpp:310
-#, c-format
-msgid ""
-"<tr><th class=\"device\" width=\"40%%\">Process</th><th "
-"class=\"device\">Device</th></tr>\n"
-msgstr "<tr><th class=\"device\" width=\"40%%\">Folyamat</th><th class=\"device\">Eszköz</th></tr>\n"
-
-#: src/devlist.cpp:312
-#, c-format
-msgid ""
-"**Process Device Activity**, \n"
-"\n"
-msgstr "**Folyamatok eszközaktivitása**, \n\n"
-
-#: src/devlist.cpp:313
-#, c-format
-msgid "Process, Device, \n"
-msgstr "Folyamat, Eszköz, \n"
-
-#: src/lib.cpp:82
-#, c-format
-msgid "%9lli"
-msgstr "%9lli"
-
-#: src/lib.cpp:86
-#, c-format
-msgid "%4lli MHz"
-msgstr "%4lli MHz"
-
-#: src/lib.cpp:88
-#, c-format
-msgid "%6lli MHz"
-msgstr "%6lli MHz"
-
-#: src/lib.cpp:93
-#, c-format
-msgid "%4.2f GHz"
-msgstr "%4.2f GHz"
-
-#: src/lib.cpp:95
-#, c-format
-msgid "%3.1f GHz"
-msgstr "%3.1f GHz"
-
-#: src/lib.cpp:241
+#: src/lib.cpp:257
 #, c-format
 msgid "%7sW"
 msgstr "%7sW"
 
-#: src/lib.cpp:244
+#: src/lib.cpp:260
 #, c-format
 msgid "    0 mW"
 msgstr "    0 mW"
 
-#: src/lib.cpp:353
+#: src/lib.cpp:369
 msgid "PS/2 Touchpad / Keyboard / Mouse"
 msgstr "PS/2 tapipad / billentyűzet / egér"
 
-#: src/lib.cpp:354
+#: src/lib.cpp:370
 msgid "SATA controller"
 msgstr "SATA vezérlő"
 
-#: src/lib.cpp:355
+#: src/lib.cpp:371
 msgid "Intel built in USB hub"
 msgstr "Beépített Intel USB hub"
 
-#: 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 "Becsült teljesítmény: %5.1f    Mért teljesítmény: %5.1f    Összeg: %5.1f\n\n"
+msgstr ""
+"Becsült teljesítmény: %5.1f    Mért teljesítmény: %5.1f    Összeg: %5.1f\n"
+"\n"
 
-#: 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 "A akkumulátor %sW kisülési sebességet jelent\n"
 
-#: src/process/do_process.cpp:829
-#, c-format
-msgid "The estimated remaining time is %i minutes\n"
+#: src/process/do_process.cpp:834
+#, fuzzy, c-format
+msgid "The estimated remaining time is %i hours, %i minutes\n"
 msgstr "%i perc a becsült hátralévő idő\n"
 
 #: src/process/do_process.cpp:842
-msgid "Power est.      Usage       Events/s    Category       Description\n"
-msgstr "Becsült telj.   Használat   Esemény/s   Kategória      Leírás\n"
+msgid "Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1029
+msgid "wakeups/second"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "GPU ops/seconds"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "VFS ops/sec and"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1030
+msgid "CPU use"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:914
+#: src/process/do_process.cpp:1034
+#, fuzzy
+msgid "Power est."
+msgstr "PowerTOP "
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Usage"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Events/s"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Category"
+msgstr ""
 
-#: src/process/do_process.cpp:844
-msgid "                Usage       Events/s    Category       Description\n"
-msgstr "                Használat   Esemény/s   Kategória      Leírás\n"
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Description"
+msgstr ""
+
+#: src/process/do_process.cpp:911
+msgid "Overview of Software Power Consumers"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GPU ops/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Disk IO/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GFX Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:1026
+msgid "Power Consumption Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:1029
+msgid "GPU ops/second"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "VFS ops/sec"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "GFX wakes/sec and"
+msgstr ""
 
 #: src/perf/perf.cpp:121
 #, c-format
 msgid "PowerTOP %s needs the kernel to support the 'perf' subsystem\n"
-msgstr "A PowerTOP %s verziójának szüksége van arra, hogy a rendszermag támogassa a „perf” alrendszert\n"
+msgstr ""
+"A PowerTOP %s verziójának szüksége van arra, hogy a rendszermag támogassa a "
+"„perf” alrendszert\n"
 
 #: src/perf/perf.cpp:122
 #, c-format
 msgid "as well as support for trace points in the kernel:\n"
 msgstr "valamint a nyomkövetési pontokra is a rendszermagban:\n"
 
-#: 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 "CONFIG_PERF_EVENTS=y\nCONFIG_PERF_COUNTERS=y\nCONFIG_TRACEPOINTS=y\nCONFIG_TRACING=y\n"
-
 #: src/devices/device.cpp:177
 #, c-format
 msgid "System baseline power is estimated at %sW\n"
@@ -408,159 +422,257 @@ msgstr "Automatikus felfüggesztés a(z) %s (%s:%s) ismeretlen USB eszközön"
 msgid "Autosuspend for USB device %s [%s]"
 msgstr "Automatikus felfüggesztés a(z) %s [%s] USB eszközön"
 
-#: src/calibrate/calibrate.cpp:297
+#: src/calibrate/calibrate.cpp:291
 #, c-format
 msgid "Cannot create temp file\n"
 msgstr "Nem tudok létrehozni ideiglenes fájlt\n"
 
-#: src/calibrate/calibrate.cpp:316
+#: src/calibrate/calibrate.cpp:310
 #, c-format
 msgid "Calibrating: CPU usage on %i threads\n"
 msgstr "Kalibrálás: CPU használtság %i szálon\n"
 
-#: src/calibrate/calibrate.cpp:331
+#: src/calibrate/calibrate.cpp:325
 #, c-format
 msgid "Calibrating: CPU wakeup power consumption\n"
 msgstr "Kalibrálás: CPU felébredési teljesítményfelvétel\n"
 
-#: src/calibrate/calibrate.cpp:348
+#: src/calibrate/calibrate.cpp:342
 #, c-format
 msgid "Calibrating USB devices\n"
 msgstr "USB eszközök kalibrálása\n"
 
-#: 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 ".... %s eszköz \n"
 
-#: src/calibrate/calibrate.cpp:365
+#: src/calibrate/calibrate.cpp:359
 #, c-format
 msgid "Calibrating radio devices\n"
 msgstr "Rádiós eszközök kalibrálása\n"
 
-#: src/calibrate/calibrate.cpp:389
+#: src/calibrate/calibrate.cpp:383
 #, c-format
 msgid "Calibrating backlight\n"
 msgstr "Háttérvilágítás kalibrálása\n"
 
-#: 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 "Üresjárat kalibrálása\n"
 
-#: src/calibrate/calibrate.cpp:432
+#: src/calibrate/calibrate.cpp:426
 #, c-format
 msgid "Calibrating: disk usage \n"
 msgstr "Kalibrálás: lemezhasználat \n"
 
-#: src/calibrate/calibrate.cpp:457
+#: src/calibrate/calibrate.cpp:451
 msgid "Starting PowerTOP power estimate calibration \n"
 msgstr "PowerTop teljesítménybecslés kalibrálás indítása \n"
 
-#: src/calibrate/calibrate.cpp:480
+#: src/calibrate/calibrate.cpp:474
 msgid "Finishing PowerTOP power estimate calibration \n"
 msgstr "PowerTop teljesítménybecslés-kalibrálás befejezése \n"
 
-#: src/calibrate/calibrate.cpp:484
+#: src/calibrate/calibrate.cpp:478
 #, c-format
 msgid "Parameters after calibration:\n"
 msgstr "Paraméterek a kalibrálás után:\n"
 
-#: src/main.cpp:83
-#, c-format
-msgid "Powertop version"
+#: src/main.cpp:84
+#, fuzzy, c-format
+msgid "PowerTOP version"
 msgstr "PowerTop verzió"
 
-#: src/main.cpp:89
+#: src/main.cpp:90
 msgid "Set refresh time out"
 msgstr "Frissítés időkorlát leteltének beállítása"
 
-#: src/main.cpp:102
-#, c-format
-msgid ""
-"Usage: powertop [OPTIONS]\n"
+#: src/main.cpp:103
+#, fuzzy
+msgid "Usage: powertop [OPTIONS]"
+msgstr ""
+"Használat: powertop [OPCIÓK]\n"
 "\n"
-msgstr "Használat: powertop [OPCIÓK]\n\n"
 
-#: src/main.cpp:103
-#, c-format
-msgid "--debug \t\t run in \"debug\" mode\n"
+#: src/main.cpp:104
+#, fuzzy
+msgid "run in \"debug\" mode"
 msgstr "--debug \t\t futtatás hibakeresési módban\n"
 
-#: src/main.cpp:104
-#, c-format
-msgid "--version \t\t print version information\n"
+#: src/main.cpp:105
+#, fuzzy
+msgid "print version information"
 msgstr "--version \t\t verzióinformáció kiíratása\n"
 
-#: src/main.cpp:105
-#, c-format
-msgid "--calibrate \t\t runs powertop in calibration mode\n"
+#: src/main.cpp:106
+#, fuzzy
+msgid "runs powertop in calibration mode"
 msgstr "--calibrate \t\t a powertop futtatása kalibrációs módban\n"
 
-#: src/main.cpp:106
-#, c-format
-msgid "--extech=devnode \t uses an Extech Power Analyzer for measurements\n"
-msgstr "--extech=devnode \t Extech Power Analyzer eszköz használata a mérésekhez\n"
+#: src/main.cpp:107
+msgid "[=devnode]"
+msgstr ""
 
 #: src/main.cpp:107
-#, c-format
-msgid "--html[=FILENAME] \t generate a html report\n"
-msgstr "--html[=FILENAME] \t HTML jelentés készítése\n"
+#, fuzzy
+msgid "uses an Extech Power Analyzer for measurements"
+msgstr ""
+"--extech=devnode \t Extech Power Analyzer eszköz használata a mérésekhez\n"
+
+#: src/main.cpp:108 src/main.cpp:109
+msgid "[=FILENAME]"
+msgstr ""
 
 #: src/main.cpp:108
-#, c-format
-msgid "--csv[=FILENAME] \t generate a csv report\n"
-msgstr "--csv[=FILENAME] \t CSV jelentés készítése\n"
+#, fuzzy
+msgid "generate a html report"
+msgstr "--html[=FILENAME] \t HTML jelentés készítése\n"
 
 #: src/main.cpp:109
-#, c-format
-msgid "--time[=secs] \t\t generate a report for 'x' secs\n"
-msgstr "--time[=secs] \t\t ennyi másodpercig készüljön a jelentés\n"
+#, fuzzy
+msgid "generate a csv report"
+msgstr "--csv[=FILENAME] \t CSV jelentés készítése\n"
 
 #: src/main.cpp:110
-#, c-format
-msgid "--iteration[=iterations] number of times to run each test\n"
-msgstr "--iteration[=iterations] ennyiszer fusson le minden egyes teszt\n"
+msgid "[=seconds]"
+msgstr ""
+
+#: src/main.cpp:110
+#, fuzzy
+msgid "generate a report for 'x' seconds"
+msgstr "--time[=secs] \t\t ennyi másodpercig készüljön a jelentés\n"
 
 #: src/main.cpp:111
-#, c-format
-msgid "--help \t\t\t print this help menu\n"
+#, fuzzy
+msgid "[=iterations] number of times to run each test"
+msgstr "--iteration[=iterations] ennyiszer fusson le minden egyes teszt\n"
+
+#: src/main.cpp:112
+#, fuzzy
+msgid "print this help menu"
 msgstr "--help \t\t\t e súgó kiíratása\n"
 
-#: src/main.cpp:113
-#, c-format
-msgid ""
-"For more help please refer to the README\n"
+#: src/main.cpp:114
+#, fuzzy
+msgid "For more help please refer to the README"
+msgstr ""
+"További információk a README fájlban találhatók\n"
 "\n"
-msgstr "További információk a README fájlban találhatók\n\n"
 
-#: src/main.cpp:251
+#: src/main.cpp:224
+#, c-format
+msgid "PowerTOP is out of memory. PowerTOP is Aborting"
+msgstr ""
+
+#: src/main.cpp:252
 #, c-format
 msgid "Preparing to take measurements\n"
 msgstr "Előkészülés a mérések elvégzéséhez\n"
 
-#: src/main.cpp:254
-#, c-format
-msgid "Measuring %d time(s) for %d seconds each\n"
+#: src/main.cpp:255
+#, fuzzy, c-format
+msgid "Taking %d measurement(s) for a duration of %d second(s) each.\n"
 msgstr "%d darab, egyenként %d másodperces mérés\n"
 
-#: src/main.cpp:277
+#: src/main.cpp:278
 #, c-format
 msgid "PowerTOP "
 msgstr "PowerTOP "
 
-#: src/main.cpp:278 src/main.cpp:367
+#: src/main.cpp:279 src/main.cpp:307
 #, c-format
 msgid "exiting...\n"
 msgstr "kilépés...\n"
 
-#: src/main.cpp:366
+#: src/main.cpp:306
 #, c-format
 msgid "Failed to mount debugfs!\n"
 msgstr "Nem tudtam csatolni a debugfs-t!\n"
 
-#: src/main.cpp:433
-#, c-format
-msgid "Leaving PowerTOP\n"
+#: src/main.cpp:443
+#, fuzzy, c-format
+msgid "Leaving PowerTOP"
 msgstr "A PowerTOP elhagyása\n"
+
+#~ msgid " <ESC> Exit | "
+#~ msgstr " <ESC> Kilépés | "
+
+#~ msgid "C3 (cc3)"
+#~ msgstr "C3 (cc3)"
+
+#~ msgid "C6 (cc6)"
+#~ msgstr "C6 (cc6)"
+
+#~ msgid "C7 (cc7)"
+#~ msgstr "C7 (cc7)"
+
+#~ msgid "C2 (pc2)"
+#~ msgstr "C2 (pc2)"
+
+#~ msgid "C3 (pc3)"
+#~ msgstr "C3 (pc3)"
+
+#~ msgid "C6 (pc6)"
+#~ msgstr "C6 (pc6)"
+
+#~ msgid "C7 (pc7)"
+#~ msgstr "C7 (pc7)"
+
+#~ msgid ""
+#~ "<h2>Process device activity</h2>\n"
+#~ " <table width=\"100%%\">\n"
+#~ msgstr ""
+#~ "<h2>Folyamatok eszközaktivitása</h2>\n"
+#~ " <table width=\"100%%\">\n"
+
+#~ msgid ""
+#~ "<tr><th class=\"device\" width=\"40%%\">Process</th><th class=\"device"
+#~ "\">Device</th></tr>\n"
+#~ msgstr ""
+#~ "<tr><th class=\"device\" width=\"40%%\">Folyamat</th><th class=\"device"
+#~ "\">Eszköz</th></tr>\n"
+
+#~ msgid ""
+#~ "**Process Device Activity**, \n"
+#~ "\n"
+#~ msgstr ""
+#~ "**Folyamatok eszközaktivitása**, \n"
+#~ "\n"
+
+#~ msgid "Process, Device, \n"
+#~ msgstr "Folyamat, Eszköz, \n"
+
+#~ msgid "%9lli"
+#~ msgstr "%9lli"
+
+#~ msgid "%4lli MHz"
+#~ msgstr "%4lli MHz"
+
+#~ msgid "%6lli MHz"
+#~ msgstr "%6lli MHz"
+
+#~ msgid "%4.2f GHz"
+#~ msgstr "%4.2f GHz"
+
+#~ msgid "%3.1f GHz"
+#~ msgstr "%3.1f GHz"
+
+#~ msgid "Power est.      Usage       Events/s    Category       Description\n"
+#~ msgstr "Becsült telj.   Használat   Esemény/s   Kategória      Leírás\n"
+
+#~ msgid "                Usage       Events/s    Category       Description\n"
+#~ msgstr "                Használat   Esemény/s   Kategória      Leírás\n"
+
+#~ msgid ""
+#~ "CONFIG_PERF_EVENTS=y\n"
+#~ "CONFIG_PERF_COUNTERS=y\n"
+#~ "CONFIG_TRACEPOINTS=y\n"
+#~ "CONFIG_TRACING=y\n"
+#~ msgstr ""
+#~ "CONFIG_PERF_EVENTS=y\n"
+#~ "CONFIG_PERF_COUNTERS=y\n"
+#~ "CONFIG_TRACEPOINTS=y\n"
+#~ "CONFIG_TRACING=y\n"
diff --git a/po/id_ID.po b/po/id_ID.po
index 6bcd3b5..ee4f2d7 100644
--- a/po/id_ID.po
+++ b/po/id_ID.po
@@ -1,32 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Intel Corporation
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andika Triwidada <andika@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: PowerTOP\n"
-"Report-Msgid-Bugs-To: \"power@bughost.org\"\n"
-"POT-Creation-Date: 2012-05-10 12:53-0700\n"
+"Report-Msgid-Bugs-To: \"powertop@lists.01.org\"\n"
+"POT-Creation-Date: 2012-05-31 14:03-0700\n"
 "PO-Revision-Date: 2012-05-29 02:59+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
-"Language-Team: Indonesian (Indonesia) (http://www.transifex.net/projects/p/PowerTOP/language/id_ID/)\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.net/projects/p/"
+"PowerTOP/language/id_ID/)\n"
+"Language: id_ID\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:139
+#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140
 msgid "Cannot save to file "
 msgstr "Tak bisa menyimpan ke berkas "
 
-#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:164
+#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:165
 msgid "Cannot load from file "
 msgstr "Tak bisa memuat dari berkas "
 
-#: src/parameters/persistent.cpp:122
+#: src/parameters/persistent.cpp:123
 #, c-format
 msgid "Loaded %i prior measurements\n"
 msgstr "Dimuat %i pengukuran sebelumnya\n"
@@ -48,8 +49,8 @@ msgid "Device stats"
 msgstr "Stat perangkat"
 
 #: src/display.cpp:131
-msgid " <ESC> Exit | "
-msgstr " <ESC> Keluar | "
+msgid "Exit"
+msgstr ""
 
 #: src/cpu/cpu_core.cpp:46 src/cpu/cpu_core.cpp:190 src/cpu/intel_cpus.cpp:296
 #, c-format
@@ -78,6 +79,16 @@ msgstr "paket %i cpu"
 msgid "cpu package"
 msgstr "paket cpu"
 
+#: 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 "C0 polling"
@@ -98,33 +109,15 @@ msgstr "Paket"
 msgid "  Package"
 msgstr "  Package"
 
-#: src/cpu/intel_cpus.cpp:103
-msgid "C3 (cc3)"
-msgstr "C3 (cc3)"
-
-#: src/cpu/intel_cpus.cpp:104
-msgid "C6 (cc6)"
-msgstr "C6 (cc6)"
-
-#: src/cpu/intel_cpus.cpp:106
-msgid "C7 (cc7)"
-msgstr "C7 (cc7)"
-
-#: src/cpu/intel_cpus.cpp:351
-msgid "C2 (pc2)"
-msgstr "C2 (pc2)"
-
-#: src/cpu/intel_cpus.cpp:353
-msgid "C3 (pc3)"
-msgstr "C3 (pc3)"
-
-#: src/cpu/intel_cpus.cpp:354
-msgid "C6 (pc6)"
-msgstr "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)"
-msgstr "C7 (pc7)"
+#: src/cpu/intel_cpus.cpp:79
+#, c-format
+msgid "pread cpu%d 0x%llx : "
+msgstr ""
 
 #: src/cpu/intel_cpus.cpp:529
 msgid "C0 active"
@@ -135,103 +128,131 @@ msgstr "C0 aktif"
 msgid "Actual"
 msgstr "Aktual"
 
-#: src/devlist.cpp:309
-#, c-format
-msgid ""
-"<h2>Process device activity</h2>\n"
-" <table width=\"100%%\">\n"
-msgstr "<h2>Aktivitas perangkat proses</h2>\n <table width=\"100%%\">\n"
-
-#: src/devlist.cpp:310
-#, c-format
-msgid ""
-"<tr><th class=\"device\" width=\"40%%\">Process</th><th "
-"class=\"device\">Device</th></tr>\n"
-msgstr "<tr><th class=\"device\" width=\"40%%\">Proses</th><th class=\"device\">Perangkat</th></tr>\n"
-
-#: src/devlist.cpp:312
-#, c-format
-msgid ""
-"**Process Device Activity**, \n"
-"\n"
-msgstr "**Aktivitas Perangkat Proses**, \n\n"
-
-#: src/devlist.cpp:313
-#, c-format
-msgid "Process, Device, \n"
-msgstr "Proses, Perangkat, \n"
-
-#: src/lib.cpp:82
-#, c-format
-msgid "%9lli"
-msgstr "%9lli"
-
-#: src/lib.cpp:86
-#, c-format
-msgid "%4lli MHz"
-msgstr "%4lli MHz"
-
-#: src/lib.cpp:88
-#, c-format
-msgid "%6lli MHz"
-msgstr "%6lli MHz"
-
-#: src/lib.cpp:93
-#, c-format
-msgid "%4.2f GHz"
-msgstr "%4.2f GHz"
-
-#: src/lib.cpp:95
-#, c-format
-msgid "%3.1f GHz"
-msgstr "%3.1f GHz"
-
-#: src/lib.cpp:241
+#: src/lib.cpp:257
 #, c-format
 msgid "%7sW"
 msgstr "%7sW"
 
-#: src/lib.cpp:244
+#: src/lib.cpp:260
 #, c-format
 msgid "    0 mW"
 msgstr "    0 mW"
 
-#: src/lib.cpp:353
+#: src/lib.cpp:369
 msgid "PS/2 Touchpad / Keyboard / Mouse"
 msgstr "PS/2 Touchpad / Keyboard / Mouse"
 
-#: src/lib.cpp:354
+#: src/lib.cpp:370
 msgid "SATA controller"
 msgstr "Pengendali SATA"
 
-#: src/lib.cpp:355
+#: src/lib.cpp:371
 msgid "Intel built in USB hub"
 msgstr "Hub USB built in Intel"
 
-#: 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 "Perkiraan daya: %5.1f    Daya terukur: %5.1f    Jumlah: %5.1f\n\n"
+msgstr ""
+"Perkiraan daya: %5.1f    Daya terukur: %5.1f    Jumlah: %5.1f\n"
+"\n"
 
-#: 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 "Baterai melaporkan laju pengosongan %sW\n"
 
-#: src/process/do_process.cpp:829
-#, c-format
-msgid "The estimated remaining time is %i minutes\n"
+#: src/process/do_process.cpp:834
+#, fuzzy, c-format
+msgid "The estimated remaining time is %i hours, %i minutes\n"
 msgstr "Perkiraan sisa waktu adalah %i menit\n"
 
 #: src/process/do_process.cpp:842
-msgid "Power est.      Usage       Events/s    Category       Description\n"
-msgstr "Est. daya       Pakai       Event/s     Kategori       Deskripsi\n"
+msgid "Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1029
+msgid "wakeups/second"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "GPU ops/seconds"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "VFS ops/sec and"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1030
+msgid "CPU use"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:914
+#: src/process/do_process.cpp:1034
+#, fuzzy
+msgid "Power est."
+msgstr "PowerTOP "
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Usage"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Events/s"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Category"
+msgstr ""
 
-#: src/process/do_process.cpp:844
-msgid "                Usage       Events/s    Category       Description\n"
-msgstr "                Pakai       Event/s     Kategori       Deskripsi\n"
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Description"
+msgstr ""
+
+#: src/process/do_process.cpp:911
+msgid "Overview of Software Power Consumers"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GPU ops/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Disk IO/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GFX Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:1026
+msgid "Power Consumption Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:1029
+msgid "GPU ops/second"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "VFS ops/sec"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "GFX wakes/sec and"
+msgstr ""
 
 #: src/perf/perf.cpp:121
 #, c-format
@@ -243,15 +264,6 @@ msgstr "PowerTop %s memerlukan kernel yang mendukung subsistem 'perf'\n"
 msgid "as well as support for trace points in the kernel:\n"
 msgstr "dan juga dukungan trace point dalam kernel:\n"
 
-#: 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 "CONFIG_PERF_EVENTS=y\nCONFIG_PERF_COUNTERS=y\nCONFIG_TRACEPOINTS=y\nCONFIG_TRACING=y\n"
-
 #: src/devices/device.cpp:177
 #, c-format
 msgid "System baseline power is estimated at %sW\n"
@@ -407,159 +419,252 @@ msgstr "Suspensi otomatis bagi perangkat USB tak dikenal %s (%s:%s)"
 msgid "Autosuspend for USB device %s [%s]"
 msgstr "Suspensi otomatis bagi perangkat USB %s [%s]"
 
-#: src/calibrate/calibrate.cpp:297
+#: src/calibrate/calibrate.cpp:291
 #, c-format
 msgid "Cannot create temp file\n"
 msgstr "Tak bisa membuat berkas temp\n"
 
-#: src/calibrate/calibrate.cpp:316
+#: src/calibrate/calibrate.cpp:310
 #, c-format
 msgid "Calibrating: CPU usage on %i threads\n"
 msgstr "Kalibrasi: Pemakaian CPU pada %i thread \n"
 
-#: src/calibrate/calibrate.cpp:331
+#: src/calibrate/calibrate.cpp:325
 #, c-format
 msgid "Calibrating: CPU wakeup power consumption\n"
 msgstr "Kalibrasi: Konsumsi daya CPU bangun \n"
 
-#: src/calibrate/calibrate.cpp:348
+#: src/calibrate/calibrate.cpp:342
 #, c-format
 msgid "Calibrating USB devices\n"
 msgstr "Kalibrasi perangkat USB \n"
 
-#: 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 ".... perangkat %s \n"
 
-#: src/calibrate/calibrate.cpp:365
+#: src/calibrate/calibrate.cpp:359
 #, c-format
 msgid "Calibrating radio devices\n"
 msgstr "Kalibrasi perangkat radio \n"
 
-#: src/calibrate/calibrate.cpp:389
+#: src/calibrate/calibrate.cpp:383
 #, c-format
 msgid "Calibrating backlight\n"
 msgstr "Kalibrasi cahaya latar \n"
 
-#: 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 "Kalibrasi menganggur \n"
 
-#: src/calibrate/calibrate.cpp:432
+#: src/calibrate/calibrate.cpp:426
 #, c-format
 msgid "Calibrating: disk usage \n"
 msgstr "Kalibrasi: pemakaian disk \n"
 
-#: src/calibrate/calibrate.cpp:457
+#: src/calibrate/calibrate.cpp:451
 msgid "Starting PowerTOP power estimate calibration \n"
 msgstr "Memulai kalibrasi estimasi daya PowerTop \n"
 
-#: src/calibrate/calibrate.cpp:480
+#: src/calibrate/calibrate.cpp:474
 msgid "Finishing PowerTOP power estimate calibration \n"
 msgstr "Mengakhiri kalibrasi estimasi daya PowerTop \n"
 
-#: src/calibrate/calibrate.cpp:484
+#: src/calibrate/calibrate.cpp:478
 #, c-format
 msgid "Parameters after calibration:\n"
 msgstr "Parameter setelah kalibrasi:\n"
 
-#: src/main.cpp:83
-#, c-format
-msgid "Powertop version"
+#: src/main.cpp:84
+#, fuzzy, c-format
+msgid "PowerTOP version"
 msgstr "Versi Powerop"
 
-#: src/main.cpp:89
+#: src/main.cpp:90
 msgid "Set refresh time out"
 msgstr "Tata tenggang waktu penyegaran"
 
-#: src/main.cpp:102
-#, c-format
-msgid ""
-"Usage: powertop [OPTIONS]\n"
-"\n"
+#: src/main.cpp:103
+#, fuzzy
+msgid "Usage: powertop [OPTIONS]"
 msgstr "Cara pakai: powertop [OPSI]\n"
 
-#: src/main.cpp:103
-#, c-format
-msgid "--debug \t\t run in \"debug\" mode\n"
+#: src/main.cpp:104
+#, fuzzy
+msgid "run in \"debug\" mode"
 msgstr "--debug \t\t jalankan dalam mode \"debug\"\n"
 
-#: src/main.cpp:104
-#, c-format
-msgid "--version \t\t print version information\n"
+#: src/main.cpp:105
+#, fuzzy
+msgid "print version information"
 msgstr "--version \t\t cetak informasi versi\n"
 
-#: src/main.cpp:105
-#, c-format
-msgid "--calibrate \t\t runs powertop in calibration mode\n"
+#: src/main.cpp:106
+#, fuzzy
+msgid "runs powertop in calibration mode"
 msgstr "--calibrate \t\t jalankan powertop dalam mode kalibrasi\n"
 
-#: src/main.cpp:106
-#, c-format
-msgid "--extech=devnode \t uses an Extech Power Analyzer for measurements\n"
-msgstr "--extech=devnode \t gunakan Extech Power Analyzer untuk pengukuran\n"
+#: src/main.cpp:107
+msgid "[=devnode]"
+msgstr ""
 
 #: src/main.cpp:107
-#, c-format
-msgid "--html[=FILENAME] \t generate a html report\n"
-msgstr "--html[=NAMAFILE] \t buat laporan html\n"
+#, fuzzy
+msgid "uses an Extech Power Analyzer for measurements"
+msgstr "--extech=devnode \t gunakan Extech Power Analyzer untuk pengukuran\n"
+
+#: src/main.cpp:108 src/main.cpp:109
+msgid "[=FILENAME]"
+msgstr ""
 
 #: src/main.cpp:108
-#, c-format
-msgid "--csv[=FILENAME] \t generate a csv report\n"
-msgstr "--csv[=NAMAFILE] \t buat laporan csv\n"
+#, fuzzy
+msgid "generate a html report"
+msgstr "--html[=NAMAFILE] \t buat laporan html\n"
 
 #: src/main.cpp:109
-#, c-format
-msgid "--time[=secs] \t\t generate a report for 'x' secs\n"
-msgstr "--time[=detik] \t\t buat laporan untuk 'x' detik\n"
+#, fuzzy
+msgid "generate a csv report"
+msgstr "--csv[=NAMAFILE] \t buat laporan csv\n"
 
 #: src/main.cpp:110
-#, c-format
-msgid "--iteration[=iterations] number of times to run each test\n"
-msgstr "--iteration[=iterasi] berapa kali menjalankan setiap tes\n"
+msgid "[=seconds]"
+msgstr ""
+
+#: src/main.cpp:110
+#, fuzzy
+msgid "generate a report for 'x' seconds"
+msgstr "--time[=detik] \t\t buat laporan untuk 'x' detik\n"
 
 #: src/main.cpp:111
-#, c-format
-msgid "--help \t\t\t print this help menu\n"
+#, fuzzy
+msgid "[=iterations] number of times to run each test"
+msgstr "--iteration[=iterasi] berapa kali menjalankan setiap tes\n"
+
+#: src/main.cpp:112
+#, fuzzy
+msgid "print this help menu"
 msgstr "--help \t\t\t cetak menu help ini\n"
 
-#: src/main.cpp:113
-#, c-format
-msgid ""
-"For more help please refer to the README\n"
-"\n"
+#: src/main.cpp:114
+#, fuzzy
+msgid "For more help please refer to the README"
 msgstr "Untuk bantuan lebih lanjut silakan mengacu ke README\n"
 
-#: src/main.cpp:251
+#: src/main.cpp:224
+#, c-format
+msgid "PowerTOP is out of memory. PowerTOP is Aborting"
+msgstr ""
+
+#: src/main.cpp:252
 #, c-format
 msgid "Preparing to take measurements\n"
 msgstr "Bersiap melakukan pengkukuran\n"
 
-#: src/main.cpp:254
-#, c-format
-msgid "Measuring %d time(s) for %d seconds each\n"
+#: src/main.cpp:255
+#, fuzzy, c-format
+msgid "Taking %d measurement(s) for a duration of %d second(s) each.\n"
 msgstr "Mengukur %d kali selama masing-masing %d detik\n"
 
-#: src/main.cpp:277
+#: src/main.cpp:278
 #, c-format
 msgid "PowerTOP "
 msgstr "PowerTOP "
 
-#: src/main.cpp:278 src/main.cpp:367
+#: src/main.cpp:279 src/main.cpp:307
 #, c-format
 msgid "exiting...\n"
 msgstr "keluar...\n"
 
-#: src/main.cpp:366
+#: src/main.cpp:306
 #, c-format
 msgid "Failed to mount debugfs!\n"
 msgstr "Gagal mengait debugfs!\n"
 
-#: src/main.cpp:433
-#, c-format
-msgid "Leaving PowerTOP\n"
+#: src/main.cpp:443
+#, fuzzy, c-format
+msgid "Leaving PowerTOP"
 msgstr "Meninggalkan PowerTOP\n"
+
+#~ msgid " <ESC> Exit | "
+#~ msgstr " <ESC> Keluar | "
+
+#~ msgid "C3 (cc3)"
+#~ msgstr "C3 (cc3)"
+
+#~ msgid "C6 (cc6)"
+#~ msgstr "C6 (cc6)"
+
+#~ msgid "C7 (cc7)"
+#~ msgstr "C7 (cc7)"
+
+#~ msgid "C2 (pc2)"
+#~ msgstr "C2 (pc2)"
+
+#~ msgid "C3 (pc3)"
+#~ msgstr "C3 (pc3)"
+
+#~ msgid "C6 (pc6)"
+#~ msgstr "C6 (pc6)"
+
+#~ msgid "C7 (pc7)"
+#~ msgstr "C7 (pc7)"
+
+#~ msgid ""
+#~ "<h2>Process device activity</h2>\n"
+#~ " <table width=\"100%%\">\n"
+#~ msgstr ""
+#~ "<h2>Aktivitas perangkat proses</h2>\n"
+#~ " <table width=\"100%%\">\n"
+
+#~ msgid ""
+#~ "<tr><th class=\"device\" width=\"40%%\">Process</th><th class=\"device"
+#~ "\">Device</th></tr>\n"
+#~ msgstr ""
+#~ "<tr><th class=\"device\" width=\"40%%\">Proses</th><th class=\"device"
+#~ "\">Perangkat</th></tr>\n"
+
+#~ msgid ""
+#~ "**Process Device Activity**, \n"
+#~ "\n"
+#~ msgstr ""
+#~ "**Aktivitas Perangkat Proses**, \n"
+#~ "\n"
+
+#~ msgid "Process, Device, \n"
+#~ msgstr "Proses, Perangkat, \n"
+
+#~ msgid "%9lli"
+#~ msgstr "%9lli"
+
+#~ msgid "%4lli MHz"
+#~ msgstr "%4lli MHz"
+
+#~ msgid "%6lli MHz"
+#~ msgstr "%6lli MHz"
+
+#~ msgid "%4.2f GHz"
+#~ msgstr "%4.2f GHz"
+
+#~ msgid "%3.1f GHz"
+#~ msgstr "%3.1f GHz"
+
+#~ msgid "Power est.      Usage       Events/s    Category       Description\n"
+#~ msgstr "Est. daya       Pakai       Event/s     Kategori       Deskripsi\n"
+
+#~ msgid "                Usage       Events/s    Category       Description\n"
+#~ msgstr "                Pakai       Event/s     Kategori       Deskripsi\n"
+
+#~ msgid ""
+#~ "CONFIG_PERF_EVENTS=y\n"
+#~ "CONFIG_PERF_COUNTERS=y\n"
+#~ "CONFIG_TRACEPOINTS=y\n"
+#~ "CONFIG_TRACING=y\n"
+#~ msgstr ""
+#~ "CONFIG_PERF_EVENTS=y\n"
+#~ "CONFIG_PERF_COUNTERS=y\n"
+#~ "CONFIG_TRACEPOINTS=y\n"
+#~ "CONFIG_TRACING=y\n"
diff --git a/po/powertop.pot b/po/powertop.pot
index 804facb..b51a516 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: \"powertop@lists.01.org\"\n"
-"POT-Creation-Date: 2012-05-31 10:51-0700\n"
+"POT-Creation-Date: 2012-05-31 14:03-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,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/parameters/persistent.cpp:46
+#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140
 msgid "Cannot save to file "
 msgstr ""
 
-#: src/parameters/persistent.cpp:78
+#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:165
 msgid "Cannot load from file "
 msgstr ""
 
@@ -30,14 +30,6 @@ msgstr ""
 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 ""
@@ -55,7 +47,7 @@ msgid "Device stats"
 msgstr ""
 
 #: src/display.cpp:131
-msgid " <ESC> Exit | "
+msgid "Exit"
 msgstr ""
 
 #: src/cpu/cpu_core.cpp:46 src/cpu/cpu_core.cpp:190 src/cpu/intel_cpus.cpp:296
@@ -173,12 +165,88 @@ msgstr ""
 msgid "The estimated remaining time is %i hours, %i minutes\n"
 msgstr ""
 
-#: src/process/do_process.cpp:847
-msgid "Power est.      Usage       Events/s    Category       Description\n"
+#: src/process/do_process.cpp:842
+msgid "Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1029
+msgid "wakeups/second"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "GPU ops/seconds"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "VFS ops/sec and"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1030
+msgid "CPU use"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:914
+#: src/process/do_process.cpp:1034
+msgid "Power est."
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Usage"
 msgstr ""
 
-#: src/process/do_process.cpp:849
-msgid "                Usage       Events/s    Category       Description\n"
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Events/s"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Category"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Description"
+msgstr ""
+
+#: src/process/do_process.cpp:911
+msgid "Overview of Software Power Consumers"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GPU ops/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Disk IO/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GFX Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:1026
+msgid "Power Consumption Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:1029
+msgid "GPU ops/second"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "VFS ops/sec"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "GFX wakes/sec and"
 msgstr ""
 
 #: src/perf/perf.cpp:121
@@ -415,67 +483,64 @@ msgid "Set refresh time out"
 msgstr ""
 
 #: src/main.cpp:103
-#, c-format
-msgid ""
-"Usage: powertop [OPTIONS]\n"
-"\n"
+msgid "Usage: powertop [OPTIONS]"
 msgstr ""
 
 #: src/main.cpp:104
-#, c-format
-msgid "--debug \t\t run in \"debug\" mode\n"
+msgid "run in \"debug\" mode"
 msgstr ""
 
 #: src/main.cpp:105
-#, c-format
-msgid "--version \t\t print version information\n"
+msgid "print version information"
 msgstr ""
 
 #: src/main.cpp:106
-#, c-format
-msgid "--calibrate \t\t runs powertop in calibration mode\n"
+msgid "runs powertop in calibration mode"
 msgstr ""
 
 #: src/main.cpp:107
-#, c-format
-msgid "--extech=devnode \t uses an Extech Power Analyzer for measurements\n"
+msgid "[=devnode]"
+msgstr ""
+
+#: src/main.cpp:107
+msgid "uses an Extech Power Analyzer for measurements"
+msgstr ""
+
+#: src/main.cpp:108 src/main.cpp:109
+msgid "[=FILENAME]"
 msgstr ""
 
 #: src/main.cpp:108
-#, c-format
-msgid "--html[=FILENAME] \t generate a html report\n"
+msgid "generate a html report"
 msgstr ""
 
 #: src/main.cpp:109
-#, c-format
-msgid "--csv[=FILENAME] \t generate a csv report\n"
+msgid "generate a csv report"
 msgstr ""
 
 #: src/main.cpp:110
-#, c-format
-msgid "--time[=secs] \t\t generate a report for 'x' secs\n"
+msgid "[=seconds]"
+msgstr ""
+
+#: src/main.cpp:110
+msgid "generate a report for 'x' seconds"
 msgstr ""
 
 #: src/main.cpp:111
-#, c-format
-msgid "--iteration[=iterations] number of times to run each test\n"
+msgid "[=iterations] number of times to run each test"
 msgstr ""
 
 #: src/main.cpp:112
-#, c-format
-msgid "--help \t\t\t print this help menu\n"
+msgid "print this help menu"
 msgstr ""
 
 #: src/main.cpp:114
-#, c-format
-msgid ""
-"For more help please refer to the README\n"
-"\n"
+msgid "For more help please refer to the README"
 msgstr ""
 
 #: src/main.cpp:224
 #, c-format
-msgid "Out of memory. Aborting...\n"
+msgid "PowerTOP is out of memory. PowerTOP is Aborting"
 msgstr ""
 
 #: src/main.cpp:252
@@ -485,7 +550,7 @@ msgstr ""
 
 #: src/main.cpp:255
 #, c-format
-msgid "Measuring %d time(s) for %d seconds each\n"
+msgid "Taking %d measurement(s) for a duration of %d second(s) each.\n"
 msgstr ""
 
 #: src/main.cpp:278
@@ -505,5 +570,5 @@ msgstr ""
 
 #: src/main.cpp:443
 #, c-format
-msgid "Leaving PowerTOP\n"
+msgid "Leaving PowerTOP"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2895574..7ef8594 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,32 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Intel Corporation
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Yuan CHAO <yuanchao@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: PowerTOP\n"
-"Report-Msgid-Bugs-To: \"power@bughost.org\"\n"
-"POT-Creation-Date: 2012-05-10 12:53-0700\n"
+"Report-Msgid-Bugs-To: \"powertop@lists.01.org\"\n"
+"POT-Creation-Date: 2012-05-31 14:03-0700\n"
 "PO-Revision-Date: 2012-05-27 21:06+0000\n"
 "Last-Translator: Yuan CHAO <yuanchao@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/PowerTOP/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
+"PowerTOP/language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:139
+#: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140
 msgid "Cannot save to file "
 msgstr "無法保存到檔案 "
 
-#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:164
+#: src/parameters/persistent.cpp:78 src/parameters/persistent.cpp:165
 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 "載入 %i 先前量測數據\n"
@@ -48,8 +49,8 @@ msgid "Device stats"
 msgstr "設備統計"
 
 #: src/display.cpp:131
-msgid " <ESC> Exit | "
-msgstr " <ESC> 離開 | "
+msgid "Exit"
+msgstr ""
 
 #: src/cpu/cpu_core.cpp:46 src/cpu/cpu_core.cpp:190 src/cpu/intel_cpus.cpp:296
 #, c-format
@@ -78,6 +79,16 @@ msgstr "cpu 代號 %i"
 msgid "cpu package"
 msgstr "cpu 代號"
 
+#: 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 "C0 輪巡"
@@ -98,33 +109,15 @@ msgstr "代號"
 msgid "  Package"
 msgstr "  代號"
 
-#: src/cpu/intel_cpus.cpp:103
-msgid "C3 (cc3)"
-msgstr "C3 (cc3)"
-
-#: src/cpu/intel_cpus.cpp:104
-msgid "C6 (cc6)"
-msgstr "C6 (cc6)"
-
-#: src/cpu/intel_cpus.cpp:106
-msgid "C7 (cc7)"
-msgstr "C7 (cc7)"
-
-#: src/cpu/intel_cpus.cpp:351
-msgid "C2 (pc2)"
-msgstr "C2 (pc2)"
-
-#: src/cpu/intel_cpus.cpp:353
-msgid "C3 (pc3)"
-msgstr "C3 (pc3)"
-
-#: src/cpu/intel_cpus.cpp:354
-msgid "C6 (pc6)"
-msgstr "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)"
-msgstr "C7 (pc7)"
+#: src/cpu/intel_cpus.cpp:79
+#, c-format
+msgid "pread cpu%d 0x%llx : "
+msgstr ""
 
 #: src/cpu/intel_cpus.cpp:529
 msgid "C0 active"
@@ -135,103 +128,131 @@ msgstr "C0 運作中"
 msgid "Actual"
 msgstr "實際"
 
-#: src/devlist.cpp:309
-#, c-format
-msgid ""
-"<h2>Process device activity</h2>\n"
-" <table width=\"100%%\">\n"
-msgstr "<h2>程緒 設備 活動量</h2>\n <table width=\"100%%\">\n"
-
-#: src/devlist.cpp:310
-#, c-format
-msgid ""
-"<tr><th class=\"device\" width=\"40%%\">Process</th><th "
-"class=\"device\">Device</th></tr>\n"
-msgstr "<tr><th class=\"device\" width=\"40%%\">程緒</th><th class=\"device\">設備</th></tr>\n"
-
-#: src/devlist.cpp:312
-#, c-format
-msgid ""
-"**Process Device Activity**, \n"
-"\n"
-msgstr "**程緒 設備 活動量**, \n\n"
-
-#: src/devlist.cpp:313
-#, c-format
-msgid "Process, Device, \n"
-msgstr "程緒, 設備, \n"
-
-#: src/lib.cpp:82
-#, c-format
-msgid "%9lli"
-msgstr "%9lli"
-
-#: src/lib.cpp:86
-#, c-format
-msgid "%4lli MHz"
-msgstr "%4lli MHz"
-
-#: src/lib.cpp:88
-#, c-format
-msgid "%6lli MHz"
-msgstr "%6lli MHz"
-
-#: src/lib.cpp:93
-#, c-format
-msgid "%4.2f GHz"
-msgstr "%4.2f GHz"
-
-#: src/lib.cpp:95
-#, c-format
-msgid "%3.1f GHz"
-msgstr "%3.1f GHz"
-
-#: src/lib.cpp:241
+#: src/lib.cpp:257
 #, c-format
 msgid "%7sW"
 msgstr "%7sW"
 
-#: src/lib.cpp:244
+#: src/lib.cpp:260
 #, c-format
 msgid "    0 mW"
 msgstr "    0 mW"
 
-#: src/lib.cpp:353
+#: src/lib.cpp:369
 msgid "PS/2 Touchpad / Keyboard / Mouse"
 msgstr "PS/2  觸控板 / 鍵盤 / 滑鼠"
 
-#: src/lib.cpp:354
+#: src/lib.cpp:370
 msgid "SATA controller"
 msgstr "SATA 控制器"
 
-#: src/lib.cpp:355
+#: src/lib.cpp:371
 msgid "Intel built in USB hub"
 msgstr "Intel 內建 USB 集線器"
 
-#: 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 "預估用電量: %5.1f         實測用電量: %5.1f        總計: %5.1f\n\n"
+msgstr ""
+"預估用電量: %5.1f         實測用電量: %5.1f        總計: %5.1f\n"
+"\n"
 
-#: 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 "電池回報放電速率為 %sW\n"
 
-#: src/process/do_process.cpp:829
-#, c-format
-msgid "The estimated remaining time is %i minutes\n"
+#: src/process/do_process.cpp:834
+#, fuzzy, c-format
+msgid "The estimated remaining time is %i hours, %i minutes\n"
 msgstr "預期剩餘時間為 %i 分鐘\n"
 
 #: src/process/do_process.cpp:842
-msgid "Power est.      Usage       Events/s    Category       Description\n"
-msgstr "電源預估        使用量      頻率        分類           描述\n"
+msgid "Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1029
+msgid "wakeups/second"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "GPU ops/seconds"
+msgstr ""
+
+#: src/process/do_process.cpp:842
+msgid "VFS ops/sec and"
+msgstr ""
+
+#: src/process/do_process.cpp:842 src/process/do_process.cpp:1030
+msgid "CPU use"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:914
+#: src/process/do_process.cpp:1034
+#, fuzzy
+msgid "Power est."
+msgstr "PowerTOP "
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Usage"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Events/s"
+msgstr ""
+
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Category"
+msgstr ""
 
-#: src/process/do_process.cpp:844
-msgid "                Usage       Events/s    Category       Description\n"
-msgstr "                使用量      頻率        分類           描述\n"
+#: src/process/do_process.cpp:846 src/process/do_process.cpp:848
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+#: src/process/do_process.cpp:1034 src/process/do_process.cpp:1038
+msgid "Description"
+msgstr ""
+
+#: src/process/do_process.cpp:911
+msgid "Overview of Software Power Consumers"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GPU ops/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "Disk IO/s"
+msgstr ""
+
+#: src/process/do_process.cpp:914 src/process/do_process.cpp:917
+msgid "GFX Wakeups/s"
+msgstr ""
+
+#: src/process/do_process.cpp:1026
+msgid "Power Consumption Summary"
+msgstr ""
+
+#: src/process/do_process.cpp:1029
+msgid "GPU ops/second"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "VFS ops/sec"
+msgstr ""
+
+#: src/process/do_process.cpp:1030
+msgid "GFX wakes/sec and"
+msgstr ""
 
 #: src/perf/perf.cpp:121
 #, c-format
@@ -243,15 +264,6 @@ msgstr "PowerTOP %s 需要 Linux 核心 'perf' 子系統支援\n"
 msgid "as well as support for trace points in the kernel:\n"
 msgstr "以及 Linux 核心中斷點 (trace point) 支援:\n"
 
-#: 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 "CONFIG_PERF_EVENTS=y\nCONFIG_PERF_COUNTERS=y\nCONFIG_TRACEPOINTS=y\nCONFIG_TRACING=y\n"
-
 #: src/devices/device.cpp:177
 #, c-format
 msgid "System baseline power is estimated at %sW\n"
@@ -407,159 +419,256 @@ msgstr "自動閒置於未知的 USB 設備 %s (%s:%s)"
 msgid "Autosuspend for USB device %s [%s]"
 msgstr "自動閒置於 USB 設備 %s [%s]"
 
-#: src/calibrate/calibrate.cpp:297
+#: src/calibrate/calibrate.cpp:291
 #, c-format
 msgid "Cannot create temp file\n"
 msgstr "無法建立暫存檔案\n"
 
-#: src/calibrate/calibrate.cpp:316
+#: src/calibrate/calibrate.cpp:310
 #, c-format
 msgid "Calibrating: CPU usage on %i threads\n"
 msgstr "校正: CPU 使用量於 %i 執行緒\n"
 
-#: src/calibrate/calibrate.cpp:331
+#: src/calibrate/calibrate.cpp:325
 #, c-format
 msgid "Calibrating: CPU wakeup power consumption\n"
 msgstr "校正: CPU 喚醒電源使用量\n"
 
-#: src/calibrate/calibrate.cpp:348
+#: src/calibrate/calibrate.cpp:342
 #, c-format
 msgid "Calibrating USB devices\n"
 msgstr "校正 USB 設備\n"
 
-#: 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 ".... 裝置 %s \n"
 
-#: src/calibrate/calibrate.cpp:365
+#: src/calibrate/calibrate.cpp:359
 #, c-format
 msgid "Calibrating radio devices\n"
 msgstr "校正無線電設備\n"
 
-#: src/calibrate/calibrate.cpp:389
+#: src/calibrate/calibrate.cpp:383
 #, c-format
 msgid "Calibrating backlight\n"
 msgstr "校正螢幕背光\n"
 
-#: 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 "校正閒置\n"
 
-#: src/calibrate/calibrate.cpp:432
+#: src/calibrate/calibrate.cpp:426
 #, c-format
 msgid "Calibrating: disk usage \n"
 msgstr "校正: 磁碟使用\n"
 
-#: src/calibrate/calibrate.cpp:457
+#: src/calibrate/calibrate.cpp:451
 msgid "Starting PowerTOP power estimate calibration \n"
 msgstr "開始 PowerTOP 電源預期校正 \n"
 
-#: src/calibrate/calibrate.cpp:480
+#: src/calibrate/calibrate.cpp:474
 msgid "Finishing PowerTOP power estimate calibration \n"
 msgstr "完成 PowerTOP 電源預期校正 \n"
 
-#: src/calibrate/calibrate.cpp:484
+#: src/calibrate/calibrate.cpp:478
 #, c-format
 msgid "Parameters after calibration:\n"
 msgstr "校正取得參數:\n"
 
-#: src/main.cpp:83
-#, c-format
-msgid "Powertop version"
+#: src/main.cpp:84
+#, fuzzy, c-format
+msgid "PowerTOP version"
 msgstr "Powertop 版本"
 
-#: src/main.cpp:89
+#: src/main.cpp:90
 msgid "Set refresh time out"
 msgstr "設定更新週期"
 
-#: src/main.cpp:102
-#, c-format
-msgid ""
-"Usage: powertop [OPTIONS]\n"
+#: src/main.cpp:103
+#, fuzzy
+msgid "Usage: powertop [OPTIONS]"
+msgstr ""
+"用法: powertop [選項]\n"
 "\n"
-msgstr "用法: powertop [選項]\n\n"
 
-#: src/main.cpp:103
-#, c-format
-msgid "--debug \t\t run in \"debug\" mode\n"
+#: src/main.cpp:104
+#, fuzzy
+msgid "run in \"debug\" mode"
 msgstr "--debug \t\t 以 \"debug\" 模式執行\n"
 
-#: src/main.cpp:104
-#, c-format
-msgid "--version \t\t print version information\n"
+#: src/main.cpp:105
+#, fuzzy
+msgid "print version information"
 msgstr "--version \t\t 顯示版本資訊\n"
 
-#: src/main.cpp:105
-#, c-format
-msgid "--calibrate \t\t runs powertop in calibration mode\n"
+#: src/main.cpp:106
+#, fuzzy
+msgid "runs powertop in calibration mode"
 msgstr "--calibrate \t\t 以校正模式執行 powertop\n"
 
-#: src/main.cpp:106
-#, c-format
-msgid "--extech=devnode \t uses an Extech Power Analyzer for measurements\n"
-msgstr "--extech=devnode \t 使用 Extech 電源分析儀進行量測\n"
+#: src/main.cpp:107
+msgid "[=devnode]"
+msgstr ""
 
 #: src/main.cpp:107
-#, c-format
-msgid "--html[=FILENAME] \t generate a html report\n"
-msgstr "--html[=FILENAME] \t 產生 html 報告\n"
+#, fuzzy
+msgid "uses an Extech Power Analyzer for measurements"
+msgstr "--extech=devnode \t 使用 Extech 電源分析儀進行量測\n"
+
+#: src/main.cpp:108 src/main.cpp:109
+msgid "[=FILENAME]"
+msgstr ""
 
 #: src/main.cpp:108
-#, c-format
-msgid "--csv[=FILENAME] \t generate a csv report\n"
-msgstr "--csv[=FILENAME] \t 產生 csv 報告\n"
+#, fuzzy
+msgid "generate a html report"
+msgstr "--html[=FILENAME] \t 產生 html 報告\n"
 
 #: src/main.cpp:109
-#, c-format
-msgid "--time[=secs] \t\t generate a report for 'x' secs\n"
-msgstr "--time[=secs] \t\t 產生蒐集資料 'x' 秒鐘的報告\n"
+#, fuzzy
+msgid "generate a csv report"
+msgstr "--csv[=FILENAME] \t 產生 csv 報告\n"
 
 #: src/main.cpp:110
-#, c-format
-msgid "--iteration[=iterations] number of times to run each test\n"
-msgstr "--iteration[=iterations] 每次檢驗進行量測次數\n"
+msgid "[=seconds]"
+msgstr ""
+
+#: src/main.cpp:110
+#, fuzzy
+msgid "generate a report for 'x' seconds"
+msgstr "--time[=secs] \t\t 產生蒐集資料 'x' 秒鐘的報告\n"
 
 #: src/main.cpp:111
-#, c-format
-msgid "--help \t\t\t print this help menu\n"
+#, fuzzy
+msgid "[=iterations] number of times to run each test"
+msgstr "--iteration[=iterations] 每次檢驗進行量測次數\n"
+
+#: src/main.cpp:112
+#, fuzzy
+msgid "print this help menu"
 msgstr "--help \t\t\t 顯示此輔助說明選單\n"
 
-#: src/main.cpp:113
-#, c-format
-msgid ""
-"For more help please refer to the README\n"
+#: src/main.cpp:114
+#, fuzzy
+msgid "For more help please refer to the README"
+msgstr ""
+"更多的輔助說明請參閱 README\n"
 "\n"
-msgstr "更多的輔助說明請參閱 README\n\n"
 
-#: src/main.cpp:251
+#: src/main.cpp:224
+#, c-format
+msgid "PowerTOP is out of memory. PowerTOP is Aborting"
+msgstr ""
+
+#: src/main.cpp:252
 #, c-format
 msgid "Preparing to take measurements\n"
 msgstr "量測準備中\n"
 
-#: src/main.cpp:254
-#, c-format
-msgid "Measuring %d time(s) for %d seconds each\n"
+#: src/main.cpp:255
+#, fuzzy, c-format
+msgid "Taking %d measurement(s) for a duration of %d second(s) each.\n"
 msgstr "測量 %d 次於每 %d 秒\n"
 
-#: src/main.cpp:277
+#: src/main.cpp:278
 #, c-format
 msgid "PowerTOP "
 msgstr "PowerTOP "
 
-#: src/main.cpp:278 src/main.cpp:367
+#: src/main.cpp:279 src/main.cpp:307
 #, c-format
 msgid "exiting...\n"
 msgstr "離開中...\n"
 
-#: src/main.cpp:366
+#: src/main.cpp:306
 #, c-format
 msgid "Failed to mount debugfs!\n"
 msgstr "debugfs 掛載失敗!\n"
 
-#: src/main.cpp:433
-#, c-format
-msgid "Leaving PowerTOP\n"
+#: src/main.cpp:443
+#, fuzzy, c-format
+msgid "Leaving PowerTOP"
 msgstr "離開 PowerTOP\n"
+
+#~ msgid " <ESC> Exit | "
+#~ msgstr " <ESC> 離開 | "
+
+#~ msgid "C3 (cc3)"
+#~ msgstr "C3 (cc3)"
+
+#~ msgid "C6 (cc6)"
+#~ msgstr "C6 (cc6)"
+
+#~ msgid "C7 (cc7)"
+#~ msgstr "C7 (cc7)"
+
+#~ msgid "C2 (pc2)"
+#~ msgstr "C2 (pc2)"
+
+#~ msgid "C3 (pc3)"
+#~ msgstr "C3 (pc3)"
+
+#~ msgid "C6 (pc6)"
+#~ msgstr "C6 (pc6)"
+
+#~ msgid "C7 (pc7)"
+#~ msgstr "C7 (pc7)"
+
+#~ msgid ""
+#~ "<h2>Process device activity</h2>\n"
+#~ " <table width=\"100%%\">\n"
+#~ msgstr ""
+#~ "<h2>程緒 設備 活動量</h2>\n"
+#~ " <table width=\"100%%\">\n"
+
+#~ msgid ""
+#~ "<tr><th class=\"device\" width=\"40%%\">Process</th><th class=\"device"
+#~ "\">Device</th></tr>\n"
+#~ msgstr ""
+#~ "<tr><th class=\"device\" width=\"40%%\">程緒</th><th class=\"device\">設備"
+#~ "</th></tr>\n"
+
+#~ msgid ""
+#~ "**Process Device Activity**, \n"
+#~ "\n"
+#~ msgstr ""
+#~ "**程緒 設備 活動量**, \n"
+#~ "\n"
+
+#~ msgid "Process, Device, \n"
+#~ msgstr "程緒, 設備, \n"
+
+#~ msgid "%9lli"
+#~ msgstr "%9lli"
+
+#~ msgid "%4lli MHz"
+#~ msgstr "%4lli MHz"
+
+#~ msgid "%6lli MHz"
+#~ msgstr "%6lli MHz"
+
+#~ msgid "%4.2f GHz"
+#~ msgstr "%4.2f GHz"
+
+#~ msgid "%3.1f GHz"
+#~ msgstr "%3.1f GHz"
+
+#~ msgid "Power est.      Usage       Events/s    Category       Description\n"
+#~ msgstr "電源預估        使用量      頻率        分類           描述\n"
+
+#~ msgid "                Usage       Events/s    Category       Description\n"
+#~ msgstr "                使用量      頻率        分類           描述\n"
+
+#~ msgid ""
+#~ "CONFIG_PERF_EVENTS=y\n"
+#~ "CONFIG_PERF_COUNTERS=y\n"
+#~ "CONFIG_TRACEPOINTS=y\n"
+#~ "CONFIG_TRACING=y\n"
+#~ msgstr ""
+#~ "CONFIG_PERF_EVENTS=y\n"
+#~ "CONFIG_PERF_COUNTERS=y\n"
+#~ "CONFIG_TRACEPOINTS=y\n"
+#~ "CONFIG_TRACING=y\n"