update changelog

CHANGELOG

@@ -1,9 +1,33 @@
+Ver.2.0.0:
++ add new widget - awesome widget
++ add new tags $hddfreemb, $hddfreegb, $memusedmb, $memusedgb, $memfreemb $memfreegb, $swapfreemb, $swapfreegb
++ add new DataEngine - battery
++ add new tooltip - battery
++ add new temperature units cm^-1, kcal/mol, kJ/mol, Reamur
++ add ability to hide panels by hotkey pressing
+- remove widget pytextmonitor
+- remove separate fields
+- remove README
+* project has been renamed to Awesome Widgets
+* rename tag $custom (time) to $ctime
+* rename tag $custom (uptime) to $cuptime
+* rename tag $time (player) to $duration
+* rename tag $number to $ndesktop
+* rename tag $name to $desktop
+* rename tag $total to $tdesktops
+* debug flag is DEBUG now
+* rewrite project to C++
+* tooltip doesn't depend on widget now
+* text align now can be configured only by using HTML tags
+* move battery and AC settings to DataEngine
+* changes in configuration interface
+
 Ver.1.11.0:
-+ added ability to disable background image
++ add ability to disable background image
-+ added desktop DataEngine
++ add desktop DataEngine
-+ added PTM desktop panel
++ add PTM desktop panel
-+ added desktop label (tags $name, $number, $total)
++ add desktop label (tags $name, $number, $total)
-+ added ability to interact with players using mpris
++ add ability to interact with players using mpris
 * rewrite to use submodules
 * rewrite dataengine to use tasks
 * fix nvidia temperature definition
@@ -17,61 +41,61 @@ Ver.1.10.1:
 - fix checking of qmmp
 
 Ver.1.10.0:
-+ added tags $hddtotmb, $hddtotgb
++ add tags $hddtotmb, $hddtotgb
-+ added tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb
++ add tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb
-+ added ability for force update text
++ add ability for force update text
-+ added support of clementine
++ add support of clementine
-+ added support of hddtemp cmd
++ add support of hddtemp cmd
-+ added support of disable option for HDDDEV and GPUDEV
++ add support of disable option for HDDDEV and GPUDEV
-+ added error checking of DataEngine variables
++ add error checking of DataEngine variables
-+ added multithreading to DataEngine
++ add multithreading to DataEngine
-+ added ability to disable popup messages
++ add ability to disable popup messages
-+ added ability to use vertical layout
++ add ability to use vertical layout
-+ added ability to add stretch
++ add ability to add stretch
-+ added ability to show debug information (set environment variable 'PTM_DEBUG' to 'yes')
++ add ability to show debug information (set environment variable 'PTM_DEBUG' to 'yes')
-+ added Brazillian Portuguese translation (@underr)
++ add Brazillian Portuguese translation (@underr)
-+ added Ukrainian translation (Виктор Слободян)
++ add Ukrainian translation (Виктор Слободян)
-- removed util.py
+- remove util.py
-- removed createNotifyrc since it isn't needed
+- remove createNotifyrc since it isn't needed
 * refactoring of configuration interface
 * player settings was moved from plasmoid to dataengine
-* edited readme call
+* edit readme call
-* changed readme from md to html
+* change readme from md to html
 
 Ver.1.9.0:
-+ added support of several custom commands ($customN)
++ add support of several custom commands ($customN)
-+ added hdd speed label ($hddrN, $hddwN)
++ add hdd speed label ($hddrN, $hddwN)
-+ added actions to context menu (open readme and run ksysguard)
++ add actions to context menu (open readme and run ksysguard)
-- removed doubleclick event
+- remove doubleclick event
 * fix parsing pkg label
 
 Ver.1.8.3:
-+ added Spanish translation (thanks to Ernesto Avilés Vzqz)
++ add Spanish translation (thanks to Ernesto Avilés Vzqz)
-+ added readme to the package
++ add readme to the package
 
 Ver.1.8.2:
-+ added different temperature units (Farenheit and Kelvin)
++ add different temperature units (Farenheit and Kelvin)
 
 Ver.1.8.1:
 * change pkg update time to hour
 
 Ver.1.8.0:
-+ added scrollbar to configuration interface
++ add scrollbar to configuration interface
-+ added AC lines configuration
++ add AC lines configuration
-+ added $hddmbN, %hddgbN tags
++ add $hddmbN, $hddgbN tags
-+ added support of ps ($ps, $pscount, $pstotal tags)
++ add support of ps ($ps, $pscount, $pstotal tags)
-+ added support of package managers ($pkgcountN tags)
++ add support of package managers ($pkgcountN tags)
 * refactoring of DataEngine
 
 Ver.1.7.4:
