slitaz-configs rev 295
Logout menu handling
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Nov 12 12:55:29 2016 +0200 (2016-11-12) |
| parents | e517df532f55 |
| children | 25dee9a9b8fd |
| files | Makefile ob-menu/menu.xml.in po/fr.po po/hu.po po/pt.po po/ru.po po/slitaz-ob-menu.pot po/zh_CN.po rootfs/etc/lxpanel/slitaz/panels/panel rootfs/etc/skel/.xinitrc |
line diff
1.1 --- a/Makefile Mon Oct 24 04:36:33 2016 -0200 1.2 +++ b/Makefile Sat Nov 12 12:55:29 2016 +0200 1.3 @@ -41,3 +41,4 @@ 1.4 clean: 1.5 rm -rf po/mo 1.6 rm -f po/*~ 1.7 + rm -f po/*.mo
2.1 --- a/ob-menu/menu.xml.in Mon Oct 24 04:36:33 2016 -0200 2.2 +++ b/ob-menu/menu.xml.in Sat Nov 12 12:55:29 2016 +0200 2.3 @@ -38,7 +38,7 @@ 2.4 <item label="$(gettext 'Configure favorites')"> 2.5 <action name="Execute"><command>tazbox tazapps</command></action> 2.6 </item> 2.7 - <item label="Configure/install favorites (tazx)"> 2.8 + <item label="$(gettext 'Configure/install favorites (tazx)')"> 2.9 <action name="Execute"><command>terminal -e tazx</command></action> 2.10 </item> 2.11 </menu>
3.1 --- a/po/fr.po Mon Oct 24 04:36:33 2016 -0200 3.2 +++ b/po/fr.po Sat Nov 12 12:55:29 2016 +0200 3.3 @@ -7,7 +7,7 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: slitaz-ob-menu 5.1.6\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2016-09-24 14:10+0300\n" 3.8 +"POT-Creation-Date: 2016-11-12 12:34+0200\n" 3.9 "PO-Revision-Date: 2013-08-01 01:22+0300\n" 3.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 3.11 "Language: fr\n" 3.12 @@ -39,6 +39,11 @@ 3.13 msgid "Configure favorites" 3.14 msgstr "Configuration des favoris" 3.15 3.16 +#: ob-menu/menu.xml.in:41 3.17 +#, fuzzy 3.18 +msgid "Configure/install favorites (tazx)" 3.19 +msgstr "Configuration des favoris" 3.20 + 3.21 #: ob-menu/menu.xml.in:47 3.22 msgid "Desktop Effects" 3.23 msgstr "Effets visuels"
4.1 --- a/po/hu.po Mon Oct 24 04:36:33 2016 -0200 4.2 +++ b/po/hu.po Sat Nov 12 12:55:29 2016 +0200 4.3 @@ -7,7 +7,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: slitaz-ob-menu 5.1.6\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2016-09-24 14:10+0300\n" 4.8 +"POT-Creation-Date: 2016-11-12 12:34+0200\n" 4.9 "PO-Revision-Date: 2013-08-01 01:27+0300\n" 4.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 4.11 "Language: hu\n" 4.12 @@ -39,6 +39,11 @@ 4.13 msgid "Configure favorites" 4.14 msgstr "Configure favorites" 4.15 4.16 +#: ob-menu/menu.xml.in:41 4.17 +#, fuzzy 4.18 +msgid "Configure/install favorites (tazx)" 4.19 +msgstr "Configure favorites" 4.20 + 4.21 #: ob-menu/menu.xml.in:47 4.22 msgid "Desktop Effects" 4.23 msgstr "Asztali hatások"
5.1 --- a/po/pt.po Mon Oct 24 04:36:33 2016 -0200 5.2 +++ b/po/pt.po Sat Nov 12 12:55:29 2016 +0200 5.3 @@ -7,7 +7,7 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: slitaz-ob-menu 5.1.5\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2016-09-24 14:10+0300\n" 5.8 +"POT-Creation-Date: 2016-11-12 12:34+0200\n" 5.9 "PO-Revision-Date: 2014-01-14 21:42+0300\n" 5.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 5.11 "Language: pt_BR\n" 5.12 @@ -40,6 +40,11 @@ 5.13 msgid "Configure favorites" 5.14 msgstr "Configurar favoritos" 5.15 5.16 +#: ob-menu/menu.xml.in:41 5.17 +#, fuzzy 5.18 +msgid "Configure/install favorites (tazx)" 5.19 +msgstr "Configurar favoritos" 5.20 + 5.21 #: ob-menu/menu.xml.in:47 5.22 msgid "Desktop Effects" 5.23 msgstr "Efeitos Visuais"
6.1 --- a/po/ru.po Mon Oct 24 04:36:33 2016 -0200 6.2 +++ b/po/ru.po Sat Nov 12 12:55:29 2016 +0200 6.3 @@ -7,14 +7,15 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: slitaz-ob-menu 5.1.5\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2016-09-24 14:10+0300\n" 6.8 -"PO-Revision-Date: 2016-09-24 14:15+0300\n" 6.9 +"POT-Creation-Date: 2016-11-12 12:34+0200\n" 6.10 +"PO-Revision-Date: 2016-11-12 12:34+0200\n" 6.11 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 6.12 "Language-Team: \n" 6.13 "Language: ru\n" 6.14 "MIME-Version: 1.0\n" 6.15 "Content-Type: text/plain; charset=UTF-8\n" 6.16 "Content-Transfer-Encoding: 8bit\n" 6.17 +"X-Generator: Poedit 1.8.6\n" 6.18 6.19 #: ob-menu/menu.xml.in:24 6.20 msgid "Favorite Applications" 6.21 @@ -40,6 +41,10 @@ 6.22 msgid "Configure favorites" 6.23 msgstr "Настроить избранное" 6.24 6.25 +#: ob-menu/menu.xml.in:41 6.26 +msgid "Configure/install favorites (tazx)" 6.27 +msgstr "Настроить/установить избранное (tazx)" 6.28 + 6.29 #: ob-menu/menu.xml.in:47 6.30 msgid "Desktop Effects" 6.31 msgstr "Эффекты рабочего стола"
7.1 --- a/po/slitaz-ob-menu.pot Mon Oct 24 04:36:33 2016 -0200 7.2 +++ b/po/slitaz-ob-menu.pot Sat Nov 12 12:55:29 2016 +0200 7.3 @@ -8,7 +8,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: slitaz-ob-menu 5.1.6\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2016-09-24 14:16+0300\n" 7.8 +"POT-Creation-Date: 2016-11-12 12:34+0200\n" 7.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 7.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 7.11 "Language-Team: LANGUAGE <LL@li.org>\n" 7.12 @@ -41,6 +41,10 @@ 7.13 msgid "Configure favorites" 7.14 msgstr "" 7.15 7.16 +#: ob-menu/menu.xml.in:41 7.17 +msgid "Configure/install favorites (tazx)" 7.18 +msgstr "" 7.19 + 7.20 #: ob-menu/menu.xml.in:47 7.21 msgid "Desktop Effects" 7.22 msgstr ""
8.1 --- a/po/zh_CN.po Mon Oct 24 04:36:33 2016 -0200 8.2 +++ b/po/zh_CN.po Sat Nov 12 12:55:29 2016 +0200 8.3 @@ -7,7 +7,7 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: slitaz-ob-menu 5.1.6\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2016-09-24 14:16+0300\n" 8.8 +"POT-Creation-Date: 2016-11-12 12:34+0200\n" 8.9 "PO-Revision-Date: 2014-07-13 08:38+0800\n" 8.10 "Last-Translator: rhsky <rhsky@qq.com>\n" 8.11 "Language-Team: rhsky <rhsky@qq.com>\n" 8.12 @@ -42,6 +42,11 @@ 8.13 msgid "Configure favorites" 8.14 msgstr "配置收藏夹" 8.15 8.16 +#: ob-menu/menu.xml.in:41 8.17 +#, fuzzy 8.18 +msgid "Configure/install favorites (tazx)" 8.19 +msgstr "配置收藏夹" 8.20 + 8.21 #: ob-menu/menu.xml.in:47 8.22 msgid "Desktop Effects" 8.23 msgstr "桌面效果"
9.1 --- a/rootfs/etc/lxpanel/slitaz/panels/panel Mon Oct 24 04:36:33 2016 -0200 9.2 +++ b/rootfs/etc/lxpanel/slitaz/panels/panel Sat Nov 12 12:55:29 2016 +0200 9.3 @@ -131,7 +131,6 @@ 9.4 type = batt 9.5 Config { 9.6 HideIfNoBattery=0 9.7 - AlarmCommand=tazbox notify "Warning: battery low" "dialog-warning" 9.8 AlarmTime=5 9.9 BackgroundColor=#404040 9.10 BorderWidth=3 9.11 @@ -179,8 +178,19 @@ 9.12 image=avatar-default 9.13 tintcolor=#33230D 9.14 item { 9.15 - image=system-shutdown-panel-restart 9.16 - command=logout 9.17 + image=system-log-out-panel 9.18 + name=Close X session 9.19 + action=tazbox logout exit 9.20 + } 9.21 + item { 9.22 + image=system-reboot-panel 9.23 + name=Reboot system 9.24 + action=tazbox logout reboot 9.25 + } 9.26 + item { 9.27 + image=system-shutdown-panel 9.28 + name=Shutdown system 9.29 + action=tazbox logout halt 9.30 } 9.31 } 9.32 }
10.1 --- a/rootfs/etc/skel/.xinitrc Mon Oct 24 04:36:33 2016 -0200 10.2 +++ b/rootfs/etc/skel/.xinitrc Sat Nov 12 12:55:29 2016 +0200 10.3 @@ -3,8 +3,7 @@ 10.4 # it permanently with your personal applications.conf file. 10.5 # 10.6 . $HOME/.config/slitaz/applications.conf 10.7 -dd="$HOME/.local/share/desktop-directories"; mkdir -p "$dd" 10.8 -echo -e "[Desktop Entry]\nType=Directory\nName=$(whoami)" > "$dd/user.directory" 10.9 +tazbox mkmenu 10.10 10.11 [ "$1" ] && WINDOW_MANAGER="$1" 10.12