diff -Nru tilda-1.1.12/autogen.sh tilda-1.2.2/autogen.sh --- tilda-1.1.12/autogen.sh 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/autogen.sh 2014-10-28 11:36:24.000000000 +0000 @@ -32,7 +32,9 @@ # Autoconf will call run autopoint, aclocal, autoconf, autoheader and automake # to setup and configure the build environment -autoreconf --verbose --install --symlink --force || { +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. +autoreconf --verbose --install --symlink --force "$srcdir" || { echo; echo "autoreconf has encountered an error." echo; @@ -44,4 +46,4 @@ echo echo "Running configure now" echo -./configure "$@" +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff -Nru tilda-1.1.12/ChangeLog tilda-1.2.2/ChangeLog --- tilda-1.1.12/ChangeLog 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/ChangeLog 2014-10-28 11:36:24.000000000 +0000 @@ -1,3 +1,61 @@ +version 1.2.2 (2014-10-28): + * Fixed an error where Tilda failed to start when the lock + file directory did not exist or could not be opened. + +version 1.2.1 (2014-10-16): + * Readded empty NEWS file to fix debian packaging + * Updated po/ folder + +version 1.2.0 (2014-10-15): + * Fixed background option + * Updated README, HACKING and TODO files + * Fixed bug in focus/pull-up selection + * Made tilda icon themable + +version 1.2~rc1 (2014-09-25): + * Fixed an issue with drop-to-default shell option + * Added light and dark solarized schemes + * Custom color selection improved + * New option to set the maximum tab title length + * The fullscreen hotkey is now configurable in the + preferences. + * Its now possible to compile with clang + * Fixed some focus issues + * Its now possible to open the context menu with the context-menu + button on the keyboard if such a key is present. This provides + improved usability for people with disabilities. + * Tabs can now be switches using the mouse history buttons. + * Tilda now uses non-recursive automake, there have been + many improvements to the build system and some code cleanups. + Its now also possible to make out-of-tree builds. + The debugging output has also been improved and now shows + in which file a log message was printed. + * There is a new unlimited scrollback option. + * A positioning bug when unfullscreening was fixed. + * Some improvements for different window managers were made. + * Tilda can no be focuses with the hotkey instead of hiding it + when it is currently not focused. This new behavior is configurable. + * A locking issue has been fixed if multiple tilda instances were started + at the same time, which caused a race condition to appear and could + delete the configuration file. + * The UI file from GtkBuilder is now being compiled into the tilda binary. + * There is a new option to hide the tab bar and the border when multiple + tabs are open. + * When a new tab is opened the tab will now inherit its working directory + from the old tab. This behavior is active by default and can only be + disabled from an option in the config file. + +version 1.1.13 (2014-09-22): + * Fixed focus stealing issue + on mouse enter. This caused + the tilda window to become + active when the mouse + entered the window. + * Fixed two functions which prevented + building on systems with + '-Wreturn-type' enabled in the + compiler. + version 1.1.12 (2014-05-20): * Fixed an issue where the keystroke for the fullscreen diff -Nru tilda-1.1.12/configure.ac tilda-1.2.2/configure.ac --- tilda-1.1.12/configure.ac 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/configure.ac 2014-10-28 11:36:24.000000000 +0000 @@ -3,21 +3,14 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([Tilda],[1.1.12],[https://github.com/lanoxx/tilda/issues],[tilda],[https://github.com/lanoxx/tilda]) -AM_INIT_AUTOMAKE +AC_INIT([Tilda],[1.2.2],[https://github.com/lanoxx/tilda/issues],[tilda],[https://github.com/lanoxx/tilda]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) # We are going to use silent builds which have a much # nicer output. More information can be foudn here: -# https://live.gnome.org/GnomeGoals/NicerBuilds +# https://wiki.gnome.org/Initiatives/GnomeGoals/NicerBuilds m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -AC_CONFIG_SRCDIR([src/tilda.c]) -AC_CONFIG_HEADERS([tilda-config.h:tilda-config.h.in]) - -# This will initialize the internationalization -# capabilities of glib (glib/gi18n.h) and gettext -AM_GNU_GETTEXT_VERSION([0.18.1]) -AM_GNU_GETTEXT([external]) # See http://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/maintainer_002dmode.html # for an explanation of using this macro. The short explanation is: @@ -30,21 +23,45 @@ # options that are defined below. It also activates several flags to the compile such that it # will show more warnings and errors to indicate problems in the source code. AC_ARG_ENABLE([maintainer-flags], - [AS_HELP_STRING([--enable-maintainer-flags],[enable extra debugging (don't use as user)])]) - -#' This comment fixes syntax highlighting + [AS_HELP_STRING([--enable-maintainer-flags],[\ + Enables extra debugging; use this option if you want to develope for tilda, + but to not use it as an end user if you just want to compile and use tilda. \ + This option includes the --enable-debug and --enable-debug-functions \ + options. And sets several CFLAGS to enable more gcc warnings and errors.])]) if test "x$enable_maintainer_flags" = "xyes"; then enable_debug="yes" enable_debug_functions="yes" - CFLAGS="$CFLAGS -Wall -Wextra -pedantic -fno-common -Wstrict-aliasing=2" - CFLAGS="$CFLAGS -Wshadow -Wmissing-prototypes -Wmissing-declarations" + CFLAGS="$CFLAGS \ + -Wall \ + -Wextra \ + -fno-common \ + -Wstrict-aliasing=2 \ + -Wshadow \ + -Wmissing-prototypes \ + -Wmissing-declarations \ + -Wcast-align \ + -Wuninitialized \ + -Wno-strict-aliasing \ + -Werror=pointer-arith \ + -Werror=missing-declarations \ + -Werror=redundant-decls \ + -Werror=empty-body \ + -Werror=format \ + -Werror=format-security \ + -Werror=format-nonliteral \ + -Werror=init-self \ + -Werror=vla \ + -DDEBUG \ + " fi # This registers the option '--enable-debug' in the ./configure script # If this option is set, then the the options -g and -ggdb will be # passed to the compiler. -AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[enable extra debugging output])]) +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug],[Enables extra debugging output and \ + sets debug flags for gdb])]) if test "x$enable_debug" = "xyes"; then AC_DEFINE([DEBUG], [1], [Enable extra debugging output]) @@ -54,26 +71,73 @@ # This registers the option '--debug-functions' in the ./configure script # If this option is set, then the name of each entered function will be # printed on the shell. -AC_ARG_ENABLE([debug-functions], [AS_HELP_STRING([--enable-debug-functions],[enable function call tracing])]) +AC_ARG_ENABLE([debug-functions], + [AS_HELP_STRING([--enable-debug-functions],[Enables function call tracing. \ + When this option is enabled tilda will print \ + the name of each function that is called to the \ + console.])]) if test "x$enable_debug_functions" = "xyes"; then AC_DEFINE([DEBUG_FUNCTIONS], [1], [Enable function call tracing]) fi +AC_ARG_ENABLE([clang], + [AS_HELP_STRING([--enable-clang],[use clang instead of gcc as C compiler.])]) + +#Use C99 compilation mode +if test "x$enable_clang" = "xyes"; then + # clang uses c99 mode by default, so we just set CC to clang and we are done + CC="clang"; +else + # We do not need to set CC as the default is gcc, but we need to set it to + # use C99 compilation mode + CFLAGS="$CFLAGS -std=c99"; +fi + +AC_ARG_ENABLE([lto], + [AS_HELP_STRING([--enable-lto],[Optimize at link time. This enables the compiler \ + to do a better job at optimization and (hopefully) \ + produce smaller binaries.])]) + +if test "x$enable_lto" = "xyes"; then + CFLAGS="$CFLAGS -flto" + if test "$CC" != "clang"; then + # If the user has enabled lto explicitly, we assume he has made sure + # that his toolchain can indeed handle lto objects. + CFLAGS="$CFLAGS -fno-fat-lto-objects" + fi + # In the case of lto optimizations, we need to pass the optimization options + # to the linker as well as telling it to use the linker plugin. + LDFLAGS="$LDFLAGS $CFLAGS -fuse-linker-plugin" +fi + + +AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no) +if test x$GLIB_COMPILE_RESOURCES = xno; then + AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH) +fi + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O +AC_CONFIG_SRCDIR([src/tilda.c]) +AC_CONFIG_HEADERS([tilda-config.h:tilda-config.h.in]) + +# This will initialize the internationalization +# capabilities of glib (glib/gi18n.h) and gettext +AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT([external]) # Checks for libraries. PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.0.0]) PKG_CHECK_MODULES([VTE], [vte-2.90]) PKG_CHECK_MODULES([LIBCONFUSE], [libconfuse]) +PKG_CHECK_MODULES([X11], [x11]) # Checks for header files. -AC_PATH_X AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h strings.h sys/ioctl.h unistd.h confuse.h]) +AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h strings.h sys/ioctl.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -86,7 +150,39 @@ AC_CHECK_FUNCS([mkdir strcasecmp strchr strncasecmp strstr strtol]) AC_CONFIG_FILES([Makefile - src/Makefile - m4/Makefile po/Makefile.in]) AC_OUTPUT + +dnl --------------------------------------------------------------------------- +dnl - Show summary +dnl --------------------------------------------------------------------------- + +dnl The following 'for' block splits the CFLAGS variable into multiple lines of 4 options per line +cflaglines="" +cflagcount=0 +for flag in ${CFLAGS}; do + cflaglines=$cflaglines$flag" " + cflagcount=$(($cflagcount+1)) + if (( $cflagcount % 4 == 0)); then + dnl Here we concatenate the current cflaglines variable with a newline and enough spaces + dnl such that the lines are correctly indented. Do not try to indent or reformat the + dnl position of the double quotes (\"). + cflaglines=$cflaglines" + " + fi +done; + +echo " + ${PACKAGE} $VERSION + `echo ${PACKAGE} $VERSION | sed "s/./=/g"` + + prefix: ${prefix} + datarootdir: ${datarootdir} + datadir: ${datadir} + pkgdatadir: `if test x${pkgdatadir} != "x"; then echo ${pkgdatadir}; else echo ${datadir}/${PACKAGE}; fi` + source code location: ${srcdir} + compiler: ${CC} + cflags: ${cflaglines} + Maintainer mode: ${USE_MAINTAINER_MODE} + Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags} +" diff -Nru tilda-1.1.12/debian/changelog tilda-1.2.2/debian/changelog --- tilda-1.1.12/debian/changelog 2014-05-24 15:51:06.000000000 +0000 +++ tilda-1.2.2/debian/changelog 2014-10-28 11:36:24.000000000 +0000 @@ -1,3 +1,9 @@ +tilda (1.2.2-1) unstable; urgency=low + * New packaging version 3.9.6 + * Add debian/tilda.docs + + -- Sebastian Geiger Tue, 28 Oct 2014 12:35:00 +0100 + tilda (1.1.12-1) unstable; urgency=low * Fixed an issue where the keystroke for the fullscreen diff -Nru tilda-1.1.12/debian/control tilda-1.2.2/debian/control --- tilda-1.1.12/debian/control 2014-05-24 15:51:06.000000000 +0000 +++ tilda-1.2.2/debian/control 2014-10-28 11:36:24.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Sebastian Geiger Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, autopoint, pkg-config, libgtk-3-dev, libvte-2.90-dev, libconfuse-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://github.com/lanoxx/tilda Vcs-Git: git://github.com/lanoxx/tilda.git Vcs-Browser: https://github.com/lanoxx/tilda/tree/tilda-debian-1-1 diff -Nru tilda-1.1.12/debian/tilda.docs tilda-1.2.2/debian/tilda.docs --- tilda-1.1.12/debian/tilda.docs 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/debian/tilda.docs 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1 @@ +README.md diff -Nru tilda-1.1.12/.gitignore tilda-1.2.2/.gitignore --- tilda-1.1.12/.gitignore 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/.gitignore 2014-10-28 11:36:24.000000000 +0000 @@ -32,8 +32,11 @@ src/Makefile src/Makefile.in src/key_converter.c +src/glade-resources.c +src/glade-resources.h src/tilda stamp-h1 +src/tilda.ui~ tilda-config.h tilda-config.h.in tilda-config.h.in~ diff -Nru tilda-1.1.12/HACKING.md tilda-1.2.2/HACKING.md --- tilda-1.1.12/HACKING.md 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/HACKING.md 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,84 @@ +# Compiling and Installing + +## Dependencies + + * Glib >= 2.30 - http://developer.gnome.org/glib/2.30/ + * Gtk+3 >= 3.0 - http://developer.gnome.org/gtk3/3.0/ + * VTE >= 2.90 - http://developer.gnome.org/vte/0.30/ + * libConfuse - http://www.nongnu.org/confuse/ + +On Ubuntu based system install dependencies with: + + sudo apt-get install git automake libgtk-3-dev libvte-2.90-dev libconfuse-dev + +You possibly need other packages such as `gettext`, `automake`, `autoconf`, `autopoint`, and X11 development libraries. + +On Fedora: + + sudo yum install git automake libconfuse-devel vte3-devel gtk3-devel glib-devel gettext-devel + +The dependencies section is complete, depending on your system you my need ot install additional packages. Please +carefully read the output of the `autogen.sh` (see below) for more information of what you need to install. + +## Compiling + +Generally if you have installed the development packages (*-dev or *-devel) of +the dependencies above then it should be possible to compile with: + + ./autogen.sh --prefix=/usr + make --silent + +I recommend to run make with the `--silent` (or `-s`) option. + +## Installing + +After you have compiled the package run the following command to install tilda to the prefix that you have chosen +before: + + sudo make install + +If you don't want to install to the `/usr` prefix, choose some other prefix when you run the `autogen.sh` script, +such as `/opt/tilda` and add it to your path. + +# Packaging for Debian + +This section explains how to package Tilda for Debian and Debian derived distributions. + +## Preparation before building the package + +In order to build a package which can be uploaded to some +Debian based distribution the following steps are necessary. +Replace '#' with the number of the current minor release. + + 1. Check out the latest stable branch (e.g. tilda-1-1) + and commit any changes or patches which you want to include, + then commit these changes. + 2. Update the changelog with a message such as: + "Update the change log for 1.1.#" + 3. Update the version number in configure.ac and make + a commit with the version number: + "1.1.#" + 4. Rebase the tilda-debian-1-1 ontop of the latest stable HEAD. + This is not very nice currently as this branch needs to be + rebased every time a new release is made. I am still looking + for a better solution. + 5. Change debian/changelog and update the Debian specific changelog. + 6. Create a tarball using git-archive: + git archive --prefix=tilda-1.1.#/ -o ../tilda_1.1.#.orig.tar.gz HEAD + +# Building a package + +You now have a tarball which can be build into a package. The following steps +are just to document the basic commands that are required to build the package, +then verify its correct and upload the package to mentors. However the steps which +are required to setup such a development environment are not explained here: + + 7. cd ..; tar -xf tilda_1.1.#.orig.tar.gz + 8. cd tilda-1.1.# + 9. Run debuild +10. If debuild finishes without a problem next run pbuilder, this will verify that + the packge is buildable (without warnings or errors) in a clean environment: + sudo pbuilder --build --basetgz ~/pbuilder/unstable-base.tgz tilda_1.1.8-1.dsc +11. If pbuilder does not complain and you don't see any warnings in lintian, then + upload the package to mentors: + dput mentors tilda_1.1.#-1_amd64.changes Binary files /tmp/zm1oaVZ9Xv/tilda-1.1.12/images/tilda_appearance.png and /tmp/zs0g5qgu4m/tilda-1.2.2/images/tilda_appearance.png differ Binary files /tmp/zm1oaVZ9Xv/tilda-1.1.12/images/tilda_general.png and /tmp/zs0g5qgu4m/tilda-1.2.2/images/tilda_general.png differ Binary files /tmp/zm1oaVZ9Xv/tilda-1.1.12/images/tilda_keybindings.png and /tmp/zs0g5qgu4m/tilda-1.2.2/images/tilda_keybindings.png differ diff -Nru tilda-1.1.12/Makefile.am tilda-1.2.2/Makefile.am --- tilda-1.1.12/Makefile.am 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/Makefile.am 2014-10-28 11:36:24.000000000 +0000 @@ -1,9 +1,7 @@ ## Process this file with automake to produce a Makefile.in # vim: set noexpandtab ts=8 sts=8 sw=8: -AUTOMAKE_OPTIONS = gnu - -SUBDIRS = po m4 src +SUBDIRS = po CLEANFILES = tilda.desktop @@ -44,12 +42,16 @@ Pixmapsdir = ${datadir}/pixmaps Pixmaps_DATA = tilda.png -pkgdata_DATA = tilda.glade - -EXTRA_DIST = tilda.desktop.in tilda.png tilda.glade +EXTRA_DIST = tilda.desktop.in tilda.png tilda.desktop: tilda.desktop.in sed -e 's|\@BINDIR\@|$(bindir)|' \ -e 's|\@PIXMAPSDIR\@|$(Pixmapsdir)|' $< > $@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + + +bin_PROGRAMS = + +include src/Makefile.am + diff -Nru tilda-1.1.12/NEWS tilda-1.2.2/NEWS --- tilda-1.1.12/NEWS 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/NEWS 2014-10-28 11:36:24.000000000 +0000 @@ -1 +0,0 @@ -Please see the ChangeLog for more information on what is new in this release. diff -Nru tilda-1.1.12/po/bg.po tilda-1.2.2/po/bg.po --- tilda-1.1.12/po/bg.po 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/po/bg.po 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,1030 @@ +# Bulgarian translation for tilda +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the tilda package. +# Anton Antonov , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: tilda\n" +"Report-Msgid-Bugs-To: sloutri@iit.edu\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" +"PO-Revision-Date: 2014-07-30 22:44+0000\n" +"Last-Translator: Anton Antonov \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-07-30 22:48+0000\n" +"X-Generator: Launchpad (build 17131)\n" + +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Затвори подпрозорец" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Звучен Terminal Bell" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Първоначално Заглавие:" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Не може да пусне shell по подразбиране: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"Escape последователност\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 +msgid "Tilda Config" +msgstr "Tilda конфигурация" + +#: src/tilda.ui:355 +msgid "Enable Double Buffering" +msgstr "Позволи двойно буфериране" + +#: src/tilda.ui:371 src/tilda.c:322 +msgid "Start Tilda hidden" +msgstr "Стартирай Tilda скрита" + +#: src/tilda.ui:387 +msgid "Always on top" +msgstr "Винаги най-отгоре" + +#: src/tilda.ui:403 +msgid "Display on all workspaces" +msgstr "Покажи всички работни среди" + +#: src/tilda.ui:419 +msgid "Do not show in taskbar" +msgstr "Не показвай в лентата на задачите" + +#: src/tilda.ui:435 +msgid "Show Notebook Border" +msgstr "Покажи тефтерски ръбове" + +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 +msgid "Window Display" +msgstr "Прозорец - представяне" + +#: src/tilda.ui:531 +msgid "Cursor Blinks" +msgstr "Мигащ курсор" + +#: src/tilda.ui:547 +msgid "Audible Terminal Bell" +msgstr "Звучен Terminal Bell" + +#: src/tilda.ui:569 +msgid "Terminal Display" +msgstr "Терминал - представяне" + +#: src/tilda.ui:625 +msgid "Enable Antialiasing" +msgstr "Позволи antialiasing" + +#: src/tilda.ui:641 +msgid "Allow Bold Text" +msgstr "Позволи удебелен текст" + +#: src/tilda.ui:660 +msgid "Position of Tabs:" +msgstr "Позиция на подпрозорци:" + +#: src/tilda.ui:693 +msgid "Font:" +msgstr "Шрифт:" + +#: src/tilda.ui:710 +msgid "Font" +msgstr "Шрифт" + +#: src/tilda.ui:763 +msgid "Hide Tilda when mouse leaves it" +msgstr "" + +#: src/tilda.ui:783 +msgid "Auto Hide Delay:" +msgstr "" + +#: src/tilda.ui:794 +msgid "Hide when Tilda loses focus" +msgstr "" + +#: src/tilda.ui:816 +#, fuzzy +msgid "Auto Hide" +msgstr "Заглавие" + +#: src/tilda.ui:858 +msgid "When last terminal is closed:" +msgstr "" + +#: src/tilda.ui:894 +#, fuzzy +msgid "Program Exit" +msgstr "Позиция" + +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." +msgstr "" + +#: src/tilda.ui:933 +msgid "General" +msgstr "Общ" + +#: src/tilda.ui:982 +msgid "Word Characters:" +msgstr "" + +#: src/tilda.ui:998 +msgid "Select by Word" +msgstr "" + +#: src/tilda.ui:1049 +#, fuzzy +msgid "Web Browser *:" +msgstr "Уеб Браузър" + +#: src/tilda.ui:1065 +msgid "URL Handling" +msgstr "Обработка на URL" + +#: src/tilda.ui:1100 +msgid "Initial Title:" +msgstr "Първоначално Заглавие:" + +#: src/tilda.ui:1112 +msgid "Dynamically-set Title:" +msgstr "Динамично зададено Заглавие:" + +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 +msgid "Title" +msgstr "Заглавие" + +#: src/tilda.ui:1230 +msgid "Run a custom command instead of the shell" +msgstr "Пусни произволна команда вместо shell" + +#: src/tilda.ui:1247 +msgid "Custom Command:" +msgstr "Произволна команда:" + +#: src/tilda.ui:1261 +msgid "When Command Exits:" +msgstr "Когато командата приключи:" + +#: src/tilda.ui:1316 +msgid "Command" +msgstr "Команда" + +#: src/tilda.ui:1354 +msgid "" +"* A valid command that can open a browser must be entered here. It is " +"possible to use the name of a specific browser such as 'firefox' and 'google-" +"chrome' or to use the generic commands 'x-www-browser' and 'xdg-open'. The " +"best command may be different depending on the system." +msgstr "" + +#: src/tilda.ui:1375 +msgid "Title and Command" +msgstr "Заглавие и команда" + +#: src/tilda.ui:1408 src/tilda.ui:1501 +msgid "Percentage" +msgstr "Процент" + +#: src/tilda.ui:1435 src/tilda.ui:1514 +msgid "In Pixels" +msgstr "В пиксели" + +#: src/tilda.ui:1467 +msgid "Height" +msgstr "Височина" + +#: src/tilda.ui:1560 +msgid "Width" +msgstr "Широчина" + +#: src/tilda.ui:1592 +msgid "Centered Horizontally" +msgstr "Центрирана хоризонтално" + +#: src/tilda.ui:1610 +msgid "Centered Vertically" +msgstr "Центрирана вертикално" + +#: src/tilda.ui:1632 src/tilda.c:329 +msgid "X Position" +msgstr "X позиция" + +#: src/tilda.ui:1647 src/tilda.c:330 +msgid "Y Position" +msgstr "Y позиция" + +#: src/tilda.ui:1699 +msgid "Position" +msgstr "Позиция" + +#: src/tilda.ui:1734 +msgid "Enable Transparency" +msgstr "Позволи прозрачност" + +#: src/tilda.ui:1752 +msgid "Level of Transparency" +msgstr "Ниво на прозрачност" + +#: src/tilda.ui:1778 +msgid "Animated Pulldown" +msgstr "Анимирано падане" + +#: src/tilda.ui:1795 +msgid "Use Image for Background" +msgstr "Използвай изображение за фон" + +#: src/tilda.ui:1815 +msgid "Animation Delay (usec)" +msgstr "Забавяне на анимацията (usec)" + +#: src/tilda.ui:1832 +msgid "Animation Orientation" +msgstr "Ориентация на анимацията" + +#: src/tilda.ui:1905 +msgid "Extras" +msgstr "Екстри" + +#: src/tilda.ui:1940 +msgid "Monitor:" +msgstr "" + +#: src/tilda.ui:2003 +#, fuzzy +msgid "Select monitor" +msgstr "Шрифт" + +#: src/tilda.ui:2023 +msgid "Appearance" +msgstr "Външен вид" + +#: src/tilda.ui:2069 +msgid "Built-in Schemes" +msgstr "Вградени цветови схеми" + +#: src/tilda.ui:2100 +msgid "Text Color" +msgstr "Цвят на текст" + +#: src/tilda.ui:2114 +msgid "Background Color" +msgstr "Цвят на фон" + +#: src/tilda.ui:2163 +msgid "Foreground and Background Colors" +msgstr "Цветове на преден и заден план" + +#: src/tilda.ui:2194 src/tilda.ui:2801 +msgid " " +msgstr " " + +#: src/tilda.ui:2215 +msgid "" +"Note: Terminal applications have these colors available to " +"them." +msgstr "" + +#: src/tilda.ui:2502 +msgid "Color palette:" +msgstr "" + +#: src/tilda.ui:2519 +#, fuzzy +msgid "Built-in schemes:" +msgstr "Вградени цветови схеми" + +#: src/tilda.ui:2546 +#, fuzzy +msgid "Palette" +msgstr "Заглавие" + +#: src/tilda.ui:2568 +msgid "Colors" +msgstr "Цветове" + +#: src/tilda.ui:2619 +msgid "lines" +msgstr "редове" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Скрол лента е:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Scrollback:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 +msgid "Scroll on Output" +msgstr "Скрол на извод" + +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" +msgstr "Скрол на натискане на бутон" + +#: src/tilda.ui:2720 +msgid "Scroll Background" +msgstr "Скрол на фон" + +#: src/tilda.ui:2744 +msgid "Scrolling" +msgstr "Скролване" + +#: src/tilda.ui:2766 +msgid "Scrolling" +msgstr "Скролване" + +#: src/tilda.ui:2784 +msgid "Compatibility" +msgstr "Съвместимост" + +#: src/tilda.ui:2820 +msgid "" +"Note: These options may cause some applications to behave " +"incorrectly. They are only here to allow you to work around certain " +"applications and operating systems that expect different terminal behavior." +msgstr "" +"Забележка: Тези настройки могат да доведът до неправилно " +"поведение на някои приложения. Те са тук само, за да позволят заобикаляне на " +"приложения и операционни системи, които очакват различно терминално " +"поведение." + +#: src/tilda.ui:2843 +msgid "_Delete key generates:" +msgstr "_Delete копчето генерира:" + +#: src/tilda.ui:2859 +msgid "_Backspace key generates:" +msgstr "_Backspace копчето генерира:" + +#: src/tilda.ui:2922 +msgid "_Reset Compatibility Options to Defaults" +msgstr "_Върни настройките за съвместимост по подразбиране" + +#: src/tilda.ui:2959 +msgid "Compatibility" +msgstr "Съвместимост" + +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 +msgid " " +msgstr "" + +#: src/tilda.ui:3000 +#, fuzzy +msgid "Paste" +msgstr "Заглавие" + +#: src/tilda.ui:3040 +msgid "Go To Next Tab" +msgstr "" + +#: src/tilda.ui:3078 +#, fuzzy +msgid "Quit" +msgstr "Заглавие" + +#: src/tilda.ui:3116 +#, fuzzy +msgid "Add Tab" +msgstr "Заглавие" + +#: src/tilda.ui:3155 +msgid "Go To Tab 10" +msgstr "" + +#: src/tilda.ui:3195 +msgid "Go To Tab 5" +msgstr "" + +#: src/tilda.ui:3233 +msgid "Go To Tab 4" +msgstr "" + +#: src/tilda.ui:3271 +msgid "Go To Tab 3" +msgstr "" + +#: src/tilda.ui:3309 +msgid "Go To Tab 2" +msgstr "" + +#: src/tilda.ui:3347 +msgid "Go To Tab 1" +msgstr "" + +#: src/tilda.ui:3385 +msgid "Go To Previous Tab" +msgstr "" + +#: src/tilda.ui:3425 +#, fuzzy +msgid "Close Tab" +msgstr "_Затвори подпрозорец" + +#: src/tilda.ui:3465 +#, fuzzy +msgid "Copy" +msgstr "Шрифт" + +#: src/tilda.ui:3503 +#, fuzzy +msgid "Pull Down Terminal" +msgstr "Падащо копче" + +#: src/tilda.ui:3539 +msgid "Go To Tab 6" +msgstr "" + +#: src/tilda.ui:3579 +msgid "Go To Tab 7" +msgstr "" + +#: src/tilda.ui:3619 +msgid "Go To Tab 8" +msgstr "" + +#: src/tilda.ui:3659 +msgid "Go To Tab 9" +msgstr "" + +#: src/tilda.ui:3699 +msgid "Move Tab Left" +msgstr "" + +#: src/tilda.ui:3737 +#, fuzzy +msgid "Move Tab Right" +msgstr "Височина" + +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 +msgid "Keybindings" +msgstr "Клавишни комбинации" + +#: src/callback_func.c:53 +msgid "Untitled" +msgstr "Неозаглавен" + +#: src/callback_func.c:71 +msgid "Bad value for \"d_set_title\" in config file\n" +msgstr "Невалидна стойност за \"d_set_title\" в конфигурационният файл\n" + +#: src/configsys.c:199 +#, fuzzy +msgid "Problem when opening config file\n" +msgstr "Проблем при разчитане на конфигурационният файл" + +#: src/configsys.c:203 +msgid "An unexpected error occured while parsing the config file\n" +msgstr "" + +#: src/configsys.c:371 +msgid "Unable to sync the config file to disk\n" +msgstr "Не може да синхронизира конфигурационният файл на диска\n" + +#: src/configsys.c:381 +msgid "Unable to close the config file\n" +msgstr "Не може да затвори конфигурационният файл\n" + +#: src/configsys.c:390 +#, c-format +msgid "Unable to write the config file to %s\n" +msgstr "Не може да запише конфигурационният фалй на %s\n" + +#: src/tilda.c:216 +#, c-format +msgid "Unable to run command: `%s'\n" +msgstr "Не може да изпълни командата:`%s'\n" + +#: src/tilda.c:255 src/tilda.c:492 +#, c-format +msgid "Unable to open lock directory: %s\n" +msgstr "Не може да отвори директория: %s\n" + +#: src/tilda.c:319 +msgid "Use Antialiased Fonts" +msgstr "Използвай Antialised шрифтове" + +#: src/tilda.c:320 +msgid "Set the background color" +msgstr "Сложи фоннов цвят" + +#: src/tilda.c:321 +msgid "Run a command at startup" +msgstr "Изпълни команда при стартиране" + +#: src/tilda.c:323 +msgid "Set the font to the following string" +msgstr "Сложи шрифт на следният стринг" + +#: src/tilda.c:324 +msgid "Scrollback Lines" +msgstr "Scrollback редове" + +#: src/tilda.c:325 +msgid "Use Scrollbar" +msgstr "Използвай скрол лента" + +#: src/tilda.c:326 +msgid "Opaqueness: 0-100%" +msgstr "Непрозрачност: 0-100%" + +#: src/tilda.c:327 +msgid "Print the version, then exit" +msgstr "Принтирай версията и излез" + +#: src/tilda.c:328 +msgid "Set Initial Working Directory" +msgstr "Определи началната работна директория" + +#: src/tilda.c:331 +msgid "Set Background Image" +msgstr "Определи фонново изображение" + +#: src/tilda.c:332 +msgid "Show Configuration Wizard" +msgstr "Покажи помощник при конфигурация" + +#: src/tilda.c:348 +#, c-format +msgid "" +"Error parsing command-line options. Try \"tilda --help\"\n" +"to see all possible options.\n" +"\n" +"Error message: %s\n" +msgstr "" +"Грешка при разчитане на командните опции. Опитай \"tilda --help\"\n" +"за да видиш всички възможни опциии.\n" +"\n" +"Грешка: %s\n" + +#: src/tilda.c:445 +#, c-format +msgid "Creating directory:'%s'\n" +msgstr "" + +#: src/tilda.c:560 +msgid "" +"Found style.css in the user config directory, applying user css style.\n" +msgstr "" + +#: src/tilda.c:591 +msgid "Migrating old config path to XDG folders\n" +msgstr "" + +#: src/tilda.c:717 src/wizard.c:370 +#, fuzzy +msgid "" +"The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " +"choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Проблем при разчитане на : %s\n" + +#: src/tilda_terminal.c:446 +#, fuzzy, c-format +msgid "Problem parsing custom command: %s\n" +msgstr "Проблем при разчитане на : %s\n" + +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 +msgid "Launching default shell instead\n" +msgstr "Пускам вместо това shell по подразбиране\n" + +#: src/tilda_terminal.c:475 +#, c-format +msgid "Unable to launch custom command: %s\n" +msgstr "Не може да пусне командата по избор: %s\n" + +#: src/tilda_terminal.c:530 +#, c-format +msgid "Unable to launch default shell: %s\n" +msgstr "Не може да пусне shell по подразбиране: %s\n" + +#: src/tilda_terminal.c:818 +msgid "_New Tab" +msgstr "_Нов подпрозорец" + +#: src/tilda_terminal.c:822 +msgid "_Close Tab" +msgstr "_Затвори подпрозорец" + +#: src/tilda_terminal.c:834 +msgid "Toggle fullscreen" +msgstr "" + +#: src/tilda_terminal.c:930 +#, c-format +msgid "Failed to launch the web browser. The command was `%s'\n" +msgstr "Не успя да пусне уеб брайзъра. Командата беше `%s'\n" + +#: src/tilda_window.c:101 +msgid "You have a bad tab_pos in your configuration file\n" +msgstr "Вие имате невалидна tab_pos във вашият конфигурационен файл\n" + +#: src/tilda_window.c:509 +#, c-format +msgid "Unable to set tilda's icon: %s\n" +msgstr "Не може да зададе икона на tilda: %s\n" + +#: src/tilda_window.c:695 +msgid "Out of memory, cannot create tab\n" +msgstr "Недостиг на памет, не може да създаде подпрозорец\n" + +#: src/wizard.c:189 +msgid "Tango" +msgstr "" + +#: src/wizard.c:190 +msgid "Linux console" +msgstr "" + +#: src/wizard.c:191 +msgid "XTerm" +msgstr "" + +#: src/wizard.c:192 +msgid "Rxvt" +msgstr "" + +#: src/wizard.c:286 +#, fuzzy, c-format +msgid "Tilda %d Config" +msgstr "Tilda конфигурация" + +#: src/wizard.c:374 +#, fuzzy +msgid "" +"The keybinding you chose for \"Add Tab\" is invalid. Please choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:376 +#, fuzzy +msgid "" +"The keybinding you chose for \"Close Tab\" is invalid. Please choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:378 +#, fuzzy +msgid "" +"The keybinding you chose for \"Next Tab\" is invalid. Please choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:380 +#, fuzzy +msgid "" +"The keybinding you chose for \"Previous Tab\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:382 +#, fuzzy +msgid "" +"The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:384 +#, fuzzy +msgid "" +"The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:386 +#, fuzzy +msgid "" +"The keybinding you chose for \"Copy\" is invalid. Please choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:388 +#, fuzzy +msgid "" +"The keybinding you chose for \"Paste\" is invalid. Please choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:390 +#, fuzzy +msgid "" +"The keybinding you chose for \"Quit\" is invalid. Please choose another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:392 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:394 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:396 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:398 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:400 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:402 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:404 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:406 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:408 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:410 +#, fuzzy +msgid "" +"The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"Клавишната комбинация, която избрахте е невалидна. Моля изберете друга." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 +msgid "Invalid tab position setting, ignoring\n" +msgstr "Невалидна настройка за позиция на подпрозорци, игнориране\n" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Проблем при разчитане на конфигурационният файл" + +#~ msgid "" +#~ "Top\n" +#~ "Bottom\n" +#~ "Left\n" +#~ "Right" +#~ msgstr "" +#~ "Горде\n" +#~ "Долу\n" +#~ "Ляво\n" +#~ "Дясно" + +#~ msgid "" +#~ "Isn't displayed\n" +#~ "Goes after initial title\n" +#~ "Goes before initial title\n" +#~ "Replace initial title" +#~ msgstr "" +#~ "Не е показано\n" +#~ "Отива след първоначалното заглавие\n" +#~ "Отива преди първоначалното заглавие\n" +#~ "Заменя първоначалното заглавие" + +#~ msgid "" +#~ "Hold the terminal open\n" +#~ "Restart the command\n" +#~ "Exit the terminal" +#~ msgstr "" +#~ "Задръж терминала отворен\n" +#~ "Рестартирай командата\n" +#~ "Излез от терминала" + +#~ msgid "" +#~ "Custom\n" +#~ "Green on Black\n" +#~ "Black on White\n" +#~ "White on Black" +#~ msgstr "" +#~ "Произволна\n" +#~ "Зелено на черно\n" +#~ "Черно на бяло\n" +#~ "Бяло на черно" + +#~ msgid "" +#~ "On the Left\n" +#~ "On the Right\n" +#~ "Disabled" +#~ msgstr "" +#~ "В ляво\n" +#~ "В дясно\n" +#~ "Забранено" + +#~ msgid "Key Binding" +#~ msgstr "Клавишна комбинация" + +#~ msgid "Grab Keybinding" +#~ msgstr "Прихвани клавишна комбинация" + +#~ msgid "gtk-close" +#~ msgstr "gtk-close" diff -Nru tilda-1.1.12/po/ca.po tilda-1.2.2/po/ca.po --- tilda-1.1.12/po/ca.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/ca.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-01-22 10:08+0000\n" "Last-Translator: animarval \n" "Language-Team: Catalan \n" @@ -18,149 +18,280 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Títol Inicial:" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Configuració de Tilda" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Permet Double Buffering" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Inicia Tilda ocultament" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Sempre en primer pla" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Mostra en tots els espais de treball" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "No mostrar a la barra de tasques" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Permet text en negreta" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Posició de les Pestanyes:" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Títol" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Posició" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" msgstr "" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Títol Inicial:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Posar un Títol Dinàmic:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Títol" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Ordre personalitzada:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Ordre" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -168,167 +299,171 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Centrat Verticalment" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Posició X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Posició Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Posició" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Habilita la transparència" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Nivell de Transparència" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animació del menú desplegable" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Usar Imatge per al Fons" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Retard de l'Animació (usec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Orientació de l'Animació" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Títol" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Títol" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "" -#: tilda.glade:2476 -msgid "Scroll on Output" +#: src/tilda.ui:2619 +msgid "lines" +msgstr "línies" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" msgstr "" -#: tilda.glade:2493 -msgid "Scroll on Keystroke" +#: src/tilda.ui:2669 +msgid "Limit scrollback to:" msgstr "" -#: tilda.glade:2510 -msgid "Scroll Background" +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." msgstr "" -#: tilda.glade:2547 -msgid "lines" -msgstr "línies" +#: src/tilda.ui:2686 +msgid "Scroll on Output" +msgstr "" -#: tilda.glade:2587 -msgid "Scrollback:" +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" msgstr "" -#: tilda.glade:2601 -msgid "Scrollbar is:" +#: src/tilda.ui:2720 +msgid "Scroll Background" msgstr "" -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Desplaçament" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Desplaçament" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Compatibilitat" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -340,118 +475,123 @@ "certes aplicacions i sistemes operatius que esperen un comportament diferent " "del terminal." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Títol" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Títol" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Títol" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "Ordre" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Ordre" -#: tilda.glade:3374 +#: src/tilda.ui:3503 msgid "Pull Down Terminal" msgstr "" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Ordre" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Ordre" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "" @@ -463,86 +603,82 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 msgid "Problem when opening config file\n" msgstr "" -#: src/configsys.c:177 -msgid "Problem while parsing config file\n" -msgstr "" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Incapaç d'executar l'ordre: '%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Incapaç d'obrir el directori bloquejat: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Indicar color del fons" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Executar ordre a l'iniciar" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -551,212 +687,227 @@ "Error message: %s\n" msgstr "" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Configuració de Tilda" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -787,6 +938,3 @@ #~ "A l'Esquerra\n" #~ "A la Dreta\n" #~ "Desactivat" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" diff -Nru tilda-1.1.12/po/cs.po tilda-1.2.2/po/cs.po --- tilda-1.1.12/po/cs.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/cs.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-02-14 07:57+0000\n" "Last-Translator: Vojtěch Trefný \n" "Language-Team: Czech \n" @@ -18,150 +18,288 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Zavřít kartu" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Terminálové pípání" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Výchozí titulek" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Nemohu spustit výchozí shell: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"Escape sekvenci\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Konfigurace" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Povolit Double Buffering" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Spustit Tildu skrytou" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Vždy navrchu" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Zobrazovat na všech plochách" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Nezobrazovat na panelu úloh" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Zobrazovat rámeček" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Zobrazení okna" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Kurzor bliká" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Terminálové pípání" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Zobrazení Terminálu" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Povolit vyhlazování" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Povolit tučný text" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Pozice panelů" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Písmo:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Písmo" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Titulek" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Umístění" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Obecné" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Webový prohlížeč" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "URL" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Výchozí titulek" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Dynamický titulek" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Titulek" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Místo shellu spustit vlastní příkaz" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Vlastní příkaz" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Když příkaz skončí" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Příkaz" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,168 +307,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Titulek a příkaz" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Procenta" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "V pixelech" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Výška" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Šířka" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Vycentrováno vodorovně" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Vycentrováno svisle" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Pozice X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Pozice Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Umístění" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Povolit průhlednost" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Úroveň průhlednosti" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animované vysouvání" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Obrázek na pozadí" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Délka animace (mikrosekundy)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Směr animace" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Doplňky" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Titulek" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Vzhled" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Vestavěná témata" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Barva textu" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Barva pozadí" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Barva pozadí a popředí" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "Vestavěná témata" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Titulek" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Barvy" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "řádky" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Posuvník je:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Odskrolováno:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Posouvat při výstupu" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Posouvat stiskem klávesy" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Posouvat pozadí" -#: tilda.glade:2547 -msgid "lines" -msgstr "řádky" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Odskrolováno:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Posuvník je:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Posun" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Posouvání" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Kompatibilita" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -342,119 +485,124 @@ "některé aplikace a operační systémy očekávají jiné chování terminálu." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "Klávesa _Delete generuje:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "Klávesa _Backspace generuje:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "Obnovit standardní nastavení pro _kompatibilitu" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Kompatibilita" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Titulek" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Titulek" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Titulek" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "_Zavřít kartu" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Písmo" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Rolovací klávesa" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "_Zavřít kartu" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Výška" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Klávesové zkratky" @@ -466,88 +614,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Špatná hodnota \"d_set_title\" v konfiguračním souboru.\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Nemohu zavřít konfigurační soubor\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Nemohu zavřít konfigurační soubor\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Nemohu synchronizovat konfigurační soubor na disk\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Nemohu zavřít konfigurační soubor\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Nemohu zapsat konfigurační soubor do %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Nemohu spustit příkaz: `%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Nemohu otevřít adresář: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Použít vyhlazování písma" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Nastavit barvu pozadí" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Spouštět příkaz při spuštění" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Nastavit písmo na následující řetězec" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Odskrolovaných řádků" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Použít posuvník" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Průhlednost: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Vypsat verzi, poté ukončit" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Nastavit počáteční pracovní adresář" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Nastavit obrázek pozadí" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Zobrazit konfiguračního průvodce" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -560,232 +703,252 @@ "\n" "Chybová zpráva: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Spouštím výchozí shell.\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Nemohu spustit příkaz: %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "Nemohu spustit výchozí shell: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Nová karta" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Selhalo spuštění internetového prohlížeče. Příkaz byl `%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Špatná hodnota tab_pos v konfiguračním souboru.\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Nemohu nastavit ikonu tildy: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Nedostatek paměti, nemohu vytvořit panel\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Konfigurace" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "Vámi zvolená klávesová zkratka je neplatná. Prosím zvolte jinou." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Neplatné nastavení pozice panelu. Ignoruji.\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Nemohu zavřít konfigurační soubor\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -837,20 +1000,8 @@ #~ "Napravo\n" #~ "Zakázaný" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Escape sekvenci\n" -#~ "Control-H" - #~ msgid "Key Binding" #~ msgstr "Klávesová zkratka" #~ msgid "Grab Keybinding" #~ msgstr "Zabrat klávesové zkratky" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" diff -Nru tilda-1.1.12/po/de.po tilda-1.2.2/po/de.po --- tilda-1.1.12/po/de.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/de.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" -"PO-Revision-Date: 2008-04-03 20:02+0000\n" -"Last-Translator: Benjamin Weber \n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" +"PO-Revision-Date: 2013-07-13 11:12+0000\n" +"Last-Translator: Christian Weber \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -18,320 +18,457 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "Tilda Beenden" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "Neues Terminal öffnen" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "Neues Terminal öffnen und ausblenden" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "Oben" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "Unten" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "Links" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "Rechts" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Terminal beenden" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "Nicht angezeigt" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "Kommt nach Anfangstitel" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "Kommt vor Anfangstitel" + +#: src/tilda.ui:132 +msgid "Replace initial title" +msgstr "Ersetzt Anfangstitel" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "Standard-Shell öffnen" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "Befehl erneut ausführen" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "Terminal beenden" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "Benutzerdefiniert" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "Grün auf Schwarz" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "Schwarz auf Weiß" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "Weiß auf Schwarz" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "Links" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "Rechts" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "Deaktiviert" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "Escape-Sequenz" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "Strg-H" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Tilda Konfiguration" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Double Buffering aktivieren" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Tilda versteckt starten" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Im Vordergrund" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Auf allen Arbeitsbereichen anzeigen" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Nicht in der Taskleiste anzeigen" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Notitzbuchrand anzeigen" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Fenster-Anzeige" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "blinkender Cursor" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Akkustische Terminalglocke" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Terminal-Anzeige" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Antialiasing aktivieren" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Fetten Text erlauben" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Position der Tabs:" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Schriftart:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Schriftart" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" -msgstr "" +msgstr "Ausblenden, wenn Maus Tilda verlässt" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" -msgstr "" +msgstr "Ausblendeverzögerung" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" -msgstr "" +msgstr "Ausblenden, wenn Tilda Fokus verliert" -#: tilda.glade:749 -#, fuzzy +#: src/tilda.ui:816 msgid "Auto Hide" -msgstr "Titel" +msgstr "Automatisches Ausblenden" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" -msgstr "" +msgstr "Wenn letztes Terminal geschlossen wurde:" -#: tilda.glade:827 -#, fuzzy +#: src/tilda.ui:894 msgid "Program Exit" -msgstr "Position" +msgstr "Beenden" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" +"Hinweis: Manche Optionen erfordern einen Neustart von tilda." +"" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Allgemein" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" -msgstr "" +msgstr "Wortzeichen" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" -msgstr "" +msgstr "Wörter auswählen" -#: tilda.glade:980 -#, fuzzy +#: src/tilda.ui:1049 msgid "Web Browser *:" -msgstr "Webbrowser" +msgstr "Webbrowser *:" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "URL-Handhabung" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" -msgstr "Anfangsüberschrift" +msgstr "Anfangsüberschrift:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" -msgstr "Dynamische Überschrift" +msgstr "Dynamische Überschrift:" + +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" -#: tilda.glade:1093 +#: src/tilda.ui:1200 msgid "Title" msgstr "Titel" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Führe benutzerdefinierten Befehl anstelle der Shell aus" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Benutzerdefinierter Befehl:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Wenn Befehl endet:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" -msgstr "Kommando" +msgstr "Befehl" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" "chrome' or to use the generic commands 'x-www-browser' and 'xdg-open'. The " "best command may be different depending on the system." msgstr "" +"* Ein gültiger Befehl, der einen Browser öffnen kann, muss hier eingesetzt " +"werden. Spezifische Befehle wie 'firefox' und 'google-chrome' oder die " +"allgemeinen Befehle 'x-www-browser' und 'xdg-open' sind möglich. Der beste " +"Befehl kann je nach System unterschiedlich sein." -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" -msgstr "Titel und Kommando" +msgstr "Titel und Befehl" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Prozentanteil" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "In Pixel" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Höhe" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Breite" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Horizontal zentriert" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Vertikal zentriert" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "X Position" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Y Position" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Position" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Transparenz aktivieren" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Transparenzstufe" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Pulldown animieren" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Hintergrundbild verwenden" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" -msgstr "Verzögerte Animation (msec)" +msgstr "Verzögerte Animation (µsec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Animationsorientierung" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extras" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 -#, fuzzy +#: src/tilda.ui:2003 msgid "Select monitor" -msgstr "Titel" +msgstr "Monitor auswählen" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Darstellung" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Eingebaute Schemata" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Textfarbe" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Hintergrundfarbe" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Vordergrund- und Hintergrundfarbe" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" +"Hinweis: Textbasierte Anwendungen können diese Farben " +"nutzen." -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" -msgstr "" +msgstr "Farbpalette:" -#: tilda.glade:2396 -#, fuzzy +#: src/tilda.ui:2519 msgid "Built-in schemes:" -msgstr "Eingebaute Schemata" +msgstr "Eingebaute Schemata:" -#: tilda.glade:2423 -#, fuzzy +#: src/tilda.ui:2546 msgid "Palette" -msgstr "Titel" +msgstr "Palette" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Farben" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "Zeilen" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Scrollbalken ist:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Gespeicherte Zeilen:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Ausgabe scrollen" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Bei Tastendruck scrollen" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Hintergrund scrollen" -#: tilda.glade:2547 -msgid "lines" -msgstr "Zeilen" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Scrollbalken:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Scrollbalken ist:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Scrollen" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Scrollen" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Kompatibilität" -#: tilda.glade:2694 -#, fuzzy +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -343,119 +480,117 @@ "Verfügung, damit problematische Anwendungen oder Betriebssysteme reibungslos " "funktionieren, die ein anderes Terminal-Verhalten erwarten." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "_Entfernen-Taste erzeugt:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "_Rücktaste erzeugt:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "Kompatibilitätseinstellungen auf Vorgabewerte _zurücksetzen" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Kompatibilität" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 -#, fuzzy +#: src/tilda.ui:3000 msgid "Paste" -msgstr "Titel" +msgstr "Einfügen" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" -msgstr "" +msgstr "Nächster Tab" -#: tilda.glade:2949 -#, fuzzy +#: src/tilda.ui:3078 msgid "Quit" -msgstr "Titel" +msgstr "Beenden" -#: tilda.glade:2987 -#, fuzzy +#: src/tilda.ui:3116 msgid "Add Tab" -msgstr "Titel" +msgstr "Tab hinzufügen" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" -msgstr "" +msgstr "Gehe zu Tab 10" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" -msgstr "" +msgstr "Gehe zu Tab 5" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" -msgstr "" +msgstr "Gehe zu Tab 4" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" -msgstr "" +msgstr "Gehe zu Tab 3" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" -msgstr "" +msgstr "Gehe zu Tab 2" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" -msgstr "" +msgstr "Gehe zu Tab 1" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" -msgstr "" +msgstr "Vorheriger Tab" -#: tilda.glade:3296 -#, fuzzy +#: src/tilda.ui:3425 msgid "Close Tab" -msgstr "Tab s_chließen" +msgstr "Tab schließen" -#: tilda.glade:3336 -#, fuzzy +#: src/tilda.ui:3465 msgid "Copy" -msgstr "Schriftart" +msgstr "Kopieren" -#: tilda.glade:3374 -#, fuzzy +#: src/tilda.ui:3503 msgid "Pull Down Terminal" -msgstr "\"Bild runter\"-Taste" +msgstr "Terminal Einblenden" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" -msgstr "" +msgstr "Gehe zu Tab 6" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" -msgstr "" +msgstr "Gehe zu Tab 7" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" -msgstr "" +msgstr "Gehe zu Tab 8" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" -msgstr "" +msgstr "Gehe zu Tab 9" -#: tilda.glade:3570 -#, fuzzy -msgid "Move Tabe Left" -msgstr "Tab s_chließen" +#: src/tilda.ui:3699 +msgid "Move Tab Left" +msgstr "Bewege Tab nach links" -#: tilda.glade:3608 -#, fuzzy +#: src/tilda.ui:3737 msgid "Move Tab Right" -msgstr "Höhe" +msgstr "Bewege Tab nach rechts" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +#, fuzzy +msgid "Toggle Fullscreen" +msgstr "Vollbild umschalten" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Tastenbelegungen" @@ -467,91 +602,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Ungültiger Wert für \"d_set_title\" in der Konfigurationsdatei\n" -#: src/configsys.c:173 -#, fuzzy +#: src/configsys.c:199 msgid "Problem when opening config file\n" -msgstr "Problem beim Parsen der Konfigurationsdatei\n" - -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Problem beim Parsen der Konfigurationsdatei\n" +msgstr "Problem beim Öffnen der Konfigurationsdatei\n" -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" +"Ein unerwarteter Fehler ist beim Lesen der Konfigurationsdatei aufgetreten\n" -#: src/configsys.c:308 -#, fuzzy +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Konnte die Konfigurationsdatei nicht speichern\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Kann die Konfigurationsdatei nicht schließen\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Kann die Konfigurationsdatei nicht nach %s schreiben\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Kann Befehl nicht ausführen: `%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" -msgstr "Kann gesperrtes Verzeichnis nicht öffnen: %s\n" +msgstr "Kann Lock-Verzeichnis nicht öffnen: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" -msgstr "Antialiased Zeichensatz verwenden" +msgstr "Zeichensatz mit Antialiasing verwenden" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Hintergrundfarbe auswählen" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Befehl beim Starten ausführen" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Setze die Schriftart auf folgenden String" -#: src/tilda.c:302 -#, fuzzy +#: src/tilda.c:324 msgid "Scrollback Lines" -msgstr "Zurück zu scrollende Zeilen" +msgstr "Zurückscrollbare Zeilen" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Scrollbalken benutzen" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Transparenz: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Version ausgeben, danach beenden" -#: src/tilda.c:306 -#, fuzzy +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Startverzeichnis setzen" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Hintergrundbild festlegen" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Konfigurationsassistenten starten" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -559,343 +686,275 @@ "\n" "Error message: %s\n" msgstr "" -"Fehler bei der Analyse der Kommandozeilen-Optionen. Versuche \"tilda --help" -"\"\n" +"Fehler beim Lesen der Kommandozeilen-Optionen. Versuche \"tilda --help\"\n" "um alle möglichen Optionen zu sehen.\n" "\n" "Fehlermeldung: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" -msgstr "" +msgstr "Erstelle Verzeichnis: '%s'\n" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" +"style.css in Nutzer Config-Verzeichnis gefunden, nutze Nutzer css style.\n" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" -msgstr "" +msgstr "Verschiebe altes Konfigurationsverzeichnis in XDG-Verzeichnisse\n" -#: src/tilda.c:638 src/wizard.c:329 -#, fuzzy +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Terminal Einblenden\" ist " +"ungültig. Bitte wählen Sie ein Anderes." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 #, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Problem beim Lesen eines benutzerdefinierten Befehls: %s\n" + +#: src/tilda_terminal.c:446 +#, c-format msgid "Problem parsing custom command: %s\n" -msgstr "Problem beim Parsen eines benutzerdefinierten Befehls: %s\n" +msgstr "Problem beim Lesen eines benutzerdefinierten Befehls: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 -#, fuzzy +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Öffne stattdessen die Standard-Shell\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Konnte benutzerdefinierten Befehl nicht ausführen: %s\n" -#: src/tilda_terminal.c:460 -#, fuzzy, c-format +#: src/tilda_terminal.c:530 +#, c-format msgid "Unable to launch default shell: %s\n" msgstr "Konnte die Standard-Shell nicht öffnen: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Neuer Tab" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "Tab s_chließen" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" -msgstr "" +msgstr "Vollbild umschalten" -#: src/tilda_terminal.c:853 -#, fuzzy, c-format +#: src/tilda_terminal.c:930 +#, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Konnte Webbrowser nicht starten. Der Befehl lautete `%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Die Konfigurationsdatei enthält eine falsche tab_pos\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" -msgstr "Kann tildas Symbol nicht festlegen: %s\n" +msgstr "Kann Tildas Symbol nicht festlegen: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Kein Speicher vorhanden, Tab kann nicht erstellt werden\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 -#, fuzzy, c-format +#: src/wizard.c:286 +#, c-format msgid "Tilda %d Config" -msgstr "Tilda Konfiguration" +msgstr "Tilda %d Konfiguration" -#: src/wizard.c:333 -#, fuzzy +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Tab hinzufügen\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:335 -#, fuzzy +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Tab schließen\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:337 -#, fuzzy +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Nächster Tab\" ist ungültig. Bitte " +"wählen Sie ein Anderes." -#: src/wizard.c:339 -#, fuzzy +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Vorheriger Tab\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:341 -#, fuzzy +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Bewege Tab nach links\" ist " +"ungültig. Bitte wählen Sie ein Anderes." -#: src/wizard.c:343 -#, fuzzy +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Bewege Tab nach rechts\" ist " +"ungültig. Bitte wählen Sie ein Anderes." -#: src/wizard.c:345 -#, fuzzy +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Kopieren\" ist ungültig. Bitte " +"wählen Sie ein Anderes." -#: src/wizard.c:347 -#, fuzzy +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Einfügen\" ist ungültig. Bitte " +"wählen Sie ein Anderes." -#: src/wizard.c:349 -#, fuzzy +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Beenden\" ist ungültig. Bitte " +"wählen Sie ein Anderes." -#: src/wizard.c:351 -#, fuzzy +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 1\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:353 -#, fuzzy +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 2\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:355 -#, fuzzy +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 3\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:357 -#, fuzzy +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 4\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:359 -#, fuzzy +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 5\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:361 -#, fuzzy +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 6\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:363 -#, fuzzy +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 7\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:365 -#, fuzzy +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 8\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:367 -#, fuzzy +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 9\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:369 -#, fuzzy +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -"Das von Ihnen gewählte Tastenkürzel ist ungültig. Bitte wählen Sie ein " -"Anderes." +"Das von Ihnen gewählte Tastenkürzel für \"Gehe zu Tab 10\" ist ungültig. " +"Bitte wählen Sie ein Anderes." -#: src/wizard.c:819 -msgid "Invalid tab position setting, ignoring\n" -msgstr "Ungültige Einstellung der Registerkarten-Position. Ignoriere.\n" +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"Das von Ihnen gewählte Tastenkürzel für \"Einfügen\" ist ungültig. Bitte " +"wählen Sie ein Anderes." -#~ msgid "" -#~ "Top\n" -#~ "Bottom\n" -#~ "Left\n" -#~ "Right" -#~ msgstr "" -#~ "Oben\n" -#~ "Unten\n" -#~ "Links\n" -#~ "Rechts" +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" -#, fuzzy -#~ msgid "" -#~ "Isn't displayed\n" -#~ "Goes after initial title\n" -#~ "Goes before initial title\n" -#~ "Replace initial title" -#~ msgstr "" -#~ "Nicht angezeigt\n" -#~ "Kommt nach Anfangstitel\n" -#~ "Kommt vor Anfangstitel\n" -#~ "Ersetze Anfangstitel" - -#~ msgid "" -#~ "Hold the terminal open\n" -#~ "Restart the command\n" -#~ "Exit the terminal" -#~ msgstr "" -#~ "Terminal offen halten\n" -#~ "Befehl erneut ausführen\n" -#~ "Terminal beenden" - -#~ msgid "" -#~ "Custom\n" -#~ "Green on Black\n" -#~ "Black on White\n" -#~ "White on Black" -#~ msgstr "" -#~ "Benutzerdefiniert\n" -#~ "Grün auf Schwarz\n" -#~ "Schwarz auf Weiss\n" -#~ "Weiss auf Schwarz" - -#~ msgid "" -#~ "On the Left\n" -#~ "On the Right\n" -#~ "Disabled" -#~ msgstr "" -#~ "Links\n" -#~ "Rechts\n" -#~ "Deaktiviert" - -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Escape-Sequenz\n" -#~ "Strg-H" +#: src/wizard.c:895 +msgid "Invalid tab position setting, ignoring\n" +msgstr "Ungültige Einstellung der Tab-Position. Ignoriere.\n" -#~ msgid "Grab Keybinding" -#~ msgstr "Tastenbelegung erfassen" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "Tastenkürzel eingeben" -#, fuzzy -#~ msgid "gtk-close" -#~ msgstr "gtk-schließen" +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Problem beim Lesen der Konfigurationsdatei\n" diff -Nru tilda-1.1.12/po/el.po tilda-1.2.2/po/el.po --- tilda-1.1.12/po/el.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/el.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2007-11-13 19:28+0000\n" "Last-Translator: Alexander Kikis \n" "Language-Team: Greek, Modern (1453-) \n" @@ -18,147 +18,277 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +msgid "Replace initial title" +msgstr "" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 msgid "Auto Hide" msgstr "" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 msgid "Program Exit" msgstr "" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" msgstr "" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -166,165 +296,169 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Θέση X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Θέση Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 msgid "Select monitor" msgstr "" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr "" -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 msgid "Palette" msgstr "" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "" -#: tilda.glade:2476 -msgid "Scroll on Output" +#: src/tilda.ui:2619 +msgid "lines" msgstr "" -#: tilda.glade:2493 -msgid "Scroll on Keystroke" +#: src/tilda.ui:2659 +msgid "Scrollbar is:" msgstr "" -#: tilda.glade:2510 -msgid "Scroll Background" +#: src/tilda.ui:2669 +msgid "Limit scrollback to:" msgstr "" -#: tilda.glade:2547 -msgid "lines" +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." msgstr "" -#: tilda.glade:2587 -msgid "Scrollback:" +#: src/tilda.ui:2686 +msgid "Scroll on Output" msgstr "" -#: tilda.glade:2601 -msgid "Scrollbar is:" +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" +msgstr "" + +#: src/tilda.ui:2720 +msgid "Scroll Background" msgstr "" -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -332,111 +466,116 @@ "i>" msgstr "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 msgid "Paste" msgstr "" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 msgid "Quit" msgstr "" -#: tilda.glade:2987 +#: src/tilda.ui:3116 msgid "Add Tab" msgstr "" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 msgid "Close Tab" msgstr "" -#: tilda.glade:3336 +#: src/tilda.ui:3465 msgid "Copy" msgstr "" -#: tilda.glade:3374 +#: src/tilda.ui:3503 msgid "Pull Down Terminal" msgstr "" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 -msgid "Move Tabe Left" +#: src/tilda.ui:3699 +msgid "Move Tab Left" msgstr "" -#: tilda.glade:3608 +#: src/tilda.ui:3737 msgid "Move Tab Right" msgstr "" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "" @@ -448,93 +587,89 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 msgid "Problem when opening config file\n" msgstr "" -#: src/configsys.c:177 -msgid "Problem while parsing config file\n" -msgstr "" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "" -#: src/tilda.c:298 +#: src/tilda.c:320 #, fuzzy msgid "Set the background color" msgstr "Θέσε το χρώμα στο υπόβαθρο" -#: src/tilda.c:299 +#: src/tilda.c:321 #, fuzzy msgid "Run a command at startup" msgstr "Τρέξε μια εντολή στο ξεκίνημα" -#: src/tilda.c:301 +#: src/tilda.c:323 #, fuzzy msgid "Set the font to the following string" msgstr "Θέστε την γραμματοσειρά στην ακόλουθη σειρά" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "" -#: src/tilda.c:303 +#: src/tilda.c:325 #, fuzzy msgid "Use Scrollbar" msgstr "Χρήση Μπάρας Κύλισις" -#: src/tilda.c:304 +#: src/tilda.c:326 #, fuzzy msgid "Opaqueness: 0-100%" msgstr "Αδιαφάνεια: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 #, fuzzy msgid "Print the version, then exit" msgstr "Τυπώστε την έκδοση, κατόπιν έξοδος" -#: src/tilda.c:306 +#: src/tilda.c:328 #, fuzzy msgid "Set Initial Working Directory" msgstr "Καθορισμένος αρχικούς καταλογους εργασίας" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -543,208 +678,223 @@ "Error message: %s\n" msgstr "" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" diff -Nru tilda-1.1.12/po/en_GB.po tilda-1.2.2/po/en_GB.po --- tilda-1.1.12/po/en_GB.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/en_GB.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-01-14 16:23+0000\n" "Last-Translator: John Drinkwater \n" "Language-Team: English (United Kingdom) \n" @@ -18,150 +18,286 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Audible Terminal Bell" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Initial Title:" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"Escape sequence\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Tilda Config" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Enable Double Buffering" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Start Tilda hidden" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Always on top" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Display on all workspaces" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Do not show in taskbar" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Show Notebook Border" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Window Display" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Cursor Blinks" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Audible Terminal Bell" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Terminal Display" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Enable Anti-aliasing" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Allow Bold Text" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Position of Tabs:" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Font:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Font" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Title" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Position" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "General" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Web Browser" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "URL Handling" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Initial Title:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Dynamically-set Title:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Title" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Run a custom command instead of the shell" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Custom Command:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "When command exits:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Command" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,168 +305,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Title and Command" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Percentage" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "In Pixels" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Height" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Width" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Centred Horizontally" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Centred Vertically" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "X Position" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Y Position" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Position" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Enable Transparency" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Level of Transparency" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animated Pull-down" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Use Image for Background" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Animation Delay (usec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Animation Orientation" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extras" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Title" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Appearance" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Built-in Schemes" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Text Colour" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Background Colour" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Foreground and Background Colours" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "Built-in Schemes" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Title" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Colours" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "lines" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Scrollbar is:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Scroll-back:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Scroll on Output" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Scroll on Keystroke" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Scroll Background" -#: tilda.glade:2547 -msgid "lines" -msgstr "lines" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Scroll-back:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Scrollbar is:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Scrolling" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Scrolling" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Compatibility" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -342,119 +483,124 @@ "applications and operating systems that expect different terminal behaviour." "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "_Delete key generates:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "_Backspace key generates:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "_Reset Compatibility Options to Defaults" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Compatibility" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Title" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Title" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Title" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "Command" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Font" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Pull-down Key" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Command" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Height" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Key bindings" @@ -466,86 +612,82 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Bad value for \"d_set_title\" in config file\n" -#: src/configsys.c:173 +#: src/configsys.c:199 msgid "Problem when opening config file\n" msgstr "" -#: src/configsys.c:177 -msgid "Problem while parsing config file\n" -msgstr "" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Unable to run command: `%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Unable to open lock directory: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Use Anti-aliased Fonts" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Set the background colour" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Run a command at startup" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Set the font to the following string" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Scroll-back Lines" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Use Scrollbar" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Opaqueness: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Print the version, then exit" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Set Initial Working Directory" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Set Background Image" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Show Configuration Wizard" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -558,232 +700,248 @@ "\n" "Error message: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "You have a bad tab_pos in your configuration file\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Unable to set tilda's icon: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Out of memory, cannot create tab\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Tilda Config" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "The key binding you chose is invalid. Please choose another." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "The key binding you chose is invalid. Please choose another." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Invalid tab position setting, ignoring\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -835,20 +993,8 @@ #~ "On the Right\n" #~ "Disabled" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" - #~ msgid "Key Binding" #~ msgstr "Key binding" #~ msgid "Grab Keybinding" #~ msgstr "Grab key binding" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" diff -Nru tilda-1.1.12/po/es.po tilda-1.2.2/po/es.po --- tilda-1.1.12/po/es.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/es.po 2014-10-28 11:36:24.000000000 +0000 @@ -1,346 +1,476 @@ # Spanish translation for tilda # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007 # This file is distributed under the same license as the tilda package. -# FIRST AUTHOR , 2007. # +# FIRST AUTHOR , 2007. +# micrococo , 2014. msgid "" msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" -"PO-Revision-Date: 2008-03-27 19:11+0000\n" -"Last-Translator: Jorge Rodríguez \n" -"Language-Team: Spanish \n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" +"PO-Revision-Date: 2014-09-07 12:19+0200\n" +"Last-Translator: micrococo \n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Generator: Lokalize 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "Cerrar Tilda" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "Abrir una nueva terminal" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "Abrir una nueva terminal y ocultarla" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "Arriba" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "Abajo" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "Izquierda" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "Derecha" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Salir de la terminal" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "No mostrarlo" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "Ponerlo detrás el título inicial" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "Ponerlo delante del título inicial" + +#: src/tilda.ui:132 +msgid "Replace initial title" +msgstr "Sustituir el título Inicial" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "Usar la acción predeterminada de la terminal" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "Reiniciar el comando" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "Salir de la terminal" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "Personalizado" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "Verde sobre negro" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "Negro sobre blanco" -#: tilda.glade:246 +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "Blanco sobre negro" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "Solarizado claro" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "Solarizado oscuro" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "A la izquierda" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "A la derecha" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "Inhabilitada" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "Secuencia de escape" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Configuración de Tilda" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" -msgstr "Habilitar doble memoria temporal" +msgstr "Habilitar memoria temporal doble" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" -msgstr "Iniciar Tilda oculto" +msgstr "Iniciar Tilda oculta" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Siempre visible" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Mostrar en todos los espacios de trabajo" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "No mostrar en la barra de tareas" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" -msgstr "Mostrar borde de cuaderno" +msgstr "Mostrar borde del cuaderno" + +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" -#: tilda.glade:425 +#: src/tilda.ui:492 msgid "Window Display" -msgstr "Visualización de la Ventana" +msgstr "Visualización de la ventana" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" -msgstr "Intermitencia del cursor" +msgstr "Cursor intermitente" -#: tilda.glade:480 -#, fuzzy +#: src/tilda.ui:547 msgid "Audible Terminal Bell" -msgstr "Campana del terminal activada" +msgstr "Timbre del sistema audible" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" -msgstr "Visualización del Terminal" +msgstr "Visualización de la terminal" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" -msgstr "Activar Antialiasing" +msgstr "Activar el suavizado de líneas" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Permitir texto en negrita" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" -msgstr "Posición de pestañas:" +msgstr "Posición de las pestañas:" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Tipo de letra:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Fuente" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" -msgstr "" +msgstr "Ocultar Tilda cuando el ratón salga de su ventana" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" -msgstr "" +msgstr "Retardo de la ocultación automática" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" -msgstr "" +msgstr "Ocultar Tilda cuando pierda el foco" -#: tilda.glade:749 -#, fuzzy +#: src/tilda.ui:816 msgid "Auto Hide" -msgstr "Título" +msgstr "Ocultar automáticamente" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" -msgstr "" +msgstr "Al cerrar la última terminal:" -#: tilda.glade:827 -#, fuzzy +#: src/tilda.ui:894 msgid "Program Exit" -msgstr "Posición" +msgstr "Salir del programa" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" +"Nota: Algunas opciones requieren que se reinicie Tilda." -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "General" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" -msgstr "" +msgstr "Caracteres de palabra:" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" -msgstr "" +msgstr "Selección de palabras" -#: tilda.glade:980 -#, fuzzy +#: src/tilda.ui:1049 msgid "Web Browser *:" -msgstr "Navegador web" +msgstr "Navegador web *:" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" -msgstr "Manejo de vínculos" +msgstr "Manejo de las URL" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" -msgstr "Título Inicial:" +msgstr "Título inicial:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" -msgstr "Título establecido Dinámicamente:" +msgstr "Establecer título dinámicamente:" + +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "Limitar la longitud máxima del título de la pestaña:" -#: tilda.glade:1093 +#: src/tilda.ui:1200 msgid "Title" msgstr "Título" -#: tilda.glade:1123 -#, fuzzy +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" -msgstr "Ejecutar un comando personalizado en lugar del terminal" +msgstr "Ejecutar un comando personalizado en lugar de la terminal" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Comando personalizado:" -#: tilda.glade:1154 -#, fuzzy +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Cuando el comando termine:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Comando" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" "chrome' or to use the generic commands 'x-www-browser' and 'xdg-open'. The " "best command may be different depending on the system." msgstr "" +"* Aquí se debe introducir un comando válido que pueda abrir un navegador " +"web. Se puede usar el nombre de un navegador específico como 'firefox' y " +"'google-chrome' o los comandos genéricos 'x-www-browser' y 'xdg-open'. El " +"comando más apropiado puede ser distinto dependiendo del sistema." -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Título y comando" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Porcentaje" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" -msgstr "En Pixeles" +msgstr "Píxeles" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Alto" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Ancho" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" -msgstr "Centrado Horizontalmente" +msgstr "Centrado horizontalmente" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" -msgstr "Centrado Verticalmente" +msgstr "Centrado verticalmente" -#: tilda.glade:1509 src/tilda.c:307 -#, fuzzy +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Posición X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Posición Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Posición" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" -msgstr "Activar Transparencia" +msgstr "Activar transparencia" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" -msgstr "Nivel de Transparencia" +msgstr "Nivel de transparencia" -#: tilda.glade:1655 -#, fuzzy +#: src/tilda.ui:1778 msgid "Animated Pulldown" -msgstr "Desplazamiento vertical animado" +msgstr "Animar la aparición de la ventana" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" -msgstr "Usar imagen como fondo" +msgstr "Usar imagen de fondo" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" -msgstr "Retardo de Animacion (useg)" +msgstr "Retardo de la animación (µseg)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" -msgstr "Orientaci'on de la Animación" +msgstr "Sentido de la animación" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extras" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" -msgstr "" +msgstr "Monitor:" -#: tilda.glade:1880 -#, fuzzy +#: src/tilda.ui:2003 msgid "Select monitor" -msgstr "Título" +msgstr "Selección del monitor" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Apariencia" -#: tilda.glade:1946 -#, fuzzy +#: src/tilda.ui:2069 msgid "Built-in Schemes" -msgstr "Esquemas de color internos" +msgstr "Esquemas internos" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Color del texto" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Color de fondo" -#: tilda.glade:2040 -#, fuzzy +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" -msgstr "Colores de la ventana y del fondo" +msgstr "Color del texto y del fondo" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" +"Nota: Las aplicaciones de terminal tienen estos colores a " +"su disposición." -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" -msgstr "" +msgstr "Paleta de color:" -#: tilda.glade:2396 -#, fuzzy +#: src/tilda.ui:2519 msgid "Built-in schemes:" -msgstr "Esquemas de color internos" +msgstr "Esquemas internos:" -#: tilda.glade:2423 -#, fuzzy +#: src/tilda.ui:2546 msgid "Palette" -msgstr "Título" +msgstr "Paleta" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Colores" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "líneas" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Barra de desplazamiento:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Desplazamiento hacia atrás" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Desplazar tras salida" -#: tilda.glade:2493 -#, fuzzy +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Desplazar al teclear" -#: tilda.glade:2510 -#, fuzzy +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Desplazar el fondo" -#: tilda.glade:2547 -msgid "lines" -msgstr "líneas" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Desplazamiento hacia atrás" - -#: tilda.glade:2601 -#, fuzzy -msgid "Scrollbar is:" -msgstr "Barra de desplazamiento a la:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Desplazamiento" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Desplazamiento" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Compatibilidad" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -352,122 +482,116 @@ "ciertas aplicaciones y sistemas operativos que esperan un comportamiento " "diferente del terminal." -#: tilda.glade:2717 -#, fuzzy +#: src/tilda.ui:2843 msgid "_Delete key generates:" -msgstr "La tecla «_Suprimir» produce:" +msgstr "La tecla _Suprimir produce:" -#: tilda.glade:2733 -#, fuzzy +#: src/tilda.ui:2859 msgid "_Backspace key generates:" -msgstr "La tecla <<_Retroceso>> produce:" +msgstr "La tecla _Retroceso produce:" -#: tilda.glade:2796 -#, fuzzy +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" -msgstr "_Reiniciar las Opciones de Compatibilidad a las predeterminadas" +msgstr "_Reiniciar las opciones de compatibilidad a las predeterminadas" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Compatibilidad" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " -msgstr "" +msgstr " " -#: tilda.glade:2871 -#, fuzzy +#: src/tilda.ui:3000 msgid "Paste" -msgstr "Título" +msgstr "Pegar" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" -msgstr "" +msgstr "Ir a la siguiente pestaña" -#: tilda.glade:2949 -#, fuzzy +#: src/tilda.ui:3078 msgid "Quit" -msgstr "Título" +msgstr "Salir" -#: tilda.glade:2987 -#, fuzzy +#: src/tilda.ui:3116 msgid "Add Tab" -msgstr "Título" +msgstr "Añadir pestaña" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" -msgstr "" +msgstr "Ir a la pestaña 10" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" -msgstr "" +msgstr "Ir a la pestaña 5" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" -msgstr "" +msgstr "Ir a la pestaña 4" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" -msgstr "" +msgstr "Ir a la pestaña 3" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" -msgstr "" +msgstr "Ir a la pestaña 2" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" -msgstr "" +msgstr "Ir a la pestaña 1" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" -msgstr "" +msgstr "Ir a la pestaña anterior" -#: tilda.glade:3296 -#, fuzzy +#: src/tilda.ui:3425 msgid "Close Tab" -msgstr "_Cerrar pestaña" +msgstr "Cerrar pestaña" -#: tilda.glade:3336 -#, fuzzy +#: src/tilda.ui:3465 msgid "Copy" -msgstr "Fuente" +msgstr "Copiar" -#: tilda.glade:3374 -#, fuzzy +#: src/tilda.ui:3503 msgid "Pull Down Terminal" -msgstr "Tecla de desplazamiento hacia abajo" +msgstr "Mostrar terminal" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" -msgstr "" +msgstr "Ir a la pestaña 6" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" -msgstr "" +msgstr "Ir a la pestaña 7" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" -msgstr "" +msgstr "Ir a la pestaña 8" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" -msgstr "" +msgstr "Ir a la pestaña 9" -#: tilda.glade:3570 -#, fuzzy -msgid "Move Tabe Left" -msgstr "_Cerrar pestaña" +#: src/tilda.ui:3699 +msgid "Move Tab Left" +msgstr "Mover pestaña a la izquierda" -#: tilda.glade:3608 -#, fuzzy +#: src/tilda.ui:3737 msgid "Move Tab Right" -msgstr "Alto" +msgstr "Mover pestaña a la derecha" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "Alternar pantalla completa" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Atajos de teclado" @@ -479,88 +603,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Valor erróneo para \"d_set_title\" en el fichero de configuración\n" -#: src/configsys.c:173 -#, fuzzy +#: src/configsys.c:199 msgid "Problem when opening config file\n" -msgstr "Problema analizando el fichero de configuración\n" +msgstr "Problema al abrir el fichero de configuración\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Problema analizando el fichero de configuración\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" +"Ha ocurrido un error inesperado al procesar el archivo de configuración\n" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" -msgstr "No se pudo sincronizar el archivo de configuración a disco\n" +msgstr "No se puede sincronizar el archivo de configuración a disco\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" -msgstr "No se pudo cerrar el archivo de configuración\n" +msgstr "No se puede cerrar el archivo de configuración\n" -#: src/configsys.c:327 -#, fuzzy, c-format +#: src/configsys.c:390 +#, c-format msgid "Unable to write the config file to %s\n" -msgstr "Incapaz de escribir el fichero de configuración en %s\n" +msgstr "No se puede escribir el fichero de configuración en %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" -msgstr "Incapaz de ejecutar el comando: `%s'\n" +msgstr "No se puede ejecutar el comando: `%s'\n" -#: src/tilda.c:234 src/tilda.c:446 -#, fuzzy, c-format +#: src/tilda.c:255 src/tilda.c:492 +#, c-format msgid "Unable to open lock directory: %s\n" -msgstr "Incapaz de abrir el fichero protegido %s\n" +msgstr "No se puede abrir el directorio bloqueado %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" -msgstr "Usar fuentes suavizadas" +msgstr "Usar suavizado de fuentes" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" -msgstr "Elegir el color de fondo" +msgstr "Establecer el color de fondo" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Ejecutar un comando al inicio" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" -msgstr "Establecer la fuente para la siguiente cadena" +msgstr "Establecer la fuente con la cadena siguiente" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" -msgstr "Líneas de desplazamiento hacia atras" +msgstr "Desplazar líneas hacia atrás" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" -msgstr "Usar Barra de desplazamiento" +msgstr "Usar barra de desplazamiento" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Opacidad: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Imprimir la version y luego salir" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" -msgstr "Elegir el Directorio de Trabajo Inicial" +msgstr "Elegir el directorio de trabajo inicial" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" -msgstr "Elegir la Imagen de Fondo" +msgstr "Elegir la imagen de fondo" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" -msgstr "Mostrar Asistente de Configuración" +msgstr "Mostrar el asistente de configuración" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -568,239 +687,279 @@ "\n" "Error message: %s\n" msgstr "" -"Error interpretando las opciones de línea de comando. Pruebe con \"tilda --" -"help\"\n" +"Error procesando las opciones de línea de comandos. Pruebe con \"tilda --help" +"\"\n" "para ver todas las opciones posibles.\n" "\n" "Mensaje de error: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" -msgstr "" +msgstr "Crear directorio:'%s'\n" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" +"Encontrado style.css en el directorio de configuración del usuario, " +"aplicando el estilo css del usuario.\n" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" -msgstr "" +msgstr "Migrando la antigua ruta de configuración a directorios XDG\n" -#: src/tilda.c:638 src/wizard.c:329 -#, fuzzy +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Mostrar la terminal\" es inválido. " +"Seleccione otro, por favor." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 #, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Problema procesando el comando personalizado: %s\n" + +#: src/tilda_terminal.c:446 +#, c-format msgid "Problem parsing custom command: %s\n" -msgstr "Problema analizando comando personalizado: %s\n" +msgstr "Problema procesando el comando personalizado: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 -#, fuzzy +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" -msgstr "En su lugar, ejecutando terminal predeterminado\n" +msgstr "Ejecutando la terminal predeterminada en su lugar\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" -msgstr "Incapaz de ejecutar el comando personalizado %s\n" +msgstr "No se puede ejecutar el comando personalizado %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" -msgstr "Incapaz de ejecutar el terminal predeterminado: %s\n" +msgstr "No se puede ejecutar la terminal predeterminada: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Nueva pestaña" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" -msgstr "" +msgstr "Alternar pantalla completa" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" -msgstr "Fallo al ejecutar el navegador web. El comando fue '%s'\n" +msgstr "Fallo al ejecutar el navegador web. El comando era '%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Tiene un tab_pos erróneo en su archivo de configuración\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" -msgstr "Incapaz de establecer el ícono de Tilda: %s\n" +msgstr "No se puede establecer el icono de Tilda: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" -msgstr "No hay memoria disponible, no se puede crear pestaña\n" +msgstr "No hay memoria disponible, no se puede crear la pestaña\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" -msgstr "" +msgstr "Consola Linux" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 -#, fuzzy, c-format +#: src/wizard.c:286 +#, c-format msgid "Tilda %d Config" -msgstr "Configuración de Tilda" +msgstr "Configuración %d de Tilda" -#: src/wizard.c:333 -#, fuzzy +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Añadir pestaña\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:335 -#, fuzzy +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Cerrar pestaña\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:337 -#, fuzzy +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Siguiente pestaña\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:339 -#, fuzzy +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Pestaña anterior\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:341 -#, fuzzy +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Mover pestaña a la izquierda\" es " +"inválido. Seleccione otro, por favor." -#: src/wizard.c:343 -#, fuzzy +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Mover pestaña a la derecha\" es " +"inválido. Seleccione otro, por favor." -#: src/wizard.c:345 -#, fuzzy +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Copiar\" es inválido. Seleccione " +"otro, por favor." -#: src/wizard.c:347 -#, fuzzy +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Pegar\" es inválido. Seleccione " +"otro, por favor." -#: src/wizard.c:349 -#, fuzzy +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Salir\" es inválido. Seleccione " +"otro, por favor." -#: src/wizard.c:351 -#, fuzzy +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 1\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:353 -#, fuzzy +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 2\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:355 -#, fuzzy +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 3\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:357 -#, fuzzy +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 4\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:359 -#, fuzzy +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 5\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:361 -#, fuzzy +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 6\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:363 -#, fuzzy +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 7\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:365 -#, fuzzy +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 8\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:367 -#, fuzzy +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 9\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:369 -#, fuzzy +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." -msgstr "El atajo de teclado que definió es inválido. Seleccione otro." +msgstr "" +"El atajo de teclado que ha elegido para \"Ir a la pestaña 10\" es inválido. " +"Seleccione otro, por favor." -#: src/wizard.c:819 -#, fuzzy +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"El atajo de teclado que ha elegido para \"Alternar pantalla completa\" es " +"inválido. Seleccione otro, por favor." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" -msgstr "Configuración del tab position errónea, ignorando.\n" +msgstr "Posición no válida para la pestaña, se ignora\n" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "Introduzca el atajo de teclado" + +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Problema al procesar el fichero de configuración\n" #~ msgid "" #~ "Top\n" @@ -855,21 +1014,9 @@ #~ "A la derecha\n" #~ "Deshabilitado" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Secuencia de escape\n" -#~ "Control-H" - #~ msgid "Key Binding" #~ msgstr "Atajo de teclado" #, fuzzy #~ msgid "Grab Keybinding" #~ msgstr "Guardar atajos de teclado" - -#~ msgid "gtk-close" -#~ msgstr "Cerrar gtk" diff -Nru tilda-1.1.12/po/fr.po tilda-1.2.2/po/fr.po --- tilda-1.1.12/po/fr.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/fr.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-03-10 22:11+0000\n" "Last-Translator: François Boulogne \n" "Language-Team: French \n" @@ -18,150 +18,286 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Fermer l'onglet" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Titre initial :" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "Personnalisé" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"Suppression ASCII\n" +"Séquence d'échappement\n" +"Ctrl-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Configuration de Tilda" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Activer le Double Buffering" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Démarrer Tilda caché" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Toujours en avant plan" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Afficher sur tous les espaces de travail" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Ne pas afficher dans la barre des tâches" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Afficher les contours de la fenêtre" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Affichage de la fenêtre" -#: tilda.glade:464 +#: src/tilda.ui:531 #, fuzzy msgid "Cursor Blinks" msgstr "Curseur clignotant" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Affichage du terminal" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Activer l'Antialiasing" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Autoriser le texte en gras" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Position des onglets :" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Police :" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Police de caractères" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "Masquer Tilda lorsque le pointeur le quitte" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "Délais de masquage automatique" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "Masquer lorsque Tilda perd le focus" -#: tilda.glade:749 +#: src/tilda.ui:816 msgid "Auto Hide" msgstr "Masquage automatique" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Position" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Généralités" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "Sélectionner par mots" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Navigateur Web" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "Traitement des URL" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Titre initial :" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Titre paramétré dynamiquement :" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Titre" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Exécuter une commande personnalisée au lieu du terminal" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Commande personnalisée :" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Lorsque la commande se termine :" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Commande" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,167 +305,172 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Titre et commande" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Pourcentage" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "En pixels" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Hauteur" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Largeur" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Centré horizontalement" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Centré verticalement" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Position X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Position Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Position" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Activer la transparence" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Degré de transparence" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Arrivée animée" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Utiliser une image d'arrière-plan" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Durée de l'animation (µsec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Orientation de l'animation" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Compléments" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Sélectionner par mots" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Apparence" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Couleur du texte" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Couleur d'arrière-plan" -#: tilda.glade:2040 +#: src/tilda.ui:2163 #, fuzzy msgid "Foreground and Background Colors" msgstr "Couleurs de premier et d'arrière plan" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "Palette de couleurs :" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 msgid "Palette" msgstr "Palette" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Couleurs" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "lignes" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "La barre de défilement est :" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Capacité de défilement :" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Faire défiler sur la sortie standard" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Faire défiler l'arrière-plan" -#: tilda.glade:2547 -msgid "lines" -msgstr "lignes" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Capacité de défilement :" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "La barre de défilement est :" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Défilement" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Défilement" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Compatibilité" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -341,114 +482,120 @@ "fonctionner certaines applications et systèmes d'exploitation qui attendent " "un comportement du terminal différent." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "La touche « _Suppr » émet :" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "La touche « _Retour arrière » émet :" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "_Réinitialiser les options de compatibilité aux valeurs par défaut" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Compatibilité" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 msgid "Paste" msgstr "Coller" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "Aller à l'onglet suivant" -#: tilda.glade:2949 +#: src/tilda.ui:3078 msgid "Quit" msgstr "Quitter" -#: tilda.glade:2987 +#: src/tilda.ui:3116 msgid "Add Tab" msgstr "Ajouter un onglet" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "Aller à l'onglet 10" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "Aller à l'onglet 5" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "Aller à l'onglet 4" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "Aller à l'onglet 3" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "Aller à l'onglet 2" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "Aller à l'onglet 1" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "Aller à l'onglet précédent" -#: tilda.glade:3296 +#: src/tilda.ui:3425 msgid "Close Tab" msgstr "Fermer l'onglet" -#: tilda.glade:3336 +#: src/tilda.ui:3465 msgid "Copy" msgstr "Copier" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Affichage du terminal" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "Aller à l'onglet 6" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "Aller à l'onglet 7" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "Aller à l'onglet 8" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "Aller à l'onglet 9" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Fermer l'onglet" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Hauteur" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +#, fuzzy +msgid "Toggle Fullscreen" +msgstr "Passer en mode plein écran" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Raccourcis clavier" @@ -461,88 +608,83 @@ msgstr "" "Mauvaise valeur pour \"d_set_title\" dans le fichier de configuration\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Problème lors de l'analyse du fichier de configuration\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Problème lors de l'analyse du fichier de configuration\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Impossible d'enregistrer le fichier de configuration sur le disque\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Ne peut pas fermer le fichier de configuration\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Ne peut pas écrire le fichier de configuration dans %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Impossible d'exécuter la commande : '%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Utiliser des polices antialiasées" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Paramètrer la couleur de fond" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Lancer une commande au démarrage" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Paramètrer la police à la chaine de caractères suivante" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Lignes d'historique" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Utiliser la barre de défilement" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Opacité : 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Renvoyer la version, puis quitter" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Paramètrer le dossier de travail initial" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Paramètrer l'image de fond" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Montrer l'outil de configuration" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -555,21 +697,21 @@ "\n" "Message d'erreur : %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " @@ -578,83 +720,84 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Impossible de lancer la commande personnalisée : %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Nouvel onglet" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Fermer l'onglet" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "Passer en mode plein écran" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Echec du lancement du navigateur web. La commande était `%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" "Vous avez un mauvais positionnement des onglets dans votre fichier de " "configuration\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Ne peut pas paramétrer l'icône de tilda : %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Plus de mémoire, ne peut pas créer l'onglet\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "Tango" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "Xterm" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "Rxvt" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." @@ -662,7 +805,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." @@ -670,7 +813,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." @@ -678,7 +821,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " @@ -687,7 +830,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " @@ -696,7 +839,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " @@ -705,7 +848,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." @@ -713,7 +856,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." @@ -721,7 +864,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." @@ -729,7 +872,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " @@ -738,7 +881,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " @@ -747,7 +890,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " @@ -756,7 +899,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " @@ -765,7 +908,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " @@ -774,7 +917,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " @@ -783,7 +926,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " @@ -792,7 +935,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " @@ -801,7 +944,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " @@ -810,7 +953,7 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " @@ -819,10 +962,31 @@ "Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " "choisissez en un autre." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"Le raccourcis clavier que vous avez choisi est invalide. S'il-vous-plaît, " +"choisissez en un autre." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Problème lors de l'analyse du fichier de configuration\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -865,9 +1029,6 @@ #~ "Noir sur blanc\n" #~ "Blanc sur noir" -#~ msgid "Custom" -#~ msgstr "Personnalisé" - #~ msgid "" #~ "On the Left\n" #~ "On the Right\n" @@ -877,15 +1038,6 @@ #~ "À droite\n" #~ "Désactivé" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "Suppression ASCII\n" -#~ "Séquence d'échappement\n" -#~ "Ctrl-H" - #, fuzzy #~ msgid "Key Binding" #~ msgstr "Raccourci Clavier" diff -Nru tilda-1.1.12/po/hu.po tilda-1.2.2/po/hu.po --- tilda-1.1.12/po/hu.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/hu.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-03-05 00:28+0000\n" "Last-Translator: Pittmann Tamás \n" "Language-Team: Hungarian \n" @@ -18,150 +18,288 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "Fül _bezárása" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Hangos terminál csengő" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Ablakcím induláskor:" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Nem tudom elindítani az alapértelmezett héjat: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"Escape sorozat\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Tilda Beállítás" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Dupla gyorstár engedélyezése" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Tilda indítása rejtve" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Mindig felül" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Minden munkaterületen megjelenjen" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Ne jelenjen meg a feladatlistában" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Keret megjelenítése" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Ablak beállítások" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Villogó kurzor" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Hangos terminál csengő" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Terminál beállítások" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Élsimítás bekapcsolása" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Félkövér szöveg engedélyezése" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Fülek helye" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Betűkészlet:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Betűkészlet" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Cím" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Elhelyezés" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Általános" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Webböngésző" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "URL kezelés" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Ablakcím induláskor:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Dinamikus ablakcím:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Cím" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Héj helyett saját parancs futtatása" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Saját parancs:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Parancs befejeződésekor:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Parancs" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,168 +307,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Cím és parancs" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Százalék" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "Képpont" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Magasság" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Szélesség" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Vizszintesen középre" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Függőlegesen középre" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "X pozíció" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Y pozíció" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Elhelyezés" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Átlátszóság engedélyezése" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Átlátszóság szintje:" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animált lenyitás" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Kép használata háttérként" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Animáció késleltetése (usec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Animáció iránya" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extrák" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Cím" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Megjelenés" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Beépített színsémák" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Szövegszín" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Háttérszín" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Előtér és háttérszínek" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "Beépített színsémák" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Cím" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Színek" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "sor" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Görgetősáv helye:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Visszagörgethető sorok száma" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Görgetés kiíráskor" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Görgetés billentyű leütésre" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Háttér görgetése" -#: tilda.glade:2547 -msgid "lines" -msgstr "sor" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Visszagörgethető sorok száma" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Görgetősáv helye:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Görgetés" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Görgetés" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Kompatibilitás" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -343,119 +486,124 @@ "együttműködését, amelyek más igényeket támasztanak a terminállal szemben." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "A _Delete billentyű által küldött kód:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "A _Backspace billentyű által küldött kód:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "_Kompatibilitási beállítások alapértelmezettre állítása" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Kompatibilitás" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Cím" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Cím" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Cím" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "Fül _bezárása" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Betűkészlet" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Terminálnyitó gyorsbillentyű" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Fül _bezárása" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Magasság" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Gyorsbillentyű" @@ -467,88 +615,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Hibás érték a konfigfájlban itt: \"d_set_title\"\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Hiba a konfigfájlban.\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Hiba a konfigfájlban.\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Nem tudom elvégezni a konfigfájl szinkronizálását.\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Nem tudom bezárni a konfigfájlt.\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Nem tudom írni a konfigfájlt: %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "A '%s' parancs futtatása nem sikerült\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Nem tudom megnyitni a zárolási könyvtárat :%s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Élsimított betűkészletek használata" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Háttérszín beállítása" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Parancs futtatása induláskor" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Betűkészlet beállítása erre a karakterláncra" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Visszagördíthető sorok száma" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Görgetősáv használata" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Átlátszóság: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Verzió kiírása és kilépés" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Kezdő munkakönyvtár beállítása" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Háttérkép beállítása" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Indítás konfigurációs ablakkal" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -560,232 +703,252 @@ "\n" "Hiba: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Parancs értelmezési hiba: %s\n" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "Parancs értelmezési hiba: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Helyette indítom az alapértelmezett héjat.\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Nem tudom elindítani a megadott felhasználói parancsot: %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "Nem tudom elindítani az alapértelmezett héjat: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "Új _fül" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "Fül _bezárása" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Nem tudtam elindítani a böngészőt, parancs: %s\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "A konfigfájlban hibás a fülek pozíciója\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Nem tudom a tilda ikonját beállítani: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Elfogyott a memória. a fül nem hozható létre\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Tilda Beállítás" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "A választott gyorsbillentyű érvénytelen. Válasszon másikat." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Érvénytelen fülpozíció, figyelmen kívül lesz hagyva\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Hiba a konfigfájlban.\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -837,18 +1000,6 @@ #~ "Jobbra\n" #~ "Letiltva" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Escape sorozat\n" -#~ "Control-H" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - #~ msgid "Key Binding" #~ msgstr "Gyorsbillentyű" diff -Nru tilda-1.1.12/po/it.po tilda-1.2.2/po/it.po --- tilda-1.1.12/po/it.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/it.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2010-08-22 18:58+0000\n" "Last-Translator: Davide Truffa \n" "Language-Team: Italian \n" @@ -18,150 +18,291 @@ "X-Launchpad-Export-Date: 2010-08-23 16:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Chiudi scheda" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Avviso acustico" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Titolo iniziale:" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Impossibile eseguire la shell predefinita: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "Personalizzata" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"Carattere ASCII DEL\n" +"Sequenza di Escape\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Configurazione di Tilda" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Abilita Double Buffering" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Lancia Tilda nascosta" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Sempre in primo piano" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Mostra su tutti gli schermi" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Non mostrare nella barra dei task" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Mostra bordo nelle schede" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Finestra" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Cursore intermittente" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Avviso acustico" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Terminale" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Abilita Antialiasing" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Consentire il testo in grassetto" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Posizione delle schede:" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Carattere:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Carattere" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "Nascondi tilda all'uscita del mouse" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "Ritardo scomparsa automatica:" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "Nascondi tilda alla perdita del focus" -#: tilda.glade:749 +#: src/tilda.ui:816 msgid "Auto Hide" msgstr "Scomparsa Automatica" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Posizione" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +#, fuzzy +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" +"Nota: colori disponibili per le applicazioni da terminale." -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Generale" -#: tilda.glade:913 +#: src/tilda.ui:982 #, fuzzy msgid "Word Characters:" msgstr "Caratteri selezionabili come parola" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "Seleziona Parole" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Browser web" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "Gestione URL" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Titolo iniziale:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Titolo impostato dinamicamente:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Titolo" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Esegui un comando personalizzato al posto della shell" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Comando Personalizzato:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Comando personalizzato:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Comando" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,108 +310,108 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Titolo e comando" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Percentuale" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "In pixel" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Altezza" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Larghezza" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Centra orizzontalmente" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Centra verticalmente" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Posizione orizzontale" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Posizione verticale" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Posizione" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Abilitare la trasparenza" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Livello di trasparenza" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Comparsa animata" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Usa un'immagine per lo sfondo" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Durata dell'animazione (usec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Direzione dell'animazione" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extra" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Seleziona Parole" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Aspetto" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Schemi incorporati" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Colore del testo" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Colore di sfondo" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Primo piano e sfondo" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." @@ -278,59 +419,64 @@ "Nota: colori disponibili per le applicazioni da terminale." -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "Tavolozza dei colori:" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "Schemi incorporati" -#: tilda.glade:2423 +#: src/tilda.ui:2546 msgid "Palette" msgstr "Tavolozza" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Colori" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "righe" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Barra di scorrimento:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Scorrimento all'indietro:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Scorrere in presenza di output" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Scorrere alla pressione dei tasti" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Scorrere in background" -#: tilda.glade:2547 -msgid "lines" -msgstr "righe" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Scorrimento all'indietro:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Barra di scorrimento:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Scorrimento" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Scorrimento" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Compatibilità" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -342,113 +488,119 @@ "applicazioni e sistemi operativi che si aspettano un diverso funzionamento " "del terminale." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "Il tasto «_Canc» genera:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "Il tasto «_Backspace» genera:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "_Ripristina valori predefiniti per opzioni di compatibilità" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Compatibilità" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr " " -#: tilda.glade:2871 +#: src/tilda.ui:3000 msgid "Paste" msgstr "Incolla" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "Vai alla scheda sucessiva" -#: tilda.glade:2949 +#: src/tilda.ui:3078 msgid "Quit" msgstr "Esci" -#: tilda.glade:2987 +#: src/tilda.ui:3116 msgid "Add Tab" msgstr "Nuova scheda" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "Vai alla scheda 10" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "Vai alla scheda 5" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "Vai alla scheda 4" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "Vai alla scheda 3" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "Vai alla scheda 3" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "Vai alla scheda 1" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "Vai alla scheda precedente" -#: tilda.glade:3296 +#: src/tilda.ui:3425 msgid "Close Tab" msgstr "Chiudi scheda" -#: tilda.glade:3336 +#: src/tilda.ui:3465 msgid "Copy" msgstr "Copia" -#: tilda.glade:3374 +#: src/tilda.ui:3503 msgid "Pull Down Terminal" msgstr "Comparsa terminale" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "Vai alla scheda 6" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "Vai alla scheda 7" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "Vai alla scheda 8" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "Vai alla scheda 9" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Chiudi scheda" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Altezza" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +#, fuzzy +msgid "Toggle Fullscreen" +msgstr "Schermo Intero" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Scorciatoie da tastiera" @@ -460,88 +612,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Valore errato \"d_set_title\" nel file di configurazione\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Problemi analizzando il file di configurazione\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Problemi analizzando il file di configurazione\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Impossibile aggiornare il file di configurazione su disco\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Impossibile chiudere il file di configurazione\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Impossibile scrivere il file di configurazione in %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Impossibile avviare il comando: `%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Impossibile aprire la directory di lock: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Abilita l'Antialiasing per i caratteri" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Imposta il colore di sfondo" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Esegui un comando all'avvio" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Imposta il carattere alla seguente stringa" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Linee di scorrimento" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Abilita barra di scorrimento" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Opacità: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Mostra numero di versione ed esce" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Imposta directory iniziale" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Imposta immagine di sfondo" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Mostra wizard di configurazione" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -554,21 +701,21 @@ "\n" "Messaggio di errore: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." @@ -576,102 +723,103 @@ "La scorciatoia da tastiera scelta per \"Comparsa terminale\" non è valida. " "Selezionarne un'altra." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Problemi analizzando il comando personalizzato: %s\n" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "Problemi analizzando il comando personalizzato: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Avvio della shell predefinita\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Impossibile avviare il comando personalizzato: %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "Impossibile eseguire la shell predefinita: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Nuova scheda" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "Schermo Intero" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Impossibile avviare il browser web tramite il comando: `%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Valore errato \"tab_pos\" nel file di configurazione\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Impossibile impostare l'icona di Tilda: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Memoria insufficiente, non posso creare la scheda\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "Tango" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "Console Linux" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "XTerm" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "Rxvt" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "Configurazione di di Tilda - Sessione %d" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" "La scorciatoia da tastiera scelta per \"Aggiungi scheda\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" "La scorciatoia da tastiera scelta per \"Chiudi scheda\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" "La scorciatoia da tastiera scelta per \"Scheda successiva\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." @@ -679,7 +827,7 @@ "La scorciatoia da tastiera scelta per \"Scheda precedente\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " @@ -688,7 +836,7 @@ "La scorciatoia da tastiera scelta per \"Chiudi scheda\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " @@ -697,28 +845,28 @@ "La scorciatoia da tastiera scelta per \"Chiudi scheda\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" "La scorciatoia da tastiera scelta per \"Copia\" non è valida. Selezionarne " "un'altra." -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" "La scorciatoia da tastiera scelta per \"Incolla\" non è valida. Selezionarne " "un'altra." -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" "La scorciatoia da tastiera scelta per \"Esci\" non è valida. Selezionarne " "un'altra." -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." @@ -726,7 +874,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 1\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." @@ -734,7 +882,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 2\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." @@ -742,7 +890,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 3\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." @@ -750,7 +898,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 4\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." @@ -758,7 +906,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 5\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." @@ -766,7 +914,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 6\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." @@ -774,7 +922,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 7\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." @@ -782,7 +930,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 8\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." @@ -790,7 +938,7 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 9\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." @@ -798,10 +946,31 @@ "La scorciatoia da tastiera scelta per \"Vai alla scheda 10\" non è valida. " "Selezionarne un'altra." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"La scorciatoia da tastiera scelta per \"Incolla\" non è valida. Selezionarne " +"un'altra." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Posizionamento delle schede non valido, verrà ignorato\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Problemi analizzando il file di configurazione\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -844,9 +1013,6 @@ #~ "Nero su bianco\n" #~ "Bianco su nero" -#~ msgid "Custom" -#~ msgstr "Personalizzata" - #~ msgid "" #~ "On the Left\n" #~ "On the Right\n" @@ -855,12 +1021,3 @@ #~ "A sinistra\n" #~ "A destra\n" #~ "Disabilitata" - -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "Carattere ASCII DEL\n" -#~ "Sequenza di Escape\n" -#~ "Control-H" diff -Nru tilda-1.1.12/po/LINGUAS tilda-1.2.2/po/LINGUAS --- tilda-1.1.12/po/LINGUAS 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/LINGUAS 2014-10-28 11:36:24.000000000 +0000 @@ -1,3 +1,4 @@ +bg ca cs de @@ -7,6 +8,7 @@ fr hu it +lt pl pt pt_BR diff -Nru tilda-1.1.12/po/lt.po tilda-1.2.2/po/lt.po --- tilda-1.1.12/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/po/lt.po 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,1010 @@ +msgid "" +msgstr "" +"Project-Id-Version: tilda\n" +"Report-Msgid-Bugs-To: sloutri@iit.edu\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" +"PO-Revision-Date: 2014-06-16 09:53+0200\n" +"Last-Translator: Algimantas Margevičius \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" +"X-Launchpad-Export-Date: 2012-08-07 14:16+0000\n" +"X-Generator: Poedit 1.6.5\n" + +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "Užverti tilda" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "Atverti naują terminalą" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "Atverti naują terminalą ir paslėpti" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "Viršus" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "Apačioje" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "Kairėje" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "Dešinėje" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Išeiti iš terminalo" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "Nerodoma" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "Po pradinės antraštės" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "Prieš pradinę antraštę" + +#: src/tilda.ui:132 +msgid "Replace initial title" +msgstr "Pakeisti pradinę antraštę" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "Rodyti pagrindiniame „shell“" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "Paleisti komandą iš naujo" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "Išeiti iš terminalo" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "Tinkintas" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "Žalia ant juodos" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "Juoda ant balto" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "Balta ant juodos" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "Zenburn" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "Išblukus spalva" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "Išblukus juoda" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "Kairėje" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "Dešinėje" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "Išjungtas" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "ASCII DEL" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "„Escape“ seka" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "Vald-H" + +#: src/tilda.ui:278 +msgid "Tilda Config" +msgstr "Tildos Konfigūracija" + +#: src/tilda.ui:355 +msgid "Enable Double Buffering" +msgstr "Įgalinti dvigubą buferį" + +#: src/tilda.ui:371 src/tilda.c:322 +msgid "Start Tilda hidden" +msgstr "Paleisti Tildą paslėptą" + +#: src/tilda.ui:387 +msgid "Always on top" +msgstr "Visada viršuje" + +#: src/tilda.ui:403 +msgid "Display on all workspaces" +msgstr "Rodyti visuose darbastaliuose" + +#: src/tilda.ui:419 +msgid "Do not show in taskbar" +msgstr "Nerodyti įrankių juostoje" + +#: src/tilda.ui:435 +msgid "Show Notebook Border" +msgstr "Rodyti kraštus" + +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 +msgid "Window Display" +msgstr "Lango rodymas" + +#: src/tilda.ui:531 +msgid "Cursor Blinks" +msgstr "Kursoriaus mirgėjimas" + +#: src/tilda.ui:547 +msgid "Audible Terminal Bell" +msgstr "Girdimas Terminalo Skambutis" + +#: src/tilda.ui:569 +msgid "Terminal Display" +msgstr "Terminalo rodymas" + +#: src/tilda.ui:625 +msgid "Enable Antialiasing" +msgstr "Įgalinti glodinimą" + +#: src/tilda.ui:641 +msgid "Allow Bold Text" +msgstr "Leisti paryškintą tekstą" + +#: src/tilda.ui:660 +msgid "Position of Tabs:" +msgstr "Kortelių pozicija:" + +#: src/tilda.ui:693 +msgid "Font:" +msgstr "Šriftas:" + +#: src/tilda.ui:710 +msgid "Font" +msgstr "Šriftas" + +#: src/tilda.ui:763 +msgid "Hide Tilda when mouse leaves it" +msgstr "Pelei palikus Tilda paslėpti" + +#: src/tilda.ui:783 +msgid "Auto Hide Delay:" +msgstr "Automatinio slėpimo delsa:" + +#: src/tilda.ui:794 +msgid "Hide when Tilda loses focus" +msgstr "Slėpti kai Tilda praranda fokusą" + +#: src/tilda.ui:816 +msgid "Auto Hide" +msgstr "Automatinis slėpimas" + +#: src/tilda.ui:858 +msgid "When last terminal is closed:" +msgstr "Užvėrus paskutinį terminalą:" + +#: src/tilda.ui:894 +msgid "Program Exit" +msgstr "Programos išėjimas" + +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." +msgstr "" +"Pastaba: Kai kurios parinktys įsigalios tik iš naujo " +"paleidus „tilda“." + +#: src/tilda.ui:933 +msgid "General" +msgstr "Bendra" + +#: src/tilda.ui:982 +msgid "Word Characters:" +msgstr "Žodžių simboliai:" + +#: src/tilda.ui:998 +msgid "Select by Word" +msgstr "Pasirinkti pagal žodį" + +#: src/tilda.ui:1049 +msgid "Web Browser *:" +msgstr "Naršyklė *:" + +#: src/tilda.ui:1065 +msgid "URL Handling" +msgstr "Adresų valdyklė" + +#: src/tilda.ui:1100 +msgid "Initial Title:" +msgstr "Terminalo pavadinimas" + +#: src/tilda.ui:1112 +msgid "Dynamically-set Title:" +msgstr "Dinamiškai nustatyti pavadinimą:" + +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "Riboti didžiausią leidžiamą kortelės pavadinimo ilgį:" + +#: src/tilda.ui:1200 +msgid "Title" +msgstr "Pavadinimas" + +#: src/tilda.ui:1230 +msgid "Run a custom command instead of the shell" +msgstr "Paleisti komandą vietoj Shell'o" + +#: src/tilda.ui:1247 +msgid "Custom Command:" +msgstr "Komanda:" + +#: src/tilda.ui:1261 +msgid "When Command Exits:" +msgstr "Kai komanda \"Exit\":" + +#: src/tilda.ui:1316 +msgid "Command" +msgstr "Komanda" + +#: src/tilda.ui:1354 +msgid "" +"* A valid command that can open a browser must be entered here. It is " +"possible to use the name of a specific browser such as 'firefox' and 'google-" +"chrome' or to use the generic commands 'x-www-browser' and 'xdg-open'. The " +"best command may be different depending on the system." +msgstr "" +"* Čia turi būti įvesta tinkama komanda kuri gali atverti naršyklę. Galima " +"naudoti programos pavadinimą pvz. „firefox“ ar „google-chrome“ ar tiesiog " +"bendrines komandas „x-www-browser“ ir „xdg-open“. Kiekvienai sistemai " +"geriausia komanda yra skirtinga." + +#: src/tilda.ui:1375 +msgid "Title and Command" +msgstr "Pavadinimas ir komanda" + +#: src/tilda.ui:1408 src/tilda.ui:1501 +msgid "Percentage" +msgstr "Procentais" + +#: src/tilda.ui:1435 src/tilda.ui:1514 +msgid "In Pixels" +msgstr "Taškais" + +#: src/tilda.ui:1467 +msgid "Height" +msgstr "Aukštis" + +#: src/tilda.ui:1560 +msgid "Width" +msgstr "Plotis" + +#: src/tilda.ui:1592 +msgid "Centered Horizontally" +msgstr "Centruotas horizontaliai" + +#: src/tilda.ui:1610 +msgid "Centered Vertically" +msgstr "Centruotas vertikaliai" + +#: src/tilda.ui:1632 src/tilda.c:329 +msgid "X Position" +msgstr "X padėtis" + +#: src/tilda.ui:1647 src/tilda.c:330 +msgid "Y Position" +msgstr "Y padėtis" + +#: src/tilda.ui:1699 +msgid "Position" +msgstr "Padėtis" + +#: src/tilda.ui:1734 +msgid "Enable Transparency" +msgstr "Įjungti permatomumą" + +#: src/tilda.ui:1752 +msgid "Level of Transparency" +msgstr "Permatomumo lygis" + +#: src/tilda.ui:1778 +msgid "Animated Pulldown" +msgstr "Animuotas nusileidimas" + +#: src/tilda.ui:1795 +msgid "Use Image for Background" +msgstr "Fonui naudoti paveikslėlį" + +#: src/tilda.ui:1815 +msgid "Animation Delay (usec)" +msgstr "Animacijos delsa (ms)" + +#: src/tilda.ui:1832 +msgid "Animation Orientation" +msgstr "Animacijos orientacija" + +#: src/tilda.ui:1905 +msgid "Extras" +msgstr "Papildomi" + +#: src/tilda.ui:1940 +msgid "Monitor:" +msgstr "Monitorius:" + +#: src/tilda.ui:2003 +msgid "Select monitor" +msgstr "Pasirinkite monitorių" + +#: src/tilda.ui:2023 +msgid "Appearance" +msgstr "Išvaizda" + +#: src/tilda.ui:2069 +msgid "Built-in Schemes" +msgstr "Esamos schemos" + +#: src/tilda.ui:2100 +msgid "Text Color" +msgstr "Teksto spalva" + +#: src/tilda.ui:2114 +msgid "Background Color" +msgstr "Fono spalva" + +#: src/tilda.ui:2163 +msgid "Foreground and Background Colors" +msgstr "Priekinio ir galinio fono spalvos " + +#: src/tilda.ui:2194 src/tilda.ui:2801 +msgid " " +msgstr " " + +#: src/tilda.ui:2215 +msgid "" +"Note: Terminal applications have these colors available to " +"them." +msgstr "" +"Pastaba: Terminalinėms programoms yra prieinamos šios " +"spalvos." + +#: src/tilda.ui:2502 +msgid "Color palette:" +msgstr "Spalvų paletė:" + +#: src/tilda.ui:2519 +msgid "Built-in schemes:" +msgstr "Esamos schemos:" + +#: src/tilda.ui:2546 +msgid "Palette" +msgstr "Paletė" + +#: src/tilda.ui:2568 +msgid "Colors" +msgstr "Spalvos" + +#: src/tilda.ui:2619 +msgid "lines" +msgstr "eilučių" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Slinkimo juosta yra:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Slinkimas:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 +msgid "Scroll on Output" +msgstr "Slinkti išvestyje" + +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" +msgstr "Slinkti paspaudus klavišą" + +#: src/tilda.ui:2720 +msgid "Scroll Background" +msgstr "Slinkti foną" + +#: src/tilda.ui:2744 +msgid "Scrolling" +msgstr "Slinkimas" + +#: src/tilda.ui:2766 +msgid "Scrolling" +msgstr "Slinkimas" + +#: src/tilda.ui:2784 +msgid "Compatibility" +msgstr "Suderinamumas" + +#: src/tilda.ui:2820 +msgid "" +"Note: These options may cause some applications to behave " +"incorrectly. They are only here to allow you to work around certain " +"applications and operating systems that expect different terminal behavior." +msgstr "" +"Pastaba: Dėl šių nuostatų kai kurios programos gali elgtis " +"nekorektiškai. Jos čia yra tik dėl to, kad būtų galima apeiti kai kurių " +"programų ir operacinių sistemų, kurios tikisi kitokio terminalo veikimo, " +"elgseną." + +#: src/tilda.ui:2843 +msgid "_Delete key generates:" +msgstr "„_Delete“ klavišas siunčia:" + +#: src/tilda.ui:2859 +msgid "_Backspace key generates:" +msgstr "„_Backspace“ klavišas siunčia:" + +#: src/tilda.ui:2922 +msgid "_Reset Compatibility Options to Defaults" +msgstr "_Atstatyti suderinamumo nustatymus į numatytuosius" + +#: src/tilda.ui:2959 +msgid "Compatibility" +msgstr "Suderinamumas" + +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 +msgid " " +msgstr " " + +#: src/tilda.ui:3000 +msgid "Paste" +msgstr "Įklijuoti" + +#: src/tilda.ui:3040 +msgid "Go To Next Tab" +msgstr "Eiti į sekančią kortelę" + +#: src/tilda.ui:3078 +msgid "Quit" +msgstr "Išeiti" + +#: src/tilda.ui:3116 +msgid "Add Tab" +msgstr "Pridėti kortelę" + +#: src/tilda.ui:3155 +msgid "Go To Tab 10" +msgstr "Eiti į kortelę 10" + +#: src/tilda.ui:3195 +msgid "Go To Tab 5" +msgstr "Eiti į kortelę 5" + +#: src/tilda.ui:3233 +msgid "Go To Tab 4" +msgstr "Eiti į kortelę 4" + +#: src/tilda.ui:3271 +msgid "Go To Tab 3" +msgstr "Eiti į kortelę 3" + +#: src/tilda.ui:3309 +msgid "Go To Tab 2" +msgstr "Eiti į kortelę 2" + +#: src/tilda.ui:3347 +msgid "Go To Tab 1" +msgstr "Eiti į kortelę 1" + +#: src/tilda.ui:3385 +msgid "Go To Previous Tab" +msgstr "Eiti į anstesnę kortelę" + +#: src/tilda.ui:3425 +msgid "Close Tab" +msgstr "Užverti kortelę" + +#: src/tilda.ui:3465 +msgid "Copy" +msgstr "Kopijuoti" + +#: src/tilda.ui:3503 +msgid "Pull Down Terminal" +msgstr "Išskleisti terminalą" + +#: src/tilda.ui:3539 +msgid "Go To Tab 6" +msgstr "Eiti į kortelę 6" + +#: src/tilda.ui:3579 +msgid "Go To Tab 7" +msgstr "Eiti į kortelę 7" + +#: src/tilda.ui:3619 +msgid "Go To Tab 8" +msgstr "Eiti į kortelę 8" + +#: src/tilda.ui:3659 +msgid "Go To Tab 9" +msgstr "Eiti į kortelę 9" + +#: src/tilda.ui:3699 +msgid "Move Tab Left" +msgstr "Perkelti kortelę kairėn" + +#: src/tilda.ui:3737 +msgid "Move Tab Right" +msgstr "Perkelti kortelę dešinėn" + +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "Perjungti viso ekrano veikseną" + +#: src/tilda.ui:3799 +msgid "Keybindings" +msgstr "Klavišų susaistymai" + +#: src/callback_func.c:53 +msgid "Untitled" +msgstr "Be pavadinimo" + +#: src/callback_func.c:71 +msgid "Bad value for \"d_set_title\" in config file\n" +msgstr "Bloga reikšmė \"d_set_title\" konfigūracijos faile\n" + +#: src/configsys.c:199 +msgid "Problem when opening config file\n" +msgstr "Klaida atveriant konfigūracijos failą\n" + +#: src/configsys.c:203 +msgid "An unexpected error occured while parsing the config file\n" +msgstr "Apdorojant konfigūracijos failą įvyko nežinoma klaida\n" + +#: src/configsys.c:371 +msgid "Unable to sync the config file to disk\n" +msgstr "Negalima sinchronizuoti konfiguravimo failo\n" + +#: src/configsys.c:381 +msgid "Unable to close the config file\n" +msgstr "Negalima užverti konfigūravimo failo\n" + +#: src/configsys.c:390 +#, c-format +msgid "Unable to write the config file to %s\n" +msgstr "Negalima įrašyti į konfigūravimo failą %s\n" + +#: src/tilda.c:216 +#, c-format +msgid "Unable to run command: `%s'\n" +msgstr "Negalima paleisit komandos: `%s'\n" + +#: src/tilda.c:255 src/tilda.c:492 +#, c-format +msgid "Unable to open lock directory: %s\n" +msgstr "Negalima atidaryti užrakinto katalogo: %s\n" + +#: src/tilda.c:319 +msgid "Use Antialiased Fonts" +msgstr "Naudoti šriftus su taškine korekcija" + +#: src/tilda.c:320 +msgid "Set the background color" +msgstr "Nustatyti fono spalvą" + +#: src/tilda.c:321 +msgid "Run a command at startup" +msgstr "Paleisti komandą pasileidus" + +#: src/tilda.c:323 +msgid "Set the font to the following string" +msgstr "Nustatyti šriftą sekančiai eilutei" + +#: src/tilda.c:324 +msgid "Scrollback Lines" +msgstr "Slinkimo eilutės" + +#: src/tilda.c:325 +msgid "Use Scrollbar" +msgstr "Naudoti slankjuostę" + +#: src/tilda.c:326 +msgid "Opaqueness: 0-100%" +msgstr "Neskaidrumas: 0-100%" + +#: src/tilda.c:327 +msgid "Print the version, then exit" +msgstr "Parodyti versiją, tada išeiti" + +#: src/tilda.c:328 +msgid "Set Initial Working Directory" +msgstr "Nustatyti pradinį darbo katalogą" + +#: src/tilda.c:331 +msgid "Set Background Image" +msgstr "Nustatyti fono paveikslėlį" + +#: src/tilda.c:332 +msgid "Show Configuration Wizard" +msgstr "Rodyti konfiguravimo vediklį" + +#: src/tilda.c:348 +#, c-format +msgid "" +"Error parsing command-line options. Try \"tilda --help\"\n" +"to see all possible options.\n" +"\n" +"Error message: %s\n" +msgstr "" +"Klaida komandinės eilutės nuostatose. Pabandykite \"tilda --help\"\n" +"kad pamatytumėte visas galimas nuostatas.\n" +"\n" +"Klaidos žinutė: %s\n" + +#: src/tilda.c:445 +#, c-format +msgid "Creating directory:'%s'\n" +msgstr "Kuriamas aplankas: „%s“\n" + +#: src/tilda.c:560 +msgid "" +"Found style.css in the user config directory, applying user css style.\n" +msgstr "" +"Naudotojo konfigūracijos aplanke rasta „style.css“, pritaikomas naudotojo " +"stilius.\n" + +#: src/tilda.c:591 +msgid "Migrating old config path to XDG folders\n" +msgstr "Perkeliamas senas konfigūracijos kelias į XDG aplankus\n" + +#: src/tilda.c:717 src/wizard.c:370 +msgid "" +"The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " +"choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Išskleisti terminalą“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Klaida analizuojant komandą: %s\n" + +#: src/tilda_terminal.c:446 +#, c-format +msgid "Problem parsing custom command: %s\n" +msgstr "Klaida analizuojant komandą: %s\n" + +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 +msgid "Launching default shell instead\n" +msgstr "Paleisti numatytąją konsolę vietoj\n" + +#: src/tilda_terminal.c:475 +#, c-format +msgid "Unable to launch custom command: %s\n" +msgstr "Nepavyko paleisti komandos: %s\n" + +#: src/tilda_terminal.c:530 +#, c-format +msgid "Unable to launch default shell: %s\n" +msgstr "Negalima paleisti numatytosios konsolės: %s\n" + +#: src/tilda_terminal.c:818 +msgid "_New Tab" +msgstr "_Nauja kortelė" + +#: src/tilda_terminal.c:822 +msgid "_Close Tab" +msgstr "_Užverti kortelę" + +#: src/tilda_terminal.c:834 +msgid "Toggle fullscreen" +msgstr "Perjungti viso ekrano veikseną" + +#: src/tilda_terminal.c:930 +#, c-format +msgid "Failed to launch the web browser. The command was `%s'\n" +msgstr "Nepavyko paleisti interneto naršyklės. Komanda buvo `%s'\n" + +#: src/tilda_window.c:101 +msgid "You have a bad tab_pos in your configuration file\n" +msgstr "Jūs turite blogai nustatytą tab_pos konfigūracijos faile\n" + +#: src/tilda_window.c:509 +#, c-format +msgid "Unable to set tilda's icon: %s\n" +msgstr "Negalima nustatyti Tildos piktogramos: %s\n" + +#: src/tilda_window.c:695 +msgid "Out of memory, cannot create tab\n" +msgstr "Trūksta atminties, negalima sukurti kortelės\n" + +#: src/wizard.c:189 +msgid "Tango" +msgstr "Tango" + +#: src/wizard.c:190 +msgid "Linux console" +msgstr "Linux konsolė" + +#: src/wizard.c:191 +msgid "XTerm" +msgstr "XTerm" + +#: src/wizard.c:192 +msgid "Rxvt" +msgstr "Rxvt" + +#: src/wizard.c:286 +#, c-format +msgid "Tilda %d Config" +msgstr "Tildos %d konfigūracija" + +#: src/wizard.c:374 +msgid "" +"The keybinding you chose for \"Add Tab\" is invalid. Please choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Pridėti kortelę“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/wizard.c:376 +msgid "" +"The keybinding you chose for \"Close Tab\" is invalid. Please choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Užverti kortelę“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/wizard.c:378 +msgid "" +"The keybinding you chose for \"Next Tab\" is invalid. Please choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Sekanti kortelė“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/wizard.c:380 +msgid "" +"The keybinding you chose for \"Previous Tab\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Ankstesnė kortelė“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/wizard.c:382 +msgid "" +"The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Perkelti kortelę į kairę“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/wizard.c:384 +msgid "" +"The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Perkelti kortelę į dešinę“ yra " +"netinkamas. Pasirinkite kitą." + +#: src/wizard.c:386 +msgid "" +"The keybinding you chose for \"Copy\" is invalid. Please choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Kopijuoti“ yra netinkamas. " +"Pasirinkite kitą." + +#: src/wizard.c:388 +msgid "" +"The keybinding you chose for \"Paste\" is invalid. Please choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Įklijuoti“ yra netinkamas. " +"Pasirinkite kitą." + +#: src/wizard.c:390 +msgid "" +"The keybinding you chose for \"Quit\" is invalid. Please choose another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Išeiti“ yra netinkamas. " +"Pasirinkite kitą." + +#: src/wizard.c:392 +msgid "" +"The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 1“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:394 +msgid "" +"The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 2“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:396 +msgid "" +"The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 3“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:398 +msgid "" +"The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 4“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:400 +msgid "" +"The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 5“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:402 +msgid "" +"The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 6“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:404 +msgid "" +"The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 7“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:406 +msgid "" +"The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 8“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:408 +msgid "" +"The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 9“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:410 +msgid "" +"The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišo susiejimas skirtas „Eiti į kortelę 10“ yra " +"netinkamass. Pasirinkite kitą." + +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"Jūsų pasirinktas klavišų susiejimas skirtas „Perjungti viso ekrano veikseną“ " +"yra netinkamas. Pasirinkite kitą." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 +msgid "Invalid tab position setting, ignoring\n" +msgstr "Neteisinga kortelės pozicijos nuostata, ignoruojama\n" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "Įveskite klaviatūros greitąjį klavišą" + +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Apdorojant konfigūracijos failą įvyko klaida\n" + +#~ msgid "" +#~ "Custom\n" +#~ "Green on Black\n" +#~ "Black on White\n" +#~ "White on Black" +#~ msgstr "" +#~ "Pasirinktinai\n" +#~ "Žaliai ant Juodo\n" +#~ "Juodai ant Balto\n" +#~ "Baltai ant Juodo" + +#~ msgid "Grab Keybinding" +#~ msgstr "Nustatyti susaistymą" + +#~ msgid "" +#~ "Hold the terminal open\n" +#~ "Restart the command\n" +#~ "Exit the terminal" +#~ msgstr "" +#~ "Laikyti terminalą atvertą\n" +#~ "Pakartoti komandą\n" +#~ "Išeiti iš teminalo" + +#~ msgid "" +#~ "Isn't displayed\n" +#~ "Goes after initial title\n" +#~ "Goes before initial title\n" +#~ "Replace initial title" +#~ msgstr "" +#~ "Nebuvo rodomas\n" +#~ "Eina po pradinio pavadinimo\n" +#~ "Eina prieš pradinį pavadinimą\n" +#~ "Pakeiskite pradinį pavadinimą" + +#~ msgid "Key Binding" +#~ msgstr "Klavišo susaistymas" + +#~ msgid "" +#~ "On the Left\n" +#~ "On the Right\n" +#~ "Disabled" +#~ msgstr "" +#~ "Kairėje\n" +#~ "Dešinėje\n" +#~ "Išjungta" + +#~ msgid "" +#~ "Top\n" +#~ "Bottom\n" +#~ "Left\n" +#~ "Right" +#~ msgstr "" +#~ "Viršus\n" +#~ "Apačia\n" +#~ "Kairė\n" +#~ "Dešinė" diff -Nru tilda-1.1.12/po/Makevars tilda-1.2.2/po/Makevars --- tilda-1.1.12/po/Makevars 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/Makevars 2014-10-28 11:36:24.000000000 +0000 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=col # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff -Nru tilda-1.1.12/po/pl.po tilda-1.2.2/po/pl.po --- tilda-1.1.12/po/pl.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/pl.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-03-06 00:10+0000\n" "Last-Translator: Maciej Habant \n" "Language-Team: Polish \n" @@ -18,153 +18,291 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Zamknij kartę" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Głośny dzwonek terminala" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Początkowy tytuł" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Nie można uruchomić domyślnej powłoki: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"Sekwencja sterująca\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 #, fuzzy msgid "Tilda Config" msgstr "Konfiguracja" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Włącz podwójne buforowanie" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Uruchamiaj Tildę ukrytą" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Zawsze na wierzchu" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Wyświetlaj na wszystkich obszarach roboczych" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Nie pokazuj na pasku zadań" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Pokaż obramowanie" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 #, fuzzy msgid "Window Display" msgstr "Ekran Okna" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Mruganie kursora" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Głośny dzwonek terminala" -#: tilda.glade:502 +#: src/tilda.ui:569 #, fuzzy msgid "Terminal Display" msgstr "Ekran Terminalu" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Włącz antyaliasing" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Pozwól na pogrubioną czcionkę" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Czcionka:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Czcionka" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Tytuł" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Pozycja" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Ogólne" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Przeglądarka WWW" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "Obsługa URLi" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Początkowy tytuł" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Dynamicznie ustawiony tytuł" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Tytuł" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Uruchom własne plecenie zamiast powłoki" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Własne polecenie:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Polecenie" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -172,169 +310,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Tytuł i polecenie" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Procent" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "W pikselach" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Wysokość" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Szerokość" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Wyśrodkowanie poziome" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Wyśrodkowanie pionowe" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Pozycja X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Pozycja Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Pozycja" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Włącz przezroczystość" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Poziom przezroczystości" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animowane rozwijanie" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Użyj obrazu jako tła" -#: tilda.glade:1692 +#: src/tilda.ui:1815 #, fuzzy msgid "Animation Delay (usec)" msgstr "Opóźnienie animacji (milisekundy)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Orientacja animacji" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Dodatkowe" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Tytuł" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Wygląd" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Wbudowane schematy" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Kolor tekstu" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Kolor tła" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "Wbudowane schematy" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Tytuł" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Kolory" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "wiersze" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Pasek przewijania jest:" + +#: src/tilda.ui:2669 +msgid "Limit scrollback to:" +msgstr "" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Przewijaj po naciśnięciu klawisza" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Przewijaj tło" -#: tilda.glade:2547 -msgid "lines" -msgstr "wiersze" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Pasek przewijania jest:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Przewijanie" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Przewijanie" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Kompatybilność" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -346,119 +488,124 @@ "z pewnymi aplikacjami i systemami operacyjnymi, które oczekują innego " "zachowania terminala." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "Klawisz _Delete generuje:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "Klawisz _Backspace generuje:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "Przywróć _domyślne wartości opcji zgodności" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Kompatybilność" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Tytuł" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Tytuł" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Tytuł" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "_Zamknij kartę" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Czcionka" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Ekran Terminalu" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "_Zamknij kartę" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Wysokość" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Skróty klawiszowe" @@ -471,90 +618,85 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Zła wartość \"d_set_title\" w pliku konfiguracyjnym\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Problem przy parsowaniu pliku konfiguracyjnego\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Problem przy parsowaniu pliku konfiguracyjnego\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Nie można zamknąć pliku konfiguracyjnego\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Nie można zapisać pliku konfiguracyjnego do %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Nie można wykonać polecenia: `%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Włącz anti-aliasing czcionek" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Ustaw kolor tła" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Wykonaj polecenie przy starcie" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Ustaw czcionkę do następującego ciągu" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Ilość przewijanych wierszy" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Włącz pasek przewijania" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Nieprzeźroczystość: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Wyświetl wersję i zakończ" -#: src/tilda.c:306 +#: src/tilda.c:328 #, fuzzy msgid "Set Initial Working Directory" msgstr "Ustaw katalog startowy" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Ustaw obraz jako tło" -#: src/tilda.c:310 +#: src/tilda.c:332 #, fuzzy msgid "Show Configuration Wizard" msgstr "Pokaż kreatora ustawień" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -567,21 +709,21 @@ "\n" "Treść błędu: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " @@ -589,102 +731,103 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Problem przy parsowaniu własnej komendy: %s\n" + +#: src/tilda_terminal.c:446 #, fuzzy, c-format msgid "Problem parsing custom command: %s\n" msgstr "Problem przy parsowaniu własnej komendy: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Zamiast tego uruchamiem domyślną powłokę\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Nie można uruchomić własnej komeny: %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "Nie można uruchomić domyślnej powłoki: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Nowa karta" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Nie udało się uruchomić przeglądarki. Wywołano komendę `%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Powinieneś mieć złą wartość tab_pos w swoim pliku konfiguracyjnym\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, fuzzy, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Nie można ustawić ikony tildy: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Zbyt mało pamięci do utworzenia nowej zakładki\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Konfiguracja" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " @@ -692,7 +835,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " @@ -700,7 +843,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " @@ -708,28 +851,28 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " @@ -737,7 +880,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " @@ -745,7 +888,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " @@ -753,7 +896,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " @@ -761,7 +904,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " @@ -769,7 +912,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " @@ -777,7 +920,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " @@ -785,7 +928,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " @@ -793,7 +936,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " @@ -801,7 +944,7 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " @@ -809,10 +952,30 @@ msgstr "" "Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"Przypisanie klawiszy, które wybrałeś jest nieprawidłowe. Proszę wybrać inne." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Nieprawidłowe ustawienie pozycji karty, ignorowanie\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Problem przy parsowaniu pliku konfiguracyjnego\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -853,18 +1016,6 @@ #~ "Po prawej\n" #~ "Wyłączony" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Sekwencja sterująca\n" -#~ "Control-H" - -#~ msgid "gtk-close" -#~ msgstr "Zamknij" - #, fuzzy #~ msgid "Key Binding" #~ msgstr "Skrót klawiszowy" diff -Nru tilda-1.1.12/po/POTFILES.in tilda-1.2.2/po/POTFILES.in --- tilda-1.1.12/po/POTFILES.in 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/POTFILES.in 2014-10-28 11:36:24.000000000 +0000 @@ -1,6 +1,6 @@ # List of source files which contain translatable strings. -tilda.glade +src/tilda.ui src/callback_func.c src/configsys.c src/tilda.c diff -Nru tilda-1.1.12/po/pt_BR.po tilda-1.2.2/po/pt_BR.po --- tilda-1.1.12/po/pt_BR.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/pt_BR.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,158 +7,288 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" -"PO-Revision-Date: 2007-05-30 01:49+0000\n" -"Last-Translator: Drak[X] \n" -"Language-Team: Brazilian Portuguese \n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" +"PO-Revision-Date: 2014-08-04 22:29+0000\n" +"Last-Translator: NatanJMai \n" "Language: pt_BR\n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" -"X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 -msgid "Tilda Config" +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "Fechar Tilda" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "Abrir um novo terminal" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "Abrir um novo terminal e esconder" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "Topo" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "Inferior" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "Esquerda" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "Direita" + +#: src/tilda.ui:98 +msgid "Hidden" msgstr "" -#: tilda.glade:323 -msgid "Enable Double Buffering" +#: src/tilda.ui:109 +msgid "Focus Terminal" msgstr "" -#: tilda.glade:339 src/tilda.c:300 -msgid "Start Tilda hidden" +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Fechar o terminal" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "Não é exibido" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "Após o título inicial" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "Antes do título inicial" + +#: src/tilda.ui:132 +msgid "Replace initial title" +msgstr "Substituir título inicial" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "Alterar para o shell padrão" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "Reiniciar o comando" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "Fechar o terminal" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "Personalizado" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "Verde no Preto" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "Preto no Branco" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "Branco no Preto" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "Zenburn" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "Luz solarizada" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "Escuro solarizado" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "À esquerda" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "À direita" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "Inválido" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "ASCII DEL" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" msgstr "" -#: tilda.glade:355 +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "Control-H" + +#: src/tilda.ui:278 +msgid "Tilda Config" +msgstr "Configurações Tilda" + +#: src/tilda.ui:355 +msgid "Enable Double Buffering" +msgstr "Ativar Double Buffering" + +#: src/tilda.ui:371 src/tilda.c:322 +msgid "Start Tilda hidden" +msgstr "Iniciar escondido" + +#: src/tilda.ui:387 msgid "Always on top" -msgstr "" +msgstr "Sempre no topo" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" -msgstr "" +msgstr "Mostrar em todos os espaços de trabalho" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" -msgstr "" +msgstr "Não mostrar na barra de tarefas" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" +msgstr "Mostrar borda do notebook" + +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" msgstr "" -#: tilda.glade:425 +#: src/tilda.ui:492 msgid "Window Display" -msgstr "" +msgstr "Vitrine" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" -msgstr "" +msgstr "Efeito do cursor" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" -msgstr "" +msgstr "Som do terminal" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" -msgstr "" +msgstr "Visor do terminal" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" -msgstr "" +msgstr "Ativar suavização" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" -msgstr "" +msgstr "Permitir texto em negrito" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" -msgstr "" +msgstr "Posições das abas" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" -msgstr "" +msgstr "Fonte:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" -msgstr "" +msgstr "Fonte" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" -msgstr "" +msgstr "Ocultar Tilda quando mouse sair" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" -msgstr "" +msgstr "Tempo para esconder automaticamente" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" -msgstr "" +msgstr "Esconder Tilda quando perder o foco" -#: tilda.glade:749 +#: src/tilda.ui:816 msgid "Auto Hide" -msgstr "" +msgstr "Esconder Automaticamente" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" -msgstr "" +msgstr "Quando o último terminal é fechado:" -#: tilda.glade:827 +#: src/tilda.ui:894 msgid "Program Exit" -msgstr "" +msgstr "Sair do Programa" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" +"Note: Algumas opções requerem que o Tilda seja reiniciado." -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" -msgstr "" +msgstr "Geral" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" -msgstr "" +msgstr "Caracteres:" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" -msgstr "" +msgstr "Selecione por palavra" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" -msgstr "" +msgstr "Navegador *:" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" -msgstr "" +msgstr "Título Inicial:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "Limite de comprimento máximo do título da aba:" + +#: src/tilda.ui:1200 msgid "Title" -msgstr "" +msgstr "Título" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" -msgstr "" +msgstr "Executar um comando personalizado em vez do shell" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" -msgstr "" +msgstr "Comando personalizado:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" -msgstr "" +msgstr "Quando o comando sair:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" -msgstr "" +msgstr "Comando" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -166,165 +296,169 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" -msgstr "" +msgstr "Título e Comando" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" -msgstr "" +msgstr "Percentual" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" -msgstr "" +msgstr "Em Pixels" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" -msgstr "" +msgstr "Altura" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" -msgstr "" +msgstr "Largura" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" -msgstr "" +msgstr "Centralizado Horizontalmente" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" -msgstr "" +msgstr "Centralizado Verticalmente" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" -msgstr "" +msgstr "Posição X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" -msgstr "" +msgstr "Posição Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" -msgstr "" +msgstr "Posição" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" -msgstr "" +msgstr "Habilitar Transparência" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" -msgstr "" +msgstr "Nível de Transparência" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" -msgstr "" +msgstr "Animar a descida" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" -msgstr "" +msgstr "Usar imagem como plano de fundo" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" -msgstr "" +msgstr "Tempo de animação" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" -msgstr "" +msgstr "Orientação da Animação" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" -msgstr "" +msgstr "Extras" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" -msgstr "" +msgstr "Monitor:" -#: tilda.glade:1880 +#: src/tilda.ui:2003 msgid "Select monitor" -msgstr "" +msgstr "Selecione o monitor" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" -msgstr "" +msgstr "Aparência" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" -msgstr "" +msgstr "Esquemas embutidos" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" -msgstr "" +msgstr "Cor do Texto" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" -msgstr "" +msgstr "Cor do plano de fundo" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " -msgstr "" +msgstr "\t" -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" -msgstr "" +msgstr "Paleta de cores:" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" -msgstr "" +msgstr "Esquemas Embutidos:" -#: tilda.glade:2423 +#: src/tilda.ui:2546 msgid "Palette" -msgstr "" +msgstr "Paleta" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" -msgstr "" +msgstr "Cores" -#: tilda.glade:2476 -msgid "Scroll on Output" +#: src/tilda.ui:2619 +msgid "lines" +msgstr "Linhas" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" msgstr "" -#: tilda.glade:2493 -msgid "Scroll on Keystroke" +#: src/tilda.ui:2669 +msgid "Limit scrollback to:" msgstr "" -#: tilda.glade:2510 -msgid "Scroll Background" +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." msgstr "" -#: tilda.glade:2547 -msgid "lines" +#: src/tilda.ui:2686 +msgid "Scroll on Output" msgstr "" -#: tilda.glade:2587 -msgid "Scrollback:" +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" msgstr "" -#: tilda.glade:2601 -msgid "Scrollbar is:" +#: src/tilda.ui:2720 +msgid "Scroll Background" msgstr "" -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" -msgstr "" +msgstr "Compatibilidade" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -332,202 +466,203 @@ "i>" msgstr "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" -msgstr "" +msgstr "Voltar opções padrões de compatibilidade" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" -msgstr "" +msgstr "Compatibilidade" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " -msgstr "" +msgstr " " -#: tilda.glade:2871 +#: src/tilda.ui:3000 msgid "Paste" msgstr "" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" -msgstr "" +msgstr "Ir para próxima aba" -#: tilda.glade:2949 +#: src/tilda.ui:3078 msgid "Quit" -msgstr "" +msgstr "Fechar" -#: tilda.glade:2987 +#: src/tilda.ui:3116 msgid "Add Tab" -msgstr "" +msgstr "Adicionar Aba" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" -msgstr "" +msgstr "Ir para a aba 10" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" -msgstr "" +msgstr "Ir para a aba 5" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" -msgstr "" +msgstr "Ir para a aba 4" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" -msgstr "" +msgstr "Ir para a aba 3" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" -msgstr "" +msgstr "Ir para a aba 2" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" -msgstr "" +msgstr "Ir para a aba 1" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" -msgstr "" +msgstr "Ir para a aba anterior" -#: tilda.glade:3296 +#: src/tilda.ui:3425 msgid "Close Tab" -msgstr "" +msgstr "Fechar Aba" -#: tilda.glade:3336 +#: src/tilda.ui:3465 msgid "Copy" -msgstr "" +msgstr "Copiar" -#: tilda.glade:3374 +#: src/tilda.ui:3503 msgid "Pull Down Terminal" -msgstr "" +msgstr "" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" -msgstr "" +msgstr "Ir para a Aba 6" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" -msgstr "" +msgstr "Ir para a Aba 7" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" -msgstr "" +msgstr "Ir para a Aba 8" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" -msgstr "" +msgstr "Ir para a Aba 9" -#: tilda.glade:3570 -msgid "Move Tabe Left" +#: src/tilda.ui:3699 +msgid "Move Tab Left" msgstr "" -#: tilda.glade:3608 +#: src/tilda.ui:3737 msgid "Move Tab Right" msgstr "" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "" #: src/callback_func.c:53 msgid "Untitled" -msgstr "" +msgstr "Sem título" #: src/callback_func.c:71 msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 msgid "Problem when opening config file\n" msgstr "" -#: src/configsys.c:177 -msgid "Problem while parsing config file\n" -msgstr "" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" -msgstr "" +msgstr "Mudar a cor de fundo" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" -msgstr "" +msgstr "Mudar a fonte para a seguinte frase" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" -msgstr "" +msgstr "Mostrar a versão, quando fechado" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" -msgstr "" +msgstr "Mudar Diretório de Trabalho inicial" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" -msgstr "" +msgstr "Alterar imagem de fundo" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -536,208 +671,226 @@ "Error message: %s\n" msgstr "" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" -msgstr "" +msgstr "Criando diretório:'%s'\n" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" -msgstr "" +msgstr "_Nova Aba" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" -msgstr "" +msgstr "_Fechar Aba" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" -msgstr "" +msgstr "Terminal do Linux" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" -msgstr "" +msgstr "XTerm" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" -msgstr "" - -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" +msgstr "Rxvt" -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "Adicione um atalho de teclado" + +#~ msgid "0" +#~ msgstr "0" diff -Nru tilda-1.1.12/po/pt.po tilda-1.2.2/po/pt.po --- tilda-1.1.12/po/pt.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/pt.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-04-19 11:22+0000\n" "Last-Translator: João Santos \n" "Language-Team: Portuguese \n" @@ -18,150 +18,288 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Fechar Aba" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Campainha do Terminal Audível" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Título Inicial:" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Incapaz de carregar o shell padrão: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"DEL ASCII\n" +"Sequência de escape\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Configuração do Tilda" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Habilitar Buffering Duplo" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Iniciar o Tilda escondido" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Sempre no topo" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Mostrar em todas as Áreas de Trabalho" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Não mostrar na barra de tarefas" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Mostrar Borda do Bloco de Notas" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Exibição da Janela" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Cursor Pisca" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Campainha do Terminal Audível" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Exibição do Terminal" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Habilitar Antiserrilhado" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Permitir Texto em Negrito" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Posição das Abas" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Tipo de letra:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Fonte" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Título" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Posição" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Geral" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Navegador Web" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "Tratamento de URL" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Título Inicial:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Título definido dinamicamente:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Título" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Correr um comando personalizado em vez da shell" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Comando personalizado:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Quando o comando sair:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Comando" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,168 +307,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Título e Comando" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Percentagem" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "Em Pixeis" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Altura" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Comprimento" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Centrado Horizontalmente" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Centrado Verticalmente" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Posição X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Posição Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Posição" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Habilitar Transparência" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Nivel de Transparência" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animação" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Usar imagem de fundo" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Atraso da Animação (usec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Orientação de Animação" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extras" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Título" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Aparência" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Esquemas Pre-definidos" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Cor do Texto" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Cor de Fundo" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Cores de Frente e Fundo" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "Esquemas Pre-definidos" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Título" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Cores" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "linhas" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Barra de Rolamento está à:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Histórico:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Rolar com o conteúdo" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Rodar ao Pressionar Tecla" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Rolar fundo" -#: tilda.glade:2547 -msgid "lines" -msgstr "linhas" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Histórico:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Barra de Rolamento está à:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Rolamento" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Rolamento" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Compatibilidade" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -342,119 +485,124 @@ "algumas aplicações e sistemas operativos que esperam comportamentos " "diferentes da consola." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "Tecla _delete gera:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "Tecla _backspace gera:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "_Repor Opções de Compatibilidade nos Valores Pre-definidos" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Compatibilidade" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Título" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Título" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Título" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "_Fechar Aba" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Fonte" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Tecla Pulldown" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "_Fechar Aba" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Altura" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Atalhos de Teclado" @@ -466,90 +614,85 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Valor inválido para \"d_set_title\" no ficheiro de configuração\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Problema ao analisar o arquivo de configuração\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Problema ao analisar o arquivo de configuração\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" "Não foi possível escrever as alterações no ficheiro de configuração no " "disco\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Não foi possível fechar o ficheiro de configuração\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Não foi possível escrever o ficheiro de configuração para %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Não foi possível correr o comando: '%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Não foi possível abrir directório de bloqueio: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Usar fontes não serrilhadas" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Definir a cor de fundo" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Corre um comando ao iniciar" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Definir a fonte da seguinte expressão" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Linhas do Histórico" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Usar Barra de Rolamento" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Opacidade: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Escreve a versão e sai" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Definir o Directório de Trabalho Inicial" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Definir a imagem de fundo" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Mostrar o Assistente de Configuração" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -562,21 +705,21 @@ "\n" "Mensagem de erro: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " @@ -584,102 +727,103 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Problema ao analisar o comando personalizado: %s\n" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "Problema ao analisar o comando personalizado: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Carregando antes a shell padrão\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Incapaz de carregar o comando personalizado: %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "Incapaz de carregar o shell padrão: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Nova Aba" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Fechar Aba" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Falha ao carregar o navegador web. O comando foi `%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Tem um tab_pos errado no seu ficheiro de configuração\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Não foi possível mudar o ícone do tilda: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Memória Insuficiente, não é possível criar aba\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Configuração do Tilda" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " @@ -687,7 +831,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " @@ -695,7 +839,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " @@ -703,28 +847,28 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " @@ -732,7 +876,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " @@ -740,7 +884,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " @@ -748,7 +892,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " @@ -756,7 +900,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " @@ -764,7 +908,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " @@ -772,7 +916,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " @@ -780,7 +924,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " @@ -788,7 +932,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " @@ -796,7 +940,7 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " @@ -804,10 +948,30 @@ msgstr "" "A combinação de teclas que escolheu é inválida. Por favor escolha outra." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" +"A combinação de teclas que escolheu é inválida. Por favor escolha outra." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Configuração de posição de aba inválida, ignorando\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Problema ao analisar o arquivo de configuração\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -859,18 +1023,6 @@ #~ "Na Direita\n" #~ "Desactivado" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "DEL ASCII\n" -#~ "Sequência de escape\n" -#~ "Control-H" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - #~ msgid "Key Binding" #~ msgstr "Atalhos de Teclado" diff -Nru tilda-1.1.12/po/ru.po tilda-1.2.2/po/ru.po --- tilda-1.1.12/po/ru.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/ru.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-02-09 09:14+0000\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -18,150 +18,288 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "_Закрыть вкладку" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "Звуковой терминальный сигнал" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Исходный заголовок:" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "Не удалось запустить оболочку по умолчанию: %s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"Управляющую последовательность\n" +"Control-H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Настройка Tilda" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Двойная буферизация" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Скрыть Tilda при запуске" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Поверх всех окон" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Отображать на всех рабочих столах" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Не показывать в панели задач" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Рамка вокруг окна" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Настройки отображения" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "Мерцающий курсор" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "Звуковой терминальный сигнал" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Внешний вид терминала" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "Включить сглаживание" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "Разрешить полужирный текст" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "Расположение закладок:" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "Шрифт:" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Шрифт" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Заголовок" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Расположение" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Основные" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "Веб-браузер" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "Обработка URL" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Исходный заголовок:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Автоматически установленный заголовок" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Заголовок" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "Запускать пользовательскую команду вместо shell" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "Пользовательская команда:" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "Когда команда завершается:" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Команда" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,168 +307,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Заголовок и команда" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "В процентах:" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "В пикселах:" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Высота" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Ширина" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Центрировать по горизонтали" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Центрировать по вертикали" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Позиция по горизонтали" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Позиция по вертикали" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Расположение" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Включить прозрачность" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Уровень прозрачности" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Анимировать появление/скрытие" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Использовать изображение в качестве фона" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Продолжительность анимации (мкс)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Направление анимации" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Дополнительно" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Заголовок" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Внешний вид" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "Встроенные схемы" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "Цвет текста" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "Цвет фона" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "Цвет текста и фона" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "Встроенные схемы" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Заголовок" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Цвета" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "cтрок(и)" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Полоса прокрутки:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Буфер прокрутки:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Прокручивать по мере появления текста" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "Прокручивать клавишами" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Прокручивать фоновое изображение" -#: tilda.glade:2547 -msgid "lines" -msgstr "cтрок(и)" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Буфер прокрутки:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Полоса прокрутки:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "Прокрутка" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Прокрутка" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "Совместимость" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -342,119 +485,124 @@ "работать с некоторыми приложениями и операционными ситемами, ожидающими " "другого поведения терминала." -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "Клавиша _Delete вызывает:" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "Клавиша _Backspace вызывает:" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "_Восстановить параметры совместимости по умолчанию" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Совместимость" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Заголовок" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Заголовок" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Заголовок" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "_Закрыть вкладку" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Шрифт" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Горячая клавиша" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "_Закрыть вкладку" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Высота" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Сочетание клавиш" @@ -466,88 +614,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "Неправильное значение параметра \"d_set_title\" в файле конфигурации\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Возникла проблема при обработке файла конфигурации\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Возникла проблема при обработке файла конфигурации\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Не удалось записать конфигурационный файл на диск\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Не удалось закрыть конфигурационный файл\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Возникла ошибка при записи конфигурационного файла в %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "Не удалось выполнить команду: «%s»\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "Невозможно открыть директорию lock: %s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Использовать сглаживание шрифтов" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Установить цвет фона" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Запустить команду при запуске" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Использовать указанный шрифт" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Размер буфера прокрутки, строк" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Использовать полосу прокрутки" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Непрозрачность: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Вывести версию и выйти" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Установить рабочую директорию" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Установить фоновое изображение" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Запустить мастер конфигурации" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -560,232 +703,252 @@ "\n" "Сообщение об ошибке: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "Возникла проблема при обработке пользовательской команды: %s\n" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "Возникла проблема при обработке пользовательской команды: %s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "Запуск оболочки по умолчанию вместо\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "Не удалось запустить пользовательскую команду: %s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "Не удалось запустить оболочку по умолчанию: %s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "_Новая вкладка" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "Ошибка при запуске веб-браузера командой «%s»\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "Неправильный параметр tab_pos в файле конфигурации\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Не удалось установить иконку tilda: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Не удалось создать вкладку: память исчерпана\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Настройка Tilda" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "Комбинация клавиш, которую вы выбрали, неверная. Выберите другую." + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "Неправильный вариант положения вкладки, пропущен\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Возникла проблема при обработке файла конфигурации\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -837,18 +1000,6 @@ #~ "Справа\n" #~ "Выключен" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "Управляющую последовательность\n" -#~ "Control-H" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - #~ msgid "Key Binding" #~ msgstr "Привязка к клавише" diff -Nru tilda-1.1.12/po/sk.po tilda-1.2.2/po/sk.po --- tilda-1.1.12/po/sk.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/sk.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2007-11-22 22:15+0000\n" "Last-Translator: Matej Duman \n" "Language-Team: Slovak \n" @@ -18,149 +18,280 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Počiatočný titulok:" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Povoliť dvojitý buffering" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Spustiť Tildu skrytú" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Vždy navrchu" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Zobraziť na všetkých plochách" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Nezobrazovať v paneli úloh" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Zobraziť rám" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Zobrazenie okna" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Zobrazenie terminálu" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Písmo" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Titulok" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Umiestnenie" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Všeobecné" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" msgstr "" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Počiatočný titulok:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Dynamický titulok:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Titulok" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Príkaz" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -168,167 +299,172 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Titulok a príkaz" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Percentuálne vyjadrenie" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "V pixeloch" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Výška" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Šírka" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Zarovnať vodorovne" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Zarovnať zvislo" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Pozícia X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Pozícia Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Umiestnenie" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Povoliť priehľadnosť" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Úroveň priehľadnosti" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animované vysunutie" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Použiť obrázok ako pozadie" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Dĺžka animácie (mikrosekundy)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Začiatok animácie" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Doplnky" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Titulok" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Vzhľad" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr "" -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Titulok" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Farby" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Posúvač je:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "História" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Posúvať pri výstupe" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Posúvať pozadie" -#: tilda.glade:2547 -msgid "lines" -msgstr "" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "História" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Posúvač je:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Posúvanie" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -336,119 +472,124 @@ "i>" msgstr "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Kompatibilita" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Titulok" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Titulok" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Titulok" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "Príkaz" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Písmo" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Zobrazenie terminálu" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Príkaz" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Výška" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Klávesové skratky" @@ -460,88 +601,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Nemôžem zatvoriť konfiguračný súbor\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Nemôžem zatvoriť konfiguračný súbor\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Nemôžem synchronizovať konfiguračný súbor na disk\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Nemôžem zatvoriť konfiguračný súbor\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Nemôžem zapísať konfiguračný súbor do %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Použiť vyhladzovanie písma" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Nastaviť farbu pozadia" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Spustiť pri štarte príkaz" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Nastaviť písmo pre nasledujúci reťazec" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "História riadkov" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Použiť posúvač" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Priehľadnosť: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Napísať číslo verzie a potom skončiť" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Nastaviť počiatočný pracovný priečinok" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Nastaviť obrázok pozadia" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Zobraziť sprievodcu konfiguráciou" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -554,211 +690,230 @@ "\n" "Chybové hlásenie: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Nemôžem nastaviť ikonu tildy: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Nedostatok pamäte, nemôžem vytvoriť kartu\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Nemôžem zatvoriť konfiguračný súbor\n" + #~ msgid "Grab Keybinding" #~ msgstr "Zachytiť klávesovú skratku" diff -Nru tilda-1.1.12/po/sl.po tilda-1.2.2/po/sl.po --- tilda-1.1.12/po/sl.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/sl.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2007-07-11 00:16+0000\n" "Last-Translator: Nejc Lotrič \n" "Language-Team: Slovenian \n" @@ -18,149 +18,280 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Prvotni Naslov:" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Omogoči Dvojno Medpomnenje" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Vedno na vrhu" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Prikaži na vseh delovnih površinah" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Ne prikaži v opravilni vrstici" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Okenski prikaz" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Prikaz v Terminalu" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Pisava" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Naslov" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Pozicija" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Splošno" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" msgstr "" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Prvotni Naslov:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Naslov" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Ukaz" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -168,168 +299,172 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Naslov in Ukaz" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Odstotek" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "V Pikslih" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Višina" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Širina" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "Pozicija X" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Pozicija Y" -#: tilda.glade:1576 +#: src/tilda.ui:1699 #, fuzzy msgid "Position" msgstr "Pozicija" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Vključi Prosojnost" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Nivo Prozornosti" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Uporabi Sliko za Ozadje" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Zakasnitev Animacij (usec)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Dodatki" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Naslov" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Videz" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr "" -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Naslov" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Barve" -#: tilda.glade:2476 -msgid "Scroll on Output" +#: src/tilda.ui:2619 +msgid "lines" msgstr "" -#: tilda.glade:2493 -msgid "Scroll on Keystroke" +#: src/tilda.ui:2659 +msgid "Scrollbar is:" msgstr "" -#: tilda.glade:2510 -msgid "Scroll Background" +#: src/tilda.ui:2669 +msgid "Limit scrollback to:" msgstr "" -#: tilda.glade:2547 -msgid "lines" +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." msgstr "" -#: tilda.glade:2587 -msgid "Scrollback:" +#: src/tilda.ui:2686 +msgid "Scroll on Output" msgstr "" -#: tilda.glade:2601 -msgid "Scrollbar is:" +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" +msgstr "" + +#: src/tilda.ui:2720 +msgid "Scroll Background" msgstr "" -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Premikanje zaslona" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -337,119 +472,124 @@ "i>" msgstr "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Združljivost" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Naslov" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Naslov" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Naslov" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "Ukaz" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Pisava" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Prikaz v Terminalu" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Ukaz" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Višina" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "" @@ -461,86 +601,82 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 msgid "Problem when opening config file\n" msgstr "" -#: src/configsys.c:177 -msgid "Problem while parsing config file\n" -msgstr "" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Nastavi barvo ozadja" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Poženi ukaz ob zagonu" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Nastavi Sliko Ozadja" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Prikaži Čarovnika Nastavitev" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -549,208 +685,223 @@ "Error message: %s\n" msgstr "" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Ni moč nastaviti ikone tilde: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" diff -Nru tilda-1.1.12/po/sv.po tilda-1.2.2/po/sv.po --- tilda-1.1.12/po/sv.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/sv.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2007-05-14 18:18+0000\n" "Last-Translator: Umut \n" "Language-Team: Swedish \n" @@ -18,149 +18,280 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "Initial titel:" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "Aktivera dubbelbuffring" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Starta Tilda dold" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "Alltid överst" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "Visa på alla arbetsytor" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "Visa inte i aktivitetsfält" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "Visa ram" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "Fönstervisning" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "Terminalvisning" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "Typsnitt" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "Titel" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "Position" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "Allmänt" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" msgstr "" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "Initial titel:" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "Dynamiskt inställd titel:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "Titel" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "Kommando" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -168,167 +299,172 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "Titel och kommando" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "Procentandel" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "I bildpunkter" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "Höjd" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "Bredd" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "Horisontellt centrerad" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "Vertikalt centrerad" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "X-position" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Y-position" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "Position" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "Aktivera genomskinlighet" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "Nivå av genomskinlighet" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "Animerad rullgardin" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "Använd bild som bakgrund" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "Fördröjning för animering (ms)" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "Orientering för animering" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "Extrafunktioner" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "Titel" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "Utseende" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr "" -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "Titel" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "Färger" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "Rullningslisten är:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "Rullningslängd:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "Rulla vid utmatning" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "Rulla bakgrunden" -#: tilda.glade:2547 -msgid "lines" -msgstr "" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "Rullningslängd:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "Rullningslisten är:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "Rullning" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -336,119 +472,124 @@ "i>" msgstr "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "Kompatibilitet" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "Titel" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "Titel" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "Titel" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "Kommando" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "Typsnitt" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "Terminalvisning" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "Kommando" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "Höjd" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "Tangentbindningar" @@ -460,88 +601,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "Kunde inte stänga konfigurationsfilen\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "Kunde inte stänga konfigurationsfilen\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "Kunde inte synkronisera konfigurationsfilen till disk\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "Kunde inte stänga konfigurationsfilen\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "Kunde inte skriva konfigurationsfilen till %s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "Använd kantutjämnade typsnitt" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "Ställ in bakgrundsfärgen" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "Kör ett kommando vid uppstart" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "Ställ in typsnittet till följande sträng" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "Antal rader att rulla tillbaka" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "Använd rullningslist" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "Opakhet: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "Skriv ut versionen, avsluta sedan" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "Ställ in initial arbetskatalog" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "Ställ in bakgrundsbild" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "Visa konfigurationsguide" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -554,211 +690,230 @@ "\n" "Felmeddelande: %s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "Kunde inte ställa in ikon för tilda: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "Slut på minne, kan inte skapa flik\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "Kunde inte stänga konfigurationsfilen\n" + #~ msgid "Grab Keybinding" #~ msgstr "Fånga tangentbindning" diff -Nru tilda-1.1.12/po/tr.po tilda-1.2.2/po/tr.po --- tilda-1.1.12/po/tr.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/tr.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2007-05-22 18:11+0000\n" "Last-Translator: Alperen Yusuf Aybar \n" "Language-Team: Turkish \n" @@ -18,147 +18,277 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +msgid "Close Tilda" +msgstr "" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +msgid "Hide Terminal" +msgstr "" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +msgid "Replace initial title" +msgstr "" + +#: src/tilda.ui:143 +msgid "Drop to the default shell" +msgstr "" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +msgid "Escape sequence" +msgstr "" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 msgid "Auto Hide" msgstr "" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 msgid "Program Exit" msgstr "" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 msgid "Web Browser *:" msgstr "" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -166,165 +296,169 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 msgid "Select monitor" msgstr "" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr "" -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 msgid "Built-in schemes:" msgstr "" -#: tilda.glade:2423 +#: src/tilda.ui:2546 msgid "Palette" msgstr "" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "" -#: tilda.glade:2476 -msgid "Scroll on Output" +#: src/tilda.ui:2619 +msgid "lines" msgstr "" -#: tilda.glade:2493 -msgid "Scroll on Keystroke" +#: src/tilda.ui:2659 +msgid "Scrollbar is:" msgstr "" -#: tilda.glade:2510 -msgid "Scroll Background" +#: src/tilda.ui:2669 +msgid "Limit scrollback to:" msgstr "" -#: tilda.glade:2547 -msgid "lines" +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." msgstr "" -#: tilda.glade:2587 -msgid "Scrollback:" +#: src/tilda.ui:2686 +msgid "Scroll on Output" msgstr "" -#: tilda.glade:2601 -msgid "Scrollbar is:" +#: src/tilda.ui:2703 +msgid "Scroll on Keystroke" +msgstr "" + +#: src/tilda.ui:2720 +msgid "Scroll Background" msgstr "" -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -332,111 +466,116 @@ "i>" msgstr "" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 msgid "Paste" msgstr "" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 msgid "Quit" msgstr "" -#: tilda.glade:2987 +#: src/tilda.ui:3116 msgid "Add Tab" msgstr "" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 msgid "Close Tab" msgstr "" -#: tilda.glade:3336 +#: src/tilda.ui:3465 msgid "Copy" msgstr "" -#: tilda.glade:3374 +#: src/tilda.ui:3503 msgid "Pull Down Terminal" msgstr "" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 -msgid "Move Tabe Left" +#: src/tilda.ui:3699 +msgid "Move Tab Left" msgstr "" -#: tilda.glade:3608 +#: src/tilda.ui:3737 msgid "Move Tab Right" msgstr "" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "" @@ -448,86 +587,82 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "" -#: src/configsys.c:173 +#: src/configsys.c:199 msgid "Problem when opening config file\n" msgstr "" -#: src/configsys.c:177 -msgid "Problem while parsing config file\n" -msgstr "" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -536,208 +671,223 @@ "Error message: %s\n" msgstr "" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, c-format +msgid "Problem reading link %s: %s\n" +msgstr "" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, c-format msgid "Tilda %d Config" msgstr "" -#: src/wizard.c:333 +#: src/wizard.c:374 msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:335 +#: src/wizard.c:376 msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:337 +#: src/wizard.c:378 msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:339 +#: src/wizard.c:380 msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:341 +#: src/wizard.c:382 msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:343 +#: src/wizard.c:384 msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:345 +#: src/wizard.c:386 msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:347 +#: src/wizard.c:388 msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:349 +#: src/wizard.c:390 msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "" -#: src/wizard.c:351 +#: src/wizard.c:392 msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:353 +#: src/wizard.c:394 msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:355 +#: src/wizard.c:396 msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:357 +#: src/wizard.c:398 msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:359 +#: src/wizard.c:400 msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:361 +#: src/wizard.c:402 msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:363 +#: src/wizard.c:404 msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:365 +#: src/wizard.c:406 msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:367 +#: src/wizard.c:408 msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:369 +#: src/wizard.c:410 msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "" -#: src/wizard.c:819 +#: src/wizard.c:412 +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "" + +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" diff -Nru tilda-1.1.12/po/zh_CN.po tilda-1.2.2/po/zh_CN.po --- tilda-1.1.12/po/zh_CN.po 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/po/zh_CN.po 2014-10-28 11:36:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: tilda\n" "Report-Msgid-Bugs-To: sloutri@iit.edu\n" -"POT-Creation-Date: 2013-02-24 16:27+0100\n" +"POT-Creation-Date: 2014-10-16 17:06+0200\n" "PO-Revision-Date: 2008-03-17 23:34+0000\n" "Last-Translator: luojie-dune \n" "Language-Team: Chinese (China) \n" @@ -18,150 +18,288 @@ "X-Launchpad-Export-Date: 2008-04-28 05:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: tilda.glade:246 +#: src/tilda.ui:69 +#, fuzzy +msgid "Close Tilda" +msgstr "关闭标签(_C)" + +#: src/tilda.ui:72 +msgid "Open a new terminal" +msgstr "" + +#: src/tilda.ui:75 +msgid "Open a new terminal and hide" +msgstr "" + +#: src/tilda.ui:86 src/tilda.ui:160 +msgid "Top" +msgstr "" + +#: src/tilda.ui:89 src/tilda.ui:163 +msgid "Bottom" +msgstr "" + +#: src/tilda.ui:92 src/tilda.ui:166 +msgid "Left" +msgstr "" + +#: src/tilda.ui:95 src/tilda.ui:169 +msgid "Right" +msgstr "" + +#: src/tilda.ui:98 +msgid "Hidden" +msgstr "" + +#: src/tilda.ui:109 +msgid "Focus Terminal" +msgstr "" + +#: src/tilda.ui:112 +#, fuzzy +msgid "Hide Terminal" +msgstr "可闻的终端响铃" + +#: src/tilda.ui:123 +msgid "Isn't displayed" +msgstr "" + +#: src/tilda.ui:126 +msgid "Goes after initial title" +msgstr "" + +#: src/tilda.ui:129 +msgid "Goes before initial title" +msgstr "" + +#: src/tilda.ui:132 +#, fuzzy +msgid "Replace initial title" +msgstr "原始标题 :" + +#: src/tilda.ui:143 +#, fuzzy +msgid "Drop to the default shell" +msgstr "无法运行默认shell：%s\n" + +#: src/tilda.ui:146 +msgid "Restart the command" +msgstr "" + +#: src/tilda.ui:149 +msgid "Exit the terminal" +msgstr "" + +#: src/tilda.ui:180 src/tilda.ui:209 src/wizard.c:188 +msgid "Custom" +msgstr "" + +#: src/tilda.ui:183 +msgid "Green on Black" +msgstr "" + +#: src/tilda.ui:186 +msgid "Black on White" +msgstr "" + +#: src/tilda.ui:189 +msgid "White on Black" +msgstr "" + +#: src/tilda.ui:192 src/wizard.c:193 +msgid "Zenburn" +msgstr "" + +#: src/tilda.ui:195 src/wizard.c:194 +msgid "Solarized Light" +msgstr "" + +#: src/tilda.ui:198 src/wizard.c:195 +msgid "Solarized Dark" +msgstr "" + +#: src/tilda.ui:220 +msgid "On the Left" +msgstr "" + +#: src/tilda.ui:223 +msgid "On the Right" +msgstr "" + +#: src/tilda.ui:226 +msgid "Disabled" +msgstr "" + +#: src/tilda.ui:237 src/tilda.ui:254 +msgid "ASCII DEL" +msgstr "" + +#: src/tilda.ui:240 src/tilda.ui:257 +#, fuzzy +msgid "Escape sequence" +msgstr "" +"ASCII DEL\n" +"转码序列\n" +"Ctrl+H" + +#: src/tilda.ui:243 src/tilda.ui:260 +msgid "Control-H" +msgstr "" + +#: src/tilda.ui:278 msgid "Tilda Config" msgstr "Tilda设置" -#: tilda.glade:323 +#: src/tilda.ui:355 msgid "Enable Double Buffering" msgstr "启用双重缓存" -#: tilda.glade:339 src/tilda.c:300 +#: src/tilda.ui:371 src/tilda.c:322 msgid "Start Tilda hidden" msgstr "Tilda 启动后隐藏" -#: tilda.glade:355 +#: src/tilda.ui:387 msgid "Always on top" msgstr "置顶" -#: tilda.glade:371 +#: src/tilda.ui:403 msgid "Display on all workspaces" msgstr "在所有工作空间上显示" -#: tilda.glade:387 +#: src/tilda.ui:419 msgid "Do not show in taskbar" msgstr "不在任务栏显示" -#: tilda.glade:403 +#: src/tilda.ui:435 msgid "Show Notebook Border" msgstr "显示窗口边框" -#: tilda.glade:425 +#: src/tilda.ui:452 +msgid "Non-focus Pull Up Behaviour:" +msgstr "" + +#: src/tilda.ui:492 msgid "Window Display" msgstr "窗口显示" -#: tilda.glade:464 +#: src/tilda.ui:531 msgid "Cursor Blinks" msgstr "光标闪烁" -#: tilda.glade:480 +#: src/tilda.ui:547 msgid "Audible Terminal Bell" msgstr "可闻的终端响铃" -#: tilda.glade:502 +#: src/tilda.ui:569 msgid "Terminal Display" msgstr "终端显示" -#: tilda.glade:558 +#: src/tilda.ui:625 msgid "Enable Antialiasing" msgstr "启用字体抗锯齿" -#: tilda.glade:574 +#: src/tilda.ui:641 msgid "Allow Bold Text" msgstr "允许粗体" -#: tilda.glade:593 +#: src/tilda.ui:660 msgid "Position of Tabs:" msgstr "标签位置：" -#: tilda.glade:626 +#: src/tilda.ui:693 msgid "Font:" msgstr "字体：" -#: tilda.glade:643 +#: src/tilda.ui:710 msgid "Font" msgstr "字体" -#: tilda.glade:696 +#: src/tilda.ui:763 msgid "Hide Tilda when mouse leaves it" msgstr "" -#: tilda.glade:716 +#: src/tilda.ui:783 msgid "Auto Hide Delay:" msgstr "" -#: tilda.glade:727 +#: src/tilda.ui:794 msgid "Hide when Tilda loses focus" msgstr "" -#: tilda.glade:749 +#: src/tilda.ui:816 #, fuzzy msgid "Auto Hide" msgstr "标题" -#: tilda.glade:791 +#: src/tilda.ui:858 msgid "When last terminal is closed:" msgstr "" -#: tilda.glade:827 +#: src/tilda.ui:894 #, fuzzy msgid "Program Exit" msgstr "位置" -#: tilda.glade:849 -msgid "Note: Some options require that tilda is restarted" +#: src/tilda.ui:916 +msgid "" +"Note: Some options require that tilda is restarted." msgstr "" -#: tilda.glade:864 +#: src/tilda.ui:933 msgid "General" msgstr "常规" -#: tilda.glade:913 +#: src/tilda.ui:982 msgid "Word Characters:" msgstr "" -#: tilda.glade:929 +#: src/tilda.ui:998 msgid "Select by Word" msgstr "" -#: tilda.glade:980 +#: src/tilda.ui:1049 #, fuzzy msgid "Web Browser *:" msgstr "网页浏览器" -#: tilda.glade:996 +#: src/tilda.ui:1065 msgid "URL Handling" msgstr "URL处理" -#: tilda.glade:1031 +#: src/tilda.ui:1100 msgid "Initial Title:" msgstr "原始标题 :" -#: tilda.glade:1043 +#: src/tilda.ui:1112 msgid "Dynamically-set Title:" msgstr "动态设置标题:" -#: tilda.glade:1093 +#: src/tilda.ui:1162 +msgid "Limit maximum length of tab title:" +msgstr "" + +#: src/tilda.ui:1200 msgid "Title" msgstr "标题" -#: tilda.glade:1123 +#: src/tilda.ui:1230 msgid "Run a custom command instead of the shell" msgstr "运行一个自定义命令而非shell指令" -#: tilda.glade:1140 +#: src/tilda.ui:1247 msgid "Custom Command:" msgstr "自定义命令：" -#: tilda.glade:1154 +#: src/tilda.ui:1261 msgid "When Command Exits:" msgstr "当命令存在：" -#: tilda.glade:1209 +#: src/tilda.ui:1316 msgid "Command" msgstr "命令" -#: tilda.glade:1234 +#: src/tilda.ui:1354 msgid "" "* A valid command that can open a browser must be entered here. It is " "possible to use the name of a specific browser such as 'firefox' and 'google-" @@ -169,168 +307,173 @@ "best command may be different depending on the system." msgstr "" -#: tilda.glade:1252 +#: src/tilda.ui:1375 msgid "Title and Command" msgstr "标题和命令" -#: tilda.glade:1285 tilda.glade:1378 +#: src/tilda.ui:1408 src/tilda.ui:1501 msgid "Percentage" msgstr "百分比" -#: tilda.glade:1312 tilda.glade:1391 +#: src/tilda.ui:1435 src/tilda.ui:1514 msgid "In Pixels" msgstr "按像素计" -#: tilda.glade:1344 +#: src/tilda.ui:1467 msgid "Height" msgstr "高度" -#: tilda.glade:1437 +#: src/tilda.ui:1560 msgid "Width" msgstr "宽度" -#: tilda.glade:1469 +#: src/tilda.ui:1592 msgid "Centered Horizontally" msgstr "水平居中" -#: tilda.glade:1487 +#: src/tilda.ui:1610 msgid "Centered Vertically" msgstr "垂直居中" -#: tilda.glade:1509 src/tilda.c:307 +#: src/tilda.ui:1632 src/tilda.c:329 msgid "X Position" msgstr "X轴位置" -#: tilda.glade:1524 src/tilda.c:308 +#: src/tilda.ui:1647 src/tilda.c:330 msgid "Y Position" msgstr "Y轴位置" -#: tilda.glade:1576 +#: src/tilda.ui:1699 msgid "Position" msgstr "位置" -#: tilda.glade:1611 +#: src/tilda.ui:1734 msgid "Enable Transparency" msgstr "启用透明" -#: tilda.glade:1629 +#: src/tilda.ui:1752 msgid "Level of Transparency" msgstr "透明度" -#: tilda.glade:1655 +#: src/tilda.ui:1778 msgid "Animated Pulldown" msgstr "下拉动画" -#: tilda.glade:1672 +#: src/tilda.ui:1795 msgid "Use Image for Background" msgstr "使用图片作为背景" -#: tilda.glade:1692 +#: src/tilda.ui:1815 msgid "Animation Delay (usec)" msgstr "动画延迟（微秒）" -#: tilda.glade:1709 +#: src/tilda.ui:1832 msgid "Animation Orientation" msgstr "动画方向" -#: tilda.glade:1782 +#: src/tilda.ui:1905 msgid "Extras" msgstr "额外" -#: tilda.glade:1817 +#: src/tilda.ui:1940 msgid "Monitor:" msgstr "" -#: tilda.glade:1880 +#: src/tilda.ui:2003 #, fuzzy msgid "Select monitor" msgstr "标题" -#: tilda.glade:1900 +#: src/tilda.ui:2023 msgid "Appearance" msgstr "外观" -#: tilda.glade:1946 +#: src/tilda.ui:2069 msgid "Built-in Schemes" msgstr "内置方案" -#: tilda.glade:1977 +#: src/tilda.ui:2100 msgid "Text Color" msgstr "文字颜色" -#: tilda.glade:1991 +#: src/tilda.ui:2114 msgid "Background Color" msgstr "背景颜色" -#: tilda.glade:2040 +#: src/tilda.ui:2163 msgid "Foreground and Background Colors" msgstr "前景和背景颜色" -#: tilda.glade:2071 tilda.glade:2675 +#: src/tilda.ui:2194 src/tilda.ui:2801 msgid " " msgstr " " -#: tilda.glade:2092 +#: src/tilda.ui:2215 msgid "" "Note: Terminal applications have these colors available to " "them." msgstr "" -#: tilda.glade:2379 +#: src/tilda.ui:2502 msgid "Color palette:" msgstr "" -#: tilda.glade:2396 +#: src/tilda.ui:2519 #, fuzzy msgid "Built-in schemes:" msgstr "内置方案" -#: tilda.glade:2423 +#: src/tilda.ui:2546 #, fuzzy msgid "Palette" msgstr "标题" -#: tilda.glade:2445 +#: src/tilda.ui:2568 msgid "Colors" msgstr "颜色" -#: tilda.glade:2476 +#: src/tilda.ui:2619 +msgid "lines" +msgstr "行" + +#: src/tilda.ui:2659 +msgid "Scrollbar is:" +msgstr "滚动条位于:" + +#: src/tilda.ui:2669 +#, fuzzy +msgid "Limit scrollback to:" +msgstr "回滚:" + +#: src/tilda.ui:2673 +msgid "Unselect for unlimited scrollback." +msgstr "" + +#: src/tilda.ui:2686 msgid "Scroll on Output" msgstr "输出时滚动" -#: tilda.glade:2493 +#: src/tilda.ui:2703 msgid "Scroll on Keystroke" msgstr "击键时滚动" -#: tilda.glade:2510 +#: src/tilda.ui:2720 msgid "Scroll Background" msgstr "滚动背景" -#: tilda.glade:2547 -msgid "lines" -msgstr "行" - -#: tilda.glade:2587 -msgid "Scrollback:" -msgstr "回滚:" - -#: tilda.glade:2601 -msgid "Scrollbar is:" -msgstr "滚动条位于:" - -#: tilda.glade:2618 +#: src/tilda.ui:2744 msgid "Scrolling" msgstr "滚动" -#: tilda.glade:2640 +#: src/tilda.ui:2766 msgid "Scrolling" msgstr "滚动" -#: tilda.glade:2658 +#: src/tilda.ui:2784 msgid "Compatibility" msgstr "兼容性" -#: tilda.glade:2694 +#: src/tilda.ui:2820 msgid "" "Note: These options may cause some applications to behave " "incorrectly. They are only here to allow you to work around certain " @@ -340,119 +483,124 @@ "注意：这些选项可能造成一些应用程序产生不正确的行为。仅用于允" "许您在一些应用程序和操作系统中作调整以获得不同的终端行为。" -#: tilda.glade:2717 +#: src/tilda.ui:2843 msgid "_Delete key generates:" msgstr "按Detelet键产生(_D):" -#: tilda.glade:2733 +#: src/tilda.ui:2859 msgid "_Backspace key generates:" msgstr "按Backspace键产生(_B)" -#: tilda.glade:2796 +#: src/tilda.ui:2922 msgid "_Reset Compatibility Options to Defaults" msgstr "重置兼容性选项为默认值(_R)" -#: tilda.glade:2833 +#: src/tilda.ui:2959 msgid "Compatibility" msgstr "兼容性" -#: tilda.glade:2858 tilda.glade:2898 tilda.glade:2936 tilda.glade:2974 -#: tilda.glade:3013 tilda.glade:3053 tilda.glade:3091 tilda.glade:3129 -#: tilda.glade:3167 tilda.glade:3205 tilda.glade:3243 tilda.glade:3283 -#: tilda.glade:3323 tilda.glade:3361 tilda.glade:3397 tilda.glade:3437 -#: tilda.glade:3477 tilda.glade:3517 tilda.glade:3557 tilda.glade:3595 +#: src/tilda.ui:2987 src/tilda.ui:3027 src/tilda.ui:3065 src/tilda.ui:3103 +#: src/tilda.ui:3142 src/tilda.ui:3182 src/tilda.ui:3220 src/tilda.ui:3258 +#: src/tilda.ui:3296 src/tilda.ui:3334 src/tilda.ui:3372 src/tilda.ui:3412 +#: src/tilda.ui:3452 src/tilda.ui:3490 src/tilda.ui:3526 src/tilda.ui:3566 +#: src/tilda.ui:3606 src/tilda.ui:3646 src/tilda.ui:3686 src/tilda.ui:3724 +#: src/tilda.ui:3764 msgid " " msgstr "" -#: tilda.glade:2871 +#: src/tilda.ui:3000 #, fuzzy msgid "Paste" msgstr "标题" -#: tilda.glade:2911 +#: src/tilda.ui:3040 msgid "Go To Next Tab" msgstr "" -#: tilda.glade:2949 +#: src/tilda.ui:3078 #, fuzzy msgid "Quit" msgstr "标题" -#: tilda.glade:2987 +#: src/tilda.ui:3116 #, fuzzy msgid "Add Tab" msgstr "标题" -#: tilda.glade:3026 +#: src/tilda.ui:3155 msgid "Go To Tab 10" msgstr "" -#: tilda.glade:3066 +#: src/tilda.ui:3195 msgid "Go To Tab 5" msgstr "" -#: tilda.glade:3104 +#: src/tilda.ui:3233 msgid "Go To Tab 4" msgstr "" -#: tilda.glade:3142 +#: src/tilda.ui:3271 msgid "Go To Tab 3" msgstr "" -#: tilda.glade:3180 +#: src/tilda.ui:3309 msgid "Go To Tab 2" msgstr "" -#: tilda.glade:3218 +#: src/tilda.ui:3347 msgid "Go To Tab 1" msgstr "" -#: tilda.glade:3256 +#: src/tilda.ui:3385 msgid "Go To Previous Tab" msgstr "" -#: tilda.glade:3296 +#: src/tilda.ui:3425 #, fuzzy msgid "Close Tab" msgstr "关闭标签(_C)" -#: tilda.glade:3336 +#: src/tilda.ui:3465 #, fuzzy msgid "Copy" msgstr "字体" -#: tilda.glade:3374 +#: src/tilda.ui:3503 #, fuzzy msgid "Pull Down Terminal" msgstr "下拉快捷键" -#: tilda.glade:3410 +#: src/tilda.ui:3539 msgid "Go To Tab 6" msgstr "" -#: tilda.glade:3450 +#: src/tilda.ui:3579 msgid "Go To Tab 7" msgstr "" -#: tilda.glade:3490 +#: src/tilda.ui:3619 msgid "Go To Tab 8" msgstr "" -#: tilda.glade:3530 +#: src/tilda.ui:3659 msgid "Go To Tab 9" msgstr "" -#: tilda.glade:3570 +#: src/tilda.ui:3699 #, fuzzy -msgid "Move Tabe Left" +msgid "Move Tab Left" msgstr "关闭标签(_C)" -#: tilda.glade:3608 +#: src/tilda.ui:3737 #, fuzzy msgid "Move Tab Right" msgstr "高度" -#: tilda.glade:3632 +#: src/tilda.ui:3777 +msgid "Toggle Fullscreen" +msgstr "" + +#: src/tilda.ui:3799 msgid "Keybindings" msgstr "键绑定" @@ -464,88 +612,83 @@ msgid "Bad value for \"d_set_title\" in config file\n" msgstr "配置文件中\"d_set_title\"的值有误\n" -#: src/configsys.c:173 +#: src/configsys.c:199 #, fuzzy msgid "Problem when opening config file\n" msgstr "解析配置文件错误\n" -#: src/configsys.c:177 -#, fuzzy -msgid "Problem while parsing config file\n" -msgstr "解析配置文件错误\n" - -#: src/configsys.c:180 +#: src/configsys.c:203 msgid "An unexpected error occured while parsing the config file\n" msgstr "" -#: src/configsys.c:308 +#: src/configsys.c:371 msgid "Unable to sync the config file to disk\n" msgstr "无法同步磁盘上的配置文件\n" -#: src/configsys.c:318 +#: src/configsys.c:381 msgid "Unable to close the config file\n" msgstr "无法关闭配置文件\n" -#: src/configsys.c:327 +#: src/configsys.c:390 #, c-format msgid "Unable to write the config file to %s\n" msgstr "无法将配置文件写入%s\n" -#: src/tilda.c:211 +#: src/tilda.c:216 #, c-format msgid "Unable to run command: `%s'\n" msgstr "无法执行命令：`%s'\n" -#: src/tilda.c:234 src/tilda.c:446 +#: src/tilda.c:255 src/tilda.c:492 #, c-format msgid "Unable to open lock directory: %s\n" msgstr "无法打开锁定的目录：%s\n" -#: src/tilda.c:297 +#: src/tilda.c:319 msgid "Use Antialiased Fonts" msgstr "使用平滑字体" -#: src/tilda.c:298 +#: src/tilda.c:320 msgid "Set the background color" msgstr "设置背景颜色" -#: src/tilda.c:299 +#: src/tilda.c:321 msgid "Run a command at startup" msgstr "启动时运行命令" -#: src/tilda.c:301 +#: src/tilda.c:323 msgid "Set the font to the following string" msgstr "使用如下字符串的字体" -#: src/tilda.c:302 +#: src/tilda.c:324 msgid "Scrollback Lines" msgstr "回滚行" -#: src/tilda.c:303 +#: src/tilda.c:325 msgid "Use Scrollbar" msgstr "使用滚动条" -#: src/tilda.c:304 +#: src/tilda.c:326 msgid "Opaqueness: 0-100%" msgstr "不透明: 0-100%" -#: src/tilda.c:305 +#: src/tilda.c:327 msgid "Print the version, then exit" msgstr "显示版本号后退出" -#: src/tilda.c:306 +#: src/tilda.c:328 msgid "Set Initial Working Directory" msgstr "设定初始工作目录" -#: src/tilda.c:309 +#: src/tilda.c:331 msgid "Set Background Image" msgstr "设置背景图片" -#: src/tilda.c:310 +#: src/tilda.c:332 msgid "Show Configuration Wizard" msgstr "显示配置向导" -#: src/tilda.c:326 +#: src/tilda.c:348 #, c-format msgid "" "Error parsing command-line options. Try \"tilda --help\"\n" @@ -558,232 +701,252 @@ "\n" "错误信息：%s\n" -#: src/tilda.c:406 +#: src/tilda.c:445 #, c-format msgid "Creating directory:'%s'\n" msgstr "" -#: src/tilda.c:515 +#: src/tilda.c:560 msgid "" -"Found style.css in the user config directory, applying user css stlye.\n" +"Found style.css in the user config directory, applying user css style.\n" msgstr "" -#: src/tilda.c:546 +#: src/tilda.c:591 msgid "Migrating old config path to XDG folders\n" msgstr "" -#: src/tilda.c:638 src/wizard.c:329 +#: src/tilda.c:717 src/wizard.c:370 #, fuzzy msgid "" "The keybinding you chose for \"Pull Down Terminal\" is invalid. Please " "choose another." msgstr "键绑定无效。请重新选择。" -#: src/tilda_terminal.c:390 +#: src/tilda_terminal.c:408 +#, fuzzy, c-format +msgid "Problem reading link %s: %s\n" +msgstr "解析自定义命令错误：%s\n" + +#: src/tilda_terminal.c:446 #, c-format msgid "Problem parsing custom command: %s\n" msgstr "解析自定义命令错误：%s\n" -#: src/tilda_terminal.c:391 src/tilda_terminal.c:420 +#: src/tilda_terminal.c:447 src/tilda_terminal.c:476 msgid "Launching default shell instead\n" msgstr "运行默认shell作为替代\n" -#: src/tilda_terminal.c:419 +#: src/tilda_terminal.c:475 #, c-format msgid "Unable to launch custom command: %s\n" msgstr "无法执行自定义命令：%s\n" -#: src/tilda_terminal.c:460 +#: src/tilda_terminal.c:530 #, c-format msgid "Unable to launch default shell: %s\n" msgstr "无法运行默认shell：%s\n" -#: src/tilda_terminal.c:747 +#: src/tilda_terminal.c:818 msgid "_New Tab" msgstr "新建标签(_N)" -#: src/tilda_terminal.c:751 +#: src/tilda_terminal.c:822 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: src/tilda_terminal.c:763 +#: src/tilda_terminal.c:834 msgid "Toggle fullscreen" msgstr "" -#: src/tilda_terminal.c:853 +#: src/tilda_terminal.c:930 #, c-format msgid "Failed to launch the web browser. The command was `%s'\n" msgstr "无法运行web浏览器。该命令是'%s'\n" -#: src/tilda_window.c:102 +#: src/tilda_window.c:101 msgid "You have a bad tab_pos in your configuration file\n" msgstr "在你的配置文件中有一个错误的标签位置\n" -#: src/tilda_window.c:491 +#: src/tilda_window.c:509 #, c-format msgid "Unable to set tilda's icon: %s\n" msgstr "无法设置tilda的图标: %s\n" -#: src/tilda_window.c:689 +#: src/tilda_window.c:695 msgid "Out of memory, cannot create tab\n" msgstr "内存不够，无法创建标签页\n" -#: src/wizard.c:151 +#: src/wizard.c:189 msgid "Tango" msgstr "" -#: src/wizard.c:152 +#: src/wizard.c:190 msgid "Linux console" msgstr "" -#: src/wizard.c:153 +#: src/wizard.c:191 msgid "XTerm" msgstr "" -#: src/wizard.c:154 +#: src/wizard.c:192 msgid "Rxvt" msgstr "" -#: src/wizard.c:155 -msgid "Zenburn" -msgstr "" - -#: src/wizard.c:246 +#: src/wizard.c:286 #, fuzzy, c-format msgid "Tilda %d Config" msgstr "Tilda设置" -#: src/wizard.c:333 +#: src/wizard.c:374 #, fuzzy msgid "" "The keybinding you chose for \"Add Tab\" is invalid. Please choose another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:335 +#: src/wizard.c:376 #, fuzzy msgid "" "The keybinding you chose for \"Close Tab\" is invalid. Please choose another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:337 +#: src/wizard.c:378 #, fuzzy msgid "" "The keybinding you chose for \"Next Tab\" is invalid. Please choose another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:339 +#: src/wizard.c:380 #, fuzzy msgid "" "The keybinding you chose for \"Previous Tab\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:341 +#: src/wizard.c:382 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Left\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:343 +#: src/wizard.c:384 #, fuzzy msgid "" "The keybinding you chose for \"Move Tab to Right\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:345 +#: src/wizard.c:386 #, fuzzy msgid "" "The keybinding you chose for \"Copy\" is invalid. Please choose another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:347 +#: src/wizard.c:388 #, fuzzy msgid "" "The keybinding you chose for \"Paste\" is invalid. Please choose another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:349 +#: src/wizard.c:390 #, fuzzy msgid "" "The keybinding you chose for \"Quit\" is invalid. Please choose another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:351 +#: src/wizard.c:392 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 1\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:353 +#: src/wizard.c:394 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 2\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:355 +#: src/wizard.c:396 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 3\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:357 +#: src/wizard.c:398 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 4\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:359 +#: src/wizard.c:400 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 5\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:361 +#: src/wizard.c:402 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 6\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:363 +#: src/wizard.c:404 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 7\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:365 +#: src/wizard.c:406 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 8\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:367 +#: src/wizard.c:408 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 9\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:369 +#: src/wizard.c:410 #, fuzzy msgid "" "The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose " "another." msgstr "键绑定无效。请重新选择。" -#: src/wizard.c:819 +#: src/wizard.c:412 +#, fuzzy +msgid "" +"The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose " +"another." +msgstr "键绑定无效。请重新选择。" + +#: src/wizard.c:870 +msgid "Invalid non-focus pull up behaviour, ignoring\n" +msgstr "" + +#: src/wizard.c:895 msgid "Invalid tab position setting, ignoring\n" msgstr "无效标签位置，忽略\n" +#: src/wizard.c:1871 +msgid "Enter keyboard shortcut" +msgstr "" + +#, fuzzy +#~ msgid "Problem while parsing config file\n" +#~ msgstr "解析配置文件错误\n" + #~ msgid "" #~ "Top\n" #~ "Bottom\n" @@ -835,18 +998,6 @@ #~ "右侧\n" #~ "禁用" -#~ msgid "" -#~ "ASCII DEL\n" -#~ "Escape sequence\n" -#~ "Control-H" -#~ msgstr "" -#~ "ASCII DEL\n" -#~ "转码序列\n" -#~ "Ctrl+H" - -#~ msgid "gtk-close" -#~ msgstr "关闭" - #~ msgid "Key Binding" #~ msgstr "键绑定" diff -Nru tilda-1.1.12/README tilda-1.2.2/README --- tilda-1.1.12/README 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ -Contacting the Developers / Questions and Comments -================================================================================ -Please use the Issue tracker on Github or email questions and comments to anyone -listed in the AUTHORS file. Please see the section titled "Reporting Bugs" below -for how to submit a bug report. - -Dependencies -================================================================================ -Glib >= 2.30 - http://developer.gnome.org/glib/2.30/ -Gtk+3 >= 3.0 - http://developer.gnome.org/gtk3/3.0/ -VTE >= 2.90 - http://developer.gnome.org/vte/0.30/ -libConfuse - http://www.nongnu.org/confuse/ - - -Installing from source -================================================================================ -See the INSTALL file for details. Generally if you have installed the -development packages (*-dev or *-devel) of the dependencies above then it -should be possible to install with: - - ./autogen.sh --prefix=/usr - make --silent - sudo make install - -If you don't want to install to the /usr prefix, choose some other prefix, -such as /opt/tilda and add it to your path. Also I recomment do run make with -the --silent (or -s) option. - -Running Tilda -================================================================================ -Once you have installed tilda, you can run it using the tilda.desktop file which -should have been installed into your system. Alternatively, you can run `tilda' -from your command line, or any other convenient way. - -The first time you run Tilda, it will create the default configuration file for -you, and show the configuration wizard. If you do not want to change any -settings, just press the "OK" button to accept the defaults. - -The default keybindings to show and hide Tilda are as follows: -F1 - the first instance -F2 - the second instance -F3 - the third instance -... - -Other default keybindings are: -Shift-Ctrl-T - Open new tab -Ctrl-PageUp - Next tab -Ctrl-PageDown - Previous tab -Shift-Ctrl-W - Close current tab -Shift-Ctrl-Q - Exit Tilda - - -Specifying your own keybinding to hide / show Tilda -================================================================================ -We, the developers, have attempted to make the keybinding setting work with as -little trouble as possible. Some example keybindings follow: - - -|===================|==========================================================| -| Keybinding String | Notes | -|===================|==========================================================| -| grave | This will use the tilde key. Many people want this. -|===================|==========================================================| -| ~ | This is the same as grave | -|===================|==========================================================| -| space | This will use the spacebar to show / hide Tilda. | -| | NOT RECOMMENDED! | -|===================|==========================================================| -| A | Press Shift, Control, and the "a" key at the same time | -|===================|==========================================================| -| space | Press Shift and the spacebar at the same time | -|===================|==========================================================| -| z | Press Control and the "z" key at the same time | -|===================|==========================================================| - - -That should cover most of the cases. If you want to use something else, it -probably follows the pattern, so give it a try. Alternatively, you can use the -configuration wizard, and press the "Grab Keybinding" button on the -"Keybindings" tab, then type the combination you want to use. Hopefully, Tilda -will be able to grab it for you. - - -Files that Tilda creates -================================================================================ -Tilda now adheres to the XDG Base Directory Specification and creates its files -in the $XDG_CONFIG_HOME and $XDG_CACHE_HOME folders which normally default to -~/.config/ and ~/.cache/. Tilda will create a lock file in the cache directory -each time it starts, to keep track of how many instances are running: - ~/.cache/tilda/locks/lock_$PID_$INSTANCE -Tilda will also create the config files in: - ~/.config/tilda/config_$INSTANCE -where $INSTANCE is the number of how many instances are running and -$PID the process id. If you have been using the old version of tilda before, -there is a migration function, that will automatically move the files at the -old location ~/.tilda/ to the XDG folders for you. - -Getting more help -================================================================================ -To get more help, you should first open a command prompt, and run "tilda ---help". If that does not help you satisfactorily, please see the section titled -"Contacting the Developers / Questions and Comments" at the beginning of this -document. - - -Reporting Bugs -================================================================================ -We have done our best to make sure that Tilda is free from bugs, but it is -inevitable that we have missed some. - -You may open bugs at http://github.com/lanoxx/tilda/issues or email them to the -developers directly. - -Contributing to Tilda -================================================================================ -If you would like to help us develop Tilda, please send an email to one (or all) -of the developers or open an issue on Github. - -You can also look into the TODO file and see if there is something there that -you would like to do. - diff -Nru tilda-1.1.12/README.md tilda-1.2.2/README.md --- tilda-1.1.12/README.md 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/README.md 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,107 @@ +# What is Tilda? + +Tilda is a terminal emulator and can be compared with other popular terminal emulators such as +gnome-terminal (Gnome), Konsole (KDE), xterm and many others. The specialities of Tilda +are that it does not behave like a normal window but instead it can be pulled up and down from the top +of the screen with a special hotkey. Additionally Tilda is highly configurable. It is possible to configure the +hotkeys for keybindings, change the appearance and many options that affect the behavior of Tilda. The screen shots +below show some of the options that Tilda provides. + +## General options +![General](images/tilda_general.png) +## Appearance options +![Appearance](images/tilda_appearance.png) +##Keybindings options +![Keybindings](images/tilda_keybindings.png) + +# Installing Tilda + +Tilda should be packaged for your distribution if you are running Debian or any Debian derived distribution such as +Ubuntu or Linux Mint. For other distributions please check your package manager if it provides Tilda. You can also +install Tilda from source. For instructions to compile, install and optionally package tilda please see +**[HACKING.md](HACKING.md)**. + +# Running Tilda + +Once you have installed tilda, it should have automatically registered a menu entry in your desktops application menu. +Alternatively, you can run `tilda` from your command line. + +The first time you run Tilda, it will create the default configuration file for +you, and show the configuration wizard. If you do not want to change any +settings, just press the "OK" button to accept the defaults. + +The default keybindings to show and hide Tilda are as follows: + + * F1 - the first instance + * F2 - the second instance + * F3 - the third instance + * ... + +Other default keybindings are: + + * Shift-Ctrl-T - Open new tab + * Ctrl-PageUp - Next tab + * Ctrl-PageDown - Previous tab + * Shift-Ctrl-W - Close current tab + * Shift-Ctrl-Q - Exit Tilda + +# Specifying your own keybinding to hide / show Tilda + +We, the developers, have attempted to make the keybinding setting work with as +little trouble as possible. Some example keybindings follow: + +| Keybinding String | Notes | +|-------------------|-------------------------------------------------------------------| +| `grave` | This will use the tilde key. Many people want this. | +| `~` | This is the same as grave | +| `space` | This will use the spacebar to show / hide Tilda. NOT RECOMMENDED! | +| `A` | Press Shift, Control, and the "a" key at the same time | +| `space` | Press Shift and the spacebar at the same time | +| `z` | Press Control and the "z" key at the same time | + +That should cover most of the cases. If you want to use something else, it +probably follows the pattern, so give it a try. Alternatively, you can use the +configuration wizard, and press the "Pull Down Terminal" button on the +"Keybindings" tab, then type the combination you want to use. Hopefully, Tilda +will be able to grab it for you. The `` key cannot be grabbed, so at the moment +combinations such as `` are not possible. + +# Files that Tilda creates + +Since approximately version 0.9.6 Tilda adheres to the XDG Base Directory Specification and +creates its files in the $XDG_CONFIG_HOME and $XDG_CACHE_HOME folders which normally default to +~/.config/ and ~/.cache/. Tilda will create a lock file in the cache directory +each time it starts, to keep track of how many instances are running: + + ~/.cache/tilda/locks/lock_$PID_$INSTANCE + +Tilda will also create the config files in: + + ~/.config/tilda/config_$INSTANCE + +where `$INSTANCE` is the number of how many instances are running and +`$PID` the process id. Tilda automatically migrates the files for you if it detects configuration file +at the old location `~/.tilda`. + +# Getting more help / Questions and Comments + +To get more help, you should first open a command prompt, and run `tilda +--help`. You can also take a look at the **[Wiki](https://github.com/lanoxx/tilda/wiki)**, or email +questions and comments to anyone listed in the [AUTHORS](AUTHORS) file. + +# Reporting Bugs + +We have done our best to make sure that Tilda is free from bugs, but it is +inevitable that we have missed some. + +You may open bugs in the **[issue section](http://github.com/lanoxx/tilda/issues)** or email them to the +developers directly. + +# Contributing to Tilda + +Tilda is written in C with the use of the libraries **glib**, **GTK+**, **libconfuse** and **X11**. +If you would like to help us develop Tilda you can look at the issue section to see if you can help to fix an open issue. +Or you can send an email to the developers. Pull requests and patches are always welcome. + +You can also look into the [TODO.md](TODO.md) file and see if there is something there that +you would like to do. diff -Nru tilda-1.1.12/src/callback_func.c tilda-1.2.2/src/callback_func.c --- tilda-1.1.12/src/callback_func.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/callback_func.c 2014-10-28 11:36:24.000000000 +0000 @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include "debug.h" +#include "configsys.h" +#include "callback_func.h" #include #include diff -Nru tilda-1.1.12/src/callback_func.h tilda-1.2.2/src/callback_func.h --- tilda-1.1.12/src/callback_func.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/callback_func.h 2014-10-28 11:36:24.000000000 +0000 @@ -17,8 +17,8 @@ #ifndef CALLBACK_FUNC_H #define CALLBACK_FUNC_H -#include -#include +#include "tilda_window.h" +#include "tilda_terminal.h" #include #include diff -Nru tilda-1.1.12/src/configsys.c tilda-1.2.2/src/configsys.c --- tilda-1.1.12/src/configsys.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/configsys.c 2014-10-28 11:36:24.000000000 +0000 @@ -1,7 +1,24 @@ /* vim: set ts=4 sts=4 sw=4 expandtab textwidth=112: */ +/* + * This is free software; you can redistribute it and/or modify it under + * the terms of the GNU Library 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. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see . + */ + +#define _POSIX_SOURCE /* feature test macro for fileno */ +#define _XOPEN_SOURCE /* feature test macro for fsync */ #include -#include +#include "debug.h" #include #include @@ -10,7 +27,7 @@ #include /* atoi */ #include /* fsync */ -#include +#include "configsys.h" static cfg_t *tc; @@ -73,9 +90,13 @@ CFG_INT("auto_hide_time", 2000, CFGF_NONE), CFG_INT("on_last_terminal_exit", 0, CFGF_NONE), CFG_INT("palette_scheme", 0, CFGF_NONE), + CFG_INT("non_focus_pull_up_behaviour", 0, CFGF_NONE), + /* The default monitor number is 0 */ CFG_INT("show_on_monitor_number", 0, CFGF_NONE), - + /* The length of a tab title */ + CFG_INT("title_max_length", 25, CFGF_NONE), + /* int list */ CFG_INT_LIST("palette", "{\ 0x2e2e, 0x3434, 0x3636,\ @@ -106,6 +127,7 @@ CFG_INT("text_blue", 0xffff, CFGF_NONE), /* booleans */ + CFG_BOOL("scroll_history_infinite", FALSE, CFGF_NONE), CFG_BOOL("scroll_background", TRUE, CFGF_NONE), CFG_BOOL("scroll_on_output", FALSE, CFGF_NONE), CFG_BOOL("notebook_border", FALSE, CFGF_NONE), @@ -129,15 +151,19 @@ CFG_BOOL("double_buffer", FALSE, CFGF_NONE), CFG_BOOL("auto_hide_on_focus_lost", FALSE, CFGF_NONE), CFG_BOOL("auto_hide_on_mouse_leave", FALSE, CFGF_NONE), + /* Whether we limit the length of a tab title */ + CFG_BOOL("title_max_length_flag", TRUE, CFGF_NONE), + /* Whether to set a new tab's working dir to the current tab's */ + CFG_BOOL("inherit_working_dir", TRUE, CFGF_NONE), CFG_END() }; /* Define these here, so that we can enable a non-threadsafe version * without changing the code below. */ #ifndef NO_THREADSAFE - static GStaticMutex mutex = G_STATIC_MUTEX_INIT; - #define config_mutex_lock() g_static_mutex_lock (&mutex) - #define config_mutex_unlock() g_static_mutex_unlock (&mutex) + static GMutex mutex; + #define config_mutex_lock() g_mutex_lock (&mutex) + #define config_mutex_unlock() g_mutex_unlock (&mutex) #else #define config_mutex_lock() #define config_mutex_unlock() @@ -147,7 +173,7 @@ #define CONFIGS_SAME 0 #define CONFIG1_NEWER 1 -static gboolean compare_config_versions (const gchar *config1, const gchar *config2); +static gboolean compare_config_versions (const gchar *config1, const gchar *config2) G_GNUC_UNUSED; @@ -172,16 +198,17 @@ DEBUG_ERROR ("Problem parsing config"); g_printerr (_("Problem when opening config file\n")); return 1; - } else if (ret == CFG_PARSE_ERROR) { - DEBUG_ERROR ("Problem parsing config"); - g_printerr (_("Problem while parsing config file\n")); - } else if (ret != CFG_SUCCESS) { + } else if (ret != CFG_SUCCESS) { DEBUG_ERROR ("Problem parsing config."); g_printerr (_("An unexpected error occured while " "parsing the config file\n")); } } + #ifndef NO_THREADSAFE + g_mutex_init(&mutex); + #endif + return 0; } @@ -218,6 +245,22 @@ return 0; } +gint config_setdouble (const gchar *key, const gdouble val) { + config_mutex_lock (); + cfg_setfloat (tc, key, val); + config_mutex_unlock (); + + return 0; +} + +gint config_setndouble (const gchar *key, const gdouble val, const guint idx) { + config_mutex_lock (); + cfg_setnfloat (tc, key, val, idx); + config_mutex_unlock (); + + return 0; +} + gint config_setstr (const gchar *key, const gchar *val) { config_mutex_lock (); @@ -256,6 +299,26 @@ config_mutex_unlock (); return temp; +} + +gdouble config_getdouble (const gchar* key) { + gdouble temp; + + config_mutex_lock (); + temp = cfg_getfloat (tc, key); + config_mutex_unlock (); + + return temp; +} + +gdouble config_getndouble (const gchar* key, const guint idx) { + gdouble temp; + + config_mutex_lock (); + temp = cfg_getnfloat (tc, key, idx); + config_mutex_unlock (); + + return temp; } gchar* config_getstr (const gchar *key) diff -Nru tilda-1.1.12/src/configsys.h tilda-1.2.2/src/configsys.h --- tilda-1.1.12/src/configsys.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/configsys.h 2014-10-28 11:36:24.000000000 +0000 @@ -1,4 +1,18 @@ /* vim: set ts=8 sts=8 sw=8 noexpandtab textwidth=112: */ +/* + * This is free software; you can redistribute it and/or modify it under + * the terms of the GNU Library 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. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see . + */ #ifndef CONFIGSYS_H #define CONFIGSYS_H @@ -15,16 +29,20 @@ gint config_write (const gchar *config_file); /* Set values in the config system */ -gint config_setint (const gchar *key, const gint val); -gint config_setstr (const gchar *key, const gchar *val); -gint config_setbool(const gchar *key, const gboolean val); -gint config_setnint(const gchar *key, const gint val, const guint idx); +gint config_setint (const gchar *key, const gint val); +gint config_setstr (const gchar *key, const gchar *val); +gint config_setbool (const gchar *key, const gboolean val); +gint config_setnint (const gchar *key, const gint val, const guint idx); +gint config_setdouble (const gchar *key, const gdouble val); +gint config_setndouble (const gchar *key, const gdouble vat, const guint idx); /* Get values from the config system */ -gint config_getint (const gchar *key); -gchar* config_getstr (const gchar *key); -gboolean config_getbool(const gchar *key); -glong config_getnint(const gchar *key, const guint idx); +gint config_getint (const gchar *key); +gchar* config_getstr (const gchar *key); +gboolean config_getbool (const gchar *key); +glong config_getnint (const gchar *key, const guint idx); +gdouble config_getdouble (const gchar *key); +gdouble config_getndouble (const gchar *key, const guint idx); #endif /* CONFIGSYS_H */ diff -Nru tilda-1.1.12/src/debug.h tilda-1.2.2/src/debug.h --- tilda-1.1.12/src/debug.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/debug.h 2014-10-28 11:36:24.000000000 +0000 @@ -18,7 +18,8 @@ #ifndef DEBUG_H #define DEBUG_H -#include +#include "tilda-config.h" +#include #include #include @@ -64,7 +65,7 @@ #if DEBUG_FUNCTIONS - #define DEBUG_FUNCTION(NAME) g_printerr("FUNCTION ENTERED: %s\n", (NAME)) + #define DEBUG_FUNCTION(NAME) g_printerr("%s: FUNCTION ENTERED: %s\n", basename(__FILE__), (NAME)) #else @@ -75,6 +76,11 @@ /* A macro that calls perror() with a consistent header string */ #define TILDA_PERROR() perror("Tilda encountered an error") +#ifdef DEBUG +# define TRACE(x) x +#else +# define TRACE(x) do {} while (FALSE); +#endif #endif /* DEBUG_H */ diff -Nru tilda-1.1.12/src/eggaccelerators.c tilda-1.2.2/src/eggaccelerators.c --- tilda-1.1.12/src/eggaccelerators.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/eggaccelerators.c 2014-10-28 11:36:24.000000000 +0000 @@ -1,3 +1,4 @@ +/* vim: set ts=4 sts=4 sw=4 expandtab: */ /* eggaccelerators.c * Copyright (C) 2002 Red Hat, Inc.; Copyright 1998, 2001 Tim Janik * Developed by Havoc Pennington, Tim Janik @@ -13,9 +14,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "eggaccelerators.h" @@ -24,25 +23,20 @@ #include #include -enum -{ - EGG_MODMAP_ENTRY_SHIFT = 0, - EGG_MODMAP_ENTRY_LOCK = 1, - EGG_MODMAP_ENTRY_CONTROL = 2, - EGG_MODMAP_ENTRY_MOD1 = 3, - EGG_MODMAP_ENTRY_MOD2 = 4, - EGG_MODMAP_ENTRY_MOD3 = 5, - EGG_MODMAP_ENTRY_MOD4 = 6, - EGG_MODMAP_ENTRY_MOD5 = 7, - EGG_MODMAP_ENTRY_LAST = 8 +enum { + EGG_MODMAP_ENTRY_SHIFT = 0, + EGG_MODMAP_ENTRY_LOCK = 1, + EGG_MODMAP_ENTRY_CONTROL = 2, + EGG_MODMAP_ENTRY_MOD1 = 3, + EGG_MODMAP_ENTRY_MOD2 = 4, + EGG_MODMAP_ENTRY_MOD3 = 5, + EGG_MODMAP_ENTRY_MOD4 = 6, + EGG_MODMAP_ENTRY_MOD5 = 7, + EGG_MODMAP_ENTRY_LAST = 8 }; -#define MODMAP_ENTRY_TO_MODIFIER(x) (1 << (x)) - -typedef struct -{ - EggVirtualModifierType mapping[EGG_MODMAP_ENTRY_LAST]; - +typedef struct { + EggVirtualModifierType mapping[EGG_MODMAP_ENTRY_LAST]; } EggModmap; const EggModmap* egg_keymap_get_modmap (GdkKeymap *keymap); @@ -50,143 +44,78 @@ static inline gboolean is_alt (const gchar *string) { - return ((string[0] == '<') && - (string[1] == 'a' || string[1] == 'A') && - (string[2] == 'l' || string[2] == 'L') && - (string[3] == 't' || string[3] == 'T') && - (string[4] == '>')); + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_ctl (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'c' || string[1] == 'C') && - (string[2] == 't' || string[2] == 'T') && - (string[3] == 'l' || string[3] == 'L') && - (string[4] == '>')); +is_ctl (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_modx (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'm' || string[1] == 'M') && - (string[2] == 'o' || string[2] == 'O') && - (string[3] == 'd' || string[3] == 'D') && - (string[4] >= '1' && string[4] <= '5') && - (string[5] == '>')); +is_modx (const gchar *string) { + return ((string[0] == '<') && + (string[1] == 'm' || string[1] == 'M') && + (string[2] == 'o' || string[2] == 'O') && + (string[3] == 'd' || string[3] == 'D') && + (string[4] >= '1' && string[4] <= '5') && + (string[5] == '>')); } static inline gboolean -is_ctrl (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'c' || string[1] == 'C') && - (string[2] == 't' || string[2] == 'T') && - (string[3] == 'r' || string[3] == 'R') && - (string[4] == 'l' || string[4] == 'L') && - (string[5] == '>')); +is_ctrl (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_shft (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 's' || string[1] == 'S') && - (string[2] == 'h' || string[2] == 'H') && - (string[3] == 'f' || string[3] == 'F') && - (string[4] == 't' || string[4] == 'T') && - (string[5] == '>')); +is_shft (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_shift (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 's' || string[1] == 'S') && - (string[2] == 'h' || string[2] == 'H') && - (string[3] == 'i' || string[3] == 'I') && - (string[4] == 'f' || string[4] == 'F') && - (string[5] == 't' || string[5] == 'T') && - (string[6] == '>')); +is_shift (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_control (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'c' || string[1] == 'C') && - (string[2] == 'o' || string[2] == 'O') && - (string[3] == 'n' || string[3] == 'N') && - (string[4] == 't' || string[4] == 'T') && - (string[5] == 'r' || string[5] == 'R') && - (string[6] == 'o' || string[6] == 'O') && - (string[7] == 'l' || string[7] == 'L') && - (string[8] == '>')); +is_control (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_release (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'r' || string[1] == 'R') && - (string[2] == 'e' || string[2] == 'E') && - (string[3] == 'l' || string[3] == 'L') && - (string[4] == 'e' || string[4] == 'E') && - (string[5] == 'a' || string[5] == 'A') && - (string[6] == 's' || string[6] == 'S') && - (string[7] == 'e' || string[7] == 'E') && - (string[8] == '>')); +is_release (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_meta (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'm' || string[1] == 'M') && - (string[2] == 'e' || string[2] == 'E') && - (string[3] == 't' || string[3] == 'T') && - (string[4] == 'a' || string[4] == 'A') && - (string[5] == '>')); +is_meta (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_super (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 's' || string[1] == 'S') && - (string[2] == 'u' || string[2] == 'U') && - (string[3] == 'p' || string[3] == 'P') && - (string[4] == 'e' || string[4] == 'E') && - (string[5] == 'r' || string[5] == 'R') && - (string[6] == '>')); +is_super (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_hyper (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'h' || string[1] == 'H') && - (string[2] == 'y' || string[2] == 'Y') && - (string[3] == 'p' || string[3] == 'P') && - (string[4] == 'e' || string[4] == 'E') && - (string[5] == 'r' || string[5] == 'R') && - (string[6] == '>')); +is_hyper (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } static inline gboolean -is_primary (const gchar *string) -{ - return ((string[0] == '<') && - (string[1] == 'p' || string[1] == 'P') && - (string[2] == 'r' || string[2] == 'R') && - (string[3] == 'i' || string[3] == 'I') && - (string[4] == 'm' || string[4] == 'M') && - (string[5] == 'a' || string[5] == 'A') && - (string[6] == 'r' || string[6] == 'R') && - (string[7] == 'y' || string[7] == 'Y') && - (string[8] == '>')); +is_primary (const gchar *string) { + const char *sample = ""; + return g_ascii_strncasecmp(string, sample, strlen(sample)) == 0; } @@ -212,7 +141,7 @@ * can represent various keyboard keys (numlock, meta, hyper, etc.), * the virtual modifier represents the keyboard key, the concrete * modifier the actual Mod2-Mod5 bits in the key press event. - * + * * Returns: %TRUE on success. */ gboolean @@ -220,136 +149,109 @@ guint *accelerator_key, EggVirtualModifierType *accelerator_mods) { - guint keyval; - GdkModifierType mods; - gint len; - gboolean bad_keyval; - - if (accelerator_key) - *accelerator_key = 0; - if (accelerator_mods) - *accelerator_mods = 0; - - g_return_val_if_fail (accelerator != NULL, FALSE); - - bad_keyval = FALSE; - - keyval = 0; - mods = 0; - len = strlen (accelerator); - while (len) - { - if (*accelerator == '<') - { - if (len >= 9 && is_release (accelerator)) - { - accelerator += 9; - len -= 9; - mods |= EGG_VIRTUAL_RELEASE_MASK; - } - else if (len >= 9 && is_control (accelerator)) - { - accelerator += 9; - len -= 9; - mods |= EGG_VIRTUAL_CONTROL_MASK; - } - else if (len >= 7 && is_shift (accelerator)) - { - accelerator += 7; - len -= 7; - mods |= EGG_VIRTUAL_SHIFT_MASK; - } - else if (len >= 6 && is_shft (accelerator)) - { - accelerator += 6; - len -= 6; - mods |= EGG_VIRTUAL_SHIFT_MASK; - } - else if (len >= 6 && is_ctrl (accelerator)) - { - accelerator += 6; - len -= 6; - mods |= EGG_VIRTUAL_CONTROL_MASK; - } - else if (len >= 6 && is_modx (accelerator)) - { - static const guint mod_vals[] = { - EGG_VIRTUAL_ALT_MASK, EGG_VIRTUAL_MOD2_MASK, EGG_VIRTUAL_MOD3_MASK, - EGG_VIRTUAL_MOD4_MASK, EGG_VIRTUAL_MOD5_MASK - }; - - len -= 6; - accelerator += 4; - mods |= mod_vals[*accelerator - '1']; - accelerator += 2; - } - else if (len >= 5 && is_ctl (accelerator)) - { - accelerator += 5; - len -= 5; - mods |= EGG_VIRTUAL_CONTROL_MASK; - } - else if (len >= 5 && is_alt (accelerator)) - { - accelerator += 5; - len -= 5; - mods |= EGG_VIRTUAL_ALT_MASK; - } - else if (len >= 6 && is_meta (accelerator)) - { - accelerator += 6; - len -= 6; - mods |= EGG_VIRTUAL_META_MASK; - } - else if (len >= 7 && is_hyper (accelerator)) - { - accelerator += 7; - len -= 7; - mods |= EGG_VIRTUAL_HYPER_MASK; - } - else if (len >= 7 && is_super (accelerator)) - { - accelerator += 7; - len -= 7; - mods |= EGG_VIRTUAL_SUPER_MASK; - } - else if (len >= 9 && is_primary (accelerator)) - { - accelerator += 9; - len -= 9; - mods |= EGG_VIRTUAL_CONTROL_MASK; + guint keyval; + GdkModifierType mods; + size_t len; + gboolean bad_keyval; + + if (accelerator_key) + *accelerator_key = 0; + if (accelerator_mods) + *accelerator_mods = (EggVirtualModifierType) 0; + + g_return_val_if_fail (accelerator != NULL, FALSE); + + bad_keyval = FALSE; + + keyval = 0; + mods = (GdkModifierType) 0; + len = strlen (accelerator); + while (len) { + if (*accelerator == '<') { + if (len >= 9 && is_release (accelerator)) { + accelerator += 9; + len -= 9; + mods |= EGG_VIRTUAL_RELEASE_MASK; + } else if (len >= 9 && is_control (accelerator)) { + accelerator += 9; + len -= 9; + mods |= EGG_VIRTUAL_CONTROL_MASK; + } else if (len >= 7 && is_shift (accelerator)) { + accelerator += 7; + len -= 7; + mods |= EGG_VIRTUAL_SHIFT_MASK; + } else if (len >= 6 && is_shft (accelerator)) { + accelerator += 6; + len -= 6; + mods |= EGG_VIRTUAL_SHIFT_MASK; + } else if (len >= 6 && is_ctrl (accelerator)) { + accelerator += 6; + len -= 6; + mods |= EGG_VIRTUAL_CONTROL_MASK; + } else if (len >= 6 && is_modx (accelerator)) { + static const guint mod_vals[] = { + EGG_VIRTUAL_ALT_MASK, + EGG_VIRTUAL_MOD2_MASK, + EGG_VIRTUAL_MOD3_MASK, + EGG_VIRTUAL_MOD4_MASK, + EGG_VIRTUAL_MOD5_MASK + }; + + len -= 6; + accelerator += 4; + mods |= mod_vals[*accelerator - '1']; + accelerator += 2; + } else if (len >= 5 && is_ctl (accelerator)) { + accelerator += 5; + len -= 5; + mods |= EGG_VIRTUAL_CONTROL_MASK; + } else if (len >= 5 && is_alt (accelerator)) { + accelerator += 5; + len -= 5; + mods |= EGG_VIRTUAL_ALT_MASK; + } else if (len >= 6 && is_meta (accelerator)) { + accelerator += 6; + len -= 6; + mods |= EGG_VIRTUAL_META_MASK; + } else if (len >= 7 && is_hyper (accelerator)) { + accelerator += 7; + len -= 7; + mods |= EGG_VIRTUAL_HYPER_MASK; + } else if (len >= 7 && is_super (accelerator)) { + accelerator += 7; + len -= 7; + mods |= EGG_VIRTUAL_SUPER_MASK; + } else if (len >= 9 && is_primary (accelerator)) { + accelerator += 9; + len -= 9; + mods |= EGG_VIRTUAL_CONTROL_MASK; + } else { + gchar last_ch; + + last_ch = *accelerator; + while (last_ch && last_ch != '>') { + last_ch = *accelerator; + accelerator += 1; + len -= 1; + } + } + } else { // (*accelerator != '<') + keyval = gdk_keyval_from_name (accelerator); + + if (keyval == 0) + bad_keyval = TRUE; + + accelerator += len; + len -= len; } - else - { - gchar last_ch; - - last_ch = *accelerator; - while (last_ch && last_ch != '>') - { - last_ch = *accelerator; - accelerator += 1; - len -= 1; - } - } - } - else - { - keyval = gdk_keyval_from_name (accelerator); - - if (keyval == 0) - bad_keyval = TRUE; - - accelerator += len; - len -= len; - } } - - if (accelerator_key) - *accelerator_key = gdk_keyval_to_lower (keyval); - if (accelerator_mods) - *accelerator_mods = mods; - return !bad_keyval; + if (accelerator_key) + *accelerator_key = gdk_keyval_to_lower (keyval); + if (accelerator_mods) + *accelerator_mods = (EggVirtualModifierType) mods; + + return !bad_keyval; } @@ -358,7 +260,7 @@ * @accelerator_key: accelerator keyval * @accelerator_mods: accelerator modifier mask * @returns: a newly-allocated accelerator name - * + * * Converts an accelerator keyval and modifier mask * into a string parseable by egg_accelerator_parse_virtual(). * For example, if you pass in #GDK_q and #EGG_VIRTUAL_CONTROL_MASK, @@ -370,115 +272,107 @@ egg_virtual_accelerator_name (guint accelerator_key, EggVirtualModifierType accelerator_mods) { - static const gchar text_release[] = ""; - static const gchar text_shift[] = ""; - static const gchar text_control[] = ""; - static const gchar text_mod1[] = ""; - static const gchar text_mod2[] = ""; - static const gchar text_mod3[] = ""; - static const gchar text_mod4[] = ""; - static const gchar text_mod5[] = ""; - static const gchar text_meta[] = ""; - static const gchar text_super[] = ""; - static const gchar text_hyper[] = ""; - guint l; - gchar *keyval_name; - gchar *accelerator; - - accelerator_mods &= EGG_VIRTUAL_MODIFIER_MASK; - - keyval_name = gdk_keyval_name (gdk_keyval_to_lower (accelerator_key)); - if (!keyval_name) - keyval_name = ""; - - l = 0; - if (accelerator_mods & EGG_VIRTUAL_RELEASE_MASK) - l += sizeof (text_release) - 1; - if (accelerator_mods & EGG_VIRTUAL_SHIFT_MASK) - l += sizeof (text_shift) - 1; - if (accelerator_mods & EGG_VIRTUAL_CONTROL_MASK) - l += sizeof (text_control) - 1; - if (accelerator_mods & EGG_VIRTUAL_ALT_MASK) - l += sizeof (text_mod1) - 1; - if (accelerator_mods & EGG_VIRTUAL_MOD2_MASK) - l += sizeof (text_mod2) - 1; - if (accelerator_mods & EGG_VIRTUAL_MOD3_MASK) - l += sizeof (text_mod3) - 1; - if (accelerator_mods & EGG_VIRTUAL_MOD4_MASK) - l += sizeof (text_mod4) - 1; - if (accelerator_mods & EGG_VIRTUAL_MOD5_MASK) - l += sizeof (text_mod5) - 1; - if (accelerator_mods & EGG_VIRTUAL_META_MASK) - l += sizeof (text_meta) - 1; - if (accelerator_mods & EGG_VIRTUAL_HYPER_MASK) - l += sizeof (text_hyper) - 1; - if (accelerator_mods & EGG_VIRTUAL_SUPER_MASK) - l += sizeof (text_super) - 1; - l += strlen (keyval_name); - - accelerator = g_new (gchar, l + 1); - - l = 0; - accelerator[l] = 0; - if (accelerator_mods & EGG_VIRTUAL_RELEASE_MASK) - { - strcpy (accelerator + l, text_release); - l += sizeof (text_release) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_SHIFT_MASK) - { - strcpy (accelerator + l, text_shift); - l += sizeof (text_shift) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_CONTROL_MASK) - { - strcpy (accelerator + l, text_control); - l += sizeof (text_control) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_ALT_MASK) - { - strcpy (accelerator + l, text_mod1); - l += sizeof (text_mod1) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_MOD2_MASK) - { - strcpy (accelerator + l, text_mod2); - l += sizeof (text_mod2) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_MOD3_MASK) - { - strcpy (accelerator + l, text_mod3); - l += sizeof (text_mod3) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_MOD4_MASK) - { - strcpy (accelerator + l, text_mod4); - l += sizeof (text_mod4) - 1; + static const gchar text_release[] = ""; + static const gchar text_shift[] = ""; + static const gchar text_control[] = ""; + static const gchar text_mod1[] = ""; + static const gchar text_mod2[] = ""; + static const gchar text_mod3[] = ""; + static const gchar text_mod4[] = ""; + static const gchar text_mod5[] = ""; + static const gchar text_meta[] = ""; + static const gchar text_super[] = ""; + static const gchar text_hyper[] = ""; + + guint length; + gchar *keyval_name; + gchar *accelerator; + + accelerator_mods &= EGG_VIRTUAL_MODIFIER_MASK; + keyval_name = gdk_keyval_name (gdk_keyval_to_lower (accelerator_key)); + + if (!keyval_name) + keyval_name = ""; + + /* determine the size of the accelerator array */ + length = 0; + if (accelerator_mods & EGG_VIRTUAL_RELEASE_MASK) + length += sizeof (text_release) - 1; + if (accelerator_mods & EGG_VIRTUAL_SHIFT_MASK) + length += sizeof (text_shift) - 1; + if (accelerator_mods & EGG_VIRTUAL_CONTROL_MASK) + length += sizeof (text_control) - 1; + if (accelerator_mods & EGG_VIRTUAL_ALT_MASK) + length += sizeof (text_mod1) - 1; + if (accelerator_mods & EGG_VIRTUAL_MOD2_MASK) + length += sizeof (text_mod2) - 1; + if (accelerator_mods & EGG_VIRTUAL_MOD3_MASK) + length += sizeof (text_mod3) - 1; + if (accelerator_mods & EGG_VIRTUAL_MOD4_MASK) + length += sizeof (text_mod4) - 1; + if (accelerator_mods & EGG_VIRTUAL_MOD5_MASK) + length += sizeof (text_mod5) - 1; + if (accelerator_mods & EGG_VIRTUAL_META_MASK) + length += sizeof (text_meta) - 1; + if (accelerator_mods & EGG_VIRTUAL_HYPER_MASK) + length += sizeof (text_hyper) - 1; + if (accelerator_mods & EGG_VIRTUAL_SUPER_MASK) + length += sizeof (text_super) - 1; + length += strlen (keyval_name); + + accelerator = g_new (gchar, length + 1); /* allocate space for the accelerator strings */ + + length = 0; + accelerator[length] = 0; + + if (accelerator_mods & EGG_VIRTUAL_RELEASE_MASK) { /* RELEASE */ + strcpy (accelerator + length, text_release); + length += sizeof (text_release) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_SHIFT_MASK) { /* SHIFT */ + strcpy (accelerator + length, text_shift); + length += sizeof (text_shift) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_CONTROL_MASK) { /* CONTROL */ + strcpy (accelerator + length, text_control); + length += sizeof (text_control) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_ALT_MASK) { /* ALT */ + strcpy (accelerator + length, text_mod1); + length += sizeof (text_mod1) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_MOD2_MASK) { /* MOD2 */ + strcpy (accelerator + length, text_mod2); + length += sizeof (text_mod2) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_MOD3_MASK) { /* MOD3 */ + strcpy (accelerator + length, text_mod3); + length += sizeof (text_mod3) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_MOD4_MASK) { /* MOD4 */ + strcpy (accelerator + length, text_mod4); + length += sizeof (text_mod4) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_MOD5_MASK) { /* MOD5 */ + strcpy (accelerator + length, text_mod5); + length += sizeof (text_mod5) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_META_MASK) { /* Meta */ + strcpy (accelerator + length, text_meta); + length += sizeof (text_meta) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_HYPER_MASK) { /* Hyper */ + strcpy (accelerator + length, text_hyper); + length += sizeof (text_hyper) - 1; + } + if (accelerator_mods & EGG_VIRTUAL_SUPER_MASK) { /* Super */ + strcpy (accelerator + length, text_super); + length += sizeof (text_super) - 1; } - if (accelerator_mods & EGG_VIRTUAL_MOD5_MASK) - { - strcpy (accelerator + l, text_mod5); - l += sizeof (text_mod5) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_META_MASK) - { - strcpy (accelerator + l, text_meta); - l += sizeof (text_meta) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_HYPER_MASK) - { - strcpy (accelerator + l, text_hyper); - l += sizeof (text_hyper) - 1; - } - if (accelerator_mods & EGG_VIRTUAL_SUPER_MASK) - { - strcpy (accelerator + l, text_super); - l += sizeof (text_super) - 1; - } - - strcpy (accelerator + l, keyval_name); - return accelerator; + strcpy (accelerator + length, keyval_name); + + return accelerator; } void @@ -492,11 +386,11 @@ g_return_if_fail (GDK_IS_KEYMAP (keymap)); g_return_if_fail (concrete_mods != NULL); - + modmap = egg_keymap_get_modmap (keymap); - + /* Not so sure about this algorithm. */ - + concrete = 0; i = 0; while (i < EGG_MODMAP_ENTRY_LAST) @@ -515,164 +409,148 @@ GdkModifierType concrete_mods, EggVirtualModifierType *virtual_mods) { - GdkModifierType virtual; - int i; - const EggModmap *modmap; - - g_return_if_fail (GDK_IS_KEYMAP (keymap)); - g_return_if_fail (virtual_mods != NULL); - - modmap = egg_keymap_get_modmap (keymap); - - /* Not so sure about this algorithm. */ - - virtual = 0; - i = 0; - while (i < EGG_MODMAP_ENTRY_LAST) - { - if ((1 << i) & concrete_mods) - { - EggVirtualModifierType cleaned; - - cleaned = modmap->mapping[i] & ~(EGG_VIRTUAL_MOD2_MASK | - EGG_VIRTUAL_MOD3_MASK | - EGG_VIRTUAL_MOD4_MASK | - EGG_VIRTUAL_MOD5_MASK); - - if (cleaned != 0) - { - virtual |= cleaned; - } - else - { - /* Rather than dropping mod2->mod5 if not bound, - * go ahead and use the concrete names - */ - virtual |= modmap->mapping[i]; + GdkModifierType virtual; + int i; + const EggModmap *modmap; + + g_return_if_fail (GDK_IS_KEYMAP (keymap)); + g_return_if_fail (virtual_mods != NULL); + + modmap = egg_keymap_get_modmap (keymap); + + /* Not so sure about this algorithm. */ + virtual = 0; + i = 0; + while (i < EGG_MODMAP_ENTRY_LAST) { + if ((1 << i) & concrete_mods) { + EggVirtualModifierType cleaned; + cleaned = modmap->mapping[i] & ~(EGG_VIRTUAL_MOD2_MASK | + EGG_VIRTUAL_MOD3_MASK | + EGG_VIRTUAL_MOD4_MASK | + EGG_VIRTUAL_MOD5_MASK); + if (cleaned != 0) { + virtual |= cleaned; + } else { + /* Rather than dropping mod2->mod5 if not bound, + * go ahead and use the concrete names + */ + virtual |= modmap->mapping[i]; } } - - ++i; - } - - *virtual_mods = virtual; + + ++i; + } + + *virtual_mods = (EggVirtualModifierType) virtual; } static void reload_modmap (GdkKeymap *keymap, EggModmap *modmap) { - XModifierKeymap *xmodmap; - int map_size; - int i; - - /* FIXME multihead */ - xmodmap = XGetModifierMapping (gdk_x11_get_default_xdisplay ()); + XModifierKeymap *xmodmap; + int map_size; + int i; + + /* FIXME multihead */ + xmodmap = XGetModifierMapping (gdk_x11_get_default_xdisplay ()); + + memset (modmap->mapping, 0, sizeof (modmap->mapping)); + + /* there are 8 modifiers, and the first 3 are shift, shift lock, + * and control + */ + map_size = 8 * xmodmap->max_keypermod; + i = 3 * xmodmap->max_keypermod; + while (i < map_size) { + /* get the key code at this point in the map, + * see if its keysym is one we're interested in + */ + int keycode = xmodmap->modifiermap[i]; + GdkKeymapKey *keys; + guint *keyvals; + int n_entries; + int j; + EggVirtualModifierType mask; + + keys = NULL; + keyvals = NULL; + n_entries = 0; + + gdk_keymap_get_entries_for_keycode (keymap, + keycode, + &keys, &keyvals, &n_entries); + + mask = 0; + j = 0; + while (j < n_entries) { + if (keyvals[j] == GDK_KEY_Num_Lock) + mask |= EGG_VIRTUAL_NUM_LOCK_MASK; + else if (keyvals[j] == GDK_KEY_Scroll_Lock) + mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK; + else if (keyvals[j] == GDK_KEY_Meta_L || + keyvals[j] == GDK_KEY_Meta_R) + mask |= EGG_VIRTUAL_META_MASK; + else if (keyvals[j] == GDK_KEY_Hyper_L || + keyvals[j] == GDK_KEY_Hyper_R) + mask |= EGG_VIRTUAL_HYPER_MASK; + else if (keyvals[j] == GDK_KEY_Super_L || + keyvals[j] == GDK_KEY_Super_R) + mask |= EGG_VIRTUAL_SUPER_MASK; + else if (keyvals[j] == GDK_KEY_Mode_switch) + mask |= EGG_VIRTUAL_MODE_SWITCH_MASK; - memset (modmap->mapping, 0, sizeof (modmap->mapping)); - - /* there are 8 modifiers, and the first 3 are shift, shift lock, - * and control - */ - map_size = 8 * xmodmap->max_keypermod; - i = 3 * xmodmap->max_keypermod; - while (i < map_size) - { - /* get the key code at this point in the map, - * see if its keysym is one we're interested in - */ - int keycode = xmodmap->modifiermap[i]; - GdkKeymapKey *keys; - guint *keyvals; - int n_entries; - int j; - EggVirtualModifierType mask; - - keys = NULL; - keyvals = NULL; - n_entries = 0; - - gdk_keymap_get_entries_for_keycode (keymap, - keycode, - &keys, &keyvals, &n_entries); - - mask = 0; - j = 0; - while (j < n_entries) - { - if (keyvals[j] == GDK_KEY_Num_Lock) - mask |= EGG_VIRTUAL_NUM_LOCK_MASK; - else if (keyvals[j] == GDK_KEY_Scroll_Lock) - mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK; - else if (keyvals[j] == GDK_KEY_Meta_L || - keyvals[j] == GDK_KEY_Meta_R) - mask |= EGG_VIRTUAL_META_MASK; - else if (keyvals[j] == GDK_KEY_Hyper_L || - keyvals[j] == GDK_KEY_Hyper_R) - mask |= EGG_VIRTUAL_HYPER_MASK; - else if (keyvals[j] == GDK_KEY_Super_L || - keyvals[j] == GDK_KEY_Super_R) - mask |= EGG_VIRTUAL_SUPER_MASK; - else if (keyvals[j] == GDK_KEY_Mode_switch) - mask |= EGG_VIRTUAL_MODE_SWITCH_MASK; - - ++j; + ++j; } - /* Mod1Mask is 1 << 3 for example, i.e. the - * fourth modifier, i / keyspermod is the modifier - * index - */ - modmap->mapping[i/xmodmap->max_keypermod] |= mask; - - g_free (keyvals); - g_free (keys); - - ++i; - } + /* Mod1Mask is 1 << 3 for example, i.e. the + * fourth modifier, i / keyspermod is the modifier + * index + */ + modmap->mapping[i/xmodmap->max_keypermod] |= mask; + + g_free (keyvals); + g_free (keys); + + ++i; + } + + /* Add in the not-really-virtual fixed entries */ + modmap->mapping[EGG_MODMAP_ENTRY_SHIFT] |= EGG_VIRTUAL_SHIFT_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_CONTROL] |= EGG_VIRTUAL_CONTROL_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_LOCK] |= EGG_VIRTUAL_LOCK_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_MOD1] |= EGG_VIRTUAL_ALT_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_MOD2] |= EGG_VIRTUAL_MOD2_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_MOD3] |= EGG_VIRTUAL_MOD3_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_MOD4] |= EGG_VIRTUAL_MOD4_MASK; + modmap->mapping[EGG_MODMAP_ENTRY_MOD5] |= EGG_VIRTUAL_MOD5_MASK; - /* Add in the not-really-virtual fixed entries */ - modmap->mapping[EGG_MODMAP_ENTRY_SHIFT] |= EGG_VIRTUAL_SHIFT_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_CONTROL] |= EGG_VIRTUAL_CONTROL_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_LOCK] |= EGG_VIRTUAL_LOCK_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_MOD1] |= EGG_VIRTUAL_ALT_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_MOD2] |= EGG_VIRTUAL_MOD2_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_MOD3] |= EGG_VIRTUAL_MOD3_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_MOD4] |= EGG_VIRTUAL_MOD4_MASK; - modmap->mapping[EGG_MODMAP_ENTRY_MOD5] |= EGG_VIRTUAL_MOD5_MASK; - - XFreeModifiermap (xmodmap); + XFreeModifiermap (xmodmap); } const EggModmap* -egg_keymap_get_modmap (GdkKeymap *keymap) -{ - EggModmap *modmap; - - /* This is all a hack, much simpler when we can just - * modify GDK directly. - */ - - modmap = g_object_get_data (G_OBJECT (keymap), - "egg-modmap"); +egg_keymap_get_modmap (GdkKeymap *keymap) { + EggModmap *modmap; - if (modmap == NULL) - { - modmap = g_new0 (EggModmap, 1); + /* This is all a hack, much simpler when we can just + * modify GDK directly. + */ + modmap = g_object_get_data (G_OBJECT (keymap), + "egg-modmap"); + + if (modmap == NULL) { + modmap = g_new0 (EggModmap, 1); + + /* FIXME modify keymap change events with an event filter + * and force a reload if we get one + */ + reload_modmap (keymap, modmap); + g_object_set_data_full (G_OBJECT (keymap), + "egg-modmap", + modmap, + g_free); + } - /* FIXME modify keymap change events with an event filter - * and force a reload if we get one - */ - - reload_modmap (keymap, modmap); - - g_object_set_data_full (G_OBJECT (keymap), - "egg-modmap", - modmap, - g_free); - } - - g_assert (modmap != NULL); - - return modmap; + g_assert (modmap != NULL); + return modmap; } diff -Nru tilda-1.1.12/src/eggaccelerators.h tilda-1.2.2/src/eggaccelerators.h --- tilda-1.1.12/src/eggaccelerators.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/eggaccelerators.h 2014-10-28 11:36:24.000000000 +0000 @@ -13,9 +13,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #ifndef __EGG_ACCELERATORS_H__ @@ -29,42 +27,41 @@ /* Where a value is also in GdkModifierType we coincide, * otherwise we don't overlap. */ -typedef enum -{ - EGG_VIRTUAL_SHIFT_MASK = 1 << 0, - EGG_VIRTUAL_LOCK_MASK = 1 << 1, - EGG_VIRTUAL_CONTROL_MASK = 1 << 2, - - EGG_VIRTUAL_ALT_MASK = 1 << 3, /* fixed as Mod1 */ - - EGG_VIRTUAL_MOD2_MASK = 1 << 4, - EGG_VIRTUAL_MOD3_MASK = 1 << 5, - EGG_VIRTUAL_MOD4_MASK = 1 << 6, - EGG_VIRTUAL_MOD5_MASK = 1 << 7, +typedef enum { + EGG_VIRTUAL_SHIFT_MASK = 1 << 0, + EGG_VIRTUAL_LOCK_MASK = 1 << 1, + EGG_VIRTUAL_CONTROL_MASK = 1 << 2, + + EGG_VIRTUAL_ALT_MASK = 1 << 3, /* fixed as Mod1 */ + + EGG_VIRTUAL_MOD2_MASK = 1 << 4, + EGG_VIRTUAL_MOD3_MASK = 1 << 5, + EGG_VIRTUAL_MOD4_MASK = 1 << 6, + EGG_VIRTUAL_MOD5_MASK = 1 << 7, #if 0 - GDK_BUTTON1_MASK = 1 << 8, - GDK_BUTTON2_MASK = 1 << 9, - GDK_BUTTON3_MASK = 1 << 10, - GDK_BUTTON4_MASK = 1 << 11, - GDK_BUTTON5_MASK = 1 << 12, - /* 13, 14 are used by Xkb for the keyboard group */ + GDK_BUTTON1_MASK = 1 << 8, + GDK_BUTTON2_MASK = 1 << 9, + GDK_BUTTON3_MASK = 1 << 10, + GDK_BUTTON4_MASK = 1 << 11, + GDK_BUTTON5_MASK = 1 << 12, + /* 13, 14 are used by Xkb for the keyboard group */ #endif - - EGG_VIRTUAL_META_MASK = 1 << 24, - EGG_VIRTUAL_SUPER_MASK = 1 << 25, - EGG_VIRTUAL_HYPER_MASK = 1 << 26, - EGG_VIRTUAL_MODE_SWITCH_MASK = 1 << 27, - EGG_VIRTUAL_NUM_LOCK_MASK = 1 << 28, - EGG_VIRTUAL_SCROLL_LOCK_MASK = 1 << 29, - - /* Also in GdkModifierType */ - EGG_VIRTUAL_RELEASE_MASK = 1 << 30, - - /* 28-31 24-27 20-23 16-19 12-15 8-11 4-7 0-3 - * 7 f 0 0 0 0 f f - */ - EGG_VIRTUAL_MODIFIER_MASK = 0x7f0000ff + + EGG_VIRTUAL_META_MASK = 1 << 24, + EGG_VIRTUAL_SUPER_MASK = 1 << 25, + EGG_VIRTUAL_HYPER_MASK = 1 << 26, + EGG_VIRTUAL_MODE_SWITCH_MASK = 1 << 27, + EGG_VIRTUAL_NUM_LOCK_MASK = 1 << 28, + EGG_VIRTUAL_SCROLL_LOCK_MASK = 1 << 29, + + /* Also in GdkModifierType */ + EGG_VIRTUAL_RELEASE_MASK = 1 << 30, + + /* 28-31 24-27 20-23 16-19 12-15 8-11 4-7 0-3 + * 7 f 0 0 0 0 f f + */ + EGG_VIRTUAL_MODIFIER_MASK = 0x7f0000ff } EggVirtualModifierType; diff -Nru tilda-1.1.12/src/glade-resources.gresource.xml tilda-1.2.2/src/glade-resources.gresource.xml --- tilda-1.1.12/src/glade-resources.gresource.xml 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/src/glade-resources.gresource.xml 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,6 @@ + + + + tilda.ui + + diff -Nru tilda-1.1.12/src/key_grabber.c tilda-1.2.2/src/key_grabber.c --- tilda-1.1.12/src/key_grabber.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/key_grabber.c 2014-10-28 11:36:24.000000000 +0000 @@ -10,8 +10,7 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . * */ @@ -19,14 +18,14 @@ #include -#include -#include -#include -#include +#include "debug.h" +#include "key_grabber.h" +#include "tilda.h" +#include "xerror.h" #include #include -#include -#include +#include "configsys.h" +#include "tomboykeybinder.h" #include #include @@ -136,6 +135,10 @@ if (gdk_x11_screen_supports_net_wm_hint (screen, gdk_atom_intern_static_string ("_NET_ACTIVE_WINDOW"))) { + guint32 timestamp = gtk_get_current_event_time (); + if (timestamp == 0) { + timestamp = gdk_x11_get_server_time(gtk_widget_get_root_window (tw->window)); + } event.xclient.type = ClientMessage; event.xclient.serial = 0; event.xclient.send_event = True; @@ -145,7 +148,7 @@ event.xclient.format = 32; event.xclient.data.l[0] = 2; /* pager */ - event.xclient.data.l[1] = tomboy_keybinder_get_current_event_time(); /* timestamp */ + event.xclient.data.l[1] = timestamp; /* timestamp */ event.xclient.data.l[2] = 0; event.xclient.data.l[3] = 0; event.xclient.data.l[4] = 0; @@ -156,7 +159,7 @@ { /* The WM doesn't support the EWMH standards. We'll print a warning and * try this, though it probably won't work... */ - g_printerr ("WARNING: Window manager (%s) does not support EWMH hints\n", + g_printerr (_("WARNING: Window manager (%s) does not support EWMH hints\n"), gdk_x11_screen_get_window_manager_name (screen)); XRaiseWindow (x11_display, x11_window); } @@ -174,16 +177,33 @@ gdk_flush (); } -void pull (struct tilda_window_ *tw, enum pull_state state) +/** +* @force_hide: This option is used by the auto hide feature, so we can ignore the checks to focus tilda instead +* of pulling up. +*/ +void pull (struct tilda_window_ *tw, enum pull_state state, gboolean force_hide) { DEBUG_FUNCTION ("pull"); DEBUG_ASSERT (tw != NULL); DEBUG_ASSERT (state == PULL_UP || state == PULL_DOWN || state == PULL_TOGGLE); gint i; - - if (tw->current_state == UP && state != PULL_UP) - { + gboolean needsFocus = !tw->focus_loss_on_keypress + && !gtk_window_is_active(GTK_WINDOW(tw->window)) + && !force_hide + && !tw->hide_non_focused; + + if (tw->current_state == DOWN && needsFocus) { + /** + * See tilda_window.c in focus_out_event_cb for an explanation about focus_loss_on_keypress + * This conditional branch will only focus tilda but it does not actually pull the window up. + */ + TRACE (g_print("Tilda window not focused but visible\n")); + gdk_x11_window_set_user_time(gtk_widget_get_window(tw->window), + tomboy_keybinder_get_current_event_time()); + tilda_window_set_active(tw); + } else + if (tw->current_state == UP && state != PULL_UP) { /* Keep things here just like they are. If you use gtk_window_present() here, you * will introduce some weird graphical glitches. Also, calling gtk_window_move() * before showing the window avoids yet more glitches. You should probably not use @@ -250,10 +270,11 @@ } } -static void onKeybindingPull (const char *keystring, gpointer user_data) +static void onKeybindingPull (G_GNUC_UNUSED const char *keystring, gpointer user_data) { + DEBUG_FUNCTION("onKeybindingPull"); tilda_window *tw = TILDA_WINDOW(user_data); - pull (tw, PULL_TOGGLE); + pull (tw, PULL_TOGGLE, FALSE); } gboolean tilda_keygrabber_bind (const gchar *keystr, tilda_window *tw) diff -Nru tilda-1.1.12/src/key_grabber.h tilda-1.2.2/src/key_grabber.h --- tilda-1.1.12/src/key_grabber.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/key_grabber.h 2014-10-28 11:36:24.000000000 +0000 @@ -10,25 +10,29 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #ifndef TILDA_KEY_GRABBER_C #define TILDA_KEY_GRABBER_C -#include +#include "tilda_window.h" G_BEGIN_DECLS enum pull_state { PULL_UP, PULL_DOWN, PULL_TOGGLE }; -void pull (struct tilda_window_ *tw, enum pull_state state); +void pull (struct tilda_window_ *tw, enum pull_state state, gboolean force_hide); extern void generate_animation_positions (tilda_window *tw); gboolean tilda_keygrabber_bind (const gchar *keystr, tilda_window *tw); void tilda_keygrabber_unbind (const gchar *keystr); +/** + * This function will make the tilda window active after it starts + */ +void tilda_window_set_active (tilda_window *tw); + G_END_DECLS #endif diff -Nru tilda-1.1.12/src/Makefile.am tilda-1.2.2/src/Makefile.am --- tilda-1.1.12/src/Makefile.am 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/Makefile.am 2014-10-28 11:36:24.000000000 +0000 @@ -1,42 +1,55 @@ -## Process this file with automake to produce Makefile.in # vim: set noexpandtab ts=8 sts=8 sw=8: -AUTOMAKE_OPTIONS = gnu +bin_PROGRAMS += src/tilda -# Define a C macro LOCALEDIR indicating where catalogs -# will be installed. -#localedir = $(datadir)/locale -DEFS = -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\" @DEFS@ - -bin_PROGRAMS = tilda +# Rules to compile resources +src/glade-resources.h: src/glade-resources.gresource.xml + $(GLIB_COMPILE_RESOURCES) --generate $< --target=$@ --sourcedir=$(srcdir)/src +src/glade-resources.c: src/glade-resources.gresource.xml + $(GLIB_COMPILE_RESOURCES) --generate $< --target=$@ --sourcedir=$(srcdir)/src + +# Dependencies rule, and do not forget to do a make after +# editing the UI with glade! +src/glade-resources.c src/glade-resources.h: \ + src/glade-resources.gresource.xml \ + $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/src/glade-resources.gresource.xml --sourcedir=$(srcdir)/src) + +src_tilda_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/src \ + -DDATADIR='"$(datadir)"' \ + -DLOCALEDIR='"$(localedir)"' \ + -DPKGDATADIR='"$(pkgdatadir)"' # Keep the headers here so that make dist-bzip2 works -tilda_SOURCES = callback_func.h callback_func.c \ - configsys.h configsys.c \ - debug.h \ - eggaccelerators.h eggaccelerators.c \ - key_grabber.h key_grabber.c \ - tilda.h tilda.c \ - tilda_terminal.h tilda_terminal.c \ - tilda_window.h tilda_window.c \ - tomboykeybinder.h tomboykeybinder.c \ - wizard.h wizard.c \ - xerror.h xerror.c +src_tilda_SOURCES = src/callback_func.h src/callback_func.c \ + src/configsys.h src/configsys.c \ + src/debug.h \ + src/eggaccelerators.h src/eggaccelerators.c \ + src/key_grabber.h src/key_grabber.c \ + src/tilda.h src/tilda.c \ + src/tilda_terminal.h src/tilda_terminal.c \ + src/tilda_window.h src/tilda_window.c \ + src/tomboykeybinder.h src/tomboykeybinder.c \ + src/wizard.h src/wizard.c \ + src/xerror.h src/xerror.c \ + src/glade-resources.h src/glade-resources.c \ + src/glade-resources.gresource.xml -tilda_CFLAGS = $(AM_CFLAGS) \ +src_tilda_CFLAGS = $(AM_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBGLADE_CFLAGS) \ $(VTE_CFLAGS) \ $(LIBCONFUSE_CFLAGS) -tilda_LDFLAGS = $(AM_LDFLAGS) \ +src_tilda_LDFLAGS = $(AM_LDFLAGS) \ $(GTK_LDFLAGS) \ $(LIBGLADE_LDFLAGS) \ $(VTE_LDFLAGS) \ $(LIBCONFUSE_LDFLAGS) \ -Wl,--as-needed -tilda_LDADD = $(AM_LDADD) \ +src_tilda_LDADD = $(AM_LDADD) \ $(GTK_LIBS) \ $(LIBGLADE_LIBS) \ $(VTE_LIBS) \ @@ -44,5 +57,7 @@ $(LTLIBINTL) \ $(LEXLIB) -MAINTAINERCLEANFILES = Makefile.in +EXTRA_DIST += src/glade-resources.gresource.xml \ + src/tilda.ui +CLEANFILES += src/glade-resources.h src/glade-resources.c diff -Nru tilda-1.1.12/src/tilda.c tilda-1.2.2/src/tilda.c --- tilda-1.1.12/src/tilda.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tilda.c 2014-10-28 11:36:24.000000000 +0000 @@ -10,23 +10,27 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ +#define _POSIX_SOURCE /* feature test macro for signal functions */ +#define _XOPEN_SOURCE /* feature test macro for popen */ #include -#include -#include -#include -#include -#include -#include /* for pull */ -#include -#include +#include "debug.h" +#include "tilda.h" +#include "callback_func.h" +#include "configsys.h" +#include "tilda_window.h" +#include "key_grabber.h" /* for pull */ +#include "wizard.h" +#include "xerror.h" +#include "tomboykeybinder.h" #include #include +#include +#include #include #include #include @@ -44,23 +48,25 @@ #include #include -#include -#include #include #include - -static gchar *create_lock_file (struct lock_info lock) +/** +* If lock->pid is 0 then the file is not opened exclusively. Instead flock() must be used to obtain a lock. +* Otherwise an exclusive lock file is created for the process. +*/ +static gchar *create_lock_file (struct lock_info *lock) { DEBUG_FUNCTION ("create_lock_file"); - DEBUG_ASSERT (lock.instance >= 0); - DEBUG_ASSERT (lock.pid >= 1); + DEBUG_ASSERT (lock != NULL); + DEBUG_ASSERT (lock->instance >= 0); + DEBUG_ASSERT (lock->pid >= 0); gint ret; gchar *lock_file_full; gchar *lock_dir = g_build_filename (g_get_user_cache_dir (), "tilda", "locks", NULL); - gchar *lock_file = g_strdup_printf ("lock_%d_%d", lock.pid, lock.instance); + gchar *lock_file = g_strdup_printf ("lock_%d_%d", lock->pid, lock->instance); /* Make the ~/.cache/tilda/locks directory */ ret = g_mkdir_with_parents (lock_dir, S_IRUSR | S_IWUSR | S_IXUSR); @@ -72,11 +78,17 @@ lock_file_full = g_build_filename (lock_dir, lock_file, NULL); /* Create the lock file */ - ret = g_creat (lock_file_full, S_IRUSR | S_IWUSR | S_IXUSR); + if(lock->pid == 0) { + ret = g_open(lock_file_full, O_CREAT, S_IRUSR | S_IWUSR); + } else { + ret = g_open(lock_file_full, O_WRONLY | O_CREAT | O_EXCL, 0); + } if (ret == -1) goto creat_fail; + lock->file_descriptor = ret; + g_free (lock_file); g_free (lock_dir); @@ -192,24 +204,17 @@ } /** - * Remove stale lock files from the ~/.tilda/locks/ directory. - * - * Success: returns 0 - * Failure: returns non-zero - */ -static gint remove_stale_lock_files () -{ - DEBUG_FUNCTION ("remove_stale_lock_files"); - +* Gets a list of the pids in +*/ +static GSList *getPids() { GSList *pids = NULL; FILE *ps_output; const gchar ps_command[] = "ps -C tilda -o pid="; gchar buf[16]; /* Really shouldn't need more than 6 */ - if ((ps_output = popen (ps_command, "r")) == NULL) - { + if ((ps_output = popen (ps_command, "r")) == NULL) { g_printerr (_("Unable to run command: `%s'\n"), ps_command); - return -1; + return NULL; } /* The popen() succeeded, get all of the pids */ @@ -218,13 +223,29 @@ /* We've read all of the pids, exit */ pclose (ps_output); + return pids; +} + +/** + * Remove stale lock files from the ~/.tilda/locks/ directory. + * + * Success: returns 0 + * Failure: returns non-zero + */ +static gint remove_stale_lock_files () +{ + DEBUG_FUNCTION ("remove_stale_lock_files"); + + GSList *pids = getPids(); + if(pids == NULL) { + return -1; + } struct lock_info *lock; gchar *lock_dir = g_build_filename (g_get_user_cache_dir (), "tilda", "locks", NULL); gchar *remove_file; gchar *filename; GDir *dir; - gint pid; /* Open the lock directory for reading */ dir = g_dir_open (lock_dir, 0, NULL); @@ -238,7 +259,7 @@ /* For each possible lock file, check if it is a lock, and see if * it matches one of the running tildas */ - while (filename = (gchar*) g_dir_read_name (dir)) + while ((filename = (gchar*) g_dir_read_name (dir)) != NULL) { lock = islockfile (filename); @@ -256,6 +277,7 @@ g_dir_close (dir); g_free (lock_dir); + g_slist_free(pids); return 0; } @@ -323,8 +345,8 @@ /* Check for unknown options, and give a nice message if there are some */ if (error) { - const char *msg = _("Error parsing command-line options. Try \"tilda --help\"\nto see all possible options.\n\nError message: %s\n"); - g_printerr (msg, error->message); + g_printerr (_("Error parsing command-line options. Try \"tilda --help\"\nto see all possible options.\n\nError message: %s\n"), + error->message); exit (EXIT_FAILURE); } @@ -349,19 +371,36 @@ } /* Now set the options in the config, if they changed */ - if (background_color != config_getstr ("background_color")) + if (background_color != config_getstr ("background_color")) { config_setstr ("background_color", background_color); + + GdkColor col; + if (gdk_color_parse(background_color, &col)) { + config_setint("back_red", col.red); + config_setint("back_green", col.green); + config_setint("back_blue", col.blue); + } + + g_free(background_color); + } if (command != config_getstr ("command")) { config_setbool ("run_command", TRUE); config_setstr ("command", command); + g_free(command); } - if (font != config_getstr ("font")) + if (font != config_getstr ("font")) { config_setstr ("font", font); - if (image != config_getstr ("image")) + g_free(font); + } + if (image != config_getstr ("image")) { config_setstr ("image", image); - if (working_dir != config_getstr ("working_dir")) + g_free(image); + } + if (working_dir != config_getstr ("working_dir")) { config_setstr ("working_dir", working_dir); + g_free(working_dir); + } if (lines != config_getint ("lines")) config_setint ("lines", lines); @@ -416,6 +455,10 @@ return config_file; } +static gint _cmp_locks(gint a, gint b) { + return a - b; +} + /** * get_instance_number () * @@ -429,11 +472,14 @@ { DEBUG_FUNCTION ("get_instance_number"); - gint i; gchar *name; + GSequence *seq; + GSequenceIter *iter; + gint lowest_lock_instance = 0; + gint current_lock_instance; + GDir *dir; - GSList *list = NULL; struct lock_info *lock; gchar *lock_dir = g_build_filename (g_get_user_cache_dir (), "tilda", "locks", NULL); @@ -449,38 +495,38 @@ } /* Look through every file in the lock directory, and see if it is a lock file. - * If it is a lock file, store it's instance number in the list. */ - while (name = (gchar*)g_dir_read_name (dir)) + * If it is a lock file, insert it in a sorted sequence. */ + seq = g_sequence_new(NULL); + while ((name = (gchar*)g_dir_read_name (dir)) != NULL) { lock = islockfile (name); if (lock != NULL) { - list = g_slist_append (list, GINT_TO_POINTER (lock->instance)); + g_sequence_insert_sorted(seq, GINT_TO_POINTER(lock->instance), (GCompareDataFunc)_cmp_locks, NULL); g_free (lock); } } g_dir_close (dir); + g_free (lock_dir); - /* Find the lowest available instance. - * - * This is not the most efficient algorithm ever, but the - * list should not be too big, so it's ok for now. */ - for (i=0; i_) is atomic. Without this it could + * happen, that a second tilda instance was trying to determine its instance number before the first instance + * had finished creating its lock file, this resulted in two processes with the same instance number and could lead + * to corruption of the config file. + * In order to test if this works the following shell command can be used: "tilda & tilda && fg", which causes + * two tilda processes to be started simultaneously. See: + * + * http://stackoverflow.com/questions/3004811/how-do-you-run-multiple-programs-from-a-bash-script + */ + struct lock_info global_lock; + global_lock.instance = 0; + global_lock.pid = 0; + gchar *global_lock_file = NULL; + + global_lock_file = create_lock_file(&global_lock); + if(global_lock_file == NULL) { + perror("Error creating global lock file"); + return EXIT_FAILURE; + } + flock(global_lock.file_descriptor, LOCK_EX); + + /* Start of atomic section. */ lock.pid = getpid (); lock.instance = get_instance_number (); + lock_file = create_lock_file (&lock); config_file = get_config_file_name (lock.instance); - lock_file = create_lock_file (lock); + /* End of atomic section */ + + flock(global_lock.file_descriptor, LOCK_UN); + g_remove (global_lock_file); + close(lock.file_descriptor); + g_free(global_lock_file); + #if ENABLE_NLS /* Gettext Initialization */ @@ -589,14 +665,14 @@ load_custom_css_file (); /* create new tilda_window */ - tw = tilda_window_init (config_file, lock.instance); + gboolean success = tilda_window_init (config_file, lock.instance, &tw); - /* Check the allocations above */ - if (tw == NULL) - goto tw_alloc_failed; + if(!success) { + goto initialization_failed; + } /* Adding widget title for CSS selection */ - gtk_widget_set_name (GTK_WIDGET(tw->window), "Main"); + gtk_widget_set_name (GTK_WIDGET(tw.window), "Main"); /* Initialize and set up the keybinding to toggle tilda's visibility. */ tomboy_keybinder_init (); @@ -613,10 +689,10 @@ sigaction (SIGKILL, &sa, NULL); /* If the config file doesn't exist open up the wizard */ - if (access (tw->config_file, R_OK) == -1) + if (access (tw.config_file, R_OK) == -1) { /* We probably need a default key, too ... */ - gchar *default_key = g_strdup_printf ("F%d", tw->instance+1); + gchar *default_key = g_strdup_printf ("F%d", tw.instance+1); config_setstr ("key", default_key); g_free (default_key); @@ -628,31 +704,32 @@ * Note that the key will be bound upon exiting the wizard */ if (need_wizard) { g_print ("Starting the wizard to configure tilda options."); - wizard (tw); + wizard (&tw); } else { - gint ret = tilda_keygrabber_bind (config_getstr ("key"), tw); + gint ret = tilda_keygrabber_bind (config_getstr ("key"), &tw); if (!ret) { /* The key was unbindable, so we need to show the wizard */ show_invalid_keybinding_dialog (NULL, _("The keybinding you chose for \"Pull Down Terminal\" is invalid. Please choose another.")); - wizard (tw); + wizard (&tw); } } - pull (tw, config_getbool ("hidden") ? PULL_UP : PULL_DOWN); + pull (&tw, config_getbool ("hidden") ? PULL_UP : PULL_DOWN, FALSE); g_print ("Tilda has started. Press %s to pull down the window.\n", config_getstr ("key")); /* Whew! We're finally all set up and ready to run GTK ... */ gtk_main(); - /* Ok, we're at the end of our run. Time to clean up ... */ - tilda_window_free (tw); +initialization_failed: + tilda_window_free(&tw); -tw_alloc_failed: + /* Ok, we're at the end of our run. Time to clean up ... */ config_free (config_file); g_remove (lock_file); + close(lock.file_descriptor); g_free (lock_file); g_free (config_file); diff -Nru tilda-1.1.12/src/tilda.h tilda-1.2.2/src/tilda.h --- tilda-1.1.12/src/tilda.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tilda.h 2014-10-28 11:36:24.000000000 +0000 @@ -10,14 +10,13 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #ifndef TILDA_H #define TILDA_H -#include +#include "tilda_window.h" #include @@ -32,8 +31,15 @@ { gint pid; gint instance; + gint file_descriptor; }; +#define GUINT16_TO_FLOAT(color) (color / (double) 0xFFFF) +#define GUINT16_FROM_FLOAT(value) ((int) (value * 0xFFFF + 0.5)) + +#define RGB(r,g,b) (r) / (gdouble)G_MAXUINT16, \ + (g) / (gdouble)G_MAXUINT16, \ + (b) / (gdouble)G_MAXUINT16, 1. G_END_DECLS diff -Nru tilda-1.1.12/src/tilda_terminal.c tilda-1.2.2/src/tilda_terminal.c --- tilda-1.1.12/src/tilda_terminal.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tilda_terminal.c 2014-10-28 11:36:24.000000000 +0000 @@ -10,20 +10,18 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #include -#include -#include -#include -#include -#include -#include -#include /* wizard */ -#include +#include "debug.h" +#include "tilda.h" +#include "tilda_window.h" +#include "tilda_terminal.h" +#include "callback_func.h" +#include "configsys.h" +#include "wizard.h" /* wizard */ #include #include /* malloc */ @@ -36,15 +34,15 @@ #define HTTP_REGEXP "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*" -GdkColor current_palette[TERMINAL_PALETTE_SIZE]; +GdkRGBA current_palette[TERMINAL_PALETTE_SIZE]; -static gint start_shell (struct tilda_term_ *tt, gboolean ignore_custom_command); +static gint start_shell (struct tilda_term_ *tt, gboolean ignore_custom_command, const char* working_dir); static gint tilda_term_config_defaults (tilda_term *tt); static void child_exited_cb (GtkWidget *widget, gpointer data); static void window_title_changed_cb (GtkWidget *widget, gpointer data); static void status_line_changed_cb (GtkWidget *widget, gpointer data); static int button_press_cb (GtkWidget *widget, GdkEventButton *event, gpointer data); -static void status_line_changed_cb (GtkWidget *widget, gpointer data); +static gboolean key_press_cb (GtkWidget *widget, GdkEvent *event, tilda_term *terminal); static void iconify_window_cb (GtkWidget *widget, gpointer data); static void deiconify_window_cb (GtkWidget *widget, gpointer data); static void raise_window_cb (GtkWidget *widget, gpointer data); @@ -77,6 +75,9 @@ int ret; struct tilda_term_ *term; GError *error = NULL; + tilda_term *current_tt; + gint current_tt_index; + char *current_tt_dir = NULL; term = g_malloc (sizeof (struct tilda_term_)); @@ -84,6 +85,9 @@ if (!term) return NULL; + /* Set the PID to unset value */ + term->pid = -1; + /* Add the parent window reference */ term->tw = tw; @@ -97,6 +101,9 @@ term->scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (VTE_TERMINAL(term->vte_term)))); + /* Initialize to false, we have not yet dropped to the default shell */ + term->dropped_to_default_shell = FALSE; + /* Set properties of the terminal */ tilda_term_config_defaults (term); @@ -119,6 +126,8 @@ G_CALLBACK(status_line_changed_cb), term); g_signal_connect (G_OBJECT(term->vte_term), "button-press-event", G_CALLBACK(button_press_cb), term); + g_signal_connect (G_OBJECT(term->vte_term), "key-press-event", + G_CALLBACK(key_press_cb), term); //needs GDK_KEY_PRESS_MASK /* Connect to application request signals. */ g_signal_connect (G_OBJECT(term->vte_term), "iconify-window", @@ -154,8 +163,18 @@ gtk_widget_show (term->vte_term); gtk_widget_show (term->hbox); + /* Get current term's working directory */ + current_tt_index = gtk_notebook_get_current_page (GTK_NOTEBOOK(tw->notebook)); + current_tt = g_list_nth_data (tw->terms, current_tt_index); + if (current_tt != NULL) + { + current_tt_dir = tilda_term_get_cwd(current_tt); + } + /* Fork the appropriate command into the terminal */ - ret = start_shell (term, FALSE); + ret = start_shell (term, FALSE, current_tt_dir); + + g_free(current_tt_dir); if (ret) goto err_fork; @@ -173,22 +192,13 @@ DEBUG_ASSERT (tt != NULL); DEBUG_ASSERT (pos == LEFT || pos == RIGHT || pos == DISABLED); - switch (pos) - { - case LEFT: - gtk_box_reorder_child (GTK_BOX(tt->hbox), tt->scrollbar, 0); - gtk_widget_show (tt->scrollbar); - break; - - case RIGHT: - gtk_box_reorder_child (GTK_BOX(tt->hbox), tt->scrollbar, 1); - gtk_widget_show (tt->scrollbar); - break; - - case DISABLED: - default: - gtk_widget_hide (tt->scrollbar); - break; + if (pos == DISABLED) { + gtk_widget_hide (tt->scrollbar); + } else { + /* We have already asserted that it's either disabled (already taken care of), + * left, or right, so no need to check twice. */ + gtk_box_reorder_child (GTK_BOX(tt->hbox), tt->scrollbar, (pos == LEFT) ? 0 : 1); + gtk_widget_show (tt->scrollbar); } } @@ -203,12 +213,22 @@ GtkWidget *label; label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (tt->tw->notebook), tt->hbox); - gtk_label_set_text (GTK_LABEL(label), title); + + guint length = config_getint ("title_max_length"); + + if(config_getbool("title_max_length_flag") && strlen(title) > length) { + gchar *titleOffset = title + strlen(title) - length; + gchar *shortTitle = g_strdup_printf ("...%s", titleOffset); + gtk_label_set_text (GTK_LABEL(label), shortTitle); + g_free(shortTitle); + } else { + gtk_label_set_text (GTK_LABEL(label), title); + } g_free (title); } -static void status_line_changed_cb (GtkWidget *widget, gpointer data) +static void status_line_changed_cb (GtkWidget *widget, G_GNUC_UNUSED gpointer data) { DEBUG_FUNCTION ("status_line_changed_cb"); DEBUG_ASSERT (widget != NULL); @@ -216,7 +236,7 @@ g_print ("Status = `%s'.\n", vte_terminal_get_status_line (VTE_TERMINAL(widget))); } -static void iconify_window_cb (GtkWidget *widget, gpointer data) +static void iconify_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("iconify_window_cb"); DEBUG_ASSERT (data != NULL); @@ -226,7 +246,7 @@ gdk_window_iconify (gtk_widget_get_window ((GTK_WIDGET (data)))); } -static void deiconify_window_cb (GtkWidget *widget, gpointer data) +static void deiconify_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("deiconify_window_cb"); DEBUG_ASSERT (data != NULL); @@ -236,7 +256,7 @@ gdk_window_deiconify (gtk_widget_get_window ((GTK_WIDGET (data)))); } -static void raise_window_cb (GtkWidget *widget, gpointer data) +static void raise_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("raise_window_cb"); DEBUG_ASSERT (data != NULL); @@ -246,7 +266,7 @@ gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (data))); } -static void lower_window_cb (GtkWidget *widget, gpointer data) +static void lower_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("lower_window_cb"); DEBUG_ASSERT (data != NULL); @@ -256,7 +276,7 @@ gdk_window_lower (gtk_widget_get_window (GTK_WIDGET (data))); } -static void maximize_window_cb (GtkWidget *widget, gpointer data) +static void maximize_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("maximize_window_cb"); DEBUG_ASSERT (data != NULL); @@ -266,7 +286,7 @@ gdk_window_maximize (gtk_widget_get_window (GTK_WIDGET(data))); } -static void restore_window_cb (GtkWidget *widget, gpointer data) +static void restore_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("restore_window_cb"); DEBUG_ASSERT (data != NULL); @@ -276,7 +296,7 @@ gdk_window_unmaximize (gtk_widget_get_window (GTK_WIDGET (data))); } -static void refresh_window_cb (GtkWidget *widget, gpointer data) +static void refresh_window_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("refresh_window_cb"); DEBUG_ASSERT (data != NULL); @@ -296,7 +316,7 @@ } } -static void move_window_cb (GtkWidget *widget, guint x, guint y, gpointer data) +static void move_window_cb (G_GNUC_UNUSED GtkWidget *widgets, guint x, guint y, gpointer data) { DEBUG_FUNCTION ("move_window_cb"); DEBUG_ASSERT (data != NULL); @@ -361,6 +381,37 @@ adjust_font_size (widget, data, -1); } +/* Returns the working directory of the terminal + * + * @param tt the tilda_term to get working directory of + * + * SUCCESS: return non-NULL char* that should be freed with g_free when done + * FAILURE: return NULL +*/ +char* tilda_term_get_cwd(struct tilda_term_* tt) +{ + char *file; + char *cwd; + GError *error = NULL; + + if (tt->pid < 0) + { + return NULL; + } + + file = g_strdup_printf ("/proc/%d/cwd", tt->pid); + cwd = g_file_read_link (file, &error); + g_free (file); + + if (cwd == NULL) + { + g_printerr (_("Problem reading link %s: %s\n"), file, error->message); + g_error_free (error); + } + + return cwd; +} + /* Fork a shell into the VTE Terminal * * @param tt the tilda_term to fork into @@ -368,7 +419,7 @@ * SUCCESS: return 0 * FAILURE: return non-zero */ -static gint start_shell (struct tilda_term_ *tt, gboolean ignore_custom_command) +static gint start_shell (struct tilda_term_ *tt, gboolean ignore_custom_command, const char* working_dir) { DEBUG_FUNCTION ("start_shell"); DEBUG_ASSERT (tt != NULL); @@ -380,6 +431,11 @@ gchar *default_command; + if (working_dir == NULL || config_getbool ("inherit_working_dir") == FALSE) + { + working_dir = config_getstr ("working_dir"); + } + if (config_getbool ("run_command") && !ignore_custom_command) { ret = g_shell_parse_argv (config_getstr ("command"), &argc, &argv, &error); @@ -400,13 +456,13 @@ ret = vte_terminal_fork_command_full (VTE_TERMINAL (tt->vte_term), VTE_PTY_DEFAULT, /* VtePtyFlags pty_flags */ - config_getstr ("working_dir"), /* const char *working_directory */ + working_dir, /* const char *working_directory */ argv, /* char **argv */ envv, /* char **envv */ G_SPAWN_SEARCH_PATH, /* GSpawnFlags spawn_flags */ NULL, /* GSpawnChildSetupFunc child_setup */ NULL, /* gpointer child_setup_data */ - NULL, /* GPid *child_pid */ + &tt->pid, /* GPid *child_pid */ NULL /* GError **error */ ); @@ -427,6 +483,20 @@ launch_default_shell: + /* If we have dropped to the default shell before, then this time, we + * do not spawn a new shell, but instead close the current shell. This will + * cause the current tab to close. + */ + if (tt->dropped_to_default_shell) { + gint index = gtk_notebook_page_num (GTK_NOTEBOOK(tt->tw->notebook), + tt->hbox); + tilda_window_close_tab (tt->tw, index, FALSE); + return 0; + } + if (ignore_custom_command) { + tt->dropped_to_default_shell = TRUE; + } + /* No custom command, get it from the environment */ default_command = (gchar *) g_getenv ("SHELL"); @@ -443,13 +513,13 @@ ret = vte_terminal_fork_command_full (VTE_TERMINAL (tt->vte_term), VTE_PTY_DEFAULT, /* VtePtyFlags pty_flags */ - config_getstr ("working_dir"), /* const char *working_directory */ + working_dir, /* const char *working_directory */ argv, /* char **argv */ NULL, /* char **envv */ 0, /* GSpawnFlags spawn_flags */ NULL, /* GSpawnChildSetupFunc child_setup */ NULL, /* gpointer child_setup_data */ - NULL, /* GPid *child_pid */ + &tt->pid, /* GPid *child_pid */ NULL /* GError **error */ ); @@ -494,10 +564,10 @@ break; case RESTART_COMMAND: vte_terminal_feed (VTE_TERMINAL(tt->vte_term), "\r\n\r\n", 4); - start_shell (tt, FALSE); + start_shell (tt, FALSE, NULL); break; case DROP_TO_DEFAULT_SHELL: - start_shell (tt, TRUE); + start_shell (tt, TRUE, NULL); default: break; } @@ -517,28 +587,29 @@ DEBUG_ASSERT (tt != NULL); gdouble transparency_level = 0.0; - GdkColor fg, bg /*, tint, highlight, cursor, black */; + GdkRGBA fg, bg; gchar* word_chars; gint i; /** Colors & Palette **/ - bg.red = config_getint ("back_red"); - bg.green = config_getint ("back_green"); - bg.blue = config_getint ("back_blue"); - - fg.red = config_getint ("text_red"); - fg.green = config_getint ("text_green"); - fg.blue = config_getint ("text_blue"); - - for(i = 0;i < TERMINAL_PALETTE_SIZE; i++) - { - current_palette[i].pixel = 0; - current_palette[i].red = config_getnint ("palette", i*3); - current_palette[i].green = config_getnint ("palette", i*3+1); - current_palette[i].blue = config_getnint ("palette", i*3+2); + bg.red = GUINT16_TO_FLOAT(config_getint ("back_red")); + bg.green = GUINT16_TO_FLOAT(config_getint ("back_green")); + bg.blue = GUINT16_TO_FLOAT(config_getint ("back_blue")); + bg.alpha = 1.0; + + fg.red = GUINT16_TO_FLOAT(config_getint ("text_red")); + fg.green = GUINT16_TO_FLOAT(config_getint ("text_green")); + fg.blue = GUINT16_TO_FLOAT(config_getint ("text_blue")); + fg.alpha = 1.0; + + for(i = 0;i < TERMINAL_PALETTE_SIZE; i++) { + current_palette[i].red = GUINT16_TO_FLOAT(config_getnint ("palette", i*3)); + current_palette[i].green = GUINT16_TO_FLOAT(config_getnint ("palette", i*3+1)); + current_palette[i].blue = GUINT16_TO_FLOAT(config_getnint ("palette", i*3+2)); + current_palette[i].alpha = 1.0; } - vte_terminal_set_colors (VTE_TERMINAL(tt->vte_term), &fg, &bg, current_palette, TERMINAL_PALETTE_SIZE); + vte_terminal_set_colors_rgba (VTE_TERMINAL(tt->vte_term), &fg, &bg, current_palette, TERMINAL_PALETTE_SIZE); /** Bells **/ vte_terminal_set_audible_bell (VTE_TERMINAL(tt->vte_term), config_getbool ("bell")); @@ -662,7 +733,7 @@ } static void -menu_quit_cb (GtkWidget *widget, gpointer data) +menu_quit_cb (G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED gpointer data) { DEBUG_FUNCTION ("menu_quit_cb"); @@ -797,7 +868,7 @@ gtk_widget_show_all(menu); } -static int button_press_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) +static int button_press_cb (G_GNUC_UNUSED GtkWidget *widget, GdkEventButton *event, gpointer data) { DEBUG_FUNCTION ("button_press_cb"); DEBUG_ASSERT (data != NULL); @@ -806,7 +877,7 @@ tilda_term *tt; gchar *match; gint tag; - gint xpad, ypad; + gint ypad; gchar *cmd; gchar *web_browser_cmd; gboolean ret = FALSE; @@ -815,6 +886,12 @@ switch (event->button) { + case 9: + tilda_window_next_tab (tt->tw); + break; + case 8: + tilda_window_prev_tab (tt->tw); + break; case 3: /* Right Click */ popup_menu (tt->tw, tt); break; @@ -825,7 +902,7 @@ GtkBorder border; gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &border, NULL); - xpad = border.left; + ypad = border.bottom; match = vte_terminal_match_check (terminal, (event->x - ypad) / @@ -838,7 +915,7 @@ if (match != NULL) { #if DEBUG - g_print ("Got a Ctrl+Left Click -- Matched: `%s' (%d)\n", match, tag); + g_print ("Got a Left Click -- Matched: `%s' (%d)\n", match, tag); #endif web_browser_cmd = g_strescape (config_getstr ("web_browser"), NULL); cmd = g_strdup_printf ("%s %s", web_browser_cmd, match); @@ -869,4 +946,17 @@ return FALSE; } +gboolean key_press_cb (GtkWidget *widget, + GdkEvent *event, + tilda_term *terminal) +{ + if(event->type == GDK_KEY_PRESS) { + GdkEventKey *keyevent = (GdkEventKey*) event; + if(keyevent->keyval == GDK_KEY_Menu) { + popup_menu(terminal->tw, terminal); + } + } + return GDK_EVENT_PROPAGATE; +} + /* vim: set ts=4 sts=4 sw=4 expandtab: */ diff -Nru tilda-1.1.12/src/tilda_terminal.h tilda-1.2.2/src/tilda_terminal.h --- tilda-1.1.12/src/tilda_terminal.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tilda_terminal.h 2014-10-28 11:36:24.000000000 +0000 @@ -10,14 +10,13 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #ifndef TILDA_TERMINALN_H #define TILDA_TERMINALN_H -#include +#include "tilda_window.h" #include @@ -31,6 +30,12 @@ GtkWidget *hbox; GtkWidget *scrollbar; GRegex *http_regexp; + GPid pid; + /* We remember if we have already dropped to the default + * shell before, if so, then we know that this time we can + * exit the program. + */ + gboolean dropped_to_default_shell; struct tilda_window_ *tw; }; @@ -68,12 +73,13 @@ void tilda_term_set_scrollbar_position (tilda_term *tt, enum tilda_term_scrollbar_positions pos); +char* tilda_term_get_cwd(tilda_term* tt); #define TILDA_TERM(tt) ((tilda_term *)(tt)) #define TERMINAL_PALETTE_SIZE 16 -extern GdkColor current_palette[TERMINAL_PALETTE_SIZE]; +extern GdkRGBA current_palette[TERMINAL_PALETTE_SIZE]; G_END_DECLS diff -Nru tilda-1.1.12/src/tilda.ui tilda-1.2.2/src/tilda.ui --- tilda-1.1.12/src/tilda.ui 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/src/tilda.ui 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,3819 @@ + + + + + + 100 + 1 + 10 + + + 2147483647 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + + 1 + 2147483647 + 1 + 1 + 10 + + + + + + + + + Close Tilda + + + Open a new terminal + + + Open a new terminal and hide + + + + + + + + + + + Top + + + Bottom + + + Left + + + Right + + + Hidden + + + + + + + + + + + Focus Terminal + + + Hide Terminal + + + + + + + + + + + Isn't displayed + + + Goes after initial title + + + Goes before initial title + + + Replace initial title + + + + + + + + + + + Drop to the default shell + + + Restart the command + + + Exit the terminal + + + + + + + + + + + Top + + + Bottom + + + Left + + + Right + + + + + + + + + + + Custom + + + Green on Black + + + Black on White + + + White on Black + + + Zenburn + + + Solarized Light + + + Solarized Dark + + + + + + + + + + + Custom + + + + + + + + + + + On the Left + + + On the Right + + + Disabled + + + + + + + + + + + ASCII DEL + + + Escape sequence + + + Control-H + + + + + + + + + + + ASCII DEL + + + Escape sequence + + + Control-H + + + + + + + + + + + 0 + + + + + False + 5 + Tilda Config + center + normal + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + + + + gtk-close + True + False + False + True + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + + + True + False + 5 + 5 + 5 + 5 + True + 0 + + + True + False + 5 + 5 + 5 + 12 + + + True + False + 5 + True + + + Enable Double Buffering + True + True + False + 0 + True + + + 1 + 2 + 1 + 1 + + + + + Start Tilda hidden + True + True + False + 0 + True + + + 1 + 1 + 1 + 1 + + + + + Always on top + True + True + False + 0 + True + + + 1 + 0 + 1 + 1 + + + + + Display on all workspaces + True + True + False + 0 + True + + + 0 + 2 + 1 + 1 + + + + + Do not show in taskbar + True + True + False + 0 + True + + + 0 + 1 + 1 + 1 + + + + + Show Notebook Border + True + True + False + 0 + True + + + 0 + 0 + + + + + True + False + 1 + Non-focus Pull Up Behaviour: + end + 0 + + + 0 + 4 + + + + + True + False + model10 + + + + 0 + + + + + 1 + 4 + + + + + + + + + + + + + + + True + False + <b>Window Display</b> + True + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 5 + 5 + 5 + 5 + True + 0 + + + True + False + 5 + 5 + 5 + 5 + 12 + + + True + False + 5 + True + + + Cursor Blinks + True + True + False + 0 + True + + + 1 + 0 + 1 + 1 + + + + + Audible Terminal Bell + True + True + False + 0 + True + + + 0 + 0 + 1 + 1 + + + + + + + + + True + False + <b>Terminal Display</b> + True + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 5 + 5 + 5 + 5 + True + 0 + + + True + False + 5 + 5 + 5 + 5 + 12 + + + True + False + 5 + 5 + True + + + True + True + True + Sans 12 + + False + + + 1 + 2 + 1 + 1 + + + + + Enable Antialiasing + True + True + False + 0 + True + + + 0 + 0 + 1 + 1 + + + + + Allow Bold Text + True + True + False + 0 + True + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + Position of Tabs: + + + 0 + 1 + 1 + 1 + + + + + True + False + model1 + + + + 0 + + + + + 1 + 1 + 1 + 1 + + + + + True + False + 1 + Font: + + + 0 + 2 + 1 + 1 + + + + + + + + + True + False + <b>Font</b> + True + + + + + 0 + 2 + 1 + 1 + + + + + True + False + 5 + 5 + 5 + 5 + True + 0 + + + True + False + 5 + 5 + 5 + 5 + 12 + + + True + False + True + True + + + True + True + ● + adjustment1 + + + 1 + 0 + 1 + 1 + + + + + Hide Tilda when mouse leaves it + True + True + False + 0 + True + + + 1 + 1 + 1 + 1 + + + + + True + False + 1 + 10 + Auto Hide Delay: + + + 0 + 0 + 1 + 1 + + + + + Hide when Tilda loses focus + True + True + False + 0 + True + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Auto Hide</b> + True + + + + + 0 + 3 + 1 + 1 + + + + + True + False + 5 + 5 + 5 + 5 + True + 0 + + + True + False + 5 + 5 + 5 + 5 + 12 + + + True + False + 5 + True + + + True + False + 1 + When last terminal is closed: + + + 0 + 0 + 1 + 1 + + + + + True + False + liststore1 + + + + 0 + + + + + 1 + 0 + 1 + 1 + + + + + + + + + True + False + <b>Program Exit</b> + True + + + + + 0 + 4 + 1 + 1 + + + + + True + False + True + True + 0 + 1 + 5 + 5 + <small><i><b>Note:</b> Some options require that tilda is restarted.</i></small> + True + center + + + 0 + 5 + 1 + 1 + + + + + + + True + False + General + + + False + + + + + True + False + 5 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 4 + 4 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + Word Characters: + + + 4 + 4 + + + + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Select by Word</b> + True + + + + + 3 + 4 + + 4 + 4 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 4 + 4 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + Web Browser *: + + + 4 + 4 + + + + + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>URL Handling</b> + True + + + + + 2 + 3 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + 3 + 2 + True + + + True + False + 1 + Initial Title: + + + 4 + 4 + + + + + True + False + 1 + Dynamically-set Title: + + + 1 + 2 + 4 + 4 + + + + + True + True + + + 1 + 2 + 4 + 4 + + + + + True + True + model2 + + + + 0 + + + + + 1 + 2 + 1 + 2 + 4 + 4 + + + + + True + False + 1 + 0 + + + Limit maximum length of tab title: + True + False + False + 1 + True + + + + + 2 + 3 + + + + + True + True + ● + adjustment11 + + + 1 + 2 + 2 + 3 + 4 + 4 + + + + + + + + + True + False + <b>Title</b> + True + + + + + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + 3 + 2 + True + + + Run a custom command instead of the shell + True + False + False + 0 + True + + + 4 + 4 + + + + + True + False + 1 + Custom Command: + + + 1 + 2 + 4 + 4 + + + + + True + False + 1 + When Command Exits: + + + 2 + 3 + 4 + 4 + + + + + True + True + model3 + + + + 0 + + + + + 1 + 2 + 2 + 3 + 4 + 4 + + + + + True + True + + + 1 + 2 + 1 + 2 + 4 + 4 + + + + + + + + + + + + True + False + <b>Command</b> + True + + + + + 1 + 2 + + 4 + 4 + + + + + True + False + 4 + 4 + 4 + 4 + in + + + True + False + none + + + True + False + 4 + 4 + 4 + 4 + True + 0 + 0 + * A valid command that can open a browser must be entered here. It is possible to use the name of a specific browser such as 'firefox' and 'google-chrome' or to use the generic commands 'x-www-browser' and 'xdg-open'. The best command may be different depending on the system. + True + + + + + + + 4 + 5 + + + + + 1 + + + + + True + False + Title and Command + + + 1 + False + + + + + True + False + 5 + + + True + False + 0 + + + True + False + 12 + + + True + False + 4 + True + + + True + False + 1 + Percentage + + + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment2 + + + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + In Pixels + + + 2 + 3 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment3 + + + 3 + 4 + GTK_EXPAND + 4 + 4 + + + + + + + + + True + False + <b>Height</b> + True + + + + + 1 + 2 + GTK_SHRINK + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + 4 + True + + + True + False + 1 + Percentage + + + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + In Pixels + + + 2 + 3 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment4 + + + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment5 + + + 3 + 4 + GTK_EXPAND + 4 + 4 + + + + + + + + + True + False + <b>Width</b> + True + + + + + 2 + 3 + GTK_SHRINK + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + 2 + 4 + True + + + Centered Horizontally + True + False + False + 0 + True + True + + + + 2 + GTK_EXPAND + 4 + 4 + + + + + Centered Vertically + True + False + False + 0 + True + True + + + + 2 + 4 + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + X Position + + + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + Y Position + + + 2 + 3 + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment6 + + + 1 + 2 + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment7 + + + 3 + 4 + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + + + + + True + False + <b>Position</b> + True + + + + + 3 + 4 + GTK_SHRINK + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + 4 + 3 + True + + + + + + Enable Transparency + True + False + False + 0 + True + + + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + Level of Transparency + + + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment8 + + + 2 + 3 + GTK_EXPAND + 4 + 4 + + + + + Animated Pulldown + True + False + False + 0 + True + + + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + Use Image for Background + True + False + False + 0 + True + + + 3 + 4 + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + Animation Delay (usec) + + + 1 + 2 + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + False + 1 + Animation Orientation + + + 1 + 2 + 2 + 3 + GTK_EXPAND + 4 + 4 + + + + + True + True + adjustment9 + + + 2 + 3 + 1 + 2 + GTK_EXPAND + 4 + 4 + + + + + True + False + model4 + + + + 0 + + + + + 2 + 3 + 2 + 3 + GTK_EXPAND + 4 + 4 + + + + + True + False + + + 1 + 3 + 3 + 4 + GTK_EXPAND + 4 + 4 + + + + + + + + + True + False + <b>Extras</b> + True + + + + + 4 + 5 + GTK_SHRINK + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + 5 + True + True + + + True + False + 1 + Monitor: + + + 0 + 0 + 1 + 1 + + + + + True + False + 4 + 4 + 4 + monitor_list_store + + + + 0 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + + + 3 + 0 + 1 + 1 + + + + + True + False + + + 2 + 0 + 1 + 1 + + + + + + + + + True + False + <b>Select monitor</b> + True + + + + + GTK_SHRINK + 4 + 4 + + + + + 2 + + + + + True + False + Appearance + + + 2 + False + + + + + True + False + 2 + + + True + False + 0 + + + True + False + 12 + + + True + False + 4 + 2 + + + True + False + + + 2 + 1 + 2 + 4 + 4 + + + + + True + False + 1 + Built-in Schemes + + + 4 + 4 + + + + + True + True + model5 + + + + 0 + + + + + 1 + 2 + 4 + 4 + + + + + True + False + 1 + Text Color + + + 2 + 3 + 4 + 4 + + + + + True + False + 1 + Background Color + + + 3 + 4 + 4 + 4 + + + + + True + True + False + #000000000000 + + + 1 + 2 + 2 + 3 + 4 + 4 + + + + + True + True + False + #000000000000 + + + 1 + 2 + 3 + 4 + 4 + 4 + + + + + + + + + True + False + <b>Foreground and Background Colors</b> + True + + + + + + 4 + 4 + + + + + True + False + 0 + + + True + False + 4 + 12 + 4 + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + 3 + 2 + 12 + 6 + + + True + False + 0 + <small><i><b>Note:</b> Terminal applications have these colors available to them.</i></small> + True + center + + + 2 + GTK_FILL + + + + + + True + True + + + + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + False + 2 + 8 + + + True + True + False + Choose color 15 + + + 6 + 7 + 1 + 2 + GTK_FILL + + + + + + True + True + False + Choose color 7 + + + 6 + 7 + + + + + + + True + True + False + Choose color 14 + + + 5 + 6 + 1 + 2 + GTK_FILL + + + + + + True + True + False + Choose color 16 + + + 7 + 8 + 1 + 2 + + + + + + + True + True + False + Choose color 13 + + + 4 + 5 + 1 + 2 + + + + + + + True + True + False + Choose color 11 + + + 2 + 3 + 1 + 2 + + + + + + + True + True + False + Choose color 12 + + + 3 + 4 + 1 + 2 + + + + + + + True + True + False + Choose color 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + True + False + Choose color 9 + + + 1 + 2 + + + + + + + True + True + False + Choose color 8 + + + 7 + 8 + + + + + + + True + True + False + Choose color 6 + + + 5 + 6 + + + + + + + True + True + False + Choose color 5 + + + 4 + 5 + + + + + + + True + True + False + Choose color 4 + + + 3 + 4 + + + + + + + True + True + False + Choose color 3 + + + 2 + 3 + + + + + + + True + True + False + Choose color 2 + + + 1 + 2 + + + + + + + True + True + False + Choose color 1 + #000000000000 + + + + + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Color palette: + True + center + colorbutton_palette_0 + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + Built-in schemes: + True + center + combo_palette_scheme + + + 1 + 2 + GTK_FILL + + + + + + True + True + 1 + + + + + + + + + True + False + <b>Palette</b> + True + + + + + 1 + 2 + + 4 + 4 + + + + + 3 + + + + + True + False + Colors + + + 3 + False + + + + + True + False + 2 + + + True + False + 0 + + + True + False + 0 + 12 + + + True + False + 5 + 2 + + + True + False + + + True + True + adjustment10 + + + True + True + 4 + 0 + + + + + True + False + 0 + lines + + + True + True + 4 + 1 + + + + + 1 + 2 + 1 + 2 + + + + + True + False + model7 + + + + 0 + + + + + 1 + 2 + 4 + 4 + + + + + True + False + Scrollbar is: + + + GTK_FILL + 4 + 4 + + + + + Limit scrollback to: + True + True + False + Unselect for unlimited scrollback. + 0 + True + + + 1 + 2 + 4 + 4 + + + + + Scroll on Output + True + False + False + 0 + True + + + 2 + 2 + 3 + 4 + 4 + + + + + Scroll on Keystroke + True + False + False + 0 + True + + + 2 + 3 + 4 + 4 + 4 + + + + + Scroll Background + True + False + False + 0 + True + + + 2 + 4 + 5 + 4 + 4 + + + + + + + + + True + False + 0 + <b>Scrolling</b> + True + + + + + 2 + + 4 + 4 + + + + + 4 + False + + + + + True + False + Scrolling + + + 4 + False + + + + + True + False + 12 + 6 + + + True + False + 0 + <b>Compatibility</b> + True + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + 7.4505801528346183e-09 + <small><i><b>Note:</b> These options may cause some applications to behave incorrectly. They are only here to allow you to work around certain applications and operating systems that expect different terminal behavior.</i></small> + True + True + + + False + True + 0 + + + + + True + False + 2 + 3 + 12 + 6 + + + True + False + 0 + _Delete key generates: + True + center + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + _Backspace key generates: + True + center + + + GTK_FILL + + + + + + True + False + model8 + + + + 0 + + + + + 1 + 3 + GTK_FILL + + + + + True + False + model9 + + + + 0 + + + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + + False + True + 1 + + + + + True + False + 1.1175900205273592e-08 + 0 + 0 + + + _Reset Compatibility Options to Defaults + True + True + False + True + + + + + False + False + 2 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + 5 + + + + + True + False + Compatibility + + + 5 + False + + + + + True + False + 11 + 2 + + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Paste</b> + True + + + + + 1 + 2 + 2 + 3 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Next Tab</b> + True + + + + + 3 + 4 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Quit</b> + True + + + + + 1 + 2 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Add Tab</b> + True + char + + + + + 1 + 2 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 10</b> + True + + + + + 1 + 2 + 9 + 10 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 5</b> + True + + + + + 9 + 10 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 4</b> + True + + + + + 8 + 9 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 3</b> + True + + + + + 7 + 8 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 2</b> + True + + + + + 6 + 7 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 1</b> + True + + + + + 5 + 6 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Previous Tab</b> + True + + + + + 1 + 2 + 3 + 4 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Close Tab</b> + True + + + + + 1 + 2 + 1 + 2 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Copy</b> + True + + + + + 2 + 3 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Pull Down Terminal</b> + True + + + + + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 6</b> + True + + + + + 1 + 2 + 5 + 6 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 7</b> + True + + + + + 1 + 2 + 6 + 7 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 8</b> + True + + + + + 1 + 2 + 7 + 8 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + False + 2 + + + + + + + True + False + <b>Go To Tab 9</b> + True + + + + + 1 + 2 + 8 + 9 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + True + True + 2 + + + + + + + True + False + <b>Move Tab Left</b> + True + + + + + 4 + 5 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + True + True + 2 + + + + + + + True + False + <b>Move Tab Right</b> + True + + + + + 1 + 2 + 4 + 5 + + 4 + 4 + + + + + True + False + 0 + + + True + False + 12 + + + + True + False + True + 2 + + + + + + + True + False + <b>Toggle Fullscreen</b> + True + + + + + 10 + 11 + + 4 + 4 + + + + + 6 + + + + + True + False + Keybindings + + + 6 + False + + + + + False + True + 1 + + + + + + button_wizard_close + + + diff -Nru tilda-1.1.12/src/tilda_window.c tilda-1.2.2/src/tilda_window.c --- tilda-1.1.12/src/tilda_window.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tilda_window.c 2014-10-28 11:36:24.000000000 +0000 @@ -1,5 +1,3 @@ - - /* * This is free software; you can redistribute it and/or modify it under * the terms of the GNU Library General Public License as published by @@ -12,19 +10,18 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #include -#include -#include -#include -#include -#include -#include -#include +#include "debug.h" +#include "tilda.h" +#include "callback_func.h" +#include "configsys.h" +#include "tilda_window.h" +#include "tilda_terminal.h" +#include "key_grabber.h" #include #include @@ -35,6 +32,8 @@ #include #include #include +#include +#include static void tilda_window_setup_alpha_mode (tilda_window *tw) @@ -96,22 +95,20 @@ gint tilda_window_set_tab_position (tilda_window *tw, enum notebook_tab_positions pos) { - switch (pos) - { - default: /* default is top */ - g_printerr (_("You have a bad tab_pos in your configuration file\n")); - case NB_TOP: - gtk_notebook_set_tab_pos (GTK_NOTEBOOK (tw->notebook), GTK_POS_TOP); - break; - case NB_BOTTOM: - gtk_notebook_set_tab_pos (GTK_NOTEBOOK (tw->notebook), GTK_POS_BOTTOM); - break; - case NB_LEFT: - gtk_notebook_set_tab_pos (GTK_NOTEBOOK (tw->notebook), GTK_POS_LEFT); - break; - case NB_RIGHT: - gtk_notebook_set_tab_pos (GTK_NOTEBOOK (tw->notebook), GTK_POS_RIGHT); - break; + const GtkPositionType gtk_pos[] = {GTK_POS_TOP, GTK_POS_BOTTOM, GTK_POS_LEFT, GTK_POS_RIGHT }; + + if ((pos < 0) || (pos > 4)) { + g_printerr (_("You have a bad tab_pos in your configuration file\n")); + pos = NB_TOP; + } + + if(NB_HIDDEN == pos) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK(tw->notebook), FALSE); + } + else { + gtk_notebook_set_tab_pos (GTK_NOTEBOOK (tw->notebook), gtk_pos[pos]); + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)) > 1) + gtk_notebook_set_show_tabs (GTK_NOTEBOOK(tw->notebook), TRUE); } return 0; @@ -122,23 +119,26 @@ { DEBUG_FUNCTION ("toggle_fullscreen_cb"); DEBUG_ASSERT (tw != NULL); - - if (tw->fullscreen != TRUE) { - tw->fullscreen = TRUE; - gtk_window_fullscreen (GTK_WINDOW (tw->window)); - } - else { - gtk_window_unfullscreen (GTK_WINDOW (tw->window)); - tw->fullscreen = FALSE; - } + + if (tw->fullscreen != TRUE) { + gtk_window_fullscreen (GTK_WINDOW (tw->window)); + } + else { + gtk_window_unfullscreen (GTK_WINDOW (tw->window)); + // This appears to be necssary on (at least) xfwm4 if you tabbed out + // while fullscreened. + gtk_window_set_default_size (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height")); + gtk_window_resize (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height")); + gtk_window_move(GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos")); + } + tw->fullscreen = !tw->fullscreen; // It worked. Having this return GDK_EVENT_STOP makes the callback not carry the // keystroke into the vte terminal widget. return GDK_EVENT_STOP; } - -static gint next_tab (tilda_window *tw) +gint tilda_window_next_tab (tilda_window *tw) { DEBUG_FUNCTION ("next_tab"); DEBUG_ASSERT (tw != NULL); @@ -155,12 +155,12 @@ else gtk_notebook_next_page (GTK_NOTEBOOK (tw->notebook)); - // It worked. Having this return true makes the callback not carry the + // It worked. Having this return GDK_EVENT_STOP makes the callback not carry the // keystroke into the vte terminal widget. - return TRUE; + return GDK_EVENT_STOP; } -static gint prev_tab (tilda_window *tw) +gint tilda_window_prev_tab (tilda_window *tw) { DEBUG_FUNCTION ("prev_tab"); DEBUG_ASSERT (tw != NULL); @@ -176,14 +176,16 @@ else gtk_notebook_prev_page (GTK_NOTEBOOK (tw->notebook)); - // It worked. Having this return true makes the callback not carry the + // It worked. Having this return GDK_EVENT_STOP makes the callback not carry the // keystroke into the vte terminal widget. - return TRUE; + return GDK_EVENT_STOP; } -static gint move_tab_left (tilda_window *tw) +enum tab_direction { TAB_LEFT = 1, TAB_RIGHT = -1 }; + +static gint move_tab (tilda_window *tw, int direction) { - DEBUG_FUNCTION ("move_tab_left"); + DEBUG_FUNCTION ("move_tab"); DEBUG_ASSERT (tw != NULL); int num_pages; @@ -192,55 +194,37 @@ GtkWidget* current_page; num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)); - current_page_index = gtk_notebook_get_current_page (GTK_NOTEBOOK (tw->notebook)); - current_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (tw->notebook), - current_page_index); if (num_pages > 1) { - if (current_page_index < num_pages - 1) { - // Move current page one to the left - new_page_index = current_page_index + 1; - } else { - // Current page is at beginning: move to end - new_page_index = 0; - } + current_page_index = gtk_notebook_get_current_page (GTK_NOTEBOOK (tw->notebook)); + current_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (tw->notebook), + current_page_index); + + /* wrap over if new_page_index over-/underflows */ + new_page_index = (current_page_index + direction) % num_pages; - gtk_notebook_reorder_child (GTK_NOTEBOOK (tw->notebook), current_page, - new_page_index); + gtk_notebook_reorder_child (GTK_NOTEBOOK (tw->notebook), current_page, + new_page_index); } - // It worked. Having this return true makes the callback not carry the + // It worked. Having this return GDK_EVENT_STOP makes the callback not carry the // keystroke into the vte terminal widget. - return TRUE; + return GDK_EVENT_STOP; + +} +static gint move_tab_left (tilda_window *tw) +{ + DEBUG_FUNCTION ("move_tab_left"); + return move_tab(tw, LEFT); } static gint move_tab_right (tilda_window *tw) { DEBUG_FUNCTION ("move_tab_right"); - DEBUG_ASSERT (tw != NULL); - - int num_pages; - int current_page_index; - GtkWidget* current_page; - - num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)); - current_page_index = gtk_notebook_get_current_page (GTK_NOTEBOOK (tw->notebook)); - current_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (tw->notebook), - current_page_index); - - if (num_pages > 1) { - // Move current page one to the right. This automatically wraps - // when current_page_index - 1 is negative. - gtk_notebook_reorder_child (GTK_NOTEBOOK (tw->notebook), current_page, - current_page_index - 1); - } - - // It worked. Having this return true makes the callback not carry the - // keystroke into the vte terminal widget. - return TRUE; + return move_tab(tw, RIGHT); } -static void focus_term (GtkWidget *widget, gpointer data) +static gboolean focus_term (GtkWidget *widget, gpointer data) { DEBUG_FUNCTION ("focus_term"); DEBUG_ASSERT (data != NULL); @@ -256,31 +240,37 @@ list = gtk_container_get_children (GTK_CONTAINER(box)); gtk_widget_grab_focus (list->data); } + + // It worked. Having this return GDK_EVENT_STOP makes the callback not carry the + // keystroke into the vte terminal widget. + return GDK_EVENT_STOP; } static gboolean auto_hide_tick(gpointer data) { DEBUG_FUNCTION ("auto_hide_tick"); DEBUG_ASSERT (data != NULL); - + tilda_window *tw = TILDA_WINDOW(data); tw->auto_hide_current_time += tw->timer_resolution; if ((tw->auto_hide_current_time >= tw->auto_hide_max_time) || tw->current_state == UP) { - pull(tw, PULL_UP); + pull(tw, PULL_UP, TRUE); tw->auto_hide_tick_handler = 0; return FALSE; } + return TRUE; } /* Start auto hide tick */ static void start_auto_hide_tick(tilda_window *tw) { + DEBUG_FUNCTION("start_auto_hide_tick"); // If the delay is less or equal to 1000ms then the timer is not precise // enough, because it takes already about 200ms to register it, so we // rather sleep for the given amount of time. - const int MAX_SLEEP_TIME = 1000; + const guint32 MAX_SLEEP_TIME = 1000; if ((tw->auto_hide_tick_handler == 0) && (tw->disable_auto_hide == FALSE)) { /* If there is not timer registered yet, then the auto_hide_tick_handler @@ -291,13 +281,13 @@ if (tw->auto_hide_max_time > MAX_SLEEP_TIME) { tw->auto_hide_current_time = 0; tw->auto_hide_tick_handler = g_timeout_add(tw->timer_resolution, auto_hide_tick, tw); - } else if (tw->auto_hide_max_time <= MAX_SLEEP_TIME) { + } else if (tw->auto_hide_max_time > 0 && tw->auto_hide_max_time <= MAX_SLEEP_TIME) { // auto_hide_max_time is in milli seconds, so we need to convert to // microseconds by multiplying with 1000 g_usleep (tw->auto_hide_max_time * 1000); - pull(tw, PULL_UP); + pull(tw, PULL_UP, TRUE); } else { - pull(tw, PULL_UP); + pull(tw, PULL_UP, TRUE); } } } @@ -312,45 +302,70 @@ } } -static void mouse_enter (GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean mouse_enter (GtkWidget *widget, G_GNUC_UNUSED GdkEvent *event, gpointer data) { DEBUG_FUNCTION ("mouse_enter"); DEBUG_ASSERT (data != NULL); DEBUG_ASSERT (widget != NULL); - + tilda_window *tw = TILDA_WINDOW(data); stop_auto_hide_tick(tw); - if (tw->disable_auto_hide == FALSE) - tilda_window_set_active(tw); + + return GDK_EVENT_STOP; } - -static void mouse_leave (GtkWidget *widget, GdkEvent *event, gpointer data) + +static gboolean mouse_leave (GtkWidget *widget, G_GNUC_UNUSED GdkEvent *event, gpointer data) { DEBUG_FUNCTION ("mouse_leave"); DEBUG_ASSERT (data != NULL); DEBUG_ASSERT (widget != NULL); - + GdkEventCrossing *ev = (GdkEventCrossing*)event; tilda_window *tw = TILDA_WINDOW(data); - + if ((ev->mode != GDK_CROSSING_NORMAL) || (tw->auto_hide_on_mouse_leave == FALSE)) - return; - + return GDK_EVENT_STOP; + start_auto_hide_tick(tw); + + return GDK_EVENT_STOP; } -static void focus_out_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data) +static gboolean focus_out_event_cb (GtkWidget *widget, G_GNUC_UNUSED GdkEvent *event, gpointer data) { DEBUG_FUNCTION ("focus_out_event_cb"); DEBUG_ASSERT (data != NULL); DEBUG_ASSERT (widget != NULL); - + tilda_window *tw = TILDA_WINDOW(data); - + + /** + * When the tilda 'key' to pull down/up the tilda window is pressed, then tilda will inevitably loose focus. The + * problem is that we cannot distinguish whether it was focused before the key press occurred. Checking the xevent + * type here allows us to distinguish these two cases: + * + * * We loose focus because of a KeyPress event + * * We loose focus because another window gained focus or some other reason. + * + * Depending on one of the two cases we set the tw->focus_loss_on_keypress to true or false. We can then + * check this flag in the pull() function that shows or hides the tilda window. This helps us to decide if + * we just need to focus tilda or if we should hide it. + */ + XEvent xevent; + XPeekEvent(gdk_x11_display_get_xdisplay(gdk_window_get_display(gtk_widget_get_window(tw->window))), &xevent); + + if(xevent.type == KeyPress) { + tw->focus_loss_on_keypress = TRUE; + } else { + tw->focus_loss_on_keypress = FALSE; + } + if (tw->auto_hide_on_focus_lost == FALSE) - return; - + return GDK_EVENT_PROPAGATE; + start_auto_hide_tick(tw); + + return GDK_EVENT_PROPAGATE; } static void goto_tab (tilda_window *tw, guint i) @@ -361,7 +376,7 @@ gtk_notebook_set_current_page (GTK_NOTEBOOK (tw->notebook), i); } -static gboolean goto_tab_generic (tilda_window *tw, gint tab_number) +static gboolean goto_tab_generic (tilda_window *tw, guint tab_number) { DEBUG_FUNCTION ("goto_tab_generic"); DEBUG_ASSERT (tw != NULL); @@ -369,10 +384,9 @@ if (g_list_length (tw->terms) > (tab_number-1)) { goto_tab (tw, tab_number - 1); - return TRUE; } - return FALSE; + return TRUE; } /* These all just call the generic function since they're all basically the same @@ -426,40 +440,40 @@ } /* Tie a single keyboard shortcut to a callback function */ -gint tilda_add_config_accelerator(const gchar* key, GCallback callback_func, tilda_window *tw) +static gint tilda_add_config_accelerator(const gchar* key, GCallback callback_func, tilda_window *tw) { guint accel_key; GdkModifierType accel_mods; GClosure *temp; - + gtk_accelerator_parse (config_getstr(key), &accel_key, &accel_mods); if (! ((accel_key == 0) && (accel_mods == 0)) ) // make sure it parsed properly { temp = g_cclosure_new_swap (callback_func, tw, NULL); gtk_accel_group_connect (tw->accel_group, accel_key, accel_mods , GTK_ACCEL_VISIBLE, temp); } - + return 0; } - + gint tilda_window_setup_keyboard_accelerators (tilda_window *tw) { - + /* If we already have an tw->accel_group (which would happen if we're redefining accelerators in the config window) we want to remove it before creating a new one. */ if (tw->accel_group != NULL) gtk_window_remove_accel_group (GTK_WINDOW (tw->window), tw->accel_group); - + /* Create Accel Group to add key codes for quit, next, prev and new tabs */ tw->accel_group = gtk_accel_group_new (); gtk_window_add_accel_group (GTK_WINDOW (tw->window), tw->accel_group); - + /* Set up keyboard shortcuts for Exit, Next Tab, Previous Tab, Move Tab, Add Tab, Close Tab, Copy, and Paste using key combinations defined in the config. */ tilda_add_config_accelerator("quit_key", G_CALLBACK(gtk_main_quit), tw); - tilda_add_config_accelerator("nexttab_key", G_CALLBACK(next_tab), tw); - tilda_add_config_accelerator("prevtab_key", G_CALLBACK(prev_tab), tw); + tilda_add_config_accelerator("nexttab_key", G_CALLBACK(tilda_window_next_tab), tw); + tilda_add_config_accelerator("prevtab_key", G_CALLBACK(tilda_window_prev_tab), tw); tilda_add_config_accelerator("movetableft_key", G_CALLBACK(move_tab_left), tw); tilda_add_config_accelerator("movetabright_key", G_CALLBACK(move_tab_right), tw); tilda_add_config_accelerator("addtab_key", G_CALLBACK(tilda_window_add_tab), tw); @@ -467,7 +481,7 @@ tilda_add_config_accelerator("copy_key", G_CALLBACK(ccopy), tw); tilda_add_config_accelerator("paste_key", G_CALLBACK(cpaste), tw); tilda_add_config_accelerator("fullscreen_key", G_CALLBACK(toggle_fullscreen_cb), tw); - + /* Set up keyboard shortcuts for Goto Tab # using key combinations defined in the config*/ /* Know a better way? Then you do. */ tilda_add_config_accelerator("gototab_1_key", G_CALLBACK(goto_tab_1), tw); @@ -480,7 +494,7 @@ tilda_add_config_accelerator("gototab_8_key", G_CALLBACK(goto_tab_8), tw); tilda_add_config_accelerator("gototab_9_key", G_CALLBACK(goto_tab_9), tw); tilda_add_config_accelerator("gototab_10_key", G_CALLBACK(goto_tab_10), tw); - + return 0; } @@ -502,40 +516,22 @@ return 0; } -static gboolean delete_event_callback (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +static gboolean delete_event_callback (G_GNUC_UNUSED GtkWidget *widget, + G_GNUC_UNUSED GdkEvent *event, + G_GNUC_UNUSED gpointer user_data) { gtk_main_quit (); + return FALSE; } -/** - * tilda_window_init () - * - * Create a new tilda_window * and return it. It will also initialize and set up - * as much of the window as possible using the values in the configuation system. - * - * @param instance the instance number of this tilda_window - * - * Success: return a non-NULL tilda_window * - * Failure: return NULL - * - * Notes: The configuration system must be up and running before calling this function. - */ -tilda_window *tilda_window_init (const gchar *config_file, const gint instance) +gboolean tilda_window_init (const gchar *config_file, const gint instance, tilda_window *tw) { DEBUG_FUNCTION ("tilda_window_init"); DEBUG_ASSERT (instance >= 0); - tilda_window *tw; GtkCssProvider *provider; GtkStyleContext *style_context; - tw = g_malloc (sizeof(tilda_window)); - - if (tw == NULL) - return NULL; - /* Set the instance number */ tw->instance = instance; @@ -544,18 +540,26 @@ /* Create the main window */ tw->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - + /* Generic timer resolution */ tw->timer_resolution = config_getint("timer_resolution"); - + /* Auto hide support */ tw->auto_hide_tick_handler = 0; tw->auto_hide_max_time = config_getint("auto_hide_time"); tw->auto_hide_on_mouse_leave = config_getbool("auto_hide_on_mouse_leave"); tw->auto_hide_on_focus_lost = config_getbool("auto_hide_on_focus_lost"); tw->disable_auto_hide = FALSE; + tw->focus_loss_on_keypress = FALSE; - tw->fullscreen = FALSE; + if(1 == config_getint("non_focus_pull_up_behaviour")) { + tw->hide_non_focused = TRUE; + } + else { + tw->hide_non_focused = FALSE; + } + + tw->fullscreen = FALSE; /* Set up all window properties */ if (config_getbool ("pinned")) @@ -618,13 +622,19 @@ /* Add the initial terminal */ if (!tilda_window_add_tab (tw)) { - free (tw); - return NULL; + return FALSE; } + /* This is required in key_grabber.c to get the x11 server time, + * since the specification requires this flag to be set when + * gdk_x11_get_server_time() is called. + **/ + gtk_widget_add_events (tw->window, GDK_PROPERTY_CHANGE_MASK ); + /* Connect signal handlers */ g_signal_connect (G_OBJECT(tw->window), "delete-event", G_CALLBACK (delete_event_callback), tw); g_signal_connect (G_OBJECT(tw->window), "show", G_CALLBACK (focus_term), tw); + g_signal_connect (G_OBJECT(tw->window), "focus-out-event", G_CALLBACK (focus_out_event_cb), tw); g_signal_connect (G_OBJECT(tw->window), "enter-notify-event", G_CALLBACK (mouse_enter), tw); g_signal_connect (G_OBJECT(tw->window), "leave-notify-event", G_CALLBACK (mouse_leave), tw); @@ -641,11 +651,11 @@ gtk_window_set_default_size (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height")); gtk_window_resize (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height")); - /* Create GDK resources now, to prevent crashes later on */ + /* Create GDK resources now, to prevent crashes later on */ gtk_widget_realize (tw->window); generate_animation_positions (tw); - return tw; + return TRUE; } gint tilda_window_free (tilda_window *tw) @@ -664,19 +674,10 @@ } g_free (tw->config_file); - g_free (tw); return 0; } -/** - * tilda_window_add_tab () - * - * Create and add a new tab at the end of the notebook - * - * Success: the new tab's index (>=0) - * Failure: -1 - */ gint tilda_window_add_tab (tilda_window *tw) { DEBUG_FUNCTION ("tilda_window_add_tab"); @@ -700,10 +701,12 @@ /* Strangely enough, prepend puts pages on the end */ index = gtk_notebook_append_page (GTK_NOTEBOOK(tw->notebook), tt->hbox, label); gtk_notebook_set_current_page (GTK_NOTEBOOK(tw->notebook), index); - gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(tw->notebook), tt->hbox, TRUE); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK(tw->notebook), tt->hbox, TRUE); - /* We should show the tabs if there are more than one tab in the notebook */ - if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)) > 1) + /* We should show the tabs if there are more than one tab in the notebook, + * and tab position is not set to hidden */ + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (tw->notebook)) > 1 && + config_getint("tab_pos") != NB_HIDDEN) gtk_notebook_set_show_tabs (GTK_NOTEBOOK (tw->notebook), TRUE); /* Add to GList list of tilda_term structures in tilda_window structure */ @@ -715,14 +718,6 @@ return TRUE; //index; } -/** - * tilda_window_close_tab () - * - * Closes the tab at the given tab index (starting from 0) - * - * Success: return 0 - * Failure: return non-zero - */ gint tilda_window_close_tab (tilda_window *tw, gint tab_index, gboolean force_exit) { DEBUG_FUNCTION ("tilda_window_close_tab"); @@ -776,7 +771,7 @@ break; case RESTART_TERMINAL_AND_HIDE: tilda_window_add_tab (tw); - pull (tw, PULL_UP); + pull (tw, PULL_UP, TRUE); break; case EXIT_TILDA: default: diff -Nru tilda-1.1.12/src/tilda_window.h tilda-1.2.2/src/tilda_window.h --- tilda-1.1.12/src/tilda_window.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tilda_window.h 2014-10-28 11:36:24.000000000 +0000 @@ -10,15 +10,14 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #ifndef TILDA_WINDOW_H #define TILDA_WINDOW_H -#include -#include +#include "tilda_window.h" +#include "tilda_terminal.h" #include #include @@ -39,7 +38,7 @@ gboolean config_writing_disabled; gint instance; gboolean have_argb_visual; - + /* Temporarily disable auto hiding */ gboolean disable_auto_hide; /* Auto hide tick-function handler */ @@ -55,23 +54,101 @@ /* Should Tilda hide itself when mouse leaves it? */ gboolean auto_hide_on_mouse_leave; + /* Should Tilda hide itself even if not focused */ + gboolean hide_non_focused; + gboolean fullscreen; /* This field MUST be set before calling pull()! */ enum tilda_positions { UP, DOWN } current_state; + gboolean focus_loss_on_keypress; }; -enum notebook_tab_positions { NB_TOP, NB_BOTTOM, NB_LEFT, NB_RIGHT }; +enum notebook_tab_positions { NB_TOP, NB_BOTTOM, NB_LEFT, NB_RIGHT, NB_HIDDEN }; +/** + * tilda_window_add_tab () + * + * Create and add a new tab at the end of the notebook + * + * Success: the new tab's index (>=0) + * Failure: -1 + */ gint tilda_window_add_tab (tilda_window *tw); + +/** + * tilda_window_close_tab () + * + * Closes the tab at the given tab index (starting from 0) + * + * Success: return 0 + * Failure: return non-zero + */ gint tilda_window_close_tab (tilda_window *tw, gint tab_position, gboolean force_exit); -tilda_window *tilda_window_init (const gchar *config_file, const gint instance); + +/** + * tilda_window_next_tab () + * + * Switch to next tab + * + * Success: return 0 + * Failure: return non-zero + */ +gint tilda_window_next_tab (tilda_window *tw); + +/** + * tilda_window_prev_tab () + * + * Switch to previous tab + * + * Success: return 0 + * Failure: return non-zero + */ +gint tilda_window_prev_tab (tilda_window *tw); + +/** + * tilda_window_init () + * + * Initalizes an already allocated tilda_window *. It will also initialize and set up + * as much of the window as possible using the values in the configuation system. + * + * @param instance the instance number of this tilda_window + * + * Notes: The configuration system must be up and running before calling this function. + */ +gboolean tilda_window_init (const gchar *config_file, const gint instance, tilda_window *tw); + +/** + * Releases resources that are being used by the tilda window, such as the tabs + * or the config file. + */ gint tilda_window_free (tilda_window *tw); + +/** + * This toggles the fullscreen mode on or off. This is intended to be registered + * as a GCallback in order to be invoked after some user action. + */ gint toggle_fullscreen_cb (tilda_window *tw); +/** + * This controls where the tabs are positions (e.g. top, left, bottom or + * right). + */ gint tilda_window_set_tab_position (tilda_window *tw, enum notebook_tab_positions pos); + +/** + * tilda_window_close_tab () + * + * Closes the tab current tab + */ void tilda_window_close_current_tab (tilda_window *tw); +/** + * This registers the keyboard shortcuts to the values which the user has + * configured. It is automatically called when the window is initialized, + * but it must be called by the wizard after the user has changed one + * of the shortcuts, in order to registered the new shortcut. + */ gint tilda_window_setup_keyboard_accelerators (tilda_window *tw); #define TILDA_WINDOW(data) ((tilda_window *)(data)) diff -Nru tilda-1.1.12/src/tomboykeybinder.c tilda-1.2.2/src/tomboykeybinder.c --- tilda-1.1.12/src/tomboykeybinder.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tomboykeybinder.c 2014-10-28 11:36:24.000000000 +0000 @@ -1,3 +1,26 @@ +/* tomboykeybinder.c +* Copyright (C) 2008 Alex Graveley +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be +* included in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + #include #include @@ -6,22 +29,14 @@ #include "eggaccelerators.h" #include "tomboykeybinder.h" - -/* Uncomment the next line to print a debug trace. */ -/* #define DEBUG */ - -#ifdef DEBUG -# define TRACE(x) x -#else -# define TRACE(x) do {} while (FALSE); -#endif +#include "debug.h" typedef struct _Binding { TomboyBindkeyHandler handler; gpointer user_data; char *keystring; - uint keycode; - uint modifiers; + unsigned int keycode; + unsigned int modifiers; } Binding; static GSList *bindings = NULL; @@ -33,21 +48,21 @@ static void lookup_ignorable_modifiers (GdkKeymap *keymap) { - egg_keymap_resolve_virtual_modifiers (keymap, + egg_keymap_resolve_virtual_modifiers (keymap, EGG_VIRTUAL_LOCK_MASK, &caps_lock_mask); - egg_keymap_resolve_virtual_modifiers (keymap, + egg_keymap_resolve_virtual_modifiers (keymap, EGG_VIRTUAL_NUM_LOCK_MASK, &num_lock_mask); - egg_keymap_resolve_virtual_modifiers (keymap, + egg_keymap_resolve_virtual_modifiers (keymap, EGG_VIRTUAL_SCROLL_LOCK_MASK, &scroll_lock_mask); } static void -grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin, +grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin, Binding *binding, gboolean grab) { @@ -61,27 +76,27 @@ caps_lock_mask | scroll_lock_mask, num_lock_mask | caps_lock_mask | scroll_lock_mask, }; - int i; + guint i; for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) { if (grab) { - XGrabKey (GDK_WINDOW_XDISPLAY (rootwin), - binding->keycode, - binding->modifiers | mod_masks [i], + XGrabKey (GDK_WINDOW_XDISPLAY (rootwin), + binding->keycode, + binding->modifiers | mod_masks [i], GDK_WINDOW_XID (rootwin), - False, + False, GrabModeAsync, GrabModeAsync); } else { XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin), binding->keycode, - binding->modifiers | mod_masks [i], + binding->modifiers | mod_masks [i], GDK_WINDOW_XID (rootwin)); } } } -static gboolean +static gboolean do_grab_key (Binding *binding) { GdkKeymap *keymap = gdk_keymap_get_default (); @@ -93,14 +108,14 @@ if (keymap == NULL || rootwin == NULL) return FALSE; - if (!egg_accelerator_parse_virtual (binding->keystring, - &keysym, + if (!egg_accelerator_parse_virtual (binding->keystring, + &keysym, &virtual_mods)) return FALSE; TRACE (g_print ("Got accel %d, %d\n", keysym, virtual_mods)); - binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin), + binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin), keysym); if (binding->keycode == 0) return FALSE; @@ -115,8 +130,8 @@ gdk_error_trap_push (); - grab_ungrab_with_ignorable_modifiers (rootwin, - binding, + grab_ungrab_with_ignorable_modifiers (rootwin, + binding, TRUE /* grab */); gdk_flush (); @@ -129,73 +144,72 @@ return TRUE; } -static gboolean +static gboolean do_ungrab_key (Binding *binding) { GdkWindow *rootwin = gdk_get_default_root_window (); TRACE (g_print ("Removing grab for '%s'\n", binding->keystring)); - grab_ungrab_with_ignorable_modifiers (rootwin, - binding, + grab_ungrab_with_ignorable_modifiers (rootwin, + binding, FALSE /* ungrab */); return TRUE; } static GdkFilterReturn -filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) -{ - GdkFilterReturn return_val = GDK_FILTER_CONTINUE; - XEvent *xevent = (XEvent *) gdk_xevent; - guint event_mods; - GSList *iter; - - TRACE (g_print ("Got Event! %d, %d\n", xevent->type, event->type)); - - switch (xevent->type) { - case KeyPress: - TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n", - xevent->xkey.keycode, - xevent->xkey.state)); - - /* - * Set the last event time for use when showing - * windows to avoid anti-focus-stealing code. - */ - processing_event = TRUE; - last_event_time = xevent->xkey.time; - - event_mods = xevent->xkey.state & ~(num_lock_mask | - caps_lock_mask | - scroll_lock_mask); - - for (iter = bindings; iter != NULL; iter = iter->next) { - Binding *binding = (Binding *) iter->data; - - if (binding->keycode == xevent->xkey.keycode && - binding->modifiers == event_mods) { - - TRACE (g_print ("Calling handler for '%s'...\n", - binding->keystring)); - - (binding->handler) (binding->keystring, - binding->user_data); - } - } - - processing_event = FALSE; - break; - case KeyRelease: - TRACE (g_print ("Got KeyRelease! \n")); - break; +filter_func (GdkXEvent *gdk_xevent, G_GNUC_UNUSED GdkEvent *event, G_GNUC_UNUSED gpointer data) { + XEvent *xevent = (XEvent *) gdk_xevent; + guint event_mods; + GSList *iter; + + switch (xevent->type) { + case KeyPress: + TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n", + xevent->xkey.keycode, + xevent->xkey.state)); + + /* + * Set the last event time for use when showing + * windows to avoid anti-focus-stealing code. + */ + processing_event = TRUE; + last_event_time = xevent->xkey.time; + TRACE (g_print ("Current event time %d\n", last_event_time)); + + event_mods = xevent->xkey.state & ~(num_lock_mask | + caps_lock_mask | + scroll_lock_mask); + + for (iter = bindings; iter != NULL; iter = iter->next) { + Binding *binding = (Binding *) iter->data; + + if (binding->keycode == xevent->xkey.keycode && + binding->modifiers == event_mods) { + + TRACE (g_print ("Calling handler for '%s'...\n", + binding->keystring)); + + (binding->handler) (binding->keystring, + binding->user_data); + } + } + + processing_event = FALSE; + break; + case KeyRelease: + TRACE (g_print ("Got KeyRelease! \n")); + break; + default: + break; } - return return_val; + return GDK_FILTER_CONTINUE; } -static void -keymap_changed (GdkKeymap *map) +static void +keymap_changed (G_GNUC_UNUSED GdkKeymap *map) { GdkKeymap *keymap = gdk_keymap_get_default (); GSList *iter; @@ -215,7 +229,7 @@ } } -void +void tomboy_keybinder_init (void) { GdkKeymap *keymap = gdk_keymap_get_default (); @@ -223,11 +237,11 @@ lookup_ignorable_modifiers (keymap); - gdk_window_add_filter (rootwin, - filter_func, + gdk_window_add_filter (rootwin, + filter_func, NULL); - g_signal_connect (keymap, + g_signal_connect (keymap, "keys_changed", G_CALLBACK (keymap_changed), NULL); @@ -260,7 +274,7 @@ } void -tomboy_keybinder_unbind (const char *keystring, +tomboy_keybinder_unbind (const char *keystring, TomboyBindkeyHandler handler) { GSList *iter; @@ -269,7 +283,7 @@ Binding *binding = (Binding *) iter->data; if (strcmp (keystring, binding->keystring) != 0 || - handler != binding->handler) + handler != binding->handler) continue; do_ungrab_key (binding); @@ -282,7 +296,7 @@ } } -/* +/* * From eggcellrenderkeys.c. */ gboolean @@ -314,7 +328,7 @@ guint32 tomboy_keybinder_get_current_event_time (void) { - if (processing_event) + if (processing_event) return last_event_time; else return GDK_CURRENT_TIME; diff -Nru tilda-1.1.12/src/tomboykeybinder.h tilda-1.2.2/src/tomboykeybinder.h --- tilda-1.1.12/src/tomboykeybinder.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/tomboykeybinder.h 2014-10-28 11:36:24.000000000 +0000 @@ -1,3 +1,25 @@ +/* tomboykeybinder.h +* Copyright (C) 2008 Alex Graveley +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be +* included in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef __TOMBOY_KEY_BINDER_H__ #define __TOMBOY_KEY_BINDER_H__ diff -Nru tilda-1.1.12/src/wizard.c tilda-1.2.2/src/wizard.c --- tilda-1.1.12/src/wizard.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/wizard.c 2014-10-28 11:36:24.000000000 +0000 @@ -11,18 +11,19 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #include -#include -#include -#include -#include -#include -#include +#include + +#include "debug.h" +#include "tilda.h" +#include "wizard.h" +#include "key_grabber.h" +#include "configsys.h" +#include "callback_func.h" #include #include @@ -37,114 +38,150 @@ /* INT_MAX */ #include -const GdkColor -terminal_palette_tango[TERMINAL_PALETTE_SIZE] = -{ - { 0, 0x2e2e, 0x3434, 0x3636 }, - { 0, 0xcccc, 0x0000, 0x0000 }, - { 0, 0x4e4e, 0x9a9a, 0x0606 }, - { 0, 0xc4c4, 0xa0a0, 0x0000 }, - { 0, 0x3434, 0x6565, 0xa4a4 }, - { 0, 0x7575, 0x5050, 0x7b7b }, - { 0, 0x0606, 0x9820, 0x9a9a }, - { 0, 0xd3d3, 0xd7d7, 0xcfcf }, - { 0, 0x5555, 0x5757, 0x5353 }, - { 0, 0xefef, 0x2929, 0x2929 }, - { 0, 0x8a8a, 0xe2e2, 0x3434 }, - { 0, 0xfcfc, 0xe9e9, 0x4f4f }, - { 0, 0x7272, 0x9f9f, 0xcfcf }, - { 0, 0xadad, 0x7f7f, 0xa8a8 }, - { 0, 0x3434, 0xe2e2, 0xe2e2 }, - { 0, 0xeeee, 0xeeee, 0xecec } +const GdkRGBA +terminal_palette_tango[TERMINAL_PALETTE_SIZE] = { + { RGB(0x2e2e, 0x3434, 0x3636) }, + { RGB(0xcccc, 0x0000, 0x0000) }, + { RGB(0x4e4e, 0x9a9a, 0x0606) }, + { RGB(0xc4c4, 0xa0a0, 0x0000) }, + { RGB(0x3434, 0x6565, 0xa4a4) }, + { RGB(0x7575, 0x5050, 0x7b7b) }, + { RGB(0x0606, 0x9820, 0x9a9a) }, + { RGB(0xd3d3, 0xd7d7, 0xcfcf) }, + { RGB(0x5555, 0x5757, 0x5353) }, + { RGB(0xefef, 0x2929, 0x2929) }, + { RGB(0x8a8a, 0xe2e2, 0x3434) }, + { RGB(0xfcfc, 0xe9e9, 0x4f4f) }, + { RGB(0x7272, 0x9f9f, 0xcfcf) }, + { RGB(0xadad, 0x7f7f, 0xa8a8) }, + { RGB(0x3434, 0xe2e2, 0xe2e2) }, + { RGB(0xeeee, 0xeeee, 0xecec) } }; -const GdkColor +const GdkRGBA terminal_palette_zenburn[TERMINAL_PALETTE_SIZE] = { - {0, 0x2222, 0x2222, 0x2222 }, //black - {0, 0x8080, 0x3232, 0x3232 }, //darkred - {0, 0x5b5b, 0x7676, 0x2f2f }, //darkgreen - {0, 0xaaaa, 0x9999, 0x4343 }, //brown - {0, 0x3232, 0x4c4c, 0x8080 }, //darkblue - {0, 0x7070, 0x6c6c, 0x9a9a }, //darkmagenta - {0, 0x9292, 0xb1b1, 0x9e9e }, //darkcyan - {0, 0xffff, 0xffff, 0xffff }, //lightgrey - {0, 0x2222, 0x2222, 0x2222 }, //darkgrey - {0, 0x9898, 0x2b2b, 0x2b2b }, //red - {0, 0x8989, 0xb8b8, 0x3f3f }, //green - {0, 0xefef, 0xefef, 0x6060 }, //yellow - {0, 0x2b2b, 0x4f4f, 0x9898 }, //blue - {0, 0x8282, 0x6a6a, 0xb1b1 }, //magenta - {0, 0xa1a1, 0xcdcd, 0xcdcd }, //cyan - {0, 0xdede, 0xdede, 0xdede }, //white} + { RGB(0x2222, 0x2222, 0x2222) }, //black + { RGB(0x8080, 0x3232, 0x3232) }, //darkred + { RGB(0x5b5b, 0x7676, 0x2f2f) }, //darkgreen + { RGB(0xaaaa, 0x9999, 0x4343) }, //brown + { RGB(0x3232, 0x4c4c, 0x8080) }, //darkblue + { RGB(0x7070, 0x6c6c, 0x9a9a) }, //darkmagenta + { RGB(0x9292, 0xb1b1, 0x9e9e) }, //darkcyan + { RGB(0xffff, 0xffff, 0xffff) }, //lightgrey + { RGB(0x2222, 0x2222, 0x2222) }, //darkgrey + { RGB(0x9898, 0x2b2b, 0x2b2b) }, //red + { RGB(0x8989, 0xb8b8, 0x3f3f) }, //green + { RGB(0xefef, 0xefef, 0x6060) }, //yellow + { RGB(0x2b2b, 0x4f4f, 0x9898) }, //blue + { RGB(0x8282, 0x6a6a, 0xb1b1) }, //magenta + { RGB(0xa1a1, 0xcdcd, 0xcdcd) }, //cyan + { RGB(0xdede, 0xdede, 0xdede) }, //white} }; -const GdkColor -terminal_palette_linux[TERMINAL_PALETTE_SIZE] = -{ - { 0, 0x0000, 0x0000, 0x0000 }, - { 0, 0xaaaa, 0x0000, 0x0000 }, - { 0, 0x0000, 0xaaaa, 0x0000 }, - { 0, 0xaaaa, 0x5555, 0x0000 }, - { 0, 0x0000, 0x0000, 0xaaaa }, - { 0, 0xaaaa, 0x0000, 0xaaaa }, - { 0, 0x0000, 0xaaaa, 0xaaaa }, - { 0, 0xaaaa, 0xaaaa, 0xaaaa }, - { 0, 0x5555, 0x5555, 0x5555 }, - { 0, 0xffff, 0x5555, 0x5555 }, - { 0, 0x5555, 0xffff, 0x5555 }, - { 0, 0xffff, 0xffff, 0x5555 }, - { 0, 0x5555, 0x5555, 0xffff }, - { 0, 0xffff, 0x5555, 0xffff }, - { 0, 0x5555, 0xffff, 0xffff }, - { 0, 0xffff, 0xffff, 0xffff } +const GdkRGBA +terminal_palette_linux[TERMINAL_PALETTE_SIZE] = { + { RGB(0x0000, 0x0000, 0x0000) }, + { RGB(0xaaaa, 0x0000, 0x0000) }, + { RGB(0x0000, 0xaaaa, 0x0000) }, + { RGB(0xaaaa, 0x5555, 0x0000) }, + { RGB(0x0000, 0x0000, 0xaaaa) }, + { RGB(0xaaaa, 0x0000, 0xaaaa) }, + { RGB(0x0000, 0xaaaa, 0xaaaa) }, + { RGB(0xaaaa, 0xaaaa, 0xaaaa) }, + { RGB(0x5555, 0x5555, 0x5555) }, + { RGB(0xffff, 0x5555, 0x5555) }, + { RGB(0x5555, 0xffff, 0x5555) }, + { RGB(0xffff, 0xffff, 0x5555) }, + { RGB(0x5555, 0x5555, 0xffff) }, + { RGB(0xffff, 0x5555, 0xffff) }, + { RGB(0x5555, 0xffff, 0xffff) }, + { RGB(0xffff, 0xffff, 0xffff) } }; -const GdkColor -terminal_palette_xterm[TERMINAL_PALETTE_SIZE] = -{ - {0, 0x0000, 0x0000, 0x0000 }, - {0, 0xcdcb, 0x0000, 0x0000 }, - {0, 0x0000, 0xcdcb, 0x0000 }, - {0, 0xcdcb, 0xcdcb, 0x0000 }, - {0, 0x1e1a, 0x908f, 0xffff }, - {0, 0xcdcb, 0x0000, 0xcdcb }, - {0, 0x0000, 0xcdcb, 0xcdcb }, - {0, 0xe5e2, 0xe5e2, 0xe5e2 }, - {0, 0x4ccc, 0x4ccc, 0x4ccc }, - {0, 0xffff, 0x0000, 0x0000 }, - {0, 0x0000, 0xffff, 0x0000 }, - {0, 0xffff, 0xffff, 0x0000 }, - {0, 0x4645, 0x8281, 0xb4ae }, - {0, 0xffff, 0x0000, 0xffff }, - {0, 0x0000, 0xffff, 0xffff }, - {0, 0xffff, 0xffff, 0xffff } +const GdkRGBA +terminal_palette_xterm[TERMINAL_PALETTE_SIZE] = { + {RGB(0x0000, 0x0000, 0x0000) }, + {RGB(0xcdcb, 0x0000, 0x0000) }, + {RGB(0x0000, 0xcdcb, 0x0000) }, + {RGB(0xcdcb, 0xcdcb, 0x0000) }, + {RGB(0x1e1a, 0x908f, 0xffff) }, + {RGB(0xcdcb, 0x0000, 0xcdcb) }, + {RGB(0x0000, 0xcdcb, 0xcdcb) }, + {RGB(0xe5e2, 0xe5e2, 0xe5e2) }, + {RGB(0x4ccc, 0x4ccc, 0x4ccc) }, + {RGB(0xffff, 0x0000, 0x0000) }, + {RGB(0x0000, 0xffff, 0x0000) }, + {RGB(0xffff, 0xffff, 0x0000) }, + {RGB(0x4645, 0x8281, 0xb4ae) }, + {RGB(0xffff, 0x0000, 0xffff) }, + {RGB(0x0000, 0xffff, 0xffff) }, + {RGB(0xffff, 0xffff, 0xffff) } }; -const GdkColor -terminal_palette_rxvt[TERMINAL_PALETTE_SIZE] = -{ - { 0, 0x0000, 0x0000, 0x0000 }, - { 0, 0xcdcd, 0x0000, 0x0000 }, - { 0, 0x0000, 0xcdcd, 0x0000 }, - { 0, 0xcdcd, 0xcdcd, 0x0000 }, - { 0, 0x0000, 0x0000, 0xcdcd }, - { 0, 0xcdcd, 0x0000, 0xcdcd }, - { 0, 0x0000, 0xcdcd, 0xcdcd }, - { 0, 0xfafa, 0xebeb, 0xd7d7 }, - { 0, 0x4040, 0x4040, 0x4040 }, - { 0, 0xffff, 0x0000, 0x0000 }, - { 0, 0x0000, 0xffff, 0x0000 }, - { 0, 0xffff, 0xffff, 0x0000 }, - { 0, 0x0000, 0x0000, 0xffff }, - { 0, 0xffff, 0x0000, 0xffff }, - { 0, 0x0000, 0xffff, 0xffff }, - { 0, 0xffff, 0xffff, 0xffff } +const GdkRGBA +terminal_palette_rxvt[TERMINAL_PALETTE_SIZE] = { + { RGB(0x0000, 0x0000, 0x0000) }, + { RGB(0xcdcd, 0x0000, 0x0000) }, + { RGB(0x0000, 0xcdcd, 0x0000) }, + { RGB(0xcdcd, 0xcdcd, 0x0000) }, + { RGB(0x0000, 0x0000, 0xcdcd) }, + { RGB(0xcdcd, 0x0000, 0xcdcd) }, + { RGB(0x0000, 0xcdcd, 0xcdcd) }, + { RGB(0xfafa, 0xebeb, 0xd7d7) }, + { RGB(0x4040, 0x4040, 0x4040) }, + { RGB(0xffff, 0x0000, 0x0000) }, + { RGB(0x0000, 0xffff, 0x0000) }, + { RGB(0xffff, 0xffff, 0x0000) }, + { RGB(0x0000, 0x0000, 0xffff) }, + { RGB(0xffff, 0x0000, 0xffff) }, + { RGB(0x0000, 0xffff, 0xffff) }, + { RGB(0xffff, 0xffff, 0xffff) } +}; + +const GdkRGBA +terminal_palette_solarizedL[TERMINAL_PALETTE_SIZE] = { + { RGB(0xeeee, 0xe8e8, 0xd5d5) }, + { RGB(0xdcdc, 0x3232, 0x2f2f) }, + { RGB(0x8585, 0x9999, 0x0000) }, + { RGB(0xb5b5, 0x8989, 0x0000) }, + { RGB(0x2626, 0x8b8b, 0xd2d2) }, + { RGB(0xd3d3, 0x3636, 0x8282) }, + { RGB(0x2a2a, 0xa1a1, 0x9898) }, + { RGB(0x0707, 0x3636, 0x4242) }, + { RGB(0xfdfd, 0xf6f6, 0xe3e3) }, + { RGB(0xcbcb, 0x4b4b, 0x1616) }, + { RGB(0x9393, 0xa1a1, 0xa1a1) }, + { RGB(0x8383, 0x9494, 0x9696) }, + { RGB(0x6565, 0x7b7b, 0x8383) }, + { RGB(0x6c6c, 0x7171, 0xc4c4) }, + { RGB(0x5858, 0x6e6e, 0x7575) }, + { RGB(0x0000, 0x2b2b, 0x3636) } +}; + +const GdkRGBA +terminal_palette_solarizedD[TERMINAL_PALETTE_SIZE] = { + { RGB(0x0707, 0x3636, 0x4242) }, + { RGB(0xdcdc, 0x3232, 0x2f2f) }, + { RGB(0x8585, 0x9999, 0x0000) }, + { RGB(0xb5b5, 0x8989, 0x0000) }, + { RGB(0x2626, 0x8b8b, 0xd2d2) }, + { RGB(0xd3d3, 0x3636, 0x8282) }, + { RGB(0x2a2a, 0xa1a1, 0x9898) }, + { RGB(0xeeee, 0xe8e8, 0xd5d5) }, + { RGB(0x0000, 0x2b2b, 0x3636) }, + { RGB(0xcbcb, 0x4b4b, 0x1616) }, + { RGB(0x5858, 0x6e6e, 0x7575) }, + { RGB(0x8383, 0x9494, 0x9696) }, + { RGB(0x6565, 0x7b7b, 0x8383) }, + { RGB(0x6c6c, 0x7171, 0xc4c4) }, + { RGB(0x9393, 0xa1a1, 0xa1a1) }, + { RGB(0xfdfd, 0xf6f6, 0xe3e3) } }; typedef struct _TerminalPaletteScheme { const char *name; - const GdkColor *palette; + const GdkRGBA *palette; }TerminalPaletteScheme; static TerminalPaletteScheme palette_schemes[] = { @@ -153,17 +190,15 @@ { N_("Linux console"), terminal_palette_linux }, { N_("XTerm"), terminal_palette_xterm }, { N_("Rxvt"), terminal_palette_rxvt }, - { N_("Zenburn"), terminal_palette_zenburn } + { N_("Zenburn"), terminal_palette_zenburn }, + { N_("Solarized Light"), terminal_palette_solarizedL }, + { N_("Solarized Dark"), terminal_palette_solarizedD } }; -static void init_palette_scheme_menu (void); -static void update_palette_color_button(gint idx); - - /* For use in get_display_dimension() */ enum dimensions { HEIGHT, WIDTH }; -/* This will hold the GtkBuilder representation of the .glade file. +/* This will hold the GtkBuilder representation of the .ui file. * We keep this global so that we can look up any element from any routine. * * Note that for GtkBuilder to autoconnect signals, the functions that it hooks @@ -180,8 +215,14 @@ static tilda_window *tw = NULL; /* Prototypes for use in the wizard() */ -static void set_wizard_state_from_config (); -static void connect_wizard_signals (); +static void set_wizard_state_from_config (void); +static void connect_wizard_signals (void); +static void init_palette_scheme_menu (void); +static void update_palette_color_button(gint idx); +static gboolean validate_pulldown_keybinding(const gchar* accel, const GtkWidget* wizard_window, const gchar* message); +static gboolean validate_keybinding(const gchar* accel, const GtkWidget* wizard_window, const gchar* message); +static int find_centering_coordinate (enum dimensions dimension); +static void initialize_geometry_spinners(void); /* Show the wizard. This will show the wizard, then exit immediately. */ gint wizard (tilda_window *ltw) @@ -190,7 +231,6 @@ DEBUG_ASSERT (ltw != NULL); gchar *window_title; - const gchar *glade_file = g_build_filename (PKGDATADIR, "tilda.glade", NULL); GtkWidget *wizard_window; /* Make sure that there isn't already a wizard showing */ @@ -206,14 +246,13 @@ gtk_builder_set_translation_domain (xml, PACKAGE); #endif - if (!gtk_builder_add_from_file (xml, glade_file, &error)) { - g_error ("Couldn't load builder file: %s", error->message); - g_error_free (error); + if(!gtk_builder_add_from_resource (xml, "/org/tilda/tilda.ui", &error)) { + g_prefix_error(&error, "Error:"); return EXIT_FAILURE; } if (!xml) { - g_warning ("problem while loading the tilda.glade file"); + g_warning ("problem while loading the tilda.ui file"); return 2; } @@ -257,7 +296,7 @@ return 0; } -gboolean validate_pulldown_keybinding(const gchar* accel, const GtkWidget* wizard_window, const gchar* message) +static gboolean validate_pulldown_keybinding(const gchar* accel, const GtkWidget* wizard_window, const gchar* message) { /* Try to grab the key. This is a good way to validate it :) */ gboolean key_is_valid = tilda_keygrabber_bind (accel, tw); @@ -272,7 +311,7 @@ } } -gboolean validate_keybinding(const gchar* accel, const GtkWidget* wizard_window, const gchar* message) +static gboolean validate_keybinding(const gchar* accel, const GtkWidget* wizard_window, const gchar* message) { guint accel_key; GdkModifierType accel_mods; @@ -317,6 +356,7 @@ const gchar *gototab_8_key = GET_BUTTON_LABEL("button_keybinding_gototab8"); const gchar *gototab_9_key = GET_BUTTON_LABEL("button_keybinding_gototab9"); const gchar *gototab_10_key = GET_BUTTON_LABEL("button_keybinding_gototab10"); + const gchar *fullscreen_key = GET_BUTTON_LABEL("button_keybinding_fullscreen"); const GtkWidget *entry_custom_command = GTK_WIDGET (gtk_builder_get_object(xml, "entry_custom_command")); @@ -369,6 +409,8 @@ return; if (!validate_keybinding(gototab_10_key, wizard_window, _("The keybinding you chose for \"Go To Tab 10\" is invalid. Please choose another."))) return; + if (!validate_keybinding(fullscreen_key, wizard_window, _("The keybinding you chose for \"Toggle Fullscreen\" is invalid. Please choose another."))) + return; /* Now that our shortcuts are validated, store them back into the config. */ config_setstr ("key", key); @@ -391,6 +433,7 @@ config_setstr ("gototab_8_key", gototab_8_key); config_setstr ("gototab_9_key", gototab_9_key); config_setstr ("gototab_10_key", gototab_10_key); + config_setstr ("fullscreen_key", fullscreen_key); /* Now that they're in the config, reset the keybindings right now. */ tilda_window_setup_keyboard_accelerators(tw); @@ -461,7 +504,7 @@ gtk_builder_get_object (xml, (GLADE_NAME))), (VALUE)) #define FILE_BUTTON(GLADE_NAME, FILENAME) gtk_file_chooser_set_filename (GTK_FILE_CHOOSER( \ gtk_builder_get_object (xml, (GLADE_NAME))), FILENAME) -#define COLOR_BUTTON(GLADE_NAME,COLOR) gtk_color_button_set_color (GTK_COLOR_BUTTON( \ +#define COLOR_CHOOSER(GLADE_NAME,COLOR) gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER( \ gtk_builder_get_object (xml, (GLADE_NAME))), (COLOR)) #define SET_SENSITIVE_BY_CONFIG_BOOL(GLADE_NAME,CFG_BOOL) gtk_widget_set_sensitive ( \ GTK_WIDGET (gtk_builder_get_object (xml, (GLADE_NAME))), config_getbool ((CFG_BOOL))) @@ -511,7 +554,7 @@ * Note that this is called for the key_press_event for the key-grab dialog, not for the wizard. */ -static void wizard_dlg_key_grab (GtkWidget *dialog, GdkEventKey *event, GtkWidget* w, const GtkWidget* wizard_window) +static gpointer wizard_dlg_key_grab (GtkWidget *dialog, GdkEventKey *event, GtkWidget* w, const GtkWidget* wizard_window) { DEBUG_FUNCTION ("wizard_dlg_key_grab"); DEBUG_ASSERT (wizard_window != NULL); @@ -547,6 +590,7 @@ /* Free the string */ g_free (key); } + return GDK_EVENT_PROPAGATE; } static int percentage_dimension (int max_size, int current_size) { @@ -641,12 +685,25 @@ title = get_window_title (tt->vte_term); page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (tw->notebook), i); label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (tw->notebook), page); - gtk_label_set_label (GTK_LABEL(label), title); + + guint length = config_getint ("title_max_length"); + + if(config_getbool("title_max_length_flag") && strlen(title) > length) { + gchar *titleOffset = title + strlen(title) - length; + gchar *shortTitle = g_strdup_printf ("...%s", titleOffset); + gtk_label_set_text (GTK_LABEL(label), shortTitle); + g_free(shortTitle); + } else { + gtk_label_set_text (GTK_LABEL(label), title); + } + g_free (title); } } -static void set_spin_value_while_blocking_callback (GtkSpinButton *spin, void (*callback)(GtkWidget *w), gint new_val) +static void set_spin_value_while_blocking_callback (GtkSpinButton *spin, + void (*callback)(GtkWidget *w), + gint new_val) { g_signal_handlers_block_by_func (spin, G_CALLBACK(*callback), NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON(spin), new_val); @@ -657,11 +714,8 @@ /* ALL Callbacks are below */ /******************************************************************************/ -static void button_wizard_close_clicked_cb (GtkWidget *w) +static void button_wizard_close_clicked_cb () { - const GtkWidget *wizard_window = - GTK_WIDGET (gtk_builder_get_object (xml, "wizard_window")); - /* Call the clean-up function */ wizard_closed (); } @@ -713,7 +767,7 @@ static void check_enable_double_buffering_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("double_buffer", status); @@ -727,7 +781,7 @@ static void check_terminal_bell_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("bell", status); @@ -742,7 +796,7 @@ static void check_cursor_blinks_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("blinks", status); @@ -757,7 +811,7 @@ static void check_enable_antialiasing_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("antialias", status); @@ -796,7 +850,7 @@ static void check_allow_bold_text_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("bold", status); @@ -807,10 +861,31 @@ } } +static void combo_non_focus_pull_up_behaviour_cb (GtkWidget *w) +{ + const gint status = gtk_combo_box_get_active (GTK_COMBO_BOX(w)); + + if (status < 0 || status > 1) { + DEBUG_ERROR ("Non-focus pull up behaviour invalid"); + g_printerr (_("Invalid non-focus pull up behaviour, ignoring\n")); + return; + } + + if(1 == status) { + tw->hide_non_focused = TRUE; + } + else { + tw->hide_non_focused = FALSE; + } + + config_setint ("non_focus_pull_up_behaviour", status); +} + static void combo_tab_pos_changed_cb (GtkWidget *w) { const gint status = gtk_combo_box_get_active (GTK_COMBO_BOX(w)); - const gint positions[] = { GTK_POS_TOP, + const GtkPositionType positions[] = { + GTK_POS_TOP, GTK_POS_BOTTOM, GTK_POS_LEFT, GTK_POS_RIGHT }; @@ -822,14 +897,22 @@ } config_setint ("tab_pos", status); - gtk_notebook_set_tab_pos (GTK_NOTEBOOK(tw->notebook), positions[status]); + + if(NB_HIDDEN == status) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK(tw->notebook), FALSE); + } + else { + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK (tw->notebook)) > 1) { + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(tw->notebook), TRUE); + } + gtk_notebook_set_tab_pos (GTK_NOTEBOOK(tw->notebook), positions[status]); + } } static void button_font_font_set_cb (GtkWidget *w) { const gchar *font = gtk_font_button_get_font_name (GTK_FONT_BUTTON (w)); - const gboolean antialias = config_getbool ("antialias"); - gint i; + guint i; tilda_term *tt; config_setstr ("font", font); @@ -858,6 +941,32 @@ window_title_change_all (); } +static void check_max_title_length_cb (GtkWidget *w) +{ + DEBUG_FUNCTION ("check_max_title_length_cb"); + + GtkWidget *entry = GTK_WIDGET( + gtk_builder_get_object (xml, ("spin_title_max_length")) + ); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) { + config_setbool("title_max_length_flag", TRUE); + gtk_editable_set_editable (GTK_EDITABLE(entry), TRUE); + } else { + config_setbool("title_max_length_flag", FALSE); + gtk_editable_set_editable (GTK_EDITABLE(entry), FALSE); + } +} + +static void spin_max_title_length_changed_cb (GtkWidget *w) +{ + DEBUG_FUNCTION ("spin_max_title_length_changed_cb"); + + int length = gtk_spin_button_get_value (GTK_SPIN_BUTTON (w)); + + config_setint ("title_max_length", length); + window_title_change_all (); +} + static void check_run_custom_command_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); @@ -883,7 +992,10 @@ * icon is displayed on the end of the entry. * This function can only be registered to Widgets of (sub)type GtkEntry */ -static void validate_executable_command_cb (GtkWidget *w, GdkEvent *event, gpointer userdata) { +static void validate_executable_command_cb (GtkWidget *w, + G_GNUC_UNUSED GdkEvent *event, + G_GNUC_UNUSED gpointer userdata) +{ g_return_if_fail(w != NULL && GTK_IS_ENTRY(w)); const char* command = gtk_entry_get_text (GTK_ENTRY(w)); /* Check that the command exists */ @@ -927,7 +1039,7 @@ static void entry_word_chars_changed (GtkWidget *w) { - gint i; + guint i; tilda_term *tt; const gchar *word_chars = gtk_entry_get_text (GTK_ENTRY(w)); @@ -954,12 +1066,12 @@ * Centering based on y coordinate is similar, just use the screen height and * tilda window height. */ -int find_centering_coordinate (enum dimensions dimension) +static int find_centering_coordinate (enum dimensions dimension) { DEBUG_FUNCTION ("find_centering_coordinate"); - gdouble screen_dimension; - gdouble tilda_dimension; + gdouble screen_dimension = 0; + gdouble tilda_dimension = 0; gdouble min, max; if (dimension == HEIGHT) { SPIN_BUTTON_GET_RANGE ("spin_y_position", &min, &max); @@ -1160,7 +1272,7 @@ GTK_WIDGET (gtk_builder_get_object (xml, "spin_level_of_transparency")); const gdouble transparency_level = (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(spin_level_of_transparency)) / 100.0); - gint i; + guint i; tilda_term *tt; config_setbool ("enable_transparency", status); @@ -1192,7 +1304,7 @@ { const gint status = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(w)); const gdouble transparency_level = (status / 100.0); - gint i; + guint i; tilda_term *tt; config_setint ("transparency", status); @@ -1266,7 +1378,7 @@ GTK_WIDGET (gtk_builder_get_object (xml, "button_background_image")); const gchar *image = config_getstr ("image"); - gint i; + guint i; tilda_term *tt; @@ -1287,7 +1399,7 @@ static void button_background_image_selection_changed_cb (GtkWidget *w) { const gchar *image = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(w)); - gint i; + guint i; tilda_term *tt; config_setstr ("image", image); @@ -1308,28 +1420,59 @@ GTK_WIDGET (gtk_builder_get_object (xml, "colorbutton_text")); const GtkWidget *colorbutton_back = GTK_WIDGET (gtk_builder_get_object (xml, "colorbutton_back")); - GdkColor gdk_text, gdk_back; + GdkRGBA gdk_text, gdk_back; + tilda_term *tt; - gint i; + guint i; gboolean nochange = FALSE; config_setint ("scheme", scheme); - switch (scheme) - { + gdk_text.alpha = 1.0; + gdk_back.alpha = 1.0; + + switch (scheme) { + /* Green on black */ case 1: - gdk_text.red = gdk_text.blue = 0x0000; - gdk_text.green = 0xffff; - gdk_back.red = gdk_back.green = gdk_back.blue = 0x0000; + gdk_text.red = gdk_text.blue = 0.0; + gdk_text.green = 1.0; + gdk_back.red = gdk_back.green = gdk_back.blue = 0.0; break; + /* Black on white */ case 2: - gdk_text.red = gdk_text.green = gdk_text.blue = 0x0000; - gdk_back.red = gdk_back.green = gdk_back.blue = 0xffff; + gdk_text.red = gdk_text.green = gdk_text.blue = 0.0; + gdk_back.red = gdk_back.green = gdk_back.blue = 1.0; break; + /* White on black */ case 3: - gdk_text.red = gdk_text.green = gdk_text.blue = 0xffff; - gdk_back.red = gdk_back.green = gdk_back.blue = 0x0000; + gdk_text.red = gdk_text.green = gdk_text.blue = 1.0; + gdk_back.red = gdk_back.green = gdk_back.blue = 0.0; break; + /* Zenburn */ + case 4: + gdk_text.red = 0.86; + gdk_text.green = gdk_text.blue = 0.64; + gdk_back.red = gdk_back.green = gdk_back.blue = 0.25; + break; + /* Solarized Light */ + case 5: + gdk_text.red = 0.4; + gdk_text.green = 0.48; + gdk_text.blue = 0.51; + gdk_back.red = 0.99; + gdk_back.green = 0.96; + gdk_back.blue = 0.89; + break; + /* Solarized Dark */ + case 6: + gdk_text.red = 0.51; + gdk_text.green = 0.58; + gdk_text.blue = 0.59; + gdk_back.red = 0.0; + gdk_back.green = 0.17; + gdk_back.blue = 0.21; + break; + /* Custom */ default: nochange = TRUE; break; @@ -1338,20 +1481,20 @@ /* If we switched to "Custom", then don't do anything. Let the user continue * from the current color choice. */ if (!nochange) { - config_setint ("back_red", gdk_back.red); - config_setint ("back_green", gdk_back.green); - config_setint ("back_blue", gdk_back.blue); - config_setint ("text_red", gdk_text.red); - config_setint ("text_green", gdk_text.green); - config_setint ("text_blue", gdk_text.blue); + config_setint ("back_red", GUINT16_FROM_FLOAT(gdk_back.red)); + config_setint ("back_green", GUINT16_FROM_FLOAT(gdk_back.green)); + config_setint ("back_blue", GUINT16_FROM_FLOAT(gdk_back.blue)); + config_setint ("text_red", GUINT16_FROM_FLOAT(gdk_text.red)); + config_setint ("text_green", GUINT16_FROM_FLOAT(gdk_text.green)); + config_setint ("text_blue", GUINT16_FROM_FLOAT(gdk_text.blue)); - gtk_color_button_set_color (GTK_COLOR_BUTTON(colorbutton_text), &gdk_text); - gtk_color_button_set_color (GTK_COLOR_BUTTON(colorbutton_back), &gdk_back); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER(colorbutton_text), &gdk_text); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER(colorbutton_back), &gdk_back); for (i=0; iterms); i++) { tt = g_list_nth_data (tw->terms, i); - vte_terminal_set_color_foreground (VTE_TERMINAL(tt->vte_term), &gdk_text); - vte_terminal_set_color_background (VTE_TERMINAL(tt->vte_term), &gdk_back); + vte_terminal_set_color_foreground_rgba (VTE_TERMINAL(tt->vte_term), &gdk_text); + vte_terminal_set_color_background_rgba (VTE_TERMINAL(tt->vte_term), &gdk_back); } } } @@ -1361,23 +1504,23 @@ const GtkWidget *combo_colorschemes = GTK_WIDGET (gtk_builder_get_object (xml, "combo_colorschemes")); - gint i; + guint i; tilda_term *tt; - GdkColor gdk_text_color; + GdkRGBA gdk_text_color; /* The user just changed colors manually, so set the scheme to "Custom" */ gtk_combo_box_set_active (GTK_COMBO_BOX(combo_colorschemes), 0); config_setint ("scheme", 0); /* Now get the color that was set, save it, then set it */ - gtk_color_button_get_color (GTK_COLOR_BUTTON(w), &gdk_text_color); - config_setint ("text_red", gdk_text_color.red); - config_setint ("text_green", gdk_text_color.green); - config_setint ("text_blue", gdk_text_color.blue); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER(w), &gdk_text_color); + config_setint ("text_red", GUINT16_FROM_FLOAT(gdk_text_color.red)); + config_setint ("text_green", GUINT16_FROM_FLOAT(gdk_text_color.green)); + config_setint ("text_blue", GUINT16_FROM_FLOAT(gdk_text_color.blue)); for (i=0; iterms); i++) { tt = g_list_nth_data (tw->terms, i); - vte_terminal_set_color_foreground (VTE_TERMINAL(tt->vte_term), &gdk_text_color); + vte_terminal_set_color_foreground_rgba (VTE_TERMINAL(tt->vte_term), &gdk_text_color); } } @@ -1385,33 +1528,35 @@ { const GtkWidget *combo_colorschemes = GTK_WIDGET (gtk_builder_get_object (xml, "combo_colorschemes")); - gint i; + guint i; tilda_term *tt; - GdkColor gdk_back_color; + GdkRGBA gdk_back_color; /* The user just changed colors manually, so set the scheme to "Custom" */ gtk_combo_box_set_active (GTK_COMBO_BOX(combo_colorschemes), 0); config_setint ("scheme", 0); /* Now get the color that was set, save it, then set it */ - gtk_color_button_get_color (GTK_COLOR_BUTTON(w), &gdk_back_color); - config_setint ("back_red", gdk_back_color.red); - config_setint ("back_green", gdk_back_color.green); - config_setint ("back_blue", gdk_back_color.blue); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER(w), &gdk_back_color); + config_setint ("back_red", GUINT16_FROM_FLOAT(gdk_back_color.red)); + config_setint ("back_green", GUINT16_FROM_FLOAT(gdk_back_color.green)); + config_setint ("back_blue", GUINT16_FROM_FLOAT(gdk_back_color.blue)); for (i=0; iterms); i++) { tt = g_list_nth_data (tw->terms, i); - vte_terminal_set_color_background (VTE_TERMINAL(tt->vte_term), &gdk_back_color); + vte_terminal_set_color_background_rgba (VTE_TERMINAL(tt->vte_term), &gdk_back_color); } } - -static void combo_palette_scheme_changed_cb (GtkWidget *w) -{ - gint i, j; +/** + * This function is called if a different color scheme is selected from the combo box. + */ +static void combo_palette_scheme_changed_cb (GtkWidget *w) { + DEBUG_FUNCTION("combo_palette_scheme_changed_cb"); + guint i, j; tilda_term *tt; - GdkColor fg, bg; + GdkRGBA fg, bg; GtkWidget *color_button; i = gtk_combo_box_get_active (GTK_COMBO_BOX(w)); @@ -1419,27 +1564,30 @@ if (i > 0 && i < G_N_ELEMENTS (palette_schemes)) { color_button = GTK_WIDGET (gtk_builder_get_object (xml, "colorbutton_text")); - gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &fg); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER(color_button), &fg); color_button = GTK_WIDGET (gtk_builder_get_object (xml, "colorbutton_back")); - gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &bg); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER(color_button), &bg); memcpy(current_palette, palette_schemes[i].palette, sizeof(current_palette)); /* Set terminal palette. */ for (j=0; jterms); j++) { tt = g_list_nth_data (tw->terms, j); - - vte_terminal_set_colors (VTE_TERMINAL(tt->vte_term), &fg, &bg, current_palette, TERMINAL_PALETTE_SIZE); + vte_terminal_set_colors_rgba (VTE_TERMINAL(tt->vte_term), + &fg, + &bg, + current_palette, + TERMINAL_PALETTE_SIZE); } for (j=0; jterms); i++) { tt = g_list_nth_data (tw->terms, i); - vte_terminal_set_colors (VTE_TERMINAL(tt->vte_term), &fg, &bg, current_palette, TERMINAL_PALETTE_SIZE); + vte_terminal_set_colors_rgba (VTE_TERMINAL (tt->vte_term), + &fg, + &bg, + current_palette, + TERMINAL_PALETTE_SIZE); } } static void combo_scrollbar_position_changed_cb (GtkWidget *w) { const gint status = gtk_combo_box_get_active (GTK_COMBO_BOX(w)); - gint i; + guint i; tilda_term *tt; config_setint ("scrollbar_pos", status); @@ -1524,7 +1677,8 @@ static void spin_scrollback_amount_value_changed_cb (GtkWidget *w) { const gint status = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(w)); - gint i; + + guint i; tilda_term *tt; config_setint ("lines", status); @@ -1535,10 +1689,37 @@ } } +static void check_infinite_scrollback_toggled_cb(GtkWidget *w) +{ + // if status is false then scrollback is infinite, otherwise the spinner is active + const gboolean hasScrollbackLimit = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); + + config_setbool ("scroll_history_infinite", hasScrollbackLimit); + + GtkWidget *spinner = (GtkWidget *) gtk_builder_get_object(xml, "spin_scrollback_amount"); + gint scrollback_lines = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(spinner)); + GtkWidget *label = (GtkWidget *) gtk_builder_get_object(xml, "label_scrollback_lines"); + + gtk_widget_set_sensitive(spinner, hasScrollbackLimit); + gtk_widget_set_sensitive(label, hasScrollbackLimit); + + guint i; + tilda_term *tt; + + if(!hasScrollbackLimit) { + scrollback_lines = -1; + } + + for (i=0; iterms); i++) { + tt = g_list_nth_data (tw->terms, i); + vte_terminal_set_scrollback_lines(VTE_TERMINAL(tt->vte_term), scrollback_lines); + } +} + static void check_scroll_on_output_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("scroll_on_output", status); @@ -1552,7 +1733,7 @@ static void check_scroll_on_keystroke_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("scroll_on_key", status); @@ -1566,7 +1747,7 @@ static void check_scroll_background_toggled_cb (GtkWidget *w) { const gboolean status = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w)); - gint i; + guint i; tilda_term *tt; config_setbool ("scroll_background", status); @@ -1584,7 +1765,7 @@ VTE_ERASE_DELETE_SEQUENCE, VTE_ERASE_ASCII_BACKSPACE, VTE_ERASE_AUTO }; - gint i; + guint i; tilda_term *tt; config_setint ("backspace_key", status); @@ -1602,7 +1783,7 @@ VTE_ERASE_DELETE_SEQUENCE, VTE_ERASE_ASCII_BACKSPACE, VTE_ERASE_AUTO }; - gint i; + guint i; tilda_term *tt; config_setint ("delete_key", status); @@ -1613,7 +1794,7 @@ } } -static void button_reset_compatibility_options_clicked_cb (GtkWidget *w) +static void button_reset_compatibility_options_clicked_cb () { const GtkWidget *combo_backspace_binding = GTK_WIDGET (gtk_builder_get_object (xml, "combo_backspace_binding")); @@ -1655,6 +1836,7 @@ const GtkWidget *button_keybinding_gototab8 = GTK_WIDGET (gtk_builder_get_object (xml, "button_keybinding_gototab8")); const GtkWidget *button_keybinding_gototab9 = GTK_WIDGET (gtk_builder_get_object (xml, "button_keybinding_gototab9")); const GtkWidget *button_keybinding_gototab10 = GTK_WIDGET (gtk_builder_get_object (xml, "button_keybinding_gototab10")); + const GtkWidget *button_keybinding_fullscreen = GTK_WIDGET (gtk_builder_get_object (xml, "button_keybinding_fullscreen")); /* Make the preferences window and buttons non-sensitive while we are grabbing keys. */ gtk_widget_set_sensitive (GTK_WIDGET(wizard_notebook), FALSE); @@ -1679,13 +1861,14 @@ gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_gototab8), FALSE); gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_gototab9), FALSE); gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_gototab10), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_fullscreen), FALSE); /* Bring up the dialog that will accept the new keybinding */ GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW(wizard_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, - "Enter keyboard shortcut"); + _("Enter keyboard shortcut")); /* Connect the key grabber to the dialog */ g_signal_connect (G_OBJECT(dialog), "key_press_event", G_CALLBACK(wizard_dlg_key_grab), w); @@ -1718,6 +1901,7 @@ gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_gototab8), TRUE); gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_gototab9), TRUE); gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_gototab10), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET(button_keybinding_fullscreen), TRUE); /* If the dialog was "programmatically destroyed" (we got a key), we don't want to destroy it again. Otherwise, we do want to destroy it, otherwise it would stick around even after hitting Cancel. */ @@ -1759,7 +1943,7 @@ * Because we might have multiple monitors we first need to get the monitor that * is currently selected to show the window and then load its geometry information. */ -void initialize_geometry_spinners() { +static void initialize_geometry_spinners() { GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(tw->window)); int monitor = config_getint("show_on_monitor_number"); GdkRectangle rectangle; @@ -1794,9 +1978,8 @@ /* Read all state from the config system, and put it into * its visual representation in the wizard. */ -static void set_wizard_state_from_config () -{ - GdkColor text_color, back_color; +static void set_wizard_state_from_config () { + GdkRGBA text_color, back_color; gint i; /* General Tab */ @@ -1806,6 +1989,7 @@ CHECK_BUTTON ("check_start_tilda_hidden", "hidden"); CHECK_BUTTON ("check_show_notebook_border", "notebook_border"); CHECK_BUTTON ("check_enable_double_buffering", "double_buffer"); + COMBO_BOX ("combo_non_focus_pull_up_behaviour", "non_focus_pull_up_behaviour"); CHECK_BUTTON ("check_terminal_bell", "bell"); CHECK_BUTTON ("check_cursor_blinks", "blinks"); @@ -1823,6 +2007,12 @@ /* Title and Command Tab */ TEXT_ENTRY ("entry_title", "title"); COMBO_BOX ("combo_dynamically_set_title", "d_set_title"); + // Whether to limit the length of the title + CHECK_BUTTON ("check_title_max_length", "title_max_length_flag"); + // The maximum length of the title + SPIN_BUTTON_SET_RANGE ("spin_title_max_length", 0, 99999); + SPIN_BUTTON_SET_VALUE ("spin_title_max_length", config_getint ("title_max_length")); + SET_SENSITIVE_BY_CONFIG_BOOL ("spin_title_max_length", "title_max_length_flag"); CHECK_BUTTON ("check_run_custom_command", "run_command"); TEXT_ENTRY ("entry_custom_command", "command"); @@ -1862,23 +2052,24 @@ /* Colors Tab */ COMBO_BOX ("combo_colorschemes", "scheme"); - text_color.red = config_getint ("text_red"); - text_color.green = config_getint ("text_green"); - text_color.blue = config_getint ("text_blue"); - COLOR_BUTTON ("colorbutton_text", &text_color); - back_color.red = config_getint ("back_red"); - back_color.green = config_getint ("back_green"); - back_color.blue = config_getint ("back_blue"); - COLOR_BUTTON ("colorbutton_back", &back_color); + text_color.red = GUINT16_TO_FLOAT(config_getint ("text_red")); + text_color.green = GUINT16_TO_FLOAT(config_getint ("text_green")); + text_color.blue = GUINT16_TO_FLOAT(config_getint ("text_blue")); + text_color.alpha = 1.0; + COLOR_CHOOSER ("colorbutton_text", &text_color); + back_color.red = GUINT16_TO_FLOAT(config_getint ("back_red")); + back_color.green = GUINT16_TO_FLOAT(config_getint ("back_green")); + back_color.blue = GUINT16_TO_FLOAT(config_getint ("back_blue")); + back_color.alpha = 1.0; + COLOR_CHOOSER ("colorbutton_back", &back_color); COMBO_BOX ("combo_palette_scheme", "palette_scheme"); - for(i = 0;i < TERMINAL_PALETTE_SIZE; i++) - { - current_palette[i].pixel = 0; - current_palette[i].red = config_getnint ("palette", i*3); - current_palette[i].green = config_getnint ("palette", i*3+1); - current_palette[i].blue = config_getnint ("palette", i*3+2); + for(i = 0;i < TERMINAL_PALETTE_SIZE; i++) { + current_palette[i].red = GUINT16_TO_FLOAT (config_getnint ("palette", i*3)); + current_palette[i].green = GUINT16_TO_FLOAT (config_getnint ("palette", i*3+1)); + current_palette[i].blue = GUINT16_TO_FLOAT (config_getnint ("palette", i*3+2)); + current_palette[i].alpha = 1.0; update_palette_color_button(i); } @@ -1886,6 +2077,9 @@ /* Scrolling Tab */ COMBO_BOX ("combo_scrollbar_position", "scrollbar_pos"); SPIN_BUTTON ("spin_scrollback_amount", "lines"); + CHECK_BUTTON ("check_infinite_scrollback", "scroll_history_infinite"); + SET_SENSITIVE_BY_CONFIG_BOOL ("spin_scrollback_amount", "scroll_history_infinite"); + SET_SENSITIVE_BY_CONFIG_BOOL ("label_scrollback_lines", "scroll_history_infinite"); CHECK_BUTTON ("check_scroll_on_output", "scroll_on_output"); CHECK_BUTTON ("check_scroll_on_keystroke", "scroll_on_key"); CHECK_BUTTON ("check_scroll_background", "scroll_background"); @@ -1915,6 +2109,7 @@ BUTTON_LABEL_FROM_CFG ("button_keybinding_gototab8", "gototab_8_key"); BUTTON_LABEL_FROM_CFG ("button_keybinding_gototab9", "gototab_9_key"); BUTTON_LABEL_FROM_CFG ("button_keybinding_gototab10", "gototab_10_key"); + BUTTON_LABEL_FROM_CFG ("button_keybinding_fullscreen", "fullscreen_key"); } #define CONNECT_SIGNAL(GLADE_WIDGET,SIGNAL_NAME,SIGNAL_HANDLER) g_signal_connect ( \ @@ -1933,6 +2128,7 @@ CONNECT_SIGNAL ("check_always_on_top","toggled",check_always_on_top_toggled_cb); CONNECT_SIGNAL ("check_start_tilda_hidden","toggled",check_start_tilda_hidden_toggled_cb); CONNECT_SIGNAL ("check_enable_double_buffering","toggled",check_enable_double_buffering_toggled_cb); + CONNECT_SIGNAL ("combo_non_focus_pull_up_behaviour","changed",combo_non_focus_pull_up_behaviour_cb); CONNECT_SIGNAL ("check_terminal_bell","toggled",check_terminal_bell_toggled_cb); CONNECT_SIGNAL ("check_cursor_blinks","toggled",check_cursor_blinks_toggled_cb); @@ -1951,6 +2147,8 @@ /* Title and Command Tab */ CONNECT_SIGNAL ("entry_title","changed",entry_title_changed_cb); CONNECT_SIGNAL ("combo_dynamically_set_title","changed",combo_dynamically_set_title_changed_cb); + CONNECT_SIGNAL ("check_title_max_length","toggled",check_max_title_length_cb); + CONNECT_SIGNAL ("spin_title_max_length","value-changed", spin_max_title_length_changed_cb); CONNECT_SIGNAL ("check_run_custom_command","toggled",check_run_custom_command_toggled_cb); CONNECT_SIGNAL ("combo_command_exit","changed",combo_command_exit_changed_cb); @@ -1994,6 +2192,7 @@ /* Scrolling Tab */ CONNECT_SIGNAL ("combo_scrollbar_position","changed",combo_scrollbar_position_changed_cb); CONNECT_SIGNAL ("spin_scrollback_amount","value-changed",spin_scrollback_amount_value_changed_cb); + CONNECT_SIGNAL ("check_infinite_scrollback", "toggled", check_infinite_scrollback_toggled_cb); CONNECT_SIGNAL ("check_scroll_on_output","toggled",check_scroll_on_output_toggled_cb); CONNECT_SIGNAL ("check_scroll_on_keystroke","toggled",check_scroll_on_keystroke_toggled_cb); CONNECT_SIGNAL ("check_scroll_background","toggled",check_scroll_background_toggled_cb); @@ -2024,6 +2223,7 @@ CONNECT_SIGNAL ("button_keybinding_gototab8","clicked",button_keybinding_clicked_cb); CONNECT_SIGNAL ("button_keybinding_gototab9","clicked",button_keybinding_clicked_cb); CONNECT_SIGNAL ("button_keybinding_gototab10","clicked",button_keybinding_clicked_cb); + CONNECT_SIGNAL ("button_keybinding_fullscreen", "clicked", button_keybinding_clicked_cb); /* Close Button */ CONNECT_SIGNAL ("button_wizard_close","clicked",button_wizard_close_clicked_cb); @@ -2052,6 +2252,6 @@ g_free (s); - gtk_color_button_set_color (GTK_COLOR_BUTTON (color_button), ¤t_palette[idx]); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (color_button), ¤t_palette[idx]); } diff -Nru tilda-1.1.12/src/wizard.h tilda-1.2.2/src/wizard.h --- tilda-1.1.12/src/wizard.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/wizard.h 2014-10-28 11:36:24.000000000 +0000 @@ -10,15 +10,14 @@ * General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * License along with this library. If not, see . */ #ifndef WIZARD_H #define WIZARD_H -#include -#include +#include "tilda_window.h" +#include "tilda_terminal.h" #include diff -Nru tilda-1.1.12/src/xerror.c tilda-1.2.2/src/xerror.c --- tilda-1.1.12/src/xerror.c 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/xerror.c 2014-10-28 11:36:24.000000000 +0000 @@ -15,13 +15,14 @@ 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. + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #include -#include -#include +#include "xerror.h" +#include "debug.h" #include #include diff -Nru tilda-1.1.12/src/xerror.h tilda-1.2.2/src/xerror.h --- tilda-1.1.12/src/xerror.h 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/src/xerror.h 2014-10-28 11:36:24.000000000 +0000 @@ -13,7 +13,8 @@ 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. + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #ifndef __xerror_h diff -Nru tilda-1.1.12/tilda.desktop.in tilda-1.2.2/tilda.desktop.in --- tilda-1.1.12/tilda.desktop.in 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/tilda.desktop.in 2014-10-28 11:36:24.000000000 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] Name=Tilda Exec=@BINDIR@/tilda -Icon=@PIXMAPSDIR@/tilda.png +Icon=tilda Terminal=false Type=Application Categories=GNOME;GTK;System;Utility;TerminalEmulator; diff -Nru tilda-1.1.12/tilda.glade tilda-1.2.2/tilda.glade --- tilda-1.1.12/tilda.glade 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/tilda.glade 1970-01-01 00:00:00.000000000 +0000 @@ -1,3652 +0,0 @@ - - - - - 100 - 1 - 10 - - - 2147483647 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 1 - 2147483647 - 1 - 1 - 10 - - - - - - - - - Close Tilda - - - Open a new terminal - - - Open a new terminal and hide - - - - - - - - - - - Top - - - Bottom - - - Left - - - Right - - - - - - - - - - - Isn't displayed - - - Goes after initial title - - - Goes before initial title - - - Replace initial title - - - - - - - - - - - Drop to the default shell - - - Restart the command - - - Exit the terminal - - - - - - - - - - - Top - - - Bottom - - - Left - - - Right - - - - - - - - - - - Custom - - - Green on Black - - - Black on White - - - White on Black - - - - - - - - - - - Custom - - - - - - - - - - - On the Left - - - On the Right - - - Disabled - - - - - - - - - - - ASCII DEL - - - Escape sequence - - - Control-H - - - - - - - - - - - ASCII DEL - - - Escape sequence - - - Control-H - - - - - - - - - - - 0 - - - - - False - 5 - Tilda Config - center - normal - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - 2 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - - - - gtk-close - True - False - False - True - - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - - - True - False - - - True - False - 5 - 5 - 5 - 5 - True - 0 - - - True - False - 5 - 5 - 5 - 12 - - - True - False - 5 - True - - - Enable Double Buffering - True - True - False - 0 - True - - - 1 - 2 - 1 - 1 - - - - - Start Tilda hidden - True - True - False - 0 - True - - - 1 - 1 - 1 - 1 - - - - - Always on top - True - True - False - 0 - True - - - 1 - 0 - 1 - 1 - - - - - Display on all workspaces - True - True - False - 0 - True - - - 0 - 2 - 1 - 1 - - - - - Do not show in taskbar - True - True - False - 0 - True - - - 0 - 1 - 1 - 1 - - - - - Show Notebook Border - True - True - False - 0 - True - - - 0 - 0 - 1 - 1 - - - - - - - - - True - False - <b>Window Display</b> - True - - - - - 0 - 0 - 1 - 1 - - - - - True - False - 5 - 5 - 5 - 5 - True - 0 - - - True - False - 5 - 5 - 5 - 5 - 12 - - - True - False - 5 - True - - - Cursor Blinks - True - True - False - 0 - True - - - 1 - 0 - 1 - 1 - - - - - Audible Terminal Bell - True - True - False - 0 - True - - - 0 - 0 - 1 - 1 - - - - - - - - - True - False - <b>Terminal Display</b> - True - - - - - 0 - 1 - 1 - 1 - - - - - True - False - 5 - 5 - 5 - 5 - True - 0 - - - True - False - 5 - 5 - 5 - 5 - 12 - - - True - False - 5 - 5 - True - - - True - True - True - Sans 12 - - False - - - 1 - 2 - 1 - 1 - - - - - Enable Antialiasing - True - True - False - 0 - True - - - 0 - 0 - 1 - 1 - - - - - Allow Bold Text - True - True - False - 0 - True - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - Position of Tabs: - - - 0 - 1 - 1 - 1 - - - - - True - False - model1 - - - - 0 - - - - - 1 - 1 - 1 - 1 - - - - - True - False - 1 - Font: - - - 0 - 2 - 1 - 1 - - - - - - - - - True - False - <b>Font</b> - True - - - - - 0 - 2 - 1 - 1 - - - - - True - False - 5 - 5 - 5 - 5 - True - 0 - - - True - False - 5 - 5 - 5 - 5 - 12 - - - True - False - True - True - - - True - True - ● - adjustment1 - - - 1 - 0 - 1 - 1 - - - - - Hide Tilda when mouse leaves it - True - True - False - 0 - True - - - 1 - 1 - 1 - 1 - - - - - True - False - 1 - 10 - Auto Hide Delay: - - - 0 - 0 - 1 - 1 - - - - - Hide when Tilda loses focus - True - True - False - 0 - True - - - 0 - 1 - 1 - 1 - - - - - - - - - True - False - <b>Auto Hide</b> - True - - - - - 0 - 3 - 1 - 1 - - - - - True - False - 5 - 5 - 5 - 5 - True - 0 - - - True - False - 5 - 5 - 5 - 5 - 12 - - - True - False - 5 - True - - - True - False - 1 - When last terminal is closed: - - - 0 - 0 - 1 - 1 - - - - - True - False - liststore1 - - - - 0 - - - - - 1 - 0 - 1 - 1 - - - - - - - - - True - False - <b>Program Exit</b> - True - - - - - 0 - 4 - 1 - 1 - - - - - True - False - True - True - 0 - 1 - 5 - 5 - Note: Some options require that tilda is restarted - - - 0 - 5 - 1 - 1 - - - - - - - True - False - General - - - False - - - - - True - False - 5 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - True - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 4 - 4 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - Word Characters: - - - 4 - 4 - - - - - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Select by Word</b> - True - - - - - 3 - 4 - - 4 - 4 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - True - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 4 - 4 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - Web Browser *: - - - 4 - 4 - - - - - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>URL Handling</b> - True - - - - - 2 - 3 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - 2 - 2 - True - - - True - False - 1 - Initial Title: - - - 4 - 4 - - - - - True - False - 1 - Dynamically-set Title: - - - 1 - 2 - 4 - 4 - - - - - True - True - - - 1 - 2 - 4 - 4 - - - - - True - True - model2 - - - - 0 - - - - - 1 - 2 - 1 - 2 - 4 - 4 - - - - - - - - - True - False - <b>Title</b> - True - - - - - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - 3 - 2 - True - - - Run a custom command instead of the shell - True - False - False - 0 - True - - - 4 - 4 - - - - - True - False - 1 - Custom Command: - - - 1 - 2 - 4 - 4 - - - - - True - False - 1 - When Command Exits: - - - 2 - 3 - 4 - 4 - - - - - True - True - model3 - - - - 0 - - - - - 1 - 2 - 2 - 3 - 4 - 4 - - - - - True - True - - - 1 - 2 - 1 - 2 - 4 - 4 - - - - - - - - - - - - True - False - <b>Command</b> - True - - - - - 1 - 2 - - 4 - 4 - - - - - True - False - 4 - 4 - 4 - 4 - True - True - 0 - 1 - * A valid command that can open a browser must be entered here. It is possible to use the name of a specific browser such as 'firefox' and 'google-chrome' or to use the generic commands 'x-www-browser' and 'xdg-open'. The best command may be different depending on the system. - start - - - 4 - 5 - GTK_FILL - - - - - 1 - - - - - True - False - Title and Command - - - 1 - False - - - - - True - False - 5 - - - True - False - 0 - - - True - False - 12 - - - True - False - 4 - True - - - True - False - 1 - Percentage - - - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment2 - - - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - In Pixels - - - 2 - 3 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment3 - - - 3 - 4 - GTK_EXPAND - 4 - 4 - - - - - - - - - True - False - <b>Height</b> - True - - - - - 1 - 2 - GTK_SHRINK - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - 4 - True - - - True - False - 1 - Percentage - - - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - In Pixels - - - 2 - 3 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment4 - - - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment5 - - - 3 - 4 - GTK_EXPAND - 4 - 4 - - - - - - - - - True - False - <b>Width</b> - True - - - - - 2 - 3 - GTK_SHRINK - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - 2 - 4 - True - - - Centered Horizontally - True - False - False - 0 - True - True - - - - 2 - GTK_EXPAND - 4 - 4 - - - - - Centered Vertically - True - False - False - 0 - True - True - - - - 2 - 4 - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - X Position - - - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - Y Position - - - 2 - 3 - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment6 - - - 1 - 2 - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment7 - - - 3 - 4 - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - - - - - True - False - <b>Position</b> - True - - - - - 3 - 4 - GTK_SHRINK - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - 4 - 3 - True - - - - - - Enable Transparency - True - False - False - 0 - True - - - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - Level of Transparency - - - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment8 - - - 2 - 3 - GTK_EXPAND - 4 - 4 - - - - - Animated Pulldown - True - False - False - 0 - True - - - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - Use Image for Background - True - False - False - 0 - True - - - 3 - 4 - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - Animation Delay (usec) - - - 1 - 2 - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - False - 1 - Animation Orientation - - - 1 - 2 - 2 - 3 - GTK_EXPAND - 4 - 4 - - - - - True - True - adjustment9 - - - 2 - 3 - 1 - 2 - GTK_EXPAND - 4 - 4 - - - - - True - False - model4 - - - - 0 - - - - - 2 - 3 - 2 - 3 - GTK_EXPAND - 4 - 4 - - - - - True - False - - - 1 - 3 - 3 - 4 - GTK_EXPAND - 4 - 4 - - - - - - - - - True - False - <b>Extras</b> - True - - - - - 4 - 5 - GTK_SHRINK - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - 5 - True - True - - - True - False - 1 - Monitor: - - - 0 - 0 - 1 - 1 - - - - - True - False - 4 - 4 - 4 - monitor_list_store - - - - 0 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - - - 3 - 0 - 1 - 1 - - - - - True - False - - - 2 - 0 - 1 - 1 - - - - - - - - - True - False - <b>Select monitor</b> - True - - - - - GTK_SHRINK - 4 - 4 - - - - - 2 - - - - - True - False - Appearance - - - 2 - False - - - - - True - False - 2 - - - True - False - 0 - - - True - False - 12 - - - True - False - 4 - 2 - - - True - False - - - 2 - 1 - 2 - 4 - 4 - - - - - True - False - 1 - Built-in Schemes - - - 4 - 4 - - - - - True - True - model5 - - - - 0 - - - - - 1 - 2 - 4 - 4 - - - - - True - False - 1 - Text Color - - - 2 - 3 - 4 - 4 - - - - - True - False - 1 - Background Color - - - 3 - 4 - 4 - 4 - - - - - True - True - False - #000000000000 - - - 1 - 2 - 2 - 3 - 4 - 4 - - - - - True - True - False - #000000000000 - - - 1 - 2 - 3 - 4 - 4 - 4 - - - - - - - - - True - False - <b>Foreground and Background Colors</b> - True - - - - - - 4 - 4 - - - - - True - False - 0 - - - True - False - 4 - 12 - 4 - - - True - False - - - True - False - - - - False - False - 0 - - - - - True - False - 3 - 2 - 12 - 6 - - - True - False - 0 - <small><i><b>Note:</b> Terminal applications have these colors available to them.</i></small> - True - center - - - 2 - GTK_FILL - - - - - - True - True - - - - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - 2 - 8 - - - True - True - False - dummy - - - 6 - 7 - 1 - 2 - GTK_FILL - - - - - - True - True - False - dummy - - - 6 - 7 - - - - - - - True - True - False - dummy - - - 5 - 6 - 1 - 2 - GTK_FILL - - - - - - True - True - False - dummy - - - 7 - 8 - 1 - 2 - - - - - - - True - True - False - dummy - - - 4 - 5 - 1 - 2 - - - - - - - True - True - False - dummy - - - 2 - 3 - 1 - 2 - - - - - - - True - True - False - dummy - - - 3 - 4 - 1 - 2 - - - - - - - True - True - False - dummy - - - 1 - 2 - 1 - 2 - - - - - - - True - True - False - dummy - - - 1 - 2 - - - - - - - True - True - False - dummy - - - 7 - 8 - - - - - - - True - True - False - dummy - - - 5 - 6 - - - - - - - True - True - False - dummy - - - 4 - 5 - - - - - - - True - True - False - dummy - - - 3 - 4 - - - - - - - True - True - False - dummy - - - 2 - 3 - - - - - - - True - True - False - dummy - - - 1 - 2 - - - - - - - True - True - False - dummy - #000000000000 - - - - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - Color palette: - True - center - colorbutton_palette_0 - - - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - Built-in schemes: - True - center - combo_palette_scheme - - - 1 - 2 - GTK_FILL - - - - - - True - True - 1 - - - - - - - - - True - False - <b>Palette</b> - True - - - - - 1 - 2 - - 4 - 4 - - - - - 3 - - - - - True - False - Colors - - - 3 - False - - - - - True - False - 2 - - - True - False - 0 - - - True - False - 0 - 12 - - - True - False - 5 - 2 - - - Scroll on Output - True - False - False - 0 - True - - - 2 - 2 - 3 - 4 - 4 - - - - - Scroll on Keystroke - True - False - False - 0 - True - - - 2 - 3 - 4 - 4 - 4 - - - - - Scroll Background - True - False - False - 0 - True - - - 2 - 4 - 5 - 4 - 4 - - - - - True - False - - - True - True - adjustment10 - - - True - True - 4 - 0 - - - - - True - False - 0 - lines - - - True - True - 4 - 1 - - - - - 1 - 2 - 1 - 2 - - - - - True - False - model7 - - - - 0 - - - - - 1 - 2 - 4 - 4 - - - - - True - False - Scrollback: - - - 1 - 2 - GTK_FILL - 4 - 4 - - - - - True - False - Scrollbar is: - - - GTK_FILL - 4 - 4 - - - - - - - - - True - False - 0 - <b>Scrolling</b> - True - - - - - 2 - - 4 - 4 - - - - - 4 - False - - - - - True - False - Scrolling - - - 4 - False - - - - - True - False - 12 - 6 - - - True - False - 0 - <b>Compatibility</b> - True - - - False - False - 0 - - - - - True - False - - - True - False - - - - False - False - 0 - - - - - True - False - 6 - - - True - False - 0 - 7.4505801528346183e-09 - <small><i><b>Note:</b> These options may cause some applications to behave incorrectly. They are only here to allow you to work around certain applications and operating systems that expect different terminal behavior.</i></small> - True - True - - - False - True - 0 - - - - - True - False - 2 - 3 - 12 - 6 - - - True - False - 0 - _Delete key generates: - True - center - - - 1 - 2 - GTK_FILL - - - - - - True - False - 0 - _Backspace key generates: - True - center - - - GTK_FILL - - - - - - True - False - model8 - - - - 0 - - - - - 1 - 3 - GTK_FILL - - - - - True - False - model9 - - - - 0 - - - - - 1 - 3 - 1 - 2 - GTK_FILL - - - - - False - True - 1 - - - - - True - False - 1.1175900205273592e-08 - 0 - 0 - - - _Reset Compatibility Options to Defaults - True - True - False - True - - - - - False - False - 2 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - 5 - - - - - True - False - Compatibility - - - 5 - False - - - - - True - False - 10 - 2 - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Paste</b> - True - - - - - 1 - 2 - 2 - 3 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Next Tab</b> - True - - - - - 3 - 4 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Quit</b> - True - - - - - 1 - 2 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Add Tab</b> - True - char - - - - - 1 - 2 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 10</b> - True - - - - - 1 - 2 - 9 - 10 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 5</b> - True - - - - - 9 - 10 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 4</b> - True - - - - - 8 - 9 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 3</b> - True - - - - - 7 - 8 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 2</b> - True - - - - - 6 - 7 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 1</b> - True - - - - - 5 - 6 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Previous Tab</b> - True - - - - - 1 - 2 - 3 - 4 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Close Tab</b> - True - - - - - 1 - 2 - 1 - 2 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Copy</b> - True - - - - - 2 - 3 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Pull Down Terminal</b> - True - - - - - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 6</b> - True - - - - - 1 - 2 - 5 - 6 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 7</b> - True - - - - - 1 - 2 - 6 - 7 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 8</b> - True - - - - - 1 - 2 - 7 - 8 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - False - False - 2 - - - - - - - True - False - <b>Go To Tab 9</b> - True - - - - - 1 - 2 - 8 - 9 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - True - True - 2 - - - - - - - True - False - <b>Move Tabe Left</b> - True - - - - - 4 - 5 - - 4 - 4 - - - - - True - False - 0 - - - True - False - 12 - - - - True - True - True - 2 - - - - - - - True - False - <b>Move Tab Right</b> - True - - - - - 1 - 2 - 4 - 5 - - 4 - 4 - - - - - 6 - - - - - True - False - Keybindings - - - 6 - False - - - - - False - True - 1 - - - - - - button_wizard_close - - - diff -Nru tilda-1.1.12/TODO tilda-1.2.2/TODO --- tilda-1.1.12/TODO 2014-05-20 12:26:39.000000000 +0000 +++ tilda-1.2.2/TODO 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -Feature Requests / Improvements -================================================================================ -* Dragable bar at the bottom to change Tilda's height -* Ability to disable keyboard accelerators (close tab, new tab, etc) -* Configurable keyboard accelerators (close tab, new tab, etc) -* Automatically hide Tilda when it loses focus (fairly easy) -* Session support, so Tilda will load with the same number of tabs that it had - upon closing -* Ability to rename a tab manually -* Ability to pop up a dialog when the keybinding process fails (EASY now) -* Add -c option to specify specific configuration file for Tilda instance - -Future Plans -================================================================================ -* DBus-ize Tilda - This will make Tilda more of a long-running daemon than a terminal. What I - envision is one Tilda process per user, with one config file, managing all of - the Tilda windows (individual terminals) that the user wants. Also, expose all - of the terminal's properties over DBus, so a completely seperate config - program can be written. Also, things like "open a new tab in terminal 3, and - launch XYZ in it" should be possible, and easy. - - Unfortunately, to support this, I am thinking about moving away from - libConfuse, and moving to the built-in GLib key-value parser (INI-like). This - should allow a config file like: - - [global] - setting1 = value1 - setting2 = value2 - - [terminal1] - setting1 = value3 - - Which means (to me) that all terminals should have the settings from the - global section, but terminal1 will have setting1 overridden to a different - value. This could be used to give different backgrounds or different fonts - in each terminal, for example, but keep all other properties the same. - - Of course, the DBus stuff should probably be optional, so that you don't have - to have it installed, nor running. You should be able to start a Tilda which - is configured with DBus, but not have DBus running. It would be nice if Tilda - didn't die when DBus dies out from under us. - - -Possible Translation Problems -================================================================================ -Change "Animation Delay" to "Animation Duration" -"Notebook" should be changed to "Window", probably -"tab_pos" error msg (in a switch stmt) should be changed. - diff -Nru tilda-1.1.12/TODO.md tilda-1.2.2/TODO.md --- tilda-1.1.12/TODO.md 1970-01-01 00:00:00.000000000 +0000 +++ tilda-1.2.2/TODO.md 2014-10-28 11:36:24.000000000 +0000 @@ -0,0 +1,46 @@ +# Feature Requests / Improvements + + * Dragable bar at the bottom to change Tilda's height + * Ability to disable keyboard accelerators (close tab, new tab, etc) + * Session support, so Tilda will load with the same number of tabs that it had + upon closing. + * Ability to rename a tab manually + * Add -c option to specify specific configuration file for Tilda instance + +# Future Plans + + * DBus-ize Tilda + This will make Tilda more of a long-running daemon than a terminal. What I + envision is one Tilda process per user, with one config file, managing all of + the Tilda windows (individual terminals) that the user wants. Also, expose all + of the terminal's properties over DBus, so a completely seperate config + program can be written. Also, things like "open a new tab in terminal 3, and + launch XYZ in it" should be possible, and easy. + + Unfortunately, to support this, I am thinking about moving away from + libConfuse, and moving to the built-in GLib key-value parser (INI-like). This + should allow a config file like: + + [global] + setting1 = value1 + setting2 = value2 + + [terminal1] + setting1 = value3 + + Which means (to me) that all terminals should have the settings from the + global section, but terminal1 will have setting1 overridden to a different + value. This could be used to give different backgrounds or different fonts + in each terminal, for example, but keep all other properties the same. + + Of course, the DBus stuff should probably be optional, so that you don't have + to have it installed, nor running. You should be able to start a Tilda which + is configured with DBus, but not have DBus running. It would be nice if Tilda + didn't die when DBus dies out from under us. + +# Possible Translation Problems + +Change "Animation Delay" to "Animation Duration" +"Notebook" should be changed to "Window", probably +"tab_pos" error msg (in a switch stmt) should be changed. +