diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp
index 113c1f0..db3751a 100644
--- a/sources/awesome-widget/awesome-widget.cpp
+++ b/sources/awesome-widget/awesome-widget.cpp
@@ -254,14 +254,14 @@ QStringList AwesomeWidget::getKeys()
// uptime
allKeys.append(QString("uptime"));
allKeys.append(QString("cuptime"));
- // cpu
- allKeys.append(QString("cpu"));
- for (int i=counts[QString("cpu")]-1; i>=0; i--)
- allKeys.append(QString("cpu") + QString::number(i));
// cpuclock
allKeys.append(QString("cpucl"));
for (int i=counts[QString("cpu")]-1; i>=0; i--)
allKeys.append(QString("cpucl") + QString::number(i));
+ // cpu
+ allKeys.append(QString("cpu"));
+ for (int i=counts[QString("cpu")]-1; i>=0; i--)
+ allKeys.append(QString("cpu") + QString::number(i));
// temperature
for (int i=counts[QString("temp")]-1; i>=0; i--)
allKeys.append(QString("temp") + QString::number(i));
@@ -270,7 +270,6 @@ QStringList AwesomeWidget::getKeys()
// gputemp
allKeys.append(QString("gputemp"));
// memory
- allKeys.append(QString("mem"));
allKeys.append(QString("memmb"));
allKeys.append(QString("memgb"));
allKeys.append(QString("memfreemb"));
@@ -279,23 +278,24 @@ QStringList AwesomeWidget::getKeys()
allKeys.append(QString("memtotgb"));
allKeys.append(QString("memusedmb"));
allKeys.append(QString("memusedgb"));
+ allKeys.append(QString("mem"));
// swap
- allKeys.append(QString("swap"));
allKeys.append(QString("swapmb"));
allKeys.append(QString("swapgb"));
allKeys.append(QString("swapfreemb"));
allKeys.append(QString("swapfreegb"));
allKeys.append(QString("swaptotmb"));
allKeys.append(QString("swaptotgb"));
+ allKeys.append(QString("swap"));
// hdd
for (int i=counts[QString("mount")]-1; i>=0; i--) {
- allKeys.append(QString("hdd") + QString::number(i));
allKeys.append(QString("hddmb") + QString::number(i));
allKeys.append(QString("hddgb") + QString::number(i));
allKeys.append(QString("hddfreemb") + QString::number(i));
allKeys.append(QString("hddfreegb") + QString::number(i));
allKeys.append(QString("hddtotmb") + QString::number(i));
allKeys.append(QString("hddtotgb") + QString::number(i));
+ allKeys.append(QString("hdd") + QString::number(i));
}
// hdd speed
for (int i=counts[QString("disk")]-1; i>=0; i--) {
diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h
index 8d1c8f5..4bc7e60 100644
--- a/sources/awesome-widget/awesome-widget.h
+++ b/sources/awesome-widget/awesome-widget.h
@@ -66,7 +66,7 @@ public slots:
// update events
void sendNotification(const QString eventId, const QString message);
void updateNetworkDevice();
- void updateText(bool clear = false);
+ void updateText(const bool clear = false);
void updateTooltip();
private slots:
diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp
index b686c0e..2cae6ff 100644
--- a/sources/awesome-widget/configuration.cpp
+++ b/sources/awesome-widget/configuration.cpp
@@ -382,6 +382,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
connect(uiDEConfig.tableWidget_pkgCommand, SIGNAL(customContextMenuRequested(QPoint)),
this, SLOT(contextMenuPkgCommand(QPoint)));
connect(uiWidConfig.pushButton_tags, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+ connect(uiWidConfig.pushButton_br, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
+ connect(uiWidConfig.pushButton_font, SIGNAL(clicked(bool)), this, SLOT(setFontFormating()));
connect(uiWidConfig.pushButton_bold, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
connect(uiWidConfig.pushButton_italic, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
connect(uiWidConfig.pushButton_underline, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
@@ -390,7 +392,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
connect(uiWidConfig.pushButton_center, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
connect(uiWidConfig.pushButton_right, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
connect(uiWidConfig.pushButton_fill, SIGNAL(clicked(bool)), this, SLOT(setFormating()));
- connect(uiWidConfig.pushButton_font, SIGNAL(clicked(bool)), this, SLOT(setFontFormating()));
connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
@@ -579,9 +580,8 @@ void AwesomeWidget::configChanged()
fontStyle = QString("italic");
else
fontStyle = QString("normal");
- formatLine[0] = QString("\
- \
- ")
+ formatLine[0] = QString("\
+ ")
.arg(font.family())
.arg(font.pointSize())
.arg(font.htmlWeight())
@@ -722,6 +722,8 @@ void AwesomeWidget::setFormating()
QString selectedText = uiWidConfig.textEdit_elements->textCursor().selectedText();
if (sender() == uiWidConfig.pushButton_tags)
uiWidConfig.textEdit_elements->insertPlainText(QString("$") + uiWidConfig.comboBox_tags->currentText());
+ else if (sender() == uiWidConfig.pushButton_br)
+ uiWidConfig.textEdit_elements->insertPlainText(QString("
\n"));
else if (sender() == uiWidConfig.pushButton_bold)
uiWidConfig.textEdit_elements->insertPlainText(QString("") + selectedText + QString(""));
else if (sender() == uiWidConfig.pushButton_italic)
diff --git a/sources/awesome-widget/po/en.po b/sources/awesome-widget/po/en.po
index 892f9a7..d9447a7 100644
--- a/sources/awesome-widget/po/en.po
+++ b/sources/awesome-widget/po/en.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 01:52+0400\n"
"PO-Revision-Date: 2014-09-05 11:14+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: English \n"
@@ -30,43 +30,43 @@ msgstr "Show README"
msgid "Update text"
msgstr "Update text"
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr "Custom command"
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr "Package manager"
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr "Null lines"
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr "Widget"
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr "Advanced"
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr "Tooltip"
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr "Appearance"
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr "DataEngine"
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr "Remove"
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr "Select font"
@@ -75,26 +75,14 @@ msgid "Enable background"
msgstr "Enable background"
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr "Vertical layout"
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr "Enable popup on mouse click"
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr "Add stretch to left/top of the layout"
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Add stretch to right/bottom of the layout"
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr "Custom time format"
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -130,11 +118,11 @@ msgstr ""
"$ss - seconds\n"
"$s - seconds w\\o zero"
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr "Custom uptime format"
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -150,116 +138,116 @@ msgstr ""
"$mm - uptime minutes\n"
"$m - uptime minutes without zero"
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr "Temperature units"
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr "Temperature devices"
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr "Editable"
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr "Mount points"
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr "HDD (speed)"
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr "HDD (temp)"
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
msgid "Disable auto select device and set specified device"
msgstr "Disable auto select device and set specified device"
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr "Set network device"
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr "AC online tag"
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr "Line, which returns when AC is online"
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr "AC offline tag"
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr "Line, which returns when AC is offline"
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr "Time interval"
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr "Font"
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr "Font size"
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr "Font color"
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr "Font style"
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr "Font weight"
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr "HDD"
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr "MPD port"
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr "GPU device"
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr "hddtemp cmd"
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr "Music player"
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr "MPD address"
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr "Desktop check cmd"
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr "NOTE: Player DBus interface should be an active"
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr "MPRIS player name"
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
@@ -267,23 +255,23 @@ msgstr ""
"Editable\n"
"del - remove item"
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr "Battery device"
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" by default"
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr "AC device"
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" by default"
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -291,47 +279,47 @@ msgstr ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr "Number of values for tooltips"
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr "Background"
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr "CPU color"
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr "CPU clock color"
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr "Memory color"
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr "Swap color"
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr "Download speed color"
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr "Upload speed color"
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr "Battery active color"
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
msgid "Battery inactive color"
msgstr "Battery inactive color"
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
@@ -339,32 +327,41 @@ msgstr ""
"Detailed information may be found on project homepage"
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr "Ctrl+I"
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr "Ctrl+U"
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr "Add"
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Evgeniy Alekseev"
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "esalexeev@gmail.com"
+#~ msgid "Vertical layout"
+#~ msgstr "Vertical layout"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Add stretch to left/top of the layout"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Add stretch to right/bottom of the layout"
+
#~ msgid "Advanced configuration"
#~ msgstr "Advanced configuration"
diff --git a/sources/awesome-widget/po/es.po b/sources/awesome-widget/po/es.po
index 3b3c8fb..460cca5 100644
--- a/sources/awesome-widget/po/es.po
+++ b/sources/awesome-widget/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 01:52+0400\n"
"PO-Revision-Date: 2014-09-05 11:18+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Spanish \n"
@@ -30,43 +30,43 @@ msgstr "Mostrar el README"
msgid "Update text"
msgstr "Actualizar texto"
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr "Comando personalizado"
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr "Gestor de paquetes"
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr "Número de líneas nulas"
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr "Widget"
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr "Avanzado"
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr "Ventana emergente"
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr "Apariencia"
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr "DataEngine"
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr "Eliminar"
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr ""
@@ -75,26 +75,14 @@ msgid "Enable background"
msgstr ""
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr "Orientación vertical"
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr "Habilitar ventana emergente al hacer clic"
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr "Añadir extensión a la izquierda/superior de la distribución"
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Añadir extensión a la derecha/inferior de la distribución"
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr "Formato personalizado para la hora"
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -130,11 +118,11 @@ msgstr ""
"$ss - segundos\n"
"$s - segundos (sin ceros)"
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr "Formato personalizado para el tiempo de actividad del sistema"
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -150,116 +138,116 @@ msgstr ""
"$mm - minutos\n"
"$m - minutos (sin ceros)"
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr "Unidades de temperatura"
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr "Dispositivos de temperatura"
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr "Editable"
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr "Puntos de montaje"
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr "Disco duro (velocidad)"
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr "Disco duro (temperatura)"
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
msgid "Disable auto select device and set specified device"
msgstr "Inhabilitar selección automática del dispositivo y especificar uno"
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr "Establecer dispositivo de red"
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr "Etiqueta para alimentación conectada"
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr "Línea que devuelve si la alimentación está conectada"
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr "Etiqueta para la alimentación desconectada"
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr "Línea que devuelve si la alimentación está desconectada"
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr "Intervalo de tiempo"
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr "Fuente"
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr "Tamaño de fuente"
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr "Color de fuente"
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr "Estilo de fuente"
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr "Grosor de la fuente"
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr "Disco duro"
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr "Puerto de MPD"
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr "Dispositivo de GPU"
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr "Comando hddtemp"
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr "Reproductor de música"
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr "Dirección de MPD"
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr ""
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr ""
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr ""
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
@@ -267,23 +255,23 @@ msgstr ""
"Editable\n"
"del - eliminar elemento"
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr "Dispositivo de batería"
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" por defecto"
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr "Dispositivo de alimentación"
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" por defecto"
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -292,48 +280,48 @@ msgstr ""
"ventanas emergentes. Para habilitarlas habilite la caja de seleccione la "
"casilla de verificación pertinente."
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr "Número de valores para las ventanas emergentes"
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr ""
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr "Color de la CPU"
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr "Color de la frecuencia de la CPU"
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr "Color de la memoria"
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr "Color de la swap"
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr "Color de la velocidad de recepción"
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr "Color de la velocidad de envío"
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr ""
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
#, fuzzy
msgid "Battery inactive color"
msgstr "Dispositivo de batería"
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
@@ -341,32 +329,41 @@ msgstr ""
"Puede encontrar información detallada en el sitio del proyecto"
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr "Ctrl+I"
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr "Ctrl+U"
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr "Añadir"
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Tu nombre"
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "Tus correos"
+#~ msgid "Vertical layout"
+#~ msgstr "Orientación vertical"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Añadir extensión a la izquierda/superior de la distribución"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Añadir extensión a la derecha/inferior de la distribución"
+
#~ msgid "Form"
#~ msgstr "Formulario"
diff --git a/sources/awesome-widget/po/fr.po b/sources/awesome-widget/po/fr.po
index 4d21836..77ce5f6 100644
--- a/sources/awesome-widget/po/fr.po
+++ b/sources/awesome-widget/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 01:52+0400\n"
"PO-Revision-Date: 2014-09-05 11:20+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: French \n"
@@ -31,43 +31,43 @@ msgstr "Voir le README"
msgid "Update text"
msgstr "Mettre à jour le texte"
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr "Commande personnalisée"
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr "Gestionnaire de paquets"
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr "Nombre d'éléments pour les conseils"
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr "Widget"
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr "Avancé"
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr "Conseil"
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr "Apparence"
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr "Moteur de données"
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr "Supprimer"
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr ""
@@ -76,26 +76,14 @@ msgid "Enable background"
msgstr ""
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr "Positionnement vertical"
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr "Popup lors d'un click souris"
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr "Étirer le positionnement vers haut/gauche"
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Étirer le positionnement vers bas/droite"
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr "Format de l'heure personnalisé"
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -131,11 +119,11 @@ msgstr ""
"$ss - secondes\n"
"$s - secondes sans zéro"
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr "Temps de fonctionnement personalisé"
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -151,118 +139,118 @@ msgstr ""
"$mm - temps de fonctionnement en minutes\n"
"$m - temps de fonctionnement en minutes sans zéro"
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr "Unités de température"
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr "Temperature des périphériques"
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr "Modifiable"
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr "Points de montage"
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr "Périphériques HDD (la vitesse)"
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr "Périphériques HDD (température)"
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
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"
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr "Sélectionner le périphérique réseau"
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr "Tag alimentation branchée"
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr "Ligne qui est renvoyée lorsque l'alimentation est branchée"
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr "Tag alimentation débranchée"
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr "Ligne, qui est renvoyée lorsque l'alimentation est débranchée"
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr "Intervalle"
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr "Police"
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr "Taille de la police"
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr "Couleur de la police"
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr "Style de la police"
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr "Épaisseur de la police"
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr "Disque dur"
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr "Port MPD"
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr "Périphérique graphique"
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr "Commande de température HDD"
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr "Lecteur audio"
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr "Adresse MPD"
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr ""
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr ""
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr ""
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
@@ -270,23 +258,23 @@ msgstr ""
"Modifiable\n"
"del - supprimer un élément"
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr "Batterie"
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" par défaut"
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr "Périphérique d'alimentation"
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" par défaut"
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -295,48 +283,48 @@ msgstr ""
"les conseils visuels. Pour les activer cochez simplement les cases "
"correspondantes."
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr "Nombre d'éléments pour les conseils"
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr ""
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr "Couleur processeur"
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr "Couleur de l'horloge processeur"
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr "Couleur de la mémoire"
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr "Couleur de la mémoire d'échange"
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr "Couleur de la vitesse de téléchargement"
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr "Couleur du téléversement"
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr ""
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
#, fuzzy
msgid "Battery inactive color"
msgstr "Batterie"
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
@@ -344,32 +332,41 @@ msgstr ""
"D'avantage d'informations se trouvent sur la page du projet"
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr "Ctrl+I"
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr "Ctrl+U"
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr "Ajouter"
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Evgeniy Alekseev"
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "esalexeev@gmail.com"
+#~ msgid "Vertical layout"
+#~ msgstr "Positionnement vertical"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Étirer le positionnement vers haut/gauche"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Étirer le positionnement vers bas/droite"
+
#~ msgid "Form"
#~ msgstr "Entrées"
diff --git a/sources/awesome-widget/po/plasma_applet_awesome-widget.pot b/sources/awesome-widget/po/plasma_applet_awesome-widget.pot
index 7d63cd2..33f9cf8 100644
--- a/sources/awesome-widget/po/plasma_applet_awesome-widget.pot
+++ b/sources/awesome-widget/po/plasma_applet_awesome-widget.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 01:52+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -29,43 +29,43 @@ msgstr ""
msgid "Update text"
msgstr ""
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr ""
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr ""
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr ""
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr ""
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr ""
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr ""
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr ""
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr ""
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr ""
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr ""
@@ -74,26 +74,14 @@ msgid "Enable background"
msgstr ""
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr ""
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr ""
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr ""
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr ""
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr ""
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -113,11 +101,11 @@ msgid ""
"$s - seconds w\\o zero"
msgstr ""
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr ""
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -127,211 +115,211 @@ msgid ""
"$m - uptime minutes without zero"
msgstr ""
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr ""
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr ""
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr ""
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr ""
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr ""
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr ""
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
msgid "Disable auto select device and set specified device"
msgstr ""
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr ""
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr ""
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr ""
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr ""
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr ""
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr ""
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr ""
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr ""
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr ""
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr ""
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr ""
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr ""
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr ""
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr ""
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr ""
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr ""
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr ""
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr ""
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr ""
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr ""
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
msgstr ""
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr ""
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr ""
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr ""
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr ""
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
msgstr ""
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr ""
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr ""
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr ""
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr ""
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr ""
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr ""
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr ""
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr ""
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr ""
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
msgid "Battery inactive color"
msgstr ""
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
msgstr ""
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr ""
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr ""
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr ""
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr ""
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr ""
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
diff --git a/sources/awesome-widget/po/pt_BR.po b/sources/awesome-widget/po/pt_BR.po
index a23a7ae..35e293d 100644
--- a/sources/awesome-widget/po/pt_BR.po
+++ b/sources/awesome-widget/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 01:52+0400\n"
"PO-Revision-Date: 2014-09-05 11:21+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Brazilian Portuguese \n"
@@ -29,43 +29,43 @@ msgstr "Mostrar README"
msgid "Update text"
msgstr "Atualizar texto"
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr "Comando personalizado"
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr "Gerenciador de pacotes"
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr "Número de valores para dicas de contexto"
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr "Widget"
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr "Avançado"
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr "Dica de contexto"
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr "Aparência"
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr "Engine de dados"
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr "Remover"
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr ""
@@ -74,26 +74,14 @@ msgid "Enable background"
msgstr ""
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr "Layout vertical"
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr "Ativar popup no clique do mouse"
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr "Adicionar esticamento à esquerda/topo do layout"
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Adicionar esticamento à direita/inferior do layout"
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr "Formato de hora personalizado"
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -127,11 +115,11 @@ msgstr ""
"$ss - segundos\n"
"$s segundos sem zeros"
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr "Tempo em atividade com formato personalizado"
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -147,117 +135,117 @@ msgstr ""
"$mm - tempo em atividade em minutos\n"
"$m - tempo em atividade em minuto sem zeros"
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr "Unidades de temperatura"
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr "Dispositivos de temperatura"
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr "Editável"
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr "Pontos de montagem"
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr "Dispositivos HDD (velocidade) "
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr "Dispositivos HDD (temperatura)"
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
msgid "Disable auto select device and set specified device"
msgstr ""
"Desativar auto seleção de dispositivos e escolher um dispositivo específico"
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr "Escolher dispositivo de rede"
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr "Rótulo com carregador conectado"
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr "Linha, que aparece quando o carregador está conectado"
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr "Rótulo com carregador desconectado"
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr "Linha, que aparece quando o carregador está offline"
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr "Intervalo de tempo"
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr "Tamanho da fonte"
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr "Tamanho da fonte"
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr "Cor da fonte"
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr "Estilo da fonte"
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr "Peso da fonte"
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr "HDD"
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr "Porta do MPD"
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr "Dispositivo GPU"
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr "comando hddtemp "
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr "Reprodutor de áudio"
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr "Endereço do MPD"
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr ""
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr ""
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr ""
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
@@ -265,23 +253,23 @@ msgstr ""
"Editável\n"
"del - remover item"
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr "Dispositivo do carregador"
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" por padrão"
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr "Dispositivo do carregador"
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" por padrão"
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -289,48 +277,48 @@ msgstr ""
"Os rótulos de CPU, frequência de GPU, memória, swap e rede suportam dica de "
"contexto gráfica. Para ativá-los, basta selecionar a caixa necessária."
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr "Número de valores para dicas de contexto"
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr ""
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr "Cor da frequência da GPU"
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr "Cor da frequência da GPU"
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr "Cor da memória"
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr "Cor do swap"
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr "Cor da velocidade de download"
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr "Cor da velocidade de upload"
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr ""
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
#, fuzzy
msgid "Battery inactive color"
msgstr "Dispositivo do carregador"
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
@@ -338,32 +326,41 @@ msgstr ""
"Informações detalhadas podem ser encontradas na página do projeto"
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr "Ctrl+I"
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr "Ctrl+U"
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr "Adicionar"
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "under"
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "dreanazous@gmail.com"
+#~ msgid "Vertical layout"
+#~ msgstr "Layout vertical"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Adicionar esticamento à esquerda/topo do layout"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Adicionar esticamento à direita/inferior do layout"
+
#~ msgid "Form"
#~ msgstr "Forma"
diff --git a/sources/awesome-widget/po/ru.po b/sources/awesome-widget/po/ru.po
index a3e451d..54a0ca7 100644
--- a/sources/awesome-widget/po/ru.po
+++ b/sources/awesome-widget/po/ru.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 01:52+0400\n"
"PO-Revision-Date: 2014-09-05 11:16+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Russian \n"
@@ -30,43 +30,43 @@ msgstr "Показать README"
msgid "Update text"
msgstr "Обновить текст"
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr "Своя команда"
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr "Пакетный менеджер"
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr "Число пустых линий"
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr "Виджет"
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr "Расширенные"
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr "Тултип"
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr "Внешний вид"
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr "DataEngine"
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr "Удалить"
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr "Выберете шрифт"
@@ -75,26 +75,14 @@ msgid "Enable background"
msgstr "Включить фон"
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr "Вертикальная разметка"
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr "Включить сообщения по клику мыши"
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr "Добавить пустое место слева/вверху виджета"
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Добавить пустое место справа/внизу виджета"
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr "Свой формат времени"
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -130,11 +118,11 @@ msgstr ""
"$ss - секунды\n"
"$s - секунды без 0"
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr "Свой формат аптайма"
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -150,116 +138,116 @@ msgstr ""
"$mm - минуты аптайма\n"
"$m - минуты аптайма без нулей"
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr "Температурные единицы"
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr "Температурные устройства"
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr "Редактируемо"
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr "Точки монтирования"
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr "HDD (скорость)"
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr "HDD (температура)"
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
msgid "Disable auto select device and set specified device"
msgstr "Отключить автовыбор устройства и использовать указанное"
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr "Выберете сетевое устройство"
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr "AC подключен"
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr "Строка, возвращаемая при подключенном адаптере питания"
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr "AC отключен"
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr "Строка, возвращаемая при отключенном адаптере питания"
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr "Интервал обновления"
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr "Шрифт"
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr "Размер шрифта"
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr "Цвет шрифта"
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr "Стиль шрифта"
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr "Ширина шрифта"
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr "HDD"
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr "Порт сервера MPD"
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr "Устройство GPU"
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr "Команда hddtemp"
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr "Музыкальный плеер"
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr "Адрес сервера MPD"
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr "Команда для проверки рабочего стола"
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr "ВНИМАНИЕ: DBus интерфейс плеера должен быть активен"
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr "Имя плеера в MPRIS"
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
@@ -267,23 +255,23 @@ msgstr ""
"Редактируемо\n"
"del - удалить строку"
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr "Устройство батареи"
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" по умолчанию"
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr "Устройство AC"
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" по умолчанию"
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -292,47 +280,47 @@ msgstr ""
"графический тултип. Чтобы включить его, просто сделайте требуемые чекбоксы "
"полностью чекнутыми."
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr "Число хранящихся значений"
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr "Фон"
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr "Цвет CPU"
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr "Цвет частоты CPU"
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr "Цвет памяти"
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr "Цвет swap"
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr "Цвет скорости загрузки"
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr "Цвет скорости отдачи"
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr "Цвет заряжаемой батареи"
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
msgid "Battery inactive color"
msgstr "Цвет разряжаемой батареи"
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
@@ -340,32 +328,41 @@ msgstr ""
"Подробная информация может быть найдена на домашней странице проекта"
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr "Ctrl+I"
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr "Ctrl+U"
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr "Добавить"
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Evgeniy Alekseev"
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "esalexeev@gmail.com"
+#~ msgid "Vertical layout"
+#~ msgstr "Вертикальная разметка"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Добавить пустое место слева/вверху виджета"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Добавить пустое место справа/внизу виджета"
+
#~ msgid "Advanced configuration"
#~ msgstr "Расширенная настройка"
diff --git a/sources/awesome-widget/po/uk.po b/sources/awesome-widget/po/uk.po
index 845d80d..2cc3291 100644
--- a/sources/awesome-widget/po/uk.po
+++ b/sources/awesome-widget/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 01:52+0400\n"
"PO-Revision-Date: 2014-09-05 11:22+0400\n"
"Last-Translator: Evgeniy Alekseev \n"
"Language-Team: Ukrainian \n"
@@ -30,43 +30,43 @@ msgstr "Показати README"
msgid "Update text"
msgstr "Оновити текст"
-#: configuration.cpp:331 po/rc.cpp:154 rc.cpp:154
+#: configuration.cpp:319 po/rc.cpp:145 rc.cpp:145
msgid "Custom command"
msgstr "Своя команда"
-#: configuration.cpp:361 po/rc.cpp:144 rc.cpp:144
+#: configuration.cpp:349 po/rc.cpp:135 rc.cpp:135
msgid "Package manager"
msgstr "Пакетний менеджер"
-#: configuration.cpp:362 po/rc.cpp:147 rc.cpp:147
+#: configuration.cpp:350 po/rc.cpp:138 rc.cpp:138
msgid "Null lines"
msgstr "Кількість пустих рядків"
-#: configuration.cpp:374
+#: configuration.cpp:362
msgid "Widget"
msgstr "Віджет"
-#: configuration.cpp:375
+#: configuration.cpp:363
msgid "Advanced"
msgstr "Розширені"
-#: configuration.cpp:376
+#: configuration.cpp:364
msgid "Tooltip"
msgstr "Тултіп"
-#: configuration.cpp:377
+#: configuration.cpp:365
msgid "Appearance"
msgstr "Зовнішній вигляд"
-#: configuration.cpp:378
+#: configuration.cpp:366
msgid "DataEngine"
msgstr "DataEngine"
-#: configuration.cpp:663 configuration.cpp:677
+#: configuration.cpp:645 configuration.cpp:659
msgid "Remove"
msgstr "Видалити"
-#: configuration.cpp:724
+#: configuration.cpp:706
msgid "Select font"
msgstr ""
@@ -75,26 +75,14 @@ msgid "Enable background"
msgstr ""
#: po/rc.cpp:6 rc.cpp:6
-msgid "Vertical layout"
-msgstr "Вертикальна розмітка"
-
-#: po/rc.cpp:9 rc.cpp:9
msgid "Enable popup on mouse click"
msgstr "Включити спливаючі підказки при натисканні клавіші миші"
-#: po/rc.cpp:12 rc.cpp:12
-msgid "Add stretch to left/top of the layout"
-msgstr "Додати порожнє місце ліворуч/вгорі віджету"
-
-#: po/rc.cpp:15 rc.cpp:15
-msgid "Add stretch to right/bottom of the layout"
-msgstr "Додати порожнє місце праворуч/внизу віджету"
-
-#: po/rc.cpp:18 rc.cpp:18
+#: po/rc.cpp:9 rc.cpp:9
msgid "Custom time format"
msgstr "Свій формат часу"
-#: po/rc.cpp:21 rc.cpp:21
+#: po/rc.cpp:12 rc.cpp:12
msgid ""
"$dddd - long weekday\n"
"$ddd - short weekday\n"
@@ -130,11 +118,11 @@ msgstr ""
"$ss - секунди\n"
"$s - секунди без нулів"
-#: po/rc.cpp:39 rc.cpp:39
+#: po/rc.cpp:30 rc.cpp:30
msgid "Custom uptime format"
msgstr "Свій формат аптайму (uptime)"
-#: po/rc.cpp:42 rc.cpp:42
+#: po/rc.cpp:33 rc.cpp:33
msgid ""
"$dd - uptime days\n"
"$d - uptime days without zero\n"
@@ -150,116 +138,116 @@ msgstr ""
"$mm - хвилини аптайму\n"
"$m - хвилини аптайму без нулів"
-#: po/rc.cpp:50 rc.cpp:50
+#: po/rc.cpp:41 rc.cpp:41
msgid "Temperature units"
msgstr "Одиниці виміру температури"
-#: po/rc.cpp:53 rc.cpp:53
+#: po/rc.cpp:44 rc.cpp:44
msgid "Temperature devices"
msgstr "Температурні пристрої"
-#: po/rc.cpp:56 po/rc.cpp:62 po/rc.cpp:68 po/rc.cpp:74 rc.cpp:56 rc.cpp:62
-#: rc.cpp:68 rc.cpp:74
+#: po/rc.cpp:47 po/rc.cpp:53 po/rc.cpp:59 po/rc.cpp:65 rc.cpp:47 rc.cpp:53
+#: rc.cpp:59 rc.cpp:65
msgid "Editable"
msgstr "Можна редагувати"
-#: po/rc.cpp:59 rc.cpp:59
+#: po/rc.cpp:50 rc.cpp:50
msgid "Mount points"
msgstr "Точки монтування"
-#: po/rc.cpp:65 rc.cpp:65
+#: po/rc.cpp:56 rc.cpp:56
msgid "HDD devices (speed)"
msgstr "HDD (швидкість)"
-#: po/rc.cpp:71 rc.cpp:71
+#: po/rc.cpp:62 rc.cpp:62
msgid "HDD devices (temp)"
msgstr "HDD (температура)"
-#: po/rc.cpp:77 rc.cpp:77
+#: po/rc.cpp:68 rc.cpp:68
msgid "Disable auto select device and set specified device"
msgstr "Відключити автоматичний вибір пристрою та використовувати вказаний"
-#: po/rc.cpp:80 rc.cpp:80
+#: po/rc.cpp:71 rc.cpp:71
msgid "Set network device"
msgstr "Оберіть мережевий пристрій"
-#: po/rc.cpp:83 rc.cpp:83
+#: po/rc.cpp:74 rc.cpp:74
msgid "AC online tag"
msgstr "AC підключений"
-#: po/rc.cpp:86 rc.cpp:86
+#: po/rc.cpp:77 rc.cpp:77
msgid "Line, which returns when AC is online"
msgstr "Рядок, що повертається при підключеному адаптері живлення"
-#: po/rc.cpp:89 rc.cpp:89
+#: po/rc.cpp:80 rc.cpp:80
msgid "AC offline tag"
msgstr "AC відключений"
-#: po/rc.cpp:92 rc.cpp:92
+#: po/rc.cpp:83 rc.cpp:83
msgid "Line, which returns when AC is offline"
msgstr "Рядок, що повертається при відключеному адаптері живлення"
-#: po/rc.cpp:95 rc.cpp:95
+#: po/rc.cpp:86 rc.cpp:86
msgid "Time interval"
msgstr "Інтервал оновлення"
-#: po/rc.cpp:98 po/rc.cpp:205 rc.cpp:98 rc.cpp:205
+#: po/rc.cpp:89 po/rc.cpp:196 rc.cpp:89 rc.cpp:196
msgid "Font"
msgstr "Шрифт"
-#: po/rc.cpp:101 rc.cpp:101
+#: po/rc.cpp:92 rc.cpp:92
msgid "Font size"
msgstr "Розмір шрифту"
-#: po/rc.cpp:104 rc.cpp:104
+#: po/rc.cpp:95 rc.cpp:95
msgid "Font color"
msgstr "Колір шрифту"
-#: po/rc.cpp:107 rc.cpp:107
+#: po/rc.cpp:98 rc.cpp:98
msgid "Font style"
msgstr "Стиль шрифту"
-#: po/rc.cpp:110 rc.cpp:110
+#: po/rc.cpp:101 rc.cpp:101
msgid "Font weight"
msgstr "Ширина шрифту"
-#: po/rc.cpp:113 rc.cpp:113
+#: po/rc.cpp:104 rc.cpp:104
msgid "HDD"
msgstr "HDD"
-#: po/rc.cpp:116 rc.cpp:116
+#: po/rc.cpp:107 rc.cpp:107
msgid "MPD port"
msgstr "Порт сервера MPD"
-#: po/rc.cpp:119 rc.cpp:119
+#: po/rc.cpp:110 rc.cpp:110
msgid "GPU device"
msgstr "Пристій GPU"
-#: po/rc.cpp:122 rc.cpp:122
+#: po/rc.cpp:113 rc.cpp:113
msgid "hddtemp cmd"
msgstr "Команда hddtemp"
-#: po/rc.cpp:125 rc.cpp:125
+#: po/rc.cpp:116 rc.cpp:116
msgid "Music player"
msgstr "Музичний плеєр"
-#: po/rc.cpp:128 rc.cpp:128
+#: po/rc.cpp:119 rc.cpp:119
msgid "MPD address"
msgstr "Адреса сервера MPD"
-#: po/rc.cpp:131 rc.cpp:131
+#: po/rc.cpp:122 rc.cpp:122
msgid "Desktop check cmd"
msgstr ""
-#: po/rc.cpp:134 rc.cpp:134
+#: po/rc.cpp:125 rc.cpp:125
msgid "NOTE: Player DBus interface should be an active"
msgstr ""
-#: po/rc.cpp:137 rc.cpp:137
+#: po/rc.cpp:128 rc.cpp:128
msgid "MPRIS player name"
msgstr ""
-#: po/rc.cpp:140 po/rc.cpp:150 rc.cpp:140 rc.cpp:150
+#: po/rc.cpp:131 po/rc.cpp:141 rc.cpp:131 rc.cpp:141
msgid ""
"Editable\n"
"del - remove item"
@@ -267,23 +255,23 @@ msgstr ""
"Можна редагувати\n"
"del - видалити рядок"
-#: po/rc.cpp:157 rc.cpp:157
+#: po/rc.cpp:148 rc.cpp:148
msgid "Battery device"
msgstr "Пристрій батареї"
-#: po/rc.cpp:160 rc.cpp:160
+#: po/rc.cpp:151 rc.cpp:151
msgid "\"/sys/class/power_supply/BAT0/capacity\" by default"
msgstr "\"/sys/class/power_supply/BAT0/capacity\" за замовчуванням"
-#: po/rc.cpp:163 rc.cpp:163
+#: po/rc.cpp:154 rc.cpp:154
msgid "AC device"
msgstr "AC пристрій"
-#: po/rc.cpp:166 rc.cpp:166
+#: po/rc.cpp:157 rc.cpp:157
msgid "\"/sys/class/power_supply/AC/online\" by default"
msgstr "\"/sys/class/power_supply/AC/online\" за замовчуванням"
-#: po/rc.cpp:169 rc.cpp:169
+#: po/rc.cpp:160 rc.cpp:160
msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox fully checked."
@@ -292,48 +280,48 @@ msgstr ""
"підтримують графічний тултіп. Щоб їх задіяти, просто зробіть необхідні "
"чекбокси повністю чекнутими."
-#: po/rc.cpp:172 rc.cpp:172
+#: po/rc.cpp:163 rc.cpp:163
msgid "Number of values for tooltips"
msgstr "Кількість значень для тултіпа"
-#: po/rc.cpp:175 rc.cpp:175
+#: po/rc.cpp:166 rc.cpp:166
msgid "Background"
msgstr ""
-#: po/rc.cpp:178 rc.cpp:178
+#: po/rc.cpp:169 rc.cpp:169
msgid "CPU color"
msgstr "Колір CPU"
-#: po/rc.cpp:181 rc.cpp:181
+#: po/rc.cpp:172 rc.cpp:172
msgid "CPU clock color"
msgstr "Колір частоти CPU"
-#: po/rc.cpp:184 rc.cpp:184
+#: po/rc.cpp:175 rc.cpp:175
msgid "Memory color"
msgstr "Колір пам’яті"
-#: po/rc.cpp:187 rc.cpp:187
+#: po/rc.cpp:178 rc.cpp:178
msgid "Swap color"
msgstr "Колір swap"
-#: po/rc.cpp:190 rc.cpp:190
+#: po/rc.cpp:181 rc.cpp:181
msgid "Download speed color"
msgstr "Колір швидкості скачування"
-#: po/rc.cpp:193 rc.cpp:193
+#: po/rc.cpp:184 rc.cpp:184
msgid "Upload speed color"
msgstr "Колір швидкості віддачі"
-#: po/rc.cpp:196 rc.cpp:196
+#: po/rc.cpp:187 rc.cpp:187
msgid "Battery active color"
msgstr ""
-#: po/rc.cpp:199 rc.cpp:199
+#: po/rc.cpp:190 rc.cpp:190
#, fuzzy
msgid "Battery inactive color"
msgstr "Пристрій батареї"
-#: po/rc.cpp:202 rc.cpp:202
+#: po/rc.cpp:193 rc.cpp:193
msgid ""
"Detailed information may be found on project homepage"
@@ -341,32 +329,41 @@ msgstr ""
"Детальна інформація може бути знайдена на домашній сторінці проекту"
-#: po/rc.cpp:208 rc.cpp:208
+#: po/rc.cpp:199 rc.cpp:199
msgid "Ctrl+B"
msgstr "Ctrl+B"
-#: po/rc.cpp:211 rc.cpp:211
+#: po/rc.cpp:202 rc.cpp:202
msgid "Ctrl+I"
msgstr "Ctrl+I"
-#: po/rc.cpp:214 rc.cpp:214
+#: po/rc.cpp:205 rc.cpp:205
msgid "Ctrl+U"
msgstr "Ctrl+U"
-#: po/rc.cpp:217 rc.cpp:217
+#: po/rc.cpp:208 rc.cpp:208
msgid "Add"
msgstr "Добавити"
-#: po/rc.cpp:218 rc.cpp:218
+#: po/rc.cpp:209 rc.cpp:209
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
msgstr "Slobodyan Victor"
-#: po/rc.cpp:219 rc.cpp:219
+#: po/rc.cpp:210 rc.cpp:210
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr "sarumyan@i.ua"
+#~ msgid "Vertical layout"
+#~ msgstr "Вертикальна розмітка"
+
+#~ msgid "Add stretch to left/top of the layout"
+#~ msgstr "Додати порожнє місце ліворуч/вгорі віджету"
+
+#~ msgid "Add stretch to right/bottom of the layout"
+#~ msgstr "Додати порожнє місце праворуч/внизу віджету"
+
#~ msgid "Form"
#~ msgstr "Form"
diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp
index caa30ef..26b2f16 100644
--- a/sources/awesome-widget/reinit.cpp
+++ b/sources/awesome-widget/reinit.cpp
@@ -33,8 +33,6 @@ void AwesomeWidget::reinit()
if (configuration[QString("background")].toInt() == 0)
setBackgroundHints(NoBackground);
- else
- setBackgroundHints(DefaultBackground);
if (configuration[QString("popup")].toInt() == 0)
textLabel->setPopupEnabled(false);
else
@@ -71,12 +69,11 @@ void AwesomeWidget::updateNetworkDevice()
}
-void AwesomeWidget::updateText(bool clear)
+void AwesomeWidget::updateText(const bool clear)
{
if (debug) qDebug() << PDEBUG;
QString text = configuration[QString("text")];
- text.replace(QString("\n"), QString("
"));
if (!clear)
for (int i=0; iresize(100.0 * counts[QString("tooltip")], 100.0);
- // remove nan
-
// boundaries
QMap boundaries;
boundaries[QString("cpu")] = 100.0;
diff --git a/sources/awesome-widget/widget.ui b/sources/awesome-widget/widget.ui
index d71c3f0..a8b8f22 100644
--- a/sources/awesome-widget/widget.ui
+++ b/sources/awesome-widget/widget.ui
@@ -54,6 +54,15 @@
+ -
+
+
+
+
+
+
+
+
-
diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp
index babe5e5..7aca7db 100644
--- a/sources/desktop-panel/desktop-panel.cpp
+++ b/sources/desktop-panel/desktop-panel.cpp
@@ -81,6 +81,8 @@ DesktopPanel::DesktopPanel(QObject *parent, const QVariantList &args)
else
debug = false;
+ setBackgroundHints(DefaultBackground);
+ setAspectRatioMode(Plasma::IgnoreAspectRatio);
setHasConfigurationInterface(true);
// text format init
currentFormatLine.append(QString(""));
@@ -195,8 +197,6 @@ void DesktopPanel::reinit()
// layout
if (configuration[QString("background")].toInt() == 0)
setBackgroundHints(NoBackground);
- else
- setBackgroundHints(DefaultBackground);
if (configuration[QString("layout")].toInt() == 0)
layout->setOrientation(Qt::Horizontal);
else
@@ -448,9 +448,8 @@ void DesktopPanel::configChanged()
fontStyle = QString("italic");
else
fontStyle = QString("normal");
- currentFormatLine[0] = QString("\
- \
- ")
+ currentFormatLine[0] = QString("\
+ ")
.arg(font.family())
.arg(font.pointSize())
.arg(font.htmlWeight())
@@ -467,9 +466,8 @@ void DesktopPanel::configChanged()
fontStyle = QString("italic");
else
fontStyle = QString("normal");
- formatLine[0] = QString("\
- \
- ")
+ formatLine[0] = QString("\
+ ")
.arg(font.family())
.arg(font.pointSize())
.arg(font.htmlWeight())