diff options
author | Chris E Ferron <chris.e.ferron@linux.intel.com> | 2012-08-06 09:46:47 -0700 |
---|---|---|
committer | Chris E Ferron <chris.e.ferron@linux.intel.com> | 2012-08-06 09:46:47 -0700 |
commit | 46eafad554cbc9a0b59fd0805a673fbe68ceb401 (patch) | |
tree | 9cf46e98bfa2a2cee4405303cbf7241d1a1b1a0a | |
parent | 50f852a8b1fe4e100f7c695eff0a5e0191bbcfb9 (diff) |
cleanup and po update
-rw-r--r-- | po/ca.po | 11 | ||||
-rw-r--r-- | po/cs_CZ.po | 15 | ||||
-rw-r--r-- | po/de_DE.po | 11 | ||||
-rw-r--r-- | po/en_GB.po | 11 | ||||
-rw-r--r-- | po/en_US.po | 11 | ||||
-rw-r--r-- | po/es_ES.po | 14 | ||||
-rw-r--r-- | src/cpu/cpu.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 10 |
8 files changed, 51 insertions, 34 deletions
@@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Intel Corporation # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # capimans, 2012. # Il_Tifossi <lluita_i_no_dorm@hotmail.com>, 2011. @@ -13,11 +13,12 @@ msgstr "" "POT-Creation-Date: 2012-05-31 14:03-0700\n" "PO-Revision-Date: 2012-06-04 19:23+0000\n" "Last-Translator: Juanma Hernández <juanmah@gmail.com>\n" -"Language-Team: Catalan (http://www.transifex.com/projects/p/PowerTOP/language/ca/)\n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/PowerTOP/" +"language/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140 @@ -156,7 +157,9 @@ msgstr "Intel connectat a port USB" msgid "" "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" "\n" -msgstr "Potència estimada: %5.1f Potència mesurada: %5.1f Suma: %5.1f\n\n" +msgstr "" +"Potència estimada: %5.1f Potència mesurada: %5.1f Suma: %5.1f\n" +"\n" #: src/process/do_process.cpp:829 src/devices/device.cpp:171 #, c-format diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 892a0f2..f27b538 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Intel Corporation # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Otto Bříza <otto.briza@gmail.com>, 2012. msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2012-05-31 14:03-0700\n" "PO-Revision-Date: 2012-07-12 15:01+0000\n" "Last-Translator: Otto Bříza <otto.briza@gmail.com>\n" -"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/PowerTOP/language/cs_CZ/)\n" +"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/" +"PowerTOP/language/cs_CZ/)\n" +"Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" #: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140 @@ -86,7 +87,9 @@ msgstr "cpu_idle událost nevrátila stav?\n" #: src/cpu/cpu.cpp:940 #, c-format msgid "power or cpu_frequecny event returned no state?\n" -msgstr "power nebo cpu_frequecny událost nevrátila stav?\n\n" +msgstr "" +"power nebo cpu_frequecny událost nevrátila stav?\n" +"\n" #: src/cpu/cpu_linux.cpp:92 msgid "C0 polling" @@ -154,7 +157,9 @@ msgstr "Intel vestavěn v USB hubu" msgid "" "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" "\n" -msgstr "Odhad energie: %5.1f Změřená energie: %5.1f Součet: %5.1f\n\n" +msgstr "" +"Odhad energie: %5.1f Změřená energie: %5.1f Součet: %5.1f\n" +"\n" #: src/process/do_process.cpp:829 src/devices/device.cpp:171 #, c-format diff --git a/po/de_DE.po b/po/de_DE.po index e3c2800..1b95e96 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Intel Corporation # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Fabian Affolter <fab@fedoraproject.org>, 2011. # <ulf.hofemeier@intel.com>, 2012. @@ -12,11 +12,12 @@ msgstr "" "POT-Creation-Date: 2012-05-31 14:03-0700\n" "PO-Revision-Date: 2012-05-31 22:35+0000\n" "Last-Translator: Patrick McCarty <patrick.mccarty@linux.intel.com>\n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/PowerTOP/language/de_DE/)\n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/" +"PowerTOP/language/de_DE/)\n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140 @@ -155,7 +156,9 @@ msgstr "Intel integrierter USB Hub" msgid "" "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" "\n" -msgstr "Geschätzter Stromverbrauch: %5.1f Gemessener Stromverbrauch: %5.1f Summe: %5.1f\\n\n" +msgstr "" +"Geschätzter Stromverbrauch: %5.1f Gemessener Stromverbrauch: %5.1f " +"Summe: %5.1f\\n\n" #: src/process/do_process.cpp:829 src/devices/device.cpp:171 #, c-format diff --git a/po/en_GB.po b/po/en_GB.po index 4f857c3..37659a2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Intel Corporation # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Margie Foster <margie@linux.intel.com>, 2012. msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2012-05-31 14:03-0700\n" "PO-Revision-Date: 2012-05-31 22:35+0000\n" "Last-Translator: Patrick McCarty <patrick.mccarty@linux.intel.com>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/PowerTOP/language/en_GB/)\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" +"PowerTOP/language/en_GB/)\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140 @@ -154,7 +155,9 @@ msgstr "Intel built in USB hub" msgid "" "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" "\n" -msgstr "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n\n" +msgstr "" +"Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" +"\n" #: src/process/do_process.cpp:829 src/devices/device.cpp:171 #, c-format diff --git a/po/en_US.po b/po/en_US.po index ea3d67a..812a78f 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Intel Corporation # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Dimitris Glezos <glezos@indifex.com>, 2011. msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2012-05-31 14:03-0700\n" "PO-Revision-Date: 2012-05-31 22:35+0000\n" "Last-Translator: Patrick McCarty <patrick.mccarty@linux.intel.com>\n" -"Language-Team: English (United States) (http://www.transifex.com/projects/p/PowerTOP/language/en_US/)\n" +"Language-Team: English (United States) (http://www.transifex.com/projects/p/" +"PowerTOP/language/en_US/)\n" +"Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_US\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140 @@ -154,7 +155,9 @@ msgstr "Intel built in USB hub" msgid "" "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" "\n" -msgstr "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n\n" +msgstr "" +"Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" +"\n" #: src/process/do_process.cpp:829 src/devices/device.cpp:171 #, c-format diff --git a/po/es_ES.po b/po/es_ES.po index fb5b12a..49edcb1 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Intel Corporation # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Andres <andreshko9@hotmail.com>, 2011. msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2012-05-31 22:35+0000\n" "Last-Translator: Patrick McCarty <patrick.mccarty@linux.intel.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/parameters/persistent.cpp:46 src/parameters/persistent.cpp:140 @@ -154,7 +154,9 @@ msgstr "Intel construido en concentrador USB" msgid "" "Estimated power: %5.1f Measured power: %5.1f Sum: %5.1f\n" "\n" -msgstr "Energía estimada: %5.1f Energía medida: %5.1f Sum: %5.1f\n\n" +msgstr "" +"Energía estimada: %5.1f Energía medida: %5.1f Sum: %5.1f\n" +"\n" #: src/process/do_process.cpp:829 src/devices/device.cpp:171 #, c-format @@ -392,12 +394,14 @@ msgstr "Tiempo de ejecución PM para %s dispositivo %s" #: src/tuning/runtime.cpp:49 #, c-format msgid "%s device %s has no runtime power management" -msgstr "%s dispositivo %s no tiene administración de energía en tiempo de ejecución" +msgstr "" +"%s dispositivo %s no tiene administración de energía en tiempo de ejecución" #: src/tuning/runtime.cpp:73 #, c-format msgid "PCI Device %s has no runtime power management" -msgstr "Dispositivo PCI %s no tiene administración de energía en tiempo de ejecución" +msgstr "" +"Dispositivo PCI %s no tiene administración de energía en tiempo de ejecución" #: src/tuning/runtime.cpp:75 #, c-format diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 0c36bae..26c09b4 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -28,7 +28,7 @@ #include <string.h> #include <stdlib.h> #include <ncurses.h> - +#include <unistd.h> #include "cpu.h" #include "cpudevice.h" #include "../parameters/parameters.h" diff --git a/src/main.cpp b/src/main.cpp index 2c3639a..ad87f74 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -180,8 +180,6 @@ static void do_sleep(int seconds) void one_measurement(int seconds, char *workload) { - int tmp; - create_all_usb_devices(); start_power_measurement(); devices_start_measurement(); @@ -189,11 +187,10 @@ void one_measurement(int seconds, char *workload) start_cpu_measurement(); if (workload && workload[0]) { - tmp = system(workload); - } - else + system(workload); + } else { do_sleep(seconds); - + } end_cpu_measurement(); end_process_measurement(); collect_open_devices(); @@ -281,7 +278,6 @@ static void powertop_init(void) static char initialized = 0; int ret; struct statfs st_fs; - char filename[4096]; if (initialized) return; |