aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xutil/fluxbox-generate_menu.in48
2 files changed, 33 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 237518c..fc0e7a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.10: 2Changes for 0.9.10:
3*04/08/05:
4 * Check if init is consistent with menufile location (Han)
5 fluxbox-generate_menu.in
6 * Russion translation updates (thanks Roman Yepishev)
7 fluxbox-generate_menu.in
3*04/08/03: 8*04/08/03:
4 * Fixed pixmap filename expansion for menu pixmaps (Thanks Mathias Gumz) 9 * Fixed pixmap filename expansion for menu pixmaps (Thanks Mathias Gumz)
5 FbTk/MenuItem.cc 10 FbTk/MenuItem.cc
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 3b246f9..a7caf20 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -22,7 +22,7 @@
22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23# DEALINGS IN THE SOFTWARE. 23# DEALINGS IN THE SOFTWARE.
24# 24#
25# $Id: fluxbox-generate_menu.in,v 1.23 2004/06/12 14:30:50 rathnor Exp $ 25# $Id: fluxbox-generate_menu.in,v 1.24 2004/08/05 10:51:40 rathnor Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -284,37 +284,37 @@ case ${LC_ALL} in
284# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 284# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
285# email fbgm.diff to han@mijncomputer.nl 285# email fbgm.diff to han@mijncomputer.nl
286 286
287 BACKGROUNDMENU='Backgrounds (CHANGE ME!)' 287 BACKGROUNDMENU='Обои'
288 BACKGROUNDMENUTITLE='Set the Background (CHANGE ME!)' 288 BACKGROUNDMENUTITLE='Установить обои'
289 BROWSERMENU='Браузеры' 289 BROWSERMENU='Браузеры'
290 CONFIGUREMENU='Настройка' 290 CONFIGUREMENU='Настройка'
291 EDITORMENU='Редакторы' 291 EDITORMENU='Редакторы'
292 EXITITEM='Выйти' 292 EXITITEM='Выйти'
293 FBSETTINGSMENU='FB-настройки' 293 FBSETTINGSMENU='FB-настройки'
294 FILEUTILSMENU='File utils (CHANGE ME!)' 294 FILEUTILSMENU='Файловые утилиты'
295 FLUXBOXCOMMAND='Fluxbox Command (CHANGE ME!)' 295 FLUXBOXCOMMAND='Выполнить команду'
296 GAMESMENU='Games (CHANGE ME!)' 296 GAMESMENU='Игры'
297 GNOMEMENUTEXT='Gnome-меню' 297 GNOMEMENUTEXT='Gnome-меню'
298 GRAPHICMENU='Графика' 298 GRAPHICMENU='Графика'
299 KDEMENUTEXT='KDE-меню' 299 KDEMENUTEXT='KDE-меню'
300 LOCKSCREEN='Lock screen (CHANGE ME!)' 300 LOCKSCREEN='Заблокировать экран'
301 MISCMENU='Прочее' 301 MISCMENU='Прочее'
302 MUSICMENU='Звук' 302 MUSICMENU='Звук'
303 NETMENU='Сеть' 303 NETMENU='Сеть'
304 OFFICEMENU='Office (CHANGE ME!)' 304 OFFICEMENU='Офисные приложения'
305 RANDOMBACKGROUND='Random Background (CHANGE ME!)' 305 RANDOMBACKGROUND='Случайные обои'
306 REGENERATEMENU='Regen Menu (CHANGE ME!)' 306 REGENERATEMENU='Создать меню заново'
307 RELOADITEM='Перенастроить' 307 RELOADITEM='Перенастроить'
308 RESTARTITEM='Перезапустить' 308 RESTARTITEM='Перезапустить'
309 RUNCOMMAND='Run (CHANGE ME!)' 309 RUNCOMMAND='Выполнить'
310 SCREENSHOT='Screenshot (CHANGE ME!)' 310 SCREENSHOT='Снимок экрана'
311 STYLEMENUTITLE='Выберите стиль' 311 STYLEMENUTITLE='Выберите стиль'
312 SYSTEMSTYLES='Стили' 312 SYSTEMSTYLES='Системные стили'
313 TERMINALMENU='Терминалы' 313 TERMINALMENU='Терминалы'
314 TOOLS='Tools (CHANGE ME!)' 314 TOOLS='Утилиты'
315 USERSTYLES='Стили' 315 USERSTYLES='Пользовательские стили'
316 WINDOWMANAGERS='WindowManagers (CHANGE ME!)' 316 WINDOWMANAGERS='Менеджеры окон'
317 WINDOWNAME='Window name (CHANGE ME!)' 317 WINDOWNAME='Имя окна'
318 WORKSPACEMENU='Рабочие пространства' 318 WORKSPACEMENU='Рабочие пространства'
319 XUTILSMENU='X-утилиты' 319 XUTILSMENU='X-утилиты'
320 ;; 320 ;;
@@ -870,7 +870,7 @@ while [ $# -gt 0 ]; do
870 -g) GNOMEMENU=yes; shift;; 870 -g) GNOMEMENU=yes; shift;;
871 -t) MY_TERM=${2}; testoption ex $1 $2; shift 2;; 871 -t) MY_TERM=${2}; testoption ex $1 $2; shift 2;;
872 -b) MY_BROWSER=${2}; testoption ex $1 $2; shift 2;; 872 -b) MY_BROWSER=${2}; testoption ex $1 $2; shift 2;;
873 -o) MENUFILENAME=${2}; testoption fi $1 $2; shift 2;; 873 -o) MENUFILENAME=${2}; shift 2; CHECKINIT=NO ;;
874 -p) PREFIX=${2}; testoption di $1 $2; shift 2;; 874 -p) PREFIX=${2}; testoption di $1 $2; shift 2;;
875 -n) GNOME_PREFIX=${2}; testoption di $1 $2; shift 2;; 875 -n) GNOME_PREFIX=${2}; testoption di $1 $2; shift 2;;
876 -q) KDE_PREFIX=${2}; testoption di $1 $2; shift 2;; 876 -q) KDE_PREFIX=${2}; testoption di $1 $2; shift 2;;
@@ -1065,7 +1065,7 @@ append_submenu "${NETMENU}"
1065 append_menu_end 1065 append_menu_end
1066 1066
1067 append_submenu P2P 1067 append_submenu P2P
1068 normal_find gtk-gnutella lopster nicotine pyslsk xmule amule 1068 normal_find gtk-gnutella lopster nicotine pyslsk xmule amule dcgui-qt
1069 find_it TekNap append "[exec] (TekNap) {${DEFAULT_TERM} -e TekNap}" 1069 find_it TekNap append "[exec] (TekNap) {${DEFAULT_TERM} -e TekNap}"
1070 find_it giFTcurs append "[exec] (giFTcurs) {${DEFAULT_TERM} -e giFTcurs}" 1070 find_it giFTcurs append "[exec] (giFTcurs) {${DEFAULT_TERM} -e giFTcurs}"
1071 append_menu_end 1071 append_menu_end
@@ -1079,7 +1079,7 @@ append_submenu "${NETMENU}"
1079 find_it yafc append "[exec] (yafc) {${DEFAULT_TERM} -e yafc}" 1079 find_it yafc append "[exec] (yafc) {${DEFAULT_TERM} -e yafc}"
1080 append_menu_end 1080 append_menu_end
1081 1081
1082 normal_find pan xnmap 1082 normal_find pan xnmap skype
1083 1083
1084append_menu_end 1084append_menu_end
1085 1085
@@ -1286,3 +1286,11 @@ fi
1286 1286
1287echo 'Menu successfully generated.' 1287echo 'Menu successfully generated.'
1288echo 'Use fluxbox-generate_menu -h to read about all the latest features.' 1288echo 'Use fluxbox-generate_menu -h to read about all the latest features.'
1289
1290if [ -z "$CHECKINIT" ]; then
1291 INITMENUFILENAME=`awk '/menuFile/ {print $2}' $HOME/.fluxbox/init`
1292 cmp $INITMENUFILENAME $MENUFILENAME 2> /dev/null
1293 if [ $? -ne 0 ]; then
1294 echo "Warning: Your $HOME/.fluxbox/init does not point to $MENUFILENAME but to $INITMENUFILENAME" >&2
1295 fi
1296fi