diff -u powersave-0.15.20/debian/changelog powersave-0.15.20/debian/changelog
--- powersave-0.15.20/debian/changelog
+++ powersave-0.15.20/debian/changelog
@@ -1,3 +1,18 @@
+powersave (0.15.20-3ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable (LP: #296726), remaining changes:
+ - Add Replaces/Provides for powernowd and apmd, to allow installation
+ with *ubuntu-desktop meta packages.
+ - Drop changes for powerdev group used for dbus access on Debian:
+ + Drop debian/patches/dbus_access.patch.
+ + Drop debian/patches/man_powerdev_group.patch.
+ + Drop debian/NEWS.
+ + Drop debian/powersaved.postinst.
+ + Do not depend on adduser package.
+ + Remove Security section from README.Debian.
+
+ -- Iulian Udrea
Schemi di risparmio energetico
\n"
-"Selezionare dall'elenco Alimentazione a corrente alternata lo schema di risparmio "
-"energetico da applicare quando il\n"
+"Selezionare dall'elenco Alimentazione a corrente alternata lo schema "
+"di risparmio energetico da applicare quando il\n"
"computer è collegato a una fonte di corrente alternata.\n"
-"Selezionare dall'elenco Alimentazione a batteria lo schema da applicare quando il"
-"computer è alimentato dalla batteria interna.
Below the selected schemes, descriptions of both selected schemes\n" "are displayed.
" msgstr "" -"Sotto gli schemi selezionati sono visualizzate le relative descrizioni.
" +"Sotto gli schemi selezionati sono visualizzate le relative descrizioni." +"p>" #. Main dialog help 3/6 #: src/helps.ycp:107 @@ -1328,7 +1329,8 @@ msgstr "Opzioni avanzate di risparmio energetico" msgid "Scheme optimized to let machine run on maximum performance." -msgstr "Schema ottimizzato per il funzionamento del sistema alle massime prestazioni." +msgstr "" +"Schema ottimizzato per il funzionamento del sistema alle massime prestazioni." msgid "Scheme optimized to let maximum power savings take place." msgstr "" @@ -1337,7 +1339,8 @@ msgid "Scheme optimized to let machine run as quietly as possible." msgstr "" -"Schema ottimizzato per ridurre quanto più possibile la rumorosità del sistema." +"Schema ottimizzato per ridurre quanto più possibile la rumorosità del " +"sistema." msgid "" "Scheme optimized for good performance. Display standby mode and screensaver " only in patch2: unchanged: --- powersave-0.15.20.orig/translations/power-management.pl.po +++ powersave-0.15.20/translations/power-management.pl.po @@ -370,7 +370,8 @@ #. command line help text for an option #: src/commandline.ycp:440 msgid "Scheme to use when running on AC power source" -msgstr "Schemat, który ma być użyty w przypadku korzystania z zasilania z sieci" +msgstr "" +"Schemat, który ma być użyty w przypadku korzystania z zasilania z sieci" #. command line help text for an option #: src/commandline.ycp:445 @@ -558,7 +559,8 @@ msgstr "" "
Działania dla przycisków ACPI
\n"
"Proszę przypisać działania, które będą wykonywane po naciśnięciu przycisków."
-"Działania można przypisać do przycisków Zasilanie oraz Usypianie.\n"
+"Działania można przypisać do przycisków Zasilanie oraz Usypianie"
+"b>.\n"
"Do określenia działania związanego z zamykaniem pokrywy laptopa \n"
"służy przycisk Zamykanie pokrywy laptopa.
Tryby dopuszczone dla użytkowników
\n"
-"Proszę określić, które tryby oszczędzania energii mogą włączać użytkownicy.
Obsługiwane tryby oszczędzania energii
\n"
"Niektóre komputery nie obsługują wszystkich trybów oszczędzania energii. \n"
-"Jeśli dany tryb nie jest obsługiwany przez komputer, odpowiednie pole wyboru \n"
+"Jeśli dany tryb nie jest obsługiwany przez komputer, odpowiednie pole "
+"wyboru \n"
"jest nieaktywne.
Schematy oszczędzania energii
\n"
-"Do określenia schematów (zasad) oszczędzania energii przy zasilaniu sieciowym\n"
+"Do określenia schematów (zasad) oszczędzania energii przy zasilaniu "
+"sieciowym\n"
"służy przycisk Zasilanie z sieci.\n"
"Do określenia schematów oszczędzania energii przy zasilaniu z akumulatora \n"
"służy przycisk Zasilanie z akumulatora."
@@ -750,7 +755,8 @@
msgstr ""
"
Konfiguracja schematów\n" "Okno to służy do konfiguracji schematów. W pole Nazwa schematu \n" -"proszę wpisać wybraną nazwę a pole Opis schematu - opcjonalnie jego opis.
" +"proszę wpisać wybraną nazwę a pole Opis schematu - opcjonalnie jego " +"opis." #. Scheme editation dialog 1 help 3/5 #: src/helps.ycp:151 @@ -763,9 +769,12 @@ "according to the current CPU load." msgstr "" "Ustawienia procesora
\n"
-"Proszę użyć Regulacja częstotliwości aby ustawić częstotliwość pracy \n"
-"procesora. Ustawienie Dynamiczna regulacja częstotliwości spowoduje, \n"
-"że częstotliwość pracy procesora będzie zmieniana automatycznie, w zależności \n"
+"Proszę użyć Regulacja częstotliwości aby ustawić częstotliwość "
+"pracy \n"
+"procesora. Ustawienie Dynamiczna regulacja częstotliwości "
+"spowoduje, \n"
+"że częstotliwość pracy procesora będzie zmieniana automatycznie, w "
+"zależności \n"
"od obciążenia.
Jeśli używany procesor nie obsługuje regulacji częstotliwości, \n" "można ustawić stałe spowolnienie procesora podczas pracy z zasilaniem \n" -"z akumulatora. W tym celu proszę ustawić Stałe spowalnianie procesora. \n" +"z akumulatora. W tym celu proszę ustawić Stałe spowalnianie procesora" +"b>. \n" "Ustawienie to może być przydatne podczas długich podróży, w czasie których \n" "pełna moc komputera nie jest potrzebna.
\n" @@ -813,8 +823,10 @@ "Ustawienia dysku
\n"
"Proszę użyć opcji Konfiguracja stanu gotowości aby ustawić zasady \n"
"oszczędzania energii dla twardego dysku. Należy pamiętać, że im większa \n"
-"oszczędność zasilania, tym dłużej trzeba czekać na gotowość dysku do pracy. \n"
-"Opcji Głośność dysku należy użyć, aby ustawić poziom hałasu związany \n"
+"oszczędność zasilania, tym dłużej trzeba czekać na gotowość dysku do "
+"pracy. \n"
+"Opcji Głośność dysku należy użyć, aby ustawić poziom hałasu "
+"związany \n"
"z pracą dysku. Poziom ten można obniżyć przez wymuszenie wolniejszego \n"
"poruszania głowicami. Nie wszystkie dyski obsługują tę funkcję.
Initializing Power Management Configuration
\n"
+"Please wait...
Aborting Initialization
\n"
+"Safely abort the configuration utility by pressing Abort now.
Saving Power Management Configuration
\n"
+"Please wait...
Aborting Saving
\n"
+"Abort the save procedure by pressing Abort.
Battery Capacity Feedback
\n"
+"Set three battery capacity levels and assign actions for\n"
+"each of these capacity levels.
Use Warning Capacity, Low Capacity, and\n" +"Critical Capacity to set battery levels as a percentage of full\n" +"capacity.
" +msgstr "" + +#. Battery warning dialog help 3/3 +#: src/helps.ycp:48 +msgid "" +"Use Warning Level Action, Low Level Action, and\n" +"Critical Level Action to set actions to perform if the relevant\n" +"battery level is reached.
" +msgstr "" + +#. ACPI buttons dialog help 1/1 +#: src/helps.ycp:54 +msgid "" +"ACPI Buttons
\n"
+"Assign events to perform after a button is\n"
+"pressed. Events can be set for the Power Button and Sleep Button"
+"b>.\n"
+"To assign an event to perform when the lid of the laptop is\n"
+"closed, use Laptop Lid Closing.
Modes Permitted for Users
\n"
+"Configure which power-saving modes users should be able to switch to.
Suspend to Disk allows users to suspend the \n" +"computer to the disk (ACPI mode 4).\n" +"Resuming after suspending to disk takes longer than resuming\n" +"after suspending to RAM.
" +msgstr "" + +#. enabling standby/suspend dialog help 3/6 +#: src/helps.ycp:71 +msgid "" +"Suspend to RAM allows users to suspend \n" +"the computer to RAM (ACPI mode 3).\n" +"A computer suspended to RAM still consumes electricity and\n" +"unsaved data will be lost if it is disconnected or the battery drains.
" +msgstr "" + +#. enabling standby/suspend dialog help 4/6 +#: src/helps.ycp:77 +msgid "" +"Standby Mode allows users to \n" +"switch the computer to the standby power saving mode\n" +"(ACPI mode 1).
" +msgstr "" + +#. enabling standby/suspend dialog help 5/6 +#: src/helps.ycp:82 +msgid "" +"Supported Power-Saving Modes\n"
+"
\n"
+"Some machines do not support all power-saving modes. If a mode is not "
+"supported\n"
+"by your machine, the appropriate check box is disabled.
Warning
\n"
+"Depending on your hardware, suspend to RAM or standby could fail and you "
+"may \n"
+"need to push the reset button to reboot your computer. This could lead to \n"
+"data loss.\n"
+"See /usr/share/doc/packages/powersave/README.suspend for details."
+"p>"
+msgstr ""
+
+#. Main dialog help 1/6
+#: src/helps.ycp:96
+msgid ""
+"
Energy Saving Schemes
\n"
+"Use AC Powered to adjust the energy saving scheme to use when your\n"
+"computer is AC powered.\n"
+"Use Battery Powered to adjust the energy saving scheme to use when "
+"your\n"
+"computer is powered by internal battery.
Below the selected schemes, descriptions of both selected schemes\n" +"are displayed.
" +msgstr "" + +#. Main dialog help 3/6 +#: src/helps.ycp:107 +msgid "" +"Adjusting Energy Saving Schemes
\n"
+"To adjust energy saving schemes, delete existing ones, or create new ones,\n"
+"use Edit Schemes.
Battery Warning
\n"
+"To adjust levels of battery status and actions to perform on these levels\n"
+"of battery capacity, use Battery Warning.
ACPI Settings
\n"
+"To adjust operations to perform when an ACPI button is pressed, use\n"
+"ACPI Settings.
Suspend Permissions
\n"
+"To set if users are allowed to switch the computer to the standby or\n"
+"suspend mode, use Suspend Permissions.
Scheme Setup
\n"
+"Here, adjust the energy saving schemes. To modify a scheme, select\n"
+"it and click Edit.
To add a new scheme, select a scheme to clone then click\n" +"Add. To delete an existing scheme, select it and click \n" +"Delete.
" +msgstr "" + +#. Schemes list dialog 3/3 +#: src/helps.ycp:138 +msgid "" +"In the main dialog, assign schemes to use when you \n" +"work on battery or AC power.
" +msgstr "" + +#. Scheme editation dialog 1 help 1/5 +#: src/helps.ycp:142 +msgid "" +"Scheme Setup\n" +"Configure the settings of the scheme. Enter its name in Scheme Name\n" +"and optionally a description in Scheme Description.
" +msgstr "" + +#. Scheme editation dialog 1 help 3/5 +#: src/helps.ycp:151 +msgid "" +"CPU Settings
\n"
+"Use Frequency Scaling to adjust the frequency of the CPU. If you set "
+"it\n"
+"to Dynamic Frequency Scaling, the CPU frequency is adjusted "
+"automatically\n"
+"according to the current CPU load.
Set Allow Throttling to turn CPU throttling on and adjust\n" +"Max % to set the maximum CPU throttling. Throttling is supported\n" +"only on ACPI machines.
" +msgstr "" + +#. Scheme editation dialog 1 help 5/5 +#: src/helps.ycp:162 +msgid "" +"If your processor does not support CPU frequency scaling, \n" +"you may want to let your processor be constantly \n" +"slowed down when working on battery to save power. To do this, set\n" +"Always Throttle. This setting \n" +"might be useful on long-distance trips where you do not need the entire \n" +"performance of your machine.
\n" +msgstr "" + +#. Scheme editation dialog 2 help 1/2 +#: src/helps.ycp:171 +msgid "" +"Hard Disk Settings
\n"
+"Use Standby Policy to adjust the power saving policy of the hard "
+"disks.\n"
+"Remember that more power saving also means waiting more often until the "
+"disk\n"
+"drive is ready.\n"
+"Use Acoustic Policy to adjust the acoustic policy of the disk. The "
+"noise\n"
+"produced by the disk may be lowered by moving disk heads more slowly. Not "
+"all\n"
+"disks support this feature.
Cooling Policy
\n"
+"Use the cooling policy Status to adjust the active or passive cooling "
+"policy.\n"
+"Active means that the cooling fan is\n"
+"turned on if the system starts overheating.\n"
+"If the system continues overheating, the CPU frequency and voltage are\n"
+"reduced. Passive means that the system first reduces frequency then, if\n"
+"that does not help, turns the cooling fan on.
To specify actions to perform when the system overheats\n" +"or reaches critical temperature, use Overheat Temperature Action and\n" +"Critical Temperature Action.
" +msgstr "" + +#. Scheme editation dialog 3 help 1/2 +#: src/helps.ycp:192 +msgid "" +"Enable Screen Saver
\n"
+"To enable the screen saver in this scheme, set Enable Screen Saver.\n"
+"Disabling the screen saver is useful for schemes used, for example, for\n"
+"presentations.
Display Blanking
\n"
+"To allow blanking the display using DPMS, set\n"
+"Enable Display Power Management.\n"
+"To set the standby, suspend, and power off time-outs use\n"
+"Display Standby Time-Out, Display Suspend Time-Out, and\n"
+"Display Power Off Time-Out. To disable a time-out,\n"
+"set its value to 0.
ACPI Buttons
\n"
"Assign events to perform after a button is\n"
-"pressed. Events can be set for the Power Button and Sleep Button.\n"
+"pressed. Events can be set for the Power Button and Sleep Button"
+"b>.\n"
"To assign an event to perform when the lid of the laptop is\n"
"closed, use Laptop Lid Closing.
Supported Power-Saving Modes\n"
"
\n"
-"Some machines do not support all power-saving modes. If a mode is not supported\n"
+"Some machines do not support all power-saving modes. If a mode is not "
+"supported\n"
"by your machine, the appropriate check box is disabled.
របៀបសន្សំថាមពលដែលគាំទ្រ\n" @@ -612,16 +613,19 @@ #: src/helps.ycp:89 msgid "" "
Warning
\n"
-"Depending on your hardware, suspend to RAM or standby could fail and you may \n"
+"Depending on your hardware, suspend to RAM or standby could fail and you "
+"may \n"
"need to push the reset button to reboot your computer. This could lead to \n"
"data loss.\n"
-"See /usr/share/doc/packages/powersave/README.suspend for details.
ព្រមាន
\n"
"ដោយផ្អែកលើផ្នែករឹងរបស់អ្នក ការផ្អាកទៅសតិ ឬ ការរង់ចាំអាចនឹងបរាជ័យ\n"
"ហើយអ្នកប្រហែលជាត្រូវចុចប៊ូតុង reset ដើម្បីចាប់ផ្ដើមកុំព្យូទ័ររបស់អ្នកឡើងវិញ ។\n"
"ទង្វើនេះអាចនឹងបណ្ដាលឲ្យបាត់បង់ទិន្នន័យ ។\n"
-"សូមមើល /usr/share/doc/packages/powersave/README.suspend សម្រាប់ព័ត៌មានលម្អិត ។
Energy Saving Schemes
\n"
"Use AC Powered to adjust the energy saving scheme to use when your\n"
"computer is AC powered.\n"
-"Use Battery Powered to adjust the energy saving scheme to use when your\n"
+"Use Battery Powered to adjust the energy saving scheme to use when "
+"your\n"
"computer is powered by internal battery.
គ្រោងការណ៍សន្សំថាមពល
\n"
-"ប្រើ ចរន្តឆ្លាស់ ដើម្បីលៃតម្រូវគ្រោងការណ៍សន្សំថាមពល ដែលត្រូវប្រើពេលកុំព្យូទ័ររបស់អ្នក ប្រើថាមពលចរន្តឆ្លាស់ ។\n"
-"ប្រើ ថ្ម ដើម្បីលៃតម្រូវគ្រោងការណ៍សន្សំថាមពល ដែលត្រូវប្រើពេលកុំព្យូទ័ររបស់អ្នក ប្រើថាមពលដែលផ្គត់ផ្គង់ដោយថ្ម ។
CPU Settings
\n"
-"Use Frequency Scaling to adjust the frequency of the CPU. If you set it\n"
-"to Dynamic Frequency Scaling, the CPU frequency is adjusted automatically\n"
+"Use Frequency Scaling to adjust the frequency of the CPU. If you set "
+"it\n"
+"to Dynamic Frequency Scaling, the CPU frequency is adjusted "
+"automatically\n"
"according to the current CPU load.
ការកំណត់ស៊ីភីយូ
\n"
@@ -776,11 +785,15 @@
#: src/helps.ycp:171
msgid ""
"
Hard Disk Settings
\n"
-"Use Standby Policy to adjust the power saving policy of the hard disks.\n"
-"Remember that more power saving also means waiting more often until the disk\n"
+"Use Standby Policy to adjust the power saving policy of the hard "
+"disks.\n"
+"Remember that more power saving also means waiting more often until the "
+"disk\n"
"drive is ready.\n"
-"Use Acoustic Policy to adjust the acoustic policy of the disk. The noise\n"
-"produced by the disk may be lowered by moving disk heads more slowly. Not all\n"
+"Use Acoustic Policy to adjust the acoustic policy of the disk. The "
+"noise\n"
+"produced by the disk may be lowered by moving disk heads more slowly. Not "
+"all\n"
"disks support this feature.
ការកំណត់ថាសរឹង
\n"
@@ -795,7 +808,8 @@
#: src/helps.ycp:180
msgid ""
"
Cooling Policy
\n"
-"Use the cooling policy Status to adjust the active or passive cooling policy.\n"
+"Use the cooling policy Status to adjust the active or passive cooling "
+"policy.\n"
"Active means that the cooling fan is\n"
"turned on if the system starts overheating.\n"
"If the system continues overheating, the CPU frequency and voltage are\n"
@@ -807,7 +821,9 @@
msgstr ""
"
គោលការណ៍ធ្វើឲ្យត្រជាក់
ដើម្បីបញ្ជាក់អំពើដែលត្រូវអនុវត្តនៅពេលប្រព័ន្ធឡើងក្ដៅ\n" "ឬ ឈានដល់សីតុណ្ហភាពខ្ពស់បំផុត សូមប្រើ អំពើពេលសីតុណ្ហភាពឡើងក្ដៅ\n" "អំពើពេលសីតុណ្ហភាពក្ដៅខ្លាំងបំផុត ។
" @@ -1244,13 +1260,14 @@ msgstr "គ្រោងការណ៍ដែលអនុញ្ញាតឲ្យម៉ាស៊ីនរត់ស្ងាត់បំផុតតាមតែអាចធ្វើបាន ។" msgid "" -"Scheme optimized for good performance. Display standby mode and " -"screensaver are disabled." +"Scheme optimized for good performance. Display standby mode and screensaver " +"are disabled." msgstr "គ្រោងការណ៍ដែលនាំមកនូវសមត្ថភាពខ្ពស់ ។ របៀបរង់ចាំ និង ធាតុរក្សាអេក្រង់ត្រូវបានបិទ ។" msgid "" -"Scheme optimized to let maximum power savings take place. " -"Including runtime power management of devices. This feature is " -"still experimental, so please be careful." -msgstr "គ្រោងការណ៍ដែលអនុញ្ញាតឲ្យមានការសន្សំថាមពលច្រើនបំផុត ដោយរួមទាំងគ្រប់គ្រងថាមពលពេលរត់របស់ឧបករណ៍ទៀតផង ។ លក្ខណៈពិសេសនេះនៅមានកម្រិតខ្ពស់នៅឡើយ ដូច្នេះសូមប្រុងប្រយ័ត្នបន្តិច ។" - +"Scheme optimized to let maximum power savings take place. Including runtime " +"power management of devices. This feature is still experimental, so please " +"be careful." +msgstr "" +"គ្រោងការណ៍ដែលអនុញ្ញាតឲ្យមានការសន្សំថាមពលច្រើនបំផុត ដោយរួមទាំងគ្រប់គ្រងថាមពលពេលរត់របស់ឧបករណ៍ទៀត" +"ផង ។ លក្ខណៈពិសេសនេះនៅមានកម្រិតខ្ពស់នៅឡើយ ដូច្នេះសូមប្រុងប្រយ័ត្នបន្តិច ។" only in patch2: unchanged: --- powersave-0.15.20.orig/translations/power-management.hu.po +++ powersave-0.15.20/translations/power-management.hu.po @@ -1349,7 +1349,9 @@ msgid "" "Scheme optimized for good performance. Display standby mode and screensaver " "are disabled." -msgstr "Megfelelő teljesítményre optimalizált séma. A képernyő készenléti állapota és a képernyővédő funkció letiltásra kerül." +msgstr "" +"Megfelelő teljesítményre optimalizált séma. A képernyő készenléti állapota " +"és a képernyővédő funkció letiltásra kerül." msgid "" "Scheme optimized to let maximum power savings take place. Including runtime " @@ -1359,4 +1361,3 @@ "Legkisebb energiafelhasználásra optimalizált séma, amely kiterjed a " "különböző eszközök energiatakarékos használatára is. Ez a funkció kiséreti " "jellegű, ezért csak megfelelő körültekintés mellett célszerű használni." -