From c4e224d5fa0b6408957fc274a2c09287f6545710 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Tue, 22 Feb 2022 20:29:04 -0500 Subject: [PATCH] Added data files --- data/autostart | 32 ++++++++++++++ data/environment | 46 ++++++++++++++++++++ data/meson.build | 40 ++++++++++++++++++ data/rc.xml | 84 +++++++++++++++++++++++++++++++++++++ data/waybox.desktop | 7 ++++ data/waybox.sh | 100 ++++++++++++++++++++++++++++++++++++++++++++ data/xdg-autostart | 98 +++++++++++++++++++++++++++++++++++++++++++ meson.build | 1 + po/POTFILES.in | 1 + po/af.po | 8 +++- po/ar.po | 8 +++- po/be.po | 8 +++- po/bn_IN.po | 8 +++- po/ca.po | 8 +++- po/cs.po | 8 +++- po/da.po | 8 +++- po/de.po | 13 ++++-- po/el.po | 8 +++- po/eo.po | 12 ++++-- po/es.po | 8 +++- po/et.po | 8 +++- po/eu.po | 8 +++- po/fi.po | 8 +++- po/fr.po | 8 +++- po/gl_ES.po | 8 +++- po/he.po | 8 +++- po/hr.po | 8 +++- po/hu.po | 8 +++- po/ia.po | 8 +++- po/it.po | 8 +++- po/ja.po | 8 +++- po/lt.po | 8 +++- po/lv.po | 8 +++- po/meson.build | 2 +- po/nl.po | 8 +++- po/no.po | 8 +++- po/pl.po | 8 +++- po/pt.po | 8 +++- po/pt_BR.po | 8 +++- po/ro.po | 8 +++- po/ru.po | 8 +++- po/sk.po | 8 +++- po/sr.po | 8 +++- po/sr@latin.po | 8 +++- po/sv.po | 8 +++- po/tr.po | 8 +++- po/uk.po | 8 +++- po/vi.po | 8 +++- po/waybox.pot | 8 +++- po/zh_CN.po | 8 +++- po/zh_TW.po | 8 +++- waybox/config.c | 18 ++++---- waybox/meson.build | 1 + 53 files changed, 713 insertions(+), 54 deletions(-) create mode 100644 data/autostart create mode 100644 data/environment create mode 100644 data/meson.build create mode 100644 data/rc.xml create mode 100644 data/waybox.desktop create mode 100644 data/waybox.sh create mode 100644 data/xdg-autostart diff --git a/data/autostart b/data/autostart new file mode 100644 index 0000000..29548d7 --- /dev/null +++ b/data/autostart @@ -0,0 +1,32 @@ +# +# These things are run when a Waybox Wayland session is started. +# Copy to $XDG_CONFIG_HOME/waybox/autostart to customize. +# + +# +# Change from Openbox: the desktop environment's config tools should begin +# through autostart elements (e.g. /etc/xdg/autostart); there's no need to +# specify them here. +# + + +# Update the DBus environment +dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE + +# Start a dock +cairo-dock & + +# Start a panel +(waybar || yambar) & + +# Load a random wallpaper +oldifs=$IFS +IFS=: +for wpdir in ${XDG_DATA_DIRS:-${datadir:-/usr/share}}:${XDG_DATA_HOME:-~/.local/share}; +do + find $wpdir -path '*/backgrounds/*.jpg' -o -path '*/backgrounds/*.png' -o -path '*/backgrounds/*.svg' \ + -o -path '*/wallpapers/*.jpg' -o -path '*/wallpapers/*.png' -o -path '*/wallpapers/*.svg'; +done | (shuf -n 1 || tail -n 1) | xargs swaybg -m fill -i & +IFS=$oldifs + +# vim: ft=sh diff --git a/data/environment b/data/environment new file mode 100644 index 0000000..a484c76 --- /dev/null +++ b/data/environment @@ -0,0 +1,46 @@ +# +# Environment variables here for Waybox +# Copy to $XDG_CONFIG_HOME/waybox/environment to customize +# + +# To set your language for displaying messages and time/date formats, use the following: +#LANG=en_CA.UTF8 + +# To set your keyboard layout, use something like (see `man xkeyboard-config` +# for more information): +#export XKB_DEFAULT_LAYOUT=us +#export XKB_DEFAULT_MODEL=pc105 +#export XKB_DEFAULT_OPTIONS=ctrl:swapcaps,esperanto:dvorak,lv3:ralt_switch_multikey +#export XKB_DEFAULT_RULES=evdev +#export XKB_DEFAULT_VARIANT=dvorak +# +# UIM for typing non-English characters +#export XMODIFIERS=@im=uim +#export GTK_IM_MODULE=uim +#export QT_IM_MODULE=uim +#export ECORE_IMF_MODULE=uim + +# Current compositor. Needed for Wayland security negotiation. +export XDG_CURRENT_DESKTOP=waybox +export XDG_SESSION_TYPE=wayland + +# Make sure to run the X initialization if started through a display manager +# It must go here instead of in autostart so that the environment variables will get set +if test -n "$DISPLAY" && test -d /etc/X11/xinit/xinitrc.d; +then + for f in /etc/X11/xinit/xinitrc.d/*.sh; + do + test -f "$f" && . "$f" + done +fi + +# Get the preferred terminal from GNOME (if you use mostly GTK apps) +TERMINAL=$(gsettings get org.gnome.desktop.default-applications.terminal exec | tr -d \') +# Get the preferred terminal from KDE (if you use mostly Qt apps) +#TERMINAL=$(kreadconfig5 --file kdeglobals --group General --key TerminalApplication --default "konsole") +# Or just set it hard: +#TERMINAL=kitty +export TERMINAL + +# Use autostart scripts for these environments +export WB_AUTOSTART_ENVIRONMENT=GNOME:KDE diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..a82ec0a --- /dev/null +++ b/data/meson.build @@ -0,0 +1,40 @@ +cfdata = configuration_data() +cfdata.set('libexecdir', get_option('prefix') / get_option('libexecdir')) +cfdata.set('localedir', get_option('prefix') / get_option('localedir')) +cfdata.set('sysconfdir', get_option('prefix') / get_option('sysconfdir')) +cfdata.set('package', meson.project_name()) + +configure_file( + configuration: cfdata, + input: 'waybox.sh', + output: 'waybox', + install: true, + install_dir: get_option('prefix') / get_option('bindir'), + install_mode: 'rwxr-xr-x', +) + +scripts = files( + 'autostart', + 'environment', + 'xdg-autostart', + ) + +wb_xdg_dir = get_option('prefix') / get_option('sysconfdir') + '/xdg/waybox' + +install_data( + scripts, + install_dir: wb_xdg_dir, + install_mode: 'rwxr-xr-x', + ) + +install_data( + 'rc.xml', + install_dir: wb_xdg_dir, + install_mode: 'rw-r--r--', + ) + +install_data( + 'waybox.desktop', + install_dir: get_option('prefix') / get_option('datadir') + '/wayland-sessions', + install_mode: 'rw-r--r--', + ) diff --git a/data/rc.xml b/data/rc.xml new file mode 100644 index 0000000..def15e3 --- /dev/null +++ b/data/rc.xml @@ -0,0 +1,84 @@ + + + + + + + + + terminal + + + + + + + + + + + + grim "$(xdg-user-dir PICTURES)/$(date +'%Y-%m-%d-%H%M%S_grim_fs.png')" + + + + + + + + + + + + + + + + + + + obrun l + + + + + + + + konqueror || falkon + + + + + terminal -e mc + + + + + x-www-browser + + + + + + amixer -c 0 -D pulse -q sset Master toggle + + + + + amixer -c 0 -q set Master 3%- + + + + + amixer -c 0 -q set Master 3%+ + + + + diff --git a/data/waybox.desktop b/data/waybox.desktop new file mode 100644 index 0000000..49355c4 --- /dev/null +++ b/data/waybox.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Waybox +Comment=An Openbox-like compositor for Wayland +Comment[de]=Ein Wayland-Compositor ähnlich zu Openbox +Comment[eo]=Komponilo de Wayland, kiu similas je Openbox +Exec=waybox +Type=Application diff --git a/data/waybox.sh b/data/waybox.sh new file mode 100644 index 0000000..9aa088a --- /dev/null +++ b/data/waybox.sh @@ -0,0 +1,100 @@ +#!/bin/sh + +if test -z "$XDG_CONFIG_HOME"; +then + XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config} + export XDG_CONFIG_HOME +fi + +WB_USER_CONF_DIR=$XDG_CONFIG_HOME/waybox +WB_SYS_CONF_DIR=@sysconfdir@/xdg/waybox +# Seemingly, Openbox hard-coded ~/.config/openbox rather than using +# $XDG_CONFIG_HOME. Older versions of Openbox used ~/.openbox and would +# continue to use it if available. +test -d ~/.openbox && OB_USER_CONF_DIR=~/.openbox || OB_USER_CONF_DIR=~/.config/openbox +OB_SYS_CONF_DIR=@sysconfdir@/xdg/openbox + +_() +{ + if which gettext.sh >/dev/null 2>&1; + then + . gettext.sh + TEXTDOMAIN=@package@ + export TEXTDOMAIN + TEXTDOMAINDIR=@localedir@ + export TEXTDOMAINDIR + eval_gettext "$1" + else + printf "$1" + fi +} + +# Load the environment variables +if test -f $WB_USER_CONF_DIR/environment; +then + . $WB_USER_CONF_DIR/environment; +elif test -f $WB_SYS_CONF_DIR/environment; +then + . $WB_SYS_CONF_DIR/environment +elif test -f $OB_USER_CONF_DIR/environment; +then + _ "WARNING: Using files from Openbox. These may not work correctly." + . $OB_USER_CONF_DIR/environment; +elif test -f $OB_SYS_CONF_DIR/environment; +then + _ "WARNING: Using files from Openbox. These may not work correctly." + . $OB_SYS_CONF_DIR/environment; +fi + +# Get the autostart script to use +# +# Openbox calls the autostart script from the XDG autostart script, so we don't +# need to run the autostart script twice if only the Openbox scripts are +# available +if test -x $WB_USER_CONF_DIR/autostart; +then + WB_AUTOSTART=$WB_USER_CONF_DIR/autostart; +elif test -x $WB_SYS_CONF_DIR/autostart; +then + WB_AUTOSTART=$WB_SYS_CONF_DIR/autostart +fi + +# And the XDG autostart script +if test -x $WB_USER_CONF_DIR/xdg-autostart; +then + WB_XDG_AUTOSTART=$WB_USER_CONF_DIR/xdg-autostart; +elif test -x $WB_SYS_CONF_DIR/xdg-autostart; +then + WB_XDG_AUTOSTART=$WB_SYS_CONF_DIR/xdg-autostart +elif test -x "@libexecdir@/openbox-autostart"; +then + _ "WARNING: Using files from Openbox. These may not work correctly." + WB_XDG_AUTOSTART="@libexecdir@/openbox-autostart OPENBOX"; +fi + +if test -f $WB_USER_CONF_DIR/rc.xml; +then + WB_RC_XML=$WB_USER_CONF_DIR/rc.xml +elif test -f $WB_SYS_CONF_DIR/rc.xml; +then + WB_RC_XML=$WB_SYS_CONF_DIR/rc.xml +elif test -f $OB_USER_CONF_DIR/rc.xml; +then + WB_RC_XML=$OB_USER_CONF_DIR/rc.xml +elif test -f $OB_SYS_CONF_DIR/rc.xml; +then + WB_RC_XML=$OB_SYS_CONF_DIR/rc.xml; +else + _ "ERROR: No configuration file found." + exit 1 +fi +export WB_RC_XML + +if which dbus-launch >/dev/null 2>&1; +then + DBUS_LANCH="dbus-launch --exit-with-session" +fi + +# No need to export these to Waybox +unset TEXTDOMAIN TEXTDOMAINDIR +$DBUS_LAUNCH @libexecdir@/waybox --startup "${WB_AUTOSTART:-true}; ${WB_XDG_AUTOSTART:-true}" "$@" diff --git a/data/xdg-autostart b/data/xdg-autostart new file mode 100644 index 0000000..00cbfea --- /dev/null +++ b/data/xdg-autostart @@ -0,0 +1,98 @@ +#!/bin/sh + +# Autostart script +# +# I've tried to make it compatible with the specification, but YMMV +# +# Start autostart programs for the following environments: +# WB_AUTOSTART_ENVIRONMENT= # No environment +# WB_AUTOSTART_ENVIRONMENT=all # All environments +# WB_AUTOSTART_ENVIRONMENT=GNOME:KDE # GNOME and KDE only + +# Using the old set hack rather than ksh arrays, which some shells don't +# implement correctly or at all +set -- + +oldifs=$IFS +IFS=: +for d in ${XDG_CONFIG_HOME:-~/.config}:${XDG_CONFIG_DIRS:-${sysconfdir:-/etc}/xdg}; +do + for f in $d/autostart/*.desktop; + do + # Skip this entry if this file doesn't exist (e.g. if there are no + # desktop files in that directory) + if test ! -f "$f"; + then + continue + # Hidden key; must not be shown + elif cat "$f" | grep -q "^Hidden\s*=\s*true$"; + then + show_in=0 + # Value of WAYBOX: run all programs + elif test "$WB_AUTOSTART_ENVIRONMENT" = "all"; + then + show_in=1 + # No OnlyShowIn or NotShowIn key, so show regardless of the value of + # WB_AUTOSTART_ENVIRONMENT + elif ! (cat "$f" | grep -q '^\(Only\|Not\)ShowIn\s*=\s*'); + then + show_in=1 + # No WB_AUTOSTART_ENVIRONMENT specified, so don't run any programs that + # specify a special environment + elif test -z "$WB_AUTOSTART_ENVIRONMENT"; + then + cat "$f" | grep -q '^OnlyShowIn\s*=\s*' && show_in=0 + else + # Run programs only in the specified autostart environments + IFS=: + show_in=0 + for autostart_environment in $WB_AUTOSTART_ENVIRONMENT; + do + IFS=\; + ONLY_SHOW_IN=$(cat "$f" | grep '^OnlyShowIn\s*=\s*' | sed -e 's/^OnlyShowIn\s*=\s*//g') + for only_show_in in $ONLY_SHOW_IN; + do + if test "$only_show_in" = "$autostart_environment"; + then + show_in=1 + break 2 + fi + done + # But don't show in these environments + NOT_SHOW_IN=$(cat "$f" | grep '^NotShowIn\s*=\s*' | sed -e 's/^NotShowIn\s*=\s*//g') + for not_show_in in $NOT_SHOW_IN; + do + if test "$not_show_in" = "$autostart_environment"; + then + show_in=0 + break 2 + fi + done + done + fi + + fn=$(basename "$f") + # Don't use if a desktop entry with the same name has already been used + for df in "$@"; + do + if test "$df" = "$fn"; + then + show_in=0 + fi + done + # Must be set back before executing the program + IFS=$oldifs + + set -- $@ "$fn" + if test $show_in -ne 0; + then + # Don't run the Exec key if a non-empty TryExec command can't be found + TRY_EXEC=$(cat "$f" | grep '^TryExec\s*=\s*\S' | sed -e 's/^TryExec\s*=\s*//g'); + if test -n "$TRY_EXEC" && ! which $TRY_EXEC; + then + continue + fi + $(cat "$f" | grep '^Exec\s*=\s*' | sed -e 's/^Exec\s*=\s*//g') & + fi + done +done diff --git a/meson.build b/meson.build index b65a58c..1420582 100644 --- a/meson.build +++ b/meson.build @@ -38,5 +38,6 @@ if msgfmt.found() subdir('po') endif +subdir('data') subdir('protocol') subdir('waybox') diff --git a/po/POTFILES.in b/po/POTFILES.in index 3687f86..fd8f5b9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +data/waybox.sh waybox/config.c waybox/main.c waybox/output.c diff --git a/po/af.po b/po/af.po index c516608..1fd2663 100644 --- a/po/af.po +++ b/po/af.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:03-0400\n" "Last-Translator: aspersieman \n" "Language-Team: Afrikaans\n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/ar.po b/po/ar.po index 71961d9..372ecc3 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:03-0400\n" "Last-Translator: كريم اولاد الشلحة \n" "Language-Team: Arabic \n" @@ -21,6 +21,12 @@ msgstr "" "X-Poedit-Language: Arabic\n" "X-Poedit-Country: Morocco\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/be.po b/po/be.po index fda9440..4503718 100644 --- a/po/be.po +++ b/po/be.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:03-0400\n" "Last-Translator: Mikalai Udodau \n" "Language-Team: Belarusian \n" @@ -19,6 +19,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/bn_IN.po b/po/bn_IN.po index 657e267..4827aba 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:06-0400\n" "Last-Translator: Runa Bhattacharjee \n" "Language-Team: Bengali (India) \n" @@ -18,6 +18,12 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/ca.po b/po/ca.po index 5b70e0a..fc2ece7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:06-0400\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/cs.po b/po/cs.po index 9ceacb3..bc7cd84 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:06-0400\n" "Last-Translator: David Kolibac \n" "Language-Team: Czech \n" @@ -19,6 +19,12 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/da.po b/po/da.po index 6ee7092..0dc94c1 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2022-02-18 17:43-0500\n" "Last-Translator: Jesper Sander \n" "Language-Team: None\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/de.po b/po/de.po index 9ad72bc..17c4632 100644 --- a/po/de.po +++ b/po/de.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" -"PO-Revision-Date: 2022-02-20 20:21-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" +"PO-Revision-Date: 2022-02-22 21:21-0500\n" "Last-Translator: Volker Ribbert \n" "Language-Team: \n" "Language: de\n" @@ -21,6 +21,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "WARNUNG: Benutzt Dateien aus Openbox. Das wird nicht richtig werken." + +msgid "ERROR: No configuration file found." +msgstr "FEHLER: Keine Einstellungsdatei gefunden." + msgid "Unable to evaluate expression" msgstr "Konnte den Ausdruck nicht evaluieren" @@ -33,7 +39,8 @@ msgstr "Kein nodeset" msgid "" "Unable to parse the configuration file. Consult stderr for more information." msgstr "" -"Kann nicht die Einstullungsdatei analisieren. Für mehr Informationen die Standardfehlerausgabe lesen." +"Kann nicht die Einstullungsdatei analisieren. Für mehr Informationen die " +"Standardfehlerausgabe lesen." msgid "Couldn't create new context!" msgstr "Konnte einen neuen Zusammenhang nicht erstellen" diff --git a/po/el.po b/po/el.po index 88b9d33..986a147 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/eo.po b/po/eo.po index 352ccd7..1f830ca 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" -"PO-Revision-Date: 2022-02-20 20:22-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" +"PO-Revision-Date: 2022-02-22 21:21-0500\n" "Last-Translator: Keith \n" "Language-Team: Esperanto\n" "Language: eo\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "AVERTO: Uzas dosierojn el Openbox. Tiuj eble ne ĝuste funkcios." + +msgid "ERROR: No configuration file found." +msgstr "ERARO: Neniu agordo-dosiero trovita." + msgid "Unable to evaluate expression" msgstr "Ne povas taksi esprimon" @@ -140,7 +146,7 @@ msgid "Display destroyed" msgstr "Ekrano finigita" msgid "Keyboard focus is now on surface" -msgstr "Klavara fokuso nun estas surface" +msgstr "Klavara fokuso nun estas sur surfaco" msgid "Focusing current view" msgstr "Fokusas nunan vidon" diff --git a/po/es.po b/po/es.po index b652559..1013536 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: Nicolás de la Torre \n" "Language-Team: español \n" @@ -21,6 +21,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/et.po b/po/et.po index 675e211..8b55b50 100644 --- a/po/et.po +++ b/po/et.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: mihkel \n" "Language-Team: Estonian \n" @@ -19,6 +19,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/eu.po b/po/eu.po index 440bf5a..14125db 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: Inko I. A. \n" "Language-Team: Inko I. A. \n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/fi.po b/po/fi.po index 669a9fb..253e721 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: Lauri Hakko \n" "Language-Team: None\n" @@ -20,6 +20,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/fr.po b/po/fr.po index 20828ca..df8638a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: Cyrille Bagard \n" "Language-Team: franais \n" @@ -21,6 +21,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/gl_ES.po b/po/gl_ES.po index d692b86..2f30a2b 100644 --- a/po/gl_ES.po +++ b/po/gl_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 19:33-0400\n" "Last-Translator: Javier Mancebo \n" "Language-Team: Galician\n" @@ -16,6 +16,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/he.po b/po/he.po index 5661f1c..c709905 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 10:30-0400\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Rahut \n" @@ -20,6 +20,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/hr.po b/po/hr.po index c87fb46..38dc72d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:07-0400\n" "Last-Translator: boljsa \n" "Language-Team: \n" @@ -16,6 +16,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/hu.po b/po/hu.po index f7c6da4..7226727 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:42-0400\n" "Last-Translator: Laszlo Dvornik \n" "Language-Team: Hungarian\n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/ia.po b/po/ia.po index 964feff..bf94174 100644 --- a/po/ia.po +++ b/po/ia.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:42-0400\n" "Last-Translator: Nik Kalach \n" "Language-Team: Interlingua (International Auxiliary Language Association) " @@ -18,6 +18,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.5\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/it.po b/po/it.po index 8fff461..89b74f6 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:08-0400\n" "Last-Translator: Davide Truffa \n" "Language-Team: Italian \n" @@ -19,6 +19,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/ja.po b/po/ja.po index 620c416..0cbc43d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:08-0400\n" "Last-Translator: Ryoichiro Suzuki \n" "Language-Team: Japanese \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/lt.po b/po/lt.po index a668ce5..b3748e3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:42-0400\n" "Last-Translator: Algimantas Margevičius \n" "Language-Team: Lietuvių <>\n" @@ -21,6 +21,12 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2)\n" "X-Generator: Gtranslator 2.91.5\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/lv.po b/po/lv.po index 1a44fe1..2976c19 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:08-0400\n" "Last-Translator: Einars Sprugis \n" "Language-Team: Latvian \n" @@ -19,6 +19,12 @@ msgstr "" "2);\n" "X-Generator: Lokalize 1.0\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/meson.build b/po/meson.build index c40223f..5466a32 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,6 +1,6 @@ i18n = import('i18n') add_project_arguments('-DGETTEXT_PACKAGE="' + meson.project_name().to_lower() + '"', - '-DLOCALEDIR="' + get_option('prefix') + '/' + get_option('localedir') + '"', + '-DLOCALEDIR="' + get_option('prefix') / get_option('localedir') + '"', language:'c') i18n.gettext(meson.project_name().to_lower(), args: ['--directory=' + source_root, diff --git a/po/nl.po b/po/nl.po index d0e7de7..a790e98 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:08-0400\n" "Last-Translator: Pjotr \n" "Language-Team: Dutch \n" @@ -21,6 +21,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/no.po b/po/no.po index 28bdb7a..3522dd9 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:23-0400\n" "Last-Translator: Michael Kjelbergvik Thung \n" "Language-Team: None\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/pl.po b/po/pl.po index 593083b..55e877e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:08-0400\n" "Last-Translator: Jakub Błażejczyk\n" "Language-Team: polski \n" @@ -22,6 +22,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/pt.po b/po/pt.po index feb96df..7036aea 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:42-0400\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" @@ -20,6 +20,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.7\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 264b33d..0047652 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:45-0400\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/ro.po b/po/ro.po index c34ecfa..ae20f90 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:09-0400\n" "Last-Translator: Radu Feflea \n" "Language-Team: none\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/ru.po b/po/ru.po index 1ea03e8..0f569ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:09-0400\n" "Last-Translator: Moroz Sergey L. \n" "Language-Team: None\n" @@ -19,6 +19,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/sk.po b/po/sk.po index 33352ad..ec17e88 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:09-0400\n" "Last-Translator: Frantisek Elias \n" "Language-Team: Slovak \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/sr.po b/po/sr.po index dfe92df..668a02f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:09-0400\n" "Last-Translator: Jay Alexander Fleming \n" "Language-Team: None\n" @@ -19,6 +19,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/sr@latin.po b/po/sr@latin.po index deb9768..fd3ec1b 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:09-0400\n" "Last-Translator: Jay A. Fleming \n" "Language-Team: None\n" @@ -19,6 +19,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/sv.po b/po/sv.po index ee99502..70774c4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 18:42-0400\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: None\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/tr.po b/po/tr.po index 5a28d6a..769f83a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:09-0400\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Turkish \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/uk.po b/po/uk.po index ceaa6f2..d161403 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:10-0400\n" "Last-Translator: Serhiy Lysovenko \n" "Language-Team: Ukrainian \n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/vi.po b/po/vi.po index 37923bb..e24b3ce 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2022-02-01 21:17-0500\n" "Last-Translator: Quan Tran \n" "Language-Team: None\n" @@ -17,6 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/waybox.pot b/po/waybox.pot index 1dd4f46..bfc510d 100644 --- a/po/waybox.pot +++ b/po/waybox.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: waybox\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index a35c899..033359a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2020-03-10 14:10-0400\n" "Last-Translator: zhou sf \n" "Language-Team: Simplified Chinese\n" @@ -19,6 +19,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5fbd766..9761979 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Waybox 0.0.1\n" "Report-Msgid-Bugs-To: https://github.com/wizbright/waybox/issues\n" -"POT-Creation-Date: 2022-02-20 20:16-0500\n" +"POT-Creation-Date: 2022-02-22 21:19-0500\n" "PO-Revision-Date: 2022-02-01 21:14-0500\n" "Last-Translator: 洪任諭 \n" "Language-Team: Chinese (traditional) \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +msgid "WARNING: Using files from Openbox. These may not work correctly." +msgstr "" + +msgid "ERROR: No configuration file found." +msgstr "" + msgid "Unable to evaluate expression" msgstr "" diff --git a/waybox/config.c b/waybox/config.c index c7a9ba8..6151a0a 100644 --- a/waybox/config.c +++ b/waybox/config.c @@ -126,22 +126,24 @@ static bool parse_key_bindings(struct wb_config *config, xmlXPathContextPtr ctxt bool init_config(struct wb_server *server) { xmlDocPtr doc; - if (server->config_file == NULL) { + char *rc_file; + if (getenv("WB_RC_XML")) { + rc_file = strdup(getenv("WB_RC_XML")); + } else if (server->config_file != NULL) { + rc_file = strdup(server->config_file); + } else { char *xdg_config = getenv("XDG_CONFIG_HOME"); if (!xdg_config) xdg_config = "~/.config"; - char *rc_file = malloc(strlen(xdg_config) + 14); + rc_file = malloc(strlen(xdg_config) + 14); strcpy(rc_file, xdg_config); rc_file = strcat(rc_file, "/waybox/rc.xml"); - doc = xmlParseFile(rc_file); - wlr_log(WLR_INFO, "Using config file %s", rc_file); - free(rc_file); - } else { - wlr_log(WLR_INFO, "Using config file %s", server->config_file); - doc = xmlReadFile(server->config_file, NULL, XML_PARSE_RECOVER); } + doc = xmlReadFile(rc_file, NULL, XML_PARSE_RECOVER); + wlr_log(WLR_INFO, "Using config file %s", rc_file); + free(rc_file); if (doc == NULL) { wlr_log(WLR_ERROR, "%s", _("Unable to parse the configuration file. Consult stderr for more information.")); return false; diff --git a/waybox/meson.build b/waybox/meson.build index eacad8b..ff91dd8 100644 --- a/waybox/meson.build +++ b/waybox/meson.build @@ -23,4 +23,5 @@ executable( include_directories: [inc_dir], dependencies: [wb_dep, wlr_protos], install: true, + install_dir: get_option('prefix') / get_option('libexecdir'), )