From 7fc7b68358db78c05dfdbf2d50974c0793c6e3d5 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 31 May 2014 14:12:04 +0400 Subject: [PATCH] added support of $hddtotmb and $hddtotgb tags --- CHANGELOG | 1 + CHANGELOG-RU | 1 + README.md | 2 + md_readme/en.md | 2 + md_readme/ru.md | 6 ++- readme_diff.patch | 23 ++++++---- sources/ptm/contents/code/dataengine.py | 6 +++ sources/ptm/contents/code/main.py | 32 +++++++------- sources/ptm/contents/ui/widget.ui | 4 +- sources/ptm/po/en.po | 48 +++++++++++---------- sources/ptm/po/es.po | 43 ++++++++++--------- sources/ptm/po/fr.po | 43 ++++++++++--------- sources/ptm/po/pt_BR.po | 43 ++++++++++--------- sources/ptm/po/pytextmonitor.pot | 42 ++++++++++--------- sources/ptm/po/ru.po | 56 +++++++++++++------------ sources/ptm/po/uk.po | 43 ++++++++++--------- sources/readme/en.html | 2 + sources/readme/ru.html | 6 ++- 18 files changed, 224 insertions(+), 179 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 36acdcd..c147ccc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ Ver.1.10.0: ++ added tags $hddtotmb, $hddtotgb + added tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb + added ability for force update text + added support of clementine diff --git a/CHANGELOG-RU b/CHANGELOG-RU index c329915..3f7dd29 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,4 +1,5 @@ Вер.1.10.0: ++ добавлены теги $hddtotmb, $hddtotgb + добавлены теги $memtotmb, $memtotgb, $swaptotmb, $swaptotgb + добавлена возможность форсированного обновления + добавлена поддержка clementine diff --git a/README.md b/README.md index 1b8ce6f..848dfa5 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ For edited output you must open Settings window and setup output format in lines * tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0` * tag `$hddmbN` - usage for mount point N, *MB*. For example, `$hddmb0` * tag `$hddgbN` - usage for mount point N, *GB*. For example, `$hddgb0` +* tag `$hddtotmbN` - total size of mount point N, *MB*. For example, `$hddtotmb0` +* tag `$hddtotgbN` - total size of mount point N, *GB*. For example, `$hddtotgb0` * tag `$hddrN` - read speed of disk N, *KB/s*. For example, `$hddr0` * tag `$hddwN` - write speed of disk N, *KB/s*. For example, `$hddw0` * tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0` diff --git a/md_readme/en.md b/md_readme/en.md index 1b8ce6f..848dfa5 100644 --- a/md_readme/en.md +++ b/md_readme/en.md @@ -40,6 +40,8 @@ For edited output you must open Settings window and setup output format in lines * tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0` * tag `$hddmbN` - usage for mount point N, *MB*. For example, `$hddmb0` * tag `$hddgbN` - usage for mount point N, *GB*. For example, `$hddgb0` +* tag `$hddtotmbN` - total size of mount point N, *MB*. For example, `$hddtotmb0` +* tag `$hddtotgbN` - total size of mount point N, *GB*. For example, `$hddtotgb0` * tag `$hddrN` - read speed of disk N, *KB/s*. For example, `$hddr0` * tag `$hddwN` - write speed of disk N, *KB/s*. For example, `$hddw0` * tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0` diff --git a/md_readme/ru.md b/md_readme/ru.md index 4156e45..00df281 100644 --- a/md_readme/ru.md +++ b/md_readme/ru.md @@ -38,8 +38,10 @@ PyTextMonitor - минималистичный плазмоид, написан * тег `$swaptotmb` - размер swap, *MB* * тег `$swaptotgb` - размер swap, *GB* * тег `$hddN` - использование точки монтирования N, *%*. Например, `$hdd0` -* тег `$hddmbN` - использование точки монтирования N, *KB/s*. Например, `$hddmb0` -* тег `$hddgbN` - использование точки монтирования N, *KB/s*. Например, `$hddgb0` +* тег `$hddmbN` - использование точки монтирования N, *MB*. Например, `$hddmb0` +* тег `$hddgbN` - использование точки монтирования N, *GB*. Например, `$hddgb0` +* тег `$hddtotmbN` - размер точки монтирования N, *MB*. Например, `$hddtotmb0` +* тег `$hddtotgbN` - размер точки монтирования N, *GB*. Например, `$hddtotgb0` * тег `$hddrN` - скорость записи на диск N, *KB/s*. Например, `$hddr0` * тег `$hddwN` - скорость чтения с диска N, *KB/s*. Например, `$hddw0` * тег `$hddtempN` - температура HDD N. Например, `$hddtemp0` diff --git a/readme_diff.patch b/readme_diff.patch index b1782bc..f3a4aa1 100644 --- a/readme_diff.patch +++ b/readme_diff.patch @@ -1,5 +1,5 @@ --- README.md.orig 2014-05-28 20:30:26.685205144 +0400 -+++ README.md 2014-05-29 18:17:09.764661719 +0400 ++++ README.md 2014-05-31 14:11:11.206846569 +0400 @@ -3,13 +3,16 @@ Information @@ -17,7 +17,7 @@ * tag `$time` - time in default format. For example, *fri Nov 6 04:48:01 2013* * tag `$isotime` - time in iso format * tag `$shorttime` - time in short locale format -@@ -27,9 +30,13 @@ +@@ -27,12 +30,18 @@ * tag `$mem` - usage memory, *%* * tag `$memmb` - usage memory, *MB* * tag `$memgb` - usage memory, *GB* @@ -31,7 +31,12 @@ * tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0` * tag `$hddmbN` - usage for mount point N, *MB*. For example, `$hddmb0` * tag `$hddgbN` - usage for mount point N, *GB*. For example, `$hddgb0` -@@ -56,8 +63,24 @@ ++* tag `$hddtotmbN` - total size of mount point N, *MB*. For example, `$hddtotmb0` ++* tag `$hddtotgbN` - total size of mount point N, *GB*. For example, `$hddtotgb0` + * tag `$hddrN` - read speed of disk N, *KB/s*. For example, `$hddr0` + * tag `$hddwN` - write speed of disk N, *KB/s*. For example, `$hddw0` + * tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0` +@@ -56,8 +65,24 @@ **NOTE** you don't may set to show `$cpu` tag in swap label for example. **`$cpu` will work only in cpu label**. @@ -56,7 +61,7 @@ **Custom time** * tag `$dddd` - weekday in long format -@@ -130,16 +153,14 @@ +@@ -130,16 +155,14 @@ File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online. @@ -75,7 +80,7 @@ **Custom command** *NOTE* This can cause the computer freeze. -@@ -148,11 +169,15 @@ +@@ -148,11 +171,15 @@ **GPU device** @@ -93,7 +98,7 @@ **MPD address** -@@ -165,6 +190,7 @@ +@@ -165,6 +192,7 @@ **Package manager** List of commands, which will be run. Number of null lines is a number of unneeded lines. Defaults: @@ -101,7 +106,7 @@ * *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0` * *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0` * *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0` -@@ -172,9 +198,13 @@ +@@ -172,9 +200,13 @@ * *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0` * *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0` @@ -115,7 +120,7 @@ You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it. Instruction -@@ -182,25 +212,29 @@ +@@ -182,25 +214,29 @@ Dependencies ------------ @@ -147,7 +152,7 @@ * download sources * install -@@ -222,6 +256,7 @@ +@@ -222,6 +258,7 @@ Links ----- diff --git a/sources/ptm/contents/code/dataengine.py b/sources/ptm/contents/code/dataengine.py index 4d557de..925ad50 100644 --- a/sources/ptm/contents/code/dataengine.py +++ b/sources/ptm/contents/code/dataengine.py @@ -58,6 +58,7 @@ class DataEngine: if (bools['hdd'] > 0): for item in names['hdd']: dataEngines['system'].connectSource("partitions" + item + "/filllevel", self.parent, interval) + dataEngines['system'].connectSource("partitions" + item + "/freespace", self.parent, interval) dataEngines['system'].connectSource("partitions" + item + "/usedspace", self.parent, interval) if (bools['hddtemp'] > 0): dataEngines['ext'].connectSource("hddtemp", self.parent, interval) @@ -144,6 +145,11 @@ class DataEngine: updatedData['type'] = '/' + '/'.join(sourceName.split('/')[1:-1]) value = round(data[QString(u'value')].toFloat()[0], 1) updatedData['value'] = value + elif (sourceName.split('/')[0] == "partitions") and (sourceName.split('/')[-1] == "freespace"): + updatedData['name'] = "hddfreemb" + updatedData['type'] = '/' + '/'.join(sourceName.split('/')[1:-1]) + value = data[QString(u'value')].toFloat()[0] + updatedData['value'] = value elif (sourceName.split('/')[0] == "partitions") and (sourceName.split('/')[-1] == "usedspace"): updatedData['name'] = "hddmb" updatedData['type'] = '/' + '/'.join(sourceName.split('/')[1:-1]) diff --git a/sources/ptm/contents/code/main.py b/sources/ptm/contents/code/main.py index 1a1acdc..b78dfe3 100644 --- a/sources/ptm/contents/code/main.py +++ b/sources/ptm/contents/code/main.py @@ -252,6 +252,7 @@ class pyTextWidget(plasmascript.Applet): self.ptm['values']['disk-r'] = {} self.ptm['values']['disk-w'] = {} self.ptm['values']['hdd'] = {} + self.ptm['values']['hddfreemb'] = {} self.ptm['values']['hddmb'] = {} self.ptm['values']['hddtemp'] = {} self.ptm['values']['mem'] = {'app':0.0, 'used':0.0, 'free':1.0} @@ -426,14 +427,10 @@ class pyTextWidget(plasmascript.Applet): for i in devices: if (line.split('$hddr' + str(i))[0] != line): hdd = "%4i" % (self.ptm['values']['disk-r'][self.ptm['names']['disk'][i]]) - line = line.split('$hddr' + str(i))[0] +\ - hdd +\ - line.split('$hddr' + str(i))[1] + line = line.split('$hddr' + str(i))[0] + hdd + line.split('$hddr' + str(i))[1] if (line.split('$hddw' + str(i))[0] != line): hdd = "%4i" % (self.ptm['values']['disk-w'][self.ptm['names']['disk'][i]]) - line = line.split('$hddw' + str(i))[0] +\ - hdd +\ - line.split('$hddw' + str(i))[1] + line = line.split('$hddw' + str(i))[0] + hdd + line.split('$hddw' + str(i))[1] text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1] self.setText("disk", text) @@ -446,19 +443,21 @@ class pyTextWidget(plasmascript.Applet): for i in devices: if (line.split('$hdd' + str(i))[0] != line): hdd = "%4.1f" % (self.ptm['values']['hdd'][self.ptm['names']['hdd'][i]]) - line = line.split('$hdd' + str(i))[0] +\ - hdd +\ - line.split('$hdd' + str(i))[1] + line = line.split('$hdd' + str(i))[0] + hdd + line.split('$hdd' + str(i))[1] if (line.split('$hddmb' + str(i))[0] != line): hdd = "%i" % (self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / 1024.0) - line = line.split('$hddmb' + str(i))[0] +\ - str(int(self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / 1024.0)) +\ - line.split('$hddmb' + str(i))[1] + line = line.split('$hddmb' + str(i))[0] + hdd + line.split('$hddmb' + str(i))[1] if (line.split('$hddgb' + str(i))[0] != line): - hdd = "%4.1f" % (self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / (1024.0 * 1024.0)) - line = line.split('$hddgb' + str(i))[0] +\ - hdd +\ - line.split('$hddgb' + str(i))[1] + hdd = "%5.1f" % (self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]] / (1024.0 * 1024.0)) + line = line.split('$hddgb' + str(i))[0] + hdd + line.split('$hddgb' + str(i))[1] + if (line.split('$hddtotmb' + str(i))[0] != line): + hdd = "%i" % ((self.ptm['values']['hddfreemb'][self.ptm['names']['hdd'][i]] +\ + self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]]) / 1024.0) + line = line.split('$hddtotmb' + str(i))[0] + hdd + line.split('$hddtotmb' + str(i))[1] + if (line.split('$hddtotgb' + str(i))[0] != line): + hdd = "%5.1f" % ((self.ptm['values']['hddfreemb'][self.ptm['names']['hdd'][i]] +\ + self.ptm['values']['hddmb'][self.ptm['names']['hdd'][i]]) / (1024.0 * 1024.0)) + line = line.split('$hddtotgb' + str(i))[0] + hdd + line.split('$hddtotgb' + str(i))[1] text = self.ptm['vars']['app']['format'][0] + line + self.ptm['vars']['app']['format'][1] self.setText("hdd", text) @@ -579,6 +578,7 @@ class pyTextWidget(plasmascript.Applet): self.ptm['values'][item][value] = 0.0 for value in self.ptm['names']['hdd']: self.ptm['values']['hdd'][value] = 0.0 + self.ptm['values']['hddfreemb'][value] = 0.0 self.ptm['values']['hddmb'][value] = 0.0 for value in self.ptm['names']['disk']: self.ptm['values']['disk-r'][value] = 0.0 diff --git a/sources/ptm/contents/ui/widget.ui b/sources/ptm/contents/ui/widget.ui index fed024c..ab41f9c 100644 --- a/sources/ptm/contents/ui/widget.ui +++ b/sources/ptm/contents/ui/widget.ui @@ -637,7 +637,9 @@ $swaptotgb - total swap, GB $hddN - usage for mount point N (from 0), %. Example: $hdd0 $hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0 -$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0 +$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0 +$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0 +$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/sources/ptm/po/en.po b/sources/ptm/po/en.po index e71f956..d593980 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-05-29 18:12+0400\n" -"PO-Revision-Date: 2014-05-29 18:12+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" +"PO-Revision-Date: 2014-05-31 14:05+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -254,7 +254,7 @@ msgstr "MPD address" msgid "MPD port" msgstr "MPD port" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "Package manager" @@ -262,7 +262,7 @@ msgstr "Package manager" msgid "Number of null lines" msgstr "Number of null lines" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "Music player" @@ -444,17 +444,21 @@ msgstr "" msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" -#: rc.cpp:314 +#: rc.cpp:316 msgid "HDD speed" msgstr "HDD speed" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" @@ -462,21 +466,21 @@ msgstr "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" -#: rc.cpp:321 +#: rc.cpp:323 msgid "HDD temp" msgstr "HDD temp" -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" msgstr "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "Network" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" @@ -486,11 +490,11 @@ msgstr "" "$up - upload speed, KB/s\n" "$netdev - current network device" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "Battery" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" @@ -498,7 +502,7 @@ msgstr "" "$bat - battery charge, %\n" "$ac - AC status" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -512,11 +516,11 @@ msgstr "" "$time - song duration\n" "$title - song title" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "Processes" -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" @@ -526,7 +530,7 @@ msgstr "" "$pstotal - total number of running processes\n" "$ps - list of running processes comma separated" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" @@ -534,22 +538,22 @@ msgstr "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "Custom" -#: rc.cpp:370 +#: rc.cpp:372 msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "" "$customN - get output from custom command N (from N). Example `$custom0`" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" diff --git a/sources/ptm/po/es.po b/sources/ptm/po/es.po index c956e40..dbd3daf 100644 --- a/sources/ptm/po/es.po +++ b/sources/ptm/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n" -"POT-Creation-Date: 2014-05-29 18:12+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" "PO-Revision-Date: 2014-05-19 23:02+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Spanish \n" @@ -254,7 +254,7 @@ msgstr "Dirección de MPD" msgid "MPD port" msgstr "Puerto de MPD" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "Gestor de paquetes" @@ -262,7 +262,7 @@ msgstr "Gestor de paquetes" msgid "Number of null lines" msgstr "Número de líneas nulas" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "Reproductor de música" @@ -442,10 +442,13 @@ msgstr "" "$swapgb - uso de la swap, GB" #: rc.cpp:309 +#, fuzzy msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" "$hddN - uso para el punto de montaje N (a partir de 0), %. Ejemplo: $hdd0\n" "$hddmbN - uso para el punto de montaje N (a partir de 0), MB. Ejemplo: " @@ -453,11 +456,11 @@ msgstr "" "$hddgbN - uso para el punto de montaje N (a partir de 0), GB. Ejemplo: " "$hddgb0" -#: rc.cpp:314 +#: rc.cpp:316 msgid "HDD speed" msgstr "Velocidad del disco duro" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" @@ -467,22 +470,22 @@ msgstr "" "$hddwN - velocidad de escritura del disco N (a partir de 0), KB/s. Por " "ejemplo: $hddw0" -#: rc.cpp:321 +#: rc.cpp:323 msgid "HDD temp" msgstr "Temperatura del disco duro" -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" msgstr "" "$hddtempN - temperatura física en el dispositivo N (a partir de 0). Ejemplo: " "$hddtemp0" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "Red" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" @@ -492,11 +495,11 @@ msgstr "" "$up - velocidad de envío, KB/s\n" "$netdev - dispositivo de red actual" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "Batería" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" @@ -504,7 +507,7 @@ msgstr "" "$bat - carga de la batería, %\n" "$ac - estado de la alimentación" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -518,11 +521,11 @@ msgstr "" "$time - duración de la canción\n" "$title - título de la canción" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "Procesos" -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" @@ -532,7 +535,7 @@ msgstr "" "$pstotal - total de procesos en ejecución\n" "$ps - listado de procesos en ejecución separados por coma" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" @@ -540,23 +543,23 @@ msgstr "" "$pkgcountN - número de paquetes con actualizaciones disponibles, comando N. " "Por ejemplo $pkgcount0" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "Personalizado" -#: rc.cpp:370 +#: rc.cpp:372 msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "" "$customN - obtener la salida de ejecución del comando personalizado N " "(apartir de 0). Por ejemplo: $custom0" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Tu nombre" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "Tus correos" diff --git a/sources/ptm/po/fr.po b/sources/ptm/po/fr.po index 67e5439..0d4371a 100644 --- a/sources/ptm/po/fr.po +++ b/sources/ptm/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n" -"POT-Creation-Date: 2014-05-29 18:12+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" "PO-Revision-Date: 2014-05-21 16:45+0200\n" "Last-Translator: Mermouy \n" "Language-Team: French \n" @@ -260,7 +260,7 @@ msgstr "Adresse MPD" msgid "MPD port" msgstr "Port MPD" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "Gestionnaire de paquets" @@ -269,7 +269,7 @@ msgstr "Gestionnaire de paquets" msgid "Number of null lines" msgstr "Nombre d'éléments pour les conseils" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "Lecteur audio" @@ -445,10 +445,13 @@ msgstr "" "$swapmb - utilisation swap, MB" #: rc.cpp:309 +#, fuzzy msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" "$hddN - utilisation du point de montage N (à partir de 0), %. Exemple: " "$hdd0\n" @@ -457,12 +460,12 @@ msgstr "" "$hddgbN - utilisation du point de montage N (à partir de 0), GB. Exemple: " "$hddgb0" -#: rc.cpp:314 +#: rc.cpp:316 #, fuzzy msgid "HDD speed" msgstr "Périphériques HDD" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" @@ -470,23 +473,23 @@ msgstr "" "$hddrN - vitesse de lecture HDD N (à partir de 0), KB/s. Exemple: $hddr0\n" "$hddwN - vitesse d'écriture HDD N (à partir de 0), KB/s. Exemple: $hddw0" -#: rc.cpp:321 +#: rc.cpp:323 #, fuzzy msgid "HDD temp" msgstr "Température disque dur" -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" msgstr "" "$hddtempN - température physique du périphérique N (à partir de 0). Exemple: " "$hddtemp0" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "Réseau" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" @@ -496,11 +499,11 @@ msgstr "" "$up - vitesse ascendante, KB/s\n" "$netdev - périphérique réseau actuel" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "Batterie" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" @@ -508,7 +511,7 @@ msgstr "" "$bat - charge de la batterie, %\n" "$ac - état de l'alimentation" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -522,11 +525,11 @@ msgstr "" "$time - durée du morceau\n" "$title - titre du morceau" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "Processus" -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" @@ -536,7 +539,7 @@ msgstr "" "$pstotal - nombre total de processus actifs\n" "$ps - liste des processus actifs séparés par une virgule" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" @@ -544,22 +547,22 @@ msgstr "" "$pkgcountN - nombre de paquets à mettre à jour, commande N. Par exemple " "$pkgcount0" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "Personnalisé" -#: rc.cpp:370 +#: rc.cpp:372 #, fuzzy msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "$custom - sortie d'une commande personnelle" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" diff --git a/sources/ptm/po/pt_BR.po b/sources/ptm/po/pt_BR.po index e8306e7..707f220 100644 --- a/sources/ptm/po/pt_BR.po +++ b/sources/ptm/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n" -"POT-Creation-Date: 2014-05-29 18:12+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" "PO-Revision-Date: 2014-05-21 19:10-0300\n" "Last-Translator: \n" "Language-Team: Brazilian Portuguese \n" @@ -252,7 +252,7 @@ msgstr "Endereço do MPD" msgid "MPD port" msgstr "Porta do MPD" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "Gerenciador de pacotes" @@ -260,7 +260,7 @@ msgstr "Gerenciador de pacotes" msgid "Number of null lines" msgstr "Número de linhas nulas" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "Reprodutor de áudio" @@ -435,10 +435,13 @@ msgstr "" "$swapgb - uso de swap, GB" #: rc.cpp:309 +#, fuzzy msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" "$hddN - uso para o ponto de montagem N (começando por 0), %. Exemplo: $hdd0\n" "$hddmbN - uso para o ponto de montagem N (começando por 0), MB. Exemplo: " @@ -446,11 +449,11 @@ msgstr "" "$hddgbN - uso para o ponto de montagem N (começando por 0), GB. Exemplo: " "$hddgb0" -#: rc.cpp:314 +#: rc.cpp:316 msgid "HDD speed" msgstr "Velocidade do HDD" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" @@ -460,22 +463,22 @@ msgstr "" "$hddwN - velocidade de escrita do HDD (começando por 0), Kb/s. Exemplo: " "$hddwN" -#: rc.cpp:321 +#: rc.cpp:323 msgid "HDD temp" msgstr "Temperatura do HDD " -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" msgstr "" "$hddtempN - temperatura física no dispositivo N (começando por 0). Exemplo: " "$hddtemp0" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "Rede" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" @@ -485,11 +488,11 @@ msgstr "" "$up - velocidade de upload, KB/s\n" "$netdev - dispositivo de rede atual" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "Bateria" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" @@ -497,7 +500,7 @@ msgstr "" "$bateria - carga da bateria, %\n" "$ac - status do carregador" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -508,11 +511,11 @@ msgstr "" "$album - álbum da música $artist - artista da música $progress - progresso " "da música $time - duração da música $title - título da músic" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "Processos " -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" @@ -522,7 +525,7 @@ msgstr "" "$pstotal - número total de processos a roda $ps - lista de processos a roda " "separados por vírgula" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" @@ -530,23 +533,23 @@ msgstr "" "$pkgcountN - número de pacotes que possuem atualizações disponíveis, comando " "N. Por exemplo $pkgcount0" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "Personalizado" -#: rc.cpp:370 +#: rc.cpp:372 msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "" "$customN - leia a saída de um comando personalizado N (a partir de N). " "Exemplo: `$custom0`" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "under" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "dreanazous@gmail.com" diff --git a/sources/ptm/po/pytextmonitor.pot b/sources/ptm/po/pytextmonitor.pot index 0ac1792..e647e0d 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-05-29 18:12+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -229,7 +229,7 @@ msgstr "" msgid "MPD port" msgstr "" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "" @@ -237,7 +237,7 @@ msgstr "" msgid "Number of null lines" msgstr "" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "" @@ -386,50 +386,52 @@ msgstr "" msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" -#: rc.cpp:314 +#: rc.cpp:316 msgid "HDD speed" msgstr "" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" msgstr "" -#: rc.cpp:321 +#: rc.cpp:323 msgid "HDD temp" msgstr "" -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" msgstr "" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" "$netdev - current network device" msgstr "" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" msgstr "" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -438,38 +440,38 @@ msgid "" "$title - song title" msgstr "" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "" -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" "$ps - list of running processes comma separated" msgstr "" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" msgstr "" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "" -#: rc.cpp:370 +#: rc.cpp:372 msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "" diff --git a/sources/ptm/po/ru.po b/sources/ptm/po/ru.po index 8edd9d9..2b0502b 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-05-29 18:12+0400\n" -"PO-Revision-Date: 2014-05-29 18:13+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" +"PO-Revision-Date: 2014-05-31 14:09+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \n" "Language: ru\n" @@ -254,7 +254,7 @@ msgstr "Адрес сервера MPD" msgid "MPD port" msgstr "Порт сервера MPD" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "Пакетный менеджер" @@ -262,7 +262,7 @@ msgstr "Пакетный менеджер" msgid "Number of null lines" msgstr "Число пустых линий" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "Музыкальный плеер" @@ -444,17 +444,21 @@ msgstr "" msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" -"$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" -"$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddN - использование точки монтирования N (от 0), %. Пример: $hdd0\n" +"$hddmbN - использование точки монтирования N (от 0), MB. Пример: $hddmb0\n" +"$hddgbN - использование точки монтирования N (от 0), GB. Пример: $hddgb0\n" +"$hddtotmbN - размер точки монтирования N (от 0), MB. Пример: $hddtotmb0\n" +"$hddtotgbN - размер точки монтирования N (от 0), GB. Пример: $hddtotgb0" -#: rc.cpp:314 +#: rc.cpp:316 msgid "HDD speed" msgstr "Скорость HDD" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" @@ -462,22 +466,20 @@ msgstr "" "$hddrN - скорость записи на HDD N (от 0), KB/s. Например: $hddr0\n" "$hddwN - скорость чтения с HDD N (от 0), KB/s. Например: $hddw0" -#: rc.cpp:321 +#: rc.cpp:323 msgid "HDD temp" msgstr "Температура HDD" -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" -msgstr "" -"$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0 " -"$hddtempN - температура на устройстве N (от 0). Пример: $hddtemp0" +msgstr "$hddtempN - температура на устройстве N (от 0). Пример: $hddtemp0" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "Сеть" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" @@ -487,11 +489,11 @@ msgstr "" "$up - скорость загрузки, KB/s\n" "$netdev - текущее устройство" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "Батарея" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" @@ -499,7 +501,7 @@ msgstr "" "$bat - заряд батареи, %\n" "$ac - статус адаптора питания" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -513,11 +515,11 @@ msgstr "" "$time - продолжительность\n" "$title - название" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "Процессы" -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" @@ -527,7 +529,7 @@ msgstr "" "$pstotal - общее число процессов\n" "$ps - список запущенных процессов, разделенных запятыми" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" @@ -535,21 +537,21 @@ msgstr "" "$pkgcountN - число пакетов, которые доступны для обновления, для команды N. " "Например, $pkgcount0" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "Своя команда" -#: rc.cpp:370 +#: rc.cpp:372 msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "$customN - получить информацию из своей команды N. Например $custom0" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Evgeniy Alekseev" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "esalexeev@gmail.com" diff --git a/sources/ptm/po/uk.po b/sources/ptm/po/uk.po index fbf868a..1d74c4f 100644 --- a/sources/ptm/po/uk.po +++ b/sources/ptm/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=157124\n" -"POT-Creation-Date: 2014-05-29 18:12+0400\n" +"POT-Creation-Date: 2014-05-31 14:04+0400\n" "PO-Revision-Date: 2014-05-24 16:27+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Ukrainian \n" @@ -254,7 +254,7 @@ msgstr "Адреса сервера MPD" msgid "MPD port" msgstr "Порт сервера MPD" -#: rc.cpp:175 rc.cpp:361 +#: rc.cpp:175 rc.cpp:363 msgid "Package manager" msgstr "Пакетний менеджер" @@ -262,7 +262,7 @@ msgstr "Пакетний менеджер" msgid "Number of null lines" msgstr "Кількість пустих рядків" -#: rc.cpp:188 rc.cpp:343 +#: rc.cpp:188 rc.cpp:345 msgid "Music player" msgstr "Музичний плеєр" @@ -439,20 +439,23 @@ msgstr "" "$swapgb - використання swap, GB" #: rc.cpp:309 +#, fuzzy msgid "" "$hddN - usage for mount point N (from 0), %. Example: $hdd0\n" "$hddmbN - usage for mount point N (from 0), MB. Example: $hddmb0\n" -"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0" +"$hddgbN - usage for mount point N (from 0), GB. Example: $hddgb0\n" +"$hddtotmbN - total size of mount point N (from 0), MB. Example: $hddtotmb0\n" +"$hddtotgbN - total size of mount point N (from 0), GB. Example: $hddtotgb0" msgstr "" "$hddN - використання точки монтування N (від 0), %. Приклад: $hdd0\n" "$hddmbN - використання точки монтування N (від 0), MB. Приклад: $hddmb0\n" "$hddgbN - використання точки монтування N (від 0), GB. Приклад: $hddgb0" -#: rc.cpp:314 +#: rc.cpp:316 msgid "HDD speed" msgstr "Швидкість HDD" -#: rc.cpp:317 +#: rc.cpp:319 msgid "" "$hddrN - read speed HDD N (from 0), KB/s. Example: $hddr0\n" "$hddwN - write speed HDD N (from 0), KB/s. Example: $hddw0" @@ -460,21 +463,21 @@ msgstr "" "$hddrN - швидкість читання HDD N (від 0), KB/s. Приклад: $hddr0\n" "$hddwN - швидкість запису HDD N (від 0), KB/s. Приклад: $hddw0" -#: rc.cpp:321 +#: rc.cpp:323 msgid "HDD temp" msgstr "Температура HDD" -#: rc.cpp:324 +#: rc.cpp:326 msgid "" "$hddtempN - physical temperature on device N (from 0). Example: $hddtemp0" msgstr "" "$hddtempN - фізична температура на пристрої N (від 0). Приклад: $hddtemp" -#: rc.cpp:327 +#: rc.cpp:329 msgid "Network" msgstr "Мережа" -#: rc.cpp:330 +#: rc.cpp:332 msgid "" "$down - download speed, KB/s\n" "$up - upload speed, KB/s\n" @@ -484,11 +487,11 @@ msgstr "" "$up - швидкість віддачі, KB/s\n" "$netdev - поточний мережевий пристрій" -#: rc.cpp:335 +#: rc.cpp:337 msgid "Battery" msgstr "Батарея" -#: rc.cpp:339 +#: rc.cpp:341 msgid "" "$bat - battery charge, %\n" "$ac - AC status" @@ -496,7 +499,7 @@ msgstr "" "$bat - заряд батареї, %\n" "$ac - статус адаптера живлення" -#: rc.cpp:346 +#: rc.cpp:348 msgid "" "$album - song album\n" "$artist - song artist\n" @@ -510,11 +513,11 @@ msgstr "" "$time - тривалість\n" "$title - назва" -#: rc.cpp:353 +#: rc.cpp:355 msgid "Processes" msgstr "Процеси" -#: rc.cpp:356 +#: rc.cpp:358 msgid "" "$pscount - number of running processes\n" "$pstotal - total number of running processes\n" @@ -524,7 +527,7 @@ msgstr "" "$pstotal - загальна кількість процесів\n" "$ps - перелік запущених процесів, розділених комами" -#: rc.cpp:364 +#: rc.cpp:366 msgid "" "$pkgcountN - number of packages which are available for updates, command N. " "For example $pkgcount0" @@ -532,22 +535,22 @@ msgstr "" "$pkgcountN - кількість пакетів, що доступні для оновлення, для команди N. " "Наприклад: $pkgcount0" -#: rc.cpp:367 +#: rc.cpp:369 msgid "Custom" msgstr "Своя команда" -#: rc.cpp:370 +#: rc.cpp:372 msgid "" "$customN - get output from custom command N (from N). Example `$custom0`" msgstr "" "$customN - отримати інформацію зі своєї команди N. Наприклад `$custom0`" -#: rc.cpp:371 +#: rc.cpp:373 msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Slobodyan Victor" -#: rc.cpp:372 +#: rc.cpp:374 msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "sarumyan@i.ua" diff --git a/sources/readme/en.html b/sources/readme/en.html index 65f8990..8ffeea7 100644 --- a/sources/readme/en.html +++ b/sources/readme/en.html @@ -39,6 +39,8 @@
  • tag $hddN - usage for mount point N, %. For example, $hdd0
  • tag $hddmbN - usage for mount point N, MB. For example, $hddmb0
  • tag $hddgbN - usage for mount point N, GB. For example, $hddgb0
  • +
  • tag $hddtotmbN - total size of mount point N, MB. For example, $hddtotmb0
  • +
  • tag $hddtotgbN - total size of mount point N, GB. For example, $hddtotgb0
  • tag $hddrN - read speed of disk N, KB/s. For example, $hddr0
  • tag $hddwN - write speed of disk N, KB/s. For example, $hddw0
  • tag $hddtempN - temperature for HDD N. For example, $hddtemp0
  • diff --git a/sources/readme/ru.html b/sources/readme/ru.html index 8ebd10e..bde13f0 100644 --- a/sources/readme/ru.html +++ b/sources/readme/ru.html @@ -37,8 +37,10 @@
  • тег $swaptotmb - размер swap, MB
  • тег $swaptotgb - размер swap, GB
  • тег $hddN - использование точки монтирования N, %. Например, $hdd0
  • -
  • тег $hddmbN - использование точки монтирования N, KB/s. Например, $hddmb0
  • -
  • тег $hddgbN - использование точки монтирования N, KB/s. Например, $hddgb0
  • +
  • тег $hddmbN - использование точки монтирования N, MB. Например, $hddmb0
  • +
  • тег $hddgbN - использование точки монтирования N, GB. Например, $hddgb0
  • +
  • тег $hddtotmbN - размер точки монтирования N, MB. Например, $hddtotmb0
  • +
  • тег $hddtotgbN - размер точки монтирования N, GB. Например, $hddtotgb0
  • тег $hddrN - скорость записи на диск N, KB/s. Например, $hddr0
  • тег $hddwN - скорость чтения с диска N, KB/s. Например, $hddw0
  • тег $hddtempN - температура HDD N. Например, $hddtemp0