diff options
| -rw-r--r-- | panel/main.c | 6 | ||||
| -rw-r--r-- | plugins/applicationsmenu/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh (renamed from plugins/applicationsmenu/xfce4-popup-applicationsmenu.in) | 19 | ||||
| -rw-r--r-- | plugins/directorymenu/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/directorymenu/xfce4-popup-directorymenu.sh (renamed from plugins/directorymenu/xfce4-popup-directorymenu.in) | 19 | ||||
| -rw-r--r-- | plugins/windowmenu/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/windowmenu/xfce4-popup-windowmenu.sh (renamed from plugins/windowmenu/xfce4-popup-windowmenu.in) | 21 | ||||
| -rw-r--r-- | po/POTFILES.in | 59 |
8 files changed, 85 insertions, 60 deletions
diff --git a/panel/main.c b/panel/main.c index 0c2d3642..5e7207e5 100644 --- a/panel/main.c +++ b/panel/main.c @@ -166,7 +166,11 @@ main (gint argc, gchar **argv) if (opt_version) { /* print version information */ - g_print ("%s %s (Xfce %s)\n\n", PACKAGE_NAME, PACKAGE_VERSION, xfce_version_string ()); + if (opt_arguments != NULL && *opt_arguments != NULL) + g_print ("%s (%s)", *opt_arguments, PACKAGE_NAME); + else + g_print ("%s", PACKAGE_NAME); + g_print (" %s (Xfce %s)\n\n", PACKAGE_VERSION, xfce_version_string ()); g_print ("%s\n", "Copyright (c) 2004-2010"); g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved.")); g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT); diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am index cd019006..568eea2d 100644 --- a/plugins/applicationsmenu/Makefile.am +++ b/plugins/applicationsmenu/Makefile.am @@ -53,8 +53,9 @@ libapplicationsmenu_la_DEPENDENCIES = \ bin_SCRIPTS = \ xfce4-popup-applicationsmenu -xfce4-popup-applicationsmenu: xfce4-popup-applicationsmenu.in Makefile - $(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" $< >$@ +xfce4-popup-applicationsmenu: xfce4-popup-applicationsmenu.sh Makefile + $(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" \ + -e "s,\@localedir\@,$(localedir),g" $< >$@ # # .desktop file @@ -66,7 +67,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ applicationsmenu-dialog.glade \ - xfce4-popup-applicationsmenu.in \ + xfce4-popup-applicationsmenu.sh \ $(desktop_in_files) DISTCLEANFILES = \ diff --git a/plugins/applicationsmenu/xfce4-popup-applicationsmenu.in b/plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh index be1c6107..7e9a95bc 100644 --- a/plugins/applicationsmenu/xfce4-popup-applicationsmenu.in +++ b/plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh @@ -17,6 +17,25 @@ # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # +export TEXTDOMAIN="xfce4-panel" +export TEXTDOMAINDIR="@localedir@" + +case "$1" in + -h|--help) + echo "$(gettext "Usage:")" + echo " $(basename $0) [$(gettext "OPTION")...]" + echo + echo "$(gettext "Options:")" + echo " -h, --help $(gettext "Show help options")" + echo " -V, --version $(gettext "Print version information and exit")" + exit 0 + ;; + -V|--version) + exec @bindir@/xfce4-panel -V "$(basename $0)" + exit 0 + ;; +esac + exec @bindir@/xfce4-panel --plugin-event=applicationsmenu:popup # vim:set ts=2 sw=2 et ai: diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am index 69f02b24..1953ce8e 100644 --- a/plugins/directorymenu/Makefile.am +++ b/plugins/directorymenu/Makefile.am @@ -55,8 +55,9 @@ libdirectorymenu_la_DEPENDENCIES = \ bin_SCRIPTS = \ xfce4-popup-directorymenu -xfce4-popup-directorymenu: xfce4-popup-directorymenu.in Makefile - $(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" $< >$@ +xfce4-popup-directorymenu: xfce4-popup-directorymenu.sh Makefile + $(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" \ + -e "s,\@localedir\@,$(localedir),g" $< >$@ # # .desktop file @@ -68,7 +69,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ directorymenu-dialog.glade \ - xfce4-popup-directorymenu.in \ + xfce4-popup-directorymenu.sh \ $(desktop_in_files) DISTCLEANFILES = \ diff --git a/plugins/directorymenu/xfce4-popup-directorymenu.in b/plugins/directorymenu/xfce4-popup-directorymenu.sh index e1ab43c2..6e66aab3 100644 --- a/plugins/directorymenu/xfce4-popup-directorymenu.in +++ b/plugins/directorymenu/xfce4-popup-directorymenu.sh @@ -17,6 +17,25 @@ # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # +export TEXTDOMAIN="xfce4-panel" +export TEXTDOMAINDIR="@localedir@" + +case "$1" in + -h|--help) + echo "$(gettext "Usage:")" + echo " $(basename $0) [$(gettext "OPTION")...]" + echo + echo "$(gettext "Options:")" + echo " -h, --help $(gettext "Show help options")" + echo " -V, --version $(gettext "Print version information and exit")" + exit 0 + ;; + -V|--version) + exec @bindir@/xfce4-panel -V "$(basename $0)" + exit 0 + ;; +esac + exec @bindir@/xfce4-panel --plugin-event=directorymenu:popup # vim:set ts=2 sw=2 et ai: diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am index 6ba845ca..728a8fd7 100644 --- a/plugins/windowmenu/Makefile.am +++ b/plugins/windowmenu/Makefile.am @@ -54,8 +54,9 @@ libwindowmenu_la_DEPENDENCIES = \ bin_SCRIPTS = \ xfce4-popup-windowmenu -xfce4-popup-windowmenu: xfce4-popup-windowmenu.in Makefile - $(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" $< >$@ +xfce4-popup-windowmenu: xfce4-popup-windowmenu.sh Makefile + $(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" \ + -e "s,\@localedir\@,$(localedir),g" $< >$@ # # .desktop file @@ -67,7 +68,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ windowmenu-dialog.glade \ - xfce4-popup-windowmenu.in \ + xfce4-popup-windowmenu.sh \ $(desktop_in_files) DISTCLEANFILES = \ diff --git a/plugins/windowmenu/xfce4-popup-windowmenu.in b/plugins/windowmenu/xfce4-popup-windowmenu.sh index a477228c..067ec85e 100644 --- a/plugins/windowmenu/xfce4-popup-windowmenu.in +++ b/plugins/windowmenu/xfce4-popup-windowmenu.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2009 Nick Schermer <nick@xfce.org> +# Copyright (C) 2010 Nick Schermer <nick@xfce.org> # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -17,6 +17,25 @@ # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # +export TEXTDOMAIN="xfce4-panel" +export TEXTDOMAINDIR="@localedir@" + +case "$1" in + -h|--help) + echo "$(gettext "Usage:")" + echo " $(basename $0) [$(gettext "OPTION")...]" + echo + echo "$(gettext "Options:")" + echo " -h, --help $(gettext "Show help options")" + echo " -V, --version $(gettext "Print version information and exit")" + exit 0 + ;; + -V|--version) + exec @bindir@/xfce4-panel -V "$(basename $0)" + exit 0 + ;; +esac + exec @bindir@/xfce4-panel --plugin-event=windowmenu:popup # vim:set ts=2 sw=2 et ai: diff --git a/po/POTFILES.in b/po/POTFILES.in index dd9ae8ae..15232880 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,127 +3,88 @@ panel-preferences.desktop.in common/panel-builder.c -libxfce4panel/libxfce4panel.h -libxfce4panel/libxfce4panel-enums.h libxfce4panel/xfce-arrow-button.c -libxfce4panel/xfce-arrow-button.h libxfce4panel/xfce-hvbox.c -libxfce4panel/xfce-hvbox.h libxfce4panel/xfce-panel-convenience.c -libxfce4panel/xfce-panel-convenience.h libxfce4panel/xfce-panel-image.c -libxfce4panel/xfce-panel-image.h -libxfce4panel/xfce-panel-macros.h libxfce4panel/xfce-panel-plugin-provider.c -libxfce4panel/xfce-panel-plugin-provider.h libxfce4panel/xfce-panel-plugin.c -libxfce4panel/xfce-panel-plugin.h panel/main.c panel/panel-application.c -panel/panel-application.h panel/panel-base-window.c -panel/panel-base-window.h panel/panel-dbus-client.c -panel/panel-dbus-client.h panel/panel-dbus-service.c -panel/panel-dbus-service.h panel/panel-dialogs.c -panel/panel-dialogs.h panel/panel-item-dialog.c -panel/panel-item-dialog.h panel/panel-itembar.c -panel/panel-itembar.h panel/panel-module-factory.c -panel/panel-module-factory.h panel/panel-module.c -panel/panel-module.h panel/panel-plugin-external.c -panel/panel-plugin-external.h panel/panel-plugin-external-46.c -panel/panel-plugin-external-46.h panel/panel-preferences-dialog.c -panel/panel-preferences-dialog.h panel/panel-preferences-dialog.glade panel/panel-window.c -panel/panel-window.h wrapper/main.c wrapper/wrapper-module.c -wrapper/wrapper-module.h wrapper/wrapper-plug.c -wrapper/wrapper-plug.h migrate/main.c plugins/actions/actions-dialog.glade plugins/actions/actions.c plugins/actions/actions.desktop.in -plugins/actions/actions.h plugins/applicationsmenu/applicationsmenu-dialog.glade plugins/applicationsmenu/applicationsmenu.c plugins/applicationsmenu/applicationsmenu.desktop.in +plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh +plugins/clock/clock.c plugins/clock/clock-analog.c -plugins/clock/clock-analog.h plugins/clock/clock-binary.c -plugins/clock/clock-binary.h plugins/clock/clock-dialog.glade plugins/clock/clock-digital.c -plugins/clock/clock-digital.h plugins/clock/clock-fuzzy.c -plugins/clock/clock-fuzzy.h plugins/clock/clock-lcd.c -plugins/clock/clock-lcd.h -plugins/clock/clock.c plugins/clock/clock.desktop.in -plugins/clock/clock.h plugins/directorymenu/directorymenu.c plugins/directorymenu/directorymenu.desktop.in plugins/directorymenu/directorymenu-dialog.glade +plugins/directorymenu/xfce4-popup-directorymenu.sh +plugins/launcher/launcher.c plugins/launcher/launcher-dialog.c -plugins/launcher/launcher-dialog.h plugins/launcher/launcher-dialog.glade -plugins/launcher/launcher.c plugins/launcher/launcher.desktop.in -plugins/launcher/launcher.h -plugins/pager/pager-dialog.glade plugins/pager/pager.c +plugins/pager/pager-dialog.glade plugins/pager/pager.desktop.in -plugins/pager/pager.h -plugins/separator/separator-dialog.glade plugins/separator/separator.c +plugins/separator/separator-dialog.glade plugins/separator/separator.desktop.in -plugins/separator/separator.h plugins/showdesktop/showdesktop.c plugins/showdesktop/showdesktop.desktop.in -plugins/showdesktop/showdesktop.h +plugins/systray/systray.c plugins/systray/systray-box.c -plugins/systray/systray-box.h plugins/systray/systray-dialog.glade plugins/systray/systray-manager.c -plugins/systray/systray-manager.h plugins/systray/systray-marshal.list plugins/systray/systray-socket.c -plugins/systray/systray-socket.h -plugins/systray/systray.c plugins/systray/systray.desktop.in -plugins/systray/systray.h +plugins/tasklist/tasklist.c plugins/tasklist/tasklist-dialog.glade plugins/tasklist/tasklist-widget.c -plugins/tasklist/tasklist-widget.h -plugins/tasklist/tasklist.c plugins/tasklist/tasklist.desktop.in -plugins/windowmenu/windowmenu-dialog.glade plugins/windowmenu/windowmenu.c +plugins/windowmenu/windowmenu-dialog.glade plugins/windowmenu/windowmenu.desktop.in -plugins/windowmenu/windowmenu.h +plugins/windowmenu/xfce4-popup-windowmenu.sh |