From: Mikael Magnusson Date: Tue, 2 Aug 2011 20:18:14 +0000 (+0200) Subject: Merge branch 'm4/master' X-Git-Tag: mikabox-3.5-7~124 X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=d09fd3183e6a52c63fcfdcf62d418cfdccb0015b;hp=d162451a0113da1e012e007f848e38f07348d9d2 Merge branch 'm4/master' --- diff --git a/.gitignore b/.gitignore index 79e2b42..758f243 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,7 @@ tests/wmhints data/autostart/openbox-autostart data/autostart/autostart obrender/rendertest +obt/tests/bstest +obt/tests/ddtest +obt/tests/linktest +obt/tests/watchtest diff --git a/CHANGELOG b/CHANGELOG index 8636efb..9bd1021 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,61 @@ -3.5.0-rc1: +3.5.0: + * New alt-tab dialog shows windows in a vertical list. + * Improved Xinerama support. + * Allow icons in menus. + * Theme options for prompt dialogs (osd.button.unpressed.*, + osd.button.pressed.*, osd.button.focused.*) + * Addresses bug #4877, #4596, #4617, #4752, #4663, #4662, #4586, #2319, + #4341, #4519, #4543, #4503, #4355, #4072, #3702, #4284 + * Lots of additional bug fixes and performance improvements. + +3.4.11.2: + * Updated Estonian and Portuguese translations. + * Fix a rare crash involving moving fullscreen windows to different monitors + * Fix a more common crash involving pressing right in a menu + +3.4.11.1: + * Updated Polish translation. + * Fixed bug #4519 (Incorrect focus in reused windows). + * Lower the default submenu open/hide delay from 200ms to 100ms. + * Fix some more problems with gnome integration. + * Update Clearlooks theme. + * Some other small fixes. + +3.4.11: + * Update Hungarian, Japanese, and Latvian translations. + * Make xdg-autostart use the OPENBOX environment by default, so you can use + OnlyShowIn=OPENBOX in an autostart .desktop and it will work as expected. + * Don't close the menu when you hold control and execute something. + * Fix bug #4503 (Adjust who shows up in the Alt-Tab list using SKIP_TASKBAR). + * Fix flickering window when moving maximized window between monitors of + different sizes. + * Fix bug #4355 (Allow multiple escaped _'s in a menu label and allow + a menu shortcut to come after an escaped _). + * Remember the maximized state of a window when it goes fullscreen, and + restore it when leaving fullscreen state. + * Fix bug #4072 (Openbox is stopped by terminal applications writing to + stdout). + * Fix bug #4492 (Mistake in openbox-gnome-session check while setting up). + * Fix obxprop to make --root and --id work correctly. + * Add _OB_APP_ROLE/CLASS/NAME/TYPE properties (replaces _OB_ROLE/CLASS/NAME). + * Make the focus cycling popup dynamic when windows appear/disappear. + * Fix bug #4411 (Crash when window appears during focus cycling). + * Allow the user to specify which properties should be shown by obxprop. + * Fix tilde expansion in the Execute action + * Make Home and End keys move to the top/bottom of the active menu. + * Use the submenuShowDelay when navigating menus with the keyboard. + +3.4.10: + * Improve keyboard navigation in Openbox menus. + * Add a --root option and a manpage for obxprop. + * Use a negative value for submenuShowDelay and submenuHideDelay to cause + an infinite delay. This means you have to click to show a submenu, rather + than just hover over it. + * Improved code for submenu show/hide delay. Added the submenuHideDelay + config file option, under the "menu" section. + * Fixed bug #4464 (Typo in openbox-gnome-session script). + * Fixed bug #4436 (Focusing a window used to stop focus cycling). + * Renamed obprop to obxprop due to collision with Open Babel (See bug #4419). 3.4.9: * Allow focus to move while inside an Openbox menu, or during an interactive diff --git a/Makefile.am b/Makefile.am index 8cdb126..c62a594 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,8 +47,7 @@ nodist_rc_SCRIPTS = \ data/autostart/autostart dist_libexec_SCRIPTS = \ - data/autostart/openbox-xdg-autostart \ - data/autostart/openbox-autostart + data/autostart/openbox-xdg-autostart nodist_libexec_SCRIPTS = \ data/autostart/openbox-autostart @@ -154,8 +153,6 @@ obt_libobt_la_SOURCES = \ obt/signal.h \ obt/signal.c \ obt/util.h \ - obt/watch.h \ - obt/watch.c \ obt/xqueue.h \ obt/xqueue.c @@ -175,6 +172,8 @@ openbox_openbox_CPPFLAGS = \ -DCONFIGDIR=\"$(configdir)\" \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ + $(XINERAMA_LIBS) \ + $(XRANDR_LIBS) \ $(SM_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ @@ -326,9 +325,11 @@ tools_obxprop_obxprop_SOURCES = \ ## gdm-control ## tools_gdm_control_gdm_control_CPPFLAGS = \ + $(XAUTH_CFLAGS) \ $(X_CFLAGS) \ $(GLIB_CFLAGS) tools_gdm_control_gdm_control_LDADD = \ + $(XAUTH_LIBS) \ $(X_LIBS) \ $(GLIB_LIBS) tools_gdm_control_gdm_control_SOURCES = \ @@ -451,7 +452,6 @@ obtpubinclude_HEADERS = \ obt/signal.h \ obt/util.h \ obt/version.h \ - obt/watch.h \ obt/xqueue.h nodist_pkgconfig_DATA = \ @@ -473,20 +473,21 @@ dist_rc_DATA = \ edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ -e 's!@configdir\@!$(configdir)!' \ + -e 's!@rcdir\@!$(rcdir)!' \ -e 's!@libexecdir\@!$(libexecdir)!' \ -e 's!@bindir\@!$(bindir)!' -data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile +data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile @echo make: creating $@ - @test -d $(shell dirname $(builddir)/$@) || \ - mkdir $(shell dirname $(builddir)/$@) - @$(edit) $< >$(builddir)/$@ + @test -d $(shell dirname $(top_builddir)/$@) || \ + mkdir $(shell dirname $(top_builddir)/$@) + @$(edit) $< >$(top_builddir)/$@ -data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile +data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile @echo make: creating $@ - @test -d $(shell dirname $(builddir)/$@) || \ - mkdir $(shell dirname $(builddir)/$@) - @$(edit) $< >$(builddir)/$@ + @test -d $(shell dirname $(top_builddir)/$@) || \ + mkdir $(shell dirname $(top_builddir)/$@) + @$(edit) $< >$(top_builddir)/$@ %.desktop: %.desktop.in Makefile @echo make: creating $@ diff --git a/README.GIT b/README.GIT index b4b0557..dfed9c4 100644 --- a/README.GIT +++ b/README.GIT @@ -1,23 +1,26 @@ To build Openbox from git you need: A C Compiler (GNU GCC 3.2+ suggested) -GNU Gettext 0.14.4 -GNU Autoconf 2.50+ -GNU Automake 1.9 (no more, no less) -GNU Libtool -Xlib library/headers (devel package) -Pkg-Config -Glib 2.0+ library/headers (devel package) (http://www.gtk.org) -libxml2 2.0+ library/headers (devel package) -Pango 1.10+ library/headers (devel package) -cvs - -Optionally you may want: -X Cursor library/headers (devel package) -Startup Notification library/headers 0.8+ (devel package) +-GNU Gettext 0.14.4 +-GNU Autoconf 2.50+ +-GNU Automake 1.9 (no more, no less) +-GNU Libtool +-Xlib library/headers (devel package) +-Pkg-Config +-Glib 2.0+ library/headers (devel package) (http://www.gtk.org) +-libxml2 2.0+ library/headers (devel package) +-Pango 1.10+ library/headers (devel package) +-cvs or git or neither, depending on how gettext was installed* + +Also you will probably want: +-Imlib2 library/headers (devel package) +-X Cursor library/headers (devel package) +-Startup Notification library/headers 0.8+ (devel package) We recommend the latest versions of all these packages. +*) for versions below 0.18.1 cvs is needed, above that, see autopoint --version + Do the following to build and install Openbox in git: % ./bootstrap @@ -28,8 +31,8 @@ su to root and or % sudo make install -Don't try running it from the openbox/ directory without installing, it won't work. -It needs to be installed before it is run. +Don't try running it from the openbox/ directory without installing, it won't +work. It needs to be installed before it is run. The following commands will be available: openbox-session, openbox-gnome-session, openbox-kde-session, and openbox. @@ -40,21 +43,19 @@ See the man pages for details about them. If you want to run Openbox on its ---- -In debian unstable, you want these packages: +In Ubuntu, you want these packages: + gcc gettext -automake1.9 +automake autoconf libtool libpango1.0-dev pkg-config libglib2.0-dev libxml2-dev -libxcursor-dev libstartup-notification0-dev -xlibs-dev - -tip: run "update-alternatives --config automake" and select automake1.9 before - running ./configure +xorg-dev +libimlib2-dev ---- diff --git a/configure.ac b/configure.ac index 78b5aa6..82c627f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.5.0-rc1], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.5.0], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) @@ -18,16 +18,16 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl RR_MAJOR_VERSION=3 RR_MINOR_VERSION=5 -RR_MICRO_VERSION=27 -RR_INTERFACE_AGE=0 -RR_BINARY_AGE=0 +RR_MICRO_VERSION=28 +RR_INTERFACE_AGE=1 +RR_BINARY_AGE=1 RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION OBT_MAJOR_VERSION=3 OBT_MINOR_VERSION=5 -OBT_MICRO_VERSION=0 -OBT_INTERFACE_AGE=0 -OBT_BINARY_AGE=0 +OBT_MICRO_VERSION=1 +OBT_INTERFACE_AGE=1 +OBT_BINARY_AGE=1 OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION AC_SUBST(RR_MAJOR_VERSION) @@ -87,11 +87,9 @@ AC_PROG_INSTALL AM_GNU_GETTEXT_VERSION(0.15) AM_GNU_GETTEXT([external]) -AC_CHECK_HEADERS(ctype.h fcntl.h grp.h locale.h pwd.h signal.h string.h) -AC_CHECK_HEADERS(stdio.h stdlib.h unistd.h sys/stat.h sys/select.h) -AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/wait.h sys/inotify.h) -# AC_HEADER_TIME -# AC_TYPE_SIGNAL +AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h) +AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h) +AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h) AC_PATH_PROG([SED], [sed], [no]) if test "$SED" = "no"; then @@ -118,7 +116,7 @@ AC_SUBST(XML_LIBS) AC_ARG_ENABLE(startup-notification, AC_HELP_STRING( [--disable-startup-notification], - [disable the startup notification library. [[default=enabled]]] + [disable the startup notification library. [default=enabled]] ), [enable_sn=$enableval], [enable_sn=yes] @@ -143,7 +141,7 @@ fi AC_ARG_ENABLE(xcursor, AC_HELP_STRING( [--disable-xcursor], - [disable use of the X Cursor library. [[default=enabled]]] + [disable use of the X Cursor library. [default=enabled]] ), [enable_xcursor=$enableval], [enable_xcursor=yes] @@ -168,7 +166,7 @@ fi AC_ARG_ENABLE(imlib2, AC_HELP_STRING( [--disable-imlib2], - [disable use of Imlib2 image library for loading icons. [[default=enabled]]] + [disable use of Imlib2 image library for loading icons. [default=enabled]] ), [enable_imlib2=$enableeval], [enable_imlib2=yes] @@ -208,6 +206,7 @@ X11_EXT_XRANDR X11_EXT_SHAPE X11_EXT_XINERAMA X11_EXT_SYNC +X11_EXT_AUTH AC_CONFIG_FILES([ Makefile diff --git a/data/autostart/openbox-autostart.in b/data/autostart/openbox-autostart.in index 3b2f5ec..063c635 100755 --- a/data/autostart/openbox-autostart.in +++ b/data/autostart/openbox-autostart.in @@ -11,7 +11,7 @@ elif which xsetroot >/dev/null; then fi test -z $BG || $BG -solid "#303030" -GLOBALAUTOSTART="@configdir@/autostart" +GLOBALAUTOSTART="@rcdir@/autostart" AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart" # Run the global openbox autostart script @@ -31,4 +31,4 @@ fi # Run the XDG autostart stuff. These are found in /etc/xdg/autostart and # in $HOME/.config/autostart. This requires PyXDG to be installed. # See openbox-xdg-autostart --help for more details. -@libexecdir@/openbox-xdg-autostart OPENBOX +@libexecdir@/openbox-xdg-autostart "$@" diff --git a/data/rc.xml b/data/rc.xml index 21b0c87..7598a72 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -3,7 +3,8 @@ - + 10 @@ -35,10 +36,10 @@
yes
- Active + Primary + the active window is, 'Primary' - only on the primary monitor --> 1 200 diff --git a/data/rc.xsd b/data/rc.xsd index 3a1d654..ad96994 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -72,6 +72,7 @@ + @@ -170,7 +171,7 @@ - + @@ -517,6 +518,14 @@ + + + + + + + + @@ -532,4 +541,11 @@ + + + + + + + diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml index e045321..06c3ce5 100644 --- a/doc/rc-mouse-focus.xml +++ b/doc/rc-mouse-focus.xml @@ -3,7 +3,8 @@ - + 10 diff --git a/m4/openbox.m4 b/m4/openbox.m4 index 86d3e0b..0c37a58 100644 --- a/m4/openbox.m4 +++ b/m4/openbox.m4 @@ -11,6 +11,10 @@ AC_DEFUN([OB_DEBUG], AC_HELP_STRING([--enable-strict-ansi],[Enable strict ANSI compliance build [[default=no]]]), [STRICT=$enableval], [STRICT="no"]) + AC_ARG_ENABLE([super-warnings], + AC_HELP_STRING([--enable-super-warnings],[Enable extra compiler warnings [[default=no]]]), + [SUPERWARN=$enableval], [SUPERWARN="no"]) + AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug],[build a debug version [[default=no]]]), [DEBUG=$enableval], [DEBUG="no"]) @@ -43,6 +47,9 @@ AC_DEFUN([OB_DEBUG], if test "$STRICT" = "yes"; then MSG="$MSG with strict ANSI compliance" fi + if test "$SUPERWARN" = "yes"; then + MSG="$MSG with super warnings" + fi AC_MSG_RESULT([$MSG]) test "$DEBUG" = "yes" && \ @@ -77,11 +84,14 @@ AC_DEFUN([OB_COMPILER_FLAGS], FLAGS="$FLAGS -O0 -ggdb -fno-inline -Wwrite-strings" FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return" FLAGS="$FLAGS -Wbad-function-cast -Wpointer-arith" - # glib can't handle this flag - # -Wcast-qual + FLAGS="$FLAGS -Wno-write-strings" # for Python.h #FLAGS="$FLAGS -Wno-long-long" fi + if test "$SUPERWARN" = "yes"; then + # glib can't handle -Wcast-qual + FLAGS="$FLAGS -Wcast-qual -Wextra" + fi if test "$STRICT" = "yes"; then FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE" fi diff --git a/m4/x11.m4 b/m4/x11.m4 index d840d34..f3b1ede 100644 --- a/m4/x11.m4 +++ b/m4/x11.m4 @@ -11,7 +11,7 @@ AC_DEFUN([X11_DEVEL], # Store these OLDLIBS=$LIBS OLDCPPFLAGS=$CPPFLAGS - + CPPFLAGS="$CPPFLAGS $X_CFLAGS" X_LIBS="$X_PRE_LIBS $X_LIBS -lX11" LIBS="$LIBS $X_LIBS" @@ -38,44 +38,52 @@ AC_DEFUN([X11_EXT_XKB], [ AC_REQUIRE([X11_DEVEL]) - # Store these - OLDLIBS=$LIBS - OLDCPPFLAGS=$CPPFLAGS - - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" + AC_ARG_ENABLE([xkb], + AC_HELP_STRING( + [--disable-xkb], + [build without support for xkb extension [default=enabled]]), + [USE=$enableval], [USE="yes"]) - AC_CHECK_LIB([X11], [XkbBell], - AC_MSG_CHECKING([for X11/XKBlib.h]) - AC_TRY_LINK( - [ - #include - #include - #include - ], - [ - Display *d; - Window w; - XkbBell(d, w, 0, 0); - ], - [ - AC_MSG_RESULT([yes]) - XKB="yes" - AC_DEFINE([XKB], [1], [Found the XKB extension]) + if test "$USE" = "yes"; then + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS - XKB_CFLAGS="" - XKB_LIBS="" - AC_SUBST(XKB_CFLAGS) - AC_SUBST(XKB_LIBS) - ], - [ - AC_MSG_RESULT([no]) - XKB="no" - ]) - ) + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS" - LIBS=$OLDLIBS - CPPFLAGS=$OLDCPPFLAGS + AC_CHECK_LIB([X11], [XkbBell], + AC_MSG_CHECKING([for X11/XKBlib.h]) + AC_TRY_LINK( + [ + #include + #include + #include + ], + [ + Display *d; + Window w; + XkbBell(d, w, 0, 0); + ], + [ + AC_MSG_RESULT([yes]) + XKB="yes" + AC_DEFINE([XKB], [1], [Found the XKB extension]) + + XKB_CFLAGS="" + XKB_LIBS="" + AC_SUBST(XKB_CFLAGS) + AC_SUBST(XKB_LIBS) + ], + [ + AC_MSG_RESULT([no]) + XKB="no" + ]) + ) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + fi AC_MSG_CHECKING([for the Xkb extension]) if test "$XKB" = "yes"; then @@ -94,45 +102,53 @@ AC_DEFUN([X11_EXT_XRANDR], [ AC_REQUIRE([X11_DEVEL]) - # Store these - OLDLIBS=$LIBS - OLDCPPFLAGS=$CPPFLAGS - - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS -lXext -lXrender -lXrandr" + AC_ARG_ENABLE([xrandr], + AC_HELP_STRING( + [--disable-xrandr], + [build without support for xrandr extension [default=enabled]]), + [USE=$enableval], [USE="yes"]) - AC_CHECK_LIB([Xrandr], [XRRSelectInput], - AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) - AC_TRY_LINK( - [ - #include - #include - ], - [ - Display *d; - Drawable r; - int i; - XRRQueryExtension(d, &i, &i); - XRRGetScreenInfo(d, r); - ], - [ - AC_MSG_RESULT([yes]) - XRANDR="yes" - AC_DEFINE([XRANDR], [1], [Found the XRandR extension]) + if test "$USE" = "yes"; then + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS - XRANDR_CFLAGS="" - XRANDR_LIBS="-lXext -lXrender -lXrandr" - AC_SUBST(XRANDR_CFLAGS) - AC_SUBST(XRANDR_LIBS) - ], - [ - AC_MSG_RESULT([no]) - XRANDR="no" - ]) - ) + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS -lXext -lXrender -lXrandr" + + AC_CHECK_LIB([Xrandr], [XRRSelectInput], + AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) + AC_TRY_LINK( + [ + #include + #include + ], + [ + Display *d; + Drawable r; + int i; + XRRQueryExtension(d, &i, &i); + XRRGetScreenInfo(d, r); + ], + [ + AC_MSG_RESULT([yes]) + XRANDR="yes" + AC_DEFINE([XRANDR], [1], [Found the XRandR extension]) + + XRANDR_CFLAGS="" + XRANDR_LIBS="-lXext -lXrender -lXrandr" + AC_SUBST(XRANDR_CFLAGS) + AC_SUBST(XRANDR_LIBS) + ], + [ + AC_MSG_RESULT([no]) + XRANDR="no" + ]) + ) - LIBS=$OLDLIBS - CPPFLAGS=$OLDCPPFLAGS + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + fi AC_MSG_CHECKING([for the XRandR extension]) if test "$XRANDR" = "yes"; then @@ -151,43 +167,51 @@ AC_DEFUN([X11_EXT_SHAPE], [ AC_REQUIRE([X11_DEVEL]) - # Store these - OLDLIBS=$LIBS - OLDCPPFLAGS=$CPPFLAGS - - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" + AC_ARG_ENABLE([xshape], + AC_HELP_STRING( + [--disable-xshape], + [build without support for xshape extension [default=enabled]]), + [USE=$enableval], [USE="yes"]) - AC_CHECK_LIB([Xext], [XShapeCombineShape], - AC_MSG_CHECKING([for X11/extensions/shape.h]) - AC_TRY_LINK( - [ - #include - #include - #include - ], - [ - long foo = ShapeSet; - ], - [ - AC_MSG_RESULT([yes]) - SHAPE="yes" - AC_DEFINE([SHAPE], [1], [Found the XShape extension]) + if test "$USE" = "yes"; then + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS - XSHAPE_CFLAGS="" - XSHAPE_LIBS="-lXext" - AC_SUBST(XSHAPE_CFLAGS) - AC_SUBST(XSHAPE_LIBS) - ], - [ - AC_MSG_RESULT([no]) - SHAPE="no" - ]) - ) + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS" + + AC_CHECK_LIB([Xext], [XShapeCombineShape], + AC_MSG_CHECKING([for X11/extensions/shape.h]) + AC_TRY_LINK( + [ + #include + #include + #include + ], + [ + long foo = ShapeSet; + ], + [ + AC_MSG_RESULT([yes]) + SHAPE="yes" + AC_DEFINE([SHAPE], [1], [Found the XShape extension]) + + XSHAPE_CFLAGS="" + XSHAPE_LIBS="-lXext" + AC_SUBST(XSHAPE_CFLAGS) + AC_SUBST(XSHAPE_LIBS) + ], + [ + AC_MSG_RESULT([no]) + SHAPE="no" + ]) + ) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + fi - LIBS=$OLDLIBS - CPPFLAGS=$OLDCPPFLAGS - AC_MSG_CHECKING([for the Shape extension]) if test "$SHAPE" = "yes"; then AC_MSG_RESULT([yes]) @@ -206,39 +230,47 @@ AC_DEFUN([X11_EXT_XINERAMA], [ AC_REQUIRE([X11_DEVEL]) - # Store these - OLDLIBS=$LIBS - OLDCPPFLAGS=$CPPFLAGS - - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS -lXext" + AC_ARG_ENABLE([xinerama], + AC_HELP_STRING( + [--disable-xinerama], + [build without support for xinerama [default=enabled]]), + [USE=$enableval], [USE="yes"]) - AC_CHECK_LIB([Xinerama], [XineramaQueryExtension], - [ - AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) - AC_TRY_LINK( - [ - #include - #include - ], - [ - XineramaScreenInfo foo; - ], - [ - AC_MSG_RESULT([yes]) - XINERAMA="yes" - AC_DEFINE([XINERAMA], [1], [Enable support of the Xinerama extension]) - XINERAMA_LIBS="-lXext -lXinerama" - AC_SUBST(XINERAMA_LIBS) - ], + if test "$USE" = "yes"; then + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS -lXext" + + AC_CHECK_LIB([Xinerama], [XineramaQueryExtension], [ - AC_MSG_RESULT([no]) - XINERAMA="no" + AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) + AC_TRY_LINK( + [ + #include + #include + ], + [ + XineramaScreenInfo foo; + ], + [ + AC_MSG_RESULT([yes]) + XINERAMA="yes" + AC_DEFINE([XINERAMA], [1], [Enable support of the Xinerama extension]) + XINERAMA_LIBS="-lXext -lXinerama" + AC_SUBST(XINERAMA_LIBS) + ], + [ + AC_MSG_RESULT([no]) + XINERAMA="no" + ]) ]) - ]) - LIBS=$OLDLIBS - CPPFLAGS=$OLDCPPFLAGS + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + fi AC_MSG_CHECKING([for the Xinerama extension]) if test "$XINERAMA" = "yes"; then @@ -257,45 +289,106 @@ AC_DEFUN([X11_EXT_SYNC], [ AC_REQUIRE([X11_DEVEL]) + AC_ARG_ENABLE([xsync], + AC_HELP_STRING( + [--disable-xsync], + [build without support for xsync extension [default=enabled]]), + [USE=$enableval], [USE="yes"]) + + if test "$USE" = "yes"; then + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS" + + AC_CHECK_LIB([Xext], [XSyncInitialize], + AC_MSG_CHECKING([for X11/extensions/sync.h]) + AC_TRY_LINK( + [ + #include + #include + #include + ], + [ + XSyncValueType foo; + ], + [ + AC_MSG_RESULT([yes]) + SYNC="yes" + AC_DEFINE([SYNC], [1], [Found the XSync extension]) + + XSYNC_CFLAGS="" + XSYNC_LIBS="-lXext" + AC_SUBST(XSYNC_CFLAGS) + AC_SUBST(XSYNC_LIBS) + ], + [ + AC_MSG_RESULT([no]) + SYNC="no" + ]) + ) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + fi + + AC_MSG_CHECKING([for the Sync extension]) + if test "$SYNC" = "yes"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +]) + +# X11_EXT_AUTH() +# +# Check for the presence of the "Xau" X Window System extension. +# Defines "AUTH, sets the $(AUTH) variable to "yes", and sets the $(LIBS) +# appropriately if the extension is present. +AC_DEFUN([X11_EXT_AUTH], +[ + AC_REQUIRE([X11_DEVEL]) + # Store these OLDLIBS=$LIBS OLDCPPFLAGS=$CPPFLAGS - + CPPFLAGS="$CPPFLAGS $X_CFLAGS" LIBS="$LIBS $X_LIBS" - AC_CHECK_LIB([Xext], [XSyncInitialize], - AC_MSG_CHECKING([for X11/extensions/sync.h]) + AC_CHECK_LIB([Xau], [XauReadAuth], + AC_MSG_CHECKING([for X11/Xauth.h]) AC_TRY_LINK( [ #include #include - #include + #include ], [ - XSyncValueType foo; ], [ AC_MSG_RESULT([yes]) - SYNC="yes" - AC_DEFINE([SYNC], [1], [Found the XSync extension]) + AUTH="yes" + AC_DEFINE([AUTH], [1], [Found the Xauth extension]) - XSYNC_CFLAGS="" - XSYNC_LIBS="-lXext" - AC_SUBST(XSYNC_CFLAGS) - AC_SUBST(XSYNC_LIBS) + XAUTH_CFLAGS="" + XAUTH_LIBS="-lXau" + AC_SUBST(XAUTH_CFLAGS) + AC_SUBST(XAUTH_LIBS) ], - [ + [ AC_MSG_RESULT([no]) - SYNC="no" + AUTH="no" ]) ) LIBS=$OLDLIBS CPPFLAGS=$OLDCPPFLAGS - - AC_MSG_CHECKING([for the Sync extension]) - if test "$SYNC" = "yes"; then + + AC_MSG_CHECKING([for the Xauth extension]) + if test "$AUTH" = "yes"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -312,14 +405,15 @@ AC_DEFUN([X11_SM], AC_ARG_ENABLE([session-management], AC_HELP_STRING( - [--disable-session-management], [build without support for session managers [[default=enabled]]]), + [--disable-session-management], + [build without support for session managers [default=enabled]]), [SM=$enableval], [SM="yes"]) - + if test "$SM" = "yes"; then # Store these OLDLIBS=$LIBS OLDCPPFLAGS=$CPPFLAGS - + CPPFLAGS="$CPPFLAGS $X_CFLAGS" LIBS="$LIBS $X_LIBS" @@ -335,10 +429,10 @@ AC_DEFUN([X11_SM], SM="yes" ]) ]) - fi - LIBS=$OLDLIBS - CPPFLAGS=$OLDCPPFLAGS + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + fi AC_MSG_CHECKING([for session management support]) if test "$SM" = "yes"; then diff --git a/obrender/image.c b/obrender/image.c index bb65e3c..196d9d1 100644 --- a/obrender/image.c +++ b/obrender/image.c @@ -31,8 +31,25 @@ #define FLOOR(i) ((i) & (~0UL << FRACTION)) #define AVERAGE(a, b) (((((a) ^ (b)) & 0xfefefefeL) >> 1) + ((a) & (b))) -void RrImagePicInit(RrImagePic *pic, const gchar *name, - gint w, gint h, RrPixel32 *data) +/************************************************************************ + RrImagePic functions. + + RrImagePics are pictures that are grouped together into RrImageSets. Each + RrImagePic in the set has the same logical image inside it, but they are + of different sizes. An RrImagePic can be an original (which comes from some + outside source, such as an image file), or resized from some other RrImagePic + to meet the needs of the user. +**************************************************************************/ + + +/*! Set up an RrImagePic. + This does _not_ make a copy of the data. So the value of data must be + owned by the caller of this function, and not freed afterward. + This function does not allocate an RrImagePic, and can be used for setting + up a temporary RrImagePic on the stack. Such an object would then also + not be freed with RrImagePicFree. +*/ +static void RrImagePicInit(RrImagePic *pic, gint w, gint h, RrPixel32 *data) { gint i; @@ -42,49 +59,168 @@ void RrImagePicInit(RrImagePic *pic, const gchar *name, pic->sum = 0; for (i = w*h; i > 0; --i) pic->sum += *(data++); - pic->name = g_strdup(name); } +/*! Create a new RrImagePic from some picture data. + This makes a duplicate of the data. +*/ +static RrImagePic* RrImagePicNew(gint w, gint h, RrPixel32 *data) +{ + RrImagePic *pic; + + pic = g_slice_new(RrImagePic); + RrImagePicInit(pic, w, h, g_memdup(data, w*h*sizeof(RrPixel32))); + return pic; +} + + +/*! Destroy an RrImagePic. + This frees the RrImagePic object and everything inside it. +*/ static void RrImagePicFree(RrImagePic *pic) { if (pic) { g_free(pic->data); - g_free(pic->name); g_slice_free(RrImagePic, pic); } } -/*! Add a picture to an Image, that is, add another copy of the image at - another size. This may add it to the "originals" list or to the - "resized" list. */ -static void AddPicture(RrImage *self, RrImagePic ***list, gint *len, - RrImagePic *pic) +/************************************************************************ + RrImageSet functions. + + RrImageSets hold a group of pictures, each of which represent the same logical + image, but are physically different sizes. + At any time, it may be discovered that two different RrImageSets are actually + holding the same logical image. At that time, they would be merged. + An RrImageSet holds both original images which come from an outside source, + and resized images, which are generated when requests for a specific size are + made, and kept around in case they are request again. There is a maximum + number of resized images that an RrImageSet will keep around, however. + + Each RrImage points to a single RrImageSet, which keeps track of which + RrImages point to it. If two RrImageSets are merged, then the RrImages which + pointed to the two RrImageSets will all point at the resulting merged set. +**************************************************************************/ + + +/*! Free an RrImageSet and the stuff inside it. + This should only occur when there are no more RrImages pointing to the set. +*/ +static void RrImageSetFree(RrImageSet *self) { + GSList *it; gint i; + if (self) { + g_assert(self->images == NULL); + + /* remove all names associated with this RrImageSet */ + for (it = self->names; it; it = g_slist_next(it)) { + g_hash_table_remove(self->cache->name_table, it->data); + g_free(it->data); + } + g_slist_free(self->names); + + /* destroy the RrImagePic objects stored in the RrImageSet. they will + be keys in the cache to RrImageSet objects, so remove them from + the cache's pic_table as well. */ + for (i = 0; i < self->n_original; ++i) { + g_hash_table_remove(self->cache->pic_table, self->original[i]); + RrImagePicFree(self->original[i]); + } + g_free(self->original); + for (i = 0; i < self->n_resized; ++i) { + g_hash_table_remove(self->cache->pic_table, self->resized[i]); + RrImagePicFree(self->resized[i]); + } + g_free(self->resized); + + g_slice_free(RrImageSet, self); + } +} + +/*! Remove a picture from an RrImageSet as a given position. + @param set The RrImageSet to remove the picture from. + @param i The index of the picture in the RrImageSet in the list of + originals (if @original is TRUE), or in the list of resized pictures (if + @original is FALSE). + @param original TRUE if the picture is an original, FALSE if it is a resized + version of another picture in the RrImageSet. + */ +static void RrImageSetRemovePictureAt(RrImageSet *self, gint i, + gboolean original) +{ + RrImagePic ***list; + gint *len; + + if (original) { + list = &self->original; + len = &self->n_original; + } + else { + list = &self->resized; + len = &self->n_resized; + } + + g_assert(i >= 0 && i < *len); + + /* remove the picture data as a key in the cache */ + g_hash_table_remove(self->cache->pic_table, (*list)[i]); + + /* free the picture being removed */ + RrImagePicFree((*list)[i]); + + /* copy the elements after the removed one in the array forward one space + and shrink the array down one size */ + for (i = i+1; i < *len; ++i) + (*list)[i-1] = (*list)[i]; + --(*len); + *list = g_renew(RrImagePic*, *list, *len); +} + +/*! Add an RrImagePic to an RrImageSet. + The RrImagePic should _not_ exist in the image cache already. + Pictures are added to the front of the list, to maintain the ordering of + newest to oldest. +*/ +static void RrImageSetAddPicture(RrImageSet *self, RrImagePic *pic, + gboolean original) +{ + gint i; + RrImagePic ***list; + gint *len; + g_assert(pic->width > 0 && pic->height > 0); + g_assert(g_hash_table_lookup(self->cache->pic_table, pic) == NULL); + + /* choose which list in the RrImageSet to add the new picture to. */ + if (original) { + /* remove the resized picture of the same size if one exists */ + for (i = 0; i < self->n_resized; ++i) + if (self->resized[i]->width == pic->width || + self->resized[i]->height == pic->height) + { + RrImageSetRemovePictureAt(self, i, FALSE); + break; + } - if (pic->name) - g_assert(!g_hash_table_lookup(self->cache->name_table, pic->name)); - else - g_assert(!g_hash_table_lookup(self->cache->pic_table, pic)); + list = &self->original; + len = &self->n_original; + } + else { + list = &self->resized; + len = &self->n_resized; + } - /* grow the list */ + /* grow the list by one spot, shift everything down one, and insert the new + picture at the front of the list */ *list = g_renew(RrImagePic*, *list, ++*len); - - /* move everything else down one */ for (i = *len-1; i > 0; --i) (*list)[i] = (*list)[i-1]; - - /* set the new picture up at the front of the list */ (*list)[0] = pic; - /* add the name or the picture as a key to point to this image in the - cache */ - if (pic->name) - g_hash_table_insert(self->cache->name_table, pic->name, self); - else - g_hash_table_insert(self->cache->pic_table, (*list)[0], self); + /* add the picture as a key to point to this image in the cache */ + g_hash_table_insert(self->cache->pic_table, (*list)[0], self); /* #ifdef DEBUG @@ -96,42 +232,306 @@ static void AddPicture(RrImage *self, RrImagePic ***list, gint *len, */ } -/*! Remove a picture from an Image. This may remove it from the "originals" - list or the "resized" list. */ -static void RemovePicture(RrImage *self, RrImagePic ***list, - gint i, gint *len) +/*! Merges two image sets, destroying one, and returning the other. */ +RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) +{ + gint a_i, b_i, merged_i; + RrImagePic **original, **resized; + gint n_original, n_resized, tmp; + GSList *it; + + const gint max_resized = a->cache->max_resized_saved; + + if (!a) + return b; + if (!b) + return a; + if (a == b) + return b; + + /* the original and resized picture lists in an RrImageSet are kept ordered + as newest to oldest. we don't have timestamps for them, so we cannot + preserve this in the merged RrImageSet exactly. a decent approximation, + i think, is to add them in alternating order (one from a, one from b, + repeat). this way, the newest from each will be near the front at + least, and in the resized list, when we drop an old picture, we will + not always only drop from a or b only, but from each of them equally (or + from whichever has more resized pictures. + */ + + g_assert(b->cache == a->cache); + + a_i = b_i = merged_i = 0; + n_original = a->n_original + b->n_original; + original = g_new(RrImagePic*, n_original); + while (merged_i < n_original) { + if (a_i < a->n_original) + original[merged_i++] = a->original[a_i++]; + if (b_i < b->n_original) + original[merged_i++] = b->original[b_i++]; + } + + a_i = b_i = merged_i = 0; + n_resized = MIN(max_resized, a->n_resized + b->n_resized); + resized = g_new(RrImagePic*, n_resized); + while (merged_i < n_resized) { + if (a_i < a->n_resized) + resized[merged_i++] = a->resized[a_i++]; + if (b_i < b->n_resized && merged_i < n_resized) + resized[merged_i++] = b->resized[b_i++]; + } + + /* if there are any RrImagePic objects left over in a->resized or + b->resized, they need to be disposed of, and removed from the cache. + + updates the size of the list, as we want to remember which pointers + were merged from which list (and don't want to remember the ones we + did not merge and have freed). + */ + tmp = a_i; + for (; a_i < a->n_resized; ++a_i) { + g_hash_table_remove(a->cache->pic_table, a->resized[a_i]); + RrImagePicFree(a->resized[a_i]); + } + a->n_resized = tmp; + + tmp = b_i; + for (; b_i < b->n_resized; ++b_i) { + g_hash_table_remove(a->cache->pic_table, b->resized[b_i]); + RrImagePicFree(b->resized[b_i]); + } + b->n_resized = tmp; + + /* we will use the a object as the merge destination, so things in b will + be moving. + + the cache's name_table will point to b for all the names in b->names, + so these need to be updated to point at a instead. + also, the cache's pic_table will point to b for all the pictures in b, + so these need to be updated to point at a as well. + + any RrImage objects that were using b should now use a instead. + + the names and images will be all moved into a, and the merged picture + lists will be placed in a. the pictures in a and b are moved to new + arrays, so the arrays in a and b need to be freed explicitly (the + RrImageSetFree function would free the picture data too which we do not + want here). then b can be freed. + */ + + for (it = b->names; it; it = g_slist_next(it)) + g_hash_table_insert(a->cache->name_table, it->data, a); + for (b_i = 0; b_i < b->n_original; ++b_i) + g_hash_table_insert(a->cache->pic_table, b->original[b_i], a); + for (b_i = 0; b_i < b->n_resized; ++b_i) + g_hash_table_insert(a->cache->pic_table, b->resized[b_i], a); + + for (it = b->images; it; it = g_slist_next(it)) + ((RrImage*)it->data)->set = a; + + a->images = g_slist_concat(a->images, b->images); + b->images = NULL; + a->names = g_slist_concat(a->names, b->names); + b->names = NULL; + + a->n_original = a->n_resized = 0; + g_free(a->original); + g_free(a->resized); + a->original = a->resized = NULL; + b->n_original = b->n_resized = 0; + g_free(b->original); + g_free(b->resized); + b->original = b->resized = NULL; + + a->n_original = n_original; + a->original = original; + a->n_resized = n_resized; + a->resized = resized; + + RrImageSetFree(b); + + return a; +} + +static void RrImageSetAddName(RrImageSet *set, const gchar *name) +{ + gchar *n; + + n = g_strdup(name); + set->names = g_slist_prepend(set->names, n); + + /* add the new name to the hash table */ + g_assert(g_hash_table_lookup(set->cache->name_table, n) == NULL); + g_hash_table_insert(set->cache->name_table, n, set); +} + + +/************************************************************************ + RrImage functions. +**************************************************************************/ + + +void RrImageRef(RrImage *self) { - gint j; + ++self->ref; +} +void RrImageUnref(RrImage *self) +{ + if (self && --self->ref == 0) { + RrImageSet *set; /* #ifdef DEBUG - g_debug("Removing %s picture from the cache:\n " - "Image 0x%lx, w %d h %d Hash %u", - (*list == self->original ? "ORIGINAL" : "RESIZED"), - (gulong)self, (*list)[i]->width, (*list)[i]->height, - RrImagePicHash((*list)[i])); + g_debug("Refcount to 0, removing ALL pictures from the cache:\n " + "Image 0x%lx", (gulong)self); #endif */ + if (self->destroy_func) + self->destroy_func(self, self->destroy_data); - /* remove the name or picture as a key in the cache */ - if ((*list)[i]->name) - g_hash_table_remove(self->cache->name_table, (*list)[i]->name); - else - g_hash_table_remove(self->cache->pic_table, (*list)[i]); + set = self->set; + set->images = g_slist_remove(set->images, self); - /* free the picture */ - RrImagePicFree((*list)[i]); - /* shift everything down one */ - for (j = i; j < *len-1; ++j) - (*list)[j] = (*list)[j+1]; - /* shrink the list */ - *list = g_renew(RrImagePic*, *list, --*len); + /* free the set as well if there are no images pointing to it */ + if (!set->images) + RrImageSetFree(set); + g_slice_free(RrImage, self); + } +} + +/*! Set function that will be called just before RrImage is destroyed. */ +void RrImageSetDestroyFunc(RrImage *self, RrImageDestroyFunc func, + gpointer data) +{ + self->destroy_func = func; + self->destroy_data = data; +} + +void RrImageAddFromData(RrImage *self, RrPixel32 *data, gint w, gint h) +{ + RrImagePic pic, *ppic; + RrImageSet *set; + + g_return_if_fail(self != NULL); + g_return_if_fail(data != NULL); + g_return_if_fail(w > 0 && h > 0); + + RrImagePicInit(&pic, w, h, data); + set = g_hash_table_lookup(self->set->cache->pic_table, &pic); + if (set) + self->set = RrImageSetMergeSets(self->set, set); + else { + ppic = RrImagePicNew(w, h, data); + RrImageSetAddPicture(self->set, ppic, TRUE); + } +} + +RrImage* RrImageNewFromData(RrImageCache *cache, RrPixel32 *data, + gint w, gint h) +{ + RrImagePic pic, *ppic; + RrImage *self; + RrImageSet *set; + + g_return_val_if_fail(cache != NULL, NULL); + g_return_val_if_fail(data != NULL, NULL); + g_return_val_if_fail(w > 0 && h > 0, NULL); + + /* finds a picture in the cache, if it is already in there, and use the + RrImageSet the picture lives in. */ + RrImagePicInit(&pic, w, h, data); + set = g_hash_table_lookup(cache->pic_table, &pic); + if (set) { + self = set->images->data; /* just grab any RrImage from the list */ + RrImageRef(self); + return self; + } + + /* the image does not exist in any RrImageSet in the cache, so make + a new RrImageSet, and a new RrImage that points to it, and place the + new image inside the new RrImageSet */ + + self = g_slice_new0(RrImage); + self->ref = 1; + self->set = g_slice_new0(RrImageSet); + self->set->cache = cache; + self->set->images = g_slist_append(self->set->images, self); + + ppic = RrImagePicNew(w, h, data); + RrImageSetAddPicture(self->set, ppic, TRUE); + + return self; +} + +RrImage* RrImageNewFromName(RrImageCache *cache, const gchar *name) +{ +#ifndef USE_IMLIB2 + return NULL; +#else + RrImage *self; + RrImageSet *set; + Imlib_Image img; + gint w, h; + RrPixel32 *data; + gchar *path; + + g_return_val_if_fail(cache != NULL, NULL); + g_return_val_if_fail(name != NULL, NULL); + + set = g_hash_table_lookup(cache->name_table, name); + if (set) { + self = set->images->data; + RrImageRef(self); + return self; + } + + /* XXX find the path via freedesktop icon spec (use obt) ! */ + path = g_strdup(name); + + if (!(img = imlib_load_image(path))) + g_message("Cannot load image \"%s\" from file \"%s\"", name, path); + g_free(path); + + if (!img) + return NULL; + + /* Get data and dimensions of the image. + + WARNING: This stuff is NOT threadsafe !! + */ + imlib_context_set_image(img); + data = imlib_image_get_data_for_reading_only(); + w = imlib_image_get_width(); + h = imlib_image_get_height(); + + /* get an RrImage that contains an RrImageSet with this picture in it. + the RrImage might be new, or reused if the picture was already in the + cache. + + either way, we get back an RrImageSet (via the RrImage), and we must add + the name to that RrImageSet. because of the check above, we know that + there is no RrImageSet in the cache which already has the given name + asosciated with it. + */ + + self = RrImageNewFromData(cache, data, w, h); + RrImageSetAddName(self->set, name); + + imlib_free_image(); + return self; +#endif } +/************************************************************************ + Image drawing and resizing operations. +**************************************************************************/ + /*! Given a picture in RGBA format, of a specified size, resize it to the new requested size (but keep its aspect ratio). If the image does not need to be resized (it is already the right size) then this returns NULL. Otherwise it returns a newly allocated RrImagePic with the resized picture inside it + @return Returns a newly allocated RrImagePic object with a new version of the + image in the requested size (keeping aspect ratio). */ static RrImagePic* ResizeImage(RrPixel32 *src, gulong srcW, gulong srcH, @@ -144,11 +544,10 @@ static RrImagePic* ResizeImage(RrPixel32 *src, gulong ratioX, ratioY; gulong aspectW, aspectH; - /* XXX should these variables be ensured to not be zero in the callers? */ - srcW = srcW ? srcW : 1; - srcH = srcH ? srcH : 1; - dstW = dstW ? dstW : 1; - dstH = dstH ? dstH : 1; + g_assert(srcW > 0); + g_assert(srcH > 0); + g_assert(dstW > 0); + g_assert(dstH > 0); /* keep the aspect ratio */ aspectW = dstW; @@ -236,7 +635,7 @@ static RrImagePic* ResizeImage(RrPixel32 *src, } pic = g_slice_new(RrImagePic); - RrImagePicInit(pic, NULL, dstW, dstH, dststart); + RrImagePicInit(pic, dstW, dstH, dststart); return pic; } @@ -328,142 +727,6 @@ void RrImageDrawRGBA(RrPixel32 *target, RrTextureRGBA *rgba, rgba->alpha, area); } -/*! Create a new RrImage, which is linked to an image cache */ -RrImage* RrImageNew(RrImageCache *cache) -{ - RrImage *self; - - g_assert(cache != NULL); - - self = g_slice_new0(RrImage); - self->ref = 1; - self->cache = cache; - return self; -} - -/*! Set function that will be called just before RrImage is destroyed. */ -void RrImageSetDestroyFunc(RrImage *image, RrImageDestroyFunc func, - gpointer data) -{ - image->destroy_func = func; - image->destroy_data = data; -} - -void RrImageRef(RrImage *self) -{ - ++self->ref; -} - -void RrImageUnref(RrImage *self) -{ - if (self && --self->ref == 0) { -/* -#ifdef DEBUG - g_debug("Refcount to 0, removing ALL pictures from the cache:\n " - "Image 0x%lx", (gulong)self); -#endif -*/ - if (self->destroy_func) - self->destroy_func(self, self->destroy_data); - while (self->n_original > 0) - RemovePicture(self, &self->original, 0, &self->n_original); - while (self->n_resized > 0) - RemovePicture(self, &self->resized, 0, &self->n_resized); - g_slice_free(RrImage, self); - } -} - -static void AddPictureFromData(RrImage *self, const char *name, - const RrPixel32 *data, gint w, gint h) -{ - gint i; - RrImagePic *pic; - - /* make sure we don't already have this size.. */ - for (i = 0; i < self->n_original; ++i) - if (self->original[i]->width == w && self->original[i]->height == h) { -/* -#ifdef DEBUG - g_debug("Found duplicate ORIGINAL image:\n " - "Image 0x%lx, w %d h %d", (gulong)self, w, h); -#endif -*/ - return; - } - - /* remove any resized pictures of this same size */ - for (i = 0; i < self->n_resized; ++i) - if (self->resized[i]->width == w || self->resized[i]->height == h) { - RemovePicture(self, &self->resized, i, &self->n_resized); - break; - } - - /* add the new picture */ - pic = g_slice_new(RrImagePic); - RrImagePicInit(pic, name, w, h, g_memdup(data, w*h*sizeof(RrPixel32))); - AddPicture(self, &self->original, &self->n_original, pic); -} - -gboolean RrImageAddPictureName(RrImage *self, const gchar *name) -{ -#ifdef USE_IMLIB2 - Imlib_Image img; - gint w, h; - RrPixel32 *data; - gchar *path; - - /* XXX find the path via freedesktop icon spec (use obt) ! */ - path = g_strdup(name); - - if (!(img = imlib_load_image(path))) - g_message("Cannot load image \"%s\" from file \"%s\"", name, path); - g_free(path); - - if (!img) - return FALSE; /* failed to load it */ - - /* Get data and dimensions of the image. - - WARNING: This stuff is NOT threadsafe !! - */ - imlib_context_set_image(img); - data = imlib_image_get_data_for_reading_only(); - w = imlib_image_get_width(); - h = imlib_image_get_height(); - - /* add it to the RrImage, and set its name */ - AddPictureFromData(self, name, data, w, h); - - imlib_free_image(); - return TRUE; -#else - return FALSE; -#endif -} - -/*! Add a new picture with the given RGBA pixel data and dimensions into the - RrImage. This adds an "original" picture to the image. -*/ -void RrImageAddPicture(RrImage *self, const RrPixel32 *data, gint w, gint h) -{ - AddPictureFromData(self, NULL, data, w, h); -} - -/*! Remove the picture from the RrImage which has the given dimensions. This - removes an "original" picture from the image. -*/ -void RrImageRemovePicture(RrImage *self, gint w, gint h) -{ - gint i; - - /* remove any resized pictures of this same size */ - for (i = 0; i < self->n_original; ++i) - if (self->original[i]->width == w && self->original[i]->height == h) { - RemovePicture(self, &self->original, i, &self->n_original); - break; - } -} - /*! Draw an RrImage texture into a target pixel buffer. If the RrImage does not contain a picture of the appropriate size, then one of its "original" pictures will be resized and used (and stored in the RrImage as a "resized" @@ -475,65 +738,68 @@ void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, { gint i, min_diff, min_i, min_aspect_diff, min_aspect_i; RrImage *self; + RrImageSet *set; RrImagePic *pic; gboolean free_pic; self = img->image; + set = self->set; pic = NULL; free_pic = FALSE; /* is there an original of this size? (only the larger of w or h has to be right cuz we maintain aspect ratios) */ - for (i = 0; i < self->n_original; ++i) - if ((self->original[i]->width >= self->original[i]->height && - self->original[i]->width == area->width) || - (self->original[i]->width <= self->original[i]->height && - self->original[i]->height == area->height)) + for (i = 0; i < set->n_original; ++i) + if ((set->original[i]->width >= set->original[i]->height && + set->original[i]->width == area->width) || + (set->original[i]->width <= set->original[i]->height && + set->original[i]->height == area->height)) { - pic = self->original[i]; + pic = set->original[i]; break; } /* is there a resize of this size? */ - for (i = 0; i < self->n_resized; ++i) - if ((self->resized[i]->width >= self->resized[i]->height && - self->resized[i]->width == area->width) || - (self->resized[i]->width <= self->resized[i]->height && - self->resized[i]->height == area->height)) + for (i = 0; i < set->n_resized; ++i) + if ((set->resized[i]->width >= set->resized[i]->height && + set->resized[i]->width == area->width) || + (set->resized[i]->width <= set->resized[i]->height && + set->resized[i]->height == area->height)) { gint j; RrImagePic *saved; /* save the selected one */ - saved = self->resized[i]; + saved = set->resized[i]; /* shift all the others down */ for (j = i; j > 0; --j) - self->resized[j] = self->resized[j-1]; + set->resized[j] = set->resized[j-1]; /* and move the selected one to the top of the list */ - self->resized[0] = saved; + set->resized[0] = saved; - pic = self->resized[0]; + pic = set->resized[0]; break; } if (!pic) { gdouble aspect; + RrImageSet *cache_set; /* find an original with a close size */ min_diff = min_aspect_diff = -1; min_i = min_aspect_i = 0; aspect = ((gdouble)area->width) / area->height; - for (i = 0; i < self->n_original; ++i) { + for (i = 0; i < set->n_original; ++i) { gint diff; gint wdiff, hdiff; gdouble myasp; /* our size difference metric.. */ - wdiff = self->original[i]->width - area->width; + wdiff = set->original[i]->width - area->width; if (wdiff < 0) wdiff *= 2; /* prefer scaling down than up */ - hdiff = self->original[i]->height - area->height; + hdiff = set->original[i]->height - area->height; if (hdiff < 0) hdiff *= 2; /* prefer scaling down than up */ diff = (wdiff * wdiff) + (hdiff * hdiff); @@ -544,8 +810,8 @@ void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, } /* and also find the smallest difference with the same aspect ratio (and prefer this one) */ - myasp = ((gdouble)self->original[i]->width) / - self->original[i]->height; + myasp = ((gdouble)set->original[i]->width) / + set->original[i]->height; if (ABS(aspect - myasp) < 0.0000001 && (min_aspect_diff < 0 || diff < min_aspect_diff)) { @@ -559,24 +825,39 @@ void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, min_i = min_aspect_i; /* resize the original to the given area */ - pic = ResizeImage(self->original[min_i]->data, - self->original[min_i]->width, - self->original[min_i]->height, + pic = ResizeImage(set->original[min_i]->data, + set->original[min_i]->width, + set->original[min_i]->height, area->width, area->height); - /* add the resized image to the image, as the first in the resized - list */ - if (self->n_resized >= self->cache->max_resized_saved) - /* remove the last one (last used one) */ - RemovePicture(self, &self->resized, self->n_resized - 1, - &self->n_resized); - if (self->cache->max_resized_saved) - /* add it to the top of the resized list */ - AddPicture(self, &self->resized, &self->n_resized, pic); - else - free_pic = TRUE; /* don't leak mem! */ + /* is it already in the cache ? */ + cache_set = g_hash_table_lookup(set->cache->pic_table, pic); + if (cache_set) { + /* merge this set with the one found in the cache - they are + apparently the same image ! then next time we won't have to do + this resizing, we will use the cache_set's pic instead. */ + set = RrImageSetMergeSets(set, cache_set); + free_pic = TRUE; + } + else { + /* add the resized image to the image, as the first in the resized + list */ + while (set->n_resized >= set->cache->max_resized_saved) + /* remove the last one (last used one) to make space for + adding our resized picture */ + RrImageSetRemovePictureAt(set, set->n_resized-1, FALSE); + if (set->cache->max_resized_saved) + /* add it to the resized list */ + RrImageSetAddPicture(set, pic, FALSE); + else + free_pic = TRUE; /* don't leak mem! */ + } } + /* The RrImageSet may have changed if we merged it with another, so the + RrImage object needs to be updated to use the new merged RrImageSet. */ + self->set = set; + g_assert(pic != NULL); DrawRGBA(target, target_w, target_h, diff --git a/obrender/image.h b/obrender/image.h index 6e4a50e..28f29c2 100644 --- a/obrender/image.h +++ b/obrender/image.h @@ -22,10 +22,6 @@ #include "render.h" #include "geom.h" -/*! Initialize an RrImagePicture to the specified dimensions and pixel data */ -void RrImagePicInit(RrImagePic *pic, const gchar *path, - gint w, gint h, RrPixel32 *data); - void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, gint target_w, gint target_h, RrRect *area); diff --git a/obrender/imagecache.c b/obrender/imagecache.c index ad1183e..909d874 100644 --- a/obrender/imagecache.c +++ b/obrender/imagecache.c @@ -58,21 +58,6 @@ void RrImageCacheUnref(RrImageCache *self) } } -RrImage* RrImageCacheFindName(RrImageCache *self, const gchar *name) -{ - return g_hash_table_lookup(self->name_table, name); -} - -/*! Finds an image in the cache, if it is already in there */ -RrImage* RrImageCacheFind(RrImageCache *self, - RrPixel32 *data, gint w, gint h) -{ - RrImagePic pic; - - RrImagePicInit(&pic, NULL, w, h, data); - return g_hash_table_lookup(self->pic_table, &pic); -} - #define hashsize(n) ((RrPixel32)1<<(n)) #define hashmask(n) (hashsize(n)-1) #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) diff --git a/obrender/imagecache.h b/obrender/imagecache.h index 9baf34b..f9f5e4d 100644 --- a/obrender/imagecache.h +++ b/obrender/imagecache.h @@ -45,13 +45,13 @@ struct _RrImageCache { */ gint max_resized_saved; - /*! A hash table of images in the cache that don't have a file name + /*! A hash table of image sets in the cache that don't have a file name attached to them, with their key being a hash of the contents of the image. */ GHashTable *pic_table; - /*! Used to find out if an image file has already been loaded. - Provides a quick file_name -> RrImage lookup. */ + /*! Used to find out if an image file has already been loaded into an + image set. Provides a quick file_name -> RrImageSet lookup. */ GHashTable *name_table; }; diff --git a/obrender/render.h b/obrender/render.h index d8d47c9..a5d6500 100644 --- a/obrender/render.h +++ b/obrender/render.h @@ -44,11 +44,12 @@ typedef struct _RrPixmapMask RrPixmapMask; typedef struct _RrInstance RrInstance; typedef struct _RrColor RrColor; typedef struct _RrImage RrImage; +typedef struct _RrImageSet RrImageSet; typedef struct _RrImagePic RrImagePic; typedef struct _RrImageCache RrImageCache; typedef struct _RrButton RrButton; -typedef guint32 RrPixel32; +typedef guint32 RrPixel32; /* RGBA format */ typedef guint16 RrPixel16; typedef guchar RrPixel8; @@ -239,24 +240,43 @@ struct _RrImagePic { /* The sum of all the pixels. This is used to compare pictures if their hashes match. */ gint sum; - /* The name of the image. This is used to determine - if the named image already is loaded. May be NULL if the image - was not loaded from disk. */ - gchar *name; }; typedef void (*RrImageDestroyFunc)(RrImage *image, gpointer data); -/*! An RrImage is a sort of meta-image. It can contain multiple versions of - an image at different sizes, which may or may not be completely different - pictures */ +/*! An RrImage refers to a RrImageSet. If multiple RrImageSets end up + holding the same image data, they will be marged and the RrImages that + point to them would be updated. */ struct _RrImage { gint ref; + RrImageSet *set; + + /* This function (if not NULL) will be called just before destroying + RrImage. */ + RrImageDestroyFunc destroy_func; + gpointer destroy_data; +}; + +/*! An RrImage is a sort of meta-image. It can contain multiple versions + of an image at different sizes, which may or may not be completely different + pictures */ +struct _RrImageSet +{ RrImageCache *cache; + /*! If a picture is loaded by a name, then it has a name attached to it. + This contains a list of strings, containing all names that have ever + been associated with the RrImageSet. A name in the RrImageCache can + only be associated with a single RrImageSet. */ + GSList *names; + + /*! RrImages that point at this RrImageSet. If this is empty, then there + are no images using the set and it can be freed. */ + GSList *images; + /*! An array of "originals", that is of RrPictures that have been added to the image in various sizes, and that have not been resized. These - are explicitly added to the RrImage. */ + are explicitly added to the RrImageSet. */ RrImagePic **original; gint n_original; /*! An array of "resized" pictures. When an "original" RrPicture @@ -265,11 +285,6 @@ struct _RrImage { RrImage. */ RrImagePic **resized; gint n_resized; - - /* This function (if not NULL) will be called just before destroying - RrImage. */ - RrImageDestroyFunc destroy_func; - gpointer destroy_data; }; struct _RrButton { @@ -406,23 +421,41 @@ RrImageCache* RrImageCacheNew(gint max_resized_saved); void RrImageCacheRef(RrImageCache *self); void RrImageCacheUnref(RrImageCache *self); -/*! Finds an image in the cache, if it is already in there */ -RrImage* RrImageCacheFind(RrImageCache *self, - RrPixel32 *data, gint w, gint h); -/*! Finds an image in the cache, by searching for the name of the image */ -RrImage* RrImageCacheFindName(RrImageCache *self, - const gchar *name); - -RrImage* RrImageNew(RrImageCache *cache); -void RrImageRef(RrImage *im); -void RrImageUnref(RrImage *im); - -void RrImageAddPicture(RrImage *im, const RrPixel32 *data, gint w, gint h); -/*! Adds a picture by name, from a file on disk. - @name Can be a full path to an image, or it can be a name as per the - freedesktop.org icon spec. */ -gboolean RrImageAddPictureName(RrImage *im, const gchar *name); -void RrImageRemovePicture(RrImage *im, gint w, gint h); +/*! Create a new image, or return one from the cache that matches. + @param cache The image cache. + @param old The current RrImage, which the new image should be added to. + Use this if loading a different sized version of the same image. + The returned RrImage should replace the one passed in as old. + Pass NULL here if adding an image which is (or may be) entirely new. + @param name The name of the icon to be loaded off disk, or used in the cache + @return Returns NULL if unable to load an image by the name and it is not in + the cache already +*/ +RrImage* RrImageNewFromName(RrImageCache *cache, const gchar *name); + +/*! Create a new image, or return one from the cache that matches. + @param cache The image cache. + @param data The image data in RGBA32 format. There should be @w * @h many + values in the data array. + @param w The width of the image data. + @param h The height of the image data. + @return Returns NULL if unable to load an image by the name and it is not in + the cache already +*/ +RrImage* RrImageNewFromData(RrImageCache *cache, RrPixel32 *data, + gint w, gint h); + +/*! Add a new size of a picture to an image. + If a picture has multiple versions of different sizes (example 16x16, 32x32 + and so on), they should all be under the same RrImage. This adds a new + size to an existing RrImage, associating the newly sized picture with the + others in the RrImage - classifying them as being the same logical image at a + different dimention. +*/ +void RrImageAddFromData(RrImage *image, RrPixel32 *data, gint w, gint h); + +void RrImageRef(RrImage *im); +void RrImageUnref(RrImage *im); G_END_DECLS diff --git a/obt/bsearch.h b/obt/bsearch.h index 65e4268..9613c51 100644 --- a/obt/bsearch.h +++ b/obt/bsearch.h @@ -40,8 +40,9 @@ G_BEGIN_DECLS if ((val) == (ar)[out_BSEARCH]) { \ break; \ } \ - else if ((val) < (ar)[out_BSEARCH]) \ + else if ((val) < (ar)[out_BSEARCH] && out_BSEARCH > 0) { \ r_BSEARCH = out_BSEARCH-1; /* search to the left side */ \ + } \ else \ l_BSEARCH = out_BSEARCH+1; /* search to the left side */ \ } \ diff --git a/obt/keyboard.c b/obt/keyboard.c index db327a6..8bfdd39 100644 --- a/obt/keyboard.c +++ b/obt/keyboard.c @@ -439,7 +439,8 @@ void obt_keyboard_context_unref(ObtIC *ic) { if (--ic->ref < 1) { xic_all = g_slist_remove(xic_all, ic); - XDestroyIC(ic->xic); + if (ic->xic) + XDestroyIC(ic->xic); g_slice_free(ObtIC, ic); } } diff --git a/obt/prop.c b/obt/prop.c index bef9c99..d5af6a0 100644 --- a/obt/prop.c +++ b/obt/prop.c @@ -45,7 +45,8 @@ void obt_prop_startup(void) CREATE(PIXMAP); CREATE(ATOM); CREATE(STRING); - CREATE_NAME(UTF8, "UTF8_STRING"); + CREATE(COMPOUND_TEXT); + CREATE(UTF8_STRING); CREATE(MANAGER); @@ -283,128 +284,236 @@ static gboolean get_all(Window win, Atom prop, Atom type, gint size, return ret; } -static gboolean get_stringlist(Window win, Atom prop, gchar ***list, gint *nstr) +/*! Get a text property from a window, and fill out the XTextProperty with it. + @param win The window to read the property from. + @param prop The atom of the property to read off the window. + @param tprop The XTextProperty to fill out. + @param type 0 to get text of any type, or a value from + ObtPropTextType to restrict the value to a specific type. + @return TRUE if the text was read and validated against the @type, and FALSE + otherwise. +*/ +static gboolean get_text_property(Window win, Atom prop, + XTextProperty *tprop, ObtPropTextType type) { - XTextProperty tprop; - gboolean ret = FALSE; - - if (XGetTextProperty(obt_display, win, &tprop, prop) && tprop.nitems) { - if (XTextPropertyToStringList(&tprop, list, nstr)) - ret = TRUE; - XFree(tprop.value); + if (!(XGetTextProperty(obt_display, win, tprop, prop) && tprop->nitems)) + return FALSE; + if (!type) + return TRUE; /* no type checking */ + switch (type) { + case OBT_PROP_TEXT_STRING: + case OBT_PROP_TEXT_STRING_XPCS: + case OBT_PROP_TEXT_STRING_NO_CC: + return tprop->encoding == OBT_PROP_ATOM(STRING); + case OBT_PROP_TEXT_COMPOUND_TEXT: + return tprop->encoding == OBT_PROP_ATOM(COMPOUND_TEXT); + case OBT_PROP_TEXT_UTF8_STRING: + return tprop->encoding == OBT_PROP_ATOM(UTF8_STRING); + default: + g_assert_not_reached(); } - return ret; -} - -gboolean obt_prop_get32(Window win, Atom prop, Atom type, guint32 *ret) -{ - return get_prealloc(win, prop, type, 32, (guchar*)ret, 1); } -gboolean obt_prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret, - guint *nret) +/*! Returns one or more UTF-8 encoded strings from the text property. + @param tprop The XTextProperty to convert into UTF-8 string(s). + @param type The type which specifies the format that the text must meet, or + 0 to allow any valid characters that can be converted to UTF-8 through. + @param max The maximum number of strings to return. -1 to return them all. + @return If max is 1, then this returns a gchar* with the single string. + Otherwise, this returns a gchar** of no more than max strings (or all + strings read, if max is negative). If an error occurs, NULL is returned. + */ +static void* convert_text_property(XTextProperty *tprop, + ObtPropTextType type, gint max) { - return get_all(win, prop, type, 32, (guchar**)ret, nret); -} - -gboolean obt_prop_get_string_locale(Window win, Atom prop, gchar **ret) -{ - gchar **list; - gint nstr; - gchar *s; - - if (get_stringlist(win, prop, &list, &nstr) && nstr) { - s = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL); - XFreeStringList(list); - if (s) { - *ret = s; - return TRUE; + enum { + LATIN1, + UTF8, + LOCALE + } encoding; + const gboolean return_single = (max == 1); + gboolean ok = FALSE; + gchar **strlist = NULL; + gchar *single[1] = { NULL }; + gchar **retlist = single; /* single is used when max == 1 */ + gint i, n_strs; + + /* Read each string in the text property and store a pointer to it in + retlist. These pointers point into the X data structures directly. + + Then we will convert them to UTF-8, and replace the retlist pointer with + a new one. + */ + if (tprop->encoding == OBT_PROP_ATOM(COMPOUND_TEXT)) + { + encoding = LOCALE; + ok = (XmbTextPropertyToTextList( + obt_display, tprop, &strlist, &n_strs) == Success); + if (ok) { + if (max >= 0) + n_strs = MIN(max, n_strs); + if (!return_single) + retlist = g_new0(gchar*, n_strs+1); + if (retlist) + for (i = 0; i < n_strs; ++i) + retlist[i] = strlist[i]; } } - return FALSE; -} - -gboolean obt_prop_get_strings_locale(Window win, Atom prop, gchar ***ret) -{ - GSList *strs = NULL, *it; - gchar *raw, *p; - guint num, i, count = 0; - - if (get_all(win, prop, OBT_PROP_ATOM(STRING), 8, - (guchar**)&raw, &num)) + else if (tprop->encoding == OBT_PROP_ATOM(UTF8_STRING) || + tprop->encoding == OBT_PROP_ATOM(STRING)) { - p = raw; - while (p < raw + num) { - ++count; - strs = g_slist_append(strs, p); + gchar *p; /* iterator */ + + if (tprop->encoding == OBT_PROP_ATOM(STRING)) + encoding = LATIN1; + else + encoding = UTF8; + ok = TRUE; + + /* First, count the number of strings. Then make a structure for them + and copy pointers to them into it. */ + p = (gchar*)tprop->value; + n_strs = 0; + while (p < (gchar*)tprop->value + tprop->nitems) { p += strlen(p) + 1; /* next string */ + ++n_strs; } - *ret = g_new0(gchar*, count + 1); - (*ret)[count] = NULL; /* null terminated list */ + if (max >= 0) + n_strs = MIN(max, n_strs); + if (!return_single) + retlist = g_new0(gchar*, n_strs+1); + if (retlist) { + p = (gchar*)tprop->value; + for (i = 0; i < n_strs; ++i) { + retlist[i] = p; + p += strlen(p) + 1; /* next string */ + } + } + } + + if (!(ok && retlist)) { + if (strlist) XFreeStringList(strlist); + return NULL; + } + + /* convert each element in retlist to UTF-8, and replace it. */ + for (i = 0; i < n_strs; ++i) { + if (encoding == UTF8) { + const gchar *end; /* the first byte past the valid data */ - for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) { - (*ret)[i] = g_locale_to_utf8(it->data, -1, NULL, NULL, NULL); - /* make sure translation did not fail */ - if (!(*ret)[i]) - (*ret)[i] = g_strdup(""); + g_utf8_validate(retlist[i], -1, &end); + retlist[i] = g_strndup(retlist[i], end-retlist[i]); + } + else if (encoding == LOCALE) { + gsize nvalid; /* the number of valid bytes at the front of the + string */ + gchar *utf; /* the string converted into utf8 */ + + utf = g_locale_to_utf8(retlist[i], -1, &nvalid, NULL, NULL); + if (!utf) + utf = g_locale_to_utf8(retlist[i], nvalid, NULL, NULL, NULL); + g_assert(utf); + retlist[i] = utf; + } + else { /* encoding == LATIN1 */ + gsize nvalid; /* the number of valid bytes at the front of the + string */ + gchar *utf; /* the string converted into utf8 */ + gchar *p; /* iterator */ + + /* look for invalid characters */ + for (p = retlist[i], nvalid = 0; *p; ++p, ++nvalid) { + /* The only valid control characters are TAB(HT)=9 and + NEWLINE(LF)=10. + This is defined in ICCCM section 2: + http://tronche.com/gui/x/icccm/sec-2.html. + See a definition of the latin1 codepage here: + http://en.wikipedia.org/wiki/ISO/IEC_8859-1. + The above page includes control characters in the table, + which we must explicitly exclude, as the g_convert function + will happily take them. + */ + const register guchar c = (guchar)*p; /* unsigned value at p */ + if ((c < 32 && c != 9 && c != 10) || (c >= 127 && c <= 160)) + break; /* found a control character that isn't allowed */ + + if (type == OBT_PROP_TEXT_STRING_NO_CC && c < 32) + break; /* absolutely no control characters are allowed */ + + if (type == OBT_PROP_TEXT_STRING_XPCS) { + const gboolean valid = ( + (c >= 32 && c < 128) || c == 9 || c == 10); + if (!valid) + break; /* strict whitelisting for XPCS */ + } + } + /* look for invalid latin1 characters */ + utf = g_convert(retlist[i], nvalid, "utf-8", "iso-8859-1", + &nvalid, NULL, NULL); + if (!utf) + utf = g_convert(retlist[i], nvalid, "utf-8", "iso-8859-1", + NULL, NULL, NULL); + g_assert(utf); + retlist[i] = utf; } - g_free(raw); - g_slist_free(strs); - return TRUE; } - return FALSE; + + if (strlist) XFreeStringList(strlist); + if (return_single) + return retlist[0]; + else + return retlist; } -gboolean obt_prop_get_string_utf8(Window win, Atom prop, gchar **ret) +gboolean obt_prop_get32(Window win, Atom prop, Atom type, guint32 *ret) { - gchar *raw; + return get_prealloc(win, prop, type, 32, (guchar*)ret, 1); +} + +gboolean obt_prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret, + guint *nret) +{ + return get_all(win, prop, type, 32, (guchar**)ret, nret); +} + +gboolean obt_prop_get_text(Window win, Atom prop, ObtPropTextType type, + gchar **ret_string) +{ + XTextProperty tprop; gchar *str; - guint num; + gboolean ret = FALSE; - if (get_all(win, prop, OBT_PROP_ATOM(UTF8), 8, - (guchar**)&raw, &num)) - { - str = g_strndup(raw, num); /* grab the first string from the list */ - g_free(raw); - if (g_utf8_validate(str, -1, NULL)) { - *ret = str; - return TRUE; + if (get_text_property(win, prop, &tprop, type)) { + str = (gchar*)convert_text_property(&tprop, type, 1); + + if (str) { + *ret_string = str; + ret = TRUE; } - g_free(str); } - return FALSE; + XFree(tprop.value); + return ret; } -gboolean obt_prop_get_strings_utf8(Window win, Atom prop, gchar ***ret) +gboolean obt_prop_get_array_text(Window win, Atom prop, + ObtPropTextType type, + gchar ***ret_strings) { - GSList *strs = NULL, *it; - gchar *raw, *p; - guint num, i, count = 0; - - if (get_all(win, prop, OBT_PROP_ATOM(UTF8), 8, - (guchar**)&raw, &num)) - { - p = raw; - while (p < raw + num) { - ++count; - strs = g_slist_append(strs, p); - p += strlen(p) + 1; /* next string */ - } + XTextProperty tprop; + gchar **strs; + gboolean ret = FALSE; - *ret = g_new0(gchar*, count + 1); + if (get_text_property(win, prop, &tprop, type)) { + strs = (gchar**)convert_text_property(&tprop, type, -1); - for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) { - if (g_utf8_validate(it->data, -1, NULL)) - (*ret)[i] = g_strdup(it->data); - else - (*ret)[i] = g_strdup(""); + if (strs) { + *ret_strings = strs; + ret = TRUE; } - g_free(raw); - g_slist_free(strs); - return TRUE; } - return FALSE; + XFree(tprop.value); + return ret; } void obt_prop_set32(Window win, Atom prop, Atom type, gulong val) @@ -420,45 +529,13 @@ void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val, (guchar*)val, num); } -void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val) -{ - gchar const *s[2] = { val, NULL }; - obt_prop_set_strings_locale(win, prop, s); -} - -void obt_prop_set_strings_locale(Window win, Atom prop, - const gchar *const *strs) -{ - gint i, count; - gchar **lstrs; - XTextProperty tprop; - - /* count the strings in strs, and convert them to the locale format */ - for (count = 0; strs[count]; ++count); - lstrs = g_new0(char*, count); - for (i = 0; i < count; ++i) { - lstrs[i] = g_locale_from_utf8(strs[i], -1, NULL, NULL, NULL); - if (!lstrs[i]) { - lstrs[i] = g_strdup(""); /* make it an empty string */ - g_warning("Unable to translate string '%s' from UTF8 to locale " - "format", strs[i]); - } - } - - - XStringListToTextProperty(lstrs, count, &tprop); - XSetTextProperty(obt_display, win, &tprop, prop); - XFree(tprop.value); -} - -void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val) +void obt_prop_set_text(Window win, Atom prop, const gchar *val) { - XChangeProperty(obt_display, win, prop, OBT_PROP_ATOM(UTF8), 8, + XChangeProperty(obt_display, win, prop, OBT_PROP_ATOM(UTF8_STRING), 8, PropModeReplace, (const guchar*)val, strlen(val)); } -void obt_prop_set_strings_utf8(Window win, Atom prop, - const gchar *const *strs) +void obt_prop_set_array_text(Window win, Atom prop, const gchar *const *strs) { GString *str; gchar const *const *s; @@ -468,7 +545,7 @@ void obt_prop_set_strings_utf8(Window win, Atom prop, str = g_string_append(str, *s); str = g_string_append_c(str, '\0'); } - XChangeProperty(obt_display, win, prop, obt_prop_atom(OBT_PROP_UTF8), 8, + XChangeProperty(obt_display, win, prop, OBT_PROP_ATOM(UTF8_STRING), 8, PropModeReplace, (guchar*)str->str, str->len); g_string_free(str, TRUE); } diff --git a/obt/prop.h b/obt/prop.h index 7ccc218..9c4ace3 100644 --- a/obt/prop.h +++ b/obt/prop.h @@ -28,11 +28,13 @@ G_BEGIN_DECLS typedef enum { /* types */ OBT_PROP_CARDINAL, /*!< The atom which represents the Cardinal data type */ - OBT_PROP_WINDOW, /*!< The atom which represents window ids */ - OBT_PROP_PIXMAP, /*!< The atom which represents pixmap ids */ - OBT_PROP_ATOM, /*!< The atom which represents atom values */ - OBT_PROP_STRING, /*!< The atom which represents ascii strings */ - OBT_PROP_UTF8, /*!< The atom which represents utf8-encoded strings */ + OBT_PROP_WINDOW, /*!< The atom which represents window ids */ + OBT_PROP_PIXMAP, /*!< The atom which represents pixmap ids */ + OBT_PROP_ATOM, /*!< The atom which represents atom values */ + OBT_PROP_STRING, /*!< The atom which represents latin1 strings */ + OBT_PROP_COMPOUND_TEXT, /*!< The atom which represents locale-encoded + strings */ + OBT_PROP_UTF8_STRING, /*!< The atom which represents utf8-encoded strings*/ /* selection stuff */ OBT_PROP_MANAGER, @@ -223,23 +225,39 @@ typedef enum { Atom obt_prop_atom(ObtPropAtom a); +typedef enum { + /*! STRING is latin1 encoded. It cannot contain control characters except + for tab and line-feed. */ + OBT_PROP_TEXT_STRING = 1, + /*! STRING text restricted to characters in the X Portable Character + Set, which is a subset of latin1. + http://static.cray-cyber.org/Documentation/NEC_SX_R10_1/G1AE02E/CHAP1.HTML + */ + OBT_PROP_TEXT_STRING_XPCS = 2, + /*! STRING text restricted to not allow any control characters to be + present. */ + OBT_PROP_TEXT_STRING_NO_CC = 3, + /* COMPOUND_TEXT is encoded in the current locale setting. */ + OBT_PROP_TEXT_COMPOUND_TEXT = 4, + /* UTF8_STRING is encoded as utf-8. */ + OBT_PROP_TEXT_UTF8_STRING = 5, +} ObtPropTextType; + gboolean obt_prop_get32(Window win, Atom prop, Atom type, guint32 *ret); gboolean obt_prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret, guint *nret); -gboolean obt_prop_get_string_locale(Window win, Atom prop, gchar **ret); -gboolean obt_prop_get_string_utf8(Window win, Atom prop, gchar **ret); -gboolean obt_prop_get_strings_locale(Window win, Atom prop, gchar ***ret); -gboolean obt_prop_get_strings_utf8(Window win, Atom prop, gchar ***ret); + +gboolean obt_prop_get_text(Window win, Atom prop, ObtPropTextType type, + gchar **ret); +gboolean obt_prop_get_array_text(Window win, Atom prop, + ObtPropTextType type, + gchar ***ret); void obt_prop_set32(Window win, Atom prop, Atom type, gulong val); void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val, guint num); -void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val); -void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val); -void obt_prop_set_strings_locale(Window win, Atom prop, - const gchar *const *strs); -void obt_prop_set_strings_utf8(Window win, Atom prop, - const gchar *const *strs); +void obt_prop_set_text(Window win, Atom prop, const gchar *str); +void obt_prop_set_array_text(Window win, Atom prop, const gchar *const *strs); void obt_prop_erase(Window win, Atom prop); @@ -257,20 +275,33 @@ void obt_prop_message_to(Window to, Window about, Atom messagetype, #define OBT_PROP_GETA32(win, prop, type, ret, nret) \ (obt_prop_get_array32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), \ ret, nret)) -#define OBT_PROP_GETS(win, prop, type, ret) \ - (obt_prop_get_string_##type(win, OBT_PROP_ATOM(prop), ret)) -#define OBT_PROP_GETSS(win, prop, type, ret) \ - (obt_prop_get_strings_##type(win, OBT_PROP_ATOM(prop), ret)) +#define OBT_PROP_GETS(win, prop, ret) \ + (obt_prop_get_text(win, OBT_PROP_ATOM(prop), 0, ret)) +#define OBT_PROP_GETSS(win, prop, ret) \ + (obt_prop_get_array_text(win, OBT_PROP_ATOM(prop), 0, ret)) + +#define OBT_PROP_GETS_TYPE(win, prop, type, ret) \ + (obt_prop_get_text(win, OBT_PROP_ATOM(prop), OBT_PROP_TEXT_##type, ret)) +#define OBT_PROP_GETSS_TYPE(win, prop, type, ret) \ + (obt_prop_get_array_text(win, OBT_PROP_ATOM(prop), \ + OBT_PROP_TEXT_##type, ret)) + +#define OBT_PROP_GETS_UTF8(win, prop, ret) \ + OBT_PROP_GETS_TYPE(win, prop, UTF8_STRING, ret) +#define OBT_PROP_GETSS_UTF8(win, prop, ret) \ + OBT_PROP_GETSS_TYPE(win, prop, UTF8_STRING, ret) +#define OBT_PROP_GETS_XPCS(win, prop, ret) \ + OBT_PROP_GETS_TYPE(win, prop, STRING_XPCS, ret) #define OBT_PROP_SET32(win, prop, type, val) \ (obt_prop_set32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), val)) #define OBT_PROP_SETA32(win, prop, type, val, num) \ (obt_prop_set_array32(win, OBT_PROP_ATOM(prop), OBT_PROP_ATOM(type), \ val, num)) -#define OBT_PROP_SETS(win, prop, type, val) \ - (obt_prop_set_string_##type(win, OBT_PROP_ATOM(prop), val)) -#define OBT_PROP_SETSS(win, prop, type, strs) \ - (obt_prop_set_strings_##type(win, OBT_PROP_ATOM(prop), strs)) +#define OBT_PROP_SETS(win, prop, val) \ + (obt_prop_set_text(win, OBT_PROP_ATOM(prop), val)) +#define OBT_PROP_SETSS(win, prop, strs) \ + (obt_prop_set_array_text(win, OBT_PROP_ATOM(prop), strs)) #define OBT_PROP_ERASE(win, prop) (obt_prop_erase(win, OBT_PROP_ATOM(prop))) diff --git a/obt/tests/bstest.c b/obt/tests/bstest.c new file mode 100755 index 0000000..7581855 --- /dev/null +++ b/obt/tests/bstest.c @@ -0,0 +1,58 @@ +#/* +#!/bin/sh +#*/ +#if 0 +gcc -O0 -o ./bstest `pkg-config --cflags --libs obt-3.5` bstest.c && \ +./bstest +exit +#endif + +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + bstest.c for the Openbox window manager + Copyright (c) 2010 Dana Jansens + + This program 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 Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#include "../bsearch.h" +#include + +int main() { + int ar[] = { + 2, 4, 5, 7, 12, 34, 45, 56, 57, 67, 67, 68, 68, 69, 70, 71, 89, 100 }; + int n = sizeof(ar)/sizeof(ar[0]); + BSEARCH_SETUP(int); + BSEARCH(int, ar, 0, n, 1); + g_assert(!!BSEARCH_FOUND() == FALSE); + BSEARCH(int, ar, 0, n, 0); + g_assert(!!BSEARCH_FOUND() == FALSE); + BSEARCH(int, ar, 0, n, 2); + g_assert(!!BSEARCH_FOUND() == TRUE); + g_assert(BSEARCH_AT() == 0); + BSEARCH(int, ar, 0, n, 58); + g_assert(!!BSEARCH_FOUND() == FALSE); + BSEARCH(int, ar, 0, n, 57); + g_assert(!!BSEARCH_FOUND() == TRUE); + g_assert(BSEARCH_AT() == 8); + BSEARCH(int, ar, 0, n, 55); + g_assert(!!BSEARCH_FOUND() == FALSE); + BSEARCH(int, ar, 0, n, 99); + g_assert(!!BSEARCH_FOUND() == FALSE); + BSEARCH(int, ar, 0, n, 100); + g_assert(!!BSEARCH_FOUND() == TRUE); + g_assert(BSEARCH_AT() == 17); + BSEARCH(int, ar, 0, n, 101); + g_assert(!!BSEARCH_FOUND() == FALSE); + g_print("ok\n"); +} diff --git a/obt/tests/ddtest.c b/obt/tests/ddtest.c new file mode 100755 index 0000000..69a9e1c --- /dev/null +++ b/obt/tests/ddtest.c @@ -0,0 +1,61 @@ +#/* +#!/bin/sh +#*/ +#if 0 +gcc -O0 -o ./ddtest `pkg-config --cflags --libs obt-3.5` ddtest.c && \ +./ddtest +exit +#endif + +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + ddtest.c for the Openbox window manager + Copyright (c) 2010 Dana Jansens + + This program 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 Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#include +#include +#include +#include "obt/paths.h" +#include "obt/link.h" +#include + +gint main(int argc, char **argv) +{ + ObtPaths *obtpaths; + ObtLink *dd; + gchar *id; + + if (argc < 2) { + g_print("pass path to .desktop\n"); + return 1; + } + + obtpaths = obt_paths_new(); + dd = obt_link_from_ddfile(argv[1], obtpaths, "et", NULL, NULL); + obt_paths_unref(obtpaths); + if (dd) { + g_print("Success\n"); + { + gulong i, n; + const GQuark *c = obt_link_app_categories(dd, &n); + for (i = 0; i < n; ++i) + g_print("Category: %s\n", + g_quark_to_string(c[i])); + } + obt_link_unref(dd); + } + return 0; +} diff --git a/obt/tests/ddtest.desktop b/obt/tests/ddtest.desktop new file mode 100644 index 0000000..16d76aa --- /dev/null +++ b/obt/tests/ddtest.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +test= +test2 +foo = +#hi +gewh= yuhself +a-r950 = tek;la; fi +hi=bye + +you=yeh +hi=double +Type=Application +Exec=foo +Name=myname +Categories=one;two;;three diff --git a/obt/watch.h b/obt/tests/linktest.c old mode 100644 new mode 100755 similarity index 57% rename from obt/watch.h rename to obt/tests/linktest.c index c8556bc..022ba35 --- a/obt/watch.h +++ b/obt/tests/linktest.c @@ -1,6 +1,15 @@ +#/* +#!/bin/sh +#*/ +#if 0 +gcc -O0 -o ./linktest `pkg-config --cflags --libs obt-3.5` linktest.c && \ +./linktest +exit +#endif + /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - obt/watch.h for the Openbox window manager + linktest.c for the Openbox window manager Copyright (c) 2010 Dana Jansens This program is free software; you can redistribute it and/or modify @@ -16,26 +25,24 @@ See the COPYING file for a copy of the GNU General Public License. */ -#ifndef __obt_watch_h -#define __obt_watch_h - +#include "obt/linkbase.h" +#include "obt/paths.h" #include +#include -G_BEGIN_DECLS - -typedef struct _ObtWatch ObtWatch; +gint main() +{ + ObtLinkBase *base; + ObtPaths *paths; + GMainLoop *loop; -struct _ObtMainLoop; + paths = obt_paths_new(); + base = obt_linkbase_new(paths, setlocale(LC_MESSAGES, "")); + printf("done\n"); + return 0; -typedef void (*ObtWatchFunc)(ObtWatch *w, gchar *subpath, gpointer data); + loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(loop); -ObtWatch* obt_watch_new(); -void obt_watch_ref(ObtWatch *w); -void obt_watch_unref(ObtWatch *w); - -void obt_watch_dir(ObtWatch *w, const gchar *path, - ObtWatchFunc func, gpointer data); - -G_END_DECLS - -#endif + return 0; +} diff --git a/obt/tests/watchtest.c b/obt/tests/watchtest.c new file mode 100755 index 0000000..9ebdbae --- /dev/null +++ b/obt/tests/watchtest.c @@ -0,0 +1,50 @@ +#/* +#!/bin/sh +#*/ +#if 0 +gcc -O0 -o ./watchtest `pkg-config --cflags --libs obt-3.5` watchtest.c && \ +./watchtest +exit +#endif + +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + watchtest.c for the Openbox window manager + Copyright (c) 2010 Dana Jansens + + This program 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 Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#include "obt/watch.h" +#include + +void func(ObtWatch *w, const gchar *base_path, + const gchar *subpath, ObtWatchNotifyType type, + gpointer data) +{ + g_print("base path: %s subpath: %s type=%d\n", base_path, subpath, type); +} + +gint main() +{ + ObtWatch *watch; + GMainLoop *loop; + + watch = obt_watch_new(); + obt_watch_add(watch, "/tmp/a", FALSE, func, NULL); + + loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(loop); + + return 0; +} diff --git a/obt/watch.c b/obt/watch.c deleted file mode 100644 index c2f6487..0000000 --- a/obt/watch.c +++ /dev/null @@ -1,233 +0,0 @@ -/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - - obt/watch.c for the Openbox window manager - Copyright (c) 2010 Dana Jansens - - This program 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 Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - See the COPYING file for a copy of the GNU General Public License. -*/ - -#include "obt/watch.h" - -#ifdef HAVE_SYS_INOTIFY_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif -#include - -struct _ObtWatch { - guint ref; - gint ino_fd; - guint ino_watch; - GHashTable *targets; - -#ifdef HAVE_SYS_INOTIFY_H - GHashTable *targets_by_wd; -#endif -}; - -typedef struct _ObtWatchTarget { - ObtWatch *w; - -#ifdef HAVE_SYS_INOTIFY_H - gint wd; -#endif - - gchar *path; - ObtWatchFunc func; - gpointer data; -} ObtWatchTarget; - -static void init_inot(ObtWatch *w); -static gboolean read_inot(GIOChannel *s, GIOCondition cond, gpointer data); -static gboolean add_inot(ObtWatch *w, ObtWatchTarget *t, const char *path, - gboolean dir); -static void rm_inot(ObtWatchTarget *t); -static ObtWatchTarget* target_new(ObtWatch *w, const gchar *path, - ObtWatchFunc func, gpointer data); -static void target_free(ObtWatchTarget *t); - -ObtWatch* obt_watch_new() -{ - ObtWatch *w; - - w = g_slice_new(ObtWatch); - w->ref = 1; - w->ino_fd = -1; - w->targets = g_hash_table_new_full(g_str_hash, g_str_equal, - NULL, (GDestroyNotify)target_free); -#ifdef HAVE_SYS_INOTIFY_H - w->targets_by_wd = g_hash_table_new(g_int_hash, g_int_equal); -#endif - - init_inot(w); - - return w; -} -void obt_watch_ref(ObtWatch *w) -{ - ++w->ref; -} - -void obt_watch_unref(ObtWatch *w) -{ - if (--w->ref < 1) { - if (w->ino_fd >= 0 && w->ino_watch) - g_source_remove(w->ino_watch); - - g_hash_table_destroy(w->targets); - g_hash_table_destroy(w->targets_by_wd); - - g_slice_free(ObtWatch, w); - } -} - -static void init_inot(ObtWatch *w) -{ -#ifdef HAVE_SYS_INOTIFY_H - if (w->ino_fd >= 0) return; - - w->ino_fd = inotify_init(); - if (w->ino_fd >= 0) { - GIOChannel *ch; - - ch = g_io_channel_unix_new(w->ino_fd); - w->ino_watch = g_io_add_watch(ch, G_IO_IN | G_IO_HUP | G_IO_ERR, - read_inot, w); - g_io_channel_unref(ch); - } -#endif -} - -static gboolean read_inot(GIOChannel *src, GIOCondition cond, gpointer data) -{ -#ifdef HAVE_SYS_INOTIFY_H - ObtWatch *w = data; - ObtWatchTarget *t; - struct inotify_event s; - gint len; - guint ilen; - char *name; - - /* read the event */ - for (ilen = 0; ilen < sizeof(s); ilen += len) { - len = read(w->ino_fd, ((char*)&s)+ilen, sizeof(s)-ilen); - if (len < 0 && errno != EINTR) return FALSE; /* error, don't repeat */ - if (!len) return TRUE; /* nothing there */ - } - - name = g_new(char, s.len); - - /* read the filename */ - for (ilen = 0; ilen < s.len; ilen += len) { - len = read(w->ino_fd, name+ilen, s.len-ilen); - if (len < 0 && errno != EINTR) return FALSE; /* error, don't repeat */ - if (!len) return TRUE; /* nothing there */ - } - - t = g_hash_table_lookup(w->targets, &s.wd); - if (t) t->func(w, name, t->data); - - g_free(name); -#endif - return TRUE; /* repeat */ -} - -static gboolean add_inot(ObtWatch *w, ObtWatchTarget *t, const char *path, - gboolean dir) -{ -#ifndef HAVE_SYS_INOTIFY_H - return FALSE; -#else - gint mask; - if (w->ino_fd < 0) return FALSE; - if (dir) mask = IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE; - else g_assert_not_reached(); - t->wd = inotify_add_watch(w->ino_fd, path, mask); - return TRUE; -#endif -} - -static void rm_inot(ObtWatchTarget *t) -{ -#ifdef HAVE_SYS_INOTIFY_H - if (t->w->ino_fd < 0) return; - if (t->wd < 0) return; - inotify_rm_watch(t->w->ino_fd, t->wd); -#endif -} - -static ObtWatchTarget* target_new(ObtWatch *w, const gchar *path, - ObtWatchFunc func, gpointer data) -{ - ObtWatchTarget *t; - - t = g_slice_new0(ObtWatchTarget); - t->w = w; - t->wd = -1; - t->path = g_strdup(path); - t->func = func; - t->data = data; - - if (!add_inot(w, t, path, TRUE)) { - g_assert_not_reached(); /* XXX do something */ - } - -#ifndef HAVE_SYS_INOTIFY_H -#error need inotify for now -#endif - - return t; -} - -static void target_free(ObtWatchTarget *t) -{ - rm_inot(t); - - g_free(t->path); - g_slice_free(ObtWatchTarget, t); -} - -void obt_paths_watch_dir(ObtWatch *w, const gchar *path, - ObtWatchFunc func, gpointer data) -{ - ObtWatchTarget *t; - - g_return_if_fail(w != NULL); - g_return_if_fail(path != NULL); - g_return_if_fail(data != NULL); - - t = target_new(w, path, func, data); - g_hash_table_insert(w->targets, t->path, t); -#ifdef HAVE_SYS_INOTIFY_H - g_hash_table_insert(w->targets_by_wd, &t->wd, t); -#endif -} - -void obt_paths_unwatch_dir(ObtWatch *w, const gchar *path) -{ - ObtWatchTarget *t; - - g_return_if_fail(w != NULL); - g_return_if_fail(path != NULL); - - t = g_hash_table_lookup(w->targets, path); - - if (t) { -#ifdef HAVE_SYS_INOTIFY_H - g_hash_table_remove(w->targets_by_wd, &t->wd); -#endif - g_hash_table_remove(w->targets, path); - } -} diff --git a/obt/xml.c b/obt/xml.c index ffff150..c872912 100644 --- a/obt/xml.c +++ b/obt/xml.c @@ -19,6 +19,7 @@ #include "obt/xml.h" #include "obt/paths.h" +#include #include #ifdef HAVE_STDLIB_H @@ -136,6 +137,8 @@ static gboolean load_file(ObtXmlInst *i, with extra nodes in it. */ i->doc = xmlReadFile(path, NULL, (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER)); + xmlXIncludeProcessFlags(i->doc, (XML_PARSE_NOBLANKS | + XML_PARSE_RECOVER)); if (i->doc) { i->root = xmlDocGetRootElement(i->doc); if (!i->root) { diff --git a/openbox/actions.c b/openbox/actions.c index 125084e..ee9d55f 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -1,6 +1,6 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - actions.h for the Openbox window manager + actions.c for the Openbox window manager Copyright (c) 2007 Dana Jansens This program is free software; you can redistribute it and/or modify @@ -23,6 +23,7 @@ #include "event.h" #include "config.h" #include "client.h" +#include "focus.h" #include "openbox.h" #include "debug.h" @@ -300,6 +301,7 @@ void actions_run_acts(GSList *acts, struct _ObClient *client) { GSList *it; + gboolean update_user_time; /* Don't allow saving the initial state when running things from the menu */ @@ -309,6 +311,7 @@ void actions_run_acts(GSList *acts, if (x < 0 && y < 0) screen_pointer_pos(&x, &y); + update_user_time = FALSE; for (it = acts; it; it = g_slist_next(it)) { ObActionsData data; ObActionsAct *act = it->data; @@ -337,6 +340,8 @@ void actions_run_acts(GSList *acts, if (!act->def->run(&data, act->options)) { if (actions_act_is_interactive(act)) actions_interactive_end_act(); + if (client && client == focus_client) + update_user_time = TRUE; } else { /* make sure its interactive if it returned TRUE */ g_assert(act->i_input); @@ -346,6 +351,8 @@ void actions_run_acts(GSList *acts, } } } + if (update_user_time) + event_update_user_time(); } gboolean actions_interactive_act_running(void) diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c index fdce77b..380ffa0 100644 --- a/openbox/actions/execute.c +++ b/openbox/actions/execute.c @@ -260,7 +260,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) if (o->sn) { if (!ok) sn_spawn_cancel(); - unsetenv("DESKTOP_STARTUP_ID"); + g_unsetenv("DESKTOP_STARTUP_ID"); } g_free(program); diff --git a/openbox/actions/if.c b/openbox/actions/if.c index 28010d3..0e055a9 100644 --- a/openbox/actions/if.c +++ b/openbox/actions/if.c @@ -98,13 +98,16 @@ static gpointer setup_func(xmlNodePtr node) o->decor_on = TRUE; } if ((n = obt_xml_find_node(node, "desktop"))) { - gchar *s = obt_xml_node_string(n); - if (!g_ascii_strcasecmp(s, "current")) - o->desktop_current = TRUE; - if (!g_ascii_strcasecmp(s, "other")) - o->desktop_other = TRUE; - else - o->desktop_number = atoi(s); + gchar *s; + if ((s = obt_xml_node_string(n))) { + if (!g_ascii_strcasecmp(s, "current")) + o->desktop_current = TRUE; + if (!g_ascii_strcasecmp(s, "other")) + o->desktop_other = TRUE; + else + o->desktop_number = atoi(s); + g_free(s); + } } if ((n = obt_xml_find_node(node, "omnipresent"))) { if (obt_xml_node_bool(n)) diff --git a/openbox/client.c b/openbox/client.c index e666d58..1b010e4 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -110,22 +110,14 @@ static void client_ping_event(ObClient *self, gboolean dead); static void client_prompt_kill(ObClient *self); static gboolean client_can_steal_focus(ObClient *self, gboolean allow_other_desktop, + gboolean request_from_user, Time steal_time, Time launch_time); void client_startup(gboolean reconfig) { - if ((client_default_icon = RrImageCacheFind(ob_rr_icons, - ob_rr_theme->def_win_icon, - ob_rr_theme->def_win_icon_w, - ob_rr_theme->def_win_icon_h))) - RrImageRef(client_default_icon); - else { - client_default_icon = RrImageNew(ob_rr_icons); - RrImageAddPicture(client_default_icon, - ob_rr_theme->def_win_icon, - ob_rr_theme->def_win_icon_w, - ob_rr_theme->def_win_icon_h); - } + client_default_icon = RrImageNewFromData( + ob_rr_icons, ob_rr_theme->def_win_icon, + ob_rr_theme->def_win_icon_w, ob_rr_theme->def_win_icon_h); if (reconfig) return; @@ -201,7 +193,8 @@ void client_manage(Window window, ObPrompt *prompt) { ObClient *self; XSetWindowAttributes attrib_set; - gboolean activate = FALSE; + gboolean try_activate = FALSE; + gboolean do_activate; ObAppSettings *settings; gboolean transient = FALSE; Rect place; @@ -293,7 +286,7 @@ void client_manage(Window window, ObPrompt *prompt) FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, settings->focus == 1)) { - activate = TRUE; + try_activate = TRUE; } /* remove the client's border */ @@ -307,6 +300,16 @@ void client_manage(Window window, ObPrompt *prompt) /* where the frame was placed is where the window was originally */ place = self->area; + ob_debug("Going to try activate new window? %s", + try_activate ? "yes" : "no"); + if (try_activate) + do_activate = client_can_steal_focus( + self, settings->focus == 1, + (!!launch_time || settings->focus == 1), + event_time(), launch_time); + else + do_activate = FALSE; + /* figure out placement for the window if the window is new */ if (ob_state() == OB_STATE_RUNNING) { ob_debug("Positioned: %s @ %d %d", @@ -325,7 +328,8 @@ void client_manage(Window window, ObPrompt *prompt) "program + user specified" : "BADNESS !?")))), place.width, place.height); - obplaced = place_client(self, &place.x, &place.y, settings); + obplaced = place_client(self, do_activate, &place.x, &place.y, + settings); /* watch for buggy apps that ask to be placed at (0,0) when there is a strut there */ @@ -433,13 +437,34 @@ void client_manage(Window window, ObPrompt *prompt) client_apply_startup_state(self, place.x, place.y, place.width, place.height); - ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s", - activate ? "yes" : "no"); - if (activate) { - activate = client_can_steal_focus(self, settings->focus, - event_time(), launch_time); + /* set the initial value of the desktop hint, when one wasn't requested + on map. */ + OBT_PROP_SET32(self->window, NET_WM_DESKTOP, CARDINAL, self->desktop); + + /* grab mouse bindings before showing the window */ + mouse_grab_for_client(self, TRUE); + + /* this has to happen before we try focus the window, but we want it to + happen after the client's stacking has been determined or it looks bad + */ + { + gulong ignore_start; + if (!config_focus_under_mouse) + ignore_start = event_start_ignore_all_enters(); - if (!activate) { + client_show(self); + + if (!config_focus_under_mouse) + event_end_ignore_all_enters(ignore_start); + } + + /* activate/hilight/raise the window */ + if (try_activate) { + if (do_activate) { + gboolean stacked = client_restore_session_stacking(self); + client_present(self, FALSE, !stacked, TRUE); + } + else { /* if the client isn't stealing focus, then hilite it so the user knows it is there, but don't do this if we're restoring from a session */ @@ -459,27 +484,6 @@ void client_manage(Window window, ObPrompt *prompt) stacking_raise(CLIENT_AS_WINDOW(self)); } - mouse_grab_for_client(self, TRUE); - - /* this has to happen before we try focus the window, but we want it to - happen after the client's stacking has been determined or it looks bad - */ - { - gulong ignore_start; - if (!config_focus_under_mouse) - ignore_start = event_start_ignore_all_enters(); - - client_show(self); - - if (!config_focus_under_mouse) - event_end_ignore_all_enters(ignore_start); - } - - if (activate) { - gboolean stacked = client_restore_session_stacking(self); - client_present(self, FALSE, !stacked, TRUE); - } - /* add to client list/map */ client_list = g_list_append(client_list, self); window_add(&self->window, CLIENT_AS_WINDOW(self)); @@ -697,105 +701,157 @@ void client_fake_unmanage(ObClient *self) static gboolean client_can_steal_focus(ObClient *self, gboolean allow_other_desktop, + gboolean request_from_user, Time steal_time, Time launch_time) { gboolean steal; gboolean relative_focused; - gboolean parent_focused; steal = TRUE; - parent_focused = (focus_client != NULL && - client_search_focus_parent(self)); relative_focused = (focus_client != NULL && (client_search_focus_tree_full(self) != NULL || client_search_focus_group_full(self) != NULL)); /* This is focus stealing prevention */ - ob_debug_type(OB_DEBUG_FOCUS, - "Want to focus window 0x%x at time %u " - "launched at %u (last user interaction time %u)", - self->window, steal_time, launch_time, - event_last_user_time); + ob_debug("Want to focus window 0x%x at time %u " + "launched at %u (last user interaction time %u) " + "request from %s, allow other desktop: %s", + self->window, steal_time, launch_time, + event_last_user_time, + (request_from_user ? "user" : "other"), + (allow_other_desktop ? "yes" : "no")); + + /* + if no launch time is provided for an application, make one up. + + if the window is related to other existing windows + and one of those windows was the last used + then we will give it a launch time equal to the last user time, + which will end up giving the window focus probably. + else + the window is related to other windows, but you are not working in + them? + seems suspicious, so we will give it a launch time of + NOW - STEAL_INTERVAL, + so it will be given focus only if we didn't use something else + during the steal interval. + else + the window is all on its own, so we can't judge it. give it a launch + time equal to the last user time, so it will probably take focus. + + this way running things from a terminal will give them focus, but popups + without a launch time shouldn't steal focus so easily. + */ + + if (!launch_time) { + if (client_has_relative(self)) { + if (event_last_user_time && client_search_focus_group_full(self)) { + /* our relative is focused */ + launch_time = event_last_user_time; + ob_debug("Unknown launch time, using %u - window in active " + "group", launch_time); + } + else if (!request_from_user) { + /* has relatives which are not being used. suspicious */ + launch_time = event_time() - OB_EVENT_USER_TIME_DELAY; + ob_debug("Unknown launch time, using %u - window in inactive " + "group", launch_time); + } + else { + /* has relatives which are not being used, but the user seems + to want to go there! */ + launch_time = event_last_user_time; + ob_debug("Unknown launch time, using %u - user request", + launch_time); + } + } + else { + /* the window is on its own, probably the user knows it is going + to appear */ + launch_time = event_last_user_time; + ob_debug("Unknown launch time, using %u - independent window", + launch_time); + } + } - /* if it's on another desktop... */ + /* if it's on another desktop + then if allow_other_desktop is true, we don't want to let it steal + focus, unless it was launched after we changed desktops and the request + came from the user + */ if (!(self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) && - /* and (we dont know when it launched, and we don't want to allow - focus stealing from other desktops */ - ((!launch_time && !allow_other_desktop) || - /* or the timestamp is from before you changed desktops) */ - (screen_desktop_user_time && + (!allow_other_desktop || + (request_from_user && screen_desktop_user_time && !event_time_after(launch_time, screen_desktop_user_time)))) { steal = FALSE; - ob_debug_type(OB_DEBUG_FOCUS, - "Not focusing the window because its on another " - "desktop\n"); + ob_debug("Not focusing the window because its on another desktop\n"); } /* If something is focused... */ else if (focus_client) { /* If the user is working in another window right now, then don't steal focus */ - if (!parent_focused && - event_last_user_time && launch_time && - event_time_after(event_last_user_time, launch_time) && - event_last_user_time != launch_time && + if (!relative_focused && + event_last_user_time && + /* last user time must be strictly > launch_time to block focus */ + (event_time_after(event_last_user_time, launch_time) && + event_last_user_time != launch_time) && event_time_after(event_last_user_time, steal_time - OB_EVENT_USER_TIME_DELAY)) { steal = FALSE; - ob_debug_type(OB_DEBUG_FOCUS, - "Not focusing the window because the user is " - "working in another window that is not " - "its parent"); - } - /* If the new window is a transient (and its relatives aren't - focused) */ - else if (client_has_parent(self) && !relative_focused) { - steal = FALSE; - ob_debug_type(OB_DEBUG_FOCUS, - "Not focusing the window because it is a " - "transient, and its relatives aren't focused"); - } - /* Don't steal focus from globally active clients. - I stole this idea from KWin. It seems nice. - */ - else if (!(focus_client->can_focus || - focus_client->focus_notify)) - { - steal = FALSE; - ob_debug_type(OB_DEBUG_FOCUS, - "Not focusing the window because a globally " - "active client has focus"); + ob_debug("Not focusing the window because the user is " + "working in another window that is not its relative"); } /* Don't move focus if it's not going to go to this window anyway */ else if (client_focus_target(self) != self) { steal = FALSE; - ob_debug_type(OB_DEBUG_FOCUS, - "Not focusing the window because another window " - "would get the focus anyway"); + ob_debug("Not focusing the window because another window " + "would get the focus anyway"); } - /* Don't move focus if the window is not visible on the current - desktop and none of its relatives are focused */ - else if (!(self->desktop == screen_desktop || - self->desktop == DESKTOP_ALL) && - !relative_focused) - { - steal = FALSE; - ob_debug_type(OB_DEBUG_FOCUS, - "Not focusing the window because it is on " - "another desktop and no relatives are focused "); + /* For requests that don't come from the user */ + else if (!request_from_user) { + /* If the new window is a transient (and its relatives aren't + focused) */ + if (client_has_parent(self) && !relative_focused) { + steal = FALSE; + ob_debug("Not focusing the window because it is a " + "transient, and its relatives aren't focused"); + } + /* Don't steal focus from globally active clients. + I stole this idea from KWin. It seems nice. + */ + else if (!(focus_client->can_focus || focus_client->focus_notify)) + { + steal = FALSE; + ob_debug("Not focusing the window because a globally " + "active client has focus"); + } + /* Don't move focus if the window is not visible on the current + desktop and none of its relatives are focused */ + else if (!allow_other_desktop && + !screen_compare_desktops(self->desktop, screen_desktop) && + !relative_focused) + { + steal = FALSE; + ob_debug("Not focusing the window because it is on " + "another desktop and no relatives are focused "); + } } } if (!steal) - ob_debug_type(OB_DEBUG_FOCUS, - "Focus stealing prevention activated for %s at " - "time %u (last user interaction time %u)", - self->title, steal_time, event_last_user_time); + ob_debug("Focus stealing prevention activated for %s at " + "time %u (last user interaction time %u)", + self->title, steal_time, event_last_user_time); + else + ob_debug("Allowing focus stealing for %s at time %u (last user " + "interaction time %u)", + self->title, steal_time, event_last_user_time); return steal; } @@ -1154,11 +1210,10 @@ static void client_get_all(ObClient *self, gboolean real) static void client_get_startup_id(ObClient *self) { - if (!(OBT_PROP_GETS(self->window, NET_STARTUP_ID, utf8, - &self->startup_id))) + if (!(OBT_PROP_GETS_UTF8(self->window, NET_STARTUP_ID, &self->startup_id))) if (self->group) - OBT_PROP_GETS(self->group->leader, - NET_STARTUP_ID, utf8, &self->startup_id); + OBT_PROP_GETS_UTF8(self->group->leader, NET_STARTUP_ID, + &self->startup_id); } static void client_get_area(ObClient *self) @@ -1969,15 +2024,14 @@ void client_update_title(ObClient *self) g_free(self->original_title); /* try netwm */ - if (!OBT_PROP_GETS(self->window, NET_WM_NAME, utf8, &data)) { + if (!OBT_PROP_GETS_UTF8(self->window, NET_WM_NAME, &data)) { /* try old x stuff */ - if (!(OBT_PROP_GETS(self->window, WM_NAME, locale, &data) - || OBT_PROP_GETS(self->window, WM_NAME, utf8, &data))) { + if (!OBT_PROP_GETS(self->window, WM_NAME, &data)) { if (self->transient) { - /* - GNOME alert windows are not given titles: - http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html - */ + /* + GNOME alert windows are not given titles: + http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html + */ data = g_strdup(""); } else data = g_strdup(_("Unnamed Window")); @@ -2000,7 +2054,7 @@ void client_update_title(ObClient *self) g_free(data); } - OBT_PROP_SETS(self->window, NET_WM_VISIBLE_NAME, utf8, visible); + OBT_PROP_SETS(self->window, NET_WM_VISIBLE_NAME, visible); self->title = visible; if (self->frame) @@ -2011,10 +2065,9 @@ void client_update_title(ObClient *self) g_free(self->icon_title); /* try netwm */ - if (!OBT_PROP_GETS(self->window, NET_WM_ICON_NAME, utf8, &data)) + if (!OBT_PROP_GETS_UTF8(self->window, NET_WM_ICON_NAME, &data)) /* try old x stuff */ - if (!(OBT_PROP_GETS(self->window, WM_ICON_NAME, locale, &data) || - OBT_PROP_GETS(self->window, WM_ICON_NAME, utf8, &data))) + if (!OBT_PROP_GETS(self->window, WM_ICON_NAME, &data)) data = g_strdup(self->title); if (self->client_machine) { @@ -2032,7 +2085,7 @@ void client_update_title(ObClient *self) g_free(data); } - OBT_PROP_SETS(self->window, NET_WM_VISIBLE_ICON_NAME, utf8, visible); + OBT_PROP_SETS(self->window, NET_WM_VISIBLE_ICON_NAME, visible); self->icon_title = visible; } @@ -2095,7 +2148,6 @@ void client_update_icons(ObClient *self) guint num; guint32 *data; guint w, h, i, j; - guint num_seen; /* number of icons present */ RrImage *img; img = NULL; @@ -2108,13 +2160,15 @@ void client_update_icons(ObClient *self) if (OBT_PROP_GETA32(self->window, NET_WM_ICON, CARDINAL, &data, &num)) { /* figure out how many valid icons are in here */ i = 0; - num_seen = 0; while (i + 2 < num) { /* +2 is to make sure there is a w and h */ w = data[i++]; h = data[i++]; /* watch for the data being too small for the specified size, or for zero sized icons. */ - if (i + w*h > num || w == 0 || h == 0) break; + if (i + w*h > num || w == 0 || h == 0) { + i += w*h; + continue; + } /* convert it to the right bit order for ObRender */ for (j = 0; j < w*h; ++j) @@ -2124,29 +2178,13 @@ void client_update_icons(ObClient *self) (((data[i+j] >> 8) & 0xff) << RrDefaultGreenOffset) + (((data[i+j] >> 0) & 0xff) << RrDefaultBlueOffset); - /* is it in the cache? */ - img = RrImageCacheFind(ob_rr_icons, &data[i], w, h); - if (img) RrImageRef(img); /* own it */ + /* add it to the image cache as an original */ + if (!img) + img = RrImageNewFromData(ob_rr_icons, &data[i], w, h); + else + RrImageAddFromData(img, &data[i], w, h); i += w*h; - ++num_seen; - - /* don't bother looping anymore if we already found it in the cache - since we'll just use that! */ - if (img) break; - } - - /* if it's not in the cache yet, then add it to the cache now. - we have already converted it to the correct bit order above */ - if (!img && num_seen > 0) { - img = RrImageNew(ob_rr_icons); - i = 0; - for (j = 0; j < num_seen; ++j) { - w = data[i++]; - h = data[i++]; - RrImageAddPicture(img, &data[i], w, h); - i += w*h; - } } g_free(data); @@ -2170,15 +2208,10 @@ void client_update_icons(ObClient *self) if (xicon) { if (w > 0 && h > 0) { - /* is this icon in the cache yet? */ - img = RrImageCacheFind(ob_rr_icons, data, w, h); - if (img) RrImageRef(img); /* own it */ - - /* if not, then add it */ - if (!img) { - img = RrImageNew(ob_rr_icons); - RrImageAddPicture(img, data, w, h); - } + if (!img) + img = RrImageNewFromData(ob_rr_icons, data, w, h); + else + RrImageAddFromData(img, data, w, h); } g_free(data); @@ -2248,19 +2281,14 @@ static void client_get_session_ids(ObClient *self) leader = None; /* get the SM_CLIENT_ID */ - got = FALSE; - if (leader) - got = OBT_PROP_GETS(leader, SM_CLIENT_ID, locale, &self->sm_client_id); - if (!got) - OBT_PROP_GETS(self->window, SM_CLIENT_ID, locale, &self->sm_client_id); + if (leader && leader != self->window) + OBT_PROP_GETS_XPCS(leader, SM_CLIENT_ID, &self->sm_client_id); + else + OBT_PROP_GETS_XPCS(self->window, SM_CLIENT_ID, &self->sm_client_id); /* get the WM_CLASS (name and class). make them "" if they are not provided */ - got = FALSE; - if (leader) - got = OBT_PROP_GETSS(leader, WM_CLASS, locale, &ss); - if (!got) - got = OBT_PROP_GETSS(self->window, WM_CLASS, locale, &ss); + got = OBT_PROP_GETSS_TYPE(self->window, WM_CLASS, STRING_NO_CC, &ss); if (got) { if (ss[0]) { @@ -2275,11 +2303,7 @@ static void client_get_session_ids(ObClient *self) if (self->class == NULL) self->class = g_strdup(""); /* get the WM_WINDOW_ROLE. make it "" if it is not provided */ - got = FALSE; - if (leader) - got = OBT_PROP_GETS(leader, WM_WINDOW_ROLE, locale, &s); - if (!got) - got = OBT_PROP_GETS(self->window, WM_WINDOW_ROLE, locale, &s); + got = OBT_PROP_GETS_XPCS(self->window, WM_WINDOW_ROLE, &s); if (got) self->role = s; @@ -2290,9 +2314,9 @@ static void client_get_session_ids(ObClient *self) got = FALSE; if (leader) - got = OBT_PROP_GETSS(leader, WM_COMMAND, locale, &ss); + got = OBT_PROP_GETSS(leader, WM_COMMAND, &ss); if (!got) - got = OBT_PROP_GETSS(self->window, WM_COMMAND, locale, &ss); + got = OBT_PROP_GETSS(self->window, WM_COMMAND, &ss); if (got) { /* merge/mash them all together */ @@ -2315,9 +2339,9 @@ static void client_get_session_ids(ObClient *self) /* get the WM_CLIENT_MACHINE */ got = FALSE; if (leader) - got = OBT_PROP_GETS(leader, WM_CLIENT_MACHINE, locale, &s); + got = OBT_PROP_GETS(leader, WM_CLIENT_MACHINE, &s); if (!got) - got = OBT_PROP_GETS(self->window, WM_CLIENT_MACHINE, locale, &s); + got = OBT_PROP_GETS(self->window, WM_CLIENT_MACHINE, &s); if (got) { gchar localhost[128]; @@ -2344,10 +2368,10 @@ static void client_save_app_rule_values(ObClient *self) { const gchar *type; - OBT_PROP_SETS(self->window, OB_APP_ROLE, utf8, self->role); - OBT_PROP_SETS(self->window, OB_APP_NAME, utf8, self->name); - OBT_PROP_SETS(self->window, OB_APP_CLASS, utf8, self->class); - OBT_PROP_SETS(self->window, OB_APP_TITLE, utf8, self->original_title); + OBT_PROP_SETS(self->window, OB_APP_ROLE, self->role); + OBT_PROP_SETS(self->window, OB_APP_NAME, self->name); + OBT_PROP_SETS(self->window, OB_APP_CLASS, self->class); + OBT_PROP_SETS(self->window, OB_APP_TITLE, self->original_title); switch (self->type) { case OB_CLIENT_TYPE_NORMAL: @@ -2367,7 +2391,7 @@ static void client_save_app_rule_values(ObClient *self) case OB_CLIENT_TYPE_DOCK: type = "dock"; break; } - OBT_PROP_SETS(self->window, OB_APP_TYPE, utf8, type); + OBT_PROP_SETS(self->window, OB_APP_TYPE, type); } static void client_change_wm_state(ObClient *self) @@ -2484,6 +2508,11 @@ gboolean client_has_parent(ObClient *self) return self->parents != NULL; } +gboolean client_has_children(ObClient *self) +{ + return self->transients != NULL; +} + gboolean client_is_oldfullscreen(const ObClient *self, const Rect *area) { @@ -2767,9 +2796,6 @@ static void client_apply_startup_state(ObClient *self, self->area = oldarea; client_configure(self, x, y, w, h, FALSE, TRUE, FALSE); - /* set the desktop hint, to make sure that it always exists */ - OBT_PROP_SET32(self->window, NET_WM_DESKTOP, CARDINAL, self->desktop); - /* nothing to do for the other states: skip_taskbar skip_pager @@ -2849,6 +2875,13 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, the updated frame dimensions. */ frame_adjust_area(self->frame, FALSE, TRUE, TRUE); + /* cap any X windows at the size of an unsigned short */ + *w = MIN(*w, + G_MAXUSHORT - self->frame->size.left - self->frame->size.right); + *h = MIN(*h, + G_MAXUSHORT - self->frame->size.top - self->frame->size.bottom); + + /* gets the frame's position */ frame_client_gravity(self->frame, x, y); @@ -3957,13 +3990,10 @@ void client_activate(ObClient *self, gboolean desktop, gboolean here, gboolean raise, gboolean unshade, gboolean user) { - if ((user && (desktop || - self->desktop == DESKTOP_ALL || - self->desktop == screen_desktop)) || - client_can_steal_focus(self, desktop, event_time(), CurrentTime)) - { + self = client_focus_target(self); + + if (client_can_steal_focus(self, desktop, user, event_time(), CurrentTime)) client_present(self, here, raise, unshade); - } else client_hilite(self, TRUE); } @@ -4296,32 +4326,26 @@ void client_find_edge_directional(ObClient *self, ObDirection dir, } /* search for edges of clients */ - if (((dir == OB_DIRECTION_NORTH || dir == OB_DIRECTION_SOUTH) && - !self->max_vert) || - ((dir == OB_DIRECTION_EAST || dir == OB_DIRECTION_WEST) && - !self->max_horz)) - { - for (it = client_list; it; it = g_list_next(it)) { - ObClient *cur = it->data; + for (it = client_list; it; it = g_list_next(it)) { + ObClient *cur = it->data; - /* skip windows to not bump into */ - if (cur == self) - continue; - if (cur->iconic) - continue; - if (self->desktop != cur->desktop && cur->desktop != DESKTOP_ALL && - cur->desktop != screen_desktop) - continue; + /* skip windows to not bump into */ + if (cur == self) + continue; + if (cur->iconic) + continue; + if (self->desktop != cur->desktop && cur->desktop != DESKTOP_ALL && + cur->desktop != screen_desktop) + continue; - ob_debug("trying window %s", cur->title); + ob_debug("trying window %s", cur->title); - detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start, - my_edge_size, dest, near_edge); - } - dock_get_area(&dock_area); - detect_edge(dock_area, dir, my_head, my_size, my_edge_start, + detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start, my_edge_size, dest, near_edge); } + dock_get_area(&dock_area); + detect_edge(dock_area, dir, my_head, my_size, my_edge_start, + my_edge_size, dest, near_edge); g_slice_free(Rect, a); } @@ -4508,6 +4532,13 @@ gboolean client_has_group_siblings(ObClient *self) return self->group && self->group->members->next; } +gboolean client_has_relative(ObClient *self) +{ + return client_has_parent(self) || + client_has_group_siblings(self) || + client_has_children(self); +} + /*! Returns TRUE if the client is running on the same machine as Openbox */ gboolean client_on_localhost(ObClient *self) { diff --git a/openbox/client.h b/openbox/client.h index 47da397..b36bef5 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -657,6 +657,10 @@ RrImage* client_icon(ObClient *self); transient for */ gboolean client_has_parent(ObClient *self); +/*! Return TRUE if the client has some transient children, and FALSE otherwise. +*/ +gboolean client_has_children(ObClient *self); + /*! Searches a client's immediate parents for a focused window. The function does not check for the passed client, only for *ONE LEVEL* of its parents. If no focused parent is found, NULL is returned. @@ -741,6 +745,11 @@ ObClient* client_under_pointer(void); gboolean client_has_group_siblings(ObClient *self); +/*! Returns TRUE if the client has a transient child, a parent, or a + group member. Returns FALSE otherwise. +*/ +gboolean client_has_relative(ObClient *self); + /*! Returns TRUE if the client is running on the same machine as Openbox */ gboolean client_on_localhost(ObClient *self); diff --git a/openbox/config.c b/openbox/config.c index 025a683..debd9fb 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -370,7 +370,8 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) g_free(class); g_free(role); g_free(title); - name = class = role = title = NULL; + g_free(type_str); + name = class = role = title = type_str = NULL; } app = obt_xml_find_node(app->next, "application"); @@ -389,39 +390,44 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) static void parse_key(xmlNodePtr node, GList *keylist) { - gchar *key; + gchar *keystring, **keys, **key; xmlNodePtr n; gboolean is_chroot = FALSE; - if (!obt_xml_attr_string(node, "key", &key)) + if (!obt_xml_attr_string(node, "key", &keystring)) return; obt_xml_attr_bool(node, "chroot", &is_chroot); - keylist = g_list_append(keylist, key); + keys = g_strsplit(keystring, " ", 0); + for (key = keys; *key; ++key) { + keylist = g_list_append(keylist, *key); - if ((n = obt_xml_find_node(node->children, "keybind"))) { - while (n) { - parse_key(n, keylist); - n = obt_xml_find_node(n->next, "keybind"); + if ((n = obt_xml_find_node(node->children, "keybind"))) { + while (n) { + parse_key(n, keylist); + n = obt_xml_find_node(n->next, "keybind"); + } } - } - else if ((n = obt_xml_find_node(node->children, "action"))) { - while (n) { - ObActionsAct *action; - - action = actions_parse(n); - if (action) - keyboard_bind(keylist, action); - n = obt_xml_find_node(n->next, "action"); + else if ((n = obt_xml_find_node(node->children, "action"))) { + while (n) { + ObActionsAct *action; + + action = actions_parse(n); + if (action) + keyboard_bind(keylist, action); + n = obt_xml_find_node(n->next, "action"); + } } - } - if (is_chroot) - keyboard_chroot(keylist); - g_free(key); - keylist = g_list_delete_link(keylist, g_list_last(keylist)); + if (is_chroot) + keyboard_chroot(keylist); + keylist = g_list_delete_link(keylist, g_list_last(keylist)); + } + + g_strfreev(keys); + g_free(keystring); } static void parse_keyboard(xmlNodePtr node, gpointer d) @@ -576,6 +582,8 @@ static void parse_placement(xmlNodePtr node, gpointer d) config_place_monitor = OB_PLACE_MONITOR_ACTIVE; else if (obt_xml_node_contains(n, "mouse")) config_place_monitor = OB_PLACE_MONITOR_MOUSE; + else if (obt_xml_node_contains(n, "any")) + config_place_monitor = OB_PLACE_MONITOR_ANY; } if ((n = obt_xml_find_node(node, "primaryMonitor"))) { config_primary_monitor_index = obt_xml_node_int(n); @@ -997,7 +1005,7 @@ void config_startup(ObtXmlInst *i) config_place_policy = OB_PLACE_POLICY_SMART; config_place_center = TRUE; - config_place_monitor = OB_PLACE_MONITOR_ANY; + config_place_monitor = OB_PLACE_MONITOR_PRIMARY; config_primary_monitor_index = 1; config_primary_monitor = OB_PLACE_MONITOR_ACTIVE; diff --git a/openbox/debug.c b/openbox/debug.c index 8423e8a..358b090 100644 --- a/openbox/debug.c +++ b/openbox/debug.c @@ -135,7 +135,7 @@ static void prompt_handler(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) { if (ob_state() == OB_STATE_RUNNING) - prompt_show_message(message, _("Openbox"), _("Close")); + prompt_show_message(message, "Openbox", _("Close")); else log_handler(log_domain, log_level, message, data); } diff --git a/openbox/dock.c b/openbox/dock.c index 06d2280..c26eee6 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -145,7 +145,7 @@ void dock_manage(Window icon_win, Window name_win) app->name_win = name_win; app->icon_win = icon_win; - if (OBT_PROP_GETSS(app->name_win, WM_CLASS, locale, &data)) { + if (OBT_PROP_GETSS_TYPE(app->name_win, WM_CLASS, STRING_NO_CC, &data)) { if (data[0]) { app->name = g_strdup(data[0]); if (data[1]) @@ -551,6 +551,8 @@ void dock_configure(void) dock->area.height += ob_rr_theme->obwidth * 2; } + /* screen_resize() depends on this function to call screen_update_areas(), + so if this changes, also update screen_resize(). */ screen_update_areas(); } diff --git a/openbox/event.c b/openbox/event.c index b59707b..2dde132 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -273,7 +273,7 @@ static void event_set_curtime(XEvent *e) which can happen if the clock goes backwards, we erase the last specified user_time */ if (t && event_last_user_time && event_time_after(event_last_user_time, t)) - event_last_user_time = CurrentTime; + event_reset_user_time(); event_sourcetime = CurrentTime; event_curtime = t; @@ -1103,7 +1103,9 @@ static void event_handle_client(ObClient *client, XEvent *e) if (grab_on_keyboard()) break; if (e->xcrossing.mode == NotifyGrab || - e->xcrossing.mode == NotifyUngrab || + (e->xcrossing.mode == NotifyUngrab && + /* ungrab enters are used when _under_ mouse is being used */ + !(config_focus_follow && config_focus_under_mouse)) || /*ignore enters when we're already in the window */ e->xcrossing.detail == NotifyInferior) { @@ -1443,9 +1445,15 @@ static void event_handle_client(ObClient *client, XEvent *e) ob_debug_type(OB_DEBUG_APP_BUGS, "_NET_ACTIVE_WINDOW message for window %s is " "missing source indication", client->title); - client_activate(client, FALSE, FALSE, TRUE, TRUE, - (e->xclient.data.l[0] == 0 || - e->xclient.data.l[0] == 2)); + /* TODO(danakj) This should use + (e->xclient.data.l[0] == 0 || + e->xclient.data.l[0] == 2) + to determine if a user requested the activation, however GTK+ + applications seem unable to make this distinction ever + (including panels such as xfce4-panel and gnome-panel). + So we are left just assuming all activations are from the user. + */ + client_activate(client, FALSE, FALSE, TRUE, TRUE, TRUE); } else if (msgtype == OBT_PROP_ATOM(NET_WM_MOVERESIZE)) { ob_debug("net_wm_moveresize for 0x%lx direction %d", client->window, e->xclient.data.l[2]); @@ -1695,10 +1703,12 @@ static void event_handle_client(ObClient *client, XEvent *e) client->shaped = ((XShapeEvent*)e)->shaped; kind = ShapeBounding; break; +#ifdef ShapeInput case ShapeInput: client->shaped_input = ((XShapeEvent*)e)->shaped; kind = ShapeInput; break; +#endif default: g_assert_not_reached(); } @@ -1792,8 +1802,9 @@ static gboolean event_handle_menu_input(XEvent *ev) if (ev->type == ButtonRelease || ev->type == ButtonPress) { ObMenuEntryFrame *e; - if (menu_hide_delay_reached() && - (ev->xbutton.button < 4 || ev->xbutton.button > 5)) + if ((ev->xbutton.button < 4 || ev->xbutton.button > 5) && + ((ev->type == ButtonRelease && menu_hide_delay_reached()) || + ev->type == ButtonPress)) { if ((e = menu_entry_frame_under(ev->xbutton.x_root, ev->xbutton.y_root))) @@ -1804,23 +1815,11 @@ static gboolean event_handle_menu_input(XEvent *ev) if (ev->type == ButtonRelease) menu_entry_frame_execute(e, ev->xbutton.state); } - else if (ev->type == ButtonRelease) + else menu_frame_hide_all(); } ret = TRUE; } - else if (ev->type == MotionNotify) { - ObMenuFrame *f; - ObMenuEntryFrame *e; - - if ((e = menu_entry_frame_under(ev->xmotion.x_root, - ev->xmotion.y_root))) - if (!(f = find_active_menu()) || - f == e->frame || - f->parent == e->frame || - f->child == e->frame) - menu_frame_select(e->frame, e, FALSE); - } else if (ev->type == KeyPress || ev->type == KeyRelease) { guint mods; ObMenuFrame *frame; @@ -1860,14 +1859,23 @@ static gboolean event_handle_menu_input(XEvent *ev) ret = TRUE; } - else if (sym == XK_Right) { - /* Right goes to the selected submenu */ - if (frame->selected && - frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) - { - /* make sure it is visible */ - menu_frame_select(frame, frame->selected, TRUE); - menu_frame_select_next(frame->child); + else if (sym == XK_Right || sym == XK_Return || sym == XK_KP_Enter) + { + /* Right and enter goes to the selected submenu. + Enter executes instead if it's not on a submenu. */ + + if (frame->selected) { + const ObMenuEntryType t = frame->selected->entry->type; + + if (t == OB_MENU_ENTRY_TYPE_SUBMENU) { + /* make sure it is visible */ + menu_frame_select(frame, frame->selected, TRUE); + /* move focus to the child menu */ + menu_frame_select_next(frame->child); + } + else if (sym != XK_Right) { + frame->press_doexec = TRUE; + } } ret = TRUE; } @@ -1892,11 +1900,6 @@ static gboolean event_handle_menu_input(XEvent *ev) ret = TRUE; } - else if (sym == XK_Return || sym == XK_KP_Enter) { - frame->press_doexec = TRUE; - ret = TRUE; - } - /* keyboard accelerator shortcuts. (if it was a valid key) */ else if (frame->entries && (unikey = @@ -1942,8 +1945,15 @@ static gboolean event_handle_menu_input(XEvent *ev) if (found) { menu_frame_select(frame, found, TRUE); - if (num_found == 1) - frame->press_doexec = TRUE; + if (num_found == 1) { + if (found->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { + /* move focus to the child menu */ + menu_frame_select_next(frame->child); + } + else { + frame->press_doexec = TRUE; + } + } ret = TRUE; } } @@ -1958,9 +1968,7 @@ static gboolean event_handle_menu_input(XEvent *ev) frame->got_press && frame->press_doexec) { - if (frame->child) - menu_frame_select_next(frame->child); - else if (frame->selected) + if (frame->selected) menu_entry_frame_execute(frame->selected, ev->xkey.state); } } @@ -2213,7 +2221,7 @@ gboolean event_time_after(guint32 t1, guint32 t2) gboolean find_timestamp(XEvent *e, gpointer data) { const Time t = event_get_timestamp(e); - if (t > event_curtime) { + if (t && t >= event_curtime) { event_curtime = t; return TRUE; } @@ -2257,3 +2265,13 @@ void event_reset_time(void) { next_time(); } + +void event_update_user_time(void) +{ + event_last_user_time = event_time(); +} + +void event_reset_user_time(void) +{ + event_last_user_time = CurrentTime; +} diff --git a/openbox/event.h b/openbox/event.h index f0e2d39..4d9984e 100644 --- a/openbox/event.h +++ b/openbox/event.h @@ -26,7 +26,7 @@ struct _ObClient; /*! The amount of time before a window appears that is checked for user input to determine if the user is working in another window */ -#define OB_EVENT_USER_TIME_DELAY (500) /* 0.5 seconds */ +#define OB_EVENT_USER_TIME_DELAY (1000) /* 1.0 seconds */ /*! The last user-interaction time, as given by the clients */ extern Time event_last_user_time; @@ -76,7 +76,16 @@ void event_reset_time(void); /*! A time at which an event happened that caused this current event to be generated. This is a user-provided time and not to be trusted. Returns CurrentTime if there was no source time provided. - */ +*/ Time event_source_time(void); +/*! Update the timestamp for when the user has last used the focused window. + This updates the timestamp to the time of the last event, given by + event_time(). +*/ +void event_update_user_time(void); + +/*! Reset the timestamp for when the user has last used the focused window. */ +void event_reset_user_time(void); + #endif diff --git a/openbox/focus.c b/openbox/focus.c index 8c02361..a4626bf 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -100,6 +100,10 @@ void focus_set_client(ObClient *client) active = client ? client->window : None; OBT_PROP_SET32(obt_root(ob_screen), NET_ACTIVE_WINDOW, WINDOW, active); } + + /* when focus is moved to a new window, the last_user_time timestamp would + no longer be valid, as it applies for the focused window */ + event_reset_user_time(); } static ObClient* focus_fallback_target(gboolean allow_refocus, diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 39d704c..6d4cc2a 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -93,7 +93,8 @@ void focus_cycle_reorder() focus_cycle_update_indicator(focus_cycle_target); if (!focus_cycle_target) focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, - TRUE, TRUE, TRUE, TRUE, TRUE); + TRUE, TRUE, OB_FOCUS_CYCLE_POPUP_MODE_NONE, + TRUE, TRUE); } } diff --git a/openbox/frame.c b/openbox/frame.c index 8a9a5a6..3aa3ab7 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -276,9 +276,14 @@ void frame_adjust_shape_kind(ObFrame *self, int kind) { gint num; XRectangle xrect[2]; + gboolean shaped; - if (!((kind == ShapeBounding && self->client->shaped) || - (kind == ShapeInput && self->client->shaped_input))) { + shaped = (kind == ShapeBounding && self->client->shaped); +#ifdef ShapeInput + shaped |= (kind == ShapeInput && self->client->shaped_input); +#endif + + if (!shaped) { /* clear the shape on the frame window */ XShapeCombineMask(obt_display, self->window, kind, self->size.left, @@ -323,8 +328,10 @@ void frame_adjust_shape(ObFrame *self) { #ifdef SHAPE frame_adjust_shape_kind(self, ShapeBounding); +#ifdef ShapeInput frame_adjust_shape_kind(self, ShapeInput); #endif +#endif } void frame_adjust_area(ObFrame *self, gboolean moved, @@ -953,7 +960,7 @@ void frame_adjust_state(ObFrame *self) void frame_adjust_focus(ObFrame *self, gboolean hilite) { ob_debug_type(OB_DEBUG_FOCUS, - "Frame for 0x%x has focus: %d\n", + "Frame for 0x%x has focus: %d", self->client->window, hilite); self->focused = hilite; self->need_render = TRUE; diff --git a/openbox/menu.c b/openbox/menu.c index 374aeec..daea0b6 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -49,6 +49,7 @@ static GHashTable *menu_hash = NULL; static ObtXmlInst *menu_parse_inst; static ObMenuParseState menu_parse_state; static gboolean menu_can_hide = FALSE; +static guint menu_timeout_id = 0; static void menu_destroy_hash_value(ObMenu *self); static void parse_menu_item(xmlNodePtr node, gpointer data); @@ -293,19 +294,7 @@ static void parse_menu_item(xmlNodePtr node, gpointer data) if (config_menu_show_icons && obt_xml_attr_string(node, "icon", &icon)) { - RrImage *ic; - - ic = RrImageCacheFindName(ob_rr_icons, icon); - if (ic) - RrImageRef(ic); - else { - ic = RrImageNew(ob_rr_icons); - if (!RrImageAddPictureName(ic, icon)) { - RrImageUnref(ic); /* no need to keep it around */ - ic = NULL; - } - } - e->data.normal.icon = ic; + e->data.normal.icon = RrImageNewFromName(ob_rr_icons, icon); if (e->data.normal.icon) e->data.normal.icon_alpha = 0xff; @@ -337,6 +326,8 @@ static void parse_menu(xmlNodePtr node, gpointer data) ObMenuParseState *state = data; gchar *name = NULL, *title = NULL, *script = NULL; ObMenu *menu; + ObMenuEntry *e; + gchar *icon; if (!obt_xml_attr_string(node, "id", &name)) goto parse_menu_fail; @@ -360,8 +351,20 @@ static void parse_menu(xmlNodePtr node, gpointer data) } } - if (state->parent) - menu_add_submenu(state->parent, -1, name); + if (state->parent) { + e = menu_add_submenu(state->parent, -1, name); + + if (config_menu_show_icons && + obt_xml_attr_string(node, "icon", &icon)) + { + e->data.submenu.icon = RrImageNewFromName(ob_rr_icons, icon); + + if (e->data.submenu.icon) + e->data.submenu.icon_alpha = 0xff; + + g_free(icon); + } + } parse_menu_fail: g_free(name); @@ -437,6 +440,7 @@ void menu_free(ObMenu *menu) static gboolean menu_hide_delay_func(gpointer data) { menu_can_hide = TRUE; + menu_timeout_id = 0; return FALSE; /* no repeat */ } @@ -486,10 +490,11 @@ void menu_show(gchar *name, gint x, gint y, gboolean mouse, ObClient *client) menu_can_hide = TRUE; else { menu_can_hide = FALSE; - g_timeout_add_full(G_PRIORITY_DEFAULT, - config_menu_hide_delay, - menu_hide_delay_func, - NULL, NULL); + if (menu_timeout_id) g_source_remove(menu_timeout_id); + menu_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT, + config_menu_hide_delay, + menu_hide_delay_func, + NULL, NULL); } } } @@ -543,6 +548,7 @@ void menu_entry_unref(ObMenuEntry *self) } break; case OB_MENU_ENTRY_TYPE_SUBMENU: + RrImageUnref(self->data.submenu.icon); g_free(self->data.submenu.name); break; case OB_MENU_ENTRY_TYPE_SEPARATOR: diff --git a/openbox/menu.h b/openbox/menu.h index c0cc199..76cc238 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -103,6 +103,10 @@ typedef enum } ObMenuEntryType; struct _ObNormalMenuEntry { + /* Icon stuff. If you set this, make sure you RrImageRef() it too. */ + RrImage *icon; + gint icon_alpha; + gchar *label; /*! The shortcut key that would be used to activate this menu entry */ gunichar shortcut; @@ -117,10 +121,6 @@ struct _ObNormalMenuEntry { /* List of ObActions */ GSList *actions; - /* Icon stuff. If you set this, make sure you RrImageRef() it too. */ - RrImage *icon; - gint icon_alpha; - /* Mask icon */ RrPixmapMask *mask; RrColor *mask_normal_color; @@ -132,8 +132,13 @@ struct _ObNormalMenuEntry { }; struct _ObSubmenuMenuEntry { + /* Icon stuff. If you set this, make sure you RrImageRef() it too. */ + RrImage *icon; + gint icon_alpha; + gchar *name; ObMenu *submenu; + guint show_from; }; diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 5708cdf..6110045 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -181,7 +181,8 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, self->text = createWindow(self->window, 0, NULL); g_hash_table_insert(menu_frame_map, &self->window, self); g_hash_table_insert(menu_frame_map, &self->text, self); - if (entry->type == OB_MENU_ENTRY_TYPE_NORMAL) { + if ((entry->type == OB_MENU_ENTRY_TYPE_NORMAL) || + (entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)) { self->icon = createWindow(self->window, 0, NULL); g_hash_table_insert(menu_frame_map, &self->icon, self); } @@ -209,7 +210,8 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self) XDestroyWindow(obt_display, self->window); g_hash_table_remove(menu_frame_map, &self->text); g_hash_table_remove(menu_frame_map, &self->window); - if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) { + if ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) || + (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)) { XDestroyWindow(obt_display, self->icon); g_hash_table_remove(menu_frame_map, &self->icon); } @@ -324,11 +326,18 @@ void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y, gint *dx, gint *dy) { const Rect *a = NULL; - gint pos, half; + Rect search = self->area; + gint pos, half, monitor; *dx = *dy = 0; + RECT_SET_POINT(search, x, y); - a = screen_physical_area_monitor(screen_find_monitor_point(x, y)); + if (self->parent) + monitor = self->parent->monitor; + else + monitor = screen_find_monitor(&search); + + a = screen_physical_area_monitor(monitor); half = g_list_length(self->entries) / 2; pos = g_list_index(self->entries, self->selected); @@ -515,7 +524,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) g_assert_not_reached(); } - if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + if (((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) || + (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)) && self->entry->data.normal.icon) { RrAppearance *clear; diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 2f68395..3a98db3 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -21,6 +21,7 @@ #include "framerender.h" #include "screen.h" #include "client.h" +#include "focus.h" #include "frame.h" #include "openbox.h" #include "resist.h" @@ -63,8 +64,8 @@ static ObDirection edge_warp_dir = -1; static gboolean edge_warp_odd = FALSE; static guint edge_warp_timer = 0; static ObDirection key_resize_edge = -1; -#ifdef SYNC static guint waiting_for_sync; +#ifdef SYNC static guint sync_timer = 0; #endif @@ -262,6 +263,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) cur_h = start_ch; moveresize_in_progress = TRUE; + waiting_for_sync = 0; #ifdef SYNC if (config_resize_redraw && !moving && obt_display_extension_sync && @@ -300,8 +302,6 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) XSyncCADelta | XSyncCAEvents, &aa); - - waiting_for_sync = 0; } #endif } @@ -1084,5 +1084,9 @@ gboolean moveresize_event(XEvent *e) used = TRUE; } #endif + + if (used && moveresize_client == focus_client) + event_update_user_time(); + return used; } diff --git a/openbox/openbox.c b/openbox/openbox.c index ae0ba8a..0782794 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -196,7 +196,7 @@ gint main(gint argc, gchar **argv) /* set the DISPLAY environment variable for any lauched children, to the display we're using, so they open in the right place. */ - setenv("DISPLAY", DisplayString(obt_display), TRUE); + g_setenv("DISPLAY", DisplayString(obt_display), TRUE); /* create available cursors */ cursors[OB_CURSOR_NONE] = None; @@ -258,8 +258,7 @@ gint main(gint argc, gchar **argv) gchar *p = g_filename_to_utf8(config_file, -1, NULL, NULL, NULL); if (p) - OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, - utf8, p); + OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, p); g_free(p); } else @@ -286,8 +285,8 @@ gint main(gint argc, gchar **argv) if (ob_rr_theme == NULL) ob_exit_with_error(_("Unable to load a theme.")); - OBT_PROP_SETS(obt_root(ob_screen), - OB_THEME, utf8, ob_rr_theme->name); + OBT_PROP_SETS(obt_root(ob_screen), OB_THEME, + ob_rr_theme->name); } if (reconfigure) { @@ -356,11 +355,11 @@ gint main(gint argc, gchar **argv) } } - reconfigure = FALSE; - ob_set_state(OB_STATE_RUNNING); - if (startup_cmd) run_startup_cmd(); + if (!reconfigure && startup_cmd) run_startup_cmd(); + + reconfigure = FALSE; /* look for parsing errors */ { @@ -590,12 +589,12 @@ static void parse_env(void) const gchar *id; /* unset this so we don't pass it on unknowingly */ - unsetenv("DESKTOP_STARTUP_ID"); + g_unsetenv("DESKTOP_STARTUP_ID"); /* this is how gnome-session passes in a session client id */ id = g_getenv("DESKTOP_AUTOSTART_ID"); if (id) { - unsetenv("DESKTOP_AUTOSTART_ID"); + g_unsetenv("DESKTOP_AUTOSTART_ID"); if (ob_sm_id) g_free(ob_sm_id); ob_sm_id = g_strdup(id); ob_debug_type(OB_DEBUG_SM, @@ -630,7 +629,7 @@ static void parse_args(gint *argc, gchar **argv) } else if (!strcmp(argv[i], "--startup")) { if (i == *argc - 1) /* no args left */ - g_printerr(_("--startup requires an argument\n")); + g_printerr(_("%s requires an argument\n"), "--startup"); else { /* this will be in the current locale encoding, which is what we want */ @@ -664,7 +663,7 @@ static void parse_args(gint *argc, gchar **argv) } else if (!strcmp(argv[i], "--config-file")) { if (i == *argc - 1) /* no args left */ - g_printerr(_("--config-file requires an argument\n")); + g_printerr(_("%s requires an argument\n"), "--config-file"); else { /* this will be in the current locale encoding, which is what we want */ diff --git a/openbox/place.c b/openbox/place.c index d9919d0..d56adfc 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -28,129 +28,209 @@ extern ObDock *dock; -static void add_choice(guint *choice, guint mychoice) +static Rect *pick_pointer_head(ObClient *c) { - guint i; - for (i = 0; i < screen_num_monitors; ++i) { - if (choice[i] == mychoice) - return; - else if (choice[i] == screen_num_monitors) { - choice[i] = mychoice; - return; - } - } + return screen_area(c->desktop, screen_monitor_pointer(), NULL); } -static Rect *pick_pointer_head(ObClient *c) +/* use the following priority lists for pick_head() + + When a window is being placed in the FOREGROUND, use a monitor chosen in + the following order: + 1. same monitor as parent + 2. primary monitor if placement=PRIMARY + active monitor if placement=ACTIVE + pointer monitor if placement=MOUSE + 3. primary monitor + 4. other monitors where the window has group members on the same desktop + 5. other monitors where the window has group members on other desktops + 6. other monitors + + When a window is being placed in the BACKGROUND, use a monitor chosen in the + following order: + 1. same monitor as parent + 2. other monitors where the window has group members on the same desktop + 2a. primary monitor in this set + 2b. other monitors in this set + 3. other monitors where the window has group members on other desktops + 3a. primary monitor in this set + 3b. other monitors in this set + 4. other monitors + 4a. primary monitor in this set + 4b. other monitors in this set +*/ + +/*! One for each possible head, used to sort them in order of precedence. */ +typedef struct { + guint monitor; + guint flags; +} ObPlaceHead; + +/*! Flags for ObPlaceHead */ +enum { + HEAD_PARENT = 1 << 0, /* parent's monitor */ + HEAD_PLACED = 1 << 1, /* chosen monitor by placement */ + HEAD_PRIMARY = 1 << 2, /* primary monitor */ + HEAD_GROUP_DESK = 1 << 3, /* has a group member on the same desktop */ + HEAD_GROUP = 1 << 4, /* has a group member on another desktop */ +}; + +gint cmp_foreground(const void *a, const void *b) { - return screen_area(c->desktop, screen_monitor_pointer(), NULL); + const ObPlaceHead *h1 = a; + const ObPlaceHead *h2 = b; + gint i = 0; + + if (h1->monitor == h2->monitor) return 0; + + if (h1->flags & HEAD_PARENT) --i; + if (h2->flags & HEAD_PARENT) ++i; + if (i) return i; + + if (h1->flags & HEAD_PLACED) --i; + if (h2->flags & HEAD_PLACED) ++i; + if (i) return i; + + if (h1->flags & HEAD_PRIMARY) --i; + if (h2->flags & HEAD_PRIMARY) ++i; + if (i) return i; + + if (h1->flags & HEAD_GROUP_DESK) --i; + if (h2->flags & HEAD_GROUP_DESK) ++i; + if (i) return i; + + if (h1->flags & HEAD_GROUP) --i; + if (h2->flags & HEAD_GROUP) ++i; + if (i) return i; + + return h1->monitor - h2->monitor; +} + +gint cmp_background(const void *a, const void *b) +{ + const ObPlaceHead *h1 = a; + const ObPlaceHead *h2 = b; + gint i = 0; + + if (h1->monitor == h2->monitor) return 0; + + if (h1->flags & HEAD_PARENT) --i; + if (h2->flags & HEAD_PARENT) ++i; + if (i) return i; + + if (h1->flags & HEAD_GROUP_DESK || h2->flags & HEAD_GROUP_DESK) { + if (h1->flags & HEAD_GROUP_DESK) --i; + if (h2->flags & HEAD_GROUP_DESK) ++i; + if (i) return i; + if (h1->flags & HEAD_PRIMARY) --i; + if (h2->flags & HEAD_PRIMARY) ++i; + if (i) return i; + } + + if (h1->flags & HEAD_GROUP || h2->flags & HEAD_GROUP) { + if (h1->flags & HEAD_GROUP) --i; + if (h2->flags & HEAD_GROUP) ++i; + if (i) return i; + if (h1->flags & HEAD_PRIMARY) --i; + if (h2->flags & HEAD_PRIMARY) ++i; + if (i) return i; + } + + if (h1->flags & HEAD_PRIMARY) --i; + if (h2->flags & HEAD_PRIMARY) ++i; + if (i) return i; + + return h1->monitor - h2->monitor; } /*! Pick a monitor to place a window on. */ -static Rect **pick_head(ObClient *c) +static Rect *pick_head(ObClient *c, gboolean foreground) { - Rect **area; - guint *choice; + Rect *area; + ObPlaceHead *choice; guint i; - gint px, py; ObClient *p; + GSList *it; - area = g_new(Rect*, screen_num_monitors); - choice = g_new(guint, screen_num_monitors); - for (i = 0; i < screen_num_monitors; ++i) - choice[i] = screen_num_monitors; /* make them all invalid to start */ - - /* try direct parent first */ - if ((p = client_direct_parent(c))) { - add_choice(choice, client_monitor(p)); - ob_debug("placement adding choice %d for parent", - client_monitor(p)); + choice = g_new(ObPlaceHead, screen_num_monitors); + for (i = 0; i < screen_num_monitors; ++i) { + choice[i].monitor = i; + choice[i].flags = 0; } - /* more than one window in its group (more than just this window) */ - if (client_has_group_siblings(c)) { - GSList *it; - - /* try on the client's desktop */ - for (it = c->group->members; it; it = g_slist_next(it)) { - ObClient *itc = it->data; - if (itc != c && - (itc->desktop == c->desktop || - itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL)) - { - add_choice(choice, client_monitor(it->data)); - ob_debug("placement adding choice %d for group sibling", - client_monitor(it->data)); - } - } - - /* try on all desktops */ + /* find monitors with group members */ + if (c->group) { for (it = c->group->members; it; it = g_slist_next(it)) { ObClient *itc = it->data; if (itc != c) { - add_choice(choice, client_monitor(it->data)); - ob_debug("placement adding choice %d for group sibling on " - "another desktop", client_monitor(it->data)); + guint m = client_monitor(itc); + + if (m < screen_num_monitors) { + if (screen_compare_desktops(itc->desktop, c->desktop)) + choice[m].flags |= HEAD_GROUP_DESK; + else + choice[m].flags |= HEAD_GROUP; + } } } } - /* skip this if placing by the mouse position */ - if (focus_client && client_normal(focus_client) && - config_place_monitor != OB_PLACE_MONITOR_MOUSE) - { - add_choice(choice, client_monitor(focus_client)); - ob_debug("placement adding choice %d for normal focused window", - client_monitor(focus_client)); + i = screen_monitor_primary(FALSE); + if (i < screen_num_monitors) { + choice[i].flags |= HEAD_PRIMARY; + if (config_place_monitor == OB_PLACE_MONITOR_PRIMARY) + choice[i].flags |= HEAD_PLACED; } - screen_pointer_pos(&px, &py); - - for (i = 0; i < screen_num_monitors; i++) { - const Rect *monitor = screen_physical_area_monitor(i); - gboolean contain = RECT_CONTAINS(*monitor, px, py); - if (contain) { - add_choice(choice, i); - ob_debug("placement adding choice %d for mouse pointer", i); - break; - } + /* direct parent takes highest precedence */ + if ((p = client_direct_parent(c))) { + i = client_monitor(p); + if (i < screen_num_monitors) + choice[i].flags |= HEAD_PARENT; } - /* add any leftover choices */ - for (i = 0; i < screen_num_monitors; ++i) - add_choice(choice, i); + qsort(choice, screen_num_monitors, sizeof(ObPlaceHead), + foreground ? cmp_foreground : cmp_background); + /* save the areas of the monitors in order of their being chosen */ for (i = 0; i < screen_num_monitors; ++i) - area[i] = screen_area(c->desktop, choice[i], NULL); + { + ob_debug("placement choice %d is monitor %d", i, choice[i].monitor); + if (choice[i].flags & HEAD_PARENT) + ob_debug(" - parent on monitor"); + if (choice[i].flags & HEAD_PLACED) + ob_debug(" - placement choice"); + if (choice[i].flags & HEAD_PRIMARY) + ob_debug(" - primary monitor"); + if (choice[i].flags & HEAD_GROUP_DESK) + ob_debug(" - group on same desktop"); + if (choice[i].flags & HEAD_GROUP) + ob_debug(" - group on other desktop"); + } + + area = screen_area(c->desktop, choice[0].monitor, NULL); g_free(choice); + /* return the area for the chosen monitor */ return area; } -static gboolean place_random(ObClient *client, gint *x, gint *y) +static gboolean place_random(ObClient *client, Rect *area, gint *x, gint *y) { gint l, r, t, b; - Rect **areas; - guint i; - areas = pick_head(client); - i = (config_place_monitor != OB_PLACE_MONITOR_ANY) ? - 0 : g_random_int_range(0, screen_num_monitors); + ob_debug("placing randomly"); - l = areas[i]->x; - t = areas[i]->y; - r = areas[i]->x + areas[i]->width - client->frame->area.width; - b = areas[i]->y + areas[i]->height - client->frame->area.height; + l = area->x; + t = area->y; + r = area->x + area->width - client->frame->area.width; + b = area->y + area->height - client->frame->area.height; if (r > l) *x = g_random_int_range(l, r + 1); - else *x = areas[i]->x; + else *x = area->x; if (b > t) *y = g_random_int_range(t, b + 1); - else *y = areas[i]->y; - - for (i = 0; i < screen_num_monitors; ++i) - g_slice_free(Rect, areas[i]); - g_free(areas); + else *y = area->y; return TRUE; } @@ -228,118 +308,108 @@ enum { IGNORE_END = 7 }; -static gboolean place_nooverlap(ObClient *c, gint *x, gint *y) +static gboolean place_nooverlap(ObClient *c, Rect *area, gint *x, gint *y) { - Rect **areas; gint ignore; gboolean ret; gint maxsize; GSList *spaces = NULL, *sit, *maxit; - guint i; - areas = pick_head(c); + ob_debug("placing nonoverlap"); + ret = FALSE; maxsize = 0; maxit = NULL; /* try ignoring different things to find empty space */ for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) { - /* try all monitors in order of preference, but only the first one - if config_place_monitor is MOUSE or ACTIVE */ - for (i = 0; (i < (config_place_monitor != OB_PLACE_MONITOR_ANY ? - 1 : screen_num_monitors) && !ret); ++i) - { - GList *it; - - /* add the whole monitor */ - spaces = area_add(spaces, areas[i]); - - /* go thru all the windows */ - for (it = client_list; it; it = g_list_next(it)) { - ObClient *test = it->data; - - /* should we ignore this client? */ - if (screen_showing_desktop) continue; - if (c == test) continue; - if (test->iconic) continue; - if (c->desktop != DESKTOP_ALL) { - if (test->desktop != c->desktop && - test->desktop != DESKTOP_ALL) continue; - } else { - if (test->desktop != screen_desktop && - test->desktop != DESKTOP_ALL) continue; - } - if (test->type == OB_CLIENT_TYPE_SPLASH || - test->type == OB_CLIENT_TYPE_DESKTOP) continue; - - - if ((ignore >= IGNORE_FULLSCREEN) && - test->fullscreen) continue; - if ((ignore >= IGNORE_MAXIMIZED) && - test->max_horz && test->max_vert) continue; - if ((ignore >= IGNORE_MENUTOOL) && - (test->type == OB_CLIENT_TYPE_MENU || - test->type == OB_CLIENT_TYPE_TOOLBAR) && - client_has_parent(c)) continue; - /* - if ((ignore >= IGNORE_SHADED) && - test->shaded) continue; - */ - if ((ignore >= IGNORE_NONGROUP) && - client_has_group_siblings(c) && - test->group != c->group) continue; - if ((ignore >= IGNORE_BELOW) && - test->layer < c->layer) continue; - /* - if ((ignore >= IGNORE_NONFOCUS) && - focus_client != test) continue; - */ - /* don't ignore this window, so remove it from the available - area */ - spaces = area_remove(spaces, &test->frame->area); + GList *it; + + /* add the whole monitor */ + spaces = area_add(spaces, area); + + /* go thru all the windows */ + for (it = client_list; it; it = g_list_next(it)) { + ObClient *test = it->data; + + /* should we ignore this client? */ + if (screen_showing_desktop) continue; + if (c == test) continue; + if (test->iconic) continue; + if (c->desktop != DESKTOP_ALL) { + if (test->desktop != c->desktop && + test->desktop != DESKTOP_ALL) continue; + } else { + if (test->desktop != screen_desktop && + test->desktop != DESKTOP_ALL) continue; } + if (test->type == OB_CLIENT_TYPE_SPLASH || + test->type == OB_CLIENT_TYPE_DESKTOP) continue; + + + if ((ignore >= IGNORE_FULLSCREEN) && + test->fullscreen) continue; + if ((ignore >= IGNORE_MAXIMIZED) && + test->max_horz && test->max_vert) continue; + if ((ignore >= IGNORE_MENUTOOL) && + (test->type == OB_CLIENT_TYPE_MENU || + test->type == OB_CLIENT_TYPE_TOOLBAR) && + client_has_parent(c)) continue; + /* + if ((ignore >= IGNORE_SHADED) && + test->shaded) continue; + */ + if ((ignore >= IGNORE_NONGROUP) && + client_has_group_siblings(c) && + test->group != c->group) continue; + if ((ignore >= IGNORE_BELOW) && + test->layer < c->layer) continue; + /* + if ((ignore >= IGNORE_NONFOCUS) && + focus_client != test) continue; + */ + /* don't ignore this window, so remove it from the available + area */ + spaces = area_remove(spaces, &test->frame->area); + } - if (ignore < IGNORE_DOCK) { - Rect a; - dock_get_area(&a); - spaces = area_remove(spaces, &a); - } + if (ignore < IGNORE_DOCK) { + Rect a; + dock_get_area(&a); + spaces = area_remove(spaces, &a); + } - for (sit = spaces; sit; sit = g_slist_next(sit)) { - Rect *r = sit->data; + for (sit = spaces; sit; sit = g_slist_next(sit)) { + Rect *r = sit->data; - if (r->width >= c->frame->area.width && - r->height >= c->frame->area.height && - r->width * r->height > maxsize) - { - maxsize = r->width * r->height; - maxit = sit; - } + if (r->width >= c->frame->area.width && + r->height >= c->frame->area.height && + r->width * r->height > maxsize) + { + maxsize = r->width * r->height; + maxit = sit; } + } - if (maxit) { - Rect *r = maxit->data; + if (maxit) { + Rect *r = maxit->data; - /* center it in the area */ - *x = r->x; - *y = r->y; - if (config_place_center) { - *x += (r->width - c->frame->area.width) / 2; - *y += (r->height - c->frame->area.height) / 2; - } - ret = TRUE; + /* center it in the area */ + *x = r->x; + *y = r->y; + if (config_place_center) { + *x += (r->width - c->frame->area.width) / 2; + *y += (r->height - c->frame->area.height) / 2; } + ret = TRUE; + } - while (spaces) { - g_slice_free(Rect, spaces->data); - spaces = g_slist_delete_link(spaces, spaces); - } + while (spaces) { + g_slice_free(Rect, spaces->data); + spaces = g_slist_delete_link(spaces, spaces); } } - for (i = 0; i < screen_num_monitors; ++i) - g_slice_free(Rect, areas[i]); - g_free(areas); return ret; } @@ -349,6 +419,8 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y) gint px, py; Rect *area; + ob_debug("placing under mouse"); + if (!screen_pointer_pos(&px, &py)) return FALSE; area = pick_pointer_head(client); @@ -376,27 +448,17 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, if (!settings || (settings && !settings->pos_given)) return FALSE; + ob_debug("placing by per-app settings"); + /* Find which head the pointer is on */ if (settings->monitor == 0) /* this can return NULL */ screen = pick_pointer_head(client); - else if (settings->monitor > 0 && - (guint)settings->monitor <= screen_num_monitors) - screen = screen_area(client->desktop, (guint)settings->monitor - 1, - NULL); - - /* if we have't found a screen yet.. */ - if (!screen) { - Rect **areas; - guint i; - - areas = pick_head(client); - screen = areas[0]; - - /* don't free the first one, it's being set as "screen" */ - for (i = 1; i < screen_num_monitors; ++i) - g_slice_free(Rect, areas[i]); - g_free(areas); + else { + guint m = settings->monitor; + if (m < 1 || m > screen_num_monitors) + m = screen_monitor_primary(TRUE) + 1; + screen = screen_area(client->desktop, m - 1, NULL); } if (settings->position.x.center) @@ -423,12 +485,16 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y, return TRUE; } -static gboolean place_transient_splash(ObClient *client, gint *x, gint *y) +static gboolean place_transient_splash(ObClient *client, Rect *area, + gint *x, gint *y) { if (client->type == OB_CLIENT_TYPE_DIALOG) { GSList *it; gboolean first = TRUE; gint l, r, t, b; + + ob_debug("placing dialog"); + for (it = client->parents; it; it = g_slist_next(it)) { ObClient *m = it->data; if (!m->iconic) { @@ -456,17 +522,10 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y) if (client->type == OB_CLIENT_TYPE_DIALOG || client->type == OB_CLIENT_TYPE_SPLASH) { - Rect **areas; - guint i; - - areas = pick_head(client); + ob_debug("placing dialog or splash"); - *x = (areas[0]->width - client->frame->area.width) / 2 + areas[0]->x; - *y = (areas[0]->height - client->frame->area.height) / 2 + areas[0]->y; - - for (i = 0; i < screen_num_monitors; ++i) - g_slice_free(Rect, areas[i]); - g_free(areas); + *x = (area->width - client->frame->area.width) / 2 + area->x; + *y = (area->height - client->frame->area.height) / 2 + area->y; return TRUE; } @@ -475,9 +534,10 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y) /*! Return TRUE if openbox chose the position for the window, and FALSE if the application chose it */ -gboolean place_client(ObClient *client, gint *x, gint *y, +gboolean place_client(ObClient *client, gboolean foreground, gint *x, gint *y, ObAppSettings *settings) { + Rect *area; gboolean ret; /* per-app settings override program specified position @@ -488,15 +548,19 @@ gboolean place_client(ObClient *client, gint *x, gint *y, !(settings && settings->pos_given))) return FALSE; + area = pick_head(client, foreground); + /* try a number of methods */ ret = place_per_app_setting(client, x, y, settings) || - place_transient_splash(client, x, y) || + place_transient_splash(client, area, x, y) || (config_place_policy == OB_PLACE_POLICY_MOUSE && place_under_mouse(client, x, y)) || - place_nooverlap(client, x, y) || - place_random(client, x, y); + place_nooverlap(client, area, x, y) || + place_random(client, area, x, y); g_assert(ret); + g_slice_free(Rect, area); + /* get where the client should be */ frame_frame_gravity(client->frame, x, y); return TRUE; diff --git a/openbox/place.h b/openbox/place.h index 6a9add4..94e2dc0 100644 --- a/openbox/place.h +++ b/openbox/place.h @@ -35,10 +35,11 @@ typedef enum { OB_PLACE_MONITOR_ANY, OB_PLACE_MONITOR_ACTIVE, - OB_PLACE_MONITOR_MOUSE + OB_PLACE_MONITOR_MOUSE, + OB_PLACE_MONITOR_PRIMARY } ObPlaceMonitor; -gboolean place_client(struct _ObClient *client, gint *x, gint *y, - struct _ObAppSettings *settings); +gboolean place_client(struct _ObClient *client, gboolean foreground, + gint *x, gint *y, struct _ObAppSettings *settings); #endif diff --git a/openbox/prompt.c b/openbox/prompt.c index ae7f38f..785b46c 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -175,7 +175,7 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *title, /* set the window's title */ if (title) - OBT_PROP_SETS(self->super.window, NET_WM_NAME, utf8, title); + OBT_PROP_SETS(self->super.window, NET_WM_NAME, title); /* listen for key presses on the window */ self->event_mask = KeyPressMask; diff --git a/openbox/screen.c b/openbox/screen.c index 353d2de..d368cab 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -206,7 +206,7 @@ gboolean screen_annex(void) NET_SUPPORTING_WM_CHECK, WINDOW, screen_support_win); /* set properties on the supporting window */ - OBT_PROP_SETS(screen_support_win, NET_WM_NAME, utf8, "Openbox"); + OBT_PROP_SETS(screen_support_win, NET_WM_NAME, "Openbox"); OBT_PROP_SET32(screen_support_win, NET_SUPPORTING_WM_CHECK, WINDOW, screen_support_win); @@ -311,7 +311,7 @@ gboolean screen_annex(void) NET_SUPPORTED, ATOM, supported, num_support); g_free(supported); - OBT_PROP_SETS(RootWindow(obt_display, ob_screen), OB_VERSION, utf8, + OBT_PROP_SETS(RootWindow(obt_display, ob_screen), OB_VERSION, OPENBOX_VERSION); screen_tell_ksplash(); @@ -375,7 +375,7 @@ void screen_startup(gboolean reconfig) screen_resize(); /* have names already been set for the desktops? */ - if (OBT_PROP_GETSS(obt_root(ob_screen), NET_DESKTOP_NAMES, utf8, &names)) { + if (OBT_PROP_GETSS_UTF8(obt_root(ob_screen), NET_DESKTOP_NAMES, &names)) { g_strfreev(names); namesexist = TRUE; } @@ -397,7 +397,7 @@ void screen_startup(gboolean reconfig) /* set the root window property */ OBT_PROP_SETSS(obt_root(ob_screen), - NET_DESKTOP_NAMES, utf8, (const gchar*const*)names); + NET_DESKTOP_NAMES, (const gchar*const*)names); g_strfreev(names); } @@ -500,11 +500,12 @@ void screen_resize(void) if (ob_state() != OB_STATE_RUNNING) return; - screen_update_areas(); + /* this calls screen_update_areas(), which we need ! */ dock_configure(); - for (it = client_list; it; it = g_list_next(it)) - client_move_onscreen(it->data, FALSE); + if (oldw) + for (it = client_list; it; it = g_list_next(it)) + client_move_onscreen(it->data, FALSE); } void screen_set_num_desktops(guint num) @@ -1182,7 +1183,7 @@ void screen_update_desktop_names(void) screen_desktop_names = NULL; if (OBT_PROP_GETSS(obt_root(ob_screen), - NET_DESKTOP_NAMES, utf8, &screen_desktop_names)) + NET_DESKTOP_NAMES, &screen_desktop_names)) for (i = 0; screen_desktop_names[i] && i < screen_num_desktops; ++i); else i = 0; @@ -1209,7 +1210,7 @@ void screen_update_desktop_names(void) /* if we changed any names, then set the root property so we can all agree on the names */ OBT_PROP_SETSS(obt_root(ob_screen), NET_DESKTOP_NAMES, - utf8, (const gchar*const*)screen_desktop_names); + (const gchar*const*)screen_desktop_names); } /* resize the pager for these names */ @@ -1458,10 +1459,8 @@ void screen_update_areas(void) dims, 4 * screen_num_desktops); /* the area has changed, adjust all the windows if they need it */ - for (it = onscreen; it; it = g_list_next(it)) { - client_move_onscreen(it->data, FALSE); + for (it = onscreen; it; it = g_list_next(it)) client_reconfigure(it->data, FALSE); - } g_free(dims); } @@ -1653,7 +1652,7 @@ guint screen_find_monitor(const Rect *search) } } } - return most; + return most < screen_num_monitors ? most : screen_monitor_primary(FALSE); } const Rect* screen_physical_area_all_monitors(void) @@ -1754,3 +1753,12 @@ gboolean screen_pointer_pos(gint *x, gint *y) } return ret; } + +gboolean screen_compare_desktops(guint a, guint b) +{ + if (a == DESKTOP_ALL) + a = screen_desktop; + if (b == DESKTOP_ALL) + b = screen_desktop; + return a == b; +} diff --git a/openbox/screen.h b/openbox/screen.h index d15b352..a6a3995 100644 --- a/openbox/screen.h +++ b/openbox/screen.h @@ -164,4 +164,12 @@ gboolean screen_pointer_pos(gint *x, gint *y); /*! Returns the monitor which contains the pointer device */ guint screen_monitor_pointer(void); +/*! Compare the desktop for two windows to see if they are considered on the + same desktop. + Windows that are on "all desktops" are treated like they are only on the + current desktop, so they are only in one place at a time. + @return TRUE if they are on the same desktop, FALSE otherwise. +*/ +gboolean screen_compare_desktops(guint a, guint b); + #endif diff --git a/openbox/stacking.c b/openbox/stacking.c index 58a85ec..58551b5 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -571,17 +571,16 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling) { GList *it; gboolean occluded = FALSE; - gboolean found = FALSE; /* no need for any looping in this case */ if (sibling && client->layer != sibling->layer) return occluded; - for (it = stacking_list; it; - it = (found ? g_list_previous(it) :g_list_next(it))) + for (it = g_list_previous(g_list_find(stacking_list, client)); it; + it = g_list_previous(it)) if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (found && !c->iconic && + if (!c->iconic && (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || c->desktop == client->desktop) && !client_search_transient(client, c)) @@ -602,8 +601,6 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling) break; /* we past its layer */ } } - else if (c == client) - found = TRUE; } return occluded; } @@ -615,16 +612,16 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling) { GList *it; gboolean occludes = FALSE; - gboolean found = FALSE; /* no need for any looping in this case */ if (sibling && client->layer != sibling->layer) return occludes; - for (it = stacking_list; it; it = g_list_next(it)) + for (it = g_list_next(g_list_find(stacking_list, client)); + it; it = g_list_next(it)) if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (found && !c->iconic && + if (!c->iconic && (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || c->desktop == client->desktop) && !client_search_transient(c, client)) @@ -645,8 +642,6 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling) break; /* we past its layer */ } } - else if (c == client) - found = TRUE; } return occludes; } diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c index 16654cf..e249002 100644 --- a/openbox/startupnotify.c +++ b/openbox/startupnotify.c @@ -263,7 +263,7 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name, 20 * 1000, sn_launch_wait_timeout, sn_launcher, (GDestroyNotify)sn_launcher_context_unref); - setenv("DESKTOP_STARTUP_ID", id, TRUE); + g_setenv("DESKTOP_STARTUP_ID", id, TRUE); g_free(desc); } diff --git a/openbox/window.c b/openbox/window.c index ad61294..51806f9 100644 --- a/openbox/window.c +++ b/openbox/window.c @@ -26,6 +26,7 @@ #include "prompt.h" #include "debug.h" #include "grab.h" +#include "obt/prop.h" #include "obt/xqueue.h" static GHashTable *window_map; @@ -186,6 +187,20 @@ void window_manage(Window win) } XFree(wmhints); } + /* This is a new method to declare that a window is a dockapp, being + implemented by Windowmaker, to alleviate pain in writing GTK+ + dock apps. + http://thread.gmane.org/gmane.comp.window-managers.openbox/4881 + */ + if (!is_dockapp) { + gchar **ss; + if (OBT_PROP_GETSS_TYPE(win, WM_CLASS, STRING_NO_CC, &ss)) + { + if (ss[0] && ss[1] && strcmp(ss[1], "DockApp") == 0) + is_dockapp = TRUE; + g_strfreev(ss); + } + } } if (!no_manage) { diff --git a/po/ar.po b/po/ar.po index 6ecf08e..a9701b6 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2007-07-21 14:43+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,223 +19,229 @@ msgstr "" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : " "3\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "" -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "فشلت في تحويل المسار \"%s\" من utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "" -#: openbox/actions/exit.c:56 -msgid "Are you sure you want to exit Openbox?" -msgstr "" - -#: openbox/actions/exit.c:57 -msgid "Exit Openbox" +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" msgstr "" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" +#: openbox/actions/exit.c:75 +msgid "Log Out" msgstr "" -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" +#: openbox/actions/exit.c:78 +msgid "Are you sure you want to exit Openbox?" msgstr "" -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" +#: openbox/actions/exit.c:79 +msgid "Exit Openbox" msgstr "" -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "" -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "اذهب هناك..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "أدِر أسطح المكتب" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "أضِف سطح مكتب جديد (_A)" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "احذف آخر سطح مكتب (_R)" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "نوافذ" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "أسطح مكتب" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "كل أسطح المكتب" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "طبقة (_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "دائما على السطح (_T)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "طبيعي (_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "دائما في القاع (_B)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "أرسِل إلى سطح المكتب (_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "قائمة العميل" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "استعِد (_E)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "انقل (_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "حجِّم (_Z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "صغّر (_N)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "كبّر (_X)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "لُف لأعلى/لأسفل (_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "ضع/أزل الحواف (_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "أغلق (_C)" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "سياق غير صحيح \"%s\" في ارتباط الفأرة" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "زر غير صحيح \"%s\" محدد في ملف الإعدادات" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "لم أستطِع إنشاء الدليل '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "أغلق" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "لم أعثر على ملف قائمة سليم \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "فشل تنفيذ أمر ل pipe-menu \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "خرج غير سليم من pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "حاولت الوصول إلى القائمة \"%s\" لكنها غير موجودة" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "المزيد..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "زر غير صحيح \"%s\" في ارتباط الفأرة" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "سياق غير صحيح \"%s\" في ارتباط الفأرة" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "لم أستطع تغيير المجلد المنزلي \"%s\": %s" @@ -243,27 +250,27 @@ msgstr "لم أستطع تغيير المجلد المنزلي \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "تعذّر بدأ مكتبة obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "خادم إكس لا يدعم المحليّة." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "لم أستطِع تحميل سِمة." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -271,28 +278,24 @@ msgid "" "was in file \"%s\" line %d, with message: %s" msgstr "" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "أغلق" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "حقوق النسخ" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "الصيغة: openbox [options]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -300,30 +303,30 @@ msgstr "" "\n" "الخيارات:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help اعرض هذه المساعدة ثم اخرج\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version اعرض النسخة ثم اخرج\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace استبدل مدير النوافذ الذي يعمل حاليا\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable عطِّل الإتصال بمدير الجلسة\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -331,19 +334,19 @@ msgstr "" "\n" "تمرير رسائل لمرّة تعمل من أوبن‌بوكس:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure أعِد تحميل إعدادات أوبن‌بوكس\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart أعِد تشغيل أوبن‌بوكس\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -351,10 +354,14 @@ msgstr "" "\n" "خيارات التنقيح:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync شغّل في النمط المزامن\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug اعرض خرْج التنقيح\n" @@ -364,10 +371,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus اعرض خرج التنقيح للتعامل مع البؤرة\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama شق العرض إلى شاشات xinerama زائفة\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -376,26 +387,27 @@ msgstr "" "\n" "من فضلك أبلغ عن العلل إلى %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" msgstr "" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "معامل سطر أوامر غير سليم \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "يعمل مدير نوافذ بالفعل على الشاشة %Id" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "تعذّر الحصول على انتقاء مدير النوافذ على الشاشة %Id" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "مدير النوافذ على الشاشة %Id لا وجود له" @@ -404,7 +416,7 @@ msgstr "مدير النوافذ على الشاشة %Id لا وجود له" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -417,31 +429,12 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "سطح المكتب %Ii" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "لم أستطِع إنشاء الدليل \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "لم أستطِع حفظ الجلسة إلى \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "خطأ أثناء حفظ الجلسة إلى \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "تشغيل %s" @@ -466,14 +459,18 @@ msgstr "اسم مفتاح \"%s\" غير سليم في ارتباط المفتا msgid "Requested key \"%s\" does not exist on the display" msgstr "المفتاح المطلوب \"%s\" لا وجود له في العرض" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "خطأ إكس: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "" +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "لم أستطِع حفظ الجلسة إلى \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "خطأ أثناء حفظ الجلسة إلى \"%s\": %s" + +#~ msgid "X Error: %s" +#~ msgstr "خطأ إكس: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "فشلت في تنفيذ \"%s\": %s" diff --git a/po/bn_IN.po b/po/bn_IN.po index b7c898c..b6a7d0a 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -7,234 +7,241 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2007-06-01 19:02+0530\n" "Last-Translator: Runa Bhattacharjee \n" "Language-Team: Bengali (India) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "" "অবৈধ কর্ম \"%s\"-র অনুরোধ জানানো হয়েছে। এই ধরনের কোনো কর্ম বর্তমানে উপস্থিত নেই।" -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "\"%s\" পাথটি utf8 থেকে রূপান্তর করতে ব্যর্থ" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "" -#: openbox/actions/exit.c:56 -msgid "Are you sure you want to exit Openbox?" -msgstr "" - -#: openbox/actions/exit.c:57 -msgid "Exit Openbox" +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" msgstr "" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" +#: openbox/actions/exit.c:75 +msgid "Log Out" msgstr "" -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" +#: openbox/actions/exit.c:78 +msgid "Are you sure you want to exit Openbox?" msgstr "" -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" +#: openbox/actions/exit.c:79 +msgid "Exit Openbox" msgstr "" -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "" -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "চিহ্নিত স্থানে চলুন..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "উইন্ডো" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "ডেস্কটপ" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "সর্বপ্রকার ডেস্কটপ" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "স্তর (_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "সর্বদা উপরে (_t)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "স্বাভাবিক (_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "সর্বদা নীচে (_b)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "ডেস্কটপে পাঠানো হবে (_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "ক্লায়েন্ট মেনু" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "পুনরুদ্ধার (_e)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "স্থানান্তরণ (_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "মাপ পরিবর্তন (_z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "আইকন রূপে প্রদর্শন (_n)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "বড় করুন (_x)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "উপরে/নীচে গুটিয়ে নিন (_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "বিন্যাস পরিবর্তন (_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "বন্ধ করুন (_C)" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট \"%s\"" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "কনফিগ ফাইলে অবৈধ বাটন \"%s\" উল্লিখিত হয়েছে" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "'%s' ডিরেক্টরি নির্মাণ করতে ব্যর্থ: %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "বন্ধ করুন" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "বৈধ মেনু ফাইল \"%s\" সনাক্ত করতে ব্যর্থ" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "পাইপ-মেনু \"%s\"-র জন্য কমান্ড সঞ্চালন করতে ব্যর্থ: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "পাইপ-মেনু \"%s\" থেকে অবৈধ ফলাফল প্রাপ্ত হয়েছে" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "অনুপস্থিত মেনু \"%s\" ব্যবহারের প্রচেষ্টা হয়েছে" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "অতিরিক্ত..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ বাটন \"%s\"" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট \"%s\"" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "ব্যক্তিগত ডিরেক্টরি \"%s\"-তে পরিবর্তন করতে ব্যর্থ: %s" @@ -243,27 +250,27 @@ msgstr "ব্যক্তিগত ডিরেক্টরি \"%s\"-তে msgid "Failed to open the display from the DISPLAY environment variable." msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "থিম লোড করতে ব্যর্থ।" -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -271,28 +278,24 @@ msgid "" "was in file \"%s\" line %d, with message: %s" msgstr "" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "বন্ধ করুন" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল \"%s\" সঞ্চালন করতে ব্যর্থ: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "স্বত্বাধিকার (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -300,15 +303,15 @@ msgstr "" "\n" "বিবিধ বিকল্প:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version সংস্করণ প্রদর্শন করে প্রস্থান\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n" @@ -316,16 +319,16 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -333,19 +336,19 @@ msgstr "" "\n" "চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox-র কনফিগারেশন পুনরায় লোড করে\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox পুনরারম্ভ\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -353,10 +356,14 @@ msgstr "" "\n" "ডিবাগ করার বিভিন্ন বিকল্প:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug ডিবাগ-এর ফলাফল প্রদর্শন করে\n" @@ -367,10 +374,14 @@ msgstr "" " --debug-focus ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -379,26 +390,27 @@ msgstr "" "\n" "অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" msgstr "" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "একটি উইন্ডো পরিচালন ব্যবস্থা বর্তমানে %d-এ চলছে" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্যবস্থার নির্বাচিত অংশ প্রাপ্ত করতে ব্যর্থ" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ" @@ -407,7 +419,7 @@ msgstr "পর্দা %d-র উপর চলমান উইন্ডো প #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -418,31 +430,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "desktop %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "\"%s\" ডিরেক্টরি নির্মাণ করতে ব্যর্থ: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "\"%s\"-র সেশান সংরক্ষণ করতে ব্যর্থ: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "\"%s\"-এ সেশান সংরক্ষণকালে সমস্যা: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "%s সঞ্চালিত হচ্ছে" @@ -467,15 +460,19 @@ msgstr "কি-বাইন্ডিং-র মধ্যে অবৈধ কি- msgid "Requested key \"%s\" does not exist on the display" msgstr "অনুরোধ করা কি \"%s\", প্রদর্শন ক্ষেত্রে উপস্থিত নেই" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X সংক্রান্ত ত্রুটি: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "" +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "\"%s\"-র সেশান সংরক্ষণ করতে ব্যর্থ: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "\"%s\"-এ সেশান সংরক্ষণকালে সমস্যা: %s" + +#~ msgid "X Error: %s" +#~ msgstr "X সংক্রান্ত ত্রুটি: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "\"%s\" সঞ্চালন করতে ব্যর্থ: %s" diff --git a/po/ca.po b/po/ca.po index 287af4f..b892ebc 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,85 +7,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-05-25 19:23+0200\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "L'acció sollicitada \"%s\" no és vàlida. Aquesta acció no existeix." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "No" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Sí" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Executa" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "No s'ha pogut convertir el camí \"%s\" des de utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Cancel·la" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Surt" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Esteu segur de voler sortir?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Surt" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Esteu segur de voler sortir de Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Surt de Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"L'acció SessionLogout no està disponible ja que el Openbox s'ha compilat " -"sense suport per a la gestió de sessions" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Surt" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Esteu segur de voler sortir?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Finestra sense nom" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "S'està finalitzant..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "No està responent" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -94,11 +84,11 @@ msgstr "" "Sembla que la finestra \"%s\" no està responent. Voleu forçar-la a " "finalitzar enviant el senyal %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Finalitza el procés" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -107,139 +97,154 @@ msgstr "" "Sembla que la finestra \"%s\" no està responent. Voleu desconnectar-la del " "servidor d'X?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Desconnecta" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Vés aquí..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Gestiona els escriptoris" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Afegeix un nou escriptori" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Suprimeix l'últim escriptori" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Finestres" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Escriptoris" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Tots els escriptoris" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Capa" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Sempre a so_bre" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Sempre a so_ta" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "A l'_escriptori" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menú del client" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Restaur_a" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Mou" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Redimen_siona" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimitza" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximitza" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "En/Desen_rotlla" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Sense/Amb _decoració" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Tanca" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "El context \"%s\" no és vàlid en la vinculació del ratolí" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "El botó especificat al fitxer de configuració \"%s\" no és vàlid." -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "No és pot crear el directori '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Tanca" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "No s'ha pogut trobar un fitxer de menú \"%s\" vàlid" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "" "S'ha produït un error en executar l'ordre per al menú de conducte \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "La sortida del menú de conducte \"%s\" no és vàlida" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "S'ha intentat accedir al menú \"%s\" ja que no existeix" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Més..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "El botó \"%s\" no és vàlid en la vinculació del ratolí" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "El context \"%s\" no és vàlid en la vinculació del ratolí" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "No s'ha pogut canviar al directori de l'usuari \"%s\": %s" @@ -248,29 +253,29 @@ msgstr "No s'ha pogut canviar al directori de l'usuari \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "No s'ha pogut obrir la pantalla des de la variable d'entorn DISPLAY" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "S'ha produït un error en inicialitza la llibreria obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "El servidor X no te suport per a idiomes" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "No s'ha pogut assignar els modificadors del locale per al servidor X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "No s'ha pogut trobat un fitxer de configuració vàlid, s'utilitzaran alguns " "valors predeterminats" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "No s'ha pogut carregar el tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -281,30 +286,26 @@ msgstr "" "configuració de Openbox. Per a més informació visualitza el stdout. L'últim " "error trobat estava al fitxer \"%s\" línia %d, amb el missatge: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Error de sintaxi de Openbox" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Tanca" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "S'ha produït un error en tornar a iniciar i executar el nou executable \"%s" "\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaxis: openbox [opcions]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -312,15 +313,15 @@ msgstr "" "\n" "Opcions:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Visualitza aquesta ajuda i surt\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Visualitza la versió i surt\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Reemplaça el gestor de finestres que s'està executant " @@ -329,18 +330,18 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FITXER\n" " Especifica el camí del fitxer de configuració a " "utilitzar\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Inhabilita la connexió amb el gestor de sessió\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -349,19 +350,19 @@ msgstr "" "S'està transferint missatges a la instància del Openbox que s'està " "executant:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Torna a carregar la configuració de Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Torna a iniciar Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Surt de Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -369,10 +370,14 @@ msgstr "" "\n" "Opcions de depuració:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Executa en mode sincronitzat\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Mostra la sortida de depuració\n" @@ -384,12 +389,19 @@ msgstr "" "focus\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Mostra la sortida de depuració per a la gestió del " +"session management\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Divideix la visualització en pantalles xinerama " "falses\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -398,27 +410,28 @@ msgstr "" "\n" "Informeu dels errors a %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file necessita un argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s necessita un argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Opció \"%s\" no vàlida a la línia d'ordres\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Encara s'està executant un gestor de finestres a la pantalla %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "" "No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "El gestor de finestres de la pantalla %d no està sortint" @@ -427,7 +440,7 @@ msgstr "El gestor de finestres de la pantalla %d no està sortint" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -436,37 +449,18 @@ msgid_plural "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr[0] "" -"El Openbox està configurat per a %d escriptori, però la sessió actual en te %" -"d. S'està modificant la configuració del Openbox." +"El Openbox està configurat per a %d escriptori, però la sessió actual en te " +"%d. S'està modificant la configuració del Openbox." msgstr[1] "" "El Openbox està configurat per a %d escriptoris, però la sessió actual en te " "%d. S'està modificant la configuració del Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "escriptori %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "No és pot crear el directori \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "No s'ha pogut desar la sessió a \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "S'ha produït un error mentre es desava la sessió a \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "No esteu connectats al gestor de sessions" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Executant %s" @@ -492,15 +486,36 @@ msgstr "El nom de la tecla \"%s\" no és vàlid en la vinculació de tecles" msgid "Requested key \"%s\" does not exist on the display" msgstr "La tecla seleccionada \"%s\" no existeix a la pantalla" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Error d'X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "D'acord" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Surt de Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file necessita un argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "L'acció SessionLogout no està disponible ja que el Openbox s'ha compilat " +#~ "sense suport per a la gestió de sessions" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "No s'ha pogut desar la sessió a \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "S'ha produït un error mentre es desava la sessió a \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "No esteu connectats al gestor de sessions" + +#~ msgid "X Error: %s" +#~ msgstr "Error d'X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "No s'ha pogut executar \"%s\": %s" diff --git a/po/cs.po b/po/cs.po index 49ad300..79d84cf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,233 +7,238 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-17 17:00+0100\n" "Last-Translator: tezlo \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Požadována neplatná akce \"%s\". Žádná taková akce neexistuje." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ne" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Ano" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Spustit" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Nepodařilo se převést cestu \"%s\" z utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "ZruÅ¡it" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Konec" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Určitě odhlásit?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Odhlásit" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Určitě chcete ukončit Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Ukončit Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Akce SessionLogout není k dispozici jelikož byl Openbox zkompilován bez " -"podpory session manageru" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Odhlásit" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Určitě odhlásit?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Nepojmenované Okno" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Ukončuji..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Neodpovídá" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "Okno \"%s\" nedpovídá. Chcete jej ukončit signálem %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Ukončit Proces" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Okno \"%s\" neodpovídá. Chcete jej odpojit od X serveru?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Odpojit" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Jdi tam..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Spravovat plochy" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Přidat novou plochu" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Odstranit poslední plochu" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Okna" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Plochy" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "VÅ¡echny plochy" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "Vrs_tva" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Vždy na_vrchu" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normální" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Vždy ve_spodu" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Poslat na plochu" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menu klienta" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Obnovit" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Přes_unout" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Veli_kost" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimalizovat" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximalizovat" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "S_rolovat/Vyrolovat" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Oz_dobit/Odzdobit" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Zavřít" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Neplatný kontext \"%s\" v nastavení myÅ¡i" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Neplatné tlačítko \"%s\" v konfiguračním souboru" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Nepodařilo se vytvořit adresář '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Zavřít" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt klávesových zkratek v konfiguračním souboru" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Nepodařilo se najít platný menu soubor \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Nepodařilo se spustit příkaz pro pipe-menu \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Neplatný výstup z pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Pokus o přístup k menu \"%s\", ale ono neexistuje" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Víc..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Neplatné tlačítko \"%s\" v nastavení myÅ¡i" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Neplatný kontext \"%s\" v nastavení myÅ¡i" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Nepodařilo se přejít do domácího adresáře \"%s\": %s" @@ -242,29 +247,29 @@ msgstr "Nepodařilo se přejít do domácího adresáře \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Nepodařilo se otevřít displej z proměnné prostředí DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Nepodařilo se inicializovat knihovnu obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X server nepodporuje lokalizaci." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Nelze nastavit modifikátory lokalizace pro X server." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Nepodařilo se najít platný konfigurační soubor, pokračuji s výchozím " "nastavením" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Nepodařilo se načíst motiv." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -275,28 +280,24 @@ msgstr "" "chyb, více informací na standartním výstupu. Poslední zaznamenaná chyba je v " "souboru \"%s\" na řádku %d, se zprávou: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Chyba Syntaxe" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Zavřít" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Při restartu se nepodařilo spustit nový program \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntaxe: openbox [přepínače]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -304,30 +305,30 @@ msgstr "" "\n" "Přepínače:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Zobrazit tuto nápovědu a skončit\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Zobrazit verzi a skončit\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Nahradit běžící window manager\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Cesta ke konfiguračnímu souboru\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Nepřipojovat se k session manageru\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -335,19 +336,19 @@ msgstr "" "\n" "Zasílání zpráv běžící instanci Openbox:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Znovu načíst konfiguraci Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Restartovat Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Ukončit Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -355,10 +356,14 @@ msgstr "" "\n" "Ladící přepínače:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Spustit v synchronním módu\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Zobrazit ladící výstup\n" @@ -368,10 +373,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Zobrazit ladící výstup pro správu oken\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Rozdělit displej na faleÅ¡né obrazovky xinerama\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -380,26 +389,27 @@ msgstr "" "\n" "Prosím hlaÅ¡te chyby na %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file vyžaduje argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s vyžaduje argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Neplatný argument příkazové řádky \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Na obrazovce %d již nějaký window manager běží" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Window manager na obrazovce %d ne a ne skončit" @@ -409,7 +419,7 @@ msgstr "Window manager na obrazovce %d ne a ne skončit" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -424,31 +434,12 @@ msgstr[1] "" "Openbox je nakonfigurován pro %d ploch, ale současná session má %d. " "Konfigurace Openboxu bude změněna." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "plochu %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Nepodařilo se vytvořit adresář \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Nepodařilo se uložit session do \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Chyba během ukládání session do \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Nepřipojen k session manageru" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "SpouÅ¡tím %s" @@ -473,15 +464,36 @@ msgstr "Neplatné jméno klávesy \"%s\" v nastavení" msgid "Requested key \"%s\" does not exist on the display" msgstr "Požadovaná klávesa \"%s\" na displeji neexistuje" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X Chyba: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Ukončit Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file vyžaduje argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Akce SessionLogout není k dispozici jelikož byl Openbox zkompilován bez " +#~ "podpory session manageru" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Nepodařilo se uložit session do \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Chyba během ukládání session do \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nepřipojen k session manageru" + +#~ msgid "X Error: %s" +#~ msgstr "X Chyba: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Nepodařilo se spustit \"%s\": %s" diff --git a/po/da.po b/po/da.po index 3fa8ed9..9b5bc40 100644 --- a/po/da.po +++ b/po/da.po @@ -7,85 +7,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-08-19 16:50+0100\n" "Last-Translator: Jesper Sander \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Ugyldig operation \"%s\" anmodet. Operationen findes ikke." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nej" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Ja" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Udfør" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Fejl ved konvertering af stien \"%s\" fra utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Afbryd" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Afslut" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Er du sikker pÃ¥ at du vil logge ud?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Log Ud" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Er du sikker pÃ¥ at du vil afslutte Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Afslut Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"SessionLogout er ikke tilgænglig, fordi Openbox blev kompileret uden " -"understøttelse for sessionsbehandling" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Log Ud" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Er du sikker pÃ¥ at du vil logge ud?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Unavngivet vindue" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Dræber..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Svarer Ikke" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -94,149 +84,164 @@ msgstr "" "Vinduet \"%s\" svarer ikke. Vil du udføre tvunget afslutning ved at sende %s " "signalet?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Afslut proces" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Vinduet \"%s\" svarer ikke. Vil du frakoble vinduet fra X-serveren?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Frakoble" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "GÃ¥ der..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "HÃ¥ndter skrivebord" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Nyt skrivebord" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Fjern sidste skrivebord" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Vinduer" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Skrivebord" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Alle skriveborde" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "La_g" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Altid ø_verst" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "Nor_mal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Altid _nederst" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Send til skrivebord" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Klient-menu" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "G_endan" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Flyt" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Ændre s_tørrelse" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "_Minimer" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximer" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Rul op/ned" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Fjern/tilføj _dekoration" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Luk" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Ugyldig indhold \"%s\" i muse-kombination" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Ugyldig tast \"%s\" specificeret i konfigurationsfilen" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Kan ikke oprette mappe '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Luk" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt med taste-kombinationer i konfigurationsfilen" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Kan ikke finde en gyldig menufil \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Kunne ikke udføre kommando for pipe-menu \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Ugyldig uddata fra pipe-menuen \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Forsøgte at Ã¥bne menuen \"%s\", men denne findes ikke" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Mere..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Ugyldig knap \"%s\" i muse-kombination" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Ugyldig indhold \"%s\" i muse-kombination" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Kan ikke skifte til hjemmekataloget \"%s\": %s" @@ -245,29 +250,29 @@ msgstr "Kan ikke skifte til hjemmekataloget \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Kunne ikke Ã¥bne displayet fra DISPLAY-miljøvariablen" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Kunne ikke starte obrender-biblioteket." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X-serveren understøtter ikke lokalisering." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Kan ikke indstille lokaliseringsmodifikatorene for X-serveren." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Kunne ikke finde en gyldig konfigurationsfil, bruger nogle simple " "standardværdier" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Kan ikke hente et tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -278,28 +283,24 @@ msgstr "" "konfigurationsfilerne til Openbox. Se stdout for mere information. Den " "sidste fejl som blev set var i fil \"%s\", linie %d, med beskeden: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox syntaksfejl" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Luk" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Kunne ikke starte nyt program ved genstart: \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntaks: openbox [argumenter]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -307,32 +308,32 @@ msgstr "" "\n" "Tilvalg:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Vis denne hjælpetekst og afslut\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Vis versionsnummeret og afslut\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Erstat den kørende vinduesbehandler\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FIL Specificer stien til konfigurationsfilen du vil " "benytte\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Deaktiver forbindelsen til sessionsbehandleren\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -340,19 +341,19 @@ msgstr "" "\n" "Sender beskeder til en kørende Openbox-instans:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Opdater Openbox' konfiguration\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Genstart Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Afslut Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -360,10 +361,14 @@ msgstr "" "\n" "Fejlsøgningsmuligheder:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Kør i synkron-modus\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Vis fejlsøgningsinformation\n" @@ -374,10 +379,16 @@ msgstr "" " --debug-focus Vis fejlsøgningsinformation for fokus-hÃ¥ndtering\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Vis fejlsøgningsinformation for session-hÃ¥ndtering\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Split displayet for \"falske\" xinerama-skærme\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -386,26 +397,27 @@ msgstr "" "\n" "Rapporter venligst fejl til %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file kræver et argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s kræver et argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Ugyldig kommandolinie-argument \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "En vindusbehandler kører allerede pÃ¥ skærm %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Kunne ikke hente vindusbehandlerens markering pÃ¥ skærm %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Vinduesbehandleren pÃ¥ skærm %d vil ikke afslutte" @@ -417,7 +429,7 @@ msgstr "Vinduesbehandleren pÃ¥ skærm %d vil ikke afslutte" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -432,31 +444,12 @@ msgstr[1] "" "Aktiv session har %2$d skriveborde, mens Openbox er konfigureret til %1$d. " "Benytter indstillingerne for den aktive session." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "skrivebord %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Kan ikke oprette mappe \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Kan ikke gemme sessionen til \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Fejl mens session blev gemt til \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Ikke forbundet til en sessionsbehandler" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Kører %s" @@ -481,11 +474,32 @@ msgstr "Ugyldig tastenavn \"%s\" i tastekombination" msgid "Requested key \"%s\" does not exist on the display" msgstr "Ønsket tast \"%s\" eksisterer ikke i displayet" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Fejl i X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Afslut Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file kræver et argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout er ikke tilgænglig, fordi Openbox blev kompileret uden " +#~ "understøttelse for sessionsbehandling" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Kan ikke gemme sessionen til \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Fejl mens session blev gemt til \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Ikke forbundet til en sessionsbehandler" + +#~ msgid "X Error: %s" +#~ msgstr "Fejl i X: %s" diff --git a/po/de.po b/po/de.po index 9a78c71..8d12a1f 100644 --- a/po/de.po +++ b/po/de.po @@ -11,85 +11,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-13 13:38+0100\n" "Last-Translator: Florian Walch \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Unzulässige Aktion \"%s\" angefordert. Diese Aktion existiert nicht." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nein" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Ja" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Ausführen" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Konnte Pfad \"%s\" nicht von UTF-8 konvertieren" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Abbrechen" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Beenden" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Abmelden" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Sind Sie sicher, dass Openbox beendet werden soll?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Beende Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Die SessionLogout-Aktion ist nicht verfügbar, da Openbox ohne Unterstützung " -"für Sitzungsmanagement kompiliert wurde" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Abmelden" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Unbenanntes Fenster" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Wird beendet..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Reagiert nicht" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -98,11 +88,11 @@ msgstr "" "Das Fenster \"%s\" scheint nicht zu reagieren. Wollen Sie die Beendigung " "durch das Senden des %s-Signals erzwingen?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Beende Prozess" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -111,139 +101,154 @@ msgstr "" "Das Fenster \"%s\" scheint nicht zu reagieren. Soll es vom X-Server getrennt " "werden?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Trennen" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Hierher wechseln..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Desktops verwalten" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Neuen Desktop hinzufügen" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Letzten Desktop entfernen" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Fenster" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Desktops" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Alle Desktops" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Layer" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Immer im _Vordergrund" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Immer im _Hintergrund" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_An Desktop senden" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Client menu" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Wi_ederherstellen" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Vers_chieben" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "_Größe ändern" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimieren" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximieren" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Auf/Ab_rollen" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Dekoration entfernen/_Dekorieren" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Schließen" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Maus-Binding enthält ungültigen Kontext \"%s\"" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Unzulässiger Button \"%s\" in der Konfigurationsdatei angegeben" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Schließen" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Konnte keine gültige Menü-Datei \"%s\" finden" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Konnte Befehl \"%s\" für pipe-menu nicht ausführen: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Ungültige Ausgabe vom pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "" "Auf das Menü \"%s\" konnte nicht zugegriffen werden, da es nicht existiert" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Mehr..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Maus-Binding enthält ungültigen Button \"%s\"" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Maus-Binding enthält ungültigen Kontext \"%s\"" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Konnte nicht in das Heimatverzeichnis \"%s\" wechseln: %s" @@ -252,30 +257,30 @@ msgstr "Konnte nicht in das Heimatverzeichnis \"%s\" wechseln: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht öffnen." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Konnte die obrender-Bibliothek nicht initialisieren." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Die gewählte Lokalisierung wird vom X-Server nicht unterstützt." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" "Die Lokalisierungsmodifizierer für den X-Server konnten nicht gesetzt werden." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache " "Standardwerte" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Konnte kein Thema laden." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -286,29 +291,25 @@ msgstr "" "Syntaxfehler gefunden. Die Standardausgabe enthält weitere Informationen. " "Der letzte Fehler wurde in der Datei \"%s\" in Zeile %d festgestellt: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Syntax-Fehler" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Schließen" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "Neustart fehlgeschlagen, um die ausführbare Datei \"%s\" zu starten: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [Optionen]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -316,30 +317,30 @@ msgstr "" "\n" "Optionen:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Diese Hilfe anzeigen und beenden\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Version anzeigen und beenden\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Den aktuell laufenden Fenstermanager ersetzen\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file DATEI Pfad zur Konfigurationsdatei\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Keine Verbindung zum Sitzungsmanager aufbauen\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -347,19 +348,19 @@ msgstr "" "\n" "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox's Konfiguration neu laden\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox neu starten\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Beende Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -367,10 +368,14 @@ msgstr "" "\n" "Debugging Optionen:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync im Synchronisierungsmodus starten\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Debugging-Informationen anzeigen\n" @@ -381,11 +386,18 @@ msgstr "" " --debug-focus Debugging-Informationen für's Fokus-Handling anzeigen\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Debugging-Informationen für's Session-Handling " +"anzeigen\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Anzeige in künstliche Xinerama-Bildschirme aufteilen\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -394,26 +406,27 @@ msgstr "" "\n" "Bitte melden Sie Bugreports an: %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file erfordert einen Parameter\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s erfordert einen Parameter\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Ungültiges Kommandozeilen Argument \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Ein Fenstermanager läuft bereits auf Bildschirm %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Konnte die Fenstermanagerauswahl auf Bildschirm %d nicht reservieren" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht" @@ -422,7 +435,7 @@ msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -434,34 +447,15 @@ msgstr[0] "" "Openbox wurde für %d Desktop konfiguriert, aber die aktuelle Sitzung hat %d. " "Überschreibe die Openbox-Konfiguration." msgstr[1] "" -"Openbox wurde für %d Desktops konfiguriert, aber die aktuelle Sitzung hat %" -"d. Überschreibe die Openbox-Konfiguration." +"Openbox wurde für %d Desktops konfiguriert, aber die aktuelle Sitzung hat " +"%d. Überschreibe die Openbox-Konfiguration." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "Desktop %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Das Verzeichnis \"%s\" konnte nicht angelegt werden: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Konnte die Sitzung \"%s\" nicht sichern: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Fehler beim Speichern der Sitzung nach \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Nicht mit einem Sitzungsmanager verbunden" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Starte %s" @@ -486,15 +480,36 @@ msgstr "Ungültiger Tastenname \"%s\" in Tastenkombination" msgid "Requested key \"%s\" does not exist on the display" msgstr "Angeforderte Taste \"%s\" existiert nicht auf dem Display" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X-Fehler: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Beende Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file erfordert einen Parameter\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Die SessionLogout-Aktion ist nicht verfügbar, da Openbox ohne " +#~ "Unterstützung für Sitzungsmanagement kompiliert wurde" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Konnte die Sitzung \"%s\" nicht sichern: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Fehler beim Speichern der Sitzung nach \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nicht mit einem Sitzungsmanager verbunden" + +#~ msgid "X Error: %s" +#~ msgstr "X-Fehler: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Konnte \"%s\" nicht ausführen: %s" diff --git a/po/en@boldquot.po b/po/en@boldquot.po index cdd30d2..0df4f96 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,7 +1,7 @@ # English translations for openbox package. -# Copyright (C) 2009 Dana Jansens +# Copyright (C) 2011 Dana Jansens # This file is distributed under the same license as the openbox package. -# Automatically generated, 2009. +# Automatically generated, 2011. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,87 +30,77 @@ # msgid "" msgstr "" -"Project-Id-Version: openbox 3.999.0\n" +"Project-Id-Version: openbox 3.5.0-rc1\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2011-08-01 18:20+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Invalid action “%s” requested. No such action exists." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "No" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Yes" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Execute" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Failed to convert the path “%s” from utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Cancel" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Exit" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Are you sure you want to log out?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Log Out" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Are you sure you want to exit Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Exit Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Log Out" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Are you sure you want to log out?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Unnamed Window" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Killing..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Not Responding" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -119,11 +109,11 @@ msgstr "" "The window “%s” does not seem to be responding. Do you want to force " "it to exit by sending the %s signal?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "End Process" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -132,138 +122,155 @@ msgstr "" "The window “%s” does not seem to be responding. Do you want to " "disconnect it from the X server?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Disconnect" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Go there..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Manage desktops" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Add new desktop" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Remove last desktop" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Windows" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Desktops" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "All desktops" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Layer" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Always on _top" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Always on _bottom" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Send to desktop" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Client menu" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "R_estore" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Move" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Resi_ze" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Ico_nify" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximize" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Roll up/down" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Un/_Decorate" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Close" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Invalid context “%s” in mouse binding" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Invalid button “%s” specified in config file" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Unable to make directory '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Close" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflict with key binding in config file" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Unable to find a valid menu file “%s”" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Failed to execute command for pipe-menu “%s”: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Invalid output from pipe-menu “%s”" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Attempted to access menu “%s” but it does not exist" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "More..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Invalid button “%s” in mouse binding" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Invalid context “%s” in mouse binding" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Unable to change to home directory “%s”: %s" @@ -272,27 +279,27 @@ msgstr "Unable to change to home directory “%s”: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Failed to open the display from the DISPLAY environment variable." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Failed to initialize the obrender library." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X server does not support locale." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Cannot set locale modifiers for the X server." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "Unable to find a valid config file, using some simple defaults" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Unable to load a theme." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -303,28 +310,24 @@ msgstr "" "configuration files. See stdout for more information. The last error seen " "was in file “%s” line %d, with message: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Syntax Error" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Close" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Restart failed to execute new executable “%s”: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [options]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -332,30 +335,30 @@ msgstr "" "\n" "Options:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Display this help and exit\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Display the version and exit\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Replace the currently running window manager\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Specify the path to the config file to use\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Disable connection to the session manager\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -363,19 +366,19 @@ msgstr "" "\n" "Passing messages to a running Openbox instance:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Reload Openbox's configuration\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Restart Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Exit Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -383,10 +386,14 @@ msgstr "" "\n" "Debugging options:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Run in synchronous mode\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr " --startup CMD Run CMD after starting\n" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Display debugging output\n" @@ -396,10 +403,15 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Display debugging output for focus handling\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Display debugging output for session management\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Split the display into fake xinerama screens\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -408,26 +420,27 @@ msgstr "" "\n" "Please report bugs at %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requires an argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requires an argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Invalid command line argument “%s”\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "A window manager is already running on screen %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Could not acquire window manager selection on screen %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "The WM on screen %d is not exiting" @@ -436,7 +449,7 @@ msgstr "The WM on screen %d is not exiting" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -451,31 +464,12 @@ msgstr[1] "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "desktop %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Unable to make directory “%s”: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Unable to save the session to “%s”: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Error while saving the session to “%s”: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Not connected to a session manager" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Running %s" @@ -500,11 +494,6 @@ msgstr "Invalid key name “%s” in key binding" msgid "Requested key \"%s\" does not exist on the display" msgstr "Requested key “%s” does not exist on the display" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X Error: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" diff --git a/po/en@quot.po b/po/en@quot.po index ab18182..e9af2e4 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for openbox package. -# Copyright (C) 2009 Dana Jansens +# Copyright (C) 2011 Dana Jansens # This file is distributed under the same license as the openbox package. -# Automatically generated, 2009. +# Automatically generated, 2011. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,87 +27,77 @@ # msgid "" msgstr "" -"Project-Id-Version: openbox 3.999.0\n" +"Project-Id-Version: openbox 3.5.0-rc1\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2011-08-01 18:20+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Invalid action “%s” requested. No such action exists." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "No" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Yes" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Execute" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Failed to convert the path “%s” from utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Cancel" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Exit" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Are you sure you want to log out?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Log Out" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Are you sure you want to exit Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Exit Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Log Out" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Are you sure you want to log out?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Unnamed Window" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Killing..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Not Responding" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -116,11 +106,11 @@ msgstr "" "The window “%s” does not seem to be responding. Do you want to force it to " "exit by sending the %s signal?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "End Process" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -129,138 +119,155 @@ msgstr "" "The window “%s” does not seem to be responding. Do you want to disconnect " "it from the X server?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Disconnect" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Go there..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Manage desktops" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Add new desktop" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Remove last desktop" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Windows" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Desktops" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "All desktops" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Layer" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Always on _top" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Always on _bottom" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Send to desktop" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Client menu" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "R_estore" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Move" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Resi_ze" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Ico_nify" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximize" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Roll up/down" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Un/_Decorate" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Close" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Invalid context “%s” in mouse binding" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Invalid button “%s” specified in config file" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Unable to make directory '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Close" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflict with key binding in config file" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Unable to find a valid menu file “%s”" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Failed to execute command for pipe-menu “%s”: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Invalid output from pipe-menu “%s”" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Attempted to access menu “%s” but it does not exist" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "More..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Invalid button “%s” in mouse binding" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Invalid context “%s” in mouse binding" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Unable to change to home directory “%s”: %s" @@ -269,27 +276,27 @@ msgstr "Unable to change to home directory “%s”: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Failed to open the display from the DISPLAY environment variable." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Failed to initialize the obrender library." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X server does not support locale." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Cannot set locale modifiers for the X server." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "Unable to find a valid config file, using some simple defaults" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Unable to load a theme." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -300,28 +307,24 @@ msgstr "" "configuration files. See stdout for more information. The last error seen " "was in file “%s” line %d, with message: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Syntax Error" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Close" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Restart failed to execute new executable “%s”: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [options]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -329,30 +332,30 @@ msgstr "" "\n" "Options:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Display this help and exit\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Display the version and exit\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Replace the currently running window manager\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Specify the path to the config file to use\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Disable connection to the session manager\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -360,19 +363,19 @@ msgstr "" "\n" "Passing messages to a running Openbox instance:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Reload Openbox's configuration\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Restart Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Exit Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -380,10 +383,14 @@ msgstr "" "\n" "Debugging options:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Run in synchronous mode\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr " --startup CMD Run CMD after starting\n" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Display debugging output\n" @@ -393,10 +400,15 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Display debugging output for focus handling\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Display debugging output for session management\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Split the display into fake xinerama screens\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -405,26 +417,27 @@ msgstr "" "\n" "Please report bugs at %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requires an argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requires an argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Invalid command line argument “%s”\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "A window manager is already running on screen %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Could not acquire window manager selection on screen %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "The WM on screen %d is not exiting" @@ -433,7 +446,7 @@ msgstr "The WM on screen %d is not exiting" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -448,31 +461,12 @@ msgstr[1] "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "desktop %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Unable to make directory “%s”: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Unable to save the session to “%s”: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Error while saving the session to “%s”: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Not connected to a session manager" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Running %s" @@ -497,11 +491,6 @@ msgstr "Invalid key name “%s” in key binding" msgid "Requested key \"%s\" does not exist on the display" msgstr "Requested key “%s” does not exist on the display" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X Error: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" diff --git a/po/es.po b/po/es.po index d4d9f94..44c5e51 100644 --- a/po/es.po +++ b/po/es.po @@ -11,85 +11,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-05-04 16:39-0300\n" "Last-Translator: Nicolás de la Torre \n" "Language-Team: español \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "La acción \"%s\" solicitada es inválida. No existe tal acción." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "No" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Sí" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Ejecutar" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Falló al convertir la ruta \"%s\" desde utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Cancelar" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Salir" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "¿Está seguro que desea salir?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Salir" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "¿Está seguro que desea salir de Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Salir de Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"La acción SessionLogout no esta disponible ya que Openbox fue construido sin " -"soporte de manejo de sesiones" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Salir" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "¿Está seguro que desea salir?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Ventana sin nombre" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Terminando..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "No está respondiendo" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -98,11 +88,11 @@ msgstr "" "La ventana \"%s\" no parece estar respondiendo. ¿Desea forzarla a salir " "enviándole la señal %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Finalizar proceso" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -111,138 +101,153 @@ msgstr "" "La ventana \"%s\" no parece estar respondiendo. ¿Desea desconectarla del " "servidor X?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Desconectar" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Ir ahí..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Administrar escritorios" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Añadir un nuevo escritorio" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Remover el último escritorio" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Ventanas" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Escritorios" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Todos los escritorios" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Capa" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Siempre _encima" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Siempre _debajo" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Enviar al escritorio" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menú del cliente" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Rest_aurar" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Mover" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Redimen_sionar" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimizar" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximizar" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "En/Desen_rollar" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "_Decorar" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Cerrar" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Contexto inválido \"%s\" en mouse binding" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Botón inválido \"%s\" especificado en el archivo de configuración" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "No se puede crear el directorio '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Cerrar" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflicto con la combinación de teclas en el archivo de configuración" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "No es posible encontrar un archivo de menú \"%s\" válido" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Falló al ejecutar el comando para el pipe-menu \"%s\": \"%s\"" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Salida inválida del pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Intentó acceder al menú \"%s\" pero este no existe" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Más..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Botón inválido \"%s\" en mouse binding" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Contexto inválido \"%s\" en mouse binding" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "No es posible cambiar al directorio home \"%s\": %s" @@ -251,30 +256,30 @@ msgstr "No es posible cambiar al directorio home \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Falló abrir la pantalla desde la variable de entorno DISPLAY" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Falló la inicialización de la librería obrender" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "El servidor X no soporta localizaciones." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" "No se puede establecer los modificadores de localización para el servidor X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "No es posible encontrar un archivo de configuración válido, usando algunos " "valores por defecto" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "No es posible cargar el tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -285,28 +290,24 @@ msgstr "" "configuración de Openbox. Ver salida (stdout) para mas información. El " "último error viste estaba en el archivo \"%s\" linea %d, con el mensaje: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Error de Sintaxis" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Cerrar" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "El reinicio falló en ejecutar el nuevo ejecutable \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaxis: openbox [opciones]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -314,15 +315,15 @@ msgstr "" "\n" "Opciones:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Muestra esta ayuda y sale\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Muestra la versión y sale\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Remplaza el gestor de ventanas que esta corriendo " @@ -331,19 +332,19 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file ARCHIVO\n" " Especifique la ruta del archivo de configuración a " "usar\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable Deshabilita la conexión con el gestor de sesión\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -351,19 +352,19 @@ msgstr "" "\n" "Pasando mensajes a la instancia que esta corriendo de Openbox:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recarga la configuración de Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Reinicia Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Cierra Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -371,10 +372,14 @@ msgstr "" "\n" "Opciones de depuración:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Correr en modo sincrónico\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Mostrar salida del depurador\n" @@ -385,12 +390,19 @@ msgstr "" " --debug-focus Mostrar salida del depurador para el manejo del foco\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Mostrar salida del depurador para el manejo del " +"session\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Separar la visualización en pantallas de xinerama " "falsas\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -399,26 +411,27 @@ msgstr "" "\n" "Por favor reportar errores a %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requiere un argumento\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requiere un argumento\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Argumento de la línea de comando inválido \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Un gestor de ventanas ya esta corriendo en la pantalla %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "No se pudo obtener la selección del gestor de ventanas en pantalla %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "El WM en la pantalla %d no está saliendo" @@ -427,7 +440,7 @@ msgstr "El WM en la pantalla %d no está saliendo" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -442,31 +455,12 @@ msgstr[1] "" "Openbox está configurado para escritorios %d, pero la sesión actual a %d. " "Invalidando la configuración de Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "Escritorio %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "No se puede crear el directorio \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "No se puede salvar la sesión a \"%s\": \"%s\"" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Error mientras se salvaba la sesión a \"%s\": \"%s\"" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Sin conexión a un manejador de sesiones" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Ejecutando %s" @@ -492,15 +486,36 @@ msgstr "Nombre de tecla \"%s\" inválido en combinaciones de teclas" msgid "Requested key \"%s\" does not exist on the display" msgstr "Tecla solicitada \"%s\" no existe en la pantalla" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Error en X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Salir de Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file requiere un argumento\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "La acción SessionLogout no esta disponible ya que Openbox fue construido " +#~ "sin soporte de manejo de sesiones" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "No se puede salvar la sesión a \"%s\": \"%s\"" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Error mientras se salvaba la sesión a \"%s\": \"%s\"" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Sin conexión a un manejador de sesiones" + +#~ msgid "X Error: %s" +#~ msgstr "Error en X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Falló al ejecutar \"%s\": %s" diff --git a/po/et.po b/po/et.po index 9c9c9f3..01330c2 100644 --- a/po/et.po +++ b/po/et.po @@ -1,238 +1,251 @@ +# Openboxi eesti keele tõlge # translation of openbox to Estonian # Copyright (C) 2007 Dana Jansens # This file is distributed under the same license as the Openbox 3 package. # # Andres Järv , 2007. +# Mihkel , 2010 msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.3\n" +"Project-Id-Version: Openbox 3.4.11.1\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2007-07-20 16:54+0200\n" -"Last-Translator: Andres Järv \n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2010-04-21 21:40+0300\n" +"Last-Translator: mihkel \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Taotleti kehtetut käsklust \"%s\". Sellist käsklust pole olemas." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" -msgstr "" +msgstr "Ei" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" -msgstr "" +msgstr "Jah" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" -msgstr "" +msgstr "Käivita" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Raja \"%s\" ümberkodeerimine UTF8-st ebaõnnestus" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" -msgstr "" +msgstr "Katkesta" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" -msgstr "" +msgstr "Välju" -#: openbox/actions/exit.c:56 -msgid "Are you sure you want to exit Openbox?" -msgstr "" - -#: openbox/actions/exit.c:57 -msgid "Exit Openbox" -msgstr "" - -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Kas oled kindel, et soovid välja logida?" -#: openbox/actions/session.c:65 openbox/actions/session.c:70 +#: openbox/actions/exit.c:75 msgid "Log Out" -msgstr "" +msgstr "Logi välja" -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "" +#: openbox/actions/exit.c:78 +msgid "Are you sure you want to exit Openbox?" +msgstr "Kas oled kindel, et soovid OpenBoxist väljuda?" + +#: openbox/actions/exit.c:79 +msgid "Exit Openbox" +msgstr "Välju Openbox-st" -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" -msgstr "" +msgstr "Nimetu aken" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." -msgstr "" +msgstr "Tapan..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" -msgstr "" +msgstr "Ei vasta" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" +"Paistab, et aken \"%s\" ei vasta enam. Kas soovid teda jõuga väljuma sundida " +"saates %s signaali?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" -msgstr "" +msgstr "Lõpeta protsess" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" +"Paistab, et aken \"%s\" ei vasta enam. Kas soovid ta X serverist lahti " +"ühendada?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" -msgstr "" +msgstr "Ühenda lahti" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Mine sinna..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Halda töölaudu" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Lisa uus töölaud" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Eemalda viimane töölaud" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Aknad" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Töölauad" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Kõik töölauad" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Kiht" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Aken teiste _peal" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normaalne" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Aken teiste _all" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Saada töölauale" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Kliendi menüü" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Taasta" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Liiguta" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Muuda _suurust" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Muuda _ikooniks" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ksimeeri" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Rulli üles/alla" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Äär_ed sisse/välja" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "S_ulge" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Vigane kontekst \"%s\" hiire kiirklahvides" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" -msgstr "Vigane nupp \"%s\" määratletud konfiguratsioonifailis" +msgstr "Vigane nupp \"%s\" määratud seadistuste failis" + +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Kausta '%s' tegemine ebaõnnestus: %s" -#: openbox/keyboard.c:157 +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Sulge" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" -msgstr "Konflikt kiirklahviga konfiguratsioonifailis" +msgstr "Konflikt kiirklahviga seadistuste failis" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Ei suudetud leida kehtivat menüüfaili \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Ei suudetud käivitada torumenüü \"%s\" käsku: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Vigane väljund torumenüüst \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Üritati ligi pääseda menüüle \"%s\", aga seda pole olemas" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Rohkem..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Vigane nupp \"%s\" hiire kiirklahvides" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Vigane kontekst \"%s\" hiire kiirklahvides" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Ei suudetud siseneda kodukataloogi \"%s\": %s" @@ -241,58 +254,57 @@ msgstr "Ei suudetud siseneda kodukataloogi \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." -msgstr "Obrender-damisteegi käivitamine ebaõnnestus." +msgstr "Obrender-damise teegi käivitamine ebaõnnestus." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X server ei toeta lokaati." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" -"Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid " +"Kehtiva seadistuste faili leidmine ebaõnnestus, kasutatakse lihtsaid " "vaikimisi seadeid" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." -msgstr "Ei suudetud laadida teemat." +msgstr "Teema laadimine ebaõnnestus." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " "configuration files. See stdout for more information. The last error seen " "was in file \"%s\" line %d, with message: %s" msgstr "" +"Üks või enam XML süntaki viga leiti Openboxi seadistuse faili parsides. " +"Rohkem infot leiad stdout-st. Viimane viga oli failis \"%s\", real %d ja " +"sõnum oli: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" -msgstr "" - -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Sulge" +msgstr "Openboxi süntaksi viga" -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili \"%s\" käivitamine: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Autoriõigused (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Süntaks: openbox [seaded]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -300,30 +312,30 @@ msgstr "" "\n" "Seaded:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Selle abi kuvamine ja väljumine\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Versiooni kuvamine ja väljumine\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Hetkel töötava aknahalduri asendamine\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" -msgstr "" +msgstr " --config-file FAIL Määra kasutatava seadistuste faili teekond\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Seansihalduriga ühenduse keelamine\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -331,19 +343,19 @@ msgstr "" "\n" "Jooksvale Openboxi seansile sõnumite edastamine:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openboxi konfiguratsioon uuesti laadimine\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openboxi taaskäivitamine\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" -msgstr "" +msgstr " --exit Välju Openbox-st\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -351,10 +363,14 @@ msgstr "" "\n" "Silumise seaded:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Sünkroonselt jooksutamine\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Silumisväljundi kuvamine\n" @@ -364,10 +380,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Fookusekäsitluse siluriväljundi kuvamine\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Ekraani võlts-Xinerama ekraanideks jagamine\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -376,26 +396,27 @@ msgstr "" "\n" "Palun teata vigadest siia %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s nõuab argumenti\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Vigane käsurea argument \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Ekraanil %d juba jookseb aknahaldur" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Aknahaldur ekraanil %d ei sulgu" @@ -404,7 +425,7 @@ msgstr "Aknahaldur ekraanil %d ei sulgu" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -413,33 +434,18 @@ msgid_plural "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr[0] "" +"Openbox on seadistatud %d töölauale, aga aktiivsel seansil on %d. Tühistan " +"Openboxi seadistuse." msgstr[1] "" +"Openbox on seadistatud %d töölauale, aga aktiivsel seansil on %d. Tühistan " +"Openboxi seadistuse." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "töölaud %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Kausta \"%s\" tegemine ebaõnnestus: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Seansi \"%s\" salvestamine ebaõnnestus: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Seansi \"%s\" salvestamisel ilmnes viga: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Jooksev %s" @@ -464,14 +470,28 @@ msgstr "Vigane klahvinimi \"%s\" kiirklahvil" msgid "Requested key \"%s\" does not exist on the display" msgstr "Soovitud klahvi \"%s\" ei ole sellel ekraanil" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X-i viga: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" -msgstr "" +msgstr "Sobib" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Seansi \"%s\" salvestamine ebaõnnestus: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Seansi \"%s\" salvestamisel ilmnes viga: %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Pole ühendatud seansihalduriga" + +#~ msgid "X Error: %s" +#~ msgstr "X-i viga: %s" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout tegevust pole saadaval, kuna Openbox on kompileeritud " +#~ "seansi haldamise toeta" #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "\"%s\" käivitamine ebaõnnestus: %s" diff --git a/po/eu.po b/po/eu.po index 8b3a52f..01501e7 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,84 +7,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-10-22 18:06+0100\n" "Last-Translator: Inko I. A. \n" "Language-Team: Inko I. A. \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Eskatutako \"%s\" ekintza baliogabea. Ez da ekintza hori existitzen." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ez" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Bai" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Exekutatu" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Hutsegitea \"%s\" helbidea utf8-tik bihurtzean" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Ezeztatu" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Irten" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Ziur al zaude saioa itxi nahi duzula?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Saioa Itxi" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Ziur al zaude Openbox-etik irten nahi duzula?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Openbox-etik Irten" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"SessionLogout ekintza ez dago eskuragarri, Openbox saio kudetzaile gaitasun " -"gabe konpilatua izan baitzen" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Saioa Itxi" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Ziur al zaude saioa itxi nahi duzula?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Izenik gabeko leihoa" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Akabatzen..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Erantzunik Ez" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -93,11 +83,11 @@ msgstr "" "Badirudi \"%s\" leihoak ez duela erantzuten. Nahi al duzu istea behartu %s " "seinalea bidaliz?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Prozesua Amaitu" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -106,138 +96,153 @@ msgstr "" "Badirudi \"%s\" leihoak ez duela erantzuten. Nahi al duzu leihoa X " "zerbitzaritik deskonektatu?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Deskonektatu" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Hona joan..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Idazmahaiak kudeatu" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Idazmahai berria _gehitu" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Azken idazmahaia _ezabatu" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Leihoak" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Idazmahaiak" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Idazmahai guztiak" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Geruza" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Beti _gainean" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Ohikoa" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Beti _azpian" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Bidali idazmahaira" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Bezero menua" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Berr_ezarri" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Mugitu" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "_Tamaina aldatu" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Iko_notu" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximizatu" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Bildu/_Zabaldu" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Des/_Dekoratu" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Itxi" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Baliogabeko \"%s\" testuingurua sagu elkarketan" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Konfigurazio fitxategian zehaztutako \"%s\" botoia baliogabea" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Ezin da '%s' direktorioa sortu: %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Itxi" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Gatazka konfigurazio fitxategiko tekla elkarketarekin" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Ezin da \"%s\" baliozko menu fitxategi bat aurkitu" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Hutsegitea \"%s\" pipe-menuarentzat komandoa exekutatzean: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Baliogabeko irteera \"%s\" pipe-menutik" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "\"%s\" menua atzitzen saiatu da baina ez da existitzen" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Gehiago..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Baliogabeko \"%s\" botoia sagu elkarketan" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Baliogabeko \"%s\" testuingurua sagu elkarketan" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Ezin da \"%s\" hasiera direktoriora aldatu: %s" @@ -246,29 +251,29 @@ msgstr "Ezin da \"%s\" hasiera direktoriora aldatu: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Hutsegitea pantaila irekitzean DISPLAY ingurune aldagaitik." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Hutsegitea obrender liburutegia hasieratzean." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X zerbitzariak ez du locale euskarririk." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Ezin da locale modifikatzailerik ezarri X zerbitzariarentzat." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Ezin da baliozko konfigurazio fitxategirik aurkitu, hainbat aukera lehenetsi " "sinple erabiltzen" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Ezin da gai bat kargatu." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -279,28 +284,24 @@ msgstr "" "fitxategiak interpretatzerakoan. Ikusi stdout informazio gehiago jasotzeko. " "Azken errorea \"%s\" fitxategian %d lerroan izan da, mezu honekin: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox sintaxi errorea" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Itxi" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Berrabiarazteak hutsegitea \"%s\" exekutagarri berria exekutatzean: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaxia: openbox [aukerak]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -308,15 +309,15 @@ msgstr "" "\n" "Aukerak:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Mezu hau erakutsi eta irten\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Bertsioa bistarazi eta irten\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Ordezkatu exekutatzen ari den leiho-kudeatzailea\n" @@ -324,16 +325,16 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" "--config-file FILE Zehaztu erabiltzeko konfigurazio fitxategirako bidea\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Ezgaitu saio kudeatzailearekiko konexioa\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -341,19 +342,19 @@ msgstr "" "\n" "Exekutatzen ari den Openbox instantzia bati mezuak pasatzen:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Birkargatu Openbox-en konfigurazioa\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Berrabiarazi Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Itxi Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -361,10 +362,14 @@ msgstr "" "\n" "Arazketa aukerak:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Modu sinkronoan exekutatu\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Arazketa irteera erakutsi\n" @@ -374,10 +379,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Erakutsi arazketa irteera foku maneiurako\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Zatitu pantaila xinerama pantaila faltsuetan\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -386,29 +395,30 @@ msgstr "" "\n" "%s helbidean erroreen berri eman mesedez\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file argumentu bat behar du\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s argumentu bat behar du\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "\"%s\" komando lerro argumentu baliogabea\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "" "Bistaratzeko %d pantailan aurretik leiho-kudeatzaile bat exekutatzen ari da" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "" "Ezin izan da eskuratu leiho-kudeatzailearen hautapena bistaratzeko %d " "pantailan" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "%d bistaratze pantailako leiho-kudeatzailea ez da irteten" @@ -417,7 +427,7 @@ msgstr "%d bistaratze pantailako leiho-kudeatzailea ez da irteten" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -432,31 +442,12 @@ msgstr[1] "" "Openbox %d idazmahaientzat konfiguratua dago, baina uneko saioak %d dauzka. " "Openbox konfigurazioa gainjartzen." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "%i Idazmahaia" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Ezin da \"%s\" direktorioa sortu: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Ezin da saioa \"%s\"-n gorde: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Errorea saioa \"%s\"-n gordetzean: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Saio kudeatzaile batera ez konektatua" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Egikaritzen %s" @@ -481,14 +472,35 @@ msgstr " tekla elkarketan \"%s\" tekla izen baliogabea" msgid "Requested key \"%s\" does not exist on the display" msgstr "Eskatutako \"%s\" tekla ez da pantaila existitzen" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X errorea: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "Ados" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Openbox-etik Irten" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file argumentu bat behar du\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout ekintza ez dago eskuragarri, Openbox saio kudetzaile " +#~ "gaitasun gabe konpilatua izan baitzen" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Ezin da saioa \"%s\"-n gorde: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Errorea saioa \"%s\"-n gordetzean: %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Saio kudeatzaile batera ez konektatua" + +#~ msgid "X Error: %s" +#~ msgstr "X errorea: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Hutsegitea \"%s\" exekutatzean: %s" diff --git a/po/fi.po b/po/fi.po index 0c5b344..7cc1e93 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,86 +8,77 @@ # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.7\n" +"Project-Id-Version: Openbox 3.4.11\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-03-17 21:26+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2010-03-13 21:56+0100\n" "Last-Translator: Lauri Hakko \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Pyydettiin virheellinen toiminto \"%s\". Toimintoa ei ole olemassa." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ei" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Kyllä" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Suorita" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Polun \"%s\" muuntaminen utf8:sta epäonnistui" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Peruuta" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Sulje" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Haluatko varmasti kirjautua ulos?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Kirjaudu ulos" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Haluatko varmasti sulkea Openboxin" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Sulje Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"SessionLogout tapahtuma ei ole suoritettavissa, koska Openbox käännettiin " -"ilman istunnon hallinnan tukea" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Kirjaudu ulos" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Haluatko varmasti kirjautua ulos?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Nimetön ikkuna" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Tapetaan..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Ei vastaa" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -96,11 +87,11 @@ msgstr "" "Ikkuna \"%s\" ei näytä vastaavan. Haluatko sulkea sen lähettämällä sille " "singaalin %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Lopeta prosessi" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -109,138 +100,153 @@ msgstr "" "Ikkuna \"%s\" ei näytä vastaavan. Haluatko katkaista sen yhteyden X-" "palvelimeen?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Katkaise yhteys" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Näytä tämä..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Työtilojen hallinta" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Lisää uusi työtila" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Poista viimeisin työtila" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Ikkunat" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Työtilat" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Kaikkiin työtiloihin" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Kerros" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Aina _päällimmäisenä" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Tavallinen" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Aina _alimmaisena" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Lähetä työtilaan" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Ikkunan valikko" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Palauta" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "S_iirrä" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "_Muuta kokoa" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Pie_nennä" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Suurenn_a" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Rullaa _ylös/alas" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "(Epä)_reunusta" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Sulje" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Virheellinen asiayhteys \"%s\" hiirisidonnoissa" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Asetustiedostossa määritelty painike \"%s\" on virheellinen" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Hakemiston '%s' luonti epäonnistui: %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Sulje" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Päällekäisiä näppäinsidontoja asetustiedostossa" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Toimivaa valikkotiedostoa ei löytynyt \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Putkivalikon suorittaminen epäonnistui \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Virheellinen tulos putkivalikosta \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Valikon \"%s\" lukemista yritettiin, mutta sitä ei ole olemassa" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Lisää..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Virheellinen painike \"%s\" hiirisidonnoissa" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Virheellinen asiayhteys \"%s\" hiirisidonnoissa" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Kotihakemistoon \"%s\" vaihtaminen epäonnistui: %s" @@ -249,29 +255,29 @@ msgstr "Kotihakemistoon \"%s\" vaihtaminen epäonnistui: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Näytön avaaminen DISPLAY-muuttujasta epäonnistui." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Obrender-kirjaston käynnistäminen epäonnistui." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X-palvelin ei tue maa-asetusta." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Maa-asetusmuuttujia ei voitu tehdä X-palvelimelle." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Kelvollista asetustiedostoa ei löytynyt, käytetään yksinkertaisia " "oletusarvoja" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Teeman lataaminen epäonnistui." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -282,29 +288,25 @@ msgstr "" "stdout saadaksesi lisätietoja. Viimeisin virhe oli tiedostossa \"%s\" " "rivillä %d: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox syntaksivirhe" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Sulje" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "Uudelleenkäynnistys ei onnistunut käynnistämään uutta ohjelmaa \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Tekijänoikeudet (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntaksi: openbox [valitsin]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -312,30 +314,30 @@ msgstr "" "\n" "Käyttö:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Näytä tämä ohje ja poistu\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Näytä version tiedot ja poistu\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Korvaa käynnissä oleva ikkunointiohjelma\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Määritä käytettävän asetustiedoston polku\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Estä yhteys istuntojen hallintaan\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -343,19 +345,19 @@ msgstr "" "\n" "Komentojen antaminen käynnissä olevalle Openboxille:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Lataa Openboxin asetustiedosto uudelleen\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Käynnistä Openbox uudelleen\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Sulje Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -363,10 +365,14 @@ msgstr "" "\n" "Vianjäljityksen asetukset:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Aja synkronointi-tilassa\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Näytä vianjäljitystuloste\n" @@ -376,10 +382,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Näytä vianjäljitystuloste ikkunavalitsimelle\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Jaa näyttö kahteen vale-xinerama-ruutuun\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -388,26 +398,27 @@ msgstr "" "\n" "Ilmoita virheistä: %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file tarvitsee argumentin\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s tarvitsee argumentin\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Virheellinen valitsin \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Ikkunointiohjelma on jo käynnissä näytöllä %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Ikkunointiohjelman valinta ruudulla %d ei onnistunut" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu" @@ -416,8 +427,8 @@ msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 -#, fuzzy, c-format +#: openbox/screen.c:418 +#, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " "Overriding the Openbox configuration." @@ -431,31 +442,12 @@ msgstr[1] "" "Openbox on asetettu käyttämään %d työtilaa, mutta nykyisessä istunnossa " "työtiloja on %d. Ohitetaan Openboxin asetus." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "työtila %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Hakemiston \"%s\" luonti epäonnistui: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Istuntoa ei voitu tallentaa hakemistoon \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Virhe tallennettaessa istuntoa hakemistoon \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Ei yhteyttä istunnon hallintaan" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Suoritetaan %s" @@ -480,14 +472,28 @@ msgstr "Virheellinen näppäin \"%s\" pikanäppäimissä" msgid "Requested key \"%s\" does not exist on the display" msgstr "Pyydettyä näppäintä \"%s\" ei ole olemassa näytöllä" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X-virhe: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Istuntoa ei voitu tallentaa hakemistoon \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Virhe tallennettaessa istuntoa hakemistoon \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Ei yhteyttä istunnon hallintaan" + +#~ msgid "X Error: %s" +#~ msgstr "X-virhe: %s" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout tapahtuma ei ole suoritettavissa, koska Openbox käännettiin " +#~ "ilman istunnon hallinnan tukea" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Ohjelman \"%s\" suorittaminen epäonnistui: %s" diff --git a/po/fr.po b/po/fr.po index 036d78e..36a2908 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,85 +11,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-02 02:06+0100\n" "Last-Translator: Cyrille Bagard \n" "Language-Team: français \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Action demandée invalide \"%s\". Une telle action n'existe pas." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Non" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Oui" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Exécuter" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Échec de la conversion du chemin « %s » depuis l'UTF-8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Annuler" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Quitter" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Etes vous certain de vouloir vous déconnecter ?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Déconnexion" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Etes vous certain de vouloir quitter Openbox ?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Quitter Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"L'action SessionLogout n'est pas disponible comme Openbox a été construit " -"sans support de gestion de session" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Déconnexion" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Etes vous certain de vouloir vous déconnecter ?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Fenêtre sans nom" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Tue..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Ne répond pas" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -98,11 +88,11 @@ msgstr "" "La fenêtre \"%s\" semble ne pas répondre. Voulez vous la forcer à se " "terminer en envoyant un signal %s ?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Fin de processus" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -111,138 +101,153 @@ msgstr "" "La fenêtre \"%s\" semble ne pas répondre. Voulez vous la déconnecter du " "serveur X ?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Déconnexion" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Aller là..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Gérer les bureaux" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Ajouter un bureau" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Supprimer le dernier bureau" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Fenêtres" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Bureaux" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Tous les bureaux" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Disposition" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "_Toujours au premier plan" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Toujours en _arrière plan" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "En_voyer vers le bureau" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menu de la fenêtre" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "R_estaurer" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Dé_placer" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Red_imensionner" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Ico_nifier" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximiser" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "En/Dé_rouler" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Ne pas/Dé_corer" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Fermer" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Contexte « %s » invalide dans le paramétrage de la souris" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Bouton « %s » indiqué dans le fichier de configuration invalide" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Impossible de créer le répertoire « %s » : %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Fermer" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Impossible de trouver un fichier de menus valide « %s »" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Échec lors de l'exécution de la commande pour un pipe-menu « %s » : %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Sortie du pipe-menu invalide « %s »" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Tentative d'accès au menu « %s » qui n'existe pas" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Plus..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Bouton « %s » invalide dans le paramétrage de la souris" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Contexte « %s » invalide dans le paramétrage de la souris" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Impossible de changer vers le répertoire de l'utilisateur « %s » : %s" @@ -253,30 +258,30 @@ msgstr "" "Échec de l'ouverture de l'affichage depuis la variable d'environnement " "DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Échec de l'initialisation de la bibliothèque obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Le serveur X ne supporte pas la localisation." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" "Impossible d'appliquer les modifications de localisation pour le serveur X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Impossible de trouver un fichier de configuration valide, utilisation de " "défauts simples" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Impossible de charger un thème." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -285,32 +290,28 @@ msgid "" msgstr "" "Une ou plusieurs erreurs de syntaxe XML ont été trouvées lors de l'analyse " "des fichiers de configuration d'Openbox. Voir stdout pour plus " -"d'information. La dernière erreur vue était dans le fichier \"%s\", ligne %" -"d, avec le message : %s" +"d'information. La dernière erreur vue était dans le fichier \"%s\", ligne " +"%d, avec le message : %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Erreur de syntaxe Openbox" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Fermer" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "Le redémarrage n'a pas réussi à exécuter le nouvel exécutable « %s » : %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntaxe : openbox [options]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -318,15 +319,15 @@ msgstr "" "\n" "Options :\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Affiche cette aide et quitte\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Affiche la version et quitte\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Remplace le gestionnaire de fenêtres actuellement en " @@ -335,18 +336,18 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FILE Spécifie le chemin du fichier de configuration à " "utiliser\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable Désactive la connexion au gestionnaire de sessions\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -354,19 +355,19 @@ msgstr "" "\n" "Passage de messages à l'instance d'Openbox en cours :\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recharge la configuration d'Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Redémarre Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Sortir d'Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -374,10 +375,14 @@ msgstr "" "\n" "Options de déboguage :\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Exécute en mode synchrone\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Affiche la sortie de déboguage\n" @@ -389,11 +394,18 @@ msgstr "" "focus\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Affiche la sortie de déboguage pour la gestion du " +"session\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Découpe l'affichage en écrans xinerama factices\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -402,28 +414,29 @@ msgstr "" "\n" "Veuillez soumettre les rapports de bogues à %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requiert un argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requiert un argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Argument de la ligne de commande invalide « %s »\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Un gestionnaire de fenêtres est déjà lancé sur l'écran %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "" -"Impossible d'acquérir la sélection du gestionnaire de fenêtres pour l'écran %" -"d" +"Impossible d'acquérir la sélection du gestionnaire de fenêtres pour l'écran " +"%d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "" @@ -433,7 +446,7 @@ msgstr "" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -448,31 +461,12 @@ msgstr[1] "" "Openbox est configuré pour %d bureaux, mais la session en a %d. Ceci " "supplante la configuration d'Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "bureau %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Impossible de créer le répertoire « %s » : %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Impossible de sauvegarder la session dans « %s » : %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Erreur lors de la sauvegarde de la session depuis « %s » : %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Non connecté à un gestionnaire de session" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Exécution de %s" @@ -481,8 +475,8 @@ msgstr "Ex #, c-format msgid "Invalid modifier key \"%s\" in key/mouse binding" msgstr "" -"Touche de modification « %s » invalide dans le paramétrage du clavier / de la " -"souris" +"Touche de modification « %s » invalide dans le paramétrage du clavier / de " +"la souris" #: openbox/translate.c:138 #, c-format @@ -499,14 +493,35 @@ msgstr "Nom de touche msgid "Requested key \"%s\" does not exist on the display" msgstr "La touche demandée « %s » n'existe pas pour l'affichage" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Erreur X : %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Quitter Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file requiert un argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "L'action SessionLogout n'est pas disponible comme Openbox a été construit " +#~ "sans support de gestion de session" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Impossible de sauvegarder la session dans « %s » : %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Erreur lors de la sauvegarde de la session depuis « %s » : %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Non connecté à un gestionnaire de session" + +#~ msgid "X Error: %s" +#~ msgstr "Erreur X : %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Échec de l'exécution de « %s » : %s" diff --git a/po/hr.po b/po/hr.po index 13af7ef..dacabfb 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,84 +6,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2009-03-31 19:16+0200\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2009-04-05 16:53+0200\n" "Last-Translator: boljsa \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Nevažeća akcija \"%s\" zatražena. Takva akcija ne postoji." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ne" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Da" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "IzvrÅ¡i" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Neuspio pokuÅ¡aj pretvorbe putanje \"%s\" iz utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Odustani" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Izađi" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Jeste li sigurni da se želite odjaviti?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Odjava" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Jeste li sigurni da želite zatvoriti Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Zatvori Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Akcija SessionLogout nije dostupna otkad je Openbox izgrađen bez podrÅ¡ke " -"upravljanja sesijama" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Odjava" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Jeste li sigurni da se želite odjaviti?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Neimenovan Prozor" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Ubijanje..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Ne Odgovara" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -91,11 +81,11 @@ msgid "" msgstr "" "Prozor \"%s\" ne reagira. Želite li forsirati izlaženje Å¡aljući %s signal?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "ZavrÅ¡etak Procesa" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -103,138 +93,153 @@ msgid "" msgstr "" "Prozor \"%s\" ne reagira. Želite li prekinuti njegovu vezu sa X serverom?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Prekid veze" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Idi tamo..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Upravljanje radnim povrÅ¡inama" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Dodaj novu radnu povrÅ¡inu" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Ukloni zadnju radnu povrÅ¡inu" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Prozori" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Radne PovrÅ¡ine" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Sve radne povrÅ¡ine" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Sloj" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Uvijek na _vrhu" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normalno" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Uvijek na _dnu" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "PoÅ¡alji na _radnu povrÅ¡inu" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Izbornik klijenta" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "O_bnovi" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Pomicanje" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Prom_jena veličine" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimizacija" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "M_aksimizacija" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Okretanje gore/dolje" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Ne/_Dekoriranje" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Zatvori" -#: openbox/config.c:782 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Nevažeći kontekst \"%s\" u povezivanju miÅ¡a" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Nevažeće dugme \"%s\" specificirano u konfiguracijskoj datoteci" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Ne mogu stvoriti direktorij '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Zatvori" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt sa povezivanjem tipki u konfiguracijskoj datoteci" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Ne mogu pronaći važeću datoteku izbornika \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Neuspio pokuÅ¡aj izvrÅ¡avanja naredbe za cijev-izbornik \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Nevažeći izlaz za cijev-izbornik \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "PokuÅ¡avam pristupiti izborniku \"%s\" ali on ne postoji" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "ViÅ¡e..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Nevažeće dugme \"%s\" u povezivanju miÅ¡a" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Nevažeći kontekst \"%s\" u povezivanju miÅ¡a" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Ne mogu doći u home direktorij \"%s\": %s" @@ -243,29 +248,29 @@ msgstr "Ne mogu doći u home direktorij \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Neuspio pokuÅ¡aj otvaranja zaslona iz DISPLAY varijable okruženja." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Neuspio pokuÅ¡aj inicijalizacije obrender biblioteke." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X server ne podržava lokalno." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Ne mogu postaviti lokalne modifikatore za X server." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Ne mogu pronaći važeću konfiguracijsku datoteku, koriteći neke jednostavne " "standarde" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Ne mogu pokrenuti temu." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -276,28 +281,24 @@ msgstr "" "konfiguracijskih datoteka. Pogledajte stdout za viÅ¡e informacija. Zadnja " "pogreÅ¡ka je u datoteci \"%s\" u liniji %d, sa porukom: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox PogreÅ¡ka u Sintaksi" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Zatvori" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Restart je bio neusjeÅ¡an za izvrÅ¡enje novog izvrÅ¡nog \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaksa: openbox [opcije]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -305,15 +306,15 @@ msgstr "" "\n" "Opcije:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Prikazuje ovu pomoć i izlazi\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Prikazuje verziju i izlazi\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Zamjenjuje trenutno pokrenut upravitelj prozora\n" @@ -321,17 +322,17 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FILE Specificira putanju do konfiguracijske datoteke koja " "se koristi\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Onemogućuje vezu sa upraviteljom sesija\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -339,19 +340,19 @@ msgstr "" "\n" "Prosljeđuje poruke pokrenutoj Openbox instanci:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Osvježava Openbox konfiguraciju\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Restartira Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Izlazi iz Openbox-a\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -359,10 +360,14 @@ msgstr "" "\n" "Opcije traženja pogreÅ¡aka:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Pokretanje u sinkronizacijskom modu\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Prikazuje izlaz traženja pogreÅ¡aka\n" @@ -374,10 +379,17 @@ msgstr "" "fokusom\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Prikazuje izlaz traženja pogreÅ¡aka za rukovanje " +"sessionom\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Podijeli zaslon u lažne xinerama zaslone\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -386,26 +398,27 @@ msgstr "" "\n" "Molimo prijavite pogreÅ¡ku na %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file zahtjeva argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s zahtjeva argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Nevažeći argument komandne linije \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Upravitelj prozora je već pokrenut na zaslonu %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Ne mogu ostvariti odabir upravitelja prozora na zaslonu %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Upravitelj prozora na zaslonu %d ne izlazi" @@ -414,7 +427,7 @@ msgstr "Upravitelj prozora na zaslonu %d ne izlazi" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -429,31 +442,12 @@ msgstr[1] "" "Openbox je konfiguriran za %d radnu povrÅ¡inu, ali trenutna sesija ima %d. " "Prepisujem preko Openbox konfiguracije." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "radna povrÅ¡ina %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Ne mogu stvoriti direktorij \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Ne mogu spremiti sesiju u \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "PogreÅ¡ka prilokom spremanja sesije u \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Nije povezan sa upraviteljem sesija" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Pokrenuto %s" @@ -478,11 +472,32 @@ msgstr "Nevažeće ime tipke \"%s\" u povezivanju tipki" msgid "Requested key \"%s\" does not exist on the display" msgstr "Traženi ključ \"%s\" ne postoji na zaslonu" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X PogreÅ¡ka: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Zatvori Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file zahtjeva argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Akcija SessionLogout nije dostupna otkad je Openbox izgrađen bez podrÅ¡ke " +#~ "upravljanja sesijama" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Ne mogu spremiti sesiju u \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "PogreÅ¡ka prilokom spremanja sesije u \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nije povezan sa upraviteljem sesija" + +#~ msgid "X Error: %s" +#~ msgstr "X PogreÅ¡ka: %s" diff --git a/po/hu.po b/po/hu.po index 32203a7..52ba588 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,74 +8,75 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.4.10\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2010-01-07 14:19-0500\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2010-01-14 11:04+0100\n" "Last-Translator: Laszlo Dvornik \n" "Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Érvénytelen művelet \"%s\". Nem létezik ilyen művelet." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nem" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Igen" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Végrehajtás" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Az útvonalat nem sikerült átalakítani utf8-ból: \"%s\"" -#: openbox/actions/exit.c:62 openbox/client.c:3474 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Mégsem" -#: openbox/actions/exit.c:63 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Kilépés" -#: openbox/actions/exit.c:67 +#: openbox/actions/exit.c:74 msgid "Are you sure you want to log out?" msgstr "Biztos ki akar jelentkezni?" -#: openbox/actions/exit.c:68 +#: openbox/actions/exit.c:75 msgid "Log Out" msgstr "Kijelentkezés" -#: openbox/actions/exit.c:71 +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Biztos ki akar lépni az Openboxból?" -#: openbox/actions/exit.c:72 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Kilépés az Openboxból" -#: openbox/client.c:2016 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Névtelen ablak" -#: openbox/client.c:2030 openbox/client.c:2062 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Kilövés..." -#: openbox/client.c:2032 openbox/client.c:2064 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Nem válaszol" -#: openbox/client.c:3463 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -83,149 +84,164 @@ msgid "" msgstr "" "A(z) \"%s\" ablak nem válaszol. Erőltessük a kilépést a %s jelzés küldésével?" -#: openbox/client.c:3465 +#: openbox/client.c:3541 msgid "End Process" msgstr "Folyamat vége" -#: openbox/client.c:3469 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "A(z) \"%s\" ablak nem válaszol. Lekapcsoljuk az X kiszolgálóról?" -#: openbox/client.c:3471 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Lekapcsolódás" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Ugrás..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Munkaasztal-kezelés" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Új munk_aasztal" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Utolsó munkaasztal _eltávolítása" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Ablakok" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Munkaasztalok" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Összes munkaasztal" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Réteg" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Mindig _felül" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normál" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Mindig _alul" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Munkaasztalra _küldés" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Kliens menü" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Visszaállítás" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Á_thelyezés" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Átmérete_zés" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Iko_nizálás" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximalizálás" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Görgetés fel/le" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "_Dekoráció eltávolítása" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Bezárás" -#: openbox/config.c:798 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Érvénytelen környezet az egér hozzárendeléseknél: \"%s\"" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Érvénytelen gomb a konfigurációs fájlban \"%s\"" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Nem lehet létrehozni a könyvtárat '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Bezárás" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Ütköző billentyű hozzárendelések a konfigurációs fájlban" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Nem található ilyen érvényes menüfájl: \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Nem sikerült végrehajtani a parancsot a csővezeték-menüben \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Érvnytelen kimenet a csővezeték-menüből \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "\"%s\" menü elérésére történt kísérlet, de az nem létezik" -#: openbox/menu.c:370 openbox/menu.c:371 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Tovább..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Érvénytelen gomb \"%s\" az egér hozzárendeléseknél" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Érvénytelen környezet az egér hozzárendeléseknél: \"%s\"" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Nem lehet a saját könyvtárba váltani \"%s\": %s" @@ -235,30 +251,30 @@ msgid "Failed to open the display from the DISPLAY environment variable." msgstr "" "Nem sikerült megnyitni a DISPLAY környezeti változóban beállított képernyőt." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Nem sikerült előkészíteni az obrender programkönyvtárat." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Az X-kiszolgáló nem támogatja ezt a nemzetközi beállítást." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" "Nem lehet beállítani a nemzetközi beállítás-módosítókat az X-kiszolgálón." -#: openbox/openbox.c:265 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Nem található érvényes konfigurációs fájl, ezért egyszerű alapértelmezés " "lesznek használva" -#: openbox/openbox.c:299 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Nem lehet betölteni témát." -#: openbox/openbox.c:379 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -269,28 +285,24 @@ msgstr "" "feldolgozásakor. További információkért tekintse meg a szabványos kimenetet. " "Az utolsó hiba ebben a fájlban volt: \"%s\" (%d sor). A hibaüzenet: %s" -#: openbox/openbox.c:381 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox szintaktikai hiba" -#: openbox/openbox.c:381 -msgid "Close" -msgstr "Bezárás" - -#: openbox/openbox.c:463 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Az újraindítás során ez az új program nem volt indítható \"%s\": %s" -#: openbox/openbox.c:533 openbox/openbox.c:535 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:544 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Használat: openbox [opciók]\n" -#: openbox/openbox.c:545 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -298,31 +310,31 @@ msgstr "" "\n" "Opciók:\n" -#: openbox/openbox.c:546 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Súgó megjelenítése és kilépés\n" -#: openbox/openbox.c:547 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Verzió kiírása és kilépés\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Jelenleg futó ablakkezelő cseréje\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:552 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FÁJL A használandó konfigurációs fájl útvonalának megadása\n" -#: openbox/openbox.c:553 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Ne csatlakozzon a munkamenet-kezelőhöz\n" -#: openbox/openbox.c:554 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -330,19 +342,19 @@ msgstr "" "\n" "Üzenet küldése a futó Openbox példánynak:\n" -#: openbox/openbox.c:555 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox beállításának újratöltése\n" -#: openbox/openbox.c:556 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox újraindítása\n" -#: openbox/openbox.c:557 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Kilépés az Openboxból\n" -#: openbox/openbox.c:558 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -350,25 +362,33 @@ msgstr "" "\n" "Hibakeresési opciók:\n" -#: openbox/openbox.c:559 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Futtatás szinkron módban\n" -#: openbox/openbox.c:560 +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + +#: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Hibakeresési kimenet megjelenítése\n" -#: openbox/openbox.c:561 +#: openbox/openbox.c:546 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Fókuszkezelésre vonatkozó hibakeresési kimenetek " "megjelenítése\n" -#: openbox/openbox.c:562 +#: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Képernyő felosztása két ál-xinerama képernyőre\n" -#: openbox/openbox.c:563 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -377,26 +397,27 @@ msgstr "" "\n" "Kérjük a hibákat itt jelentse: %s\n" -#: openbox/openbox.c:645 -msgid "--config-file requires an argument\n" -msgstr "--config-file használatakor paraméter megadása kötelező\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s használatakor paraméter megadása kötelező\n" -#: openbox/openbox.c:688 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Érvénytelen parancssori opció: \"%s\"\n" -#: openbox/screen.c:103 openbox/screen.c:191 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Már fut egy ablakkezelő ezen a képernyőn: %d" -#: openbox/screen.c:125 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nem lehet ablakkezelőt váltani ezen a képernyőn: %d" -#: openbox/screen.c:146 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Nem lép ki az ablakkezelő ezen a képernyőn: %d" @@ -405,7 +426,7 @@ msgstr "Nem lép ki az ablakkezelő ezen a képernyőn: %d" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:416 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -420,31 +441,12 @@ msgstr[1] "" "Az Openbox %d munkaasztal használatára lett beállítva, de a jelenlegi " "munkamenetnek %d van. Felülbíráljuk az Openbox beállítását." -#: openbox/screen.c:1199 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "%i. munkaasztal" -#: openbox/session.c:105 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Nem lehet létrehozni a könyvtárat \"%s\": %s" - -#: openbox/session.c:472 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Nem lehet menteni ide a futó munkamenetet \"%s\": %s" - -#: openbox/session.c:611 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Hiba a munkamenet mentése közben \"%s\": %s" - -#: openbox/session.c:848 -msgid "Not connected to a session manager" -msgstr "Nincs kapcsolódva a munkamenet-kezelőhöz" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "%s futtatása" @@ -470,11 +472,25 @@ msgstr "Érvénytelen billentyűnév \"%s\" billentyű hozzárendelésnél" msgid "Requested key \"%s\" does not exist on the display" msgstr "A kért billentyű \"%s\" nem létezik a képernyőn" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X-hiba: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Kilépés az Openboxból" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file használatakor paraméter megadása kötelező\n" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Nem lehet menteni ide a futó munkamenetet \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Hiba a munkamenet mentése közben \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nincs kapcsolódva a munkamenet-kezelőhöz" + +#~ msgid "X Error: %s" +#~ msgstr "X-hiba: %s" diff --git a/po/it.po b/po/it.po index 27d3d81..a8fce8c 100644 --- a/po/it.po +++ b/po/it.po @@ -10,85 +10,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2009-02-25 23:51+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2009-02-25 11:29+0100\n" "Last-Translator: Davide Truffa \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "L'operazione \"%s\" non è valida. L'operazione non esiste." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "No" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Si" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Esegui" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Impossibile convertire il percorso utf8 \"%s\"" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Annulla" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Esci" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Sei sicuro di voler uscire?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Esci" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Sei sicuro di voler uscire da Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Chiudi Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"L'azione SessionLogout non è disponibile se Openbox è compilato senza il " -"supporto del gestore delle sessioni." - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Esci" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Sei sicuro di voler uscire?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Finestra senza nome" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Termino..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Non Risponde" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -97,11 +87,11 @@ msgstr "" "La finestra \"%s\" sembra non rispondere. Vuoi terminarne l'esecuzione " "inviando il segnale %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Termina Processo" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -110,140 +100,155 @@ msgstr "" "La finestra \"%s\" non sembra rispondere. Vuoi terminarne l'esecuzione " "tramite il server X?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Disconnesso" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Vai a..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Gestisci i desktop" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Aggiungi un nuovo desktop" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Rimuovi l'ultimo desktop" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Finestre" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Desktop" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Tutti i desktop" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Livello" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Sempre _sopra" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normale" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Sempre s_otto" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Invia al _desktop" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menù della finestra" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Ripristina" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Muovi" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "R_idimensiona" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimizza" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ssimizza" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "A_rrotola" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Si/No _Decorazioni" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Chiudi" -#: openbox/config.c:782 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Il contesto \"%s\" specificato nelle associazioni mouse non è valido" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Il pulsante \"%s\" specificato nel file di configurazione non è valido" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Impossibile creare la directory '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Chiudi" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "" "Conflitto con la scorciatoia da tastiera specificata nel file di " "configurazione" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Impossibile trovare il file di menù \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Impossibile eseguire il comando nel pipe-menù \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Output del pipe-menù \"%s\" non valido" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Tentativo di accedere al menù \"%s\". Il menù non esiste" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Altri..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Il pulsante \"%s\" specificato nelle associazioni mouse non è valido" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Il contesto \"%s\" specificato nelle associazioni mouse non è valido" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Impossibile accedere alla directory home \"%s\": %s" @@ -252,30 +257,30 @@ msgstr "Impossibile accedere alla directory home \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Impossibile accedere al display specificato nella variabile DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Impossibile inizializzare la libreria obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Il server X non ha il supporto per la localizzazione." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" "Impossibile impostare i tasti modificatori localizzati per il server X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Impossibile trovare un file di configurazione valido, verranno utilizzate le " "impostazioni predefinite" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Impossibile caricare un tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -286,28 +291,24 @@ msgstr "" "Vedi stdout per ulteriori informazioni. L'ultimo errore era in \"%s\" alla " "linea %d, con il messaggio: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Errore di sintassi" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Chiudi" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Non è stato possibile riavviare il nuovo eseguibile \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintassi: openbox [opzioni]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -315,31 +316,31 @@ msgstr "" "\n" "Opzioni:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Mostra questo messaggio di aiuto ed esce\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Mostra il numero di versione ed esce\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Sostituisce l'attuale window manager attivo\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FILE Specifica il percorso del file di configurazione\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Disabilita la connessione al session manager\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -347,19 +348,19 @@ msgstr "" "\n" "Inviare messaggi ad un'istanza di Openbox attiva:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ricarica la configurazione di Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Riavvia Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Termina Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -367,10 +368,14 @@ msgstr "" "\n" "Opzioni di debug:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Esegue in modalità sincrona\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Mostra le informazioni di debug\n" @@ -382,10 +387,17 @@ msgstr "" "focus\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Mostra le informazioni di debug sulla gestione del " +"session\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Divide lo schermo per simulare xinerama\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -394,26 +406,27 @@ msgstr "" "\n" "Segnalate eventuali bug a %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file richiede un argomento\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s richiede un argomento\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Argomento da linea di comando non valido \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Un window manager è già attivo sullo schermo %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Il WM sullo schermo %d non è terminato" @@ -422,7 +435,7 @@ msgstr "Il WM sullo schermo %d non è terminato" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -437,31 +450,12 @@ msgstr[1] "" "Openbox è configurato per %d desktop, ma la sessione attuale ne ha %d. " "Ignoro la configurazione di Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "desktop %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Impossibile creare la directory \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Impossibile salvare la sessione in \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Errore durante il salvataggio della sessione in \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Non connesso al gestore di sessioni" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Sto eseguendo %s" @@ -492,14 +486,35 @@ msgstr "" msgid "Requested key \"%s\" does not exist on the display" msgstr "Il tasto richiesto \"%s\" non esiste sul display" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Errore del server X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "Ok" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Chiudi Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file richiede un argomento\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "L'azione SessionLogout non è disponibile se Openbox è compilato senza il " +#~ "supporto del gestore delle sessioni." + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Impossibile salvare la sessione in \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Errore durante il salvataggio della sessione in \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Non connesso al gestore di sessioni" + +#~ msgid "X Error: %s" +#~ msgstr "Errore del server X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Impossibile eseguire il comando \"%s\": %s" diff --git a/po/ja.po b/po/ja.po index 31a070f..132b887 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,86 +8,76 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-04 16:32+0100\n" "Last-Translator: Ryoichiro Suzuki \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "" "不正なアクション\"%s\"が要求されました。そのようなアクションは存在しません。" -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "いいえ" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "はい" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "実行する" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "パス\"%s\"を utf8 から変換するのに失敗しました。" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "キャンセル" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "終了" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "ログアウトしてもよろしいですか？" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "ログアウト" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Openbox を終了してもよろしいですか？" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Openbox を終了する" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Openbox がセッション管理の機能なしに作られたので SessionLogout アクションは利" -"用できません。" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "ログアウト" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "ログアウトしてもよろしいですか？" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "名称未設定" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "強制終了中..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "応答なし" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -95,149 +85,164 @@ msgid "" msgstr "" "ウィンドウ \"%s\" は応答していないようです。%s 信号を送り強制終了しますか？" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "プロセスを終了する" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "ウィンドウ \"%s\" は応答していないようです。Xサーバから切断しますか？" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "切断する" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "移動する..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "デスクトップを管理" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "新しくデスクトップを追加(_A)" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "最後のデスクトップを削除(_R)" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "ウィンドウ" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "デスクトップ" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "すべてのデスクトップ(_A)" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "階層(_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "常に最上層にする(_T)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "通常(_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "常に最下層にする(_B)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "デスクトップに送る(_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "クライアントメニュー" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "復元(_E)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "移動(_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "サイズの変更(_Z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "最小化(_N)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "最大化(_X)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "巻き上げ/展開(_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "非/装飾(_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "閉じる(_C)" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "マウス割り当てに於いて不正なコンテクスト \"%s\"" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "不正なボタン\"%s\"が設定ファイルで指定されています。" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "ディレクトリ'%s'を作れません: %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "閉じる" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "設定ファイルにキー割り当ての衝突があります。" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "正当なメニューファイル\"%s\"を見つけることができません。" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "パイプメニューの為のコマンド\"%s\"の実行に失敗しました: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "パイプメニュー\"%s\"からの不正な出力です。" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "メニュー\"%s\"へのアクセスを試みましたが、それは存在しません。" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "もっと..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "マウス割り当てに於いて不正なボタン \"%s\"" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "マウス割り当てに於いて不正なコンテクスト \"%s\"" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "ホームディレクトリ\"%s\"に移動できません: %s" @@ -246,27 +251,27 @@ msgstr "ホームディレクトリ\"%s\"に移動できません: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "環境変数 DISPLAY からディスプレイを開くのに失敗しました。" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "obrender ライブラリの初期化に失敗しました。" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Xサーバはロケールをサポートしていません。" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Xサーバの為のロケール修飾子を設定できません。" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "正当な設定ファイルを見つけられません。単純な初期設定を使います。" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "テーマを読み込めません。" -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -277,28 +282,24 @@ msgstr "" "は標準出力を見て下さい。最後に見つかったエラーは\"%s\"ファイルの%d 行目で、説" "明はこうです：%s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox 構文エラー" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "閉じる" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "再起動の際新しい実行ファイル\"%s\"の実行に失敗しました: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "著作権 (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "用法: openbox [オプション]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -306,30 +307,30 @@ msgstr "" "\n" "オプション:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help この使い方を表示して終了します\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version バージョンを表示して終了します\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace 現在実行中のウィンドウマネージャを置き換えます\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE 使用する設定ファイルのパスを指定します\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable セッションマネージャへの接続を止めます\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -337,19 +338,19 @@ msgstr "" "\n" "実行中の Openbox に命令を送ります:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox の設定を再読み込みします\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox を再起動します\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Openbox を終了します\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -357,10 +358,14 @@ msgstr "" "\n" "デバッグオプション:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync 同期モードで実行します\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug デバッグ情報を表示します\n" @@ -371,10 +376,16 @@ msgstr "" " --debug-focus フォーカスの扱いに関するデバッグ情報を表示します\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session セッションの扱いに関するデバッグ情報を表示します\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama 偽の xinerama スクリーンに分割表示します\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -383,26 +394,27 @@ msgstr "" "\n" "バグは %s 宛へ報告して下さい\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requires an argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requires an argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "不正なコマンドライン引数 \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "スクリーン%dでウィンドウマネージャが既に起動しています。" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "スクリーン%dでウィンドウマネージャの選択を取得できませんでした。" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "スクリーン%dのWMが終了しません。" @@ -411,7 +423,7 @@ msgstr "スクリーン%dのWMが終了しません。" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -423,31 +435,12 @@ msgstr[0] "" "Openbox は %d 個のデスクトップを設定されましたが, 現在のセッションは %d 個" "持っています。 Openbox の設定を無視します。" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "デスクトップ%i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "ディレクトリ\"%s\"を作れません: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "セッションを\"%s\"に保存できません: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "セッションを\"%s\"に保存中にエラーが起きました: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "セッションマネージャに接続されていません。" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "起動中 %s" @@ -472,15 +465,36 @@ msgstr "キー割り当ての中の不正なキー名称 \"%s\"" msgid "Requested key \"%s\" does not exist on the display" msgstr "要求されたキー\"%s\"はそのディスプレイに存在しません。" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Xエラー: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Openbox を終了する" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file requires an argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Openbox がセッション管理の機能なしに作られたので SessionLogout アクション" +#~ "は利用できません。" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "セッションを\"%s\"に保存できません: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "セッションを\"%s\"に保存中にエラーが起きました: %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "セッションマネージャに接続されていません。" + +#~ msgid "X Error: %s" +#~ msgstr "Xエラー: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "\"%s\"の実行に失敗しました: %s" diff --git a/po/lt.po b/po/lt.po index 854c4c3..289f220 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,84 +7,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-05-04 21:16+0200\n" "Last-Translator: Vytautas \n" "Language-Team: Lithuanian \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Neteisingo veiksmo \"%s\" pareikalauta. Toks veiksmas neegzistuoja." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ne" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Taip" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Vygdyti" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Nepavyko iÅ¡versti \"%s\" iÅ¡ utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "AtÅ¡aukti" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "IÅ¡eiti" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Ar tikrai norite iÅ¡siregistruoti?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "IÅ¡siregistruoti" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Ar tikrai norite iÅ¡jungti Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "IÅ¡jungti Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"SessionLogout action negalimas, nes Openbox buvo pastatytas be sesijos " -"valdymo palaikymo" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "IÅ¡siregistruoti" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Ar tikrai norite iÅ¡siregistruoti?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Bevardis Langas" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Naikinama..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Neatsako" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -93,149 +83,164 @@ msgstr "" "Langas \"%s\" neatsako. Ar nori jį priverstinai iÅ¡jungti nusiÅ«sdamas %s " "signalą?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Baigti procesą" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Langas \"%s\" neatsako. Ar nori jį atjungti nuo X serverio?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Atsijungti" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Eiti ten..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Valdyti darbastalius" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Pridėti darbastalį" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "P_aÅ¡alinti paskutinį darbastalį" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Langai" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Darbastaliai" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Visi darbastaliai" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Sluoksnis" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Visada _virÅ¡uje" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normalus" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Visada _apačioje" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "SiÅ«sti į _darbastalį" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Kliento menu" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Atstatyti" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Judinti" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "_Pakeisti dydį" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "_Mažinti" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "D_idinti" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Apvers_ti aukÅ¡tyn/žemyn" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Ne/D_ekoruoti" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Uždaryti" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Neteisingas kontekstas \"%s\" pelės nustatymuose" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Neteisingas mygtuskas \"%s\" nurodytas nustatymų byloje" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Negalima padaryti direktorijos '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Uždaryti" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konfliktas tarp mygtukų nustatymų byloje" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Nerasta gera menu byla \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Nepavyko pipe-menu komandos vygdyti \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Neteisinga iÅ¡vestis iÅ¡ pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Bandoma įeiti į menu \"%s\", bet jis neegzistuoja" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Dar..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Neteisingas mygtukas \"%s\" pelės nustatymuose" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Neteisingas kontekstas \"%s\" pelės nustatymuose" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Negalima patekti į home direktoriją \"%s\": %s" @@ -244,28 +249,28 @@ msgstr "Negalima patekti į home direktoriją \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Nepavyko atidaryti ekrano pagal DISPLAY aplinkos kintamąjį." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Nepavyko inicijuoti obrender bibliotekos." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X serveris nepalaiko lokalės." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Negalima nustatyti lokalės keitinių X serveriui." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Nepavyksta rasti geros nustatymų bylos, naudojami standartiniai nustatymai" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Nepavyksta įjunggti temos." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -276,28 +281,24 @@ msgstr "" "daugiau informacijos. Paskutinė klaida byloje \"%s\" eilutėje %d, su " "praneÅ¡imu: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Sintaksės Klaida" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Uždaryti" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Restartui nepavyko įjungti \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaksė: openbox [nustatymai]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -305,30 +306,30 @@ msgstr "" "\n" "Nustatymai:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Parodyti tai ir iÅ¡eiti\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Parodyti versiją ir iÅ¡eiti\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Pakeisti jau veikiantį VM\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Nurodyti kur yra nustatymų byla\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Atsijungti nuo sesijos tvarkyklės\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -336,19 +337,19 @@ msgstr "" "\n" "Perduodamos žinutės į veikiantį Openbox:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Perkrauti Openbox nustatymus\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Perkrauti Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit IÅ¡eiti iÅ¡ Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -356,10 +357,14 @@ msgstr "" "\n" "Klaidų Å¡alinimo nustatymai:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Paleisti synchronous mode\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Rodyti debugging output\n" @@ -369,10 +374,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Rodyti debugging output dėl focus handling\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr " --debug-session Rodyti debugging output dėl session management\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Skirstyt ekraną į netikrus xinerama ekranus\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -381,26 +390,27 @@ msgstr "" "\n" "PraneÅ¡kite apie vabaliukus %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file reikalauja argumento\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s reikalauja argumento\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Blogas komandinės eilutės argumentas \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "WM jau veikia ekrane %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nepavyksta gauti langų tvarkyklės pasirinkimo ekrane %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "WM ekrane %d neiÅ¡sijungia" @@ -409,7 +419,7 @@ msgstr "WM ekrane %d neiÅ¡sijungia" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -424,31 +434,12 @@ msgstr[1] "" "Openbox yra suderintas %d darbastaliams, bet dabartinė sesija turi %d. Mes " "naudosime kitą, ne Openbox, konfigÅ«raciją." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "darbastalis %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Negalima padaryti direktorijos \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Negalima iÅ¡saugoti sesijos į \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Klaida bandant iÅ¡saugot sesiją į \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Neprisijungta prie sesijų sesijos tvarkyklė" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Veikia %s" @@ -474,11 +465,32 @@ msgstr "Neteisingas klaviÅ¡o vardas \"%s\" klavišų priskyrimuose" msgid "Requested key \"%s\" does not exist on the display" msgstr "Norimas klaviÅ¡as \"%s\" neegzistuoja ekrane" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X Klaida: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "IÅ¡jungti Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file reikalauja argumento\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout action negalimas, nes Openbox buvo pastatytas be sesijos " +#~ "valdymo palaikymo" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Negalima iÅ¡saugoti sesijos į \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Klaida bandant iÅ¡saugot sesiją į \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Neprisijungta prie sesijų sesijos tvarkyklė" + +#~ msgid "X Error: %s" +#~ msgstr "X Klaida: %s" diff --git a/po/lv.po b/po/lv.po index 1642afe..6c434c2 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: 3.4.10\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2010-01-10 22:21+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2010-01-08 21:11+0200\n" "Last-Translator: Einars Sprugis \n" "Language-Team: Latvian \n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,65 +19,65 @@ msgstr "" "2);\n" "X-Generator: Lokalize 1.0\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "PrasÄ«ta neatļauta darbÄ«ba \"%s\". Šāda darbÄ«ba neeksistē." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nē" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Jā" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "IzpildÄ«t" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Neizdevās pārveidot ceļu \"%s\" no utf8" -#: openbox/actions/exit.c:62 openbox/client.c:3474 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Atcelt" -#: openbox/actions/exit.c:63 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Iziet" -#: openbox/actions/exit.c:67 +#: openbox/actions/exit.c:74 msgid "Are you sure you want to log out?" msgstr "Vai tiešām vēlaties atteikties?" -#: openbox/actions/exit.c:68 +#: openbox/actions/exit.c:75 msgid "Log Out" msgstr "Atteikties" -#: openbox/actions/exit.c:71 +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Vai tiešām vēlaties iziet no Openbox?" -#: openbox/actions/exit.c:72 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Iziet no Openbox" -#: openbox/client.c:2016 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Logs bez nosaukuma" -#: openbox/client.c:2030 openbox/client.c:2062 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Nogalina..." -#: openbox/client.c:2032 openbox/client.c:2064 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Neatbild" -#: openbox/client.c:3463 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -85,149 +86,164 @@ msgstr "" "Logs \"%s\" neatbild. Vai vēlieties to aizvērt piespiedu kārtā, nosÅ«tot " "signālu %s?" -#: openbox/client.c:3465 +#: openbox/client.c:3541 msgid "End Process" msgstr "Nobeigt procesu" -#: openbox/client.c:3469 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Logs \"%s\" neatbild. Vai vēlaties to atvienot no X servera?" -#: openbox/client.c:3471 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Atvienot" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Iet uz turieni..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "PārvaldÄ«t darbvirsmas" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Pievienot j_aunu darbvirsmu" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Noņemt pēdējo da_rbvirsmu" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Logi" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Darbvirsmas" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Visas darbvirsmas" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "S_lānis" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Vienmēr augšā" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normāls" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Vienmēr a_pakšā" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "No_sÅ«tÄ«t uz darbvirsmu" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Klienta izvēlne" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Atja_unot" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Pārviet_ot" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "MainÄ«t i_zmēru" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimizēt" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Maksimizē_t" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Sa_ritināt/Atritināt" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Bez/Ar _dekorācijām" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Ai_zvērt" -#: openbox/config.c:798 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Neatļauts konteksts \"%s\" peles saÄ«snē" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Konfigurācijas failā \"%s\" norādÄ«ts neatļauts taustiņš" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Nevarēja izveidot mapi '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Aizvērt" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konfliktē ar tastatÅ«ras saÄ«snēm konfigurācijas failā" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Nav atrasts atļauts izvēlnes fails \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Nevarēja izpildÄ«t skriptētās izvēlnes komandu \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Neatļauta izvade no skriptētās izvēlnes \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Mēģināja piekļūt izvēlnei \"%s\", bet tā neeksistē" -#: openbox/menu.c:370 openbox/menu.c:371 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Vairāk..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Neatļauts taustiņš \"%s\" peles saÄ«snē" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Neatļauts konteksts \"%s\" peles saÄ«snē" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Nevarēja pāriet uz mājas mapi \"%s\": %s" @@ -236,28 +252,28 @@ msgstr "Nevarēja pāriet uz mājas mapi \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Neizdevās atvērt displeju no DISPLAY vides mainÄ«gā." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Neizdevās inicializēt obrender bibliotēku." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X serveris neatbalsta lokāli." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Nevar uzstādÄ«t lokāles modificētājus X serverim." -#: openbox/openbox.c:265 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Nevarēja atrast atļautu konfigurācijas failu, tiek izmantoti noklusējumi" -#: openbox/openbox.c:299 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Nebija iespējams ielādēt tēmu." -#: openbox/openbox.c:379 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -268,28 +284,24 @@ msgstr "" "XML sintakses kļūdas. AplÅ«kojiet standarta izvadi, lai noskaidrotu vairāk. " "Pēdējā kļūda bija failā \"%s\" - %d rinda, kļūdas ziņojums: %s" -#: openbox/openbox.c:381 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox sintakses kļūda" -#: openbox/openbox.c:381 -msgid "Close" -msgstr "Aizvērt" - -#: openbox/openbox.c:463 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Pārstartētājam neizdevās palaist jauno izpildāmo \"%s\": %s" -#: openbox/openbox.c:533 openbox/openbox.c:535 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "AutortiesÄ«bas (c)" -#: openbox/openbox.c:544 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintakse: openbox [opcijas]\n" -#: openbox/openbox.c:545 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -297,31 +309,31 @@ msgstr "" "\n" "Opcijas:\n" -#: openbox/openbox.c:546 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Parāda Å¡o palÄ«dzÄ«bas tekstu un iziet\n" -#: openbox/openbox.c:547 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Parāda versiju un iziet\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Aizvieto paÅ¡reiz palaisto logu pārvaldnieku\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:552 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FAILS Norāda ceļu uz izmantojamo konfigurācijas failu\n" -#: openbox/openbox.c:553 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Pārtrauc savienojumu ar sesiju pārvaldnieku\n" -#: openbox/openbox.c:554 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -329,19 +341,19 @@ msgstr "" "\n" "Nodod ziņojumus esoÅ¡ai Openbox instancei:\n" -#: openbox/openbox.c:555 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Pārlādē Openbox konfigurācijas failus\n" -#: openbox/openbox.c:556 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Pārstartē Openbox\n" -#: openbox/openbox.c:557 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Iziet no Openbox\n" -#: openbox/openbox.c:558 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -349,24 +361,32 @@ msgstr "" "\n" "AtkļūdoÅ¡anas iespējas:\n" -#: openbox/openbox.c:559 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Palaist sinhronajā režīmā\n" -#: openbox/openbox.c:560 +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + +#: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug RādÄ«t atkļūdoÅ¡anas izvadi\n" -#: openbox/openbox.c:561 +#: openbox/openbox.c:546 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus RādÄ«t atkļūdoÅ¡anas izvadi fokusēšanas darbÄ«bām\n" -#: openbox/openbox.c:562 +#: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama SadalÄ«t displeju vairākos viltus xinerama ekrānos\n" -#: openbox/openbox.c:563 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -375,26 +395,27 @@ msgstr "" "\n" "LÅ«dzu, ziņojiet kļūdas %s\n" -#: openbox/openbox.c:645 -msgid "--config-file requires an argument\n" -msgstr "--config-file vajadzÄ«gs arguments\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s vajadzÄ«gs arguments\n" -#: openbox/openbox.c:688 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Neatļauts komandrindas arguments \"%s\"\n" -#: openbox/screen.c:103 openbox/screen.c:191 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Logu pārvaldnieks jau palaists uz %d. ekrāna" -#: openbox/screen.c:125 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nevarēja iegÅ«t logu pārvaldnieka izvēli uz %d. ekrāna" -#: openbox/screen.c:146 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Logu pārvaldnieks uz %d. ekrāna nebeidz darbÄ«bu" @@ -403,7 +424,7 @@ msgstr "Logu pārvaldnieks uz %d. ekrāna nebeidz darbÄ«bu" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:416 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -421,31 +442,12 @@ msgstr[2] "" "Openbox ir konfigurēts %d darbvirsmām, bet paÅ¡reizējai sesijai tādu ir %d. " "Å Ä« Openbox konfigurācijas opcija tiks ignorēta." -#: openbox/screen.c:1199 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "darbvirsma %i" -#: openbox/session.c:105 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Nevarēja izveidot mapi \"%s\": %s" - -#: openbox/session.c:472 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Neizdevās saglabāt sesiju \"%s\": %s" - -#: openbox/session.c:611 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Kļūda saglabājot sesiju \"%s\": %s" - -#: openbox/session.c:848 -msgid "Not connected to a session manager" -msgstr "Nav savienots ar sesiju pārvaldnieku" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Palaiž %s" @@ -470,15 +472,29 @@ msgstr "Neatļauts taustiņa nosaukums \"%s\" tastatÅ«ras saÄ«snē" msgid "Requested key \"%s\" does not exist on the display" msgstr "PieprasÄ«tais taustiņš \"%s\" uz displeja neeksistē" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X kļūda: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "Labi" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Iziet no Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file vajadzÄ«gs arguments\n" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Neizdevās saglabāt sesiju \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Kļūda saglabājot sesiju \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nav savienots ar sesiju pārvaldnieku" + +#~ msgid "X Error: %s" +#~ msgstr "X kļūda: %s" + #~ msgid "" #~ "The SessionLogout action is not available since Openbox was built without " #~ "session management support" diff --git a/po/nl.po b/po/nl.po index b635c23..b869348 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,85 +10,75 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-18 23:30+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Ongeldige actie \"%s\" werd gevraagd. Deze actie bestaat niet." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nee" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Ja" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Uitvoeren" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Converteren van het pad \"%s\" vanuit UTF-8 is mislukt" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Annuleren" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Afsluiten" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Weet u zeker dat u wilt uitloggen?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Uitloggen" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Weet u zeker dat u Openbox wilt afsluiten?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Openbox afsluiten" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"De actie 'SessionLogout' is niet beschikbaar omdat Openbox gecompileerd is " -"zonder ondersteuning voor sessiebeheer." - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Uitloggen" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Weet u zeker dat u wilt uitloggen?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Naamloos venster" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Termineren..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Reageert niet" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -97,11 +87,11 @@ msgstr "" "Het venster \"%s\" reageert niet. Wilt u het afsluiten forceren door het " "signaal %s te sturen?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Beëindig proces" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -110,138 +100,153 @@ msgstr "" "Het venster \"%s\" reageert niet. Wilt u de verbinding van het venster met " "de X-server verbreken?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Verbreek verbinding" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Ga hierheen..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Bureaubladen beheren" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Voeg nieuw bureaublad toe" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "V_erwijder laatste bureaublad" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Vensters" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Bureaubladen" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Alle bureaubladen" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Laag" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Altijd _bovenop" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normaal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Altijd _onderop" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Verplaats _naar bureaublad" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Venstermenu" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Herstellen" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Verplaatsen" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "_Grootte aanpassen" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "_Iconificeren" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "_Maximaliseren" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Op/neerklappen" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "_Vensterrand weghalen/toevoegen" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Sluiten" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Ongeldige context \"%s\" in muisbinding" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Ongeldige knop \"%s\" opgegeven in het configuratiebestand" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Kan map '%s' niet aanmaken: %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Sluiten" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflict in toetsbindingen in het configuratiebestand" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Kan geen geldig menubestand \"%s\" vinden" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Uitvoeren van commando voor pipe-menu \"%s\" is mislukt: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Ongeldige uitvoer van pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Toegang tot niet-bestaand menu \"%s\" werd gevraagd" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Meer..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Ongeldige knop \"%s\" in muisbinding" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Ongeldige context \"%s\" in muisbinding" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Kan thuismap \"%s\" niet de huidige map maken: %s" @@ -250,29 +255,29 @@ msgstr "Kan thuismap \"%s\" niet de huidige map maken: %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Kan scherm genoemd in omgevingsvariabele DISPLAY niet openen." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Initialiseren van de 'obrender'-bibliotheek is mislukt." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X-server ondersteunt lokalisatie niet." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Kan lokalisatie voor de X-server niet instellen." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Kan geen geldig configuratiebestand vinden; simpele standaardinstellingen " "worden gebruikt" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Kan geen thema laden." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -283,28 +288,24 @@ msgstr "" "Openbox-configuratiebestanden. Zie standaarduitvoer voor meer informatie. " "De laatste fout werd gevonden in bestand \"%s\" regel %d, met bericht: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox-syntaxfout" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Sluiten" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Uitvoeren van nieuw programma \"%s\" bij herstart is mislukt: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Gebruik: openbox [opties]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -312,32 +313,32 @@ msgstr "" "\n" "Opties:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Deze hulptekst tonen en stoppen\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Versie tonen en stoppen\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace De draaiende vensterbeheerder vervangen\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file BESTAND\n" " Dit configuratiebestand gebruiken\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Verbinding met de sessiebeheerder uitschakelen\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -345,19 +346,19 @@ msgstr "" "\n" "Berichten worden naar een draaiende Openbox-instantie gestuurd:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox-configuratie opnieuw laden\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox herstarten\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Openbox afsluiten\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -365,10 +366,14 @@ msgstr "" "\n" "Debugging-opties:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync In synchrone modus starten\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Debuguitvoer weergeven\n" @@ -378,10 +383,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Debuguitvoer voor focusafhandeling weergeven\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Het scherm in nep Xinerama-schermen splitsen\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -390,26 +399,27 @@ msgstr "" "\n" "Rapporteer programmafouten aan %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "'--config-file' vereist een argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s vereist een argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Onbekende optie \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Er draait al een vensterbeheerder op scherm %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Kan op scherm %d geen vensterbeheerderselectie verkrijgen" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "De vensterbeheerder op scherm %d sluit zichzelf niet af" @@ -418,7 +428,7 @@ msgstr "De vensterbeheerder op scherm %d sluit zichzelf niet af" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -433,31 +443,12 @@ msgstr[1] "" "Openbox is geconfigureerd voor %d bureaubladen, maar de huidige sessie heeft " "er %d. De Openbox-instelling wordt genegeerd." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "bureaublad %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Kan map \"%s\" niet aanmaken: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Kan de sessie niet opslaan in \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Fout tijdens het opslaan van de sessie in \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Niet met een sessiebeheerder verbonden" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Starten van %s" @@ -482,11 +473,32 @@ msgstr "Ongeldige toetsnaam \"%s\" in toetsenbinding" msgid "Requested key \"%s\" does not exist on the display" msgstr "Gevraagde toets \"%s\" bestaat niet op het scherm" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X-fout: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Openbox afsluiten" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "'--config-file' vereist een argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "De actie 'SessionLogout' is niet beschikbaar omdat Openbox gecompileerd " +#~ "is zonder ondersteuning voor sessiebeheer." + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Kan de sessie niet opslaan in \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Fout tijdens het opslaan van de sessie in \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Niet met een sessiebeheerder verbonden" + +#~ msgid "X Error: %s" +#~ msgstr "X-fout: %s" diff --git a/po/no.po b/po/no.po index a702caa..0d01353 100644 --- a/po/no.po +++ b/po/no.po @@ -7,84 +7,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-13 13:37+0100\n" "Last-Translator: Michael Kjelbergvik Thung \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Ugyldig operasjon \"%s\" etterspurt. Operasjonen finnes ikke." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nei" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Ja" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Utfør" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Feil ved konvertering av \"%s\" fra utf8 " -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Avbryt" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Avslutt" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Er du sikker pÃ¥ at du vil logge ut?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Logg Ut" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Er du sikker pÃ¥ at du vil avslutte Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Avslutt Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"SessionLogout er ikke tilgjengelig fordi Openbox ble kompilert uten støtte " -"for sesjonsbehandling" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Logg Ut" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Er du sikker pÃ¥ at du vil logge ut?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Ukjent Vindu" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Dreper..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Svarer Ikke" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -93,11 +83,11 @@ msgstr "" "Vinduet \"%s\" svarer ikke. Vil du utføre tvunget avslutning ved Ã¥ sende " "signalet %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Avslutt Prosess" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -106,138 +96,153 @@ msgstr "" "Vinduet \"%s\" svarer ikke. Vil du fjerne tilknytning av vinduet til X-" "serveren?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Fjern tilknytning" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "GÃ¥ dit..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Behandle skrivebord" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Nytt skrivebord" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Fjern siste skrivebord" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Vinduer" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Skrivebord" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Alle skrivebord" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "La_g" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Alltid ø_verst" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "Nor_mal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Alltid _nederst" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Send til" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Klient-meny" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Tilbak_estill" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Flytt" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Endre s_tørrelse" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "_Minimer" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximer" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Rull opp/ned" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Fjern/Legg til _dekorasjon" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Lukk" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Ugyldig innhold \"%s\" i binding for mus" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Ugyldig tast \"%s\" spesifisert i konfigurasjonsfilen" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Kan ikke lage katalog '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Lukk" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Kan ikke finne en gyldig menyfil \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Kunne ikke kjøre kommando for pipe-meny \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Ugyldig utdata fra pipe-menyen \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Forsøkte Ã¥ Ã¥pne menyen \"%s\", men denne finnes ikke" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Mer..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Ugyldig knapp \"%s\" i binding for mus" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Ugyldig innhold \"%s\" i binding for mus" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Kan ikke endre til hjemmekatalogen \"%s\": %s" @@ -246,27 +251,27 @@ msgstr "Kan ikke endre til hjemmekatalogen \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Kunne ikke Ã¥pne displayet fra DISPLAY-miljøvariabelen" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Kunne ikke starte obrender-biblioteket." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X-serveren støtter ikke lokalisering." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Kan ikke laste et tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -277,28 +282,24 @@ msgstr "" "til Openbox. Se stdout for mer informasjon. Forrige feil funnet var i filen " "\"%s\", linje %d, med beskjeden: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Syntaksfeil" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Lukk" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Kunne ikke starte nytt program ved omstart: \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [alternativer\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -306,32 +307,32 @@ msgstr "" "\n" "Alternativ:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Vise denne hjelpeteksten og avslutt\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Vis versjonsnummeret og avslutt\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Erstatt den kjørende vindusbehandleren\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FIL Spesifisér filbane til konfigurasjonsfilen du vil ta i " "bruk\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Deaktiver tilknytning til sesjonsbehandleren\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -339,19 +340,19 @@ msgstr "" "\n" "Sender beskjeder til en kjørende Openbox-instans:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Oppdater Openbox' konfigurasjon\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Start Openbox pÃ¥ nytt\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Avslutt Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -359,10 +360,14 @@ msgstr "" "\n" "Debug-alternativ:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Kjør i synkron-modus\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Vis debuggingsinformasjon\n" @@ -372,10 +377,16 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Vis debuggingsinformasjon for fokus-hÃ¥ndtering\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Vis debuggingsinformasjon for session-hÃ¥ndtering\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " -debug-xinerama Splitt displayet for falske xinerama-skjermer\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -384,26 +395,27 @@ msgstr "" "\n" "Vennligst rapporter bugs til %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file krever et argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s krever et argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Ugyldig kommandolinje-argument \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "En vindusbehandler kjører allerede pÃ¥ skjerm %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Kunne ikke hendte vindusbehandlerens markering pÃ¥ skjerm %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Vindusbehandleren pÃ¥ skjerm %d vil ikke avslutte" @@ -412,7 +424,7 @@ msgstr "Vindusbehandleren pÃ¥ skjerm %d vil ikke avslutte" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -427,31 +439,12 @@ msgstr[1] "" "Aktiv sesjon har %2$d skrivebord, mens Openbox er konfigurert til %1$d. " "Benytter innstillingene for den aktive sesjonen." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "skrivebord %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Kan ikke lage katalog \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Kan ikke lagre sesjon til \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Feil ved lagring av sesjon til \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Ikke tilknyttet en sesjonsbehandler" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Kjører %s" @@ -476,15 +469,36 @@ msgstr "Ugyldig tastenavn \"%s\" i hurtigtastbinding" msgid "Requested key \"%s\" does not exist on the display" msgstr "Ønsket tast \"%s\" eksisterer ikke i displayet" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Feil i X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Avslutt Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file krever et argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout er ikke tilgjengelig fordi Openbox ble kompilert uten " +#~ "støtte for sesjonsbehandling" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Kan ikke lagre sesjon til \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Feil ved lagring av sesjon til \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Ikke tilknyttet en sesjonsbehandler" + +#~ msgid "X Error: %s" +#~ msgstr "Feil i X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Kunne ikke kjøre \"%s\": %s" diff --git a/po/openbox.pot b/po/openbox.pot index 0450394..785d49e 100644 --- a/po/openbox.pot +++ b/po/openbox.pot @@ -8,232 +8,239 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "" -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "" -#: openbox/actions/exit.c:56 -msgid "Are you sure you want to exit Openbox?" -msgstr "" - -#: openbox/actions/exit.c:57 -msgid "Exit Openbox" +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" msgstr "" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" +#: openbox/actions/exit.c:75 +msgid "Log Out" msgstr "" -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" +#: openbox/actions/exit.c:78 +msgid "Are you sure you want to exit Openbox?" msgstr "" -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" +#: openbox/actions/exit.c:79 +msgid "Exit Openbox" msgstr "" -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "" -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "" -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "" -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "" @@ -242,27 +249,27 @@ msgstr "" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "" -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -270,84 +277,84 @@ msgid "" "was in file \"%s\" line %d, with message: %s" msgstr "" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" msgstr "" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr "" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr "" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" msgstr "" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr "" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr "" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" msgstr "" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr "" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr "" @@ -357,36 +364,41 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" #: openbox/openbox.c:547 -msgid " --debug-xinerama Split the display into fake xinerama screens\n" +msgid " --debug-session Display debugging output for session management\n" msgstr "" #: openbox/openbox.c:548 +msgid " --debug-xinerama Split the display into fake xinerama screens\n" +msgstr "" + +#: openbox/openbox.c:549 #, c-format msgid "" "\n" "Please report bugs at %s\n" msgstr "" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" msgstr "" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "" @@ -395,7 +407,7 @@ msgstr "" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -406,31 +418,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "" @@ -455,11 +448,6 @@ msgstr "" msgid "Requested key \"%s\" does not exist on the display" msgstr "" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "" diff --git a/po/pl.po b/po/pl.po index b0f5d52..794d0f5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,236 +4,246 @@ # Madej , 2004. # Paweł Rusinek , 2007. # Piotr Drąg , 2007. +# Jakub Łojewski , 2010. # msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2007-07-14 00:43+0200\n" -"Last-Translator: Piotr Drąg \n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2010-03-11 13:55+0100\n" +"Last-Translator: Jakub Łojewski \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." -msgstr "" +msgstr "Wywołana akcja \"%s\" nie istnieje." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" -msgstr "" +msgstr "Nie" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" -msgstr "" +msgstr "Tak" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" -msgstr "" +msgstr "Wykonaj" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Nie można przekonwertować ścieżki \"%s\" z UTF-8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" -msgstr "" +msgstr "Anuluj" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" -msgstr "" +msgstr "Wyjście" -#: openbox/actions/exit.c:56 -msgid "Are you sure you want to exit Openbox?" -msgstr "" - -#: openbox/actions/exit.c:57 -msgid "Exit Openbox" -msgstr "" - -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Czy na pewno chcesz się wylogować?" -#: openbox/actions/session.c:65 openbox/actions/session.c:70 +#: openbox/actions/exit.c:75 msgid "Log Out" -msgstr "" +msgstr "Wyloguj" -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "" +#: openbox/actions/exit.c:78 +msgid "Are you sure you want to exit Openbox?" +msgstr "Czy na pewno chcesz opuścić Openboksa?" -#: openbox/client.c:2012 +#: openbox/actions/exit.c:79 +msgid "Exit Openbox" +msgstr "Opuść Openbox" + +#: openbox/client.c:2037 msgid "Unnamed Window" -msgstr "" +msgstr "Okno bez nazwy" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." -msgstr "" +msgstr "Kończenie..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" -msgstr "" +msgstr "Nie odpowiada" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" +"Okno \"%s\" nie odpowiada. Czy wymusić zakończenie poprzez wysłanie sygnału " +"%s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" -msgstr "" +msgstr "Zakończ proces" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" -msgstr "" +msgstr "Okno \"%s\" nie odpowiada. Odłączyć je od serwera X?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" -msgstr "" +msgstr "Odłącz" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Przejdź..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Zarządzaj pulpitami" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Dod_aj nowy pulpit" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Usuń ostatni pulpit" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Okna" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Pulpity" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Wszystkie pulpity" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Warstwa" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Zawsze na _wierzchu" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normalnie" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Zawsze pod _spodem" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Wyślij na p_ulpit" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menu klienta" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "P_rzywróć" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Przesuń" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Zmień _rozmiar" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Zmi_nimalizuj" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Zma_ksymalizuj" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Zwiń/Rozwiń" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Wyświetl/ukryj _dekoracje" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Z_amknij" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Nieprawidłowy kontekst \"%s\" w skrócie myszy" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Nieprawidłowy klawisz \"%s\" określony w pliku konfiguracyjnym" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Nie można utworzyć katalogu '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Zamknij" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt skrótów klawiszowych w pliku konfiguracyjnym" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Nie można znaleźć prawidłowego pliku menu \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Wykonanie polecenia dla pipe-menu \"%s\" nie powiodło się: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Nieprawidłowe wyjście z pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Spróbowano uzyskać dostęp do menu \"%s\", ale ono nie istnieje" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Więcej..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Nieprawidłowy klawisz \"%s\" w skrócie myszy" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Nieprawidłowy kontekst \"%s\" w skrócie myszy" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Nie można przejść do katalogu domowego \"%s\": %s" @@ -242,60 +252,60 @@ msgstr "Nie można przejść do katalogu domowego \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Otwarcie ekranu ze zmiennej środowiskowej DISPLAY nie powiodło się." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Zainicjowanie biblioteki obrender nie powiodło się." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Serwer X nie obsługuje ustawień lokalnych." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Nie można znaleźć prawidłowego pliku konfiguracyjnego, używanie " "domyślnychwartości" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Nie można wczytać motywu." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " "configuration files. See stdout for more information. The last error seen " "was in file \"%s\" line %d, with message: %s" msgstr "" +"Jeden lub więcej błędów składniowych XML zostało znalezionych podczas " +"sprawdzania plików konfiguracyjnych. Zobacz stdout aby uzyskać więcej " +"informacji. Ostatnio błąd znaleziono w pliku \"%s\" linia %d, z wiadomością: " +"%s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" -msgstr "" - -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Zamknij" +msgstr "Błąd składniowy Openboksa" -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "Wykonanie nowego pliku wykonywalnego \"%s\" podczas ponownego " "uruchomienianie powiodło się: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Składnia: openbox [opcje]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -303,30 +313,30 @@ msgstr "" "\n" "Opcje:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Wyświetla tę pomoc i kończy\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Wyświetla wersję i kończy\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Zastępuje aktualnie działający menedżer okien\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" -msgstr "" +msgstr " --config-file FILE Podaj ścieżkę do pliku konfiguracji\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Nie tworzy połączenia z menedżerem sesji\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -334,19 +344,19 @@ msgstr "" "\n" "Przekazywanie komunikatów do działającej instancji Openboksa:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ponownie wczytuje pliki konfiguracyjne\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Ponownie uruchamia Openboksa\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" -msgstr "" +msgstr " --exit Opuść Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -354,10 +364,14 @@ msgstr "" "\n" "Opcje debugowania:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Uruchamia w trybie synchronicznym\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Wyświetla informacje o debugowaniu\n" @@ -368,10 +382,14 @@ msgstr "" " --debug-focus Wyświetla wyjście debugowania obsługi aktywacji\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Dzieli ekran na sztuczne ekrany xineramy\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -380,26 +398,27 @@ msgstr "" "\n" "Proszę zgłaszać błędy (w języku angielskim) pod adresem %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s wymaga argumentu\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Nieprawidłowy argument wiersza poleceń \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Menedżer okien jest już uruchomiony na ekranie %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Menedżer okien na ekranie %d nie kończy działania" @@ -408,7 +427,7 @@ msgstr "Menedżer okien na ekranie %d nie kończy działania" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -419,31 +438,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "pulpit %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Nie można utworzyć katalogu \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Nie można zapisać sesji do \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Wystąpił błąd podczas zapisywania sesji do \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Uruchamianie %s" @@ -469,14 +469,28 @@ msgstr "Nieprawidłowa nazwa \"%s\" w skrócie klawiszowym" msgid "Requested key \"%s\" does not exist on the display" msgstr "Żądany klawisz \"%s\" nie istnieje na ekranie" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Błąd X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" -msgstr "" +msgstr "OK" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Nie można zapisać sesji do \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Wystąpił błąd podczas zapisywania sesji do \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nie podłączono do menedżera sesji" + +#~ msgid "X Error: %s" +#~ msgstr "Błąd X: %s" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout jest niedostępne, ponieważ Openbox został stworzony bez " +#~ "wsparcia dla zarządzania sesją" #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Wykonanie \"%s\" nie powiodło się: %s" diff --git a/po/pt.po b/po/pt.po index f962756..390963f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,276 +1,280 @@ # Portuguese messages for openbox -# Copyright (C) 2007 Mikael Magnusson +# Copyright (C) 2010 Mikael Magnusson # This file is distributed under the same license as the openbox package. -# Gonçalo Ferreira , 2006. -# althaser , 2008. +# Gonçalo Ferreira , 2006. +# Pedro Beja , 2007 2008 2010. # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.7\n" +"Project-Id-Version: Openbox 3.4.11.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-03-16 15:46+0100\n" -"Last-Translator: althaser \n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2010-05-14 15:51+0100\n" +"Last-Translator: Pedro Beja \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." -msgstr "Pedido de acção \"%s\" inválido. Não existem quaisquer acções." +msgstr "Pedido de acção \"%s\" inválido. Não existem quaisquer acções." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" -msgstr "Não" +msgstr "Não" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Sim" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Executar" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Falha a converter o caminho \"%s\" do utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Cancelar" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Sair" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Tem a certeza que pretende fazer log out?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Log Out" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Tem a certeza que pretende sair do Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Sair do Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"A acção SessãoLogout não está disponível visto que o Openbox foi construído " -"sem suporte a gestão de sessão" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Log Out" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Tem a certeza que pretende fazer log out?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Janela sem nome" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Terminando..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" -msgstr "Não está a responder" +msgstr "Não está a responder" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" -"A janela \"%s\" parece não estar a responder. Pretende forçá-la a sair " -"enviando o sinal %s?" +"A janela \"%s\" parece não estar a responder. Quer forçá-la a sair enviando " +"o sinal %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Terminar Processo" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" -"A janela \"%s\" parece não estar a responder. Pretende desligá-la do " -"servidor X?" +"A janela \"%s\" parece não estar a responder. Quer desligá-la do servidor X?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Desligar" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Ir para..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" -msgstr "Gerir áreas de trabalho" +msgstr "Gerir áreas de trabalho" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" -msgstr "_Adicionar nova área de trabalho" +msgstr "_Adicionar nova área de trabalho" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" -msgstr "_Remover a última área de trabalho" +msgstr "_Remover última área de trabalho" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Janelas" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" -msgstr "Áreas de trabalho" +msgstr "Áreas de trabalho" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" -msgstr "Todas as áreas de trabalho" +msgstr "Todas as áreas de trabalho" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Camada" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Sempre no _topo" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Sempre no _fundo" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" -msgstr "Enviar para área de _trabalho" +msgstr "Enviar para área de _trabalho" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" -msgstr "Menu do cliente" +msgstr "Menu cliente" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "R_estaurar" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Mover" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Redimen_sionar" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimizar" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximizar" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Des/en_rolar" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Des/_Decorar" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Fechar" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Contexto inválido \"%s\" no atalho do rato" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" -msgstr "Botão inválido \"%s\" especificado no ficheiro de configuração" +msgstr "Botão inválido \"%s\" especificado no ficheiro de configuração" + +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Incapaz de criar o directório '%s': %s" -#: openbox/keyboard.c:157 +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Fechar" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" -msgstr "Conflito com tecla de atalho no ficheiro de configuração" +msgstr "Conflito com tecla de atalho no ficheiro de configuração" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" -msgstr "Incapaz de encontrar um ficheiro de menu \"%s\" válido" +msgstr "Incapaz de encontrar um ficheiro de menu válido \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" -msgstr "Falha no comando de execução para o menu de processamento \"%s\": %s" +msgstr "Falha a executar comando para o menu de processamento \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" -msgstr "Resultado inválido do menu de processamento \"%s\"" +msgstr "Resultado inválido do menu de processamento \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" -msgstr "Tentou aceder ao menu \"%s\" mas ele não existe" +msgstr "Tentou aceder ao menu \"%s\" mas ele não existe" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Mais..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" -msgstr "Botão inválido \"%s\" no atalho do rato" - -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Contexto inválido \"%s\" no atalho do rato" +msgstr "Botão inválido \"%s\" no atalho do rato" -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" -msgstr "Incapaz de mudar para o directório home \"%s\": %s" +msgstr "Incapaz de mudar para o directório home \"%s\": %s" #: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." -msgstr "Falha ao abrir o ecrã da variável de ambiente DISPLAY." +msgstr "Falha ao abrir o ecrã da variável de ambiente DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Falha ao inicializar a biblioteca obrender" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." -msgstr "O servidor X não suporta o locale." +msgstr "O servidor X não suporta o locale." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." -msgstr "Não pode definir locales modificados para o servidor X." +msgstr "Não é possível configurar modificadores de locale para o servidor X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" -"Incapaz de encontrar um ficheiro de configuração válido, usando algumas " -"configurações simples de omissão" +"Incapaz de encontrar um ficheiro de configuração válido, usando alguns " +"valores simples de omissão" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Incapaz de carregar o tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -278,111 +282,115 @@ msgid "" "was in file \"%s\" line %d, with message: %s" msgstr "" "Um ou mais erros de sintaxe do XML foram encontrados enquanto analizava os " -"ficheiros de configuração do Openbox. Veja o stdout para mais informações. " -"O último erro visto foi no ficheiro \"%s\" linha %d, com a mensagem: %s" +"ficheiros de configuração do Openbox. Veja o stdout para mais informações. " +"O último erro visto foi no ficheiro \"%s\" linha %d, com a mensagem: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Erro de Sintaxe do Openbox" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Fechar" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" -msgstr "Falha a reiniciar a execução de um novo executável \"%s\": %s" +msgstr "Falha a reiniciar a execução de um novo executável \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Direitos de autor (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" -msgstr "Sintaxe: openbox [opções]\n" +msgstr "Sintaxe: openbox [opções]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" msgstr "" "\n" -"Opções:\n" +"Opções:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Mostra esta ajuda e sai\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" -msgstr " --version Mostra a versão e sai\n" +msgstr " --version Mostra a versão e sai\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Substitui o corrente gestor de janelas\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" -" --config-file FICHEIRO\n" -" Especifica o caminho do ficheiro de configuração para " +" --config-file ficheiro\n" +" Especifica o caminho do ficheiro de configuração a " "usar\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" -msgstr " --sm-disable Desactiva a ligação com o gestor de sessões\n" +msgstr " --sm-disable Desactiva a ligação com o gestor de sessões\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" msgstr "" "\n" -"Passando mensagens para uma solicitação do Openbox em execução\n" +"Passando mensagens para uma instância do Openbox em execução:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" -msgstr " --reconfigure Recarrega a configuração do Openbox\n" +msgstr " --reconfigure Recarrega a configuração do Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Reinicia o Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --sair Sai do Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" msgstr "" "\n" -"Opções de depuração:\n" +"Opções de depuração:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Executa em modo sincronizado\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" -msgstr " --debug Mostra o resultado da depuração\n" +msgstr " --debug Mostra o resultado da depuração\n" #: openbox/openbox.c:546 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" -" --debug-focus Mostra o resultado da depuração para manipulação em " +" --debug-focus Mostra o resultado de depuração para manipulação de " "foco\n" #: openbox/openbox.c:547 -msgid " --debug-xinerama Split the display into fake xinerama screens\n" -msgstr " --debug-xinerama Divide o ecrã em falsos ecrãs xinerama\n" +msgid " --debug-session Display debugging output for session management\n" +msgstr "" #: openbox/openbox.c:548 +msgid " --debug-xinerama Split the display into fake xinerama screens\n" +msgstr " --debug-xinerama Divide o ecrã em falsos ecrãs xinerama\n" + +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -391,35 +399,36 @@ msgstr "" "\n" "Por favor reporte os erros em %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requer um argumento\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requer um argumento\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" -msgstr "Argumento inválido na linha de comandos \"%s\"\n" +msgstr "Argumento inválido na linha de comandos \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" -msgstr "Um gestor de janelas já está em execução no ecrã %d" +msgstr "Um gestor de janelas já está em execução no ecrã %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" -msgstr "Não consegui adequirir o gestor de janelas selecionado no ecrã %d" +msgstr "Não consegui adequirir o gestor de janelas selecionado no ecrã %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" -msgstr "O gestor de janelas no ecrã %d não está a fechar" +msgstr "O gestor de janelas no ecrã %d não está a fechar" #. TRANSLATORS: If you need to specify a different order of the #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -428,37 +437,18 @@ msgid_plural "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr[0] "" -"O Openbox está configurado para %d área de trabalho, mas a sessão corrente " -"tem %d. Sobrescrevendo a configuração do Openbox." +"O Openbox está configurado para %d área de trabalho, mas a sessão corrente " +"tem %d. Sobrescrevendo a configuração do Openbox." msgstr[1] "" -"O Openbox está configurado para %d áreas de trabalho, mas a sessão corrente " -"tem %d. Sobrescrevendo a configuração do Openbox." +"O Openbox está configurado para %d áreas de trabalho, mas a sessão corrente " +"tem %d. Sobrescrevendo a configuração do Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" -msgstr "área de trabalho %i" - -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Incapaz de criar o directório \"%s\": %s " - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Incapaz de guardar a sessão em \"%s\": %s" +msgstr "área de trabalho %i" -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Erro enquanto guardava a sessão em \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Desligado do gestor de sessão" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Executando %s" @@ -466,34 +456,48 @@ msgstr "Executando %s" #: openbox/translate.c:59 #, c-format msgid "Invalid modifier key \"%s\" in key/mouse binding" -msgstr "Chave modificadora \"%s\" inválida no atalho de tecla/rato" +msgstr "Chave modificadora inválida \"%s\" no atalho de tecla/rato" #: openbox/translate.c:138 #, c-format msgid "Invalid key code \"%s\" in key binding" -msgstr "Código chave \"%s\" inválido na tecla de atalho" +msgstr "Código chave inválido \"%s\" na tecla de atalho" #: openbox/translate.c:145 #, c-format msgid "Invalid key name \"%s\" in key binding" -msgstr "Nome de chave \"%s\" inválido na tecla de atalho" +msgstr "Nome de chave inválido \"%s\" na tecla de atalho" #: openbox/translate.c:151 #, c-format msgid "Requested key \"%s\" does not exist on the display" -msgstr "Chave requerida \"%s\" não existe no ecrã" - -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Erro no X: %s" +msgstr "Chave requerida \"%s\" não existe no ecrã" -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Incapaz de guardar a sessão em \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Erro enquanto guardo a sessão em \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Não está ligado a um gestor de sessões" + +#~ msgid "X Error: %s" +#~ msgstr "Erro no X: %s" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "A acção SessionLogout não está disponível visto que o Openbox foi " +#~ "construído sem suporte à gestão de sessões" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Falha a executar \"%s\": %s" #~ msgid "Invalid use of action \"%s\". Action will be ignored." -#~ msgstr "Uso inválido da acção \"%s\". A acção será ignorada." +#~ msgstr "Uso inválido da acção \"%s\". A acção será ignorada." diff --git a/po/pt_BR.po b/po/pt_BR.po index fe44888..b0c2294 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,91 +2,81 @@ # Copyright (C) 2007 Mikael Magnusson # This file is distributed under the same license as the openbox package. # crimeboy, 2007. -# Og Maciel , 2007, 2008. +# Og Maciel , 2007, 2008, 2011. # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.7\n" +"Project-Id-Version: Openbox 3.5.0\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-03-04 16:07-0500\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2011-08-01 15:26-0400\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Ação inválida \"%s\" requisitada. Ação não existe." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Não" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Sim" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Executar" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Falha ao converter o caminho \"%s\" do utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Cancelar" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Sair" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Você tem certeza que deseja sair?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Sair" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Você tem certeza que deseja sair do Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Sair do Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"A ação SessionLogout não está disponível já que o Openbox foi compilado sem " -"suporte de gerenciamento de sessões" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Sair" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Você tem certeza que deseja sair?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Janela sem nome" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Terminando..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Não Responsivo" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -95,11 +85,11 @@ msgstr "" "A janela \"%s\" não está responsiva. Você deseja forçá-la a sair enviando o " "sinal %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Terminar Processo" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -107,138 +97,155 @@ msgid "" msgstr "" "A janela \"%s\" não está responsiva. Você deseja desconectá-la do servidor X?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Desconectar" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Ir lá..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Gerenciar áreas de trabalho" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Adicionar nova área de trabalho" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Remover última área de trabalho" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Janelas" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Áreas de trabalho" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Todas as áreas de trabalho" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Camada" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Sempre no _topo" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Sempre no _fundo" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Enviar para área de _trabalho" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menu do cliente" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "R_estaurar" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Mover" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Redimen_sionar" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimizar" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximizar" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "(Des)en_rolar" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "(Não) _Decorar" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Fechar" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Contexto \"%s\" inválido na associação do mouse" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Botão inválido \"%s\" especificado no arquivo de configuração" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" +"Openbox foi compilado sem suporte para carregamento de imagens Imlib2. " +"Ícones em menus não serão carregados." + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Não foi possível criar o diretório '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Fechar" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Conflito com associação de chave no arquivo de configuração" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Não foi possível encontrar um arquivo de menu \"%s\" válido" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Falha ao executar comando para menu de processamento \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Saída inválida do menu de processamento \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Tentou acessar menu \"%s\" mas ele não existe" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Mais.." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Botão inválido \"%s\" na associação do mouse" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Contexto \"%s\" inválido na associação do mouse" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Não foi possível mudar para o diretório pessoal \"%s\": %s" @@ -247,30 +254,30 @@ msgstr "Não foi possível mudar para o diretório pessoal \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Falha ao abrir a tela da variavel de ambiente DISPLAY" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Falha ao iniciar a biblioteca obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Servidor X não suporta localização." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "" "Não foi possível configurar modificadores de localização para o servidor X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Não foi possível encontrar um arquivo de configuração válido, usando alguns " "valores padrão simples." -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Não foi possível carregar um tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -281,28 +288,24 @@ msgstr "" "de configuração do Openbox. Veja a saída padrão para mais informação. O " "último erro relatado foi no arquivo \"%s\" linha %d, com a mensagem: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Erro de Sintaxe do Openbox" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Fechar" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "O comando de reiniciar falhou ao executar novo executável \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaxe: openbox [opções]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -310,34 +313,34 @@ msgstr "" "\n" "Opções:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Mostra esta ajuda e sai\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Mostra a versão e sai\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Substitui o gerenciador de janelas ativo\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file ARQUIVO\n" " Especifica o caminho do arquivo de configuração para " "usar\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable Desabilita conexão com o gerenciador de sessões\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -345,19 +348,19 @@ msgstr "" "\n" "Passando mensagens para uma instância do Openbox em execução:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recarrega a configuração do Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Reinicia o Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Sai do Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -365,10 +368,14 @@ msgstr "" "\n" "Opções de depuração:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Executa em modo sincronizado\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr " --startup CMD Executa CMD depois de iniciar\n" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Mostra saida de depuração\n" @@ -379,12 +386,17 @@ msgstr "" " --debug-focus Mostra saída de depuração para manipulação de foco\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Mostra saída de depuração do gerenciamento da sessão\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Divide a exibição de telas em telas de xinerama " "falsas\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -393,27 +405,28 @@ msgstr "" "\n" "Por favor reporte erros em %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file requere um argumento\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s requere um argumento\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Argumento de linha de comando inválido \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Um gerenciador de janelas já está em execução na tela %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "" "Não foi possível adquirir a seleção do gerenciador de janelas na tela %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "O gerenciador de janelas na tela %d não está saindo" @@ -422,7 +435,7 @@ msgstr "O gerenciador de janelas na tela %d não está saindo" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -437,31 +450,12 @@ msgstr[1] "" "O Openbox está configurado para %d áreas de trabalho, mas a sessão atual " "contém %d. Sobrescrevendo a configuração do Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "área de trabalho %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Não foi possível criar o diretório \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Não foi possível salvar a sessão em \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Erro enquanto salvando a sessão em \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Não está conectado à um gerente de sessões" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Executando %s" @@ -486,15 +480,36 @@ msgstr "Nome de chave \"%s\" inválido na associação de chave" msgid "Requested key \"%s\" does not exist on the display" msgstr "Chave requerida \"%s\" não existe na tela" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Erro no X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Sair do Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file requere um argumento\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "A ação SessionLogout não está disponível já que o Openbox foi compilado " +#~ "sem suporte de gerenciamento de sessões" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Não foi possível salvar a sessão em \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Erro enquanto salvando a sessão em \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Não está conectado à um gerente de sessões" + +#~ msgid "X Error: %s" +#~ msgstr "Erro no X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Falha ao executar \"%s\": %s" diff --git a/po/ru.po b/po/ru.po index dfbb425..8fa7e1e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,84 +9,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-05-02 10:25+0200\n" "Last-Translator: Moroz Sergey L. \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Запрошено неверное действие \"%s\". Такого действия нет." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Нет" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Да" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Запустить" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Неудачная конвертация пути \"%s\" из utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Отменить" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Выйти" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Вы действительно хотите выйти?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Выход" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Вы действительно хотите выйти из Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Выйти из Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Действие 'SessionLogout' недоступно так как Openbox был собран без поддержки " -"управления сессиями" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Выход" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Вы действительно хотите выйти?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Безымянное окно" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Завершение..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Нет ответа" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -95,149 +85,164 @@ msgstr "" "Похоже, окно \"%s\" не отвечает. Хотите принудительно послать сигнал выхода " "%s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Закончить процесс" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Похоже, окно \"%s\" не отвечает. Хотите отключить его от Ð¥-сервера?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Отключить" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Перейти..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Управление рабочими столами" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Добавить новый рабочий стол(_A)" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Удалить последний рабочий стол(_R)" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Окна" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Рабочие столы" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Все рабочие столы" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "Положение(_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Всегда наверху(_T)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "Обычное(_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Всегда внизу(_B)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Отправить на рабочий стол(_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Клиентское меню" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Восстановить(_E)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Переместить(_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Изменить размер(_Z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Свернуть в значок(_N)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Распахнуть(_X)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Рас/скрутить(_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Рас/Декорировать(_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Закрыть(_C)" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Неверная связь \"%s\" в комбинации мыши" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "В файле конфигурации определена неверная кнопка \"%s\"" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Невозможно создать директорию '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Закрыть" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Конфликтует с комбинацией клавиш из файла конфигурации" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Невозможно найти соответствующий файл меню \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Неудачное выполнение команды для меню канала \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Неверный выход меню канала \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Попытка доступа к меню \"%s\", которого не существует" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Еще..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Неверная кнопка \"%s\" в комбинации мыши" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Неверная связь \"%s\" в комбинации мыши" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Невозможно изменить на домашнюю директорию \"%s\": %s" @@ -246,29 +251,29 @@ msgstr "Невозможно изменить на домашнюю директ msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Невозможно открыть экран из переменной окружения DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Невозможно запустить библиотеку obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X сервер не поддерживает локаль." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Невозможно установить модификаторы локали для X сервера." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Невозможно найти правильный файл настройки, используется простой по " "умолчанию." -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Невозможно загрузить тему." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -279,28 +284,24 @@ msgstr "" "синтаксических ошибок XML. Подробную информацию просмотрите в выводе " "stdout. Последняя ошибка замечена в файле \"%s\" строке %d, с сообщением: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Ошибка синтаксиса Openbox" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Закрыть" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "При перезапуске не удалось выполнить новую команду \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Синтаксис: openbox [options]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -308,30 +309,30 @@ msgstr "" "\n" "Опции:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Показать эту справку и выйти\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Показать версию и выйти\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Заменить текущий запущенный менеджер окон\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Указать путь к используемому файлу настройки\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Разорвать соединение с менеджером сессии\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -339,19 +340,19 @@ msgstr "" "\n" "Отправка сообщений запущенному экземпляру Openbox:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Перезагрузить конфигурацию Openbox\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Перезапустить Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Выйти из Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -359,10 +360,14 @@ msgstr "" "\n" "Настройки отладки:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Запустить в режиме синхронизации\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Показать вывод отладки\n" @@ -372,10 +377,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Показать вывод отладки для выделенного фокусом\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Разделить дисплей на фальшивые экраны xinerama\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -384,26 +393,27 @@ msgstr "" "\n" "Пожалуйста, сообщайте об ошибках на %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file требует указания аргумента\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s требует указания аргумента\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Неверный аргумент командной строки \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Оконный менеджер уже запущен на экране %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Невозможно получить выбранный менеджер окон на экране %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Менеджер окон на экране %d еще запущен" @@ -412,7 +422,7 @@ msgstr "Менеджер окон на экране %d еще запущен" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -421,37 +431,18 @@ msgid_plural "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr[0] "" -"Openbox сконфигурирован для %d рабочих столов, а в текущей сессии имеется %" -"d. Изменены настройки Openbox." +"Openbox сконфигурирован для %d рабочих столов, а в текущей сессии имеется " +"%d. Изменены настройки Openbox." msgstr[1] "" -"Openbox сконфигурирован для %d рабочих столов, а в текущей сессии имеется %" -"d. Изменены настройки Openbox." +"Openbox сконфигурирован для %d рабочих столов, а в текущей сессии имеется " +"%d. Изменены настройки Openbox." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "рабочий стол %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Невозможно создать директорию \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Невозможно сохранить сессию в \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Ошибка при сохранении сессии в \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Не подключен к менеджеру сессии" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Запуск %s" @@ -476,14 +467,35 @@ msgstr "Неверное имя ключа \"%s\" в комбинации кла msgid "Requested key \"%s\" does not exist on the display" msgstr "Запрошенного ключа \"%s\" на экране не существует" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Ошибка X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Выйти из Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file требует указания аргумента\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Действие 'SessionLogout' недоступно так как Openbox был собран без " +#~ "поддержки управления сессиями" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Невозможно сохранить сессию в \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Ошибка при сохранении сессии в \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Не подключен к менеджеру сессии" + +#~ msgid "X Error: %s" +#~ msgstr "Ошибка X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Не удалось запустить \"%s\": %s" diff --git a/po/sk.po b/po/sk.po index 1f86bce..c126c8e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,232 +8,239 @@ msgid "" msgstr "" "Project-Id-Version: Openbox-3.4.8\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2009-07-16 21:05+0200\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2009-07-16 17:30+0200\n" "Last-Translator: Frantisek Elias \n" "Language-Team: Slovak \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Vyžiadaná neplatná akcia \"%s\". Takáto akcia neexistuje." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nie" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Áno" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "SpustiÅ¥" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Nepodarilo sa skonvertovaÅ¥ cestu \"%s\" z utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3466 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "ZruÅ¡iÅ¥" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "UkončiÅ¥" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Naozaj sa chcete odhlásiÅ¥?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "OdhlásiÅ¥ sa" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Určite chcete ukončiÅ¥ Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "UkončiÅ¥ Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "OdhlásiÅ¥ sa" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Naozaj sa chcete odhlásiÅ¥?" - -#: openbox/client.c:2013 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Nepomenované okno" -#: openbox/client.c:2027 openbox/client.c:2059 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Ukončujem proces..." -#: openbox/client.c:2029 openbox/client.c:2061 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Neodpovedá" -#: openbox/client.c:3455 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" -#: openbox/client.c:3457 +#: openbox/client.c:3541 msgid "End Process" msgstr "UkončiÅ¥ proces" -#: openbox/client.c:3461 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Zdá sa, že okno \"%s\" neodpovedá. Chcete ho odpojiÅ¥ z X serveru?" -#: openbox/client.c:3463 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "OdpojiÅ¥" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "PrejsÅ¥ na..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Správa plôch" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_PridaÅ¥ novú plochu" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_OdstrániÅ¥ poslednú plochu" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Okná" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Plochy" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "VÅ¡etky plochy" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Vrstva" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Vždy _navrchu" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "Nor_málna" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Vždy _dole" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_PoslaÅ¥ na plochu" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Menu klienta" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_ObnoviÅ¥" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Pre_sunúť" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Z_mena veľkosti" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Do iko_ny" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximalizovaÅ¥" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Ro/_Zvinúť" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "(Ne)_DekorovaÅ¥" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Z_avrieÅ¥" -#: openbox/config.c:782 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Neplatný kontext \"%s\" v priradení myÅ¡i" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Neplatné tlačidlo \"%s\" Å¡pecifikované v konfiguračnom súbore" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Nebolo možné vytvoriÅ¥ adresár '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "ZavrieÅ¥" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt priradenie klávesov v konfiguračnom súbore" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Nepodarilo sa nájsÅ¥ platný súbor menu \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Nepodarilo sa spustiÅ¥ príkaz pre pipe-menu \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Neplatný výstup z pipe-menu \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Pokus o sprístupnenie menu \"%s\", ale to neexistuje" -#: openbox/menu.c:370 openbox/menu.c:371 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Viac..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Neplatné tlačidlo \"%s\" v priradení myÅ¡i" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Neplatný kontext \"%s\" v priradení myÅ¡i" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Nepodarilo sa prejsÅ¥ do domovského adresára \"%s\": %s" @@ -242,29 +249,29 @@ msgstr "Nepodarilo sa prejsÅ¥ do domovského adresára \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Nepodarilo sa otvoriÅ¥ displej z premennej prostredia DISPLAY" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Nepodarilo sa inicializovaÅ¥ knižnicu obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X server nepodporuje locale." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Nemôžem nastaviÅ¥ locale pre X server." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Nepodarilo sa nájsÅ¥ platný konfiguračný súbor, použijem jednoduché " "implicitné nastavenia" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Nepodarilo sa nahraÅ¥ tému." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -272,28 +279,24 @@ msgid "" "was in file \"%s\" line %d, with message: %s" msgstr "" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "ZavrieÅ¥" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "ReÅ¡tart zlyhal pri spúšťaní novej binárky \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [volby]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -301,15 +304,15 @@ msgstr "" "\n" "Volby:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Zobrazi tuto napovedu a skonci\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Zobrazi cislo verzie a skonci\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Nahradi momentalne beziace sedenie window manazera\n" @@ -317,15 +320,15 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Vypne spojenie k manazerovi sedenia\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -333,19 +336,19 @@ msgstr "" "\n" "Predavanie sprav beziacej instancii Openboxu:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Opatovne nacita konfiguraciu Openboxu\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Restartuje Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -353,10 +356,14 @@ msgstr "" "\n" "Volby ladenia:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Spustit v synchronnom mode\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Zobrazit ladiaci vystup\n" @@ -367,10 +374,14 @@ msgstr "" " --debug-focus Zobrazit ladiaci vystup pre manipulaciu s fokusom\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Rozdelit displej na neprave obrazovky xineramy\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -379,26 +390,27 @@ msgstr "" "\n" "Prosim hlaste chyby na %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file vyzaduje parameter\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s vyzaduje parameter\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Neplatny parameter prikazoveho riadku \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Okenny manazer uz bezi na obrazovke %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nepodarilo sa získaÅ¥ výber okenného manažéra na obrazovke %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Okenný manažér na obrazovke %d sa neukončuje" @@ -407,7 +419,7 @@ msgstr "Okenný manažér na obrazovke %d sa neukončuje" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:419 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -423,26 +435,7 @@ msgstr[1] "" msgid "desktop %i" msgstr "plocha %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Nebolo možné vytvoriÅ¥ adresár \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Nepodarilo sa uložiÅ¥ sedenie \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Chyba pri ukladaní sedenia do \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Spúšťam %s" @@ -467,15 +460,26 @@ msgstr "Neplatný názov klávesu \"%s\" v priradení klávesov" msgid "Requested key \"%s\" does not exist on the display" msgstr "Požadovaný kláves \"%s\" na displeji neexistuje" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Chyba X: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "UkončiÅ¥ Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file vyzaduje parameter\n" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Nepodarilo sa uložiÅ¥ sedenie \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Chyba pri ukladaní sedenia do \"%s\": %s" + +#~ msgid "X Error: %s" +#~ msgstr "Chyba X: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Nepodarilo sa spustiÅ¥ \"%s\": %s" diff --git a/po/sr.po b/po/sr.po index 5702c78..f20be6d 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,86 +8,76 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-11-11 14:52+0100\n" "Last-Translator: Jay A. Fleming \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" +"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" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Захтевана је непостојећа акција „%s“." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Не" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Да" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Изврши" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Претварање путање „%s“ из УТФ-8 није успело" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Поништи" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Излаз" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Заиста желите да се одјавите?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Одјављивање" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Заиста желите да изађете из Опенбокса?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Излаз из Опенбокса" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Акција „SessionLogout“ није доступна јер је Опенбокс преведен без подршке за " -"управљање сесијама" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Одјављивање" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Заиста желите да се одјавите?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Безимени прозор" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Убијање..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Програм се не одазива" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -96,11 +86,11 @@ msgstr "" "Изгледа да се прозор „%s“ не одазива. Желите ли да га приморате на излаз " "слањем сигнала %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Завршетак процеса" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -109,138 +99,153 @@ msgstr "" "Изгледа да се прозор „%s“ не одазива. Желите ли да га одспојите од графичког " "сервера?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Прекид везе" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Иди овде..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Управљање радним површинама" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Додајте нову радну површину" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Уклоните последњу радну површину" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Прозори" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Радне површине" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Све радне површине" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "Слој" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Увек изнад осталих" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Номално" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Увек на дну" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Премести на радну површину" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Кориснички мени" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Врати" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Помери" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Промени величину" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Умањи" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Увећај" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Замотај/Одмотај прозор" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Не/Украси" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Затвори" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Погрешан садржај „%s“ у спајању миша" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Погрешно дугме „%s“ наведено у датотеци за подешавање" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Не могу да направим директоријум '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Затвори" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Сукоб у комбинацији тастера у датотеци за подешавање" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Датотека за подешавање менија („%s“) није пронађена" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Није се могла извршити команда за цевни-мени „%s“: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Погрешан излаз из цевног-менија „%s“" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Покушај приступа менију „%s“ није успео јер он не постоји" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Више..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Погрешан тастер „%s“ у спајању миша" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Погрешан садржај „%s“ у спајању миша" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Не могу се преместити у Личну фасциклу „%s“:%s" @@ -249,29 +254,29 @@ msgstr "Не могу се преместити у Личну фасциклу msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Није успео приступ екрану из променљиве окружења „DISPLAY“" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Није успела иницијализација „obrender“ библиотеке." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Графички сервер не подржава локалитет." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Не може се поставити измењивач локалитета за графички сервер" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Не могу наћи исправне датотеке подешавања. Користиће се само основна " "подешавања." -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Не могу учитати тему." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -282,28 +287,24 @@ msgstr "" "синтаксних грешака (XML). Последња је била у датотеци „%s“, у линији %d, са " "поруком: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Синтаксна грешка у Опенбоксу" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Затвори" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Поновно покретање није могло извршити нови програм „%s“: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Ауторска права (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Синтакса: openbox [опције]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -311,32 +312,32 @@ msgstr "" "\n" "Опције:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Прикажи ову помоћ и изађи\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Прикажи верзију и изађи\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Замени тренутно покренут управник прозора\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FILE Наведите путању до датотеке са подешавањима која ће се " "користити\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Онемогући везу са управљачем сесија\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -344,19 +345,19 @@ msgstr "" "\n" "Прослеђујем поруке покренутом примерку Опенбокса:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Поново учитај подешавања за Опенбокс\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Покрени опет Опенбокс\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Изађи из Опенбокса\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -364,10 +365,14 @@ msgstr "" "\n" "Опције отклањања грешака:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Изврши у истовременом режиму\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Прикажи излаз код отклањања грешака\n" @@ -379,10 +384,14 @@ msgstr "" "фокусом\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Подели екран на имитације „xinerama“ екрана\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -391,26 +400,27 @@ msgstr "" "\n" "Пријавите грешке на %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file захтева одговарајући аргумент\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s захтева одговарајући аргумент\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Неисправан аргумент командне линије „%s“\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Управвник прозора је већ покренут на екрану %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Нисам могао да добијем избор управника прозора на екрану %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Управвник прозора на екрану %d није завршио са радом" @@ -419,7 +429,7 @@ msgstr "Управвник прозора на екрану %d није завр #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -437,31 +447,12 @@ msgstr[2] "" "Опенбокс је подешен за %d радних површина, а тренутна сесија их има %d. " "Преклапање Опенбокс подешавања." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "радна површина %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Не могу да направим директоријум „%s“: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Не могу сачувати сесију у „%s“: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Грешка приликом уписа у датотеку сесије „%s“: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Није повезан са управником сесија" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Извршавам %s" @@ -486,11 +477,32 @@ msgstr "Неисправно име тастера „%s“ у комбинац msgid "Requested key \"%s\" does not exist on the display" msgstr "Захтевани тастер „%s“ не постоји на екрану" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Грешка графичког сервера: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "У реду" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Излаз из Опенбокса" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file захтева одговарајући аргумент\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Акција „SessionLogout“ није доступна јер је Опенбокс преведен без подршке " +#~ "за управљање сесијама" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Не могу сачувати сесију у „%s“: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Грешка приликом уписа у датотеку сесије „%s“: %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Није повезан са управником сесија" + +#~ msgid "X Error: %s" +#~ msgstr "Грешка графичког сервера: %s" diff --git a/po/sr@latin.po b/po/sr@latin.po index bf5fcdc..9997185 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -8,86 +8,76 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-11-11 14:52+0100\n" "Last-Translator: Jay A. Fleming \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" +"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" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Zahtevana je nepostojeća akcija „%s“." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ne" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Da" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "IzvrÅ¡i" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Pretvaranje putanje „%s“ iz UTF-8 nije uspelo" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "PoniÅ¡ti" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Izlaz" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Zaista želite da se odjavite?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Odjavljivanje" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Zaista želite da izađete iz Openboksa?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Izlaz iz Openboksa" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Akcija „SessionLogout“ nije dostupna jer je Openboks preveden bez podrÅ¡ke za " -"upravljanje sesijama" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Odjavljivanje" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Zaista želite da se odjavite?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Bezimeni prozor" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Ubijanje..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Program se ne odaziva" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -96,11 +86,11 @@ msgstr "" "Izgleda da se prozor „%s“ ne odaziva. Želite li da ga primorate na izlaz " "slanjem signala %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "ZavrÅ¡etak procesa" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -109,138 +99,153 @@ msgstr "" "Izgleda da se prozor „%s“ ne odaziva. Želite li da ga odspojite od grafičkog " "servera?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Prekid veze" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Idi ovde..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Upravljanje radnim povrÅ¡inama" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Dodajte novu radnu povrÅ¡inu" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Uklonite poslednju radnu povrÅ¡inu" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Prozori" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Radne povrÅ¡ine" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Sve radne povrÅ¡ine" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "Sloj" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Uvek iznad ostalih" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Nomalno" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Uvek na dnu" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Premesti na radnu povrÅ¡inu" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Korisnički meni" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Vrati" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Pomeri" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Promeni veličinu" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Umanji" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Uvećaj" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Zamotaj/Odmotaj prozor" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Ne/Ukrasi" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Zatvori" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "PogreÅ¡an sadržaj „%s“ u spajanju miÅ¡a" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "PogreÅ¡no dugme „%s“ navedeno u datoteci za podeÅ¡avanje" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Ne mogu da napravim direktorijum '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Zatvori" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Sukob u kombinaciji tastera u datoteci za podeÅ¡avanje" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Datoteka za podeÅ¡avanje menija („%s“) nije pronađena" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Nije se mogla izvrÅ¡iti komanda za cevni-meni „%s“: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "PogreÅ¡an izlaz iz cevnog-menija „%s“" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "PokuÅ¡aj pristupa meniju „%s“ nije uspeo jer on ne postoji" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "ViÅ¡e..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "PogreÅ¡an taster „%s“ u spajanju miÅ¡a" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "PogreÅ¡an sadržaj „%s“ u spajanju miÅ¡a" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Ne mogu se premestiti u Ličnu fasciklu „%s“:%s" @@ -249,29 +254,29 @@ msgstr "Ne mogu se premestiti u Ličnu fasciklu „%s“:%s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Nije uspeo pristup ekranu iz promenljive okruženja „DISPLAY“" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Nije uspela inicijalizacija „obrender“ biblioteke." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "Grafički server ne podržava lokalitet." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Ne može se postaviti izmenjivač lokaliteta za grafički server" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Ne mogu naći ispravne datoteke podeÅ¡avanja. Koristiće se samo osnovna " "podeÅ¡avanja." -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Ne mogu učitati temu." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -282,28 +287,24 @@ msgstr "" "sintaksnih greÅ¡aka (XML). Poslednja je bila u datoteci „%s“, u liniji %d, " "sa porukom: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Sintaksna greÅ¡ka u Openboksu" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Zatvori" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Ponovno pokretanje nije moglo izvrÅ¡iti novi program „%s“: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Autorska prava (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sintaksa: openbox [opcije]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -311,32 +312,32 @@ msgstr "" "\n" "Opcije:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Prikaži ovu pomoć i izađi\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Prikaži verziju i izađi\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Zameni trenutno pokrenut upravnik prozora\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FILE Navedite putanju do datoteke sa podeÅ¡avanjima koja će " "se koristiti\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Onemogući vezu sa upravljačem sesija\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -344,19 +345,19 @@ msgstr "" "\n" "Prosleđujem poruke pokrenutom primerku Openboksa:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ponovo učitaj podeÅ¡avanja za Openboks\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Pokreni opet Openboks\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Izađi iz Openboksa\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -364,10 +365,14 @@ msgstr "" "\n" "Opcije otklanjanja greÅ¡aka:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync IzvrÅ¡i u istovremenom režimu\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Prikaži izlaz kod otklanjanja greÅ¡aka\n" @@ -379,10 +384,17 @@ msgstr "" "fokusom\n" #: openbox/openbox.c:547 +#, fuzzy +msgid " --debug-session Display debugging output for session management\n" +msgstr "" +" --debug-session Prikaži izlaz kod otklanjanja greÅ¡aka za rukovanje " +"sessionom\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Podeli ekran na imitacije „xinerama“ ekrana\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -391,26 +403,27 @@ msgstr "" "\n" "Prijavite greÅ¡ke na %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file zahteva odgovarajući argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s zahteva odgovarajući argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Neispravan argument komandne linije „%s“\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "Upravvnik prozora je već pokrenut na ekranu %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Nisam mogao da dobijem izbor upravnika prozora na ekranu %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Upravvnik prozora na ekranu %d nije zavrÅ¡io sa radom" @@ -419,7 +432,7 @@ msgstr "Upravvnik prozora na ekranu %d nije zavrÅ¡io sa radom" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -437,31 +450,12 @@ msgstr[2] "" "Openboks je podeÅ¡en za %d radnih povrÅ¡ina, a trenutna sesija ih ima %d. " "Preklapanje Openboks podeÅ¡avanja." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "radna povrÅ¡ina %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Ne mogu da napravim direktorijum „%s“: %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Ne mogu sačuvati sesiju u „%s“: %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "GreÅ¡ka prilikom upisa u datoteku sesije „%s“: %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Nije povezan sa upravnikom sesija" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "IzvrÅ¡avam %s" @@ -486,11 +480,32 @@ msgstr "Neispravno ime tastera „%s“ u kombinaciji tastera" msgid "Requested key \"%s\" does not exist on the display" msgstr "Zahtevani taster „%s“ ne postoji na ekranu" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "GreÅ¡ka grafičkog servera: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "U redu" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Izlaz iz Openboksa" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file zahteva odgovarajući argument\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Akcija „SessionLogout“ nije dostupna jer je Openboks preveden bez podrÅ¡ke " +#~ "za upravljanje sesijama" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Ne mogu sačuvati sesiju u „%s“: %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "GreÅ¡ka prilikom upisa u datoteku sesije „%s“: %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Nije povezan sa upravnikom sesija" + +#~ msgid "X Error: %s" +#~ msgstr "GreÅ¡ka grafičkog servera: %s" diff --git a/po/sv.po b/po/sv.po index 96be734..33952a4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,87 +5,77 @@ # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.7\n" +"Project-Id-Version: Openbox 3.5.0\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-03-03 00:43+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" +"PO-Revision-Date: 2011-08-01 18:11+0100\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Ogiltig action \"%s\" efterfrågades, men den finns inte." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Nej" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Ja" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Kör" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Lyckades inte konvertera sökvägen \"%s\" från utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Avbryt" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Avsluta" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Är du säker på att du vill logga ut?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Logga ut" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Är du säker på att du vill avsluta Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Avsluta Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Kommandot SessionLogout är inte tillgängligt eftersom Openbox kompilerades " -"utan stöd för sessionshantering" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Logga ut" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Är du säker på att du vill logga ut?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Namnlöst fönster" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Dödar..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Svarar inte" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -94,11 +84,11 @@ msgstr "" "Fönstret \"%s\" verkar inte svara. Vill du tvinga det att avslutas genom " "att skicka signalen %s?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Avsluta process" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -107,138 +97,155 @@ msgstr "" "Fönstret \"%s\" verkar inte svara. Vill du stänga dess anslutning till X-" "servern?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Stäng anslutning" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Gå dit..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Hantera skrivbord" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Lägg till nytt skrivbord" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Ta bort sista skrivbordet" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Fönster" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Skrivbord" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Alla skrivbord" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Lager" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Alltid ö_verst" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Alltid _underst" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Skicka till skrivbord" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Klientmeny" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Åt_erställ" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Flytta" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Ändra s_torlek" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Mi_nimera" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Ma_ximera" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Rulla upp/ner" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "_Dekorationer" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Stän_g" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Ogiltig kontext \"%s\" i musbindning" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Ogiltig knapp \"%s\" angiven i konfigurationsfilen" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" +"Openbox kompilerades utan stöd för att ladda bilder via Imlib2. Ikoner i " +"menyer kommer inte att laddas." + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Kunde inte skapa katalogen '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Stäng" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Konflikt med annan tangentbindning i konfigurationsfilen" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Kunde inte hitta en giltig menyfil \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Misslyckades att köra kommando för pipe-menyn \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Ogiltig utdata från pipe-menyn \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Försökte öppna menyn \"%s\", men den finns inte" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Mer..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Ogiltig knapp \"%s\" i musbindning" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Ogiltig kontext \"%s\" i musbindning" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Kunde inte gå till hemkatalogen \"%s\": %s" @@ -247,28 +254,28 @@ msgstr "Kunde inte g msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Kunde inte öppna en display från miljövariabeln DISPLAY." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Kunde inte initialisera obrender-biblioteket." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X-servern stödjer inte lokalisering." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Kan inte sätta lokaliseringsmodifierare för X-servern." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Kunde inte hitta en giltig konfigurationsfil, använder enkla standardvärden" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Kunde inte ladda ett tema." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -279,28 +286,24 @@ msgstr "" "lästes in. Se stdout för mer information. Det sista felet var i filen \"%s" "\" rad %d, med meddelandet: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox syntaxfel" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Stäng" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Restart misslyckades att starta nytt program \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [alternativ]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -308,31 +311,31 @@ msgstr "" "\n" "Alternativ:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Visa den här hjälpen och avsluta\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Visa versionen och avsluta\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Ersätt den befintliga fönsterhanteraren\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FIL Ange sökvägen till konfigurationsfil att använda\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Avaktivera anslutning till sessionshanteraren\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -340,19 +343,19 @@ msgstr "" "\n" "Skicka meddelanden till en exekverande instans av Openbox:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ladda om Openbox konfiguration\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Starta om Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Avsluta Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -360,10 +363,14 @@ msgstr "" "\n" "Debug-alternativ:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Kör i synkroniserat läge\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr " --startup CMD Kör CMD efter uppstart\n" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Visa debuginformation\n" @@ -373,10 +380,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Visa debuginformation för fokushantering\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr " --debug-session Visa debuginformation för sessionshantering\n" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Dela skärmen i simulerade xinerama-skärmar\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -385,26 +396,27 @@ msgstr "" "\n" "Rapportera buggar till %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file kräver ett argument\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s kräver ett argument\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Ogiltigt kommandoradsargument \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "En fönsterhanterare körs redan på skärm %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Kunde inte erhålla fönsterhanterarmarkeringen på skärm %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Fönsterhanteraren på skärm %d avslutar inte" @@ -413,7 +425,7 @@ msgstr "F #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -428,31 +440,12 @@ msgstr[1] "" "Openbox är inställt på %d skrivbord, men nuvarande session har %d. Använder " "sessionens inställning." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "skrivbord %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Kunde inte skapa katalogen \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Kunde inte spara sessionen till \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Ett fel inträffade när sessionen skulle sparas till \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Inte ansluten till en sessionshanterare" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Kör %s" @@ -477,15 +470,32 @@ msgstr "Ogiltigt tangentnamn \"%s\" i tangentbindning" msgid "Requested key \"%s\" does not exist on the display" msgstr "Efterfrågad tangent \"%s\" finns inte på displayen" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X-fel: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "OK" +#~ msgid "Openbox" +#~ msgstr "Openbox" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Kommandot SessionLogout är inte tillgängligt eftersom Openbox " +#~ "kompilerades utan stöd för sessionshantering" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Kunde inte spara sessionen till \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Ett fel inträffade när sessionen skulle sparas till \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Inte ansluten till en sessionshanterare" + +#~ msgid "X Error: %s" +#~ msgstr "X-fel: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Kunde inte exekvera \"%s\": %s" diff --git a/po/tr.po b/po/tr.po index 122e3bd..0f03dec 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,84 +7,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-05-24 15:08+0300\n" "Last-Translator: Tutku Dalmaz \n" "Language-Team: Turkish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "\"%s\" geçersiz eylem isteği. Böyle bir eylem yok." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Hayır" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Evet" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Çalıştır" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "\"%s\" yolu utf8'e çevrilmesi başarısız oldu" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Ä°ptal" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Çık" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Oturumu kapatmak istediğinizden emin misiniz?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Oturumu Kapat" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Openbox'tan çıkmak istediğinize emin misiniz?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Openbox'tan Çık" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Openbox oturum yönetim desteği olmaksızın yapılandırıldığı için " -"SessionLogout eylemi geçerli değildir." - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Oturumu Kapat" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Oturumu kapatmak istediğinizden emin misiniz?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Ä°simsiz Pencere" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Sonlandırılıyor..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Cevap Vermiyor" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -93,11 +83,11 @@ msgstr "" "\"%s\" penceresi cevap veriyor gibi görünmüyor. %s sinyali göndererek zorla " "sonlandırmak ister misiniz?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Süreci Sonlandır" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -106,138 +96,153 @@ msgstr "" "\"%s\" penceresi cevap veriyor gibi görünmüyor. X sunucusu ile bağlantısını " "sonlandırmak ister misiniz?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Bağlantıyı Kes" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Oraya git..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Masaüstlerini yönet" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Yeni masaüstü ekle" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Son masaüstünü kaldır" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Pencereler" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Masaüstleri" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Tüm masaüstleri" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "_Katman" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "_Her zaman üstte" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Normal" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "_Her zaman altta" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "_Masaüstüne gönder" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Ä°stemci menüsü" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Eski durumuna getir" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "_Taşı" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "_Yeniden boyutlandır" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "_Simge durumuna küçült" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "_Ekranı kapla" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Dürele/Aç" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Geri Al/Kapla" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "_Kapat" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Fare bağında geçersinz \"%s\" içeriği" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Yapılandırılma dosyasında belirtilmiş geçersiz \"%s\" düğmesi" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "'%s': %s dizini oluşturulamadı" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Kapat" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Yapılandırma dosyasındaki tuş bağlantısında çakışma" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "\"%s\" geçerli menü dosyası bulunamadı" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Ä°letim menüsü için \"%s\": %s komutunun çalıştırılması başarısız oldu" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "\"%s\" iletim menüsü için geçersiz çıkış" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "\"%s\" menüsüne erişilmeye çalışıldı fakat bu menü yok" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Daha..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Fare bağında geçersiz \"%s\" tuşu" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Fare bağında geçersinz \"%s\" içeriği" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "\"%s\": %s ev dizini değiştirilemedi" @@ -246,29 +251,29 @@ msgstr "\"%s\": %s ev dizini değiştirilemedi" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "DISPLAY çevre değişkeninde görüntünün açılması başarısız oldu." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "ObRender kitaplığının sıfırlanması başarısız oldu." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X sunucusu dil ayarlarını desteklemiyor." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "X sunucu için dil ayarları değiştiricisi ayarlanamadı." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Geçerli yapılandırma dosyası bulunamadı, bazı basit öntanımlı ayarlar " "kullanılıyor" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Tema yüklenemedi." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -279,30 +284,26 @@ msgstr "" "sözdizimi hatası bulundu. Daha fazla bilgi için stdout çıktısına bakınız. " "Son hata \"%s\" dosyası içerisindeki %d satırında %s hata iletisi ile görüldü" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox Sözdizimi Hatası" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Kapat" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "Yeniden başlatmadaki \"%s\": %s çalıştırılabilir dosyalarının başlatılması " "başarısız oldu" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Telif Hakkı (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Sözdizimi: openbox [seçenekler]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -310,32 +311,32 @@ msgstr "" "\n" "Seçenekler:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Yardımı görüntüle ve çık\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version Sürüm bilgisini görüntüle ve çık\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Güncel pencere yöneticisini değiştir\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" " --config-file FILE Kullanılacak yapılandırma dosyasının yolunu belirtir\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable Oturum yöneticisiyle olan bağlanıyı etkisiz kıl\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -343,19 +344,19 @@ msgstr "" "\n" "Ä°letiler çalışan bir Openbox örneğine aktarılıyor:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox yapılandırmasını yeniden yükle\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox'ı yeniden başlat\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Openbox'tan çık\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -363,10 +364,14 @@ msgstr "" "\n" "Hata ayıklama seçenekleri:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Eş zamanlı kipte çalış\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Hata ayıklama çıktısını göster\n" @@ -377,10 +382,14 @@ msgstr "" " --debug-focus Özelleşmiş durum için hata ayıklama çıktısını göster\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Görüntü gerçek olmayan ekranlara bölünür\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -389,26 +398,27 @@ msgstr "" "\n" "Lütfen hataları %s adresine bildiriniz\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file dosyası bir değişkene ihtiyaç duyuyor\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s dosyası bir değişkene ihtiyaç duyuyor\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "\"%s\" geçersiz komut satırı değişkeni\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "%d ekranınz zaten bir pencere yöneticixi çalışıyor" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Seçilen %d ekranında pencere yöneticisi bulunamadı" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "%d ekranındaki pencere yöneticisinden çıkılamıyor" @@ -417,7 +427,7 @@ msgstr "%d ekranındaki pencere yöneticisinden çıkılamıyor" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -432,31 +442,12 @@ msgstr[1] "" "Openbox %d masaüstleri için yapılandırılmıştır fakat güncel oturum %d dir. " "Openbox yapılandırmasının üzerien yazılıyor." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "%i masaüstü" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "\"%s\": %s dizini oluşturulamadı" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "\"%s\": %s oturumu kaydedilemedi" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Oturum \"%s\": %s'e kaydedilirken hata" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Oturum yöneticisine bağlı değil" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "%s çalışıyor" @@ -481,11 +472,32 @@ msgstr "Tuş bağında \"%s\" geçersiz tuş adı" msgid "Requested key \"%s\" does not exist on the display" msgstr "Ä°stenilen \"%s\" tuşu görüntüde yok" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "%s X Hatası" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "Tamam" + +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Openbox'tan Çık" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file dosyası bir değişkene ihtiyaç duyuyor\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Openbox oturum yönetim desteği olmaksızın yapılandırıldığı için " +#~ "SessionLogout eylemi geçerli değildir." + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "\"%s\": %s oturumu kaydedilemedi" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Oturum \"%s\": %s'e kaydedilirken hata" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Oturum yöneticisine bağlı değil" + +#~ msgid "X Error: %s" +#~ msgstr "%s X Hatası" diff --git a/po/uk.po b/po/uk.po index 602f9fe..a108e37 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,82 +8,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2009-07-05 13:50+0200\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-12-09 20:12+0200\n" "Last-Translator: Serhiy Lysovenko \n" "Language-Team: Ukrainian \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Здійснено запит на неіснуючу дію \"%s\"." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Ні" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Так" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Виконати" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Не вдалося конвертувати шлях \"%s\" з utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3466 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Скасувати" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Вихід" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Ви дійсно бажаєте завершити сеанс?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Вийти" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Ви дійсно хочете вийти з Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Вийти з Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Вийти" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Ви дійсно бажаєте завершити сеанс?" - -#: openbox/client.c:2013 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Неназване вікно" -#: openbox/client.c:2027 openbox/client.c:2059 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Знищення..." -#: openbox/client.c:2029 openbox/client.c:2061 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Не відповідає" -#: openbox/client.c:3455 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -92,149 +84,164 @@ msgstr "" "Схоже, вікно \"%s\" не відповідає. Чи бажаєте примусово завершити програму, " "пославши сигнал \"%s\"?" -#: openbox/client.c:3457 +#: openbox/client.c:3541 msgid "End Process" msgstr "Примусове завершення" -#: openbox/client.c:3461 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "Вікно \"%s\" не відповідає. Чи бажаєте його від'єднати від X сервера?" -#: openbox/client.c:3463 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Від'єднати" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Перейти..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Керування стільницями" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "Додати нову стільницю (_A)" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "Видалити останню стільницю (_R)" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Вікна" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Стільниці" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "На всіх стільницях" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "Шар (_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Над усіма вікнами (_T)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "Звичайне положення (_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Під вікнами (_B)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Відправити на стільницю (_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Меню клієнта" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "Відновити (_E)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Перемістити (_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Змінити розмір (_Z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Згорнути (_N)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Розгорнути (_X)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "Скрутити/Розкрутити (_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "Перемкнути декорацію (_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Закрити (_C)" -#: openbox/config.c:782 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Некоректний контекст \"%s\" в прив'язці клавіш мишки" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Некоректна кнопка \"%s\" вказана у файлі конфігурації" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Не вдалося створити каталог '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Закрити" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Конфлікт прив'язки клавіш у файлі конфігурації" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Не вдалося знайти коректний файл меню \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Не вдалося виконати команду для pipe-меню \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Некоректний вивід з pipe-меню \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Спроба доступу до неіснуючого меню \"%s\"" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Більше..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Некоректна клавіша \"%s\" в прив'язці клавіш мишки" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Некоректний контекст \"%s\" в прив'язці клавіш мишки" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Не вдалося перейти до домашнього каталогу \"%s\": %s" @@ -243,29 +250,29 @@ msgstr "Не вдалося перейти до домашнього катал msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Не вдалося ініцаілізувати бібліотеку obrender" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X-сервер не підтримує локалі" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Не можу встановити модифікатори локалі для X-сервера" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Не вдалося знайти коректний файл конфігурації, використовую стандартні " "налаштування" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Не вдалося завантажити тему" -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -276,29 +283,25 @@ msgstr "" "конфігураційних файлів Openbox. Щоб дізнатись більше - перегляньте stdout. " "Остання помічена помилка була в файлі \"%s\", стрічка %d, повідомлення: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "синтаксична помилка Openbox" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Закрити" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "" "При перезавантаженні не вдалося виконати новий виконуваний файл \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Авторські права (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Синтакс: openbox [параметри]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -306,30 +309,30 @@ msgstr "" "\n" "Параметри:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help Показати цю довідку і вийти\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --vesrion Показати версію і вийти\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Замінити запущений менеджер вікон\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file ФАЙЛ Вказати шлях до конфігураційного файлу\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Вимкнути з'єднання з менеджером сеансу\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -337,19 +340,19 @@ msgstr "" "\n" "Передача повідомлень процесу Openbox, що виконується\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Перезавантажити конфігурацію Openbox'у\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Перезапустити Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Вийти з Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -357,10 +360,14 @@ msgstr "" "\n" "Налагоджувальні параметри\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Запустити в синхронному режимі\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug Показувати інформацію налагоджування\n" @@ -372,10 +379,14 @@ msgstr "" "фокусом\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Розбити екран на фальшиві екрани xinerama\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -384,26 +395,27 @@ msgstr "" "\n" "Будь-ласка, повідомляйте про помилки на %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file потребує аргументу\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s потребує аргументу\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Некоректний аргумент \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "На дисплеї %d вже запущений менеджер вікон" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Не можу запустити менеджера вікон на дисплеї %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "Менеджер вікон на дисплеї %d не завершається" @@ -412,7 +424,7 @@ msgstr "Менеджер вікон на дисплеї %d не завершає #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:419 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -432,26 +444,7 @@ msgstr[1] "" msgid "desktop %i" msgstr "стільниця %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Не вдалося створити каталог \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Не вдалося зберегти сесію в \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Помилка при збереженні сесії в \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Не під'єднано до керівника сесіями" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Виконується %s" @@ -477,15 +470,29 @@ msgstr "Некоректна назва клавіші \"%s\" у прив'язц msgid "Requested key \"%s\" does not exist on the display" msgstr "Потрібної кнопки \"%s\" нема на екрані" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Помилка X-серверу: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "Гаразд" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Вийти з Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file потребує аргументу\n" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Не вдалося зберегти сесію в \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "Помилка при збереженні сесії в \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Не під'єднано до керівника сесіями" + +#~ msgid "X Error: %s" +#~ msgstr "Помилка X-серверу: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Невдалося виконати \"%s\": %s" diff --git a/po/vi.po b/po/vi.po index 49dd347..d881b6d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,84 +7,74 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-11 02:07+0100\n" "Last-Translator: Quan Tran \n" "Language-Team: None\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "Hành động \"%s\" làm không được. Hành động đó không có." -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "Không" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "Được" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "Hành động" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "Không thể chuyển chỗ \"%s\" từ utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "Bãi bỏ" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "Đi ra" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "Có chắc chắn đi ra không?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "Đi ra" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "Có chắc chắn đi ra Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "Đi ra Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"Không thể làm SessionLogout được bởi vì Openbox không bỏ \"session " -"management support\" khi compile nó" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "Đi ra" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "Có chắc chắn đi ra không?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "Cá»­a sổ không tên" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "Đang giết..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "Không phản ứng" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -93,11 +83,11 @@ msgstr "" "Cái cá»­a sổ \"%s\" không phản ứng được. Có muốn bắt nó đi ra bằng gá»­i đi %s " "tính hiệu?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "Giết Process" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -105,138 +95,153 @@ msgid "" msgstr "" "Cái cá»­a sổ \"%s\" không phản ứng được. Có muốn rời nó ra X server không" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "Rời ra" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "Đi đến chỗ đó" -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "Quản lý chỗ làm việc" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "_Cộng thêm chỗ làm việc" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "_Bỏ lát chỗ làm việc" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "Cá»­a sổ" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "Chỗ làm việc" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "Tất cả chỗ làm việc" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "Lớ_p" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "Luôn luôn ở _trên" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "_Bình thường" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "Luôn luôn ở _dưới" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "Gá»­i đến chỗ làm _việc" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "Khách thá»±c đơn" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "_Hoàn lại" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "Chu_yển đi" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "Làm _nhỏ hÆ¡n/lớn hÆ¡n" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "Biến _xuống" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "Biến _lớn nhất" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "_Cuốn lên/xuống" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "_Trang/Không Trang trí" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "Đón_g" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Vô hiệu văn cảnh \"%s\" ở trong chuột đặt" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Sai nút \"%s\" ở trong hình thể" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "Không thể chế directory '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "Đóng" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "Xung đột với chữ trói ở trong hình thể" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "Không có thể tìm vững chắc thá»±c đơn \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "Không có thể chạy lệnh cho ống-thá»±c đơn \"%s\": %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "Vô hiệu sản xuất của ống-thá»±c đơn \"%s\"" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "Thá»­ mở thá»±c đơn \"%s\" nhÆ°ng mà cái đó không có" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "Thêm nữa" -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "Vô hiệu nút \"%s\" ở trong máy chuột đặt" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Vô hiệu văn cảnh \"%s\" ở trong chuột đặt" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "Không thể đổi đến chỗ nhà \"%s\": %s" @@ -245,27 +250,27 @@ msgstr "Không thể đổi đến chỗ nhà \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Không mở hình từ DISPLAY được." -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "Không mở được thÆ° viện obrender." -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "ChÆ°Æ¡ng trình X không có locale cho tiếng nay." -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "Không thể dùng locale cho chÆ°Æ¡ng trình X." -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "Không thể tìm ra hình thể, sẽ dùng bắt đầu hình thể" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "Không thể đọc theme." -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -276,28 +281,24 @@ msgstr "" "liệu. Coi stdout cho biết thêm. Cai sai lầm cuối cùng ở trong Openbox tài " "liệu \"%s\" ở hàng %d với lời: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox danh từ không đúng" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Đóng" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "Bắt đầu lại hỏng mở được executable mới \"%s\": %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "Bản quyền (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "Cách dùng: openbox [chọn lá»±a]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -305,15 +306,15 @@ msgstr "" "\n" "Chọn lá»±a:\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help TrÆ°ng bày giúp đỡ này và đi ra\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version TrÆ°ng bày số của chÆ°Æ¡ng trình và đi ra\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Thay thế chÆ°Æ¡ng trình quản lý cá»­a sổ cho đến openbox\n" @@ -321,15 +322,15 @@ msgstr "" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE Chỉ chỗ đường cho tài liệu để dùng\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Tắt liên lạc đến session quản lý\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -337,19 +338,19 @@ msgstr "" "\n" "Đưa thông báo cho chÆ°Æ¡ng trình Openbox:\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Bắt đầu lại Openbox's tài liệu\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart Bắt đầu lại Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit Đi ra Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -357,10 +358,14 @@ msgstr "" "\n" "Debugging chọn lá»±a:\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync Chạy trong cách thức synchronous\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug TrÆ°ng bày debugging đoàn chữ\n" @@ -371,10 +376,14 @@ msgstr "" " --debug-focus TrÆ°ng bày debugging đoàn chữ cho điều khiển tập trung\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Tách trÆ°ng bày vào giả xinerama màn\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -383,26 +392,27 @@ msgstr "" "\n" "Làm Æ¡n báo cáo bugs ở chỗ %s\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file cần chọn lá»±a một tài liệu\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s cần chọn lá»±a một tài liệu\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "Mệnh lệnh viết sai \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "ChÆ°Æ¡ng trình quản lý cá»­a sổ khác đang chạy trên màn hình %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "Không thể lấy được chÆ°Æ¡ng trình quản lý cá»­a sổ ở trên màn hình %d" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "ChÆ°Æ¡ng trình quản lý cá»­a sổ trên màn hình %d không đi ra" @@ -411,7 +421,7 @@ msgstr "ChÆ°Æ¡ng trình quản lý cá»­a sổ trên màn hình %d không đi ra" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -426,31 +436,12 @@ msgstr[1] "" "Openbox đặt cho %d chỗ làm việc, nhÆ°ng mà session hiện đại có %d. Lật đổ " "openbox tài liệu cho cái mới." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "chỗ làm việc %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Không thể chế directory \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Không thể tiết kiệm thời kỳ cho \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "BÄ© trục chật lúc tiết kiệm thời kỳ cho \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "Không hàng với session quản lý" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "Đan Chạy %s" @@ -475,15 +466,36 @@ msgstr "Vô hiệu key tên \"%s\" ở chỗ key đặt" msgid "Requested key \"%s\" does not exist on the display" msgstr "Yêu cầu key \"%s\" không có ở chỗ màn hình" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X trục chật: %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "Đồng ý" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "Đi ra Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file cần chọn lá»±a một tài liệu\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "Không thể làm SessionLogout được bởi vì Openbox không bỏ \"session " +#~ "management support\" khi compile nó" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "Không thể tiết kiệm thời kỳ cho \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "BÄ© trục chật lúc tiết kiệm thời kỳ cho \"%s\": %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "Không hàng với session quản lý" + +#~ msgid "X Error: %s" +#~ msgstr "X trục chật: %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "Làm không được \"%s\": %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 61058af..4f2761a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,231 +9,238 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-11 22:07+0800\n" "Last-Translator: zhou sf \n" "Language-Team: Simplified Chinese\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "请求的动作 \"%s\" 无效。该动作不存在。" -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "否" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "是" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "执行" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "从 utf8 转换路径 \"%s\" 时失败" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "取消" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "退出" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "确认注销吗?" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "注销" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "确认退出 Openbox?" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "退出 Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "因为编译 Openbox 时未支持会话管理, 因此 SessionLogout 动作无效." - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "注销" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "确认注销吗?" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "未命名窗口" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "杀死中..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "无响应" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "窗口 \"%s\" 似乎失去了响应. 发送信号 %s 以强制退出吗?" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "结束进程" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "窗口 \"%s\" 似乎失去了响应. 断开其与 X 服务器的连接?" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "断开连接" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "跳转到..." -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "管理桌面" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "添加新桌面(_A)" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "移除最后一个桌面(_R)" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "窗口" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "桌面" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "所有桌面" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "层(_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "总在最上层(_T)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "常规(_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "总在最底层(_B)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "发送到桌面(_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "客户端菜单" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "还原(_E)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "移动(_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "调整大小(_Z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "最小化(_N)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "最大化(_X)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "卷起/放下(_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "去除装饰(_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "关闭(_C)" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "鼠标绑定中无效的上下文 \"%s\"" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "配置文件中指定的按钮 \"%s\" 无效" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "无法创建目录 '%s': %s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "关闭" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "配置文件中的组合键冲突" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "无法找到有效的菜单文件 \"%s\"" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "执行管道菜单的命令 \"%s\" 时失败: %s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "管道菜单 \"%s\" 的输出无效" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "尝试读取菜单 \"%s\"，但是它不存在" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "更多..." -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "鼠标绑定中的无效按键 \"%s\"" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "鼠标绑定中无效的上下文 \"%s\"" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "无法切换到主目录 \"%s\": %s" @@ -242,27 +249,27 @@ msgstr "无法切换到主目录 \"%s\": %s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "在打开DISPLAY环境变量所指定的X显示时失败。" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "初始化obrender库时失败。" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X服务器不支持locale。" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "无法设置X服务器的locale修饰键。" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "无法找到有效的配置文件，使用一些简单的默认值" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "无法读入主题。" -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -272,28 +279,24 @@ msgstr "" "当解析 Openbox 配置文件时发现一个或多个 XML 语法错误. 更多信息查看 stdout. " "最近的错误出现于文件 \"%s\" 中第 %d 行的: %s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox 语法错误" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "关闭" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "重新启动以执行新的可执行文件 \"%s\" 时失败: %s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "版权所有 (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "用法: openbox [选项]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -301,30 +304,30 @@ msgstr "" "\n" "选项： \n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help 显示该帮助信息后退出\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version 显示版本号后退出\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace 替换当前运行的窗口管理器\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file FILE 使用指定的配置文件\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable 禁止连接到会话管理器\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -332,19 +335,19 @@ msgstr "" "\n" "传递信息给运行中的 Openbox 实例：\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure 重新载入 Openbox 的配置\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart 重新启动 Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit 退出 Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -352,10 +355,14 @@ msgstr "" "\n" "调试选项：\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync 在同步模式中运行\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug 显示调试输出\n" @@ -365,10 +372,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus 显示焦点处理的调试输出\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama 分割显示到伪造的 xinerama 屏幕中\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -377,26 +388,27 @@ msgstr "" "\n" "请向 %s 报告错误\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file 需要一个参数\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s 需要一个参数\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "无效的命令行参数 \"%s\"\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "已经有窗口管理器运行在屏幕 %d" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "在屏幕 %d 无法被选为窗口管理器" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "屏幕 %d 的窗口管理器没有退出" @@ -405,7 +417,7 @@ msgstr "屏幕 %d 的窗口管理器没有退出" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -418,31 +430,12 @@ msgstr[0] "" msgstr[1] "" "Openbox 配置了 %d 个桌面, 当前会话拥有 %d 桌面. 覆盖 Openbox 的配置." -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "桌面 %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "无法创建目录 \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "无法保存会话到 \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "在保存会话到 \"%s\" 时出错： %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "未连接到会话管理器" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "运行 %s" @@ -467,15 +460,34 @@ msgstr "按键绑定中无效的键名 \"%s\"" msgid "Requested key \"%s\" does not exist on the display" msgstr "请求的按键 \"%s\" 在显示中不存在" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X 错误： %s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "好" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "退出 Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file 需要一个参数\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "因为编译 Openbox 时未支持会话管理, 因此 SessionLogout 动作无效." + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "无法保存会话到 \"%s\": %s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "在保存会话到 \"%s\" 时出错： %s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "未连接到会话管理器" + +#~ msgid "X Error: %s" +#~ msgstr "X 错误： %s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "执行 \"%s\" 时失败: %s" diff --git a/po/zh_TW.po b/po/zh_TW.po index 72e6285..d8bd94a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,233 +8,239 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"POT-Creation-Date: 2011-08-01 18:20+0200\n" "PO-Revision-Date: 2008-03-06 01:01+0800\n" "Last-Translator: 洪任諭 \n" "Language-Team: Chinese (traditional) \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: openbox/actions.c:149 +#: openbox/actions.c:198 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." msgstr "要求的動作「%s」無效。無此類動作存在。" -#: openbox/actions/execute.c:128 +#: openbox/actions/execute.c:147 msgid "No" msgstr "否" -#: openbox/actions/execute.c:129 +#: openbox/actions/execute.c:148 msgid "Yes" msgstr "是" -#: openbox/actions/execute.c:133 +#: openbox/actions/execute.c:152 msgid "Execute" msgstr "執行" -#: openbox/actions/execute.c:142 +#: openbox/actions/execute.c:161 #, c-format msgid "Failed to convert the path \"%s\" from utf8" msgstr "轉換路徑「%s」自 utf8 時失敗" -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 +#: openbox/actions/exit.c:69 openbox/client.c:3550 msgid "Cancel" msgstr "取消" -#: openbox/actions/exit.c:53 +#: openbox/actions/exit.c:70 msgid "Exit" msgstr "離開" -#: openbox/actions/exit.c:56 +#: openbox/actions/exit.c:74 +msgid "Are you sure you want to log out?" +msgstr "你確定要登出嗎？" + +#: openbox/actions/exit.c:75 +msgid "Log Out" +msgstr "登出" + +#: openbox/actions/exit.c:78 msgid "Are you sure you want to exit Openbox?" msgstr "你確定要離開 Openbox？" -#: openbox/actions/exit.c:57 +#: openbox/actions/exit.c:79 msgid "Exit Openbox" msgstr "離開 Openbox" -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" -"SessionLogout 動作無法使用，因為 Openbox 在編譯時沒有使用作業階段管理支援" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "登出" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "你確定要登出嗎？" - -#: openbox/client.c:2012 +#: openbox/client.c:2037 msgid "Unnamed Window" msgstr "未命名視窗" -#: openbox/client.c:2026 openbox/client.c:2058 +#: openbox/client.c:2051 openbox/client.c:2082 msgid "Killing..." msgstr "正在中止..." -#: openbox/client.c:2028 openbox/client.c:2060 +#: openbox/client.c:2053 openbox/client.c:2084 msgid "Not Responding" msgstr "沒有回應" -#: openbox/client.c:3454 +#: openbox/client.c:3539 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "視窗「%s」似乎已經停止回應。 你想送出 \"%s\" 訊息強制結束程式嗎？" -#: openbox/client.c:3456 +#: openbox/client.c:3541 msgid "End Process" msgstr "結束 Process" -#: openbox/client.c:3460 +#: openbox/client.c:3545 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "視窗「%s」似乎已經停止回應。 你想從 X 伺服器將它斷線嗎？" -#: openbox/client.c:3462 +#: openbox/client.c:3547 msgid "Disconnect" msgstr "斷線" -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +#: openbox/client_list_combined_menu.c:93 openbox/client_list_menu.c:90 msgid "Go there..." msgstr "到那裏去…" -#: openbox/client_list_combined_menu.c:94 +#: openbox/client_list_combined_menu.c:100 msgid "Manage desktops" msgstr "管理桌面" -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +#: openbox/client_list_combined_menu.c:101 openbox/client_list_menu.c:166 msgid "_Add new desktop" msgstr "加入新桌面(_A)" -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:167 msgid "_Remove last desktop" msgstr "移除尾端桌面(_R)" -#: openbox/client_list_combined_menu.c:149 +#: openbox/client_list_combined_menu.c:157 msgid "Windows" msgstr "視窗" -#: openbox/client_list_menu.c:203 +#: openbox/client_list_menu.c:214 msgid "Desktops" msgstr "桌面" -#: openbox/client_menu.c:258 +#: openbox/client_menu.c:259 msgid "All desktops" msgstr "所有桌面" -#: openbox/client_menu.c:370 +#: openbox/client_menu.c:371 msgid "_Layer" msgstr "層次(_L)" -#: openbox/client_menu.c:375 +#: openbox/client_menu.c:376 msgid "Always on _top" msgstr "最上層(_T)" -#: openbox/client_menu.c:376 +#: openbox/client_menu.c:377 msgid "_Normal" msgstr "一般(_N)" -#: openbox/client_menu.c:377 +#: openbox/client_menu.c:378 msgid "Always on _bottom" msgstr "最下層(_B)" -#: openbox/client_menu.c:379 +#: openbox/client_menu.c:380 msgid "_Send to desktop" msgstr "傳送到桌面(_S)" -#: openbox/client_menu.c:383 +#: openbox/client_menu.c:384 msgid "Client menu" msgstr "客戶端選單" -#: openbox/client_menu.c:393 +#: openbox/client_menu.c:394 msgid "R_estore" msgstr "還原(_E)" -#: openbox/client_menu.c:397 +#: openbox/client_menu.c:398 msgid "_Move" msgstr "移動(_M)" -#: openbox/client_menu.c:399 +#: openbox/client_menu.c:400 msgid "Resi_ze" msgstr "調整大小(_Z)" -#: openbox/client_menu.c:401 +#: openbox/client_menu.c:402 msgid "Ico_nify" msgstr "最小化(_N)" -#: openbox/client_menu.c:405 +#: openbox/client_menu.c:406 msgid "Ma_ximize" msgstr "最大化(_X)" -#: openbox/client_menu.c:409 +#: openbox/client_menu.c:410 msgid "_Roll up/down" msgstr "向上/向下捲動(_R)" -#: openbox/client_menu.c:411 +#: openbox/client_menu.c:414 msgid "Un/_Decorate" msgstr "開/關視窗裝飾(_D)" -#: openbox/client_menu.c:415 +#: openbox/client_menu.c:418 msgid "_Close" msgstr "關閉(_C)" -#: openbox/config.c:781 +#: openbox/config.c:503 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "與滑鼠組合的上下文「%s」無效" + +#: openbox/config.c:857 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "在配置檔中指定的按鈕「%s」無效" -#: openbox/keyboard.c:157 +#: openbox/config.c:882 +msgid "" +"Openbox was compiled without Imlib2 image loading support. Icons in menus " +"will not be loaded." +msgstr "" + +#: openbox/debug.c:55 +#, c-format +msgid "Unable to make directory '%s': %s" +msgstr "無法製作目錄'%s'：%s" + +#: openbox/debug.c:138 openbox/openbox.c:372 +msgid "Close" +msgstr "關閉" + +#: openbox/keyboard.c:161 msgid "Conflict with key binding in config file" msgstr "與配置檔中的按鍵組合衝突" -#: openbox/menu.c:102 openbox/menu.c:110 +#: openbox/menu.c:94 openbox/menu.c:106 #, c-format msgid "Unable to find a valid menu file \"%s\"" msgstr "無法找到有效的選單檔案「%s」" -#: openbox/menu.c:170 +#: openbox/menu.c:158 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" msgstr "執行命令於管線選單「%s」時失敗：%s" -#: openbox/menu.c:184 +#: openbox/menu.c:172 #, c-format msgid "Invalid output from pipe-menu \"%s\"" msgstr "從管線選單「%s」的輸出無效" -#: openbox/menu.c:197 +#: openbox/menu.c:185 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" msgstr "試圖存取選單「%s」但是它不存在" -#: openbox/menu.c:367 openbox/menu.c:368 +#: openbox/menu.c:400 openbox/menu.c:401 msgid "More..." msgstr "更多…" -#: openbox/mouse.c:373 +#: openbox/mouse.c:376 #, c-format msgid "Invalid button \"%s\" in mouse binding" msgstr "與滑鼠組合的按鈕「%s」無效" -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "與滑鼠組合的上下文「%s」無效" - -#: openbox/openbox.c:133 +#: openbox/openbox.c:137 #, c-format msgid "Unable to change to home directory \"%s\": %s" msgstr "無法變更到主目錄「%s」：%s" @@ -243,27 +249,27 @@ msgstr "無法變更到主目錄「%s」：%s" msgid "Failed to open the display from the DISPLAY environment variable." msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。" -#: openbox/openbox.c:183 +#: openbox/openbox.c:182 msgid "Failed to initialize the obrender library." msgstr "初始化 obrender 函式庫時失敗。" -#: openbox/openbox.c:194 +#: openbox/openbox.c:193 msgid "X server does not support locale." msgstr "X 伺服器不支援語區。" -#: openbox/openbox.c:196 +#: openbox/openbox.c:195 msgid "Cannot set locale modifiers for the X server." msgstr "無法設定用於 X 伺服器的語區修飾項。" -#: openbox/openbox.c:263 +#: openbox/openbox.c:253 msgid "Unable to find a valid config file, using some simple defaults" msgstr "無法找到有效的配置檔案，而使用某些簡單的預設值" -#: openbox/openbox.c:297 +#: openbox/openbox.c:286 msgid "Unable to load a theme." msgstr "無法載入佈景主題。" -#: openbox/openbox.c:377 +#: openbox/openbox.c:370 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " @@ -273,28 +279,24 @@ msgstr "" "解析 Openbox 設定檔 XML 語法時發現一個或多個錯誤。 查看 stdout 以獲得更多資" "訊。 最後一個發現的錯誤在檔案 \"%s\" 第 %d 行。訊息：%s" -#: openbox/openbox.c:379 +#: openbox/openbox.c:372 msgid "Openbox Syntax Error" msgstr "Openbox 語法錯誤" -#: openbox/openbox.c:379 -msgid "Close" -msgstr "關閉" - -#: openbox/openbox.c:448 +#: openbox/openbox.c:438 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" msgstr "重新啟動以執行新的可執行檔「%s」時失敗：%s" -#: openbox/openbox.c:518 openbox/openbox.c:520 +#: openbox/openbox.c:517 openbox/openbox.c:519 msgid "Copyright (c)" msgstr "著作權 (c)" -#: openbox/openbox.c:529 +#: openbox/openbox.c:528 msgid "Syntax: openbox [options]\n" msgstr "語法：openbox [選項]\n" -#: openbox/openbox.c:530 +#: openbox/openbox.c:529 msgid "" "\n" "Options:\n" @@ -302,30 +304,30 @@ msgstr "" "\n" "選項：\n" -#: openbox/openbox.c:531 +#: openbox/openbox.c:530 msgid " --help Display this help and exit\n" msgstr " --help 顯示此說明然後離開\n" -#: openbox/openbox.c:532 +#: openbox/openbox.c:531 msgid " --version Display the version and exit\n" msgstr " --version 顯示版本然後離開\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:532 msgid " --replace Replace the currently running window manager\n" msgstr " --replace 替換目前執行的視窗管理員\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:537 +#: openbox/openbox.c:536 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr " --config-file <檔案> 指定要使用的設定檔路徑\n" -#: openbox/openbox.c:538 +#: openbox/openbox.c:537 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable 停用與執行階段管理程式的連結\n" -#: openbox/openbox.c:539 +#: openbox/openbox.c:538 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -333,19 +335,19 @@ msgstr "" "\n" "傳遞訊息到執行中的 Openbox 實體：\n" -#: openbox/openbox.c:540 +#: openbox/openbox.c:539 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure 重新載入 Openbox 配置\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:540 msgid " --restart Restart Openbox\n" msgstr " --restart 重新啟動 Openbox\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:541 msgid " --exit Exit Openbox\n" msgstr " --exit 結束 Openbox\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:542 msgid "" "\n" "Debugging options:\n" @@ -353,10 +355,14 @@ msgstr "" "\n" "偵錯選項：\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:543 msgid " --sync Run in synchronous mode\n" msgstr " --sync 在同步模式中運行\n" +#: openbox/openbox.c:544 +msgid " --startup CMD Run CMD after starting\n" +msgstr "" + #: openbox/openbox.c:545 msgid " --debug Display debugging output\n" msgstr " --debug 顯示偵錯輸出\n" @@ -366,10 +372,14 @@ msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus 顯示焦點處理的偵錯輸出\n" #: openbox/openbox.c:547 +msgid " --debug-session Display debugging output for session management\n" +msgstr "" + +#: openbox/openbox.c:548 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama 分割顯示以進入假造的 xinerama 螢幕\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:549 #, c-format msgid "" "\n" @@ -378,26 +388,27 @@ msgstr "" "\n" "請向 %s 報告錯誤\n" -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "--config-file 需要一個參數\n" +#: openbox/openbox.c:632 openbox/openbox.c:666 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s 需要一個參數\n" -#: openbox/openbox.c:660 +#: openbox/openbox.c:709 #, c-format msgid "Invalid command line argument \"%s\"\n" msgstr "無效的命令列引數「%s」\n" -#: openbox/screen.c:102 openbox/screen.c:190 +#: openbox/screen.c:106 openbox/screen.c:191 #, c-format msgid "A window manager is already running on screen %d" msgstr "螢幕 %d 中已經有視窗管理員在運行" -#: openbox/screen.c:124 +#: openbox/screen.c:127 #, c-format msgid "Could not acquire window manager selection on screen %d" msgstr "無法於螢幕 %d 獲選為視窗管理員" -#: openbox/screen.c:145 +#: openbox/screen.c:150 #, c-format msgid "The WM on screen %d is not exiting" msgstr "螢幕 %d 中的視窗管理員並未離開" @@ -406,7 +417,7 @@ msgstr "螢幕 %d 中的視窗管理員並未離開" #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: openbox/screen.c:412 +#: openbox/screen.c:418 #, fuzzy, c-format msgid "" "Openbox is configured for %d desktop, but the current session has %d. " @@ -418,31 +429,12 @@ msgstr[0] "" "Openbox 原先被設定為使用 %d 個桌面，但目前的作業階段有其他程式變更設定為 %d " "個，因此忽略 Openbox 的設定" -#: openbox/screen.c:1180 +#: openbox/screen.c:1205 #, c-format msgid "desktop %i" msgstr "桌面 %i" -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "無法製作目錄「%s」：%s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "無法儲存執行階段到「%s」：%s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "當儲存執行階段「%s」時發生錯誤：%s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "沒有連接到作業階段管理員" - -#: openbox/startupnotify.c:243 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s" msgstr "正在運行 %s" @@ -467,15 +459,35 @@ msgstr "與按鍵組合的鍵名「%s」無效" msgid "Requested key \"%s\" does not exist on the display" msgstr "要求的按鍵「%s」不存在於畫面之中" -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "X 錯誤：%s" - -#: openbox/prompt.c:200 +#: openbox/prompt.c:153 msgid "OK" msgstr "確定" +#, fuzzy +#~ msgid "Openbox" +#~ msgstr "離開 Openbox" + +#~ msgid "--config-file requires an argument\n" +#~ msgstr "--config-file 需要一個參數\n" + +#~ msgid "" +#~ "The SessionLogout action is not available since Openbox was built without " +#~ "session management support" +#~ msgstr "" +#~ "SessionLogout 動作無法使用，因為 Openbox 在編譯時沒有使用作業階段管理支援" + +#~ msgid "Unable to save the session to \"%s\": %s" +#~ msgstr "無法儲存執行階段到「%s」：%s" + +#~ msgid "Error while saving the session to \"%s\": %s" +#~ msgstr "當儲存執行階段「%s」時發生錯誤：%s" + +#~ msgid "Not connected to a session manager" +#~ msgstr "沒有連接到作業階段管理員" + +#~ msgid "X Error: %s" +#~ msgstr "X 錯誤：%s" + #~ msgid "Failed to execute \"%s\": %s" #~ msgstr "執行「%s」時失敗：%s" diff --git a/tests/icons.c b/tests/icons.c index af13e0b..e2477c2 100644 --- a/tests/icons.c +++ b/tests/icons.c @@ -70,6 +70,7 @@ int main(int argc, char **argv) Pixmap p; Cursor cur; XEvent ev; + unsigned int bs = sizeof(long); printf("Click on a window with an icon...\n"); @@ -132,10 +133,10 @@ int main(int argc, char **argv) i[image]->byte_order = LSBFirst; i[image]->data = (char*)prop_return[image]; for (j = 0; j < w*h; j++) { - unsigned char alpha = (unsigned char)i[image]->data[j*4+3]; - unsigned char r = (unsigned char) i[image]->data[j*4+0]; - unsigned char g = (unsigned char) i[image]->data[j*4+1]; - unsigned char b = (unsigned char) i[image]->data[j*4+2]; + unsigned char alpha = (unsigned char)i[image]->data[j*bs+3]; + unsigned char r = (unsigned char) i[image]->data[j*bs+0]; + unsigned char g = (unsigned char) i[image]->data[j*bs+1]; + unsigned char b = (unsigned char) i[image]->data[j*bs+2]; // background color unsigned char bgr = 0;