-+ added support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
++ add support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
 - format bug fixes
 * changes in custom uptime format
 
 Ver.1.7.3:
-+ added tags $memgb, $swapgb
++ add tags $memgb, $swapgb
-+ added readme directory
++ add readme directory
-+ added french translation (@Mermouy)
++ add french translation (@Mermouy)
 - fix tooltip for custom uptime format
 - fix #12
 * more refactoring to the god of refactoring
@@ -80,108 +104,108 @@ Ver.1.7.3:
 * player_name now has str type
 
 Ver.1.7.2:
-+ added tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
++ add tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
-+ added scalling to tooltips
++ add scalling to tooltips
-+ added dataengine configuration from ptm
++ add dataengine configuration from ptm
-+ added custom command to dataengine
++ add custom command to dataengine
-- removed custom command from ptm
+- remove custom command from ptm
-- removed tags $ds, $hs, $ms
+- remove tags $ds, $hs, $ms
 
 Ver.1.7.1:
-- removed error label
+- remove error label
 * fix bug with zero values in tooltip
 
 Ver.1.7.0:
-+ added support of several tags in temperature label
++ add support of several tags in temperature label
-+ added tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
++ add tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
-+ added label with custom command
++ add label with custom command
-+ added tooltips for CPU, CPU clock, memory, swap and network labels
++ add tooltips for CPU, CPU clock, memory, swap and network labels
-- removed tags @@...@@, $temp, $ccpu, $ccpucl, $net
+- remove tags @@...@@, $temp, $ccpu, $ccpucl, $net
 * changes in settings
 * ptm now does not require net-tools
 * refactoring
 
 Ver.1.6.1:
-+ added support of several devices in hddtemp label
++ add support of several devices in hddtemp label
 - fixed #6
 
 Ver.1.6.0:
-+ added $custom tag to time and uptime labels (#8)
++ add $custom tag to time and uptime labels (#8)
 + russian translation
-- fixed #6, #10
+- fix #6, #10
-* changed license to GPLv3
+* change license to GPLv3
-* changed project build
+* change project build
 
 Ver.1.5.3:
-+ added $album, $progress and $time tags to player label (#7)
++ add $album, $progress and $time tags to player label (#7)
-- fixed zero swap
+- fix zero swap
 
 Ver.1.5.2:
-+ added $isotime, $shorttime and $longtime tags to time label
++ add $isotime, $shorttime and $longtime tags to time label
 
 Ver.1.5.1:
-+ added time label
++ add time label
 
 Ver.1.5.0:
-+ added player label
++ add player label
 
 Ver.1.4.0:
-+ added notifications
++ add notifications
 
 Ver.1.3.6:
-- fixed #1, #2
+- fix #1, #2
 
 Ver.1.3.5:
 - fix bug with definition network device
 
 Ver.1.3.4:
-+ added double click event
++ add double click event
-+ added auto selection of network device
++ add auto selection of network device
-- fixed yet another plasma crash
+- fix yet another plasma crash
 
 Ver.1.3.3:
-* edited reading temperature device
+* edit reading temperature device
 
 Ver.1.3.2b:
-- fixed plasma crash
+- fix plasma crash
 
 Ver.1.3.2:
-+ added GPU, GPU temperature, HDD and HDD temperature labels
++ add GPU, GPU temperature, HDD and HDD temperature labels
-+ added $ccpu and $ccpucl tags
++ add $ccpu and $ccpucl tags
 - bug fixes
 * optimization and refactoring
 
 Ver.1.2.2:
-+ added tooltip to lineEdit
++ add tooltip to lineEdit
 
 Ver.1.2.1:
 * if battery doesn't exist return 'off'
 * if AC doesn't exist return '(?)'
 
 Ver.1.2.0:
-+ added $ac tag to battery label
++ add $ac tag to battery label
-+ added battery and ac device configurations
++ add battery and ac device configurations
-+ added error cheking
++ add error cheking
 * $bat tag now reading from /sys/*
 
 Ver.1.1.4:
-* changed parsing acpi output (battery label)
+* change parsing acpi output (battery label)
 
 Ver.1.1.3:
-+ added font weight
++ add font weight
-* edited font setup line. Now setup for font family works normaly
+* edit font setup line. Now setup for font family works normaly
 * small bug fix
 
 Ver.1.1.2:
-+ added CPU clock lable
++ add CPU clock lable
-+ added function to update network device (100*time_interval)
++ add function to update network device (100*time_interval)
-+ changed update sliders
++ change update sliders
 
 Ver.1.1.1:
-+ added $swapmb, $memmb, $netdev, @@netdev=...@@ tags
++ add $swapmb, $memmb, $netdev, @@netdev=...@@ tags
 - some bug fixes
 * widget consists of several labels
-* edited configuration interface
+* edit configuration interface
 
 Ver.1.0:
 First release

CHANGELOG-RU

@@ -1,3 +1,27 @@
+Вер.2.0.0:
++ добавлен виджет awesome widget
++ новые теги $hddfreemb, $hddfreegb, $memusedmb, $memusedgb, $memfreemb $memfreegb, $swapfreemb, $swapfreegb
++ новый DataEngine - battery
++ новый тултип - battery
++ новые температурные единицы см^-1, ккал/моль, кДж/моль, Реамюр
++ добавлена возможность скрывать панели по хоткею
+- удален виджет pytextmonitor
+- убраны отдельные поля
+- удалены README
+* проект переименован в Awesome Widgets
+* тег $custom (время) переименован в $ctime
+* тег $custom (время работы) переименован в $cuptime
+* тег $time (плеер) переименован в $duration
+* тег $number переименован в $ndesktop
+* тег $name переименован в $desktop
+* тег $total переименован в $tdesktops
+* дебаг флаг теперь DEBUG
+* проект полностью переписан на C++
+* тултип независит теперь от самого виджета
+* настройка выравнивания текста теперь осуществляется только HTML тегами
+* настройки батареи и адаптора питания вынесены в DataEngine
+* изменения в конфигурационном интерфейсе
+
 Вер.1.11.0:
 + добавлена возможность отключения фона
 + добавлен desktop DataEngine

readme_diff.patch

@@ -1,89 +0,0 @@
---- README.md.orig	2014-07-08 12:10:47.217925504 +0400
-+++ README.md	2014-08-02 18:17:43.086103875 +0400
-@@ -60,6 +60,9 @@
- * tag `$ps` - list of running processes
- * tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0`
- * tag `$customN` - returns output for custom command N. For example, `$custom0`
-+* tag `$name` - name of the current desktop
-+* tag `$number` - number of the current desktop
-+* tag `$total` - total number of desktops
- 
- Label order will changed if you change slider position. HTML tags in label work normally.
- 
-@@ -75,6 +78,10 @@
- Advanced settings
- -----------------
- 
-+**Enable background**
-+
-+Uncheck to disable default background and set transparent one.
-+
- **Vertical layout**
- 
- Use vertical layout instead of horizontal one.
-@@ -173,6 +180,10 @@
- 
- Commands, which will be run for custom label.
- 
-+**Desktop cmd**
-+
-+Type a command which will be run for desktop DataEngine. Default is `qdbus org.kde.kwin /KWin currentDesktop`.
-+
- **GPU device**
- 
- Select one of supported GPU devices. `auto` will enable auto selection, `disable` will disable definition of GPU states. Default is `auto`.
-@@ -193,6 +204,10 @@
- 
- Port of MPD server. Default is `6600`.
- 
-+**MPRIS player name**
-+
-+MPRIS player name. The DBus interface of an music player should be enabled. Default is `auto`.
-+
- **Package manager**
- 
- List of commands, which will be run. Number of null lines is a number of unneeded lines. Defaults:
-@@ -208,10 +223,40 @@
- 
- Select one of supported music playes for player label.
- 
--DataEngine configuration
--------------------------
-+PTM desktop panel
-+=================
-+
-+Since version 1.11.0 PyTextMonitor provides a minimalistic panel for monitoring on desktops written on `C++`. And yes, it looks like the same panel in Awesome.
-+
-+Desktop panel configuration
-+---------------------------
-+
-+**Enable background**
-+
-+Uncheck to disable default background and set transparent one.
-+
-+**Vertical layout**
-+
-+Use vertical layout instead of horizontal one.
-+
-+**Add stretch**
-+
-+Add stretch (spacer) to the selected side of the widget.
-+
-+**Mark**
-+
-+Type symbol (or string) which will be shown if this desktop is active now.
-+
-+**Pattern tags**
-+
-+* tag `$mark` - show mark if this desktop is active
-+* tag `$name` - name of the current desktop
-+* tag `$number` - number of the current desktop
-+* tag `$total` - total number of desktops
-+
-+**Command**
- 
--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.
-+Type command which will be run on left click on the selected desktop. Available variables are same as for pattern. Default is `dbus org.kde.kwin /KWin setCurrentDesktop $number`.
- 
- Instruction
- ===========

sources/desktop-panel/po/en.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
-"PO-Revision-Date: 2014-09-06 16:05+0400\n"
+"PO-Revision-Date: 2014-09-08 02:02+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: English <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,35 +18,35 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr "Bottom Edge"
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr "Left Edge"
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr "Right Edge"
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr "Unknown Position (%1)"
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr "Appearance"
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr "Toggle panels"
 
@@ -116,15 +116,15 @@ msgstr "Pattern"
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 
 #: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"

sources/desktop-panel/po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
 "PO-Revision-Date: 2014-06-05 10:21+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Spanish <kde-spanish@lists.kde.ru>\n"
@@ -18,35 +18,35 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr ""
 
@@ -116,10 +116,10 @@ msgstr ""
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
 
 #: po/rc.cpp:72 rc.cpp:72

sources/desktop-panel/po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
 "PO-Revision-Date: 2014-06-05 19:24+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: French <kde-french@lists.kde.ru>\n"
@@ -19,35 +19,35 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr "Apparence"
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr ""
 
@@ -117,10 +117,10 @@ msgstr ""
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
 
 #: po/rc.cpp:72 rc.cpp:72

sources/desktop-panel/po/plasma_applet_desktop-panel.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,35 +17,35 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr ""
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr ""
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr ""
 
@@ -115,10 +115,10 @@ msgstr ""
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
 
 #: po/rc.cpp:72 rc.cpp:72

sources/desktop-panel/po/pt_BR.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
 "PO-Revision-Date: 2014-06-09 01:47+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-russian@lists.kde.ru>\n"
@@ -17,35 +17,35 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr "Widget"
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr "Aparência"
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr ""
 
@@ -115,10 +115,10 @@ msgstr ""
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
 
 #: po/rc.cpp:72 rc.cpp:72

sources/desktop-panel/po/ru.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
-"PO-Revision-Date: 2014-09-06 16:06+0400\n"
+"PO-Revision-Date: 2014-09-08 02:03+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -18,35 +18,35 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr "Верхний край"
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr "Нижний край"
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr "Левый край"
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr "Правый край"
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr "Неизвестное положение (%1)"
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr "Виджет"
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr "Скрыть панели"
 
@@ -116,15 +116,15 @@ msgstr "Шаблон"
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
-"$mark$ - показать метку, если данный рабочий стол активен\n"
+"$mark - показать метку, если данный рабочий стол активен\n"
-"$name$ - имя рабочего стола\n"
+"$name - имя рабочего стола\n"
-"$number$ - номер рабочего стола\n"
+"$number - номер рабочего стола\n"
-"$total$- общее число рабочий столов"
+"$total - общее число рабочий столов"
 
 #: po/rc.cpp:72 rc.cpp:72
 msgid "Command to change desktop"

sources/desktop-panel/po/uk.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
-"POT-Creation-Date: 2014-09-06 16:04+0400\n"
+"POT-Creation-Date: 2014-09-08 02:02+0400\n"
 "PO-Revision-Date: 2014-06-06 01:23+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Ukrainian <kde-ukrainian@lists.kde.ru>\n"
@@ -18,35 +18,35 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: desktop-panel.cpp:139
+#: desktop-panel.cpp:141
 msgid "Top Edge"
 msgstr ""
 
-#: desktop-panel.cpp:141
+#: desktop-panel.cpp:143
 msgid "Bottom Edge"
 msgstr ""
 
-#: desktop-panel.cpp:143
+#: desktop-panel.cpp:145
 msgid "Left Edge"
 msgstr ""
 
-#: desktop-panel.cpp:145
+#: desktop-panel.cpp:147
 msgid "Right Edge"
 msgstr ""
 
-#: desktop-panel.cpp:147
+#: desktop-panel.cpp:149
 msgid "Unknown Position (%1)"
 msgstr ""
 
-#: desktop-panel.cpp:383
+#: desktop-panel.cpp:375
 msgid "Widget"
 msgstr "Віджет"
 
-#: desktop-panel.cpp:384
+#: desktop-panel.cpp:376
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
-#: desktop-panel.cpp:385
+#: desktop-panel.cpp:377
 msgid "Toggle panels"
 msgstr ""
 
@@ -116,10 +116,10 @@ msgstr ""
 
 #: po/rc.cpp:66 rc.cpp:66
 msgid ""
-"$mark$ - show mark if the current desktop is active\n"
+"$mark - show mark if the current desktop is active\n"
-"$name$ - desktop name\n"
+"$name - desktop name\n"
-"$number$ - desktop number\n"
+"$number - desktop number\n"
-"$total$ - total number of desktops"
+"$total - total number of desktops"
 msgstr ""
 
 #: po/rc.cpp:72 rc.cpp:72

sources/desktop-panel/widget.ui

@@ -233,10 +233,10 @@
          <item>
           <widget class="QLineEdit" name="lineEdit_pattern">
            <property name="toolTip">
-            <string>$mark$ - show mark if the current desktop is active
+            <string>$mark - show mark if the current desktop is active
-$name$ - desktop name
+$name - desktop name
-$number$ - desktop number
+$number - desktop number
-$total$ - total number of desktops</string>
+$total - total number of desktops</string>
            </property>
           </widget>
          </item>