diff --git a/CHANGELOG b/CHANGELOG
index 8cb31857..4621d1df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Ver.1.8.2:
++ added different temperature units (Farenheit and Kelvin)
+
Ver.1.8.1:
* change pkg update time to hour
diff --git a/CHANGELOG-RU b/CHANGELOG-RU
index 21c7089b..53cdd288 100644
--- a/CHANGELOG-RU
+++ b/CHANGELOG-RU
@@ -1,3 +1,6 @@
+Вер.1.8.2:
++ добавлены различные температурные единицы (Farenheit и Kelvin)
+
Вер.1.8.1:
* поле pkg теперь обновляется раз в час
diff --git a/PKGBUILD b/PKGBUILD
index 23e5778d..82bfd526 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=kdeplasma-applets-pytextmonitor
_pkgname=pytextmonitor
-pkgver=1.8.1
+pkgver=1.8.2
pkgrel=1
pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in Awesome WM"
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ optdepends=("amarok: for music player monitor"
makedepends=('automoc4' 'cmake')
source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
install=${pkgname}.install
-md5sums=('de872b28c48b9b4903dcfa50158595dc')
+md5sums=('2d5f5a2587c32cce3721ea217564a4ec')
backup=('usr/share/config/extsysmon.conf')
prepare() {
diff --git a/README.md b/README.md
index 694c01ac..727964f5 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,10 @@ Advanced settings
* tag `$mm` - uptime minutes
* tag `$m` - uptime minutes without zero
+**Temperature units**
+
+Select units for temperature. Available units are Celsius, Farenheit and Kelvin.
+
**Temperature devices**
List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
diff --git a/readme/en.md b/readme/en.md
index 694c01ac..727964f5 100644
--- a/readme/en.md
+++ b/readme/en.md
@@ -82,6 +82,10 @@ Advanced settings
* tag `$mm` - uptime minutes
* tag `$m` - uptime minutes without zero
+**Temperature units**
+
+Select units for temperature. Available units are Celsius, Farenheit and Kelvin.
+
**Temperature devices**
List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
diff --git a/readme/ru.md b/readme/ru.md
index 939956ab..47cb891e 100644
--- a/readme/ru.md
+++ b/readme/ru.md
@@ -80,6 +80,10 @@ PyTextMonitor - минималистичный плазмоид, написан
* тег `$mm` - минуты аптайма
* тег `$m` - минуты аптайма без нуля
+**Температурные единицы**
+
+Выберете единицы температуры. Доступные единицы следующие: Цельсий, Фаренгейт и Кельвин.
+
**Датчики температуры**
Список датчиков, которые будут наблюдаться в поле temo (содержимое комбо бокса берется из `sensors`). Виджет редактируем, клавиша delete удалит текущую строку.
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index cb300078..b877e47c 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
project (pytextmonitor)
set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 8)
-set (PROJECT_VERSION_PATCH 1)
+set (PROJECT_VERSION_PATCH 2)
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
message (STATUS "Version: ${PROJECT_VERSION}")
diff --git a/sources/ptm/contents/code/configdef.py b/sources/ptm/contents/code/configdef.py
index e214ec78..600d8627 100644
--- a/sources/ptm/contents/code/configdef.py
+++ b/sources/ptm/contents/code/configdef.py
@@ -48,6 +48,7 @@ def configAccepted(self):
settings.set('custom_time', str(self.configpage.ui.lineEdit_timeFormat.text()))
settings.set('custom_uptime', str(self.configpage.ui.lineEdit_uptimeFormat.text()))
+ settings.set('temp_units', str(self.configpage.ui.comboBox_tempUnits.currentText()))
item = QStringList()
for i in range(self.configpage.ui.listWidget_tempDevice.count()):
item.append(self.configpage.ui.listWidget_tempDevice.item(i).text())
@@ -133,6 +134,8 @@ def createConfigurationInterface(self, parent):
self.configpage.ui.lineEdit_timeFormat.setText(str(settings.get('custom_time', '$hh:$mm')))
self.configpage.ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
+ index = self.configpage.ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius")))
+ self.configpage.ui.comboBox_tempUnits.setCurrentIndex(index)
commandOut = commands.getoutput("sensors")
for item in commandOut.split("\n\n"):
for device in item.split("\n"):
diff --git a/sources/ptm/contents/code/main.py b/sources/ptm/contents/code/main.py
index cc53231b..0ef554eb 100644
--- a/sources/ptm/contents/code/main.py
+++ b/sources/ptm/contents/code/main.py
@@ -35,6 +35,17 @@
from util import *
+def getTemp(temp, unit):
+ """function to return temperature"""
+ if (unit == "Celsius"):
+ pass
+ elif (unit == "Fahrenheit"):
+ temp = str(round(((float(temp) * 9.0 / 5.0) + 32.0), 1))
+ elif (unit == "Kelvin"):
+ temp = str(round((float(temp) + 273.15), 1))
+ return temp
+
+
class CustomPlasmaLabel(Plasma.Label):
"""new Label with defined clicked() event"""
@@ -374,7 +385,7 @@ def hddtempText(self):
for i in devices:
if (line.split('$hddtemp' + str(i))[0] != line):
line = line.split('$hddtemp' + str(i))[0] +\
- str(self.ptm['values']['hddtemp'][self.ptm['names']['hddtemp'][i]]) +\
+ getTemp(str(self.ptm['values']['hddtemp'][self.ptm['names']['hddtemp'][i]]), self.ptm['vars']['adv']['tempUnit']) +\
line.split('$hddtemp' + str(i))[1]
text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
self.setText("hddtemp", text)
@@ -443,7 +454,7 @@ def tempText(self):
for i in devices:
if (line.split('$temp' + str(i))[0] != line):
line = line.split('$temp' + str(i))[0] +\
- str(self.ptm['values']['temp'][self.ptm['names']['temp'][i]]) +\
+ getTemp(str(self.ptm['values']['temp'][self.ptm['names']['temp'][i]]), self.ptm['vars']['adv']['tempUnits']) +\
line.split('$temp' + str(i))[1]
text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1]
self.setText("temp", text)
@@ -540,7 +551,7 @@ def textPrepare(self, name=None, text=None):
line = line.split('$gpu')[0] + text + line.split('$gpu')[1]
elif (name == "gputemp"):
if (line.split('$gputemp')[0] != line):
- line = line.split('$gputemp')[0] + text + line.split('$gputemp')[1]
+ line = line.split('$gputemp')[0] + getTemp(text, self.ptm['vars']['adv']['tempUnits']) + line.split('$gputemp')[1]
elif (name == "pkg"):
for item in text.keys():
if (line.split('$' + item)[0] != line):
diff --git a/sources/ptm/contents/code/reinit.py b/sources/ptm/contents/code/reinit.py
index 095e595f..fae5857e 100644
--- a/sources/ptm/contents/code/reinit.py
+++ b/sources/ptm/contents/code/reinit.py
@@ -40,6 +40,7 @@ def reinit(self):
ptmVars['adv']['acDev'] = str(settings.get('ac_device', '/sys/class/power_supply/AC/online'))
ptmVars['adv']['acOnline'] = str(settings.get('ac_online', '(*)'))
ptmVars['adv']['acOffline'] = str(settings.get('ac_offline', '( )'))
+ ptmVars['adv']['tempUnits'] = str(settings.get('temp_units', 'Celsius'))
ptmVars['adv']['batDev'] = str(settings.get('battery_device', '/sys/class/power_supply/BAT0/capacity'))
ptmVars['adv']['customTime'] = str(settings.get('custom_time', '$hh:$mm'))
ptmVars['adv']['customUptime'] = str(settings.get('custom_uptime', '$dd,$hh,$mm'))
diff --git a/sources/ptm/contents/ui/configwindow.ui b/sources/ptm/contents/ui/configwindow.ui
index b6ff650d..44f3ee0e 100644
--- a/sources/ptm/contents/ui/configwindow.ui
+++ b/sources/ptm/contents/ui/configwindow.ui
@@ -1131,9 +1131,9 @@ $ps - list of running processes comma separated
0
- 0
- 328
- 611
+ -102
+ 526
+ 642
@@ -1211,6 +1211,61 @@ $m - uptime minutes without zero
+ -
+
+
-
+
+
+
+ 120
+ 0
+
+
+
+ Temperature units
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 180
+ 0
+
+
+
-
+
+ Celsius
+
+
+ -
+
+ Fahrenheit
+
+
+ -
+
+ Kelvin
+
+
+
+
+
+
-
-
@@ -1578,17 +1633,17 @@ del - remove item
-
- amarok
+ amarok
-
- mpd
+ mpd
-
- qmmp
+ qmmp
@@ -1642,8 +1697,8 @@ del - remove item
0
0
- 326
- 227
+ 544
+ 504
@@ -1976,8 +2031,8 @@ del - remove item
0
0
- 326
- 190
+ 544
+ 540
@@ -2373,17 +2428,17 @@ del - remove item
-
- auto
+ auto
-
- nvidia
+ nvidia
-
- ati
+ ati
@@ -2704,6 +2759,7 @@ del - remove item
scrollArea_advanced
lineEdit_timeFormat
lineEdit_uptimeFormat
+ comboBox_tempUnits
comboBox_tempDevice
pushButton_tempDevice
listWidget_tempDevice
@@ -2742,6 +2798,10 @@ del - remove item
comboBox_hdddev
lineEdit_mpdaddress
spinBox_mpdport
+ comboBox_pkgCommand
+ spinBox_pkgCommandNum
+ pushButton_pkgCommand
+ listWidget_pkgCommand
diff --git a/sources/ptm/po/en.po b/sources/ptm/po/en.po
index 47d815cd..25196776 100644
--- a/sources/ptm/po/en.po
+++ b/sources/ptm/po/en.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-09 12:35+0400\n"
-"PO-Revision-Date: 2014-04-09 12:26+0400\n"
+"POT-Creation-Date: 2014-05-08 00:24+0400\n"
+"PO-Revision-Date: 2014-05-08 00:24+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Russian \n"
"Language: ru\n"
@@ -204,9 +204,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:634
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2404
+#. i18n: file: ui/configwindow.ui:2459
#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:332
+#: rc.cpp:89 rc.cpp:317
msgid "HDD"
msgstr "HDD"
@@ -274,9 +274,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:874
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1561
+#. i18n: file: ui/configwindow.ui:1616
#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:120 rc.cpp:251
+#: rc.cpp:120 rc.cpp:254
msgid "Music player"
msgstr "Music player"
@@ -316,9 +316,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:996
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_pkg)
-#. i18n: file: ui/configwindow.ui:2518
+#. i18n: file: ui/configwindow.ui:2573
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommand)
-#: rc.cpp:138 rc.cpp:341
+#: rc.cpp:138 rc.cpp:326
msgid "Package manager"
msgstr "Package manager"
@@ -418,33 +418,39 @@ msgstr ""
"$mm - uptime minutes\n"
"$m - uptime minutes without zero"
-#. i18n: file: ui/configwindow.ui:1227
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (text), widget (QLabel, label_tempUnits)
#: rc.cpp:185
+msgid "Temperature units"
+msgstr "Temperature units"
+
+#. i18n: file: ui/configwindow.ui:1282
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:188
msgid "Temperature devices"
msgstr "Temperature devices"
-#. i18n: file: ui/configwindow.ui:1253
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1308
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1363
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1418
#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#. i18n: file: ui/configwindow.ui:2604
+#. i18n: file: ui/configwindow.ui:2659
#. i18n: ectx: property (text), widget (QPushButton, pushButton_pkgCommand)
-#: rc.cpp:188 rc.cpp:198 rc.cpp:208 rc.cpp:365
+#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:350
msgid "Add"
msgstr "Add"
-#. i18n: file: ui/configwindow.ui:1263
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1318
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1373
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1428
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#. i18n: file: ui/configwindow.ui:2614
+#. i18n: file: ui/configwindow.ui:2669
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_pkgCommand)
-#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:368
+#: rc.cpp:194 rc.cpp:204 rc.cpp:214 rc.cpp:353
msgid ""
"Editable\n"
"del - remove item"
@@ -452,117 +458,99 @@ msgstr ""
"Editable\n"
"del - remove item"
-#. i18n: file: ui/configwindow.ui:1282
+#. i18n: file: ui/configwindow.ui:1337
#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:195
+#: rc.cpp:198
msgid "Mount points"
msgstr "Mount points"
-#. i18n: file: ui/configwindow.ui:1337
+#. i18n: file: ui/configwindow.ui:1392
#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
-#: rc.cpp:205
+#: rc.cpp:208
msgid "HDD devices"
msgstr "HDD devices"
-#. i18n: file: ui/configwindow.ui:1390
+#. i18n: file: ui/configwindow.ui:1445
#. i18n: ectx: property (text), widget (QLabel, label_netdir)
-#: rc.cpp:215
+#: rc.cpp:218
msgid "Network directory"
msgstr "Network directory"
-#. i18n: file: ui/configwindow.ui:1397
+#. i18n: file: ui/configwindow.ui:1452
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:218
+#: rc.cpp:221
msgid "\"/sys/class/net\" by default"
msgstr "\"/sys/class/net\" by default"
-#. i18n: file: ui/configwindow.ui:1417
+#. i18n: file: ui/configwindow.ui:1472
#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:221
+#: rc.cpp:224
msgid "Disable auto select device and set specified device"
msgstr "Disable auto select device and set specified device"
-#. i18n: file: ui/configwindow.ui:1420
+#. i18n: file: ui/configwindow.ui:1475
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:224
+#: rc.cpp:227
msgid "Set network device"
msgstr "Set network device"
-#. i18n: file: ui/configwindow.ui:1453
+#. i18n: file: ui/configwindow.ui:1508
#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:227
+#: rc.cpp:230
msgid "Battery device"
msgstr "Battery device"
-#. i18n: file: ui/configwindow.ui:1460
+#. i18n: file: ui/configwindow.ui:1515
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:230
+#: rc.cpp:233
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
-#. i18n: file: ui/configwindow.ui:1477
+#. i18n: file: ui/configwindow.ui:1532
#. i18n: ectx: property (text), widget (QLabel, label_acOnline)
-#: rc.cpp:233
+#: rc.cpp:236
msgid "AC online tag"
msgstr "AC online tag"
-#. i18n: file: ui/configwindow.ui:1484
+#. i18n: file: ui/configwindow.ui:1539
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOnline)
-#: rc.cpp:236
+#: rc.cpp:239
msgid "Line, which returns when AC is online"
msgstr "Line, which returns when AC is online"
-#. i18n: file: ui/configwindow.ui:1507
+#. i18n: file: ui/configwindow.ui:1562
#. i18n: ectx: property (text), widget (QLabel, label_acOffline)
-#: rc.cpp:239
+#: rc.cpp:242
msgid "AC offline tag"
msgstr "AC offline tag"
-#. i18n: file: ui/configwindow.ui:1514
+#. i18n: file: ui/configwindow.ui:1569
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOffline)
-#: rc.cpp:242
+#: rc.cpp:245
msgid "Line, which returns when AC is offline"
msgstr "Line, which returns when AC is offline"
-#. i18n: file: ui/configwindow.ui:1537
+#. i18n: file: ui/configwindow.ui:1592
#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:245
+#: rc.cpp:248
msgid "AC device"
msgstr "AC device"
-#. i18n: file: ui/configwindow.ui:1544
+#. i18n: file: ui/configwindow.ui:1599
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:248
+#: rc.cpp:251
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" by default"
-#. i18n: file: ui/configwindow.ui:1581
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:254
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:1586
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:257
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:1591
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:260
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1674
#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:263
+#: rc.cpp:257
msgid "Tooltip"
msgstr "Tooltip"
-#. i18n: file: ui/configwindow.ui:1625
+#. i18n: file: ui/configwindow.ui:1680
#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:266
+#: rc.cpp:260
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -570,196 +558,196 @@ msgstr ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
-#. i18n: file: ui/configwindow.ui:1661
+#. i18n: file: ui/configwindow.ui:1716
#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:269
+#: rc.cpp:263
msgid "Number of values for tooltips"
msgstr "Number of values for tooltips"
-#. i18n: file: ui/configwindow.ui:1716
+#. i18n: file: ui/configwindow.ui:1771
#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:272
+#: rc.cpp:266
msgid "CPU clock color"
msgstr "CPU clock color"
-#. i18n: file: ui/configwindow.ui:1756
+#. i18n: file: ui/configwindow.ui:1811
#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:275
+#: rc.cpp:269
msgid "Swap color"
msgstr "Swap color"
-#. i18n: file: ui/configwindow.ui:1796
+#. i18n: file: ui/configwindow.ui:1851
#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:278
+#: rc.cpp:272
msgid "CPU color"
msgstr "CPU color"
-#. i18n: file: ui/configwindow.ui:1836
+#. i18n: file: ui/configwindow.ui:1891
#. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:281
+#: rc.cpp:275
msgid "Download speed color"
msgstr "Download speed color"
-#. i18n: file: ui/configwindow.ui:1876
+#. i18n: file: ui/configwindow.ui:1931
#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:284
+#: rc.cpp:278
msgid "Memory color"
msgstr "Memory color"
-#. i18n: file: ui/configwindow.ui:1916
+#. i18n: file: ui/configwindow.ui:1971
#. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:287
+#: rc.cpp:281
msgid "Upload speed color"
msgstr "Upload speed color"
-#. i18n: file: ui/configwindow.ui:1966
+#. i18n: file: ui/configwindow.ui:2021
#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:290
+#: rc.cpp:284
msgid "Appearance"
msgstr "Appearance"
-#. i18n: file: ui/configwindow.ui:1995
+#. i18n: file: ui/configwindow.ui:2050
#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:293
+#: rc.cpp:287
msgid "Time interval"
msgstr "Time interval"
-#. i18n: file: ui/configwindow.ui:2050
+#. i18n: file: ui/configwindow.ui:2105
#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:296
+#: rc.cpp:290
msgid "Font"
msgstr "Font"
-#. i18n: file: ui/configwindow.ui:2090
+#. i18n: file: ui/configwindow.ui:2145
#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:299
+#: rc.cpp:293
msgid "Font size"
msgstr "Font size"
-#. i18n: file: ui/configwindow.ui:2145
+#. i18n: file: ui/configwindow.ui:2200
#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:302
+#: rc.cpp:296
msgid "Font color"
msgstr "Font color"
-#. i18n: file: ui/configwindow.ui:2185
+#. i18n: file: ui/configwindow.ui:2240
#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:305
+#: rc.cpp:299
msgid "Font style"
msgstr "Font style"
-#. i18n: file: ui/configwindow.ui:2235
+#. i18n: file: ui/configwindow.ui:2290
#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:308
+#: rc.cpp:302
msgid "Font weight"
msgstr "Font weight"
-#. i18n: file: ui/configwindow.ui:2300
+#. i18n: file: ui/configwindow.ui:2355
#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:311
+#: rc.cpp:305
msgid "DataEngine"
msgstr "DataEngine"
-#. i18n: file: ui/configwindow.ui:2329
+#. i18n: file: ui/configwindow.ui:2384
#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:314
+#: rc.cpp:308
msgid "Custom command"
msgstr "Custom command"
-#. i18n: file: ui/configwindow.ui:2336
+#. i18n: file: ui/configwindow.ui:2391
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:317
+#: rc.cpp:311
msgid "Custom command to run"
msgstr "Custom command to run"
-#. i18n: file: ui/configwindow.ui:2356
+#. i18n: file: ui/configwindow.ui:2411
#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:320
+#: rc.cpp:314
msgid "GPU device"
msgstr "GPU device"
-#. i18n: file: ui/configwindow.ui:2376
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:323
-msgid "auto"
-msgstr "auto"
-
-#. i18n: file: ui/configwindow.ui:2381
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:326
-msgid "nvidia"
-msgstr "nvidia"
-
-#. i18n: file: ui/configwindow.ui:2386
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:329
-msgid "ati"
-msgstr "ati"
-
-#. i18n: file: ui/configwindow.ui:2437
+#. i18n: file: ui/configwindow.ui:2492
#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:335
+#: rc.cpp:320
msgid "MPD address"
msgstr "MPD address"
-#. i18n: file: ui/configwindow.ui:2461
+#. i18n: file: ui/configwindow.ui:2516
#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:338
+#: rc.cpp:323
msgid "MPD port"
msgstr "MPD port"
-#. i18n: file: ui/configwindow.ui:2535
+#. i18n: file: ui/configwindow.ui:2590
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:344
+#: rc.cpp:329
msgid "pacman -Qu"
msgstr "pacman -Qu"
-#. i18n: file: ui/configwindow.ui:2540
+#. i18n: file: ui/configwindow.ui:2595
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:347
+#: rc.cpp:332
msgid "apt-show-versions -u -b"
msgstr "apt-show-versions -u -b"
-#. i18n: file: ui/configwindow.ui:2545
+#. i18n: file: ui/configwindow.ui:2600
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:350
+#: rc.cpp:335
msgid "aptitude search '~U'"
msgstr "aptitude search '~U'"
-#. i18n: file: ui/configwindow.ui:2550
+#. i18n: file: ui/configwindow.ui:2605
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:353
+#: rc.cpp:338
msgid "yum list updates"
msgstr "yum list updates"
-#. i18n: file: ui/configwindow.ui:2555
+#. i18n: file: ui/configwindow.ui:2610
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:356
+#: rc.cpp:341
msgid "pkg_version -I -l '<'"
msgstr "pkg_version -I -l '<'"
-#. i18n: file: ui/configwindow.ui:2560
+#. i18n: file: ui/configwindow.ui:2615
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:359
+#: rc.cpp:344
msgid "urpmq --auto-select"
msgstr "urpmq --auto-select"
-#. i18n: file: ui/configwindow.ui:2578
+#. i18n: file: ui/configwindow.ui:2633
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommandNum)
-#: rc.cpp:362
+#: rc.cpp:347
msgid "Number of null lines"
msgstr "Number of null lines"
-#: rc.cpp:370
+#: rc.cpp:355
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Evgeniy Alekseev"
-#: rc.cpp:371
+#: rc.cpp:356
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "esalexeev@gmail.com"
+#~ msgid "amarok"
+#~ msgstr "amarok"
+
+#~ msgid "mpd"
+#~ msgstr "mpd"
+
+#~ msgid "qmmp"
+#~ msgstr "qmmp"
+
+#~ msgid "auto"
+#~ msgstr "auto"
+
+#~ msgid "nvidia"
+#~ msgstr "nvidia"
+
+#~ msgid "ati"
+#~ msgstr "ati"
+
#~ msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
#~ msgstr "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
diff --git a/sources/ptm/po/fr.po b/sources/ptm/po/fr.po
index 2f372fc4..923bb90f 100644
--- a/sources/ptm/po/fr.po
+++ b/sources/ptm/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-09 12:35+0400\n"
-"PO-Revision-Date: 2014-04-09 12:33+0400\n"
+"POT-Creation-Date: 2014-05-08 00:24+0400\n"
+"PO-Revision-Date: 2014-05-08 00:25+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Russian \n"
"Language: fr\n"
@@ -207,9 +207,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:634
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2404
+#. i18n: file: ui/configwindow.ui:2459
#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:332
+#: rc.cpp:89 rc.cpp:317
msgid "HDD"
msgstr "Disque dur"
@@ -281,9 +281,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:874
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1561
+#. i18n: file: ui/configwindow.ui:1616
#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:120 rc.cpp:251
+#: rc.cpp:120 rc.cpp:254
msgid "Music player"
msgstr "Lecteur audio"
@@ -323,9 +323,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:996
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_pkg)
-#. i18n: file: ui/configwindow.ui:2518
+#. i18n: file: ui/configwindow.ui:2573
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommand)
-#: rc.cpp:138 rc.cpp:341
+#: rc.cpp:138 rc.cpp:326
msgid "Package manager"
msgstr "Gestionnaire de paquets"
@@ -425,33 +425,39 @@ msgstr ""
"$mm - temps de fonctionnement en minutes\n"
"$m - temps de fonctionnement en minutes sans zéro"
-#. i18n: file: ui/configwindow.ui:1227
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (text), widget (QLabel, label_tempUnits)
#: rc.cpp:185
+msgid "Temperature units"
+msgstr "Unités de température"
+
+#. i18n: file: ui/configwindow.ui:1282
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:188
msgid "Temperature devices"
msgstr "Temperature des périphériques"
-#. i18n: file: ui/configwindow.ui:1253
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1308
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1363
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1418
#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#. i18n: file: ui/configwindow.ui:2604
+#. i18n: file: ui/configwindow.ui:2659
#. i18n: ectx: property (text), widget (QPushButton, pushButton_pkgCommand)
-#: rc.cpp:188 rc.cpp:198 rc.cpp:208 rc.cpp:365
+#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:350
msgid "Add"
msgstr "Ajouter"
-#. i18n: file: ui/configwindow.ui:1263
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1318
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1373
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1428
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#. i18n: file: ui/configwindow.ui:2614
+#. i18n: file: ui/configwindow.ui:2669
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_pkgCommand)
-#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:368
+#: rc.cpp:194 rc.cpp:204 rc.cpp:214 rc.cpp:353
msgid ""
"Editable\n"
"del - remove item"
@@ -459,119 +465,101 @@ msgstr ""
"Modifiable\n"
"del - supprimer un élément"
-#. i18n: file: ui/configwindow.ui:1282
+#. i18n: file: ui/configwindow.ui:1337
#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:195
+#: rc.cpp:198
msgid "Mount points"
msgstr "Points de montage"
-#. i18n: file: ui/configwindow.ui:1337
+#. i18n: file: ui/configwindow.ui:1392
#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
-#: rc.cpp:205
+#: rc.cpp:208
msgid "HDD devices"
msgstr "Périphériques HDD"
-#. i18n: file: ui/configwindow.ui:1390
+#. i18n: file: ui/configwindow.ui:1445
#. i18n: ectx: property (text), widget (QLabel, label_netdir)
-#: rc.cpp:215
+#: rc.cpp:218
msgid "Network directory"
msgstr "Voisinage réseau"
-#. i18n: file: ui/configwindow.ui:1397
+#. i18n: file: ui/configwindow.ui:1452
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:218
+#: rc.cpp:221
msgid "\"/sys/class/net\" by default"
msgstr "\"/sys/class/net\" par défaut"
-#. i18n: file: ui/configwindow.ui:1417
+#. i18n: file: ui/configwindow.ui:1472
#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:221
+#: rc.cpp:224
msgid "Disable auto select device and set specified device"
msgstr ""
"Désactiver la sélection automatique de périphériques et le sélectionner "
"manuellement"
-#. i18n: file: ui/configwindow.ui:1420
+#. i18n: file: ui/configwindow.ui:1475
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:224
+#: rc.cpp:227
msgid "Set network device"
msgstr "Sélectionner le périphérique réseau"
-#. i18n: file: ui/configwindow.ui:1453
+#. i18n: file: ui/configwindow.ui:1508
#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:227
+#: rc.cpp:230
msgid "Battery device"
msgstr "Batterie"
-#. i18n: file: ui/configwindow.ui:1460
+#. i18n: file: ui/configwindow.ui:1515
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:230
+#: rc.cpp:233
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" par défaut"
-#. i18n: file: ui/configwindow.ui:1477
+#. i18n: file: ui/configwindow.ui:1532
#. i18n: ectx: property (text), widget (QLabel, label_acOnline)
-#: rc.cpp:233
+#: rc.cpp:236
msgid "AC online tag"
msgstr "AC online tag"
-#. i18n: file: ui/configwindow.ui:1484
+#. i18n: file: ui/configwindow.ui:1539
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOnline)
-#: rc.cpp:236
+#: rc.cpp:239
msgid "Line, which returns when AC is online"
msgstr "Ligne, qui retourne lorsque le AC est online"
-#. i18n: file: ui/configwindow.ui:1507
+#. i18n: file: ui/configwindow.ui:1562
#. i18n: ectx: property (text), widget (QLabel, label_acOffline)
-#: rc.cpp:239
+#: rc.cpp:242
msgid "AC offline tag"
msgstr "AC déconnecté tag"
-#. i18n: file: ui/configwindow.ui:1514
+#. i18n: file: ui/configwindow.ui:1569
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOffline)
-#: rc.cpp:242
+#: rc.cpp:245
msgid "Line, which returns when AC is offline"
msgstr "Ligne, qui retourne lorsque le AC est offline"
-#. i18n: file: ui/configwindow.ui:1537
+#. i18n: file: ui/configwindow.ui:1592
#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:245
+#: rc.cpp:248
msgid "AC device"
msgstr "Périphérique d'alimentation"
-#. i18n: file: ui/configwindow.ui:1544
+#. i18n: file: ui/configwindow.ui:1599
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:248
+#: rc.cpp:251
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" par défaut"
-#. i18n: file: ui/configwindow.ui:1581
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:254
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:1586
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:257
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:1591
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:260
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1674
#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:263
+#: rc.cpp:257
msgid "Tooltip"
msgstr "Conseil"
-#. i18n: file: ui/configwindow.ui:1625
+#. i18n: file: ui/configwindow.ui:1680
#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:266
+#: rc.cpp:260
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -580,196 +568,196 @@ msgstr ""
"les conseils visuels. Pour les activer cochez simplement les cases "
"correspondantes."
-#. i18n: file: ui/configwindow.ui:1661
+#. i18n: file: ui/configwindow.ui:1716
#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:269
+#: rc.cpp:263
msgid "Number of values for tooltips"
msgstr "Nombre d'éléments pour les conseils"
-#. i18n: file: ui/configwindow.ui:1716
+#. i18n: file: ui/configwindow.ui:1771
#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:272
+#: rc.cpp:266
msgid "CPU clock color"
msgstr "Couleur de l'horloge processeur"
-#. i18n: file: ui/configwindow.ui:1756
+#. i18n: file: ui/configwindow.ui:1811
#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:275
+#: rc.cpp:269
msgid "Swap color"
msgstr "Couleur de la mémoire d'échange"
-#. i18n: file: ui/configwindow.ui:1796
+#. i18n: file: ui/configwindow.ui:1851
#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:278
+#: rc.cpp:272
msgid "CPU color"
msgstr "Couleur processeur"
-#. i18n: file: ui/configwindow.ui:1836
+#. i18n: file: ui/configwindow.ui:1891
#. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:281
+#: rc.cpp:275
msgid "Download speed color"
msgstr "Couleur de la vitesse de téléchargement"
-#. i18n: file: ui/configwindow.ui:1876
+#. i18n: file: ui/configwindow.ui:1931
#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:284
+#: rc.cpp:278
msgid "Memory color"
msgstr "Couleur de la mémoire"
-#. i18n: file: ui/configwindow.ui:1916
+#. i18n: file: ui/configwindow.ui:1971
#. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:287
+#: rc.cpp:281
msgid "Upload speed color"
msgstr "Couleur du téléversement"
-#. i18n: file: ui/configwindow.ui:1966
+#. i18n: file: ui/configwindow.ui:2021
#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:290
+#: rc.cpp:284
msgid "Appearance"
msgstr "Apparence"
-#. i18n: file: ui/configwindow.ui:1995
+#. i18n: file: ui/configwindow.ui:2050
#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:293
+#: rc.cpp:287
msgid "Time interval"
msgstr "Intervalle"
-#. i18n: file: ui/configwindow.ui:2050
+#. i18n: file: ui/configwindow.ui:2105
#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:296
+#: rc.cpp:290
msgid "Font"
msgstr "Police"
-#. i18n: file: ui/configwindow.ui:2090
+#. i18n: file: ui/configwindow.ui:2145
#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:299
+#: rc.cpp:293
msgid "Font size"
msgstr "Taille de la police"
-#. i18n: file: ui/configwindow.ui:2145
+#. i18n: file: ui/configwindow.ui:2200
#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:302
+#: rc.cpp:296
msgid "Font color"
msgstr "Couleur de la police"
-#. i18n: file: ui/configwindow.ui:2185
+#. i18n: file: ui/configwindow.ui:2240
#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:305
+#: rc.cpp:299
msgid "Font style"
msgstr "Style de la police"
-#. i18n: file: ui/configwindow.ui:2235
+#. i18n: file: ui/configwindow.ui:2290
#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:308
+#: rc.cpp:302
msgid "Font weight"
msgstr "Épaisseur de la police"
-#. i18n: file: ui/configwindow.ui:2300
+#. i18n: file: ui/configwindow.ui:2355
#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:311
+#: rc.cpp:305
msgid "DataEngine"
msgstr "Moteur de données"
-#. i18n: file: ui/configwindow.ui:2329
+#. i18n: file: ui/configwindow.ui:2384
#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:314
+#: rc.cpp:308
msgid "Custom command"
msgstr "Commande personnalisée"
-#. i18n: file: ui/configwindow.ui:2336
+#. i18n: file: ui/configwindow.ui:2391
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:317
+#: rc.cpp:311
msgid "Custom command to run"
msgstr "Commande personnalisée à exécuter"
-#. i18n: file: ui/configwindow.ui:2356
+#. i18n: file: ui/configwindow.ui:2411
#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:320
+#: rc.cpp:314
msgid "GPU device"
msgstr "Périphérique graphique"
-#. i18n: file: ui/configwindow.ui:2376
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:323
-msgid "auto"
-msgstr "auto"
-
-#. i18n: file: ui/configwindow.ui:2381
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:326
-msgid "nvidia"
-msgstr "nvidia"
-
-#. i18n: file: ui/configwindow.ui:2386
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:329
-msgid "ati"
-msgstr "ati"
-
-#. i18n: file: ui/configwindow.ui:2437
+#. i18n: file: ui/configwindow.ui:2492
#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:335
+#: rc.cpp:320
msgid "MPD address"
msgstr "Adresse MPD"
-#. i18n: file: ui/configwindow.ui:2461
+#. i18n: file: ui/configwindow.ui:2516
#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:338
+#: rc.cpp:323
msgid "MPD port"
msgstr "Port MPD"
-#. i18n: file: ui/configwindow.ui:2535
+#. i18n: file: ui/configwindow.ui:2590
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:344
+#: rc.cpp:329
msgid "pacman -Qu"
msgstr "pacman -Qu"
-#. i18n: file: ui/configwindow.ui:2540
+#. i18n: file: ui/configwindow.ui:2595
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:347
+#: rc.cpp:332
msgid "apt-show-versions -u -b"
msgstr "apt-show-versions -u -b"
-#. i18n: file: ui/configwindow.ui:2545
+#. i18n: file: ui/configwindow.ui:2600
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:350
+#: rc.cpp:335
msgid "aptitude search '~U'"
msgstr "aptitude search '~U'"
-#. i18n: file: ui/configwindow.ui:2550
+#. i18n: file: ui/configwindow.ui:2605
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:353
+#: rc.cpp:338
msgid "yum list updates"
msgstr "yum list updates"
-#. i18n: file: ui/configwindow.ui:2555
+#. i18n: file: ui/configwindow.ui:2610
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:356
+#: rc.cpp:341
msgid "pkg_version -I -l '<'"
msgstr "pkg_version -I -l '<'"
-#. i18n: file: ui/configwindow.ui:2560
+#. i18n: file: ui/configwindow.ui:2615
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:359
+#: rc.cpp:344
msgid "urpmq --auto-select"
msgstr "urpmq --auto-select"
-#. i18n: file: ui/configwindow.ui:2578
+#. i18n: file: ui/configwindow.ui:2633
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommandNum)
-#: rc.cpp:362
+#: rc.cpp:347
msgid "Number of null lines"
msgstr "Nombre de lignes nulles"
-#: rc.cpp:370
+#: rc.cpp:355
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Evgeniy Alekseev"
-#: rc.cpp:371
+#: rc.cpp:356
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "esalexeev@gmail.com"
+#~ msgid "amarok"
+#~ msgstr "amarok"
+
+#~ msgid "mpd"
+#~ msgstr "mpd"
+
+#~ msgid "qmmp"
+#~ msgstr "qmmp"
+
+#~ msgid "auto"
+#~ msgstr "auto"
+
+#~ msgid "nvidia"
+#~ msgstr "nvidia"
+
+#~ msgid "ati"
+#~ msgstr "ati"
+
#~ msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
#~ msgstr ""
#~ "$hddN - espace occupé sur le point de montage N (à partir de 0), %. "
diff --git a/sources/ptm/po/pytextmonitor.pot b/sources/ptm/po/pytextmonitor.pot
index ced873d3..59c05125 100644
--- a/sources/ptm/po/pytextmonitor.pot
+++ b/sources/ptm/po/pytextmonitor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-09 12:35+0400\n"
+"POT-Creation-Date: 2014-05-08 00:24+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -176,9 +176,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:634
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2404
+#. i18n: file: ui/configwindow.ui:2459
#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:332
+#: rc.cpp:89 rc.cpp:317
msgid "HDD"
msgstr ""
@@ -237,9 +237,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:874
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1561
+#. i18n: file: ui/configwindow.ui:1616
#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:120 rc.cpp:251
+#: rc.cpp:120 rc.cpp:254
msgid "Music player"
msgstr ""
@@ -271,9 +271,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:996
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_pkg)
-#. i18n: file: ui/configwindow.ui:2518
+#. i18n: file: ui/configwindow.ui:2573
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommand)
-#: rc.cpp:138 rc.cpp:341
+#: rc.cpp:138 rc.cpp:326
msgid "Package manager"
msgstr ""
@@ -349,340 +349,310 @@ msgid ""
"$m - uptime minutes without zero"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1227
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (text), widget (QLabel, label_tempUnits)
#: rc.cpp:185
+msgid "Temperature units"
+msgstr ""
+
+#. i18n: file: ui/configwindow.ui:1282
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:188
msgid "Temperature devices"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1253
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1308
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1363
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1418
#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#. i18n: file: ui/configwindow.ui:2604
+#. i18n: file: ui/configwindow.ui:2659
#. i18n: ectx: property (text), widget (QPushButton, pushButton_pkgCommand)
-#: rc.cpp:188 rc.cpp:198 rc.cpp:208 rc.cpp:365
+#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:350
msgid "Add"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1263
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1318
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1373
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1428
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#. i18n: file: ui/configwindow.ui:2614
+#. i18n: file: ui/configwindow.ui:2669
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_pkgCommand)
-#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:368
+#: rc.cpp:194 rc.cpp:204 rc.cpp:214 rc.cpp:353
msgid ""
"Editable\n"
"del - remove item"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1282
+#. i18n: file: ui/configwindow.ui:1337
#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:195
+#: rc.cpp:198
msgid "Mount points"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1337
+#. i18n: file: ui/configwindow.ui:1392
#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
-#: rc.cpp:205
+#: rc.cpp:208
msgid "HDD devices"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1390
+#. i18n: file: ui/configwindow.ui:1445
#. i18n: ectx: property (text), widget (QLabel, label_netdir)
-#: rc.cpp:215
+#: rc.cpp:218
msgid "Network directory"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1397
+#. i18n: file: ui/configwindow.ui:1452
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:218
+#: rc.cpp:221
msgid "\"/sys/class/net\" by default"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1417
+#. i18n: file: ui/configwindow.ui:1472
#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:221
+#: rc.cpp:224
msgid "Disable auto select device and set specified device"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1420
+#. i18n: file: ui/configwindow.ui:1475
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:224
+#: rc.cpp:227
msgid "Set network device"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1453
+#. i18n: file: ui/configwindow.ui:1508
#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:227
+#: rc.cpp:230
msgid "Battery device"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1460
+#. i18n: file: ui/configwindow.ui:1515
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:230
+#: rc.cpp:233
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1477
+#. i18n: file: ui/configwindow.ui:1532
#. i18n: ectx: property (text), widget (QLabel, label_acOnline)
-#: rc.cpp:233
+#: rc.cpp:236
msgid "AC online tag"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1484
+#. i18n: file: ui/configwindow.ui:1539
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOnline)
-#: rc.cpp:236
+#: rc.cpp:239
msgid "Line, which returns when AC is online"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1507
+#. i18n: file: ui/configwindow.ui:1562
#. i18n: ectx: property (text), widget (QLabel, label_acOffline)
-#: rc.cpp:239
+#: rc.cpp:242
msgid "AC offline tag"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1514
+#. i18n: file: ui/configwindow.ui:1569
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOffline)
-#: rc.cpp:242
+#: rc.cpp:245
msgid "Line, which returns when AC is offline"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1537
+#. i18n: file: ui/configwindow.ui:1592
#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:245
+#: rc.cpp:248
msgid "AC device"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1544
+#. i18n: file: ui/configwindow.ui:1599
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:248
+#: rc.cpp:251
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1581
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:254
-msgid "amarok"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1586
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:257
-msgid "mpd"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1591
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:260
-msgid "qmmp"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1674
#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:263
+#: rc.cpp:257
msgid "Tooltip"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1625
+#. i18n: file: ui/configwindow.ui:1680
#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:266
+#: rc.cpp:260
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
msgstr ""
-#. i18n: file: ui/configwindow.ui:1661
+#. i18n: file: ui/configwindow.ui:1716
#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:269
+#: rc.cpp:263
msgid "Number of values for tooltips"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1716
+#. i18n: file: ui/configwindow.ui:1771
#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:272
+#: rc.cpp:266
msgid "CPU clock color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1756
+#. i18n: file: ui/configwindow.ui:1811
#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:275
+#: rc.cpp:269
msgid "Swap color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1796
+#. i18n: file: ui/configwindow.ui:1851
#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:278
+#: rc.cpp:272
msgid "CPU color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1836
+#. i18n: file: ui/configwindow.ui:1891
#. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:281
+#: rc.cpp:275
msgid "Download speed color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1876
+#. i18n: file: ui/configwindow.ui:1931
#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:284
+#: rc.cpp:278
msgid "Memory color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1916
+#. i18n: file: ui/configwindow.ui:1971
#. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:287
+#: rc.cpp:281
msgid "Upload speed color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1966
+#. i18n: file: ui/configwindow.ui:2021
#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:290
+#: rc.cpp:284
msgid "Appearance"
msgstr ""
-#. i18n: file: ui/configwindow.ui:1995
+#. i18n: file: ui/configwindow.ui:2050
#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:293
+#: rc.cpp:287
msgid "Time interval"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2050
+#. i18n: file: ui/configwindow.ui:2105
#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:296
+#: rc.cpp:290
msgid "Font"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2090
+#. i18n: file: ui/configwindow.ui:2145
#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:299
+#: rc.cpp:293
msgid "Font size"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2145
+#. i18n: file: ui/configwindow.ui:2200
#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:302
+#: rc.cpp:296
msgid "Font color"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2185
+#. i18n: file: ui/configwindow.ui:2240
#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:305
+#: rc.cpp:299
msgid "Font style"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2235
+#. i18n: file: ui/configwindow.ui:2290
#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:308
+#: rc.cpp:302
msgid "Font weight"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2300
+#. i18n: file: ui/configwindow.ui:2355
#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:311
+#: rc.cpp:305
msgid "DataEngine"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2329
+#. i18n: file: ui/configwindow.ui:2384
#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:314
+#: rc.cpp:308
msgid "Custom command"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2336
+#. i18n: file: ui/configwindow.ui:2391
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:317
+#: rc.cpp:311
msgid "Custom command to run"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2356
+#. i18n: file: ui/configwindow.ui:2411
#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:320
+#: rc.cpp:314
msgid "GPU device"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2376
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:323
-msgid "auto"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2381
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:326
-msgid "nvidia"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2386
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:329
-msgid "ati"
-msgstr ""
-
-#. i18n: file: ui/configwindow.ui:2437
+#. i18n: file: ui/configwindow.ui:2492
#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:335
+#: rc.cpp:320
msgid "MPD address"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2461
+#. i18n: file: ui/configwindow.ui:2516
#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:338
+#: rc.cpp:323
msgid "MPD port"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2535
+#. i18n: file: ui/configwindow.ui:2590
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:344
+#: rc.cpp:329
msgid "pacman -Qu"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2540
+#. i18n: file: ui/configwindow.ui:2595
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:347
+#: rc.cpp:332
msgid "apt-show-versions -u -b"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2545
+#. i18n: file: ui/configwindow.ui:2600
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:350
+#: rc.cpp:335
msgid "aptitude search '~U'"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2550
+#. i18n: file: ui/configwindow.ui:2605
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:353
+#: rc.cpp:338
msgid "yum list updates"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2555
+#. i18n: file: ui/configwindow.ui:2610
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:356
+#: rc.cpp:341
msgid "pkg_version -I -l '<'"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2560
+#. i18n: file: ui/configwindow.ui:2615
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:359
+#: rc.cpp:344
msgid "urpmq --auto-select"
msgstr ""
-#. i18n: file: ui/configwindow.ui:2578
+#. i18n: file: ui/configwindow.ui:2633
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommandNum)
-#: rc.cpp:362
+#: rc.cpp:347
msgid "Number of null lines"
msgstr ""
-#: rc.cpp:370
+#: rc.cpp:355
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr ""
-#: rc.cpp:371
+#: rc.cpp:356
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
diff --git a/sources/ptm/po/ru.po b/sources/ptm/po/ru.po
index 2494ec18..7fe4074f 100644
--- a/sources/ptm/po/ru.po
+++ b/sources/ptm/po/ru.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n"
-"POT-Creation-Date: 2014-04-09 12:35+0400\n"
-"PO-Revision-Date: 2014-04-09 12:26+0400\n"
+"POT-Creation-Date: 2014-05-08 00:24+0400\n"
+"PO-Revision-Date: 2014-05-08 00:25+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Russian \n"
"Language: ru\n"
@@ -204,9 +204,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:634
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_hdd)
-#. i18n: file: ui/configwindow.ui:2404
+#. i18n: file: ui/configwindow.ui:2459
#. i18n: ectx: property (text), widget (QLabel, label_hdddev)
-#: rc.cpp:89 rc.cpp:332
+#: rc.cpp:89 rc.cpp:317
msgid "HDD"
msgstr "HDD"
@@ -275,9 +275,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:874
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_player)
-#. i18n: file: ui/configwindow.ui:1561
+#. i18n: file: ui/configwindow.ui:1616
#. i18n: ectx: property (text), widget (QLabel, label_playerSelect)
-#: rc.cpp:120 rc.cpp:251
+#: rc.cpp:120 rc.cpp:254
msgid "Music player"
msgstr "Музыкальный плеер"
@@ -317,9 +317,9 @@ msgstr ""
#. i18n: file: ui/configwindow.ui:996
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_pkg)
-#. i18n: file: ui/configwindow.ui:2518
+#. i18n: file: ui/configwindow.ui:2573
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommand)
-#: rc.cpp:138 rc.cpp:341
+#: rc.cpp:138 rc.cpp:326
msgid "Package manager"
msgstr "Пакетный менеджер"
@@ -419,33 +419,39 @@ msgstr ""
"$mm - минуты аптайма\n"
"$m - минуты аптайма без нулей"
-#. i18n: file: ui/configwindow.ui:1227
-#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#. i18n: file: ui/configwindow.ui:1225
+#. i18n: ectx: property (text), widget (QLabel, label_tempUnits)
#: rc.cpp:185
+msgid "Temperature units"
+msgstr "Температурные единицы"
+
+#. i18n: file: ui/configwindow.ui:1282
+#. i18n: ectx: property (text), widget (QLabel, label_tempDevice)
+#: rc.cpp:188
msgid "Temperature devices"
msgstr "Температурные устройства"
-#. i18n: file: ui/configwindow.ui:1253
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1308
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_tempDevice)
#. i18n: file: ui/configwindow.ui:1363
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_mount)
+#. i18n: file: ui/configwindow.ui:1418
#. i18n: ectx: property (text), widget (QPushButton, pushButton_hddDevice)
-#. i18n: file: ui/configwindow.ui:2604
+#. i18n: file: ui/configwindow.ui:2659
#. i18n: ectx: property (text), widget (QPushButton, pushButton_pkgCommand)
-#: rc.cpp:188 rc.cpp:198 rc.cpp:208 rc.cpp:365
+#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:350
msgid "Add"
msgstr "Добавить"
-#. i18n: file: ui/configwindow.ui:1263
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1318
-#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_tempDevice)
#. i18n: file: ui/configwindow.ui:1373
+#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_mount)
+#. i18n: file: ui/configwindow.ui:1428
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_hddDevice)
-#. i18n: file: ui/configwindow.ui:2614
+#. i18n: file: ui/configwindow.ui:2669
#. i18n: ectx: property (toolTip), widget (QListWidget, listWidget_pkgCommand)
-#: rc.cpp:191 rc.cpp:201 rc.cpp:211 rc.cpp:368
+#: rc.cpp:194 rc.cpp:204 rc.cpp:214 rc.cpp:353
msgid ""
"Editable\n"
"del - remove item"
@@ -453,117 +459,99 @@ msgstr ""
"Редактируемо\n"
"del - удалить строку"
-#. i18n: file: ui/configwindow.ui:1282
+#. i18n: file: ui/configwindow.ui:1337
#. i18n: ectx: property (text), widget (QLabel, label_mount)
-#: rc.cpp:195
+#: rc.cpp:198
msgid "Mount points"
msgstr "Точки монтирования"
-#. i18n: file: ui/configwindow.ui:1337
+#. i18n: file: ui/configwindow.ui:1392
#. i18n: ectx: property (text), widget (QLabel, label_hddDevice)
-#: rc.cpp:205
+#: rc.cpp:208
msgid "HDD devices"
msgstr "HDD"
-#. i18n: file: ui/configwindow.ui:1390
+#. i18n: file: ui/configwindow.ui:1445
#. i18n: ectx: property (text), widget (QLabel, label_netdir)
-#: rc.cpp:215
+#: rc.cpp:218
msgid "Network directory"
msgstr "Путь к интерфейсам"
-#. i18n: file: ui/configwindow.ui:1397
+#. i18n: file: ui/configwindow.ui:1452
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_netdir)
-#: rc.cpp:218
+#: rc.cpp:221
msgid "\"/sys/class/net\" by default"
msgstr "\"/sys/class/net\" по умолчанию"
-#. i18n: file: ui/configwindow.ui:1417
+#. i18n: file: ui/configwindow.ui:1472
#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:221
+#: rc.cpp:224
msgid "Disable auto select device and set specified device"
msgstr "Отключить авто выбор устройства и использовать указанное"
-#. i18n: file: ui/configwindow.ui:1420
+#. i18n: file: ui/configwindow.ui:1475
#. i18n: ectx: property (text), widget (QCheckBox, checkBox_netdev)
-#: rc.cpp:224
+#: rc.cpp:227
msgid "Set network device"
msgstr "Выберете сетевое устройство"
-#. i18n: file: ui/configwindow.ui:1453
+#. i18n: file: ui/configwindow.ui:1508
#. i18n: ectx: property (text), widget (QLabel, label_batdev)
-#: rc.cpp:227
+#: rc.cpp:230
msgid "Battery device"
msgstr "Устройство батареи"
-#. i18n: file: ui/configwindow.ui:1460
+#. i18n: file: ui/configwindow.ui:1515
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_batdev)
-#: rc.cpp:230
+#: rc.cpp:233
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
-#. i18n: file: ui/configwindow.ui:1477
+#. i18n: file: ui/configwindow.ui:1532
#. i18n: ectx: property (text), widget (QLabel, label_acOnline)
-#: rc.cpp:233
+#: rc.cpp:236
msgid "AC online tag"
msgstr "AC подключен"
-#. i18n: file: ui/configwindow.ui:1484
+#. i18n: file: ui/configwindow.ui:1539
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOnline)
-#: rc.cpp:236
+#: rc.cpp:239
msgid "Line, which returns when AC is online"
msgstr "Строка, возвращаемая при подключенном адапторе питания"
-#. i18n: file: ui/configwindow.ui:1507
+#. i18n: file: ui/configwindow.ui:1562
#. i18n: ectx: property (text), widget (QLabel, label_acOffline)
-#: rc.cpp:239
+#: rc.cpp:242
msgid "AC offline tag"
msgstr "AC отключен"
-#. i18n: file: ui/configwindow.ui:1514
+#. i18n: file: ui/configwindow.ui:1569
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acOffline)
-#: rc.cpp:242
+#: rc.cpp:245
msgid "Line, which returns when AC is offline"
msgstr "Строка, возвращаемая при отключенном адапторе питания"
-#. i18n: file: ui/configwindow.ui:1537
+#. i18n: file: ui/configwindow.ui:1592
#. i18n: ectx: property (text), widget (QLabel, label_acdev)
-#: rc.cpp:245
+#: rc.cpp:248
msgid "AC device"
msgstr "Устройство AC"
-#. i18n: file: ui/configwindow.ui:1544
+#. i18n: file: ui/configwindow.ui:1599
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_acdev)
-#: rc.cpp:248
+#: rc.cpp:251
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" по умолчанию"
-#. i18n: file: ui/configwindow.ui:1581
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:254
-msgid "amarok"
-msgstr "amarok"
-
-#. i18n: file: ui/configwindow.ui:1586
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:257
-msgid "mpd"
-msgstr "mpd"
-
-#. i18n: file: ui/configwindow.ui:1591
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_playerSelect)
-#: rc.cpp:260
-msgid "qmmp"
-msgstr "qmmp"
-
-#. i18n: file: ui/configwindow.ui:1619
+#. i18n: file: ui/configwindow.ui:1674
#. i18n: ectx: attribute (title), widget (QWidget, tooltip)
-#: rc.cpp:263
+#: rc.cpp:257
msgid "Tooltip"
msgstr "Тултип"
-#. i18n: file: ui/configwindow.ui:1625
+#. i18n: file: ui/configwindow.ui:1680
#. i18n: ectx: property (text), widget (QLabel, label_tooltip)
-#: rc.cpp:266
+#: rc.cpp:260
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -571,196 +559,196 @@ msgstr ""
"Поля CPU, частота CPU, память, swap, сеть поддерживают графический тултип. "
"Чтобы включить его, просто сделайте требуемые чекбоксы полностью чекнутыми."
-#. i18n: file: ui/configwindow.ui:1661
+#. i18n: file: ui/configwindow.ui:1716
#. i18n: ectx: property (text), widget (QLabel, label_tooltipNum)
-#: rc.cpp:269
+#: rc.cpp:263
msgid "Number of values for tooltips"
msgstr "Число хранящихся значений"
-#. i18n: file: ui/configwindow.ui:1716
+#. i18n: file: ui/configwindow.ui:1771
#. i18n: ectx: property (text), widget (QLabel, label_cpuclockColor)
-#: rc.cpp:272
+#: rc.cpp:266
msgid "CPU clock color"
msgstr "Цвет частоты CPU"
-#. i18n: file: ui/configwindow.ui:1756
+#. i18n: file: ui/configwindow.ui:1811
#. i18n: ectx: property (text), widget (QLabel, label_swapColor)
-#: rc.cpp:275
+#: rc.cpp:269
msgid "Swap color"
msgstr "Цвет swap"
-#. i18n: file: ui/configwindow.ui:1796
+#. i18n: file: ui/configwindow.ui:1851
#. i18n: ectx: property (text), widget (QLabel, label_cpuColor)
-#: rc.cpp:278
+#: rc.cpp:272
msgid "CPU color"
msgstr "Цвет CPU"
-#. i18n: file: ui/configwindow.ui:1836
+#. i18n: file: ui/configwindow.ui:1891
#. i18n: ectx: property (text), widget (QLabel, label_downColor)
-#: rc.cpp:281
+#: rc.cpp:275
msgid "Download speed color"
msgstr "Цвет скорости загрузки"
-#. i18n: file: ui/configwindow.ui:1876
+#. i18n: file: ui/configwindow.ui:1931
#. i18n: ectx: property (text), widget (QLabel, label_memColor)
-#: rc.cpp:284
+#: rc.cpp:278
msgid "Memory color"
msgstr "Цвет памяти"
-#. i18n: file: ui/configwindow.ui:1916
+#. i18n: file: ui/configwindow.ui:1971
#. i18n: ectx: property (text), widget (QLabel, label_upColor)
-#: rc.cpp:287
+#: rc.cpp:281
msgid "Upload speed color"
msgstr "Цвет скорости отдачи"
-#. i18n: file: ui/configwindow.ui:1966
+#. i18n: file: ui/configwindow.ui:2021
#. i18n: ectx: attribute (title), widget (QWidget, appearance)
-#: rc.cpp:290
+#: rc.cpp:284
msgid "Appearance"
msgstr "Внешний вид"
-#. i18n: file: ui/configwindow.ui:1995
+#. i18n: file: ui/configwindow.ui:2050
#. i18n: ectx: property (text), widget (QLabel, label_interval)
-#: rc.cpp:293
+#: rc.cpp:287
msgid "Time interval"
msgstr "Интервал обновления"
-#. i18n: file: ui/configwindow.ui:2050
+#. i18n: file: ui/configwindow.ui:2105
#. i18n: ectx: property (text), widget (QLabel, label_font)
-#: rc.cpp:296
+#: rc.cpp:290
msgid "Font"
msgstr "Шрифт"
-#. i18n: file: ui/configwindow.ui:2090
+#. i18n: file: ui/configwindow.ui:2145
#. i18n: ectx: property (text), widget (QLabel, label_fontSize)
-#: rc.cpp:299
+#: rc.cpp:293
msgid "Font size"
msgstr "Размер шрифта"
-#. i18n: file: ui/configwindow.ui:2145
+#. i18n: file: ui/configwindow.ui:2200
#. i18n: ectx: property (text), widget (QLabel, label_color)
-#: rc.cpp:302
+#: rc.cpp:296
msgid "Font color"
msgstr "Цвет шрифта"
-#. i18n: file: ui/configwindow.ui:2185
+#. i18n: file: ui/configwindow.ui:2240
#. i18n: ectx: property (text), widget (QLabel, label_style)
-#: rc.cpp:305
+#: rc.cpp:299
msgid "Font style"
msgstr "Стиль шрифта"
-#. i18n: file: ui/configwindow.ui:2235
+#. i18n: file: ui/configwindow.ui:2290
#. i18n: ectx: property (text), widget (QLabel, label_weight)
-#: rc.cpp:308
+#: rc.cpp:302
msgid "Font weight"
msgstr "Ширина шрифта"
-#. i18n: file: ui/configwindow.ui:2300
+#. i18n: file: ui/configwindow.ui:2355
#. i18n: ectx: attribute (title), widget (QWidget, dataengine)
-#: rc.cpp:311
+#: rc.cpp:305
msgid "DataEngine"
msgstr "DataEngine"
-#. i18n: file: ui/configwindow.ui:2329
+#. i18n: file: ui/configwindow.ui:2384
#. i18n: ectx: property (text), widget (QLabel, label_customCommand)
-#: rc.cpp:314
+#: rc.cpp:308
msgid "Custom command"
msgstr "Своя команда"
-#. i18n: file: ui/configwindow.ui:2336
+#. i18n: file: ui/configwindow.ui:2391
#. i18n: ectx: property (toolTip), widget (QLineEdit, lineEdit_customCommand)
-#: rc.cpp:317
+#: rc.cpp:311
msgid "Custom command to run"
msgstr "Своя команда для запуска"
-#. i18n: file: ui/configwindow.ui:2356
+#. i18n: file: ui/configwindow.ui:2411
#. i18n: ectx: property (text), widget (QLabel, label_gpudev)
-#: rc.cpp:320
+#: rc.cpp:314
msgid "GPU device"
msgstr "Устройство GPU"
-#. i18n: file: ui/configwindow.ui:2376
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:323
-msgid "auto"
-msgstr "auto"
-
-#. i18n: file: ui/configwindow.ui:2381
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:326
-msgid "nvidia"
-msgstr "nvidia"
-
-#. i18n: file: ui/configwindow.ui:2386
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_gpudev)
-#: rc.cpp:329
-msgid "ati"
-msgstr "ati"
-
-#. i18n: file: ui/configwindow.ui:2437
+#. i18n: file: ui/configwindow.ui:2492
#. i18n: ectx: property (text), widget (QLabel, label_mpdaddress)
-#: rc.cpp:335
+#: rc.cpp:320
msgid "MPD address"
msgstr "Адрес сервера MPD"
-#. i18n: file: ui/configwindow.ui:2461
+#. i18n: file: ui/configwindow.ui:2516
#. i18n: ectx: property (text), widget (QLabel, label_mpdport)
-#: rc.cpp:338
+#: rc.cpp:323
msgid "MPD port"
msgstr "Порт сервера MPD"
-#. i18n: file: ui/configwindow.ui:2535
+#. i18n: file: ui/configwindow.ui:2590
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:344
+#: rc.cpp:329
msgid "pacman -Qu"
msgstr "pacman -Qu"
-#. i18n: file: ui/configwindow.ui:2540
+#. i18n: file: ui/configwindow.ui:2595
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:347
+#: rc.cpp:332
msgid "apt-show-versions -u -b"
msgstr "apt-show-versions -u -b"
-#. i18n: file: ui/configwindow.ui:2545
+#. i18n: file: ui/configwindow.ui:2600
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:350
+#: rc.cpp:335
msgid "aptitude search '~U'"
msgstr "aptitude search '~U'"
-#. i18n: file: ui/configwindow.ui:2550
+#. i18n: file: ui/configwindow.ui:2605
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:353
+#: rc.cpp:338
msgid "yum list updates"
msgstr "yum list updates"
-#. i18n: file: ui/configwindow.ui:2555
+#. i18n: file: ui/configwindow.ui:2610
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:356
+#: rc.cpp:341
msgid "pkg_version -I -l '<'"
msgstr "pkg_version -I -l '<'"
-#. i18n: file: ui/configwindow.ui:2560
+#. i18n: file: ui/configwindow.ui:2615
#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_pkgCommand)
-#: rc.cpp:359
+#: rc.cpp:344
msgid "urpmq --auto-select"
msgstr "urpmq --auto-select"
-#. i18n: file: ui/configwindow.ui:2578
+#. i18n: file: ui/configwindow.ui:2633
#. i18n: ectx: property (text), widget (QLabel, label_pkgCommandNum)
-#: rc.cpp:362
+#: rc.cpp:347
msgid "Number of null lines"
msgstr "Число пустых линий"
-#: rc.cpp:370
+#: rc.cpp:355
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Evgeniy Alekseev"
-#: rc.cpp:371
+#: rc.cpp:356
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "esalexeev@gmail.com"
+#~ msgid "amarok"
+#~ msgstr "amarok"
+
+#~ msgid "mpd"
+#~ msgstr "mpd"
+
+#~ msgid "qmmp"
+#~ msgstr "qmmp"
+
+#~ msgid "auto"
+#~ msgstr "auto"
+
+#~ msgid "nvidia"
+#~ msgstr "nvidia"
+
+#~ msgid "ati"
+#~ msgstr "ati"
+
#~ msgid "$hddN - usage for mount point N (from 0), %. Example: $hdd0"
#~ msgstr "$hddN - использование точки монтирования N (от 0), %. Пример: $hdd0"