diff -Nru lxappearance-0.5.2~ppa2/AUTHORS lxappearance-0.5.0/AUTHORS --- lxappearance-0.5.2~ppa2/AUTHORS 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/AUTHORS 2010-08-12 22:38:54.000000000 +0000 @@ -1,3 +1,2 @@ Hong Jen Yee (PCMan) Ying-Chun Liu (PaulLiu) -Martin Bagge diff -Nru lxappearance-0.5.2~ppa2/COPYING lxappearance-0.5.0/COPYING --- lxappearance-0.5.2~ppa2/COPYING 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/COPYING 2010-08-12 22:38:54.000000000 +0000 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff -Nru lxappearance-0.5.2~ppa2/Makefile.am lxappearance-0.5.0/Makefile.am --- lxappearance-0.5.2~ppa2/Makefile.am 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/Makefile.am 2010-08-07 16:19:09.000000000 +0000 @@ -1,7 +1,7 @@ NULL= -SUBDIRS=data man po src +SUBDIRS=src po data EXTRA_DIST = \ - $(desktop_DATA) \ $(NULL) + diff -Nru lxappearance-0.5.2~ppa2/Makefile.in lxappearance-0.5.0/Makefile.in --- lxappearance-0.5.2~ppa2/Makefile.in 2012-05-20 14:36:36.000000000 +0000 +++ lxappearance-0.5.0/Makefile.in 2010-10-12 15:20:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,12 +47,6 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -74,11 +68,9 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -107,14 +99,10 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -128,8 +116,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ @@ -156,15 +142,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -181,8 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -195,9 +174,6 @@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ -XMLCATALOG = @XMLCATALOG@ -XML_CATALOG_FILE = @XML_CATALOG_FILE@ -XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -221,8 +197,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -243,18 +217,17 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -SUBDIRS = data man po src +SUBDIRS = src po data EXTRA_DIST = \ - $(desktop_DATA) \ $(NULL) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: Makefile +am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -281,20 +254,22 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -509,11 +484,7 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-lzma: distdir @@ -521,7 +492,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -552,8 +523,6 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -573,7 +542,6 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -602,16 +570,8 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -642,15 +602,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -737,18 +692,17 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru lxappearance-0.5.2~ppa2/NEWS lxappearance-0.5.0/NEWS --- lxappearance-0.5.2~ppa2/NEWS 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/NEWS 2010-08-12 22:38:54.000000000 +0000 @@ -1 +1 @@ -No news is good news. +No news is good news. \ No newline at end of file diff -Nru lxappearance-0.5.2~ppa2/README lxappearance-0.5.0/README --- lxappearance-0.5.2~ppa2/README 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/README 2010-08-12 22:38:54.000000000 +0000 @@ -1,2 +1,3 @@ LXAppearance is part of LXDE project. It's a desktop-independent theme switcher for GTK+. + diff -Nru lxappearance-0.5.2~ppa2/acinclude.m4 lxappearance-0.5.0/acinclude.m4 --- lxappearance-0.5.2~ppa2/acinclude.m4 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/acinclude.m4 2010-08-12 22:38:54.000000000 +0000 @@ -52,3 +52,4 @@ [$4]) fi ]) + diff -Nru lxappearance-0.5.2~ppa2/aclocal.m4 lxappearance-0.5.0/aclocal.m4 --- lxappearance-0.5.2~ppa2/aclocal.m4 2012-05-20 14:35:13.000000000 +0000 +++ lxappearance-0.5.0/aclocal.m4 2010-08-12 22:39:17.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -261,10 +260,6 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -306,7 +301,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. + dnl in configure.in. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -435,7 +430,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_ac,[],[ +ifdef(glib_configure_in,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -459,7 +454,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL +# serial 40 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -472,11 +467,13 @@ ;; esac -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -489,48 +486,25 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -576,7 +550,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then @@ -629,7 +603,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be executed at the very end +dnl The following CONFIG_COMMANDS should be exetuted at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -672,9 +646,8 @@ # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -692,21 +665,20 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ(2.50) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE([nls], + AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -733,12 +705,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -751,6 +719,7 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -759,32 +728,34 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) + m4_ifval([$2], [$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -826,17 +797,16 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + ifelse([$4], , [AC_MSG_ERROR(dnl [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -844,36 +814,34 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl - ]) +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])[]dnl - ]) +To get pkg-config, see .])], + [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + ifelse([$3], , :, [$3]) fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -883,7 +851,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -899,21 +867,19 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -995,14 +961,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -1042,7 +1008,6 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -1107,7 +1072,7 @@ break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) + msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -1172,13 +1137,10 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' - am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -1400,15 +1362,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1445,46 +1404,6 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. @@ -1580,15 +1499,12 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1611,14 +1527,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1626,13 +1541,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# -------------------- +# ------------------------------ # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ------------------------ +# ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1708,71 +1623,12 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1795,13 +1651,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1810,13 +1666,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1838,11 +1694,10 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru lxappearance-0.5.2~ppa2/configure lxappearance-0.5.0/configure --- lxappearance-0.5.2~ppa2/configure 2012-05-20 14:36:37.000000000 +0000 +++ lxappearance-0.5.0/configure 2010-10-12 15:20:52.000000000 +0000 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for lxappearance 0.5.2. +# Generated by GNU Autoconf 2.65 for lxappearance 0.5.0. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,7 +91,6 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -217,18 +216,11 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -327,7 +319,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -367,19 +359,19 @@ fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -541,7 +533,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -560,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='lxappearance' PACKAGE_TARNAME='lxappearance' -PACKAGE_VERSION='0.5.2' -PACKAGE_STRING='lxappearance 0.5.2' +PACKAGE_VERSION='0.5.0' +PACKAGE_STRING='lxappearance 0.5.0' PACKAGE_BUGREPORT='http://lxde.org/' PACKAGE_URL='' @@ -605,11 +597,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -ENABLE_MAN_FALSE -ENABLE_MAN_TRUE -XMLCATALOG -XML_CATALOG_FILE -XSLTPROC MKINSTALLDIRS POSUB POFILES @@ -622,17 +609,12 @@ CATALOGS MSGFMT_OPTS GETTEXT_PACKAGE -ADDITIONAL_FLAGS GMODULE_LIBS GMODULE_CFLAGS -DBUS_LIBS -DBUS_CFLAGS GTK_LIBS GTK_CFLAGS XLIB_LIBS XLIB_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PKG_CONFIG DATADIRNAME ALL_LINGUAS @@ -660,12 +642,6 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE -intltool__v_merge_options_0 -intltool__v_merge_options_ -INTLTOOL_V_MERGE_OPTIONS -INTLTOOL__v_MERGE_0 -INTLTOOL__v_MERGE_ -INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -676,7 +652,6 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -690,13 +665,6 @@ LDFLAGS CFLAGS CC -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V am__untar am__tar AMTAR @@ -761,15 +729,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_silent_rules -enable_maintainer_mode enable_dependency_tracking enable_nls -enable_man -enable_more_warnings -enable_gtk3 -enable_dbus -with_xml_catalog +enable_debug ' ac_precious_vars='build_alias host_alias @@ -781,14 +743,10 @@ CPPFLAGS CPP PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR XLIB_CFLAGS XLIB_LIBS GTK_CFLAGS GTK_LIBS -DBUS_CFLAGS -DBUS_LIBS GMODULE_CFLAGS GMODULE_LIBS' @@ -853,9 +811,8 @@ fi case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -900,7 +857,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -926,7 +883,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1130,7 +1087,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1146,7 +1103,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1176,8 +1133,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) @@ -1185,7 +1142,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1195,7 +1152,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1203,13 +1160,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1232,7 +1189,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1246,8 +1203,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1262,9 +1219,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1303,11 +1260,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1333,7 +1290,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lxappearance 0.5.2 to adapt to many kinds of systems. +\`configure' configures lxappearance 0.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1347,7 +1304,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1399,7 +1356,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lxappearance 0.5.2:";; + short | recursive ) echo "Configuration of lxappearance 0.5.0:";; esac cat <<\_ACEOF @@ -1407,25 +1364,10 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support - --enable-man regenerate roff man pages from Docbook [default=yes] - --enable-more-warnings Add more warnings [default=no] - --enable-gtk3 enable to use gtk-3.0 instead of gtk-2.0 - --enable-dbus Use Dbus support (usefull for lxsession > 0.4.9) - [default=no] - --enable-man regenerate roff man pages from Docbook [default=no] - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-xml-catalog=CATALOG - path to xml catalog to use + --enable-debug build libfm with debug support [default=no] Some influential environment variables: CC C compiler command @@ -1437,16 +1379,10 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path XLIB_CFLAGS C compiler flags for XLIB, overriding pkg-config XLIB_LIBS linker flags for XLIB, overriding pkg-config GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config - DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config - DBUS_LIBS linker flags for DBUS, overriding pkg-config GMODULE_CFLAGS C compiler flags for GMODULE, overriding pkg-config GMODULE_LIBS @@ -1518,10 +1454,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lxappearance configure 0.5.2 -generated by GNU Autoconf 2.68 +lxappearance configure 0.5.0 +generated by GNU Autoconf 2.65 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1565,7 +1501,7 @@ ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1591,7 +1527,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1602,7 +1538,7 @@ ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1644,7 +1580,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1690,7 +1626,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1703,7 +1639,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1758,7 +1694,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_func @@ -1770,10 +1706,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1809,7 +1745,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1832,15 +1768,17 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------- ## +( cat <<\_ASBOX +## ------------------------------- ## ## Report this to http://lxde.org/ ## -## ------------------------------- ##" +## ------------------------------- ## +_ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1849,7 +1787,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_mongrel @@ -1862,7 +1800,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1880,15 +1818,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lxappearance $as_me 0.5.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by lxappearance $as_me 0.5.0, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1998,9 +1936,11 @@ { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -2034,9 +1974,11 @@ ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -2049,9 +1991,11 @@ echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2065,9 +2009,11 @@ fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2122,12 +2068,7 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2142,11 +2083,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } + . "$ac_site_file" fi done @@ -2222,7 +2159,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2239,22 +2176,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2283,7 +2214,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2370,11 +2301,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2396,7 +2327,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + as_fn_error "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2406,7 +2337,7 @@ # Ok. : else - as_fn_error $? "newly created file is older than distributed files! + as_fn_error "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2460,7 +2391,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2500,7 +2431,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2553,7 +2484,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2604,7 +2535,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2644,7 +2575,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2652,7 +2583,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2686,7 +2617,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2702,7 +2633,7 @@ # Define the identity of the package. PACKAGE='lxappearance' - VERSION='0.5.2' + VERSION='0.5.0' cat >>confdefs.h <<_ACEOF @@ -2732,79 +2663,14 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' - -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# Always define AMTAR for backward compatibility. +AMTAR=${AMTAR-"${am_missing_run}tar"} +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -# Support silent build rules. Disable by either passing --disable-silent-rules -# to configure or passing V=1 to make -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE @@ -2822,7 +2688,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2862,7 +2728,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2915,7 +2781,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2955,7 +2821,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3014,7 +2880,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3058,7 +2924,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3112,8 +2978,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3227,8 +3093,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3270,8 +3137,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3328,9 +3195,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -3341,7 +3208,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3381,8 +3248,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3392,7 +3259,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3429,7 +3296,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3507,7 +3374,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3653,7 +3520,6 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' - am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3669,7 +3535,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3678,7 +3544,6 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3738,7 +3603,7 @@ break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) + msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -3811,7 +3676,7 @@ CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3841,7 +3706,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3857,11 +3722,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -3900,7 +3765,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3916,18 +3781,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -3939,7 +3804,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3988,7 +3853,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4002,7 +3867,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4054,7 +3919,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4069,7 +3934,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4203,29 +4068,31 @@ case "$am__api_version" in 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.40.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 $as_echo_n "checking for intltool >= 0.40.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 + as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -4265,7 +4132,7 @@ set dummy intltool-merge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -4305,7 +4172,7 @@ set dummy intltool-extract; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -4342,51 +4209,28 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi - - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' - - - - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' - - - - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -4489,7 +4333,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -4529,7 +4373,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : +if test "${ac_cv_path_MSGMERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -4569,7 +4413,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -4609,7 +4453,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -4647,20 +4491,20 @@ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; then : +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -4697,15 +4541,15 @@ if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 + as_fn_error "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -4716,7 +4560,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -4744,7 +4588,7 @@ case $host in *-*-solaris*) ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -4765,40 +4609,6 @@ -# Check whether --enable-man was given. -if test "${enable_man+set}" = set; then : - enableval=$enable_man; case "${enableval}" in - yes) enable_man=yes ;; - no) enable_man=no ;; - *) as_fn_error $? "bad value \"${enableval}\" for --enable-man, use \"yes\" (default) or \"no\"." "$LINENO" 5 ;; -esac -fi - - -# Check whether --enable-more_warnings was given. -if test "${enable_more_warnings+set}" = set; then : - enableval=$enable_more_warnings; enable_more_warnings="${enableval}" -else - enable_more_warnings=no - -fi - - -# Check whether --enable-gtk3 was given. -if test "${enable_gtk3+set}" = set; then : - enableval=$enable_gtk3; case "${enableval}" in - yes) enable_gtk3=yes ;; - no) enable_gtk3=no ;; - *) as_fn_error $? "bad value \"${enableval}\" for --enable-gtk3, use \"yes\" (default) or \"no\"." "$LINENO" 5 ;; -esac -fi - - - - - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -4807,7 +4617,7 @@ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -4850,7 +4660,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -4913,52 +4723,53 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi + fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5 $as_echo_n "checking for XLIB... " >&6; } -if test -n "$XLIB_CFLAGS"; then - pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$XLIB_CFLAGS"; then + pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"x11\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""x11"") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags ""x11"" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XLIB_LIBS"; then - pkg_cv_XLIB_LIBS="$XLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$XLIB_LIBS"; then + pkg_cv_XLIB_LIBS="$XLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"x11\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""x11"") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs ""x11"" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -4966,14 +4777,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs ""x11"" 2>&1` + XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""x11""` else - XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs ""x11"" 2>&1` + XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""x11""` fi # Put the nasty error message in config.log where it belongs echo "$XLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (\"x11\") were not met: + as_fn_error "Package requirements (\"x11\") were not met: $XLIB_PKG_ERRORS @@ -4982,13 +4793,12 @@ Alternatively, you may set the environment variables XLIB_CFLAGS and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -4997,69 +4807,63 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } else XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS XLIB_LIBS=$pkg_cv_XLIB_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi -if test "x$enable_gtk3" = "xyes" ; then - CFLAGS="$CFLAGS -DENABLE_GTK3" - gtk_modules="gtk+-3.0 >= 3.0.0" -else - gtk_modules="gtk+-2.0 >= 2.12.0 gthread-2.0" -fi - +gtk_modules="gtk+-2.0 >= 2.12.0 gthread-2.0" pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$gtk_modules" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$gtk_modules" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5067,14 +4871,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$gtk_modules" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtk_modules"` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$gtk_modules" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtk_modules"` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ($gtk_modules) were not met: + as_fn_error "Package requirements ($gtk_modules) were not met: $GTK_PKG_ERRORS @@ -5083,13 +4887,12 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -5098,172 +4901,63 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - -fi - - - -# Check whether --enable-dbus was given. -if test "${enable_dbus+set}" = set; then : - enableval=$enable_dbus; enable_dbus="${enableval}" -else - enable_dbus=no - + : fi -if test x"$enable_dbus" = x"yes"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 -$as_echo_n "checking for DBUS... " >&6; } - -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95 dbus-glib-1 >= 0.70\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95 dbus-glib-1 >= 0.70\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1` - else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (dbus-1 >= 0.95 dbus-glib-1 >= 0.70) were not met: - -$DBUS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables DBUS_CFLAGS -and DBUS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables DBUS_CFLAGS -and DBUS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS - DBUS_LIBS=$pkg_cv_DBUS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - CFLAGS="$CFLAGS -DENABLE_DBUS" -fi - - - - - gmodule_modules="gmodule-export-2.0" pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 $as_echo_n "checking for GMODULE... " >&6; } -if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gmodule_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gmodule_modules") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "$gmodule_modules" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gmodule_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gmodule_modules") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "$gmodule_modules" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5271,14 +4965,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$gmodule_modules" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gmodule_modules"` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$gmodule_modules" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gmodule_modules"` fi # Put the nasty error message in config.log where it belongs echo "$GMODULE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ($gmodule_modules) were not met: + as_fn_error "Package requirements ($gmodule_modules) were not met: $GMODULE_PKG_ERRORS @@ -5287,13 +4981,12 @@ Alternatively, you may set the environment variables GMODULE_CFLAGS and GMODULE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -5302,13 +4995,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } else GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS GMODULE_LIBS=$pkg_cv_GMODULE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -5323,20 +5016,14 @@ # AC_SUBST(MENU_CACHE_CFLAGS) # AC_SUBST(MENU_CACHE_LIBS) -if test x"$enable_more_warnings" = x"yes"; then - ADDITIONAL_FLAGS="-Wall -Werror=all -Werror=format -Werror=implicit-function-declaration -Werror=implicit-int -Werror=missing-braces -Werror=parentheses -Werror=return-type -Werror=strict-aliasing -Werror=switch -Wuninitialized -Werror=unused-label -Werror=unused-value -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Werror=missing-declarations -Wredundant-decls -Wmissing-noreturn -Wpointer-arith -Wcast-align -Wwrite-strings -Werror=inline -Werror=format-nonliteral -Wformat-nonliteral -Werror=format-security -Wformat-security -Winit-self -Werror=missing-include-dirs -Werror=undef -Werror=aggregate-return -Wmissing-format-attribute -Werror=nested-externs -fno-strict-aliasing -fmessage-length=0 -Wp,-D_FORTIFY_SOURCE=2 -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" -fi - - -# Check whether --enable-man was given. -if test "${enable_man+set}" = set; then : - enableval=$enable_man; enable_man="${enableval}" +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; enable_debug="${enableval}" else - enable_man=no + enable_debug=no fi - if test "$enable_debug" = "yes"; then # turn on debug and disable optimization CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g" @@ -5364,7 +5051,8 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5378,7 +5066,7 @@ for ac_header in locale.h do : ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes; then : +if test "x$ac_cv_header_locale_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_H 1 _ACEOF @@ -5390,7 +5078,7 @@ if test $ac_cv_header_locale_h = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if ${am_cv_val_LC_MESSAGES+:} false; then : +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5430,7 +5118,7 @@ INTLLIBS= ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : +if test "x$ac_cv_header_libintl_h" = x""yes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -5439,7 +5127,7 @@ # { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if ${gt_cv_func_ngettext_libc+:} false; then : +if test "${gt_cv_func_ngettext_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5470,7 +5158,7 @@ if test "$gt_cv_func_ngettext_libc" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if ${gt_cv_func_dgettext_libc+:} false; then : +if test "${gt_cv_func_dgettext_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5503,7 +5191,7 @@ for ac_func in bind_textdomain_codeset do : ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -5522,7 +5210,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if ${ac_cv_lib_intl_bindtextdomain+:} false; then : +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5556,10 +5244,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5593,10 +5281,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dgettext+:} false; then : +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5630,7 +5318,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = xyes; then : +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes fi @@ -5646,7 +5334,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5680,10 +5368,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dcgettext+:} false; then : +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5717,7 +5405,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -5742,7 +5430,7 @@ for ac_func in bind_textdomain_codeset do : ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -5780,7 +5468,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -5817,7 +5505,7 @@ for ac_func in dcgettext do : ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes; then : +if test "x$ac_cv_func_dcgettext" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DCGETTEXT 1 _ACEOF @@ -5858,7 +5546,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5899,7 +5587,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -5950,7 +5638,7 @@ case $host in *-*-solaris*) ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -5959,10 +5647,6 @@ fi ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -6088,173 +5772,7 @@ _ACEOF -if test x"$enable_man" = x"yes"; then - # Extract the first word of "xsltproc", so it can be a program name with args. -set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XSLTPROC+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XSLTPROC in - [\\/]* | ?:[\\/]*) - ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -XSLTPROC=$ac_cv_path_XSLTPROC -if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test -z "$XSLTPROC"; then - enable_man=no - fi - - - # check for the presence of the XML catalog - -# Check whether --with-xml-catalog was given. -if test "${with_xml_catalog+set}" = set; then : - withval=$with_xml_catalog; -else - with_xml_catalog=/etc/xml/catalog -fi - - jh_found_xmlcatalog=true - XML_CATALOG_FILE="$with_xml_catalog" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML catalog ($XML_CATALOG_FILE)" >&5 -$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } - if test -f "$XML_CATALOG_FILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } - else - jh_found_xmlcatalog=false - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - fi - - # check for the xmlcatalog program - # Extract the first word of "xmlcatalog", so it can be a program name with args. -set dummy xmlcatalog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XMLCATALOG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XMLCATALOG in - [\\/]* | ?:[\\/]*) - ac_cv_path_XMLCATALOG="$XMLCATALOG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" - ;; -esac -fi -XMLCATALOG=$ac_cv_path_XMLCATALOG -if test -n "$XMLCATALOG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCATALOG" >&5 -$as_echo "$XMLCATALOG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$XMLCATALOG" = xno; then - jh_found_xmlcatalog=false - fi - - if $jh_found_xmlcatalog; then - : - else - : - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 -$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } - if $jh_found_xmlcatalog && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2"; } >&5 - ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - enable_man=no - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL Stylesheets >= 1.70.1 in XML catalog" >&5 -$as_echo_n "checking for DocBook XSL Stylesheets >= 1.70.1 in XML catalog... " >&6; } - if $jh_found_xmlcatalog && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2"; } >&5 - ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - enable_man=no - fi - -fi - - if test "x$enable_man" != "xno"; then - ENABLE_MAN_TRUE= - ENABLE_MAN_FALSE='#' -else - ENABLE_MAN_TRUE='#' - ENABLE_MAN_FALSE= -fi - - -ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/ui/Makefile data/ui/about.ui data/lxappearance.pc man/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/ui/Makefile data/ui/about.glade data/lxappearance.pc po/Makefile.in" cat >confcache <<\_ACEOF @@ -6321,21 +5839,10 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then + test "x$cache_file" != "x/dev/null" && { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi + cat confcache >$cache_file else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -6351,7 +5858,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -6374,28 +5880,20 @@ am__EXEEXT_FALSE= fi -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. + as_fn_error "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_MAN\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -6496,7 +5994,6 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6542,19 +6039,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -6750,7 +6247,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -6803,8 +6300,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lxappearance $as_me 0.5.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by lxappearance $as_me 0.5.0, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6869,11 +6366,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lxappearance config.status 0.5.2 -configured by $0, generated by GNU Autoconf 2.68, +lxappearance config.status 0.5.0 +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6891,16 +6388,11 @@ while test $# != 0 do case $1 in - --*=?*) + --*=*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; *) ac_option=$1 ac_optarg=$2 @@ -6922,7 +6414,6 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -6935,7 +6426,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' + as_fn_error "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -6944,7 +6435,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' + -*) as_fn_error "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -7006,13 +6497,12 @@ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES data/ui/Makefile" ;; - "data/ui/about.ui") CONFIG_FILES="$CONFIG_FILES data/ui/about.ui" ;; + "data/ui/about.glade") CONFIG_FILES="$CONFIG_FILES data/ui/about.glade" ;; "data/lxappearance.pc") CONFIG_FILES="$CONFIG_FILES data/lxappearance.pc" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -7035,10 +6525,9 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -7046,13 +6535,12 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -7069,12 +6557,12 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -7083,18 +6571,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -7102,7 +6590,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -7150,7 +6638,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -7182,29 +6670,21 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -7216,7 +6696,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || +cat >"$tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -7228,11 +6708,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -7317,7 +6797,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -7330,7 +6810,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -7349,7 +6829,7 @@ for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -7358,7 +6838,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -7384,8 +6864,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -7521,24 +7001,23 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -7547,21 +7026,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -7706,7 +7185,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -7734,7 +7213,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -7755,7 +7234,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -7776,7 +7255,6 @@ echo lxappearance....................... : Version $VERSION echo echo Enable debug....................: "$enable_debug" - echo Enable Dbus support.............: "$enable_dbus" echo Prefix..........................: $prefix echo echo The binary will be installed in $prefix/bin diff -Nru lxappearance-0.5.2~ppa2/configure.ac lxappearance-0.5.0/configure.ac --- lxappearance-0.5.2~ppa2/configure.ac 2012-05-20 14:34:43.000000000 +0000 +++ lxappearance-0.5.0/configure.ac 2010-08-07 17:45:05.000000000 +0000 @@ -4,13 +4,8 @@ prog_name = lxappearance AC_PREREQ([2.63]) -AC_INIT([lxappearance], [0.5.2], [http://lxde.org/]) -AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign]) -# Support silent build rules. Disable by either passing --disable-silent-rules -# to configure or passing V=1 to make -AM_SILENT_RULES([yes]) - -AM_MAINTAINER_MODE +AC_INIT([lxappearance], [0.5.0], [http://lxde.org/]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) @@ -30,61 +25,15 @@ # intltool IT_PROG_INTLTOOL([0.40.0]) -AC_ARG_ENABLE(man, -AS_HELP_STRING([--enable-man],[regenerate roff man pages from Docbook @<:@default=yes@:>@]), -[case "${enableval}" in - yes) enable_man=yes ;; - no) enable_man=no ;; - *) AC_MSG_ERROR([bad value "${enableval}" for --enable-man, use "yes" (default) or "no".]) ;; -esac],[]) - -AC_ARG_ENABLE(more_warnings, - [AS_HELP_STRING([--enable-more-warnings], - [Add more warnings @<:@default=no@:>@])], - [enable_more_warnings="${enableval}"], - [enable_more_warnings=no] -) - -AC_ARG_ENABLE(gtk3, -AS_HELP_STRING([--enable-gtk3],[enable to use gtk-3.0 instead of gtk-2.0]), -[case "${enableval}" in - yes) enable_gtk3=yes ;; - no) enable_gtk3=no ;; - *) AC_MSG_ERROR([bad value "${enableval}" for --enable-gtk3, use "yes" (default) or "no".]) ;; -esac],[]) - PKG_CHECK_MODULES(XLIB, "x11") AC_SUBST(XLIB_CFLAGS) AC_SUBST(XLIB_LIBS) -if test "x$enable_gtk3" = "xyes" ; then - CFLAGS="$CFLAGS -DENABLE_GTK3" - gtk_modules="gtk+-3.0 >= 3.0.0" -else - gtk_modules="gtk+-2.0 >= 2.12.0 gthread-2.0" -fi - +gtk_modules="gtk+-2.0 >= 2.12.0 gthread-2.0" PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -AC_ARG_ENABLE(dbus, - [AS_HELP_STRING([--enable-dbus], - [Use Dbus support (usefull for lxsession > 0.4.9) @<:@default=no@:>@])], - [enable_dbus="${enableval}"], - [enable_dbus=no] -) - - -if test x"$enable_dbus" = x"yes"; then - PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95 dbus-glib-1 >= 0.70]) - CFLAGS="$CFLAGS -DENABLE_DBUS" -fi -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - - - gmodule_modules="gmodule-export-2.0" PKG_CHECK_MODULES(GMODULE, [$gmodule_modules]) AC_SUBST(GMODULE_CFLAGS) @@ -100,18 +49,12 @@ # AC_SUBST(MENU_CACHE_CFLAGS) # AC_SUBST(MENU_CACHE_LIBS) -if test x"$enable_more_warnings" = x"yes"; then - ADDITIONAL_FLAGS="-Wall -Werror=all -Werror=format -Werror=implicit-function-declaration -Werror=implicit-int -Werror=missing-braces -Werror=parentheses -Werror=return-type -Werror=strict-aliasing -Werror=switch -Wuninitialized -Werror=unused-label -Werror=unused-value -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Werror=missing-declarations -Wredundant-decls -Wmissing-noreturn -Wpointer-arith -Wcast-align -Wwrite-strings -Werror=inline -Werror=format-nonliteral -Wformat-nonliteral -Werror=format-security -Wformat-security -Winit-self -Werror=missing-include-dirs -Werror=undef -Werror=aggregate-return -Wmissing-format-attribute -Werror=nested-externs -fno-strict-aliasing -fmessage-length=0 -Wp,-D_FORTIFY_SOURCE=2 -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" -fi -AC_SUBST(ADDITIONAL_FLAGS) - -AC_ARG_ENABLE(man, - [AS_HELP_STRING([--enable-man], - [regenerate roff man pages from Docbook @<:@default=no@:>@])], - [enable_man="${enableval}"], - [enable_man=no] +AC_ARG_ENABLE(debug, + [AC_HELP_STRING([--enable-debug], + [build libfm with debug support @<:@default=no@:>@])], + [enable_debug="${enableval}"], + [enable_debug=no] ) - if test "$enable_debug" = "yes"; then # turn on debug and disable optimization CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g" @@ -135,29 +78,13 @@ AM_GLIB_GNU_GETTEXT AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) -if test x"$enable_man" = x"yes"; then - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test -z "$XSLTPROC"; then - enable_man=no - fi - - dnl check for DocBook DTD and stylesheets in the local catalog. - JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], - [DocBook XML DTD V4.1.2], [], enable_man=no) - JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], - [DocBook XSL Stylesheets >= 1.70.1], [], enable_man=no) -fi - -AM_CONDITIONAL(ENABLE_MAN, test "x$enable_man" != "xno") - AC_CONFIG_FILES([ Makefile src/Makefile data/Makefile data/ui/Makefile - data/ui/about.ui + data/ui/about.glade data/lxappearance.pc - man/Makefile po/Makefile.in ]) @@ -176,7 +103,6 @@ echo lxappearance....................... : Version $VERSION echo echo Enable debug....................: "$enable_debug" - echo Enable Dbus support.............: "$enable_dbus" echo Prefix..........................: $prefix echo echo The binary will be installed in $prefix/bin diff -Nru lxappearance-0.5.2~ppa2/data/Makefile.in lxappearance-0.5.0/data/Makefile.in --- lxappearance-0.5.2~ppa2/data/Makefile.in 2012-05-20 14:36:36.000000000 +0000 +++ lxappearance-0.5.0/data/Makefile.in 2010-10-12 15:20:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,12 +44,6 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = lxappearance.pc CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -80,12 +74,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } am__installdirs = "$(DESTDIR)$(desktopdir)" \ "$(DESTDIR)$(pkgconfigdir)" DATA = $(desktop_DATA) $(pkgconfig_DATA) @@ -124,10 +112,8 @@ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -141,8 +127,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ @@ -169,15 +153,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -194,8 +173,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -208,9 +185,6 @@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ -XMLCATALOG = @XMLCATALOG@ -XML_CATALOG_FILE = @XML_CATALOG_FILE@ -XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -234,8 +208,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -275,7 +247,7 @@ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -300,9 +272,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): lxappearance.pc: $(top_builddir)/config.status $(srcdir)/lxappearance.pc.in @@ -324,7 +296,9 @@ @$(NORMAL_UNINSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(desktopdir)" && rm -f $$files install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -342,7 +316,9 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -555,15 +531,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru lxappearance-0.5.2~ppa2/data/lxappearance.desktop lxappearance-0.5.0/data/lxappearance.desktop --- lxappearance-0.5.2~ppa2/data/lxappearance.desktop 2012-05-20 14:30:13.000000000 +0000 +++ lxappearance-0.5.0/data/lxappearance.desktop 2010-10-12 15:20:41.000000000 +0000 @@ -1,138 +1,31 @@ [Desktop Entry] Type=Application Name=Customize Look and Feel -Name[ar]=تخصيص المظهر و الإحساس -Name[be]=Настаўленні выгляду -Name[bg]=Персонализиране на Външния вид -Name[cs]=Upravit vzhled a chování -Name[da]=Tilpas udseende Name[de]=Erscheinungsbild anpassen -Name[el]=Προσαρμογή εμφάνισης και αισθητικής -Name[en_GB]=Customise Look and Feel Name[es]=Personalizar apariencia y comportamiento -Name[et]=Välimuse Kohandamine -Name[fa]=سفارشی سازی نما و شما -Name[fi]=Muokkaa ulkonäköä ja tuntumaa -Name[fo]=Tillaga útsjónd og kenslu -Name[fr]=Personnaliser l'apparence -Name[gl]=Personalizar a aparencia e o comportamento -Name[he]=התאמת המראה והתחושה -Name[hr]=Prilagođava izgled i dojam Name[hu]=Megjelenés testreszabása -Name[id]=Ubah Tampilan dan Rasa -Name[it]=Personalizza Aspetto e Stile -Name[ja]=ルックアンドフィールを設定します -Name[kk]=Сыртқы түрін баптау -Name[ko]=겉보기를 조정합니다 -Name[lg]=Tegeka eby'endabika n'enneyisa -Name[lt]=Derinti išvaizdą -Name[nl]=Uiterlijk en bediening aanpassen -Name[pa]=ਦਿੱਖ ਤੇ ਪਰਭਾਵ ਪਸੰਦ ਮੁਤਾਬਕ -Name[pl]=Preferencje wyglądu -Name[pt]=Personalizar aparência e comportamento +Name[it]=Personalizza aspetto e stile Name[pt_BR]=Personalizar visual -Name[ro]=Personalizați desktopul Name[ru]=Настройка внешнего вида -Name[sl]=Videz in občutek -Name[sr]=Подешавања изгледа -Name[sr@latin]=Podešavanja izgleda -Name[sv]=Hantera utseende och beteende -Name[te]=రూపాన్ని మలచుకుని అనందించండి -Name[tr]=Görünümü Özelleştir -Name[tt_RU]=Тышкы кыяфәт -Name[ug]=كۆرۈنۈش ۋە تۇيغۇنى ئۆزلەشتۈرۈش Name[uk]=Налаштувати вигляд і відображення -Name[vi]=Tùy chỉnh Giao diện -Name[zh_CN]=自定义外观和体验 Name[zh_TW]=自訂外觀風格 GenericName=Customize Look and Feel -GenericName[ar]=تخصيص المظهر و الإحساس -GenericName[be]=Настаўленні выгляду -GenericName[bg]=Персонализиране на Външния вид -GenericName[cs]=Upravit vzhled a chování -GenericName[da]=Tilpas udseende GenericName[de]=Erscheinungsbild anpassen -GenericName[el]=Προσαρμογή εμφάνισης και αισθητικής -GenericName[en_GB]=Customise Look and Feel GenericName[es]=Personalizar apariencia y comportamiento -GenericName[et]=Välimuse Kohandamine -GenericName[fa]=سفارشی سازی نما و شما -GenericName[fi]=Muokkaa ulkonäköä ja tuntumaa -GenericName[fo]=Tillaga útsjónd og kenslu -GenericName[fr]=Personnaliser l'apparence -GenericName[gl]=Personalizar a aparencia e o comportamento -GenericName[he]=התאמת המראה והתחושה -GenericName[hr]=Prilagođava izgled i dojam GenericName[hu]=Megjelenés testreszabása -GenericName[id]=Ubah Tampilan dan Rasa -GenericName[it]=Personalizza Aspetto e Stile -GenericName[ja]=ルックアンドフィールを設定します -GenericName[kk]=Сыртқы түрін баптау -GenericName[ko]=겉보기를 조정합니다 -GenericName[lg]=Tegeka eby'endabika n'enneyisa -GenericName[lt]=Derinti išvaizdą -GenericName[nl]=Uiterlijk en bediening aanpassen -GenericName[pa]=ਦਿੱਖ ਤੇ ਪਰਭਾਵ ਪਸੰਦ ਮੁਤਾਬਕ -GenericName[pl]=Preferencje wyglądu -GenericName[pt]=Personalizar aparência e comportamento +GenericName[it]=Personalizza aspetto e stile GenericName[pt_BR]=Personalizar visual -GenericName[ro]=Personalizați desktopul GenericName[ru]=Настройка внешнего вида -GenericName[sl]=Videz in občutek -GenericName[sr]=Подешавања изгледа -GenericName[sr@latin]=Podešavanja izgleda -GenericName[sv]=Hantera utseende och beteende -GenericName[te]=రూపాన్ని మలచుకుని అనందించండి -GenericName[tr]=Görünümü Özelleştir -GenericName[tt_RU]=Тышкы кыяфәт -GenericName[ug]=كۆرۈنۈش ۋە تۇيغۇنى ئۆزلەشتۈرۈش GenericName[uk]=Налаштувати вигляд і відображення -GenericName[vi]=Tùy chỉnh Giao diện -GenericName[zh_CN]=自定义外观和体验 GenericName[zh_TW]=自訂外觀風格 Comment=Customizes look and feel of your desktop and applications -Comment[ar]=تخصيصات مظهر وإحساس سطح مكتبك وتطبيقاته -Comment[be]=Змяніць выгляд працоўнага асяроддзя і праграмм -Comment[bg]=Персонализирайте Външният вид на вашия работен плот и приложения -Comment[da]=Tilpas skrivebordets udseende og programmer Comment[de]=Das Erscheinungsbild Ihrer Arbeitsumgebung und Anwendungen anpassen -Comment[el]=Προσαρμογή εμφάνισης και αισθητικής της επιφάνειας εργασίας και των εφαρμογών σας -Comment[en_GB]=Customises look and feel of your desktop and applications Comment[es]=Personaliza la aparciencia y el comportamiento de su escritorio y aplicaciones -Comment[et]=Töölaua ja rakenduste välimuse kohandamine -Comment[fa]=سفارشی سازی نمای و شمای رومیزی و برنامه های خود -Comment[fi]=Muokkaa ohjelmiesi sekä työpöytäsi ulkonäköä ja tuntumaa -Comment[fo]=Tillagar útsjóndina og kensluna, av tínum skriviborðið og nýtsluskipanum -Comment[fr]=Personnaliser l'apparence du bureau et des applications -Comment[gl]=Personalizar a aparencia e comportamento do seu escritorio e aplicativos -Comment[he]=התאמת המראה והתחושה של שולחן העבודה והיישומים שלך -Comment[hr]=Prilagođava izgled i dojam vaše radne površine i programa Comment[hu]=A munkaasztal és az alkalmazások megjelenésének testreszabása -Comment[id]=Ubah tampilan dan rasa dari desktop dan aplikasi Anda Comment[it]=Personalizza l'aspetto e lo stile del tuo desktop e delle applicazioni -Comment[ja]=あなたのデスクトップとアプリケーションのルックアンドフィールを設定します -Comment[kk]=Жұмыс үстелі мен қолданбаларыңыздың сыртқы түрін баптау -Comment[ko]=데스크톱과 프로그램의 겉보기를 조정합니다 -Comment[lg]=W'otegekera endabika n'enneyisa y'awakolerwa ne puloguramu -Comment[lt]=Derina jūsų darbastalio ir programų išvaizdą -Comment[nl]=Past uiterlijk en bediening aan van uw bureaublad en toepassingen -Comment[pa]=ਆਪਣੇ ਡੈਸਕਟਾਪ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਦਿੱਖ ਤੇ ਪਰਭਾਵ ਆਪਣੇ ਮੁਤਾਬਕ ਬਣਾਓ -Comment[pl]=Dostosowuje wygląd środowiska graficznego -Comment[pt]=Personaliza o aspeto do seu ambiente de trabalho e das aplicações Comment[pt_BR]=Personaliza o visual de sua área de trabalho e aplicativos -Comment[ro]=Personalizați aspectul desktopului și al programelor Comment[ru]=Настройте тему рабочего стола и приложений -Comment[sl]=Prilagodite videz in občutek namizja -Comment[sr]=Прилагодите изглед радне површи и програма -Comment[sr@latin]=Prilagodite izgled radne površi i programa -Comment[sv]=Hanterar utseende och beteende för skrivbordsmiljö och program -Comment[te]=మీ డెస్క్‍టాప్ మరియు అనువర్తనాల దర్శనమును అనురూపిస్తుంది -Comment[tr]=Masaüstünüzün ve uygulamaların görünümünü özelleştirir. -Comment[tt_RU]=Сезнең эш өстәле һәм кушымтаның тышкы кыяфәтен көйләгез -Comment[ug]=ئۈستەلئۈستىنىڭ ۋە پروگراممىلارنىڭ كۆرۈنۈش ۋە تۇيغۇسىنى ئۆزلەشتۈرۈش Comment[uk]=Налаштовує вигляд Вашого робочого столу і програм -Comment[vi]=Tùy chỉnh giao diện cho máy tính và ứng dụng của bạn -Comment[zh_CN]=自定义您桌面和应用程序的外观和体验 Comment[zh_TW]=自訂桌面和應用程式的外觀風格 Icon=preferences-desktop-theme Exec=lxappearance diff -Nru lxappearance-0.5.2~ppa2/data/ui/Makefile.am lxappearance-0.5.0/data/ui/Makefile.am --- lxappearance-0.5.2~ppa2/data/ui/Makefile.am 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/data/ui/Makefile.am 2010-08-07 16:19:09.000000000 +0000 @@ -3,10 +3,19 @@ # GtkBuilder UI definition files uidir=$(datadir)/lxappearance/ui ui_in_files= \ - about.ui \ - lxappearance.ui \ + about.glade \ + lxappearance.glade \ $(NULL) -ui_DATA = $(ui_in_files) +ui_DATA = $(ui_in_files:.glade=.ui) + +CLEANFILES = \ + $(ui_DATA) \ + $(NULL) + +# Purge GtkBuilder UI files +%.ui: %.glade + cp $< $@ + $(top_srcdir)/src/xml-purge $@ EXTRA_DIST= \ $(ui_DATA) \ diff -Nru lxappearance-0.5.2~ppa2/data/ui/Makefile.in lxappearance-0.5.0/data/ui/Makefile.in --- lxappearance-0.5.2~ppa2/data/ui/Makefile.in 2012-05-20 14:36:36.000000000 +0000 +++ lxappearance-0.5.0/data/ui/Makefile.in 2010-10-12 15:20:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,7 +34,7 @@ POST_UNINSTALL = : subdir = data/ui DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/about.ui.in + $(srcdir)/about.glade.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac @@ -42,14 +42,8 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = about.ui +CONFIG_CLEAN_FILES = about.glade CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -73,20 +67,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -100,8 +86,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ @@ -128,15 +112,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -153,8 +132,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -167,9 +144,6 @@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ -XMLCATALOG = @XMLCATALOG@ -XML_CATALOG_FILE = @XML_CATALOG_FILE@ -XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -193,8 +167,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -219,11 +191,15 @@ # GtkBuilder UI definition files uidir = $(datadir)/lxappearance/ui ui_in_files = \ - about.ui \ - lxappearance.ui \ + about.glade \ + lxappearance.glade \ + $(NULL) + +ui_DATA = $(ui_in_files:.glade=.ui) +CLEANFILES = \ + $(ui_DATA) \ $(NULL) -ui_DATA = $(ui_in_files) EXTRA_DIST = \ $(ui_DATA) \ $(NULL) @@ -231,7 +207,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -256,12 +232,12 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -about.ui: $(top_builddir)/config.status $(srcdir)/about.ui.in +about.glade: $(top_builddir)/config.status $(srcdir)/about.glade.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) @@ -280,7 +256,9 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(uidir)" && rm -f $$files tags: TAGS TAGS: @@ -335,18 +313,14 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -435,6 +409,11 @@ uninstall-am uninstall-uiDATA +# Purge GtkBuilder UI files +%.ui: %.glade + cp $< $@ + $(top_srcdir)/src/xml-purge $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru lxappearance-0.5.2~ppa2/data/ui/about.glade.in lxappearance-0.5.0/data/ui/about.glade.in --- lxappearance-0.5.2~ppa2/data/ui/about.glade.in 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/data/ui/about.glade.in 2010-08-07 16:19:09.000000000 +0000 @@ -0,0 +1,52 @@ + + + + + + 5 + center-on-parent + dialog + False + LXAppearance + @VERSION@ + Copyright (C) 2010 LXDE Project + Customizes look and feel of your desktop + http://lxde.org/ + Copyright (C) 2010 LXDE Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + 洪任諭 Hong Jen Yee (PCMan) <pcman.tw@gmail.com> + translator-credits + + True + + + True + 2 + + + True + end + + + False + end + 0 + + + + + + diff -Nru lxappearance-0.5.2~ppa2/data/ui/about.ui lxappearance-0.5.0/data/ui/about.ui --- lxappearance-0.5.2~ppa2/data/ui/about.ui 2012-05-20 14:36:52.000000000 +0000 +++ lxappearance-0.5.0/data/ui/about.ui 2010-10-12 15:21:00.000000000 +0000 @@ -1,4 +1,4 @@ -5center-on-parentdialogFalseLXAppearance0.5.2Copyright (C) 2011 LXDE ProjectCustomizes look and feel of your desktophttp://lxde.org/Copyright (C) 2010 LXDE Team +5center-on-parentdialogFalseLXAppearance0.5.0Copyright (C) 2010 LXDE ProjectCustomizes look and feel of your desktophttp://lxde.org/Copyright (C) 2010 LXDE Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru lxappearance-0.5.2~ppa2/data/ui/about.ui.in lxappearance-0.5.0/data/ui/about.ui.in --- lxappearance-0.5.2~ppa2/data/ui/about.ui.in 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/data/ui/about.ui.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -5center-on-parentdialogFalseLXAppearance@VERSION@Copyright (C) 2011 LXDE ProjectCustomizes look and feel of your desktophttp://lxde.org/Copyright (C) 2010 LXDE Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.洪任諭 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>translator-creditsTrueTrue2TrueendFalseend0 diff -Nru lxappearance-0.5.2~ppa2/data/ui/lxappearance.ui lxappearance-0.5.0/data/ui/lxappearance.ui --- lxappearance-0.5.2~ppa2/data/ui/lxappearance.ui 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/data/ui/lxappearance.ui 2010-10-06 17:02:07.000000000 +0000 @@ -1,1820 +1 @@ - - - - - - 1 - 138pla - 1 - 10 - 10 - - - - - - - - - user-home - - - user-desktop - - - folder - - - folder-remote - - - user-trash - - - x-office-document - - - application-x-executable - - - image-x-generic - - - text-x-generic - - - text-html - - - - - - - - - - - Icons only - - - Text only - - - Text below icons - - - Text beside icons - - - - - - - - - - - Same as menu items - - - Small toolbar icon - - - Large toolbar icon - - - Same as buttons - - - Same as drag icons - - - Same as dialogs - - - - - - - - - - - None - - - Slight - - - Medium - - - Full - - - - - - - - - - - None - - - RGB - - - BGR - - - VRGB - - - VBGR - - - - - 5 - Customize Look and Feel - 540 - preferences-desktop-theme - normal - - - True - 2 - - - True - True - - - True - 12 - 6 - - - 150 - True - True - automatic - automatic - etched-in - - - True - True - True - False - - - - - - 0 - - - - - - - - - 0 - - - - - True - 6 - - - True - 0 - Preview of the selected widget style - - - False - 0 - - - - - True - 0 - - - True - - - True - 10 - - - True - 2 - - - True - - - True - _File - True - - - - - gtk-new - True - True - True - - - - - gtk-open - True - True - True - - - - - gtk-save - True - True - True - - - - - gtk-save-as - True - True - True - - - - - True - - - - - gtk-quit - True - True - True - - - - - - - - - True - _Edit - True - - - - - gtk-cut - True - True - True - - - - - gtk-copy - True - True - True - - - - - gtk-paste - True - True - True - - - - - gtk-delete - True - True - True - - - - - - - - - True - _Help - True - - - - - gtk-about - True - True - True - - - - - - - - - False - False - 0 - - - - - True - - - True - icons - False - - - True - True - gtk-go-back - - - False - True - - - - - True - gtk-go-forward - - - False - True - - - - - True - True - gtk-stop - - - False - True - - - - - True - - - True - True - ● - - - - - True - True - - - - - - - False - False - 1 - - - - - True - True - 5 - - - True - - - True - 4 - 0 - - - True - 4 - 4 - - - True - 4 - - - Radio Button - True - True - False - True - True - - - False - False - 0 - - - - - Check Button - True - True - False - True - True - - - False - False - 1 - - - - - True - - - True - True - ● - 1 - - - 0 - - - - - True - True - True - - - True - 0 - 0 - - - True - 2 - - - True - gtk-find - - - False - False - 0 - - - - - True - button - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - False - 2 - - - - - - - - - True - Demo - True - - - - - 0 - - - - - True - 4 - - - True - True - 0.60000002384200002 - 0.10000000149 - 60 % - - - False - False - 0 - - - - - True - True - - - False - 1 - - - - - True - - - - 0 - - - - - False - 2 - - - - - 1 - - - - - - - True - Page1 - - - False - - - - - True - True - never - in - - - True - True - icon_demo_store - False - True - - - column - - - - 0 - - - - - - - column - - - - 0 - - - - - - - - - 1 - - - - - True - Page2 - - - 1 - False - - - - - 2 - - - - - True - 2 - - - False - False - 3 - - - - - - - - - - - - - - False - 1 - - - - - True - 12 - - - True - 0 - Default font: - - - False - 0 - - - - - True - True - True - - - 1 - - - - - False - 2 - - - - - 1 - - - - - - - True - Widget - - - False - - - - - True - 12 - 6 - - - 0 - Color scheme is not supported by currently selected widget theme. - - - False - 0 - - - - - Use customized color scheme - True - True - False - True - - - False - 1 - - - - - True - 5 - 3 - 12 - 6 - - - True - 0 - Normal windows: - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - Text windows: - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 0 - Selected items: - - - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - 0 - Tooltips: - - - 4 - 5 - GTK_FILL - GTK_FILL - - - - - True - Background - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - Foreground - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - True - True - #000000000000 - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - True - True - #000000000000 - - - 2 - 3 - 4 - 5 - GTK_FILL - - - - - - - - False - 2 - - - - - 1 - - - - - True - Color - - - 1 - False - - - - - True - 12 - 6 - - - True - 6 - - - 150 - True - True - automatic - automatic - etched-in - - - True - True - False - - - - - - 0 - - - - - - - - - 0 - - - - - Install - True - True - True - image2 - - - False - 1 - - - - - Remove - True - True - True - image3 - - - False - 2 - - - - - 0 - - - - - True - 18 - - - True - - - True - 0 - Preview of the selected icon theme - - - False - 0 - - - - - True - True - automatic - automatic - etched-in - - - True - True - icon_demo_store - - - 6 - - - 0 - - - - - - - 1 - - - - - 0 - - - - - 1 - - - - - 2 - - - - - True - Icon Theme - - - 2 - False - - - - - True - 12 - 6 - - - True - 6 - - - 150 - True - True - automatic - automatic - etched-in - - - True - True - False - - - - - - 0 - - - - - - - - - 0 - - - - - Install - True - True - True - image4 - - - False - 1 - - - - - Remove - True - True - True - image5 - - - False - 2 - - - - - 0 - - - - - True - 6 - - - True - 0 - Preview of the selected cursor theme - - - False - 0 - - - - - True - True - automatic - automatic - etched-in - - - True - True - - - - - 1 - - - - - 0 - Size of cursors - - - False - 2 - - - - - 12 - - - True - Smaller - - - False - 0 - - - - - True - True - cursor_size_adj - 0 - left - - - 1 - - - - - True - Bigger - - - False - 2 - - - - - False - 3 - - - - - True - 0 - 0 - <b>Note:</b> Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login. - True - True - - - False - 4 - - - - - 1 - - - - - 3 - - - - - True - Mouse Cursor - - - 3 - False - - - - - 12 - 18 - - - - - - 4 - - - - - True - Window Border - - - 4 - False - - - - - True - 18 - - - True - 0 - none - - - True - 12 - - - True - - - Enable antialising - True - True - False - True - - - 0 - - - - - - - - - True - <b>Antialising</b> - True - - - - - False - False - 0 - - - - - True - 0 - none - - - True - 12 - - - True - - - Enable hinting - True - True - False - True - - - 0 - - - - - True - - - True - 0 - Hinting style: - - - 0 - - - - - True - hinting_style_store - - - - 0 - - - - - 1 - - - - - 1 - - - - - - - - - True - <b>Hinting</b> - True - - - - - False - False - 1 - - - - - True - 0 - none - - - True - 12 - - - True - - - True - 0 - Sub-pixel geometry: - - - 0 - - - - - True - font_rgba_store - - - - 0 - - - - - 1 - - - - - - - - - True - <b>Sub-pixel geometry</b> - True - - - - - False - False - 2 - - - - - 5 - - - - - True - Font - - - 5 - False - - - - - True - 12 - 18 - - - True - 0 - none - - - True - 12 - - - True - 6 - - - True - 2 - 2 - 12 - 6 - - - True - 0 - Toolbar Style: - - - GTK_FILL - GTK_FILL - - - - - True - 0 - Toolbar Icon Size: - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - tb_style_store - - - - 0 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - tb_icon_size_store - - - - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - 0 - - - - - Show images on buttons - True - True - False - True - - - 1 - - - - - Show images in menus - True - True - False - True - - - 2 - - - - - - - - - True - <b>GUI Options</b> - True - - - - - False - False - 0 - - - - - 0 - none - - - True - 12 - - - True - 6 - - - Play event sounds - True - True - False - True - - - 0 - - - - - Play event sounds as feedback to user input - True - True - False - True - - - 1 - - - - - - - - - True - <b>Sound Effect</b> - True - - - - - False - False - 1 - - - - - 6 - - - - - True - Other - - - 6 - False - - - - - 1 - - - - - True - end - - - gtk-about - True - True - True - True - - - False - False - 0 - True - - - - - gtk-apply - True - False - True - True - True - - - False - False - 1 - - - - - gtk-close - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - about - apply - close - - - - True - gtk-add - - - True - gtk-remove - - - True - gtk-add - - - True - gtk-remove - - +113811010user-homeuser-desktopfolderfolder-remoteuser-trashx-office-documentapplication-x-executableimage-x-generictext-x-generictext-htmlIcons onlyText onlyText below iconsText beside iconsSame as menu itemsSmall toolbar iconLarge toolbar iconSame as buttonsSame as drag iconsSame as dialogs5Customize Look and Feel540preferences-desktop-themenormalFalseTrue2TrueTrueTrue126150TrueTrueautomaticautomaticetched-inTrueTrueTrueFalse00True6True0Preview of the selected widget styleFalse0True0TrueTrue10True2TrueTrue_FileTruegtk-newTrueTrueTruegtk-openTrueTrueTruegtk-saveTrueTrueTruegtk-save-asTrueTrueTrueTruegtk-quitTrueTrueTrueTrue_EditTruegtk-cutTrueTrueTruegtk-copyTrueTrueTruegtk-pasteTrueTrueTruegtk-deleteTrueTrueTrueTrue_HelpTruegtk-aboutTrueTrueTrueFalseFalse0TrueTrueiconsFalseTrueTruegtk-go-backFalseTrueTruegtk-go-forwardFalseTrueTrueTruegtk-stopFalseTrueTrueTrueTrue●TrueTrueFalseFalse1TrueTrue5TrueTrue40True44True4Radio ButtonTrueTrueFalseTrueTrueFalseFalse0Check ButtonTrueTrueFalseTrueTrueFalseFalse1TrueTrueTrue●10TrueTrueTrueTrue00True2Truegtk-findFalseFalse0TruebuttonTrueFalseFalse1FalseFalse1False2TrueDemoTrue0True4TrueTrue0.600000023842000020.1000000014960 %FalseFalse0TrueTrueFalse1True0False21TruePage1FalseTrueTrueneverinTrueTrueicon_demo_storeFalseTruecolumn0column01TruePage21False2True2FalseFalse3False1True12True0Default font:False0TrueTrueTrue1False21TrueWidgetFalseTrue1260Color scheme is not supported by currently selected widget theme.False0Use customized color schemeTrueTrueFalseTrueFalse1True53126True0Normal windows:12GTK_FILLGTK_FILLTrue0Text windows:23GTK_FILLGTK_FILLTrue0Selected items:34GTK_FILLGTK_FILLTrue0Tooltips:45GTK_FILLGTK_FILLTrueBackground12GTK_FILLGTK_FILLTrueForeground23GTK_FILLGTK_FILLTrueTrueTrue#0000000000001212GTK_FILLTrueTrueTrue#0000000000002312GTK_FILLTrueTrueTrue#0000000000001223GTK_FILLTrueTrueTrue#0000000000002323GTK_FILLTrueTrueTrue#0000000000001234GTK_FILLTrueTrueTrue#0000000000002334GTK_FILLTrueTrueTrue#0000000000001245GTK_FILLTrueTrueTrue#0000000000002345GTK_FILLFalse21TrueColor1FalseTrue126True6150TrueTrueautomaticautomaticetched-inTrueTrueFalse00InstallTrueTrueTrueimage2False1RemoveTrueTrueTrueimage3False20True18TrueTrue0Preview of the selected icon themeFalse0TrueTrueautomaticautomaticetched-inTrueTrueicon_demo_store601012TrueIcon Theme2FalseTrue126True6150TrueTrueautomaticautomaticetched-inTrueTrueFalse00InstallTrueTrueTrueimage4False1RemoveTrueTrueTrueimage5False20True6True0Preview of the selected cursor themeFalse0TrueTrueautomaticautomaticetched-inTrueTrue10Size of cursorsFalse212TrueSmallerFalse0TrueTruedelayedcursor_size_adj0left1TrueBiggerFalse2False3True00<b>Note:</b> Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login.TrueTrueFalse413TrueMouse Cursor3False12184TrueWindow Border4FalseTrue1218True0noneTrue12True6True22126True0Toolbar Style:GTK_FILLGTK_FILLTrue0Toolbar Icon Size:12GTK_FILLGTK_FILLTruetb_style_store012GTK_FILLGTK_FILLTruetb_icon_size_store01212GTK_FILLGTK_FILL0Show images on buttonsTrueTrueFalseTrue1Show images in menusTrueTrueFalseTrue2True<b>GUI Options</b>TrueFalseFalse00noneTrue12True6Play event soundsTrueTrueFalseTrue0Play event sounds as feedback to user inputTrueTrueFalseTrue1True<b>Sound Effect</b>TrueFalseFalse15TrueOther5False1Trueendgtk-aboutTrueTrueTrueTrueFalseFalse0Truegtk-closeTrueTrueTrueTrueFalseFalse1gtk-applyTrueFalseTrueTrueTrueFalseFalse1Falseend0aboutcloseapplyTruegtk-addTruegtk-removeTruegtk-addTruegtk-remove diff -Nru lxappearance-0.5.2~ppa2/debian/apport/source_lxappearance.py lxappearance-0.5.0/debian/apport/source_lxappearance.py --- lxappearance-0.5.2~ppa2/debian/apport/source_lxappearance.py 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/apport/source_lxappearance.py 2010-08-09 21:53:36.000000000 +0000 @@ -0,0 +1,54 @@ +""" + Copyright (c) 2010 Julien Lavergne + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +""" + +import os +import apport.hookutils + +#Detect session +session = os.environ['DESKTOP_SESSION'] + +#Set location of various configuration files +system_conf = "/etc/xdg/lxsession/" +home_conf = os.path.expanduser("~/.config/lxsession/") +gtkrc_conf = os.path.expanduser("~/.gtkrc-2.0") +icons_default_conf = os.path.expanduser("~.icons/default/index.theme") + +#Set description for each file reported by apport +report_icons_default = "Icons_Default" +report_gtkrc = "gtkrc_Config" +if session: + report_config_system = "Config_System_" + session + report_config_home = "Config_Home_" + session + +def add_info(report): + if not session: + report[report_gtkrc] = apport.hookutils.read_file(gtkrc_conf) + report[report_icons_default] = apport.hookutils.read_file(icons_default_conf) + elif os.path.exists(os.path.join(home_conf,session,"desktop.conf")): + # If a config file exist in HOME, report it instead of the system one. + report[report_config_home] = apport.hookutils.read_file(os.path.join(home_conf,session,"desktop.conf")) + if os.path.exists(icons_default_conf): + report[report_icons_default] = apport.hookutils.read_file(icons_default_conf) + else: + report[report_icons_default] = "No icons theme configured by default" + else: + report[report_config_system] = apport.hookutils.read_file(os.path.join(system_conf,session,"desktop.conf")) + if os.path.exists(icons_default_conf): + report[report_icons_default] = apport.hookutils.read_file(icons_default_conf) + else: + report[report_icons_default] = "No icons theme configured by default" diff -Nru lxappearance-0.5.2~ppa2/debian/changelog lxappearance-0.5.0/debian/changelog --- lxappearance-0.5.2~ppa2/debian/changelog 2012-07-21 01:37:43.000000000 +0000 +++ lxappearance-0.5.0/debian/changelog 2010-12-19 10:53:02.000000000 +0000 @@ -1,8 +1,122 @@ -lxappearance (0.5.2~ppa2) precise; urgency=low +lxappearance (0.5.0-0ubuntu1~lucid1) lucid; urgency=low + * Backport to lucid. + + -- Julien Lavergne Sun, 19 Dec 2010 11:52:49 +0100 + +lxappearance (0.5.0-0ubuntu1) natty; urgency=low + + * New upstream release. + - Fix crash with early call to gtkrc_file_get_color_scheme. LP: #642153 + * debian/patches: + - lxappearance-0.4.0+git20100807.patch: Drop, merged upstream. + - 01_gtk3_migration.patch: Make it compatible with GTK3. + - 02_font_config.patch: Add a tab for font configuration. LP: #591426 + - 99_fix_build.patch: Don't clean ui files. + * debian/control: + - Build-depends on lsb-release, needed to detect the distribution. + - Build-depends on dh-autoreconf for 99_fix_build.patch. + - Build-depends on intltool (>= 0.40.0), libx11-dev, + libmenu-cache1-dev (>= 0.3.2). + - Bump build-depends on libgtk2.0-dev (>= 2.12) and libglib2.0-dev (>= 2.18). + - Wrap depends and build-depends. + * debian/rules: + - Install apport hook only on Ubuntu. + - Replace autoreconf call by --with autoreconf. + * debian/copyright: + - Update copyright year. + + -- Julien Lavergne Fri, 12 Nov 2010 00:40:54 +0100 + +lxappearance (0.4.1+git20100809-0ubuntu1) maverick; urgency=low + + [ Julien Lavergne ] + * New upstream snaphot (rev c5db6b860e...) + * debian/control: + - Add a new binary for files needed to build plugins. + - Add a debug package. + * debian/*.install: + - Split installed files. + * debian/source_lxappearance.py: + - Add apport hook. + * debian/lxappearance.install: + - Install apport hook. + * debian/rules: + - Add dh_strip call for the debug package. + - Use --fail-missing for dh_install. + + [ Andrew Lee (李健秋) ] + * Use Debian LXDE Packaging Team address. + * Bumped Standard-version to 3.9.1 + * Added Vcs-Git and Vcs-Browser tags + * Switch to dpkg-source 3.0 (quilt) format + * Commit changelog + * Added a patch that sync with upstream snapshot + * Build-depends on debhelper (>= 7.0.50~) + * Bumped to dh7 + * Update rules file to dh7 format + + -- Julien Lavergne Wed, 11 Aug 2010 20:56:49 +0200 + +lxappearance (0.4.0-1) unstable; urgency=low + + * New upstream release (Closes: #562564, #532847) + - Replace all Glade-generated code with GtkBuilder + - Use icon names defined in newer icon naming spec. + - UI adjustment + - Fix memory leaks and compiler warnings. + - Translation update + + -- Andrew Lee (李健秋) Thu, 07 Jan 2010 00:11:40 +0800 + +lxappearance (0.3.0+svn20091218-1) unstable; urgency=low + + * Sync with upstream for bug fix + - fix category in lxappearance.desktop + - Cursor theme modification is disabled by default since it is buggy + - Translation update + + -- Andrew Lee (李健秋) Fri, 18 Dec 2009 15:35:01 +0800 + +lxappearance (0.3+svn20091101-1) unstable; urgency=low + + * New upstream release (Closes:#559463) + - Support the latest lxsession-Xsettings-daemon + - Cursor size support + * Drop dpatch. (patches merged into upstream) + * Update homepage url + + -- Andrew Lee (李健秋) Sat, 05 Dec 2009 12:33:48 +0800 + +lxappearance (0.2.1-2) unstable; urgency=low + + * Applied 01_fix_infinite_loop.dpatch (Closes:#541666) + * debian/control: + - Build-depends on intltool, dpatch * debian/rules: - - Enable dbus support. + - autoreconf -fiv + + -- Andrew Lee (李健秋) Sat, 15 Aug 2009 21:38:26 +0800 + +lxappearance (0.2.1-1) unstable; urgency=low + + * New upstream release + - Use Docbook-XML instead of SGML for manpages + - Enable regeneration of man pages via "configure --enable-man" + - Compilation error fix + - Translation update (Cloese:#532847) + * Correct debian/watch + * debian/rules: + - Added --enable-man * debian/control: - - Add build-depends on libdbus-glib-1-dev. + - Build-depends on docbook-xsl + * Bumped Stardard-version to 3.8.2 + + -- Andrew Lee (李健秋) Sun, 26 Jul 2009 21:32:32 +0200 + +lxappearance (0.2-1) unstable; urgency=low + + * Initial release (Closes: #482165) + + -- Andrew Lee Sun, 25 May 2008 14:49:18 +0800 - -- Daniel González (daniel-go-mon) Sun, 08 Jul 2012 22:28:14 +0200 diff -Nru lxappearance-0.5.2~ppa2/debian/compat lxappearance-0.5.0/debian/compat --- lxappearance-0.5.2~ppa2/debian/compat 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/compat 2010-10-26 03:23:45.000000000 +0000 @@ -1 +1 @@ -9 +7 diff -Nru lxappearance-0.5.2~ppa2/debian/control lxappearance-0.5.0/debian/control --- lxappearance-0.5.2~ppa2/debian/control 2012-07-21 01:36:57.000000000 +0000 +++ lxappearance-0.5.0/debian/control 2010-11-11 17:01:12.000000000 +0000 @@ -1,43 +1,70 @@ Source: lxappearance -Section: x11 -Priority: optional -Maintainer: Daniel González (daniel-go-mon) -Build-Depends: - debhelper (>= 8.0.0), autotools-dev, intltool, docbook-xml, docbook-xsl, - libglib2.0-dev, libgtk2.0-dev, libmenu-cache1-dev, libx11-dev, libdbus-glib-1-dev, xsltproc -Standards-Version: 3.9.2 -Homepage: http://www.lxde.org/ -Vcs-Browser: http://git.lxde.org/gitweb/?p=debian/lxappearance.git -Vcs-Git: git://git.lxde.org/git/debian/lxappearance.git +Section: utils +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian LXDE Packaging Team +Uploaders: Andrew Lee (李健秋) +Build-Depends: debhelper (>= 7.0.50~), + autotools-dev, + libgtk2.0-dev (>= 2.12), + libglib2.0-dev (>= 2.18), + libx11-dev, + libmenu-cache1-dev (>= 0.3.2), + docbook-xsl, + docbook-xml, + xsltproc, + intltool (>= 0.40.0), + lsb-release, + dh-autoreconf +Standards-Version: 3.9.1 +Homepage: http://lxde.org +Vcs-Git: git://git.debian.org/git/collab-maint/lxappearance.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/lxappearance.git;a=summary + Package: lxappearance Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: gtk2-engines -Description: LXDE GTK+ theme switcher - LXAppearance is a GUI application for the Lightweight X11 Desktop Environment - (LXDE). +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gtk2-engines +Description: a new feature-rich GTK+ theme switcher + LXAppearance is a new feature-rich GTK+ theme switcher able to change + GTK+ themes, icon themes, and fonts used by applications. . - It is a new feature-rich GTK+ theme switcher able to change GTK+ themes, icon - themes, and fonts used by applications. GNOME/KDE/Xfce user may use build-in - theme, this works for GTK+ based lightweight desktop Environment. + GNOME/KDE/XFce user may use build-in theme, this works for GTK+ + based lightweight desktop Environment. . Features: - . * Choose GTK+ theme * Choose icon theme * Install new icon theme * Choose their favorite font * Choose toolbar style * See changes immediately in preview area + . + LXAppearance is developed from LXDE(the Lightweight X11 Desktop + Environment) project. But it works on other GTK+ based system too. + +Package: lxappearance-dev +Architecture: any +Depends: lxappearance (= ${binary:Version}), + libgtk2.0-dev (>= 2.12), + ${shlibs:Depends}, + ${misc:Depends} +Description: a new feature-rich GTK+ theme switcher - development files + LXAppearance is a new feature-rich GTK+ theme switcher able to change + GTK+ themes, icon themes, and fonts used by applications. + . + This package contains the development headers. Package: lxappearance-dbg Architecture: any Section: debug -Priority: extra -Depends: ${misc:Depends}, lxappearance (= ${binary:Version}) -Description: LXDE GTK+ theme switcher (debug) - LXAppearance is a GUI application for the Lightweight X11 Desktop Environment - (LXDE). +Depends: lxappearance (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: a new feature-rich GTK+ theme switcher - debugging symbols + LXAppearance is a new feature-rich GTK+ theme switcher able to change + GTK+ themes, icon themes, and fonts used by applications. . This package contains the debugging symbols. diff -Nru lxappearance-0.5.2~ppa2/debian/copyright lxappearance-0.5.0/debian/copyright --- lxappearance-0.5.2~ppa2/debian/copyright 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/copyright 2010-10-26 14:26:57.000000000 +0000 @@ -1,31 +1,37 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: LXAppearance -Upstream-Contact: lxde-list@lists.sourceforge.net -Source: http://sourceforge.net/projects/lxde/files/ - -Files: * -Copyright: 2009-2011 Hong Jen Yee (PCMan) - 2009-2011 Ying-Chun Liu (PaulLiu) -License: GPL-2+ - -Files: debian/* -Copyright: 2008-2012 Andrew Lee (李健秋) -License: GPL-2+ - -License: GPL-2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - The complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2 file. +This package was debianized by Andrew Lee on +Sun, 20 Apr 2008 12:31:15 +0800. + +It was downloaded from http://lxde.sourceforge.net + +Upstream Author: + + Hong Jen Yee (PCMan) + Ying-Chun Liu (PaulLiu) + +Copyright Holder: + + Copyright (C) 2010 Hong Jen Yee (PCMan) + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package 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 General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2008, Andrew Lee and +is licensed under the GPL, see above. + diff -Nru lxappearance-0.5.2~ppa2/debian/dirs lxappearance-0.5.0/debian/dirs --- lxappearance-0.5.2~ppa2/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/dirs 2010-10-26 03:23:45.000000000 +0000 @@ -0,0 +1 @@ +usr/bin diff -Nru lxappearance-0.5.2~ppa2/debian/docs lxappearance-0.5.0/debian/docs --- lxappearance-0.5.2~ppa2/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/docs 2010-10-26 03:23:45.000000000 +0000 @@ -0,0 +1,2 @@ +NEWS +README diff -Nru lxappearance-0.5.2~ppa2/debian/local/source_lxappearance.py lxappearance-0.5.0/debian/local/source_lxappearance.py --- lxappearance-0.5.2~ppa2/debian/local/source_lxappearance.py 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/local/source_lxappearance.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -""" - Copyright (c) 2010 Julien Lavergne - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -""" - -import os -import apport.hookutils - -#Detect session -session = os.environ['DESKTOP_SESSION'] - -#Set location of various configuration files -system_conf = "/etc/xdg/lxsession/" -home_conf = os.path.expanduser("~/.config/lxsession/") -gtkrc_conf = os.path.expanduser("~/.gtkrc-2.0") -icons_default_conf = os.path.expanduser("~.icons/default/index.theme") - -#Set description for each file reported by apport -report_icons_default = "Icons_Default" -report_gtkrc = "gtkrc_Config" -if session: - report_config_system = "Config_System_" + session - report_config_home = "Config_Home_" + session - -def add_info(report): - if not session: - report[report_gtkrc] = apport.hookutils.read_file(gtkrc_conf) - report[report_icons_default] = apport.hookutils.read_file(icons_default_conf) - elif os.path.exists(os.path.join(home_conf,session,"desktop.conf")): - # If a config file exist in HOME, report it instead of the system one. - report[report_config_home] = apport.hookutils.read_file(os.path.join(home_conf,session,"desktop.conf")) - if os.path.exists(icons_default_conf): - report[report_icons_default] = apport.hookutils.read_file(icons_default_conf) - else: - report[report_icons_default] = "No icons theme configured by default" - else: - report[report_config_system] = apport.hookutils.read_file(os.path.join(system_conf,session,"desktop.conf")) - if os.path.exists(icons_default_conf): - report[report_icons_default] = apport.hookutils.read_file(icons_default_conf) - else: - report[report_icons_default] = "No icons theme configured by default" diff -Nru lxappearance-0.5.2~ppa2/debian/lxappearance-dev.install lxappearance-0.5.0/debian/lxappearance-dev.install --- lxappearance-0.5.2~ppa2/debian/lxappearance-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/lxappearance-dev.install 2010-08-09 23:11:25.000000000 +0000 @@ -0,0 +1,2 @@ +usr/include +usr/lib diff -Nru lxappearance-0.5.2~ppa2/debian/lxappearance.install lxappearance-0.5.0/debian/lxappearance.install --- lxappearance-0.5.2~ppa2/debian/lxappearance.install 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/lxappearance.install 2010-10-26 13:36:51.000000000 +0000 @@ -1 +1,2 @@ -debian/local/source_lxappearance.py /usr/share/apport/package-hooks +usr/bin +usr/share diff -Nru lxappearance-0.5.2~ppa2/debian/lxappearance.menu lxappearance-0.5.0/debian/lxappearance.menu --- lxappearance-0.5.2~ppa2/debian/lxappearance.menu 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/lxappearance.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -?package(lxappearance):needs="X11" section="Applications/System/Administration"\ - title="LXAppearance" longtitle="LXDE GTK+ theme switcher"\ - description="LXAppearance is a GUI application for the Lightweight X11 Desktop Environment (LXDE). It is a new feature-rich GTK+ theme switcher able to change GTK+ themes, icon themes, and fonts used by applications. GNOME/KDE/Xfce user may use build-in theme, this works for GTK+ based lightweight desktop Environment."\ - command="/usr/bin/lxappearance" diff -Nru lxappearance-0.5.2~ppa2/debian/patches/01_gtk3_migration.patch lxappearance-0.5.0/debian/patches/01_gtk3_migration.patch --- lxappearance-0.5.2~ppa2/debian/patches/01_gtk3_migration.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/patches/01_gtk3_migration.patch 2010-11-12 00:07:14.000000000 +0000 @@ -0,0 +1,39 @@ +#upstream: https://sourceforge.net/tracker/?group_id=180858&atid=894871 +Index: lxappearance/src/lxappearance.c +=================================================================== +--- lxappearance.orig/src/lxappearance.c ++++ lxappearance/src/lxappearance.c +@@ -48,16 +48,16 @@ static const char* lxsession_name = NULL + + static void check_lxsession() + { +- lxsession_atom = XInternAtom( GDK_DISPLAY(), "_LXSESSION", True ); ++ lxsession_atom = XInternAtom( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "_LXSESSION", True ); + if( lxsession_atom != None ) + { +- XGrabServer( GDK_DISPLAY() ); +- if( XGetSelectionOwner( GDK_DISPLAY(), lxsession_atom ) ) ++ XGrabServer( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) ); ++ if( XGetSelectionOwner( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), lxsession_atom ) ) + { + app.use_lxsession = TRUE; + lxsession_name = g_getenv("DESKTOP_SESSION"); + } +- XUngrabServer( GDK_DISPLAY() ); ++ XUngrabServer( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) ); + } + } + +Index: lxappearance/src/utils.c +=================================================================== +--- lxappearance.orig/src/utils.c ++++ lxappearance/src/utils.c +@@ -73,7 +73,7 @@ gboolean show_progress_for_pid(GtkWindow + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); + gtk_widget_show(progress); + gtk_box_pack_start(GTK_BOX(vbox), progress, FALSE, TRUE, 0); +- gtk_progress_set_activity_mode(GTK_PROGRESS(progress), TRUE); ++ gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress)); + g_signal_connect(dlg, "response", G_CALLBACK(on_progress_dlg_response), &pid); + + res = gtk_dialog_run(GTK_DIALOG(dlg)); diff -Nru lxappearance-0.5.2~ppa2/debian/patches/02_font_config.patch lxappearance-0.5.0/debian/patches/02_font_config.patch --- lxappearance-0.5.2~ppa2/debian/patches/02_font_config.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/patches/02_font_config.patch 2010-11-12 01:12:31.000000000 +0000 @@ -0,0 +1,2140 @@ +Index: lxappearance/src/other.c +=================================================================== +--- lxappearance.orig/src/other.c 2010-11-11 20:19:26.000000000 +0100 ++++ lxappearance/src/other.c 2010-11-11 20:28:16.000000000 +0100 +@@ -34,17 +34,6 @@ + lxappearance_changed(); + } + +-static void on_check_button_toggled(GtkToggleButton* btn, gpointer user_data) +-{ +- gboolean* val = (gboolean*)user_data; +- gboolean new_val = gtk_toggle_button_get_active(btn); +- if(new_val != *val) +- { +- *val = new_val; +- lxappearance_changed(); +- } +-} +- + void other_init(GtkBuilder* b) + { + int idx; +@@ -78,5 +67,6 @@ + /* event sound support */ + gtk_widget_show_all(GTK_WIDGET(gtk_builder_get_object(b, "sound_effect"))); + #endif ++ + } + +Index: lxappearance/src/lxappearance.c +=================================================================== +--- lxappearance.orig/src/lxappearance.c 2010-11-11 20:19:26.000000000 +0100 ++++ lxappearance/src/lxappearance.c 2010-11-12 00:07:59.000000000 +0100 +@@ -38,6 +38,7 @@ + #include "color-scheme.h" + #include "icon-theme.h" + #include "cursor-theme.h" ++#include "font.h" + #include "other.h" + #include "plugin.h" + +@@ -172,6 +173,9 @@ + "gtk-enable-event-sounds=%d\n" + "gtk-enable-input-feedback-sounds=%d\n" + #endif ++ "gtk-xft-antialias=%d\n" ++ "gtk-xft-hinting=%d\n" ++ + , app.cursor_theme_size, + tb_styles[app.toolbar_style], + tb_icon_sizes[app.toolbar_icon_size], +@@ -179,10 +183,20 @@ + app.menu_images ? 1 : 0, + #if GTK_CHECK_VERSION(2, 14, 0) + app.enable_event_sound ? 1 : 0, +- app.enable_input_feedback ? 1 : 0 ++ app.enable_input_feedback ? 1 : 0, + #endif ++ app.enable_antialising ? 1 : 0, ++ app.enable_hinting ? 1 : 0 + ); + ++ if(app.hinting_style) ++ g_string_append_printf(content, ++ "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style); ++ ++ if(app.font_rgba) ++ g_string_append_printf(content, ++ "gtk-xft-rgba=\"%s\"\n", app.font_rgba); ++ + if(app.color_scheme) + { + char* escaped = g_strescape(app.color_scheme, NULL); +@@ -249,6 +263,10 @@ + g_key_file_set_integer( kf, "GTK", "iNet/EnableEventSounds", app.enable_event_sound); + g_key_file_set_integer( kf, "GTK", "iNet/EnableInputFeedbackSounds", app.enable_input_feedback); + #endif ++ g_key_file_set_integer( kf, "GTK", "iXft/Antialias", app.enable_antialising); ++ g_key_file_set_integer( kf, "GTK", "iXft/Hinting", app.enable_hinting); ++ g_key_file_set_string ( kf, "GTK", "sXft/HintStyle", app.hinting_style); ++ g_key_file_set_string ( kf, "GTK", "sXft/RGBA", app.font_rgba); + + buf = g_key_file_to_data( kf, &len, NULL ); + g_key_file_free(kf); +@@ -308,6 +326,10 @@ + "gtk-enable-event-sounds", &app.enable_event_sound, + "gtk-enable-input-feedback-sounds", &app.enable_input_feedback, + #endif ++ "gtk-xft-antialias", &app.enable_antialising, ++ "gtk-xft-hinting", &app.enable_hinting, ++ "gtk-xft-hintstyle", &app.hinting_style, ++ "gtk-xft-rgba", &app.font_rgba, + NULL); + /* try to figure out cursor theme used. */ + if(!app.cursor_theme || g_strcmp0(app.cursor_theme, "default") == 0) +@@ -411,6 +433,7 @@ + color_scheme_init(b); + icon_theme_init(b); + cursor_theme_init(b); ++ font_init(b); + other_init(b); + /* the page for window manager plugins */ + app.wm_page = GTK_WIDGET(gtk_builder_get_object(b, "wm_page")); +@@ -437,3 +460,14 @@ + gtk_dialog_set_response_sensitive(GTK_DIALOG(app.dlg), GTK_RESPONSE_APPLY, TRUE); + } + } ++ ++void on_check_button_toggled(GtkToggleButton* btn, gpointer user_data) ++{ ++ gboolean* val = (gboolean*)user_data; ++ gboolean new_val = gtk_toggle_button_get_active(btn); ++ if(new_val != *val) ++ { ++ *val = new_val; ++ lxappearance_changed(); ++ } ++} +Index: lxappearance/src/lxappearance.h +=================================================================== +--- lxappearance.orig/src/lxappearance.h 2010-11-11 20:19:26.000000000 +0100 ++++ lxappearance/src/lxappearance.h 2010-11-12 00:08:43.000000000 +0100 +@@ -69,6 +69,13 @@ + GtkWidget* button_images_check; + GtkWidget* menu_images_check; + ++ /* font rendering */ ++ GtkWidget* font_rgba_combo; ++ GtkWidget* hinting_style_combo; ++ ++ GtkWidget* enable_antialising_check; ++ GtkWidget* enable_hinting_check; ++ + /* the page for window manager plugins */ + GtkWidget* wm_page; + +@@ -80,6 +87,8 @@ + char* color_scheme; + int toolbar_style; + int toolbar_icon_size; ++ int hinting_style; ++ int font_rgba; + + gboolean button_images; + gboolean menu_images; +@@ -91,6 +100,9 @@ + gboolean enable_input_feedback; + #endif + ++ gboolean enable_antialising; ++ gboolean enable_hinting; ++ + gboolean changed; + gboolean use_lxsession; + }; +@@ -99,4 +111,6 @@ + + void lxappearance_changed(); + ++void on_check_button_toggled(GtkToggleButton* btn, gpointer user_data); ++ + #endif +Index: lxappearance/data/ui/lxappearance.ui +=================================================================== +--- lxappearance.orig/data/ui/lxappearance.ui 2010-11-11 20:19:26.000000000 +0100 ++++ lxappearance/data/ui/lxappearance.ui 2010-11-11 20:19:29.000000000 +0100 +@@ -1 +1,1821 @@ +-113811010user-homeuser-desktopfolderfolder-remoteuser-trashx-office-documentapplication-x-executableimage-x-generictext-x-generictext-htmlIcons onlyText onlyText below iconsText beside iconsSame as menu itemsSmall toolbar iconLarge toolbar iconSame as buttonsSame as drag iconsSame as dialogs5Customize Look and Feel540preferences-desktop-themenormalFalseTrue2TrueTrueTrue126150TrueTrueautomaticautomaticetched-inTrueTrueTrueFalse00True6True0Preview of the selected widget styleFalse0True0TrueTrue10True2TrueTrue_FileTruegtk-newTrueTrueTruegtk-openTrueTrueTruegtk-saveTrueTrueTruegtk-save-asTrueTrueTrueTruegtk-quitTrueTrueTrueTrue_EditTruegtk-cutTrueTrueTruegtk-copyTrueTrueTruegtk-pasteTrueTrueTruegtk-deleteTrueTrueTrueTrue_HelpTruegtk-aboutTrueTrueTrueFalseFalse0TrueTrueiconsFalseTrueTruegtk-go-backFalseTrueTruegtk-go-forwardFalseTrueTrueTruegtk-stopFalseTrueTrueTrueTrue●TrueTrueFalseFalse1TrueTrue5TrueTrue40True44True4Radio ButtonTrueTrueFalseTrueTrueFalseFalse0Check ButtonTrueTrueFalseTrueTrueFalseFalse1TrueTrueTrue●10TrueTrueTrueTrue00True2Truegtk-findFalseFalse0TruebuttonTrueFalseFalse1FalseFalse1False2TrueDemoTrue0True4TrueTrue0.600000023842000020.1000000014960 %FalseFalse0TrueTrueFalse1True0False21TruePage1FalseTrueTrueneverinTrueTrueicon_demo_storeFalseTruecolumn0column01TruePage21False2True2FalseFalse3False1True12True0Default font:False0TrueTrueTrue1False21TrueWidgetFalseTrue1260Color scheme is not supported by currently selected widget theme.False0Use customized color schemeTrueTrueFalseTrueFalse1True53126True0Normal windows:12GTK_FILLGTK_FILLTrue0Text windows:23GTK_FILLGTK_FILLTrue0Selected items:34GTK_FILLGTK_FILLTrue0Tooltips:45GTK_FILLGTK_FILLTrueBackground12GTK_FILLGTK_FILLTrueForeground23GTK_FILLGTK_FILLTrueTrueTrue#0000000000001212GTK_FILLTrueTrueTrue#0000000000002312GTK_FILLTrueTrueTrue#0000000000001223GTK_FILLTrueTrueTrue#0000000000002323GTK_FILLTrueTrueTrue#0000000000001234GTK_FILLTrueTrueTrue#0000000000002334GTK_FILLTrueTrueTrue#0000000000001245GTK_FILLTrueTrueTrue#0000000000002345GTK_FILLFalse21TrueColor1FalseTrue126True6150TrueTrueautomaticautomaticetched-inTrueTrueFalse00InstallTrueTrueTrueimage2False1RemoveTrueTrueTrueimage3False20True18TrueTrue0Preview of the selected icon themeFalse0TrueTrueautomaticautomaticetched-inTrueTrueicon_demo_store601012TrueIcon Theme2FalseTrue126True6150TrueTrueautomaticautomaticetched-inTrueTrueFalse00InstallTrueTrueTrueimage4False1RemoveTrueTrueTrueimage5False20True6True0Preview of the selected cursor themeFalse0TrueTrueautomaticautomaticetched-inTrueTrue10Size of cursorsFalse212TrueSmallerFalse0TrueTruedelayedcursor_size_adj0left1TrueBiggerFalse2False3True00<b>Note:</b> Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login.TrueTrueFalse413TrueMouse Cursor3False12184TrueWindow Border4FalseTrue1218True0noneTrue12True6True22126True0Toolbar Style:GTK_FILLGTK_FILLTrue0Toolbar Icon Size:12GTK_FILLGTK_FILLTruetb_style_store012GTK_FILLGTK_FILLTruetb_icon_size_store01212GTK_FILLGTK_FILL0Show images on buttonsTrueTrueFalseTrue1Show images in menusTrueTrueFalseTrue2True<b>GUI Options</b>TrueFalseFalse00noneTrue12True6Play event soundsTrueTrueFalseTrue0Play event sounds as feedback to user inputTrueTrueFalseTrue1True<b>Sound Effect</b>TrueFalseFalse15TrueOther5False1Trueendgtk-aboutTrueTrueTrueTrueFalseFalse0Truegtk-closeTrueTrueTrueTrueFalseFalse1gtk-applyTrueFalseTrueTrueTrueFalseFalse1Falseend0aboutcloseapplyTruegtk-addTruegtk-removeTruegtk-addTruegtk-remove ++ ++ ++ ++ ++ ++ 1 ++ 138 ++ 1 ++ 10 ++ 10 ++ ++ ++ ++ ++ ++ ++ ++ ++ user-home ++ ++ ++ user-desktop ++ ++ ++ folder ++ ++ ++ folder-remote ++ ++ ++ user-trash ++ ++ ++ x-office-document ++ ++ ++ application-x-executable ++ ++ ++ image-x-generic ++ ++ ++ text-x-generic ++ ++ ++ text-html ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Icons only ++ ++ ++ Text only ++ ++ ++ Text below icons ++ ++ ++ Text beside icons ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Same as menu items ++ ++ ++ Small toolbar icon ++ ++ ++ Large toolbar icon ++ ++ ++ Same as buttons ++ ++ ++ Same as drag icons ++ ++ ++ Same as dialogs ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ None ++ ++ ++ Slight ++ ++ ++ Medium ++ ++ ++ Full ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ None ++ ++ ++ RGB ++ ++ ++ BGR ++ ++ ++ VRGB ++ ++ ++ VBGR ++ ++ ++ ++ ++ 5 ++ Customize Look and Feel ++ 540 ++ preferences-desktop-theme ++ normal ++ ++ ++ True ++ 2 ++ ++ ++ True ++ True ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ 150 ++ True ++ True ++ automatic ++ automatic ++ etched-in ++ ++ ++ True ++ True ++ True ++ False ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ Preview of the selected widget style ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ ++ ++ True ++ ++ ++ True ++ 10 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ ++ ++ True ++ _File ++ True ++ ++ ++ ++ ++ gtk-new ++ True ++ True ++ True ++ ++ ++ ++ ++ gtk-open ++ True ++ True ++ True ++ ++ ++ ++ ++ gtk-save ++ True ++ True ++ True ++ ++ ++ ++ ++ gtk-save-as ++ True ++ True ++ True ++ ++ ++ ++ ++ True ++ ++ ++ ++ ++ gtk-quit ++ True ++ True ++ True ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ _Edit ++ True ++ ++ ++ ++ ++ gtk-cut ++ True ++ True ++ True ++ ++ ++ ++ ++ gtk-copy ++ True ++ True ++ True ++ ++ ++ ++ ++ gtk-paste ++ True ++ True ++ True ++ ++ ++ ++ ++ gtk-delete ++ True ++ True ++ True ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ _Help ++ True ++ ++ ++ ++ ++ gtk-about ++ True ++ True ++ True ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ icons ++ False ++ ++ ++ True ++ True ++ gtk-go-back ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ gtk-go-forward ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ True ++ gtk-stop ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ ● ++ ++ ++ ++ ++ True ++ True ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 5 ++ ++ ++ True ++ ++ ++ True ++ 4 ++ 0 ++ ++ ++ True ++ 4 ++ 4 ++ ++ ++ True ++ 4 ++ ++ ++ Radio Button ++ True ++ True ++ False ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ Check Button ++ True ++ True ++ False ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ ● ++ 1 ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-find ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ button ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ Demo ++ True ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 4 ++ ++ ++ True ++ True ++ 0.60000002384200002 ++ 0.10000000149 ++ 60 % ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ Page1 ++ ++ ++ False ++ ++ ++ ++ ++ True ++ True ++ never ++ in ++ ++ ++ True ++ True ++ icon_demo_store ++ False ++ True ++ ++ ++ column ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ column ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ Page2 ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ 2 ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 0 ++ Default font: ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ Widget ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ 0 ++ Color scheme is not supported by currently selected widget theme. ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ Use customized color scheme ++ True ++ True ++ False ++ True ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 5 ++ 3 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ Normal windows: ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 0 ++ Text windows: ++ ++ ++ 2 ++ 3 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 0 ++ Selected items: ++ ++ ++ 3 ++ 4 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 0 ++ Tooltips: ++ ++ ++ 4 ++ 5 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ Background ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ Foreground ++ ++ ++ 2 ++ 3 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 2 ++ 3 ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 2 ++ 3 ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 1 ++ 2 ++ 3 ++ 4 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 2 ++ 3 ++ 3 ++ 4 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 1 ++ 2 ++ 4 ++ 5 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ True ++ True ++ #000000000000 ++ ++ ++ 2 ++ 3 ++ 4 ++ 5 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ Color ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ 150 ++ True ++ True ++ automatic ++ automatic ++ etched-in ++ ++ ++ True ++ True ++ False ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ Install ++ True ++ True ++ True ++ image2 ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ Remove ++ True ++ True ++ True ++ image3 ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 18 ++ ++ ++ True ++ ++ ++ True ++ 0 ++ Preview of the selected icon theme ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ automatic ++ automatic ++ etched-in ++ ++ ++ True ++ True ++ icon_demo_store ++ ++ ++ 6 ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ Icon Theme ++ ++ ++ 2 ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ 150 ++ True ++ True ++ automatic ++ automatic ++ etched-in ++ ++ ++ True ++ True ++ False ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ Install ++ True ++ True ++ True ++ image4 ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ Remove ++ True ++ True ++ True ++ image5 ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ Preview of the selected cursor theme ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ automatic ++ automatic ++ etched-in ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 0 ++ Size of cursors ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 12 ++ ++ ++ True ++ Smaller ++ ++ ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ delayed ++ cursor_size_adj ++ 0 ++ left ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ Bigger ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ False ++ 3 ++ ++ ++ ++ ++ True ++ 0 ++ 0 ++ <b>Note:</b> Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login. ++ True ++ True ++ ++ ++ False ++ 4 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ Mouse Cursor ++ ++ ++ 3 ++ False ++ ++ ++ ++ ++ 12 ++ 18 ++ ++ ++ ++ ++ ++ 4 ++ ++ ++ ++ ++ True ++ Window Border ++ ++ ++ 4 ++ False ++ ++ ++ ++ ++ True ++ 18 ++ ++ ++ True ++ 0 ++ none ++ ++ ++ True ++ 12 ++ ++ ++ True ++ ++ ++ Enable antialising ++ True ++ True ++ False ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ <b>Antialising</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ none ++ ++ ++ True ++ 12 ++ ++ ++ True ++ ++ ++ Enable hinting ++ True ++ True ++ False ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ Hinting style: ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ hinting_style_store ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ <b>Hinting</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 0 ++ none ++ ++ ++ True ++ 12 ++ ++ ++ True ++ ++ ++ True ++ 0 ++ Sub-pixel geometry: ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ font_rgba_store ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ <b>Sub-pixel geometry</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 5 ++ ++ ++ ++ ++ True ++ Font ++ ++ ++ 5 ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 0 ++ none ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ Toolbar Style: ++ ++ ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 0 ++ Toolbar Icon Size: ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ tb_style_store ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ tb_icon_size_store ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ Show images on buttons ++ True ++ True ++ False ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ Show images in menus ++ True ++ True ++ False ++ True ++ ++ ++ 2 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ <b>GUI Options</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ 0 ++ none ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ Play event sounds ++ True ++ True ++ False ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ play event sounds as feedback to user input ++ True ++ True ++ False ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ <b>Sound Effect</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 6 ++ ++ ++ ++ ++ True ++ Other ++ ++ ++ 6 ++ False ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ end ++ ++ ++ gtk-about ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ True ++ ++ ++ ++ ++ gtk-apply ++ True ++ False ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ gtk-close ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ end ++ 0 ++ ++ ++ ++ ++ ++ about ++ apply ++ close ++ ++ ++ ++ True ++ gtk-add ++ ++ ++ True ++ gtk-remove ++ ++ ++ True ++ gtk-add ++ ++ ++ True ++ gtk-remove ++ ++ +Index: lxappearance/src/Makefile.am +=================================================================== +--- lxappearance.orig/src/Makefile.am 2010-11-11 20:21:18.000000000 +0100 ++++ lxappearance/src/Makefile.am 2010-11-11 20:26:27.000000000 +0100 +@@ -23,6 +23,8 @@ + icon-theme.h \ + cursor-theme.c \ + cursor-theme.h \ ++ font.c \ ++ font.h \ + other.c \ + other.h \ + utils.c \ +Index: lxappearance/src/font.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxappearance/src/font.c 2010-11-12 02:12:27.000000000 +0100 +@@ -0,0 +1,98 @@ ++// font.c ++// ++// Copyright 2010 Hong Jen Yee (PCMan) ++// ++// This program is free software; you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation; either version 2 of the License, or ++// (at your option) any later version. ++// ++// This program is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with this program; if not, write to the Free Software ++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++// MA 02110-1301, USA. ++ ++ ++#include "lxappearance.h" ++#include "font.h" ++#include ++ ++static const char* font_hinting_style[]={ ++ "hintnone", ++ "hintslight", ++ "hintmedium", ++ "hintfull" ++}; ++ ++static const char* font_rgba[]={ ++ "none", ++ "rgb", ++ "bgr", ++ "vrgb", ++ "vbgr" ++ }; ++ ++static void on_hinting_style_changed(GtkComboBox* combo, gpointer user_data) ++{ ++ gint pos_combo = gtk_combo_box_get_active(combo); ++ if (pos_combo >= 0) ++ { ++ app.hinting_style = font_hinting_style[pos_combo]; ++ lxappearance_changed(); ++ } ++ ++} ++ ++static void on_font_rgba_changed(GtkComboBox* combo, gpointer user_data) ++{ ++ gint pos_combo = gtk_combo_box_get_active(combo); ++ if (pos_combo >= 0) ++ { ++ app.font_rgba = font_rgba[pos_combo]; ++ lxappearance_changed(); ++ } ++} ++ ++static int convert_list_to_pos(char* font, const char* list[]) ++{ ++ ++ int pos, i; ++ ++ for (i = 0; i <= 3; i = i + 1) ++ { ++ if (g_strcmp0(list[i],font) == 0) ++ pos = i; ++ } ++ ++ return pos ; ++ ++} ++ ++void font_init(GtkBuilder* b) ++{ ++ int idx; ++ app.enable_antialising_check = GTK_WIDGET(gtk_builder_get_object(b, "enable_antialising")); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(app.enable_antialising_check), app.enable_antialising); ++ g_signal_connect(app.enable_antialising_check, "toggled", G_CALLBACK(on_check_button_toggled), &app.enable_antialising); ++ ++ app.enable_hinting_check = GTK_WIDGET(gtk_builder_get_object(b, "enable_hinting")); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(app.enable_hinting_check), app.enable_hinting); ++ g_signal_connect(app.enable_hinting_check, "toggled", G_CALLBACK(on_check_button_toggled), &app.enable_hinting); ++ ++ app.hinting_style_combo = GTK_WIDGET(gtk_builder_get_object(b, "hinting_style")); ++ idx = convert_list_to_pos(app.hinting_style, font_hinting_style); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(app.hinting_style_combo), idx); ++ g_signal_connect(app.hinting_style_combo, "changed", G_CALLBACK(on_hinting_style_changed), NULL); ++ ++ app.font_rgba_combo = GTK_WIDGET(gtk_builder_get_object(b, "font_rgba")); ++ idx = convert_list_to_pos(app.font_rgba, font_rgba); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(app.font_rgba_combo), idx); ++ g_signal_connect(app.font_rgba_combo, "changed", G_CALLBACK(on_font_rgba_changed), NULL); ++ ++} ++ +Index: lxappearance/src/font.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lxappearance/src/font.h 2010-11-11 22:37:39.000000000 +0100 +@@ -0,0 +1,30 @@ ++// font.h ++// ++// Copyright 2010 Hong Jen Yee (PCMan) ++// ++// This program is free software; you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation; either version 2 of the License, or ++// (at your option) any later version. ++// ++// This program is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with this program; if not, write to the Free Software ++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++// MA 02110-1301, USA. ++ ++ ++#ifndef __FONT_H__ ++#define __FONT_H__ ++ ++G_BEGIN_DECLS ++ ++void font_init(GtkBuilder* b); ++ ++G_END_DECLS ++ ++#endif /* __FONT_H__ */ diff -Nru lxappearance-0.5.2~ppa2/debian/patches/99_fix_build.patch lxappearance-0.5.0/debian/patches/99_fix_build.patch --- lxappearance-0.5.2~ppa2/debian/patches/99_fix_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/patches/99_fix_build.patch 2010-11-11 21:35:30.000000000 +0000 @@ -0,0 +1,29 @@ +Index: lxappearance/data/ui/Makefile.am +=================================================================== +--- lxappearance.orig/data/ui/Makefile.am 2010-11-11 21:42:10.000000000 +0100 ++++ lxappearance/data/ui/Makefile.am 2010-11-11 21:42:30.000000000 +0100 +@@ -2,21 +2,14 @@ + + # GtkBuilder UI definition files + uidir=$(datadir)/lxappearance/ui +-ui_in_files= \ +- about.glade \ +- lxappearance.glade \ ++ui_DATA = \ ++ about.ui \ ++ lxappearance.ui \ + $(NULL) +-ui_DATA = $(ui_in_files:.glade=.ui) + + CLEANFILES = \ +- $(ui_DATA) \ + $(NULL) + +-# Purge GtkBuilder UI files +-%.ui: %.glade +- cp $< $@ +- $(top_srcdir)/src/xml-purge $@ +- + EXTRA_DIST= \ + $(ui_DATA) \ + $(NULL) diff -Nru lxappearance-0.5.2~ppa2/debian/patches/series lxappearance-0.5.0/debian/patches/series --- lxappearance-0.5.2~ppa2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-0.5.0/debian/patches/series 2010-11-12 00:19:40.000000000 +0000 @@ -0,0 +1,3 @@ +01_gtk3_migration.patch +02_font_config.patch +99_fix_build.patch diff -Nru lxappearance-0.5.2~ppa2/debian/rules lxappearance-0.5.0/debian/rules --- lxappearance-0.5.2~ppa2/debian/rules 2012-07-08 20:31:01.000000000 +0000 +++ lxappearance-0.5.0/debian/rules 2010-11-11 16:40:37.000000000 +0000 @@ -1,19 +1,55 @@ #!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright (C) 2009-2010 Andrew Lee (李健秋) +# Description: Main Debian packaging script for morituri +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, 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 General Public License +# along with this program. If not, see . +# Uncomment this to turn on verbose mode. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DISTRO = "$(shell lsb_release -si)" + +# GTK3 migration +CFLAGS+=-DGTK_DISABLE_SINGLE_INCLUDES +CFLAGS+=-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED +CFLAGS+=-DGSEAL_ENABLE +CFLAGS+=-DGDK_PIXBUF_DISABLE_DEPRECATED +CFLAGS+=-DG_DISABLE_DEPRECATED + +LDFLAGS+=-Wl,-z,defs -Wl,--as-needed %: - dh ${@} + dh --with autoreconf $@ override_dh_auto_configure: - dh_auto_configure -- --enable-man --enable-dbus + dh_auto_configure -- --enable-man -override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxappearance +override_dh_auto_clean: + rm -f man/lxpanel.1 man/lxpanelctl.1 + dh_auto_clean + +override_dh_install: + dh_install --fail-missing + #Install apport hook only on Ubuntu +ifeq ($(DISTRO),"Ubuntu") + dh_install -plxappearance debian/apport/source_lxappearance.py usr/share/apport/package-hooks +endif override_dh_auto_test: - # disabled: test fails in po directory - -override_dh_builddeb: - dh_builddeb -- -Zxz -z9 + : override_dh_strip: dh_strip --dbg-package=lxappearance-dbg diff -Nru lxappearance-0.5.2~ppa2/debian/source/options lxappearance-0.5.0/debian/source/options --- lxappearance-0.5.2~ppa2/debian/source/options 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/source/options 2010-10-26 03:23:45.000000000 +0000 @@ -1,2 +1,2 @@ -compression = "xz" +compression = "bzip2" compression-level = 9 diff -Nru lxappearance-0.5.2~ppa2/debian/watch lxappearance-0.5.0/debian/watch --- lxappearance-0.5.2~ppa2/debian/watch 2012-05-20 18:15:12.000000000 +0000 +++ lxappearance-0.5.0/debian/watch 2010-10-26 03:23:45.000000000 +0000 @@ -1,2 +1,12 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file version=3 + +# Uncomment to find new files on sourceforge, for debscripts >= 2.9 http://sf.net/lxde/lxappearance-(.*)\.tar\.gz + + diff -Nru lxappearance-0.5.2~ppa2/depcomp lxappearance-0.5.0/depcomp --- lxappearance-0.5.2~ppa2/depcomp 2012-05-20 14:29:41.000000000 +0000 +++ lxappearance-0.5.0/depcomp 2010-08-06 08:01:50.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. + tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,18 +90,10 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' + cygpath_u="sed s,\\\\\\\\,/,g" depmode=msvisualcpp fi -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -166,12 +158,10 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. +## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -415,52 +405,6 @@ rm -f "$tmpdepfile" ;; -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/ \1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/ / - G - p -}' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -559,9 +503,7 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru lxappearance-0.5.2~ppa2/install-sh lxappearance-0.5.0/install-sh --- lxappearance-0.5.2~ppa2/install-sh 2012-05-20 14:29:41.000000000 +0000 +++ lxappearance-0.5.0/install-sh 2010-08-06 08:01:50.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,10 +156,6 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac shift;; -T) no_target_directory=true;; @@ -190,10 +186,6 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac done fi @@ -208,11 +200,7 @@ fi if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 + trap '(exit $?); exit' 1 2 13 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -240,9 +228,9 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names starting with `-'. case $src in - -* | [=\(\)!]) src=./$src;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -264,7 +252,12 @@ echo "$0: no destination specified." >&2 exit 1 fi + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -392,7 +385,7 @@ case $dstdir in /*) prefix='/';; - [-=\(\)!]*) prefix='./';; + -*) prefix='./';; *) prefix='';; esac @@ -410,7 +403,7 @@ for d do - test X"$d" = X && continue + test -z "$d" && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru lxappearance-0.5.2~ppa2/ltmain.sh lxappearance-0.5.0/ltmain.sh --- lxappearance-0.5.2~ppa2/ltmain.sh 2012-05-20 14:36:34.000000000 +0000 +++ lxappearance-0.5.0/ltmain.sh 2010-10-12 15:20:50.000000000 +0000 @@ -1,9 +1,9 @@ +# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.4.2 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,57 +32,50 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print informational messages (default) +# --version print version information +# -h, --help print short or long help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# MODE-ARGS vary depending on the MODE. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . -PROGRAM=libtool +PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" -package_revision=1.3337 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -98,15 +91,10 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - # NLS nuisances: We save the old values to restore during execute mode. +# Only set LANG and LC_ALL to C if already set. +# These must not be set unconditionally because not all systems understand +# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -119,28 +107,24 @@ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL $lt_unset CDPATH -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="echo"} +: ${EGREP="/bin/grep -E"} +: ${FGREP="/bin/grep -F"} +: ${GREP="/bin/grep"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} +: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -160,27 +144,6 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -195,183 +158,33 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` } -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Generated shell functions inserted here. - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" # The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result +case $progname in + -*) progname=./$progname ;; +esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -383,7 +196,7 @@ ;; *) save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} + IFS=: for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -402,15 +215,6 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -439,7 +243,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + $ECHO "$progname${mode+: }$mode: $*" } # func_verbose arg... @@ -454,25 +258,18 @@ : } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -529,9 +326,9 @@ case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -581,7 +378,7 @@ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "$my_tmpdir" + $ECHO "X$my_tmpdir" | $Xsed } @@ -595,7 +392,7 @@ { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -622,7 +419,7 @@ { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ + my_arg=`$ECHO "X$1" | $Xsed \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -691,39 +488,15 @@ fi } -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} + + # func_version # Echo version message to standard output and exit. func_version () { - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -736,28 +509,22 @@ # Echo short help message to standard output and exit. func_usage () { - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { + $SED -n '/^# Usage:/,/# -h/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - echo + $ECHO $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. +# func_help +# Echo long help message to standard output and exit. func_help () { - $opt_debug - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -767,18 +534,11 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + }' < "$progpath" + exit $? } # func_missing_arg argname @@ -786,106 +546,63 @@ # exit_cmd. func_missing_arg () { - $opt_debug - - func_error "missing argument for $1." + func_error "missing argument for $1" exit_cmd=exit } +exit_cmd=: -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation -exit_cmd=: +# Check that we have a working $ECHO. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell, and then maybe $ECHO will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -919,16 +636,16 @@ # Display the features supported by this script. func_features () { - echo "host: $host" + $ECHO "host: $host" if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" + $ECHO "enable shared libraries" else - echo "disable shared libraries" + $ECHO "disable shared libraries" fi if test "$build_old_libs" = yes; then - echo "enable static libraries" + $ECHO "enable static libraries" else - echo "disable static libraries" + $ECHO "disable static libraries" fi exit $? @@ -975,209 +692,117 @@ esac } -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do + # Parse non-mode specific arguments: + while test "$#" -gt 0; do opt="$1" shift + case $opt in - --debug|-x) opt_debug='set -x' + --config) func_config ;; + + --debug) preserve_args="$preserve_args $opt" func_echo "enabling shell trace mode" + opt_debug='set -x' $opt_debug ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" + + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" shift ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac + + --dry-run | -n) opt_dry_run=: ;; + --features) func_features ;; + --finish) mode="finish" ;; + + --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break + case $1 in + # Valid mode arguments: + clean) ;; + compile) ;; + execute) ;; + finish) ;; + install) ;; + link) ;; + relink) ;; + uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; + esac + + mode="$1" shift ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here shift ;; - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} shift ;; - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; esac done - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -1185,44 +810,82 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ;; esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + exit $EXIT_MISMATCH + fi +} + - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi +## ----------- ## +## Main. ## +## ----------- ## - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } +$opt_help || { + # Sanity checks first: + func_check_version_match + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" -## ----------- ## -## Main. ## -## ----------- ## + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$mode' for more information." +} + # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1287,9 +950,12 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi } # func_ltwrapper_p file @@ -1335,37 +1001,6 @@ } -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1378,15 +1013,13 @@ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1397,13 +1030,11 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1466,486 +1097,6 @@ } } - -################################################## -# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -################################################## - -# func_convert_core_file_wine_to_w32 ARG -# Helper function used by file name conversion functions when $build is *nix, -# and $host is mingw, cygwin, or some other w32 environment. Relies on a -# correctly configured wine environment available, with the winepath program -# in $build's $PATH. -# -# ARG is the $build file name to be converted to w32 format. -# Result is available in $func_convert_core_file_wine_to_w32_result, and will -# be empty on error (or when ARG is empty) -func_convert_core_file_wine_to_w32 () -{ - $opt_debug - func_convert_core_file_wine_to_w32_result="$1" - if test -n "$1"; then - # Unfortunately, winepath does not exit with a non-zero error code, so we - # are forced to check the contents of stdout. On the other hand, if the - # command is not found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both error code of - # zero AND non-empty stdout, which explains the odd construction: - func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - # func_mode_compile arg... func_mode_compile () { @@ -1986,12 +1137,12 @@ ;; -pie | -fpie | -fPIE) - func_append pie_flag " $arg" + pie_flag="$pie_flag $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" + later="$later $arg" continue ;; @@ -2012,14 +1163,15 @@ save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_append_quoted lastarg "$arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - func_append base_compile " $lastarg" + base_compile="$base_compile $lastarg" continue ;; @@ -2035,7 +1187,8 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in @@ -2060,7 +1213,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.obj | *.sx) func_xform "$libobj" libobj=$func_xform_result ;; @@ -2135,7 +1288,7 @@ # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -2166,16 +1319,17 @@ $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - func_append removelist " $output_obj" + removelist="$removelist $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" + removelist="$removelist $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -2195,7 +1349,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - func_append command " -o $lobj" + command="$command -o $lobj" fi func_show_eval_locale "$command" \ @@ -2242,11 +1396,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - func_append command " -o $obj" + command="$command -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" + command="$command$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -2291,13 +1445,13 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +test "$mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $opt_mode in + case $mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -2328,11 +1482,10 @@ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -2385,7 +1538,7 @@ The following components of INSTALL-COMMAND are treated specially: - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -2405,8 +1558,6 @@ -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -2435,11 +1586,6 @@ -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -2473,44 +1619,18 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" ;; esac - echo + $ECHO $ECHO "Try \`$progname --help' for more information about other modes." + + exit $? } -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help # func_mode_execute arg... @@ -2523,16 +1643,13 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $opt_dlopen; do + for file in $execute_dlfiles; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -2554,7 +1671,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" + dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -2595,7 +1712,7 @@ for file do case $file in - -* | *.la | *.lo ) ;; + -*) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -2611,7 +1728,8 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" done if test "X$opt_dry_run" = Xfalse; then @@ -2636,66 +1754,29 @@ # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" + $ECHO "export $shlibpath_var" fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS fi +} + +test "$mode" = execute && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libdirs="$nonopt" + admincmds= if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done + for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -2705,7 +1786,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " + $opt_dry_run || eval "$cmds" || admincmds="$admincmds $cmds" fi done @@ -2714,55 +1795,53 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo + $ECHO "X----------------------------------------------------------------------" | $Xsed + $ECHO "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + $ECHO + $ECHO "If you ever happen to want to link against installed libraries" + $ECHO "in a given directory, LIBDIR, you must either use libtool, and" + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" + $ECHO "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" + $ECHO " during execution" + fi + if test -n "$runpath_var"; then + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" + $ECHO " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi + $ECHO + + $ECHO "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" + $ECHO "pages." + ;; + *) + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + $ECHO "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test "$mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2773,7 +1852,7 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2787,12 +1866,7 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac + install_prog="$install_prog$func_quote_for_eval_result" # We need to accept at least all the BSD install flags. dest= @@ -2802,12 +1876,10 @@ install_type= isdir=no stripme= - no_mode=: for arg do - arg2= if test -n "$dest"; then - func_append files " $dest" + files="$files $dest" dest=$arg continue fi @@ -2815,9 +1887,10 @@ case $arg in -d) isdir=yes ;; -f) - if $install_cp; then :; else - prev=$arg - fi + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac ;; -g | -m | -o) prev=$arg @@ -2831,10 +1904,6 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi prev= else dest=$arg @@ -2845,11 +1914,7 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" + install_prog="$install_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2858,13 +1923,6 @@ test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2919,13 +1977,10 @@ case $file in *.$libext) # Do the static libraries later. - func_append staticlibs " $file" + staticlibs="$staticlibs $file" ;; *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2939,23 +1994,23 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; + *) future_libdirs="$future_libdirs $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - func_append dir "$objdir" + dir="$dir$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2968,9 +2023,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2988,7 +2043,7 @@ test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -3028,7 +2083,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ;; *.lo) @@ -3128,7 +2183,7 @@ if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -3147,7 +2202,7 @@ file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -3166,7 +2221,7 @@ } else # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -3202,13 +2257,11 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + func_show_eval "$old_striplib $oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3227,7 +2280,7 @@ fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test "$mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3270,22 +2323,6 @@ extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - /* External symbol declarations for the compiler. */\ " @@ -3295,11 +2332,10 @@ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -3335,7 +2371,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -3348,52 +2384,10 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } done $opt_dry_run || { @@ -3421,19 +2415,36 @@ if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist +" + case $host in + *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ +/* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs. */" + lt_dlsym_const= ;; + *osf5*) + echo >> "$output_objdir/$my_dlsyms" "\ +/* This system does not cope well with relocations in const data */" + lt_dlsym_const= ;; + *) + lt_dlsym_const=const ;; + esac + + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist +$lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -3446,7 +2457,7 @@ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -3473,7 +2484,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3489,7 +2500,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; + *) symtab_cflags="$symtab_cflags $arg" ;; esac done @@ -3504,16 +2515,16 @@ case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -3527,8 +2538,8 @@ # really was required. # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi } @@ -3538,7 +2549,6 @@ # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -3549,11 +2559,9 @@ win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ / I /{ @@ -3582,131 +2590,6 @@ $ECHO "$win32_libid_type" } -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} # func_extract_an_archive dir oldlib @@ -3715,18 +2598,7 @@ $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -3797,7 +2669,7 @@ darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -3812,30 +2684,25 @@ func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" } -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. + +# func_emit_wrapper_part1 [arg=no] # -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () +{ + func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part1_arg1=$1 + fi $ECHO "\ #! $SHELL @@ -3851,6 +2718,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -3881,135 +2749,31 @@ else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$ECHO works! + : + else + # Restart under the correct shell, and then maybe \$ECHO will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ +" + $ECHO "\ # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -4019,13 +2783,30 @@ esac fi - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done +" +} +# end: func_emit_wrapper_part1 + +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -4033,7 +2814,7 @@ fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -4088,18 +2869,6 @@ if test -f \"\$progdir/\$program\"; then" - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -4108,28 +2877,253 @@ # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var " fi + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } - +# end: func_emit_wrapper_part2 + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 + fi + + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} + + +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path + +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -4147,23 +3141,31 @@ This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. + + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. */ EOF cat <<"EOF" -#ifdef _MSC_VER -# define _CRT_SECURE_NO_DEPRECATE 1 -#endif #include #include #ifdef _MSC_VER # include # include # include +# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif # endif #endif #include @@ -4175,44 +3177,6 @@ #include #include -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -4228,7 +3192,14 @@ # define S_IXGRP 0 #endif -/* path handling portability macros */ +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif + #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -4259,6 +3230,10 @@ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif + #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -4271,13 +3246,22 @@ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} #else -static int lt_debug = 0; +# define LTWRAPPER_DEBUGPRINTF(args) #endif -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ +const char *program_name = NULL; void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -4287,27 +3271,41 @@ int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); +void lt_fatal (const char *message, ...); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); + +static const char *script_text_part1 = +EOF + + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); for (i = 0; i < newargc; i++) { - lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", - i, nonnull (newargz[i])); + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); } EOF @@ -4523,14 +3560,11 @@ mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ - newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - lt_debugprintf (__FILE__, __LINE__, - "(main) failed to launch target \"%s\": %s\n", - lt_argv_zero, nonnull (strerror (errno))); + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); return 127; } return rval; @@ -4552,7 +3586,7 @@ { void *p = (void *) malloc (num); if (!p) - lt_fatal (__FILE__, __LINE__, "memory exhausted"); + lt_fatal ("Memory exhausted"); return p; } @@ -4586,8 +3620,8 @@ { struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4604,8 +3638,8 @@ int rval = 0; struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4631,8 +3665,8 @@ int tmp_len; char *concat_name; - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -4685,8 +3719,7 @@ { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -4711,8 +3744,7 @@ } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -4738,9 +3770,8 @@ int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -4762,9 +3793,8 @@ } else { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); } } XFREE (tmp_pathspec); @@ -4777,8 +3807,7 @@ tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); + lt_fatal ("Could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -4804,25 +3833,11 @@ return str; } -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, +lt_error_core (int exit_status, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + fprintf (stderr, "%s: %s: ", program_name, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -4831,32 +3846,20 @@ } void -lt_fatal (const char *file, int line, const char *message, ...) +lt_fatal (const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); va_end (ap); } -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - void lt_setenv (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -4901,12 +3904,95 @@ return new_value; } +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; + + p = strchr (arg, (int)'='); + + if (!p) + return 1; + + *value = xstrdup (++p); + + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; + + return 0; +} + +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } + + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + void lt_update_exe_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4925,9 +4011,9 @@ void lt_update_lib_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4937,158 +4023,11 @@ } } -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} EOF } # end: func_emit_cwrapperexe_src -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - # func_mode_link arg... func_mode_link () { @@ -5133,7 +4072,6 @@ new_inherited_linker_flags= avoid_version=no - bindir= dlfiles= dlprefiles= dlself=no @@ -5226,11 +4164,6 @@ esac case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -5262,9 +4195,9 @@ ;; *) if test "$prev" = dlfiles; then - func_append dlfiles " $arg" + dlfiles="$dlfiles $arg" else - func_append dlprefiles " $arg" + dlprefiles="$dlprefiles $arg" fi prev= continue @@ -5288,7 +4221,7 @@ *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ;; esac ;; @@ -5307,7 +4240,7 @@ moreargs= for fil in `cat "$save_arg"` do -# func_append moreargs " $fil" +# moreargs="$moreargs $fil" arg=$fil # A libtool-controlled object. @@ -5336,7 +4269,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5348,7 +4281,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5418,12 +4351,12 @@ if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) func_append rpath " $arg" ;; + *) rpath="$rpath $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) func_append xrpath " $arg" ;; + *) xrpath="$xrpath $arg" ;; esac fi prev= @@ -5435,28 +4368,28 @@ continue ;; weak) - func_append weak_libs " $arg" + weak_libs="$weak_libs $arg" prev= continue ;; xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - func_append compiler_flags " $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -5492,11 +4425,6 @@ continue ;; - -bindir) - prev=bindir - continue - ;; - -dlopen) prev=dlfiles continue @@ -5547,16 +4475,15 @@ ;; -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -5568,30 +4495,24 @@ ;; esac case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; + *" -L$dir "*) ;; *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; + *) dllsearchpath="$dllsearchpath:$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -5601,7 +4522,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) # These systems don't actually have a C or math library (as such) continue ;; @@ -5615,7 +4536,7 @@ ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -5635,7 +4556,7 @@ ;; esac fi - func_append deplibs " $arg" + deplibs="$deplibs $arg" continue ;; @@ -5647,22 +4568,21 @@ # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" + -model|-arch|-isysroot) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; esac continue ;; @@ -5729,17 +4649,13 @@ # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac continue ;; @@ -5792,8 +4708,8 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5808,9 +4724,9 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" + linker_flags="$linker_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5838,27 +4754,23 @@ arg="$func_quote_for_eval_result" ;; - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - func_append compiler_flags " $arg" + compiler_flags="$compiler_flags $arg" continue ;; @@ -5870,7 +4782,7 @@ *.$objext) # A standard object. - func_append objs " $arg" + objs="$objs $arg" ;; *.lo) @@ -5901,7 +4813,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5913,7 +4825,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5958,25 +4870,24 @@ *.$libext) # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" continue ;; *.la) # A libtool-controlled library. - func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" + dlfiles="$dlfiles $arg" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" + dlprefiles="$dlprefiles $arg" prev= else - func_append deplibs " $func_resolve_sysroot_result" + deplibs="$deplibs $arg" fi continue ;; @@ -6014,7 +4925,7 @@ if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` else shlib_search_path= fi @@ -6023,8 +4934,6 @@ func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -6045,12 +4954,12 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append libs " $deplib" + libs="$libs $deplib" done if test "$linkmode" = lib; then @@ -6063,9 +4972,9 @@ if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; esac - func_append pre_post_deps " $pre_post_dep" + pre_post_deps="$pre_post_deps $pre_post_dep" done fi pre_post_deps= @@ -6135,19 +5044,17 @@ for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= - func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; + *.la) func_source "$lib" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` case " $weak_libs " in *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; + *) deplibs="$deplibs $deplib" ;; esac done done @@ -6163,17 +5070,16 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append compiler_flags " $deplib" + compiler_flags="$compiler_flags $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6258,7 +5164,7 @@ if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6271,8 +5177,7 @@ test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; prog) if test "$pass" = conv; then @@ -6286,8 +5191,7 @@ finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -6298,21 +5202,17 @@ -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result + dir=$func_stripname_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; + *.la) lib="$deplib" ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -6330,7 +5230,7 @@ match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -6340,15 +5240,15 @@ ;; esac if test "$valid_a_lib" != yes; then - echo + $ECHO $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because the file extensions .$libext of this argument makes me believe" + $ECHO "*** that it is just a static archive that I should not use here." else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -6375,11 +5275,11 @@ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - func_append newdlprefiles " $deplib" + newdlprefiles="$newdlprefiles $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append newdlfiles " $deplib" + newdlfiles="$newdlfiles $deplib" fi fi continue @@ -6421,20 +5321,20 @@ # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi if test "$pass" = conv; then @@ -6445,17 +5345,17 @@ func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $deplib" + tmp_libs="$tmp_libs $deplib" done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" @@ -6466,15 +5366,9 @@ # Get the name of the library we link against. linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi + for l in $old_library $library_names; do + linklib="$l" + done if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -6491,9 +5385,9 @@ # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" + dlprefiles="$dlprefiles $lib $dependency_libs" else - func_append newdlfiles " $lib" + newdlfiles="$newdlfiles $lib" fi continue fi # $pass = dlopen @@ -6515,14 +5409,14 @@ # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir="$libdir" + absdir="$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -6530,12 +5424,12 @@ dir="$ladir" absdir="$abs_ladir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -6546,46 +5440,20 @@ if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi fi # $pass = dlpreopen if test -z "$libdir"; then @@ -6603,7 +5471,7 @@ if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" + newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -6616,8 +5484,7 @@ for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; esac # Need to link against all dependency_libs? @@ -6628,12 +5495,12 @@ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $deplib" + tmp_libs="$tmp_libs $deplib" done # for deplib continue fi # $linkmode = prog... @@ -6648,7 +5515,7 @@ # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; + *) temp_rpath="$temp_rpath$absdir:" ;; esac fi @@ -6660,7 +5527,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6669,7 +5536,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6694,12 +5561,12 @@ case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=no ;; *) if test "$installed" = no; then - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=yes fi ;; @@ -6716,7 +5583,7 @@ fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo + $ECHO if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -6734,7 +5601,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6743,7 +5610,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6797,7 +5664,7 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= @@ -6819,9 +5686,9 @@ if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" + $ECHO + $ECHO "*** And there doesn't seem to be a static archive available" + $ECHO "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -6848,12 +5715,12 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6875,7 +5742,7 @@ if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -6889,13 +5756,13 @@ test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= @@ -6909,7 +5776,7 @@ elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -6926,7 +5793,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6961,21 +5828,21 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - echo + $ECHO $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + $ECHO "*** But as you try to build a module library, libtool will still create " + $ECHO "*** a static module, that should work as long as the dlopening application" + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -7003,33 +5870,27 @@ temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; + *) xrpath="$xrpath $temp_xrpath";; esac;; - *) func_append temp_deplibs " $libdir";; + *) temp_deplibs="$temp_deplibs $libdir";; esac done dependency_libs="$temp_deplibs" fi - func_append newlib_search_path " $absdir" + newlib_search_path="$newlib_search_path $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $func_resolve_sysroot_result" + tmp_libs="$tmp_libs $deplib" done if test "$link_all_deplibs" != no; then @@ -7039,10 +5900,8 @@ case $deplib in -L*) path="$deplib" ;; *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir=$func_dirname_result + dir="$func_dirname_result" # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -7069,8 +5928,8 @@ if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -7103,7 +5962,7 @@ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -7120,7 +5979,7 @@ for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; + *) lib_search_path="$lib_search_path $dir" ;; esac done newlib_search_path= @@ -7178,10 +6037,10 @@ -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -7197,7 +6056,7 @@ ;; esac if test -n "$i" ; then - func_append tmp_libs " $i" + tmp_libs="$tmp_libs $i" fi done dependency_libs=$tmp_libs @@ -7238,7 +6097,7 @@ # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - func_append objs "$old_deplibs" + objs="$objs$old_deplibs" ;; lib) @@ -7271,10 +6130,10 @@ if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" + libobjs="$libobjs $objs" fi fi @@ -7333,14 +6192,13 @@ # which has an extra 1 added just for fun # case $version_type in - # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|qnx|sunos) + freebsd-aout|freebsd-elf|sunos) current="$number_major" revision="$number_minor" age="0" @@ -7453,7 +6311,7 @@ versuffix="$major.$revision" ;; - linux) # correct to gnu/linux during the next big refactor + linux) func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -7476,7 +6334,7 @@ done # Make executables depend on our current version. - func_append verstring ":${current}.0" + verstring="$verstring:${current}.0" ;; qnx) @@ -7544,10 +6402,10 @@ fi func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" + libobjs="$libobjs $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$opt_mode" != relink; then + if test "$mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7563,7 +6421,7 @@ continue fi fi - func_append removelist " $p" + removelist="$removelist $p" ;; *) ;; esac @@ -7574,28 +6432,27 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" + oldlibs="$oldlibs $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" + temp_xrpath="$temp_xrpath -R$libdir" case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -7609,7 +6466,7 @@ for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; + *) dlfiles="$dlfiles $lib" ;; esac done @@ -7619,19 +6476,19 @@ for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; + *) dlprefiles="$dlprefiles $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -7648,7 +6505,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" + deplibs="$deplibs -lc" fi ;; esac @@ -7697,7 +6554,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7708,21 +6565,21 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which I believe you do not have" - echo "*** because a test_compile did reveal that the linker did not use it for" - echo "*** its dynamic dependency list that programs get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which I believe you do not have" + $ECHO "*** because a test_compile did reveal that the linker did not use it for" + $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7740,7 +6597,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7751,29 +6608,29 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because a test_compile did reveal that the linker did not use this one" - echo "*** as a dynamic dependency that programs can get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because a test_compile did reveal that the linker did not use this one" + $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - echo "*** make it link in! You will probably need to install it or some" - echo "*** library that it depends on before this library will be fully" - echo "*** functional. Installing it before continuing would be even better." + $ECHO "*** make it link in! You will probably need to install it or some" + $ECHO "*** library that it depends on before this library will be fully" + $ECHO "*** functional. Installing it before continuing would be even better." fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7790,27 +6647,15 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` - if test -n "$file_magic_glob"; then - libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` - else - libnameglob=$libname - fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then - shopt -s nocaseglob - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7827,13 +6672,13 @@ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7842,12 +6687,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -7858,7 +6703,7 @@ ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. @@ -7874,7 +6719,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac @@ -7885,9 +6730,9 @@ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7896,12 +6741,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -7912,32 +6757,32 @@ ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` done fi - case $tmp_deplibs in - *[!\ \ ]*) - echo + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." else - echo "*** Warning: inter-library dependencies are not known to be supported." + $ECHO "*** Warning: inter-library dependencies are not known to be supported." fi - echo "*** All declared inter-library dependencies are being dropped." + $ECHO "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - ;; - esac + fi ;; esac versuffix=$versuffix_save @@ -7949,23 +6794,23 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO + $ECHO "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." + $ECHO "*** a static module, that should work as long as the dlopening" + $ECHO "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -7975,16 +6820,16 @@ build_libtool_libs=no fi else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." + $ECHO "*** The inter-library dependencies that have been dropped here will be" + $ECHO "*** automatically added whenever a program is linked with this library" + $ECHO "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." + $ECHO + $ECHO "*** Since this library must not contain undefined symbols," + $ECHO "*** because either the platform does not support them or" + $ECHO "*** it was explicitly requested with -no-undefined," + $ECHO "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -8001,9 +6846,9 @@ # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8016,7 +6861,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8026,10 +6871,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done deplibs="$new_libs" @@ -8041,22 +6886,15 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -8065,18 +6903,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" + dep_rpath="$dep_rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi done @@ -8084,13 +6922,17 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -8098,7 +6940,7 @@ fi shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8124,18 +6966,18 @@ linknames= for link do - func_append linknames " $link" + linknames="$linknames $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" + delfiles="$delfiles $export_symbols" fi orig_export_symbols= @@ -8166,45 +7008,13 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do + for cmd in $cmds; do IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" + eval cmd=\"$cmd\" + func_len " $cmd" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -8226,7 +7036,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -8238,7 +7048,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8248,7 +7058,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - func_append tmp_deplibs " $test_deplib" + tmp_deplibs="$tmp_deplibs $test_deplib" ;; esac done @@ -8268,21 +7078,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" + linker_flags="$linker_flags $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -8327,8 +7137,7 @@ save_libobjs=$libobjs fi save_output=$output - func_basename "$output" - output_la=$func_basename_result + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -8341,16 +7150,13 @@ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output + $ECHO 'INPUT (' > $output for obj in $save_libobjs do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result + $ECHO ')' >> $output + delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -8364,12 +7170,10 @@ fi for obj do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -8393,19 +7197,17 @@ # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" else # All subsequent reloadable object files will link in # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" + objlist=$obj func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -8415,12 +7217,11 @@ # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - func_append delfiles " $output" + delfiles="$delfiles $output" else output= @@ -8454,7 +7255,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8475,7 +7276,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -8487,7 +7288,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8528,10 +7329,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -8547,7 +7348,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8559,7 +7360,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8640,21 +7441,18 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -8714,8 +7512,8 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac @@ -8726,14 +7524,14 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8747,7 +7545,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8757,17 +7555,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done compile_deplibs="$new_libs" - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -8775,7 +7573,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done fi @@ -8794,18 +7592,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi case $host in @@ -8814,12 +7612,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; + *) dllsearchpath="$dllsearchpath:$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -8845,18 +7643,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; esac fi done @@ -8870,8 +7668,8 @@ if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -8883,15 +7681,15 @@ wrappers_required=yes case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -8900,19 +7698,13 @@ esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8935,7 +7727,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8943,7 +7735,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8953,18 +7745,11 @@ # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - exit $EXIT_SUCCESS fi @@ -8979,7 +7764,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -8991,19 +7776,13 @@ fi # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Now create the wrapper script. func_verbose "creating $output" @@ -9021,7 +7800,18 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi + + # Quote $ECHO for shipping. + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -9101,7 +7891,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" + oldobjs="$oldobjs $symfileobj" fi fi addlibs="$old_convenience" @@ -9109,10 +7899,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. @@ -9123,10 +7913,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -9142,9 +7932,9 @@ done | sort | sort -uc >/dev/null 2>&1); then : else - echo "copying selected object files to avoid basename conflicts..." + $ECHO "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -9168,30 +7958,18 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" ;; - *) func_append oldobjs " $obj" ;; + *) oldobjs="$oldobjs $obj" ;; esac done fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -9265,7 +8043,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -9285,23 +8063,12 @@ *.la) func_basename "$deplib" name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" + newdependency_libs="$newdependency_libs $libdir/$name" ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -9315,9 +8082,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + newdlfiles="$newdlfiles $libdir/$name" ;; - *) func_append newdlfiles " $lib" ;; + *) newdlfiles="$newdlfiles $lib" ;; esac done dlfiles="$newdlfiles" @@ -9334,7 +8101,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + newdlprefiles="$newdlprefiles $libdir/$name" ;; esac done @@ -9346,7 +8113,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlfiles " $abs" + newdlfiles="$newdlfiles $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -9355,33 +8122,15 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlprefiles " $abs" + newdlprefiles="$newdlprefiles $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -9440,7 +8189,7 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && +{ test "$mode" = link || test "$mode" = relink; } && func_mode_link ${1+"$@"} @@ -9460,9 +8209,9 @@ for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; + *) files="$files $arg" ;; esac done @@ -9471,23 +8220,24 @@ rmdirs= + origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - odir="$objdir" + objdir="$origobjdir" else - odir="$dir/$objdir" + objdir="$dir/$origobjdir" fi func_basename "$file" name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + test "$mode" = uninstall && objdir="$dir" - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + # Remember objdir for removal later, being careful to avoid duplicates + if test "$mode" = clean; then case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; + *" $objdir "*) ;; + *) rmdirs="$rmdirs $objdir" ;; esac fi @@ -9513,17 +8263,18 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - func_append rmfiles " $odir/$n" + rmfiles="$rmfiles $objdir/$n" done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - case "$opt_mode" in + case "$mode" in clean) - case " $library_names " in + case " $library_names " in + # " " in the beginning catches empty $dlname *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -9551,19 +8302,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" + rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" + rmfiles="$rmfiles $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test "$mode" = clean ; then noexename=$name case $file in *.exe) @@ -9573,7 +8324,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - func_append rmfiles " $file" + rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. @@ -9582,7 +8333,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -9590,12 +8341,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" + rmfiles="$rmfiles $objdir/lt-$name" fi if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + rmfiles="$rmfiles $objdir/lt-${noexename}.c" fi fi fi @@ -9603,6 +8354,7 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -9614,16 +8366,16 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && +{ test "$mode" = uninstall || test "$mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$opt_mode" && { +test -z "$mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -Nru lxappearance-0.5.2~ppa2/man/Makefile.am lxappearance-0.5.0/man/Makefile.am --- lxappearance-0.5.2~ppa2/man/Makefile.am 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/man/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -man_MANS = \ - lxappearance.1 - -man_XMANS = \ - lxappearance.xml - -EXTRA_DIST = \ - $(man_MANS) \ - $(man_XMANS) - - -if ENABLE_MAN - -lxappearance.1: lxappearance.xml - $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -CLEANFILES = $(man_MANS) -else - -$(man_MANS): - @echo "" - @echo "Warning: you need to run configure with '--enable-man'" - @echo " in order to regenerate man pages." - @echo "" -endif diff -Nru lxappearance-0.5.2~ppa2/man/Makefile.in lxappearance-0.5.0/man/Makefile.in --- lxappearance-0.5.2~ppa2/man/Makefile.in 2012-05-20 14:36:36.000000000 +0000 +++ lxappearance-0.5.0/man/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,478 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" -NROFF = nroff -MANS = $(man_MANS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -XLIB_CFLAGS = @XLIB_CFLAGS@ -XLIB_LIBS = @XLIB_LIBS@ -XMLCATALOG = @XMLCATALOG@ -XML_CATALOG_FILE = @XML_CATALOG_FILE@ -XSLTPROC = @XSLTPROC@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -man_MANS = \ - lxappearance.1 - -man_XMANS = \ - lxappearance.xml - -EXTRA_DIST = \ - $(man_MANS) \ - $(man_XMANS) - -@ENABLE_MAN_TRUE@CLEANFILES = $(man_MANS) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign man/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-man1: $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ - done; } - -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(man1dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(MANS) -installdirs: - for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-man - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: install-man1 - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-man - -uninstall-man: uninstall-man1 - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-man uninstall-man1 - - -@ENABLE_MAN_TRUE@lxappearance.1: lxappearance.xml -@ENABLE_MAN_TRUE@ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -@ENABLE_MAN_FALSE@$(man_MANS): -@ENABLE_MAN_FALSE@ @echo "" -@ENABLE_MAN_FALSE@ @echo "Warning: you need to run configure with '--enable-man'" -@ENABLE_MAN_FALSE@ @echo " in order to regenerate man pages." -@ENABLE_MAN_FALSE@ @echo "" - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru lxappearance-0.5.2~ppa2/man/lxappearance.1 lxappearance-0.5.0/man/lxappearance.1 --- lxappearance-0.5.2~ppa2/man/lxappearance.1 2012-05-20 14:36:57.000000000 +0000 +++ lxappearance-0.5.0/man/lxappearance.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -'\" t -.\" Title: LXAPPEARANCE -.\" Author: Ying-Chun Liu -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: April 20, 2008 -.\" Manual: http://LXDE.org -.\" Source: http://LXDE.org -.\" Language: English -.\" -.TH "LXAPPEARANCE" "1" "April 20, 2008" "http://LXDE\&.org" "http://LXDE.org" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -lxappearance \- GTK+ theme switcher -.SH "SYNOPSIS" -.HP \w'\fBlxappearance\fR\ 'u -\fBlxappearance\fR -.SH "DESCRIPTION" -.PP -This manual page documents briefly the -\fBlxappearance\fR -command\&. -.PP -\fBlxappearance\fR -is a program to change GTK+ themes, icon themes, and fonts used by applications\&. It is a feature\-rich GTK+ theme switcher\&. -.SH "AUTHOR" -.PP -This manual page was written by paulliu -grandpaul@gmail\&.com -for the -Debian -system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the -GNU -General Public License, Version 2 any later version published by the Free Software Foundation\&. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&. -.PP -The source code of this manual page should be in -\&.sgml -format\&. It is better not to modify the -\&.1 -file directly\&. -.SH "AUTHOR" -.PP -\fBYing\-Chun Liu\fR -.RS 4 -Author. -.RE -.SH "COPYRIGHT" -.br -Copyright \(co 2008 paulliu -.br diff -Nru lxappearance-0.5.2~ppa2/man/lxappearance.xml lxappearance-0.5.0/man/lxappearance.xml --- lxappearance-0.5.2~ppa2/man/lxappearance.xml 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/man/lxappearance.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ - -
grandpaul@gmail.com -
- Ying-Chun - Liu - - 2008 - paulliu - - April 20, 2008 - - LXAPPEARANCE -http://LXDE.org - - 1 - - lxappearance - - GTK+ theme switcher - - lxappearance - - - DESCRIPTION - - This manual page documents briefly the - lxappearance command. - - lxappearance is a program to change - GTK+ themes, icon themes, and fonts used by applications. It is a - feature-rich GTK+ theme switcher. - - - - - AUTHOR - - This manual page was written by paulliu grandpaul@gmail.com for - the Debian system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the GNU General Public License, Version 2 any - later version published by the Free Software Foundation. - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - The source code of this manual page should be in - .sgml format. It is better not to modify - the .1 file directly. - - - diff -Nru lxappearance-0.5.2~ppa2/missing lxappearance-0.5.0/missing --- lxappearance-0.5.2~ppa2/missing 2012-05-20 14:29:41.000000000 +0000 +++ lxappearance-0.5.0/missing 2010-08-06 08:01:50.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -121,6 +122,15 @@ # Not GNU programs, they don't have --version. ;; + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -216,7 +226,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -246,7 +256,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -308,6 +318,41 @@ touch $file ;; + tar*) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru lxappearance-0.5.2~ppa2/po/LINGUAS lxappearance-0.5.0/po/LINGUAS --- lxappearance-0.5.2~ppa2/po/LINGUAS 2012-05-20 14:36:48.000000000 +0000 +++ lxappearance-0.5.0/po/LINGUAS 2010-10-12 15:20:58.000000000 +0000 @@ -1,44 +1,25 @@ -ar -be -bg -cs da de el en_GB es -et fa -fi fo fr gl he -hr hu id it ja -kk -ko -lg -lt -nl pa -pl pt pt_BR -ro ru -sl sr sr@latin sv -te tr -tt_RU -ug uk vi -zh_CN zh_TW diff -Nru lxappearance-0.5.2~ppa2/po/Makefile.in.in lxappearance-0.5.0/po/Makefile.in.in --- lxappearance-0.5.2~ppa2/po/Makefile.in.in 2012-05-20 14:36:35.000000000 +0000 +++ lxappearance-0.5.0/po/Makefile.in.in 2010-10-12 15:20:50.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,20 +73,15 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) -INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) -INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; - .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< + $(MSGFMT) -o $@ $< .po.gmo: - $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ + file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru lxappearance-0.5.2~ppa2/po/POTFILES.in lxappearance-0.5.0/po/POTFILES.in --- lxappearance-0.5.2~ppa2/po/POTFILES.in 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/po/POTFILES.in 2010-08-07 16:23:02.000000000 +0000 @@ -1,6 +1,6 @@ # List of source files containing translatable strings. data/lxappearance.desktop.in -[type: gettext/glade]data/ui/about.ui.in -[type: gettext/glade]data/ui/lxappearance.ui +data/ui/about.glade.in +data/ui/lxappearance.glade src/utils.c diff -Nru lxappearance-0.5.2~ppa2/po/ar.po lxappearance-0.5.0/po/ar.po --- lxappearance-0.5.2~ppa2/po/ar.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/ar.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,322 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-02-24 23:52+0200\n" -"Last-Translator: كريم \n" -"Language-Team: LANGUAGE \n" -"Language: ar\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "تخصيص المظهر و الإحساس" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "تخصيصات مظهر وإحساس سطح مكتبك وتطبيقاته" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "حقوق النشر (C) 2011 مشروع LXDE" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "تخصيصات مظهر وإحساس سطح مكتبك" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Karim Oulad Chalha " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "أيقونات فقط" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "النص فقط" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "النص تحت الأيقونات" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "النص بجانب الأيقونات" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "نفس عناصر القائمة" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "أيقونات شريط الأدوات صغيرة" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "أيقونات شريط الأدوات كبيرة" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "نفس الأزرار" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "نفس أيقونات السحب" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "نفس الحوارات" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "بدون" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "قليل" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "متوسطة" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "كامل" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "أحمر أخضر أزرق" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "أزرق أخضر أحمر" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "معاينة سمة نمط القطع المحدد" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_ملف" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_تحرير" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_مساعدة" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "زر راديو" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "زر تحول" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "زر" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "العينة" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "صفحة1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "صفحة2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "الخط الإفتراضي:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "قطعة" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "مخطط الألوان غير مدعوم من طرف السمة المحددة حاليا." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "استخدام مخطط ألوان مخصص" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "نوافذ عادية:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "نص النوافذ:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "العناصر المحددة:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "التلميحات:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "الخلفية" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "المقدمة" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "اللون" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "تثبيت" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "إزالة" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "معاينة سمة الأيقونات المحددة" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "سِمة الأيقونات" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "معاينة سمة المؤشر المحددة" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "حجم المؤشر" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "أصغر" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "أكبر" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"ملحوظة لا تدعم كل تطبيقات سطح المكتب سمة المؤشر عنذ التحليق. لذلك " -"فإنه لن يتم تطبيق جميع إختيارات إلى بعد الولوج التالي." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "مؤشر الفأرة" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "حدود النافذة" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "تمكين مضاد التعرجات" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "مضاد التعرج" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "تمكين التلميحات" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "أسلوب التلميح:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "التلميحات" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Sub-pixel geometry: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Sub-pixel geometry" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "الخط" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "نمط شريط الأدوات:" - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "حجم أيقونة شريط الأدوات:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "إظهار الصور في الأزرار" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "إظهار الصور في القوائم" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "خيارات الواجهة" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "تشغيل أصوات الأحداث" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "تشغيل أصوات الأحداث كرد فعل على إدخال المستخدم" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "المؤثرات الصوتية" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "أخرى" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "حدد سمة أيقونات" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (سمة الأيقونات)" diff -Nru lxappearance-0.5.2~ppa2/po/be.po lxappearance-0.5.0/po/be.po --- lxappearance-0.5.2~ppa2/po/be.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/be.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,324 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-08-07 16:58+0200\n" -"Last-Translator: Мікалай \n" -"Language-Team: LANGUAGE \n" -"Language: be\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Настаўленні выгляду" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Змяніць выгляд працоўнага асяроддзя і праграмм" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Аўтарскае права (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Змяніць выгляд працоўнай прасторы" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "" -"Анік Кіна \n" -"Мікалай Удодаў , 2011." - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Толькі значкі" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Толькі подпісы" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Подпісы пад значкамі" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Подпісы побач са значкамі" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Як элементы меню" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Малыя значкі" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Вялікія значкі" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Гэтак жа, як кнопкі" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Гэтак жа, як значкоў перацягвання" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Гэтак жа, як дыялогі" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Няма" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Злёгку" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Сярэдні" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Поўны" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Прагляд выбранай тэмы віджэтаў" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "Ф_айл" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Рэдагаваць" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Даведка" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Пераключальнік выбару" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Праверыць кнопкі" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "кнопка" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Дэма" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Стар1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Стар2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Прадвызначаны шрыфт:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Віджэт" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Колеравая схема не падтрымана выбранай тэмай віджэтаў." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Ужываць уласную схему колераў" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Звычайныя вокны:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Тэкставае поле:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Выбраны элемент:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Падказкі:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Шпалеры" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Пярэдні план" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Колер" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Устанавіць" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Сцерці" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Прагляд выбранай тэмы значкоў" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Тэма значкоў" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Прагляд выбранай тэмы курсора" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Памер курсора" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Меншы" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Буйны" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Заўвага: Не ўсе праграмы падтрымліваюць змяненне курсора \"на ляту\". " -"Цалкам змены набудуць моц пасля наступнага ўваходу ў сістэму." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Курсор мышы" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Абрамленне акна" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Уключыць згладжванне" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Згладжванне" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Уключыць хінтынг" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Стыль хінтынгу: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Хінтынг" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Суб-пікельная геаметрыя: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Суб-піксельная геаметрыя" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Шрыфт" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Стыль панэлі інструментаў: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Памер значкоў панэлі інструментаў: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Паказваць значкі на кнопках" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Паказваць значкі ў меню" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Опцыі графічнай абалонкі" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Прайграваць гукі дзеянняў" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Прайграваць гукі ў адказ на карыстальніцкі ўвод" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Гукавы эфект" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Іншыя" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Выберыце тэму значкоў" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (тэмы значкоў)" diff -Nru lxappearance-0.5.2~ppa2/po/bg.po lxappearance-0.5.0/po/bg.po --- lxappearance-0.5.2~ppa2/po/bg.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/bg.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,322 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-12-31 23:37+0200\n" -"Last-Translator: Радослав \n" -"Language-Team: LANGUAGE \n" -"Language: bg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Персонализиране на Външния вид" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Персонализирайте Външният вид на вашия работен плот и приложения" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright © 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Персонализирайте външният вид на вашия работен плот" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Радослав Иванов" - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Само икони" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Само текст" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Текст под иконите" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Текст зад иконите" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Като елементите на менюто" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Малки икони в лентата с инструментите" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Големи икони в лентата с инструменти" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Като бутоните" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Като влачените икони" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Като диалозите" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Няма" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Тънък" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Средно" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Пълен" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "Основни цветове" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "Основни цветове" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "Вертикално: червено, зелено, синьо" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "Вертикално: синьо, зелено, червено" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Преглед на израният стил за джаджите" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Файл" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Редактиране" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Помощ" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Бутон за единичен избор" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Провери бутона" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "бутон" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Демонстрация" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Страница 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Страница 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Шрифт по подразбиране:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Джаджа" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Цветовата схема засега не се поддържа от избраната тема за джаджи." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Използвай персонализирана цветова схема:" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Нормални прозорци:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Текстови прозорци:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Избрани елементи:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Подсказки:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Среда" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Отпред" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Цвят" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Инсталиране" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Премахни" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Преглед на маркираната тема за иконите" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Тема за икони" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Преглед на маркираната тема за курсора" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Размер на курсорите" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "По-малки" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "По-голям" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Бележка: Невсички от приложенията поддържат опресняване на " -"курсоровата тема. Така че промените, може да не са меродавно приложени... до " -"следващото вписване." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Курсор на мишката" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Рамка на прозорците" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Позволи заглаждане" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Заглаждане" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Позволи подсказване" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Стил на подсказката" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Подсказване" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Форма на подпикселите:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Форма на подпикселите" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Шрифт" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Стил на панела с инструментите:" - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Размер на иконите в панела с инструментите:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Показвай образи на бутоните" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Показвай образи в менютата" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Опции на графическия интерфейс" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Изпълнявай сигнализиращи звукове" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Изпълнявай сигнализиращи звукове според набраните комбинации" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Звуков Ефект" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Други" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Изберете тема за иконите" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Тема за икони)" diff -Nru lxappearance-0.5.2~ppa2/po/cs.po lxappearance-0.5.0/po/cs.po --- lxappearance-0.5.2~ppa2/po/cs.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/cs.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,329 +0,0 @@ -# Czech translation for LXAppearance package. -# Copyright (C) 2010 -# This file is distributed under the same license as the LXAppearance package. -# Radek Tříška , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: LXAppearance\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2010-11-01 23:51+0100\n" -"Last-Translator: Radek Tříška \n" -"Language-Team: Czech \n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Upravit vzhled a chování" - -#: ../data/lxappearance.desktop.in.h:2 -#, fuzzy -msgid "Customizes look and feel of your desktop and applications" -msgstr "Upraví vzhled a chování vašeho pracovního prostředí a aplikací" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -#, fuzzy -msgid "Customizes look and feel of your desktop" -msgstr "Upraví vzhled a chování vašeho pracovního prostředí" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Radek Tříška (radek@fastlinux.eu)" - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Pouze ikony" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Pouze text" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Text pod ikonami" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Text vedle ikon" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Stejné jako položky nabídek" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Malé ikony panelu nástrojů" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Velké ikony panelu nástrojů" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Stejné jako tlačítka" - -#: ../data/ui/lxappearance.ui.h:9 -#, fuzzy -msgid "Same as drag icons" -msgstr "Stejné jako přetahované ikony" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Stejné jako dialogy" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Náhled vybraného widget motivu" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Soubor" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Upravit" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Nápověda" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Přepínací tlačítko" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Zaškrtávací tlačítko" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "tlačítko" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Karta1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Karta2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Výchozí písmo:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Barevné schéma není podporováno u aktuálně vybraného widget motivu." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Použít vlastní barevné schéma" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normální okna:" - -#: ../data/ui/lxappearance.ui.h:35 -#, fuzzy -msgid "Text windows:" -msgstr "Textová okna:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Vybrané položky:" - -#: ../data/ui/lxappearance.ui.h:37 -#, fuzzy -msgid "Tooltips:" -msgstr "Bublinková nápověda:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Pozadí" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Popředí" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Barva" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instalovat" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Odstranit" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Náhled vybraného motivu ikon" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Motiv ikon" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Náhled vybraného motivu kurzoru" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Velikost kurzoru" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Menší" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Větší" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Poznámka: Některé aplikace nepodporují změnu tématu kurzoru za chodu. " -"Pro správnou funkčnost všech aplikací je potřeba opětovný login. " - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Kurzor myši" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Okraj okna" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" - -#: ../data/ui/lxappearance.ui.h:56 -#, fuzzy -msgid "Hinting" -msgstr "Volby GUI" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:60 -#, fuzzy -msgid "Toolbar Style: " -msgstr "Styl panelu nástrojů:" - -#: ../data/ui/lxappearance.ui.h:61 -#, fuzzy -msgid "Toolbar Icon Size: " -msgstr "Velikost ikon panelu nástrojů:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Zobrazovat obrázky na tlačítkách" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Zobrazovat obrázky v nabídkách" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Volby GUI" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Přehrávání zvuků při událostech" - -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "Přehrávání zvuků při událostech jako zpětnou vazbu uživatelova vstupu" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Zvukový efekt" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Ostatní" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Vyberte motiv ikon" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Motiv ikon)" diff -Nru lxappearance-0.5.2~ppa2/po/da.po lxappearance-0.5.0/po/da.po --- lxappearance-0.5.2~ppa2/po/da.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/da.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-12-27 13:37+0200\n" -"Last-Translator: mjjzf \n" -"Language: da\n" +"POT-Creation-Date: 2010-10-03 05:58+0000\n" +"PO-Revision-Date: 2010-10-03 10:15+0200\n" +"Last-Translator: Joe Hansen " +"Language-Team: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 1.1.0\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Tilpas udseende" @@ -25,16 +24,16 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Tilpas skrivebordets udseende og programmer" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Ophavsret 2011 LXDE-projektet" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Ophavsret 2010 LXDE-projektet" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Tilpas skrivebordets udseende" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "" "Joe Hansen, 2010.\n" @@ -42,285 +41,222 @@ "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Kun ikoner" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Kun tekst" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Indstillinger for grafisk brugergrænseflade" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekst under ikonerne" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Bemærk: Ikke alle skrivebordsprogrammer understøtter ændring af " +"løbende markørændring. Så dine ændringer her er måske ikke fuldt brugbare " +"for alle programmer før næste logind." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekst ved siden af ikonerne" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Lydeffekt" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Som menupunkter" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Baggrund" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Små værktøjsbjælkeikoner" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Større" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Store værktøjsbjælkeikoner" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Tjekknap" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Som knapper" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Farve" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Som trækkede ikoner" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Farveskema er ikke understøttet af aktuelt valgt kontroltema." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Som dialoger" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Standardskrift:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Ingen" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Lille" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Medium" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Fuld" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Forhåndsvisning af den valgte kontrolstil" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Forgrund" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fil" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Ikontema" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Rediger" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Kun ikoner" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Hjælp" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Installer" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Radioknap" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Store værktøjsbjælkeikoner" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Tjekknap" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Musemarkør" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "knap" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Normale vinduer:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Andet" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Side1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Side2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Standardskrift:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Kontrol" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Farveskema er ikke understøttet af aktuelt valgt kontroltema." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Brug tilpasset farveskema" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Afspil påmindelseslyde" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normale vinduer:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Forhåndsvisning af det valgte markørtema" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Tekstvinduer:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Forhåndsvisning af det valgte ikontema" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Valgte punkter:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Forhåndsvisning af den valgte kontrolstil" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Værktøjsfif:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Radioknap" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Baggrund" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Fjern" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Forgrund" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Som knapper" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Farve" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Som dialoger" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Installer" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Som trækkede ikoner" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Fjern" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Som menupunkter" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Forhåndsvisning af det valgte ikontema" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Valgte punkter:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Ikontema" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Vis billeder i menuer" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Forhåndsvisning af det valgte markørtema" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Vis billeder på knapper" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Størrelse på markører" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Små værktøjsbjælkeikoner" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Mindre" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Større" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Tekst under ikonerne" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Bemærk: Ikke alle skrivebordsprogrammer understøtter ændring af " -"løbende markørændring. Så dine ændringer her er måske ikke fuldt brugbare " -"for alle programmer før næste logind." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Tekst ved siden af ikonerne" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Musemarkør" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Kun tekst" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Vinduegrænse" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Tekstvinduer:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Aktivér antialiasing" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialias" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Aktiver hinting" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Hintingtype:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Sub-pixel geometri" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Sub-pixel-geometri" - -# could also be "font", actually... However, "Skrifttype" is a native Danish word and should be understood by all... -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Skrifttype" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Størrelse på værktøjsbjælkeikoner: " -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " -msgstr "Værktøjsbjælkens Stil:" +msgstr "Stil for værktøjsbjælke: " -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Størrelse på værktøjsbjælkens ikoner: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Værktøjsfif:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Vis billeder på knapper" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Brug tilpasset farveskema" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Vis billeder i menuer" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Kontrol" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Indstillinger for grafisk brugergrænseflade" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Vinduegrænse" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Afspil påmindelseslyde" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Rediger" + +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Fil" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Afspil lyde som tilbagemelding på brugerinput" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Hjælp" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Lydeffekt" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "knap" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Andet" +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "afspil påmindelseslyde som tilbagemelding på brugerinddata" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Vælg ikontema" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ikontema)" + + diff -Nru lxappearance-0.5.2~ppa2/po/de.po lxappearance-0.5.0/po/de.po --- lxappearance-0.5.2~ppa2/po/de.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/de.po 2010-10-06 17:05:53.000000000 +0000 @@ -7,19 +7,16 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-03-05 01:16+0200\n" -"Last-Translator: Christoph \n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-13 17:51+0100\n" +"Last-Translator: Lutz Thuns \n" "Language-Team: Deutsch \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: German\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Erscheinungsbild anpassen" @@ -27,300 +24,236 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Das Erscheinungsbild Ihrer Arbeitsumgebung und Anwendungen anpassen" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Projekt" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Projekt" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Passt das Erscheinungsbild Ihrer Arbeitsumgebung an" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "" "Christoph Wickert \n" "Lutz Thuns " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Nur Symbole" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Nur Text" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Oberfläche" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Text unter Symbolen" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Hinweis: Nicht alle Desktop-Anwendungen unterstützen das sofortige " +"Ändern des Mauszeigers. Ihre Einstellungen könnten bis zur nächsten " +"Anmeldung nicht vollständig für alle Anwendungen übernommen werden." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Text neben Symbolen" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Akustische Signale" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Wie in Menüs" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Hintergrund" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Kleine Symbole" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Größer" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Große Symbole" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Ankreuzfeld" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Wie auf Knöpfen" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Farben" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Wie Symbole der Anfasser" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Farbschemata werden vom momentan gewählten Thema nicht unterstützt." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Wie in Dialogen" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Schrift:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Keine" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Leicht" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Mittel" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Vollständig" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "senkrechtes RGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "senkrechtes BGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Vorschau des ausgewählten Themas" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Vordergrund" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Datei" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Symbolthema" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Bearbeiten" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Nur Symbole" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Hilfe" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Installieren" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Auswahlknopf" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Große Symbole" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Ankreuzfeld" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Mauszeiger" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "Knopf" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Normale Fenster:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Andere" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Reiter1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Reiter2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Schrift:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Fenster" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Farbschemata werden vom momentan gewählten Thema nicht unterstützt." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Akustische Signale wiedergeben" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Angepasstes Farbschema benutzen" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "Akustische Signale als Rückmeldung für Benutzereingaben wiedergeben" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normale Fenster:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Vorschau des ausgewählten Mauszeigerthemas" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Fenstertext:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Vorschau des ausgewählten Symbolthemas" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Ausgewählte Elemente:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Vorschau des ausgewählten Themas" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Minihilfe:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Auswahlknopf" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Hintergrund" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Entfernen" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Vordergrund" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "Wie auf Knöpfen" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Farben" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "Wie in Dialogen" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Installieren" +#: ../data/ui/lxappearance.glade.h:31 +#, fuzzy +msgid "Same as drag icons" +msgstr "Wie in Anfassern" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Entfernen" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "Wie in Menüs" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Vorschau des ausgewählten Symbolthemas" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Ausgewählte Elemente:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Symbolthema" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Symbole in Menüs anzeigen" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Vorschau des ausgewählten Mauszeigerthemas" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Symbole auf Knöpfen anzeigen" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Größe des Mauszeigers" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Kleine Symbole" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Kleiner" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Größer" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Text unter Symbolen" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Hinweis: Nicht alle Desktop-Anwendungen unterstützen das sofortige " -"Ändern des Mauszeigers. Ihre Einstellungen könnten bis zur nächsten " -"Anmeldung nicht vollständig für alle Anwendungen übernommen werden." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Text neben Symbolen" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Mauszeiger" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Nur Text" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Fensterrahmen" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Fenstertext:" -# oder "aktivieren"? -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Kantenglättung verwenden" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Kantenglättung" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Sub-Pixel-Hinting verwenden" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Hinting-Stil:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Sub-Pixel-Geometrie:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Subpixel-Geometrie" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Schrift" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Symbolgröße der Werkzeugleiste:" -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "Stil der Werkzeugleiste:" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Symbolgröße der Werkzeugleiste:" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Minihilfe:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Symbole auf Knöpfen anzeigen" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Angepasstes Farbschema benutzen" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Symbole in Menüs anzeigen" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Fenster" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Oberfläche" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Fensterrahmen" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Akustische Signale wiedergeben" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Bearbeiten" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Akustische Signale als Rückmeldung für Benutzereingaben wiedergeben" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Datei" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Akustische Signale" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Hilfe" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Andere" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "Knopf" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Symbolthema wählen" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Symbolthema)" diff -Nru lxappearance-0.5.2~ppa2/po/el.po lxappearance-0.5.0/po/el.po --- lxappearance-0.5.2~ppa2/po/el.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/el.po 2010-10-06 16:55:34.000000000 +0000 @@ -1,323 +1,249 @@ -# +# msgid "" msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-24 14:43+0200\n" -"Last-Translator: George \n" +"POT-Creation-Date: 2010-09-14 05:43+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: George Vasilakos \n" "Language-Team: Greek\n" -"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: GREECE\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" -msgstr "Προσαρμογή εμφάνισης και αισθητικής" +msgstr "Προσαρμόστε την εμφάνιση και αίσθηση" #: ../data/lxappearance.desktop.in.h:2 msgid "Customizes look and feel of your desktop and applications" -msgstr "" -"Προσαρμογή εμφάνισης και αισθητικής της επιφάνειας εργασίας και των " -"εφαρμογών σας" +msgstr "Προσαρμόζει την εμφάνιση και την αίσθηση της επιφάνειας εργασίας και των εφαρμογών σας" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" -msgstr "Προσαρμογή εμφάνισης και αισθητικής της επιφάνειας εργασίας " +msgstr "Προσαρμόζει την εμφάνιση και την αίσθηση της επιφάνειας εργασίας" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Βασιλάκος Γεώργιος " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Μόνο εικονίδια" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Μόνο κείμενο" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Επιλογές διεπαφής" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Κείμενο κάτω από τις εικόνες" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Σημείωση: Δεν υποστηρίζουν όλες οι εφαρμογές την άμεση αλλαγή θέματος του δρομέα. Έτσι, οι αλλαγές σας μπορεί να μην εφαρμοστούν πλήρως μέχρι την επόμενη σύνδεση." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Κείμενο πάνω από τις εικόνες" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Ηχητικά εφέ" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Ίδιο με αντικείμενα του μενού" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Παρασκήνιο" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Μικρά εικονίδια στη γραμμή εργαλείων" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Μεγαλύτερο" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Μεγάλα εικονίδια στη γραμμή εργαλείων" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Κουμπί επιλογής" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Ίδιο με κουμπιά" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Χρώμα" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Ίδιο με συρόμενα εικονίδια" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Ο συνδυασμός χρωμάτων δεν υποστηρίζεται από το επιλεγμένο θέμα widget." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Ίδιο με διαλόγους" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Προεπιλεγμένη γραμματοσειρά:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Κανένα" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Ελαφρά" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Μεσαίο" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Γεμάτο" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Δοκιμή" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Προεπισκόπηση του επιλεγμένου στυλ γραφικών συστατικών" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Προσκήνιο" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Αρχείο" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Θέματα εικονιδίων" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Επεξεργασία" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Εικονίδια μόνο" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Βοήθεια" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Εγκατάσταση" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Κουμπί επιλογής" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Μεγάλα εικονίδια στη γραμμή εργαλείων" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Κουμπί επιλογής" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Δρομέας" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "κουμπί" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Κανονικά παράθυρα:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Δοκιμή" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Άλλο" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Σελίδα1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Σελίδα2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Προεπιλεγμένη γραμματοσειρά:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Ο συνδυασμός χρωμάτων δεν υποστηρίζεται από το επιλεγμένο θέμα widget." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Χρήση προσαρμοσμένων χρωμάτων" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Αναπαραγωγή ήχων σε γεγονότα" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Κανονικά παράθυρα:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Προεπισκόπηση του επιλεγμένου θέματος δρομεα" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Κείμενο παραθύρων:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Προεπισκόπηση του επιλεγμένου θέματος εικονιδίων" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Επιλεγμένα αντικείμενα:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Προεπισκόπηση του επιλεγμένου στυλ γραφικών συστατικών" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Συμβουλές:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Κουμπί επιλογής" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Παρασκήνιο" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Αφαίρεση" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Προσκήνιο" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Ίδιο με κουμπιά" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Χρώμα" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Ίδιο με διαλόγους" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Εγκατάσταση" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Ίδιο με συρόμενα εικονίδια" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Αφαίρεση" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Ίδιο με αντικείμενα του μενού" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Προεπισκόπηση του επιλεγμένου θέματος εικονιδίων" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Επιλεγμένα αντικείμενα:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Θέματα εικονιδίων" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Εμφάνιση εικόνων στα μενού" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Προεπισκόπηση του επιλεγμένου θέματος δρομεα" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Εμφάνιση εικόνων στα κουμπιά" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Μέγεθος δρομέα" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Μικρά εικονίδια στη γραμμή εργαλείων" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Μικρότερο" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Μεγαλύτερο" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Κείμενο κάτω από τις εικόνες" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Σημείωση: Δεν υποστηρίζουν όλες οι εφαρμογές την άμεση αλλαγή θέματος " -"του δρομέα. Έτσι, οι αλλαγές σας μπορεί να μην εφαρμοστούν πλήρως μέχρι την " -"επόμενη σύνδεση." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Κείμενο πάνω από τις εικόνες" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Δρομέας" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Μόνο κείμενο" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Πλαίσιο παραθύρου" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Κείμενο παραθύρων:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Ενεργοποίηση antialising" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialising" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Ενεργοποίηση υποδείξεων" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Στυλ υπόδειξης: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Υποδείξεις" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Γεωμετρία υπό-pixel: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Γεωμετρία υπο-pixel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Γραμματοσειρά" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Μέγεθος εικονιδίων γραμμής εργασιών:" -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " -msgstr "Στυλ μπάρας εργαλείων: " +msgstr "Στυλ γραμμής εργαλείων:" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Μέγεθος εικονιδίων μπάρας εργαλείων: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Συμβουλές:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Εμφάνιση εικόνων στα κουμπιά" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Χρήση προσαρμοσμένων χρωμάτων" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Εμφάνιση εικόνων στα μενού" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Επιλογές διεπαφής" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Πλαίσιο παραθύρου" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Αναπαραγωγή ήχων σε γεγονότα" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Επεξεργασία" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Αναπαραγωγή ήχων σε ενέργειες του χρήστη" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Αρχείο" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Ηχητικά εφέ" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Βοήθεια" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Άλλο" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "κουμπί" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "Αναπαραγωγή ήχων ως ανάδραση σε ενέργειες εισαγωγής του χρήστη " -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Επιλέξτε ένα θέμα εικονιδίων" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (θέμα εικονιδίων)" diff -Nru lxappearance-0.5.2~ppa2/po/en_GB.po lxappearance-0.5.0/po/en_GB.po --- lxappearance-0.5.2~ppa2/po/en_GB.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/en_GB.po 2010-10-06 16:55:34.000000000 +0000 @@ -2,25 +2,23 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-01-25 00:25+0200\n" -"Last-Translator: Steve \n" +"POT-Creation-Date: 2010-09-25 05:51+0000\n" +"PO-Revision-Date: 2010-09-04 17:42+0100\n" +"Last-Translator: Steve (Yorvyk) Cook \n" "Language-Team: en_GB \n" -"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Country: UNITED KINGDOM\n" +"Language: \n" "X-Poedit-Language: English\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Customise Look and Feel" @@ -28,297 +26,227 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Customises look and feel of your desktop and applications" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright © 2012 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright © 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Customises the look and feel of your desktop" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "translator-credits" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Icons only" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Text only" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "GUI Options" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Text below icons" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes, here, might not be fully applied to all applications until next login." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Text beside icons" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Sound Effect" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Same as menu items" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Background" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Small toolbar icon" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Larger" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Large toolbar icon" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Check Button" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Same as buttons" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Colour" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Same as drag icons" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Colour scheme is not supported by the current widget theme." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Same as dialogs" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Default Font Size" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "None" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Slight" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Medium" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Full" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Preview of the selected widget style" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Foreground" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_File" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Icon Theme" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Edit" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Icons only" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Help" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Install" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Radio Button" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Large toolbar icon" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Check Button" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Mouse Cursor" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "button" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Normal windows:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Other" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Page 1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Page 2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Default font:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Colour scheme is not supported by the current widget theme." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Use customised colour scheme" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Play event sounds" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normal windows:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Preview of the selected cursor theme" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Text windows:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Preview of the selected icon theme" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Selected items:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Preview of the selected widget style" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Tooltips:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Radio Button" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Background" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Remove" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Foreground" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Same as buttons" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Colour" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Same as dialogs" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Install" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Same as drag icons" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Remove" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Same as menu items" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Preview of the selected icon theme" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Selected items:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Icon Theme" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Show images in menus" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Preview of the selected cursor theme" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Show images on buttons" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Size of cursors" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Small toolbar icon" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Smaller" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Larger" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Text below icons" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Note: Not all desktop applications support changing the cursor theme " -"on-the-fly. So your changes, here, may not be fully applied to all " -"applications until next login." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Text beside icons" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Mouse Cursor" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Text only" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Window Border" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Text windows:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Enable anti-aliasing" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Anti-aliasing" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Enable hinting" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Hinting style: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Sub-pixel geometry: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Sub-pixel geometry" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Font" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Toolbar Icon Size: " -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "Toolbar Style: " -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Toolbar Icon Size: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Tooltips:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Show images on buttons" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Use customised colour scheme" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Show images in menus" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI Options" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Window Border" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Play event sounds" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Edit" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Play event sounds as feedback to user input" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_File" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Sound Effect" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Help" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Other" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "button" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "Play event sounds as feedback to user input" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Select an icon theme" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Icon Theme)" diff -Nru lxappearance-0.5.2~ppa2/po/es.po lxappearance-0.5.0/po/es.po --- lxappearance-0.5.2~ppa2/po/es.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/es.po 2010-10-06 17:05:28.000000000 +0000 @@ -7,18 +7,16 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-23 09:35+0200\n" -"Last-Translator: Hugo \n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-09 06:22-0500\n" +"Last-Translator: Hugo Florentino \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" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Personalizar apariencia y comportamiento" @@ -28,299 +26,235 @@ "Personaliza la aparciencia y el comportamiento de su escritorio y " "aplicaciones" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 Proyecto LXDE" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 Proyecto LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Personaliza la apariencia y el comportamiento de su escritorio" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Hugo Florentino " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Solo iconos" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Sólo texto" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Opciones de la interfaz gráfica" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Texto bajo los iconos" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Nota: No todas las aplicaciones de escritorio admiten cambiar el tema " +"de cursores al vuelo. De manera que sus cambios aquí podrían aplicarse sólo " +"tras el próximo inicio de sesión." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Texto al lado de los iconos" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Efectos sonoros" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Igual que en los elementos de menú" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Fondo" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Icono pequeño en la barra de herramientas" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Mayor" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Icono grande en la barra de herramientas" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Botón de marcado" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Igual que en los botones" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Color" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Igual que en los iconos de arrastre" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "" +"El tema de componentes seleccionado actualmente no admite este tema de " +"colores." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Igual que en las pantallas" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Fuente por defecto:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Ninguno" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Ligero" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Medio" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Completo" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Previsualizar el tema de controles seleccionados" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Primer plano" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Archivo" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Tema de icono" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Editar" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Solo iconos" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "Ay_uda" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Instalar" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Botón de selección" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Icono grande en la barra de herramientas" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Botón de marcado" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Cursor del ratón" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "botón" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Ventanas normales:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Otras" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Página1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Página2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Fuente por defecto:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Controles" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" -"El tema de componentes seleccionado actualmente no admite este esquema de " -"colores." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Reproducir sonidos en eventos" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Usar esquema de colores personalizado" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "Reproducir sonidos de eventos como retroalimentación al usuario" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Ventanas normales:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Previsualizar el tema de cursores seleccionados" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Ventanas de texto:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Previsualizar el tema de iconos seleccionados" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Elementos seleccionados" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Previsualizar el tema de controles seleccionados" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Sugerencias:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Botón de selección" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Fondo" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Quitar" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Primer plano" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "Igual que en los botons" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Color" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "Igual que en las pantallas" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instalar" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "Igual que en los iconos de arrastre" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Quitar" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "Igual que en los elementos de menú" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Previsualizar el tema de iconos seleccionados" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Elementos seleccionados" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema de iconos" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Mostrar imágenes en los menús" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Previsualizar el tema de cursores seleccionados" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Mostrar imágenes en los botones" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Tamaño de los cursores" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Icono pequeño en la barra de herramientas" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Menor" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Mayor" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Texto bajo los iconos" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Nota: No todas las aplicaciones de escritorio admiten cambiar el tema " -"de cursores al vuelo. De manera que sus cambios aquí podrían aplicarse sólo " -"tras el próximo inicio de sesión." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Texto al lado de los iconos" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Cursor del ratón" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Sólo texto" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Borde de la ventana" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Ventanas de texto:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Habilitar antialias" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialias" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Habilitar optimización" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Estilo de optimización:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Optimización" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometría subpíxel:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometría subpíxel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Fuente" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Tamaño del icono de la barra de herramientas:" -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "Estilo de la barra de herramientas:" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Tamaño del icono de la barra de herramientas:" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Sugerencias:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Mostrar imágenes en los botones" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Usar esquema de colores personalizado" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Mostrar imágenes en los menús" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Controles" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opciones de la interfaz gráfica" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Borde de la ventana" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Reproducir sonidos en eventos" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Editar" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Reproducir sonidos de eventos como retroalimentación al usuario" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Archivo" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Efectos sonoros" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "Ay_uda" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Otras" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "botón" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Seleccionar un tema de iconos" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema de iconos)" diff -Nru lxappearance-0.5.2~ppa2/po/et.po lxappearance-0.5.0/po/et.po --- lxappearance-0.5.2~ppa2/po/et.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/et.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,322 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-09-08 15:51+0200\n" -"Last-Translator: Anari \n" -"Language-Team: LANGUAGE \n" -"Language: et\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Välimuse Kohandamine" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Töölaua ja rakenduste välimuse kohandamine" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Töölaua välimuse kohandamine" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Anari Jalakas" - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Ainult ikoonid" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Ainult tekst" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekst ikoonide all" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekst ikoonide kõrval" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Sama mis menüüelementidel" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Väike tööriistariba ikoon" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Suur tööriistariba ikoon" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Sama mis nuppudel" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Sama mis lohistamisikoonidel" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Sama mis dialoogidel" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Mitte ükski" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Vähene" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Keskmine" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Täis" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Valitud vidinateema eelvaade" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fail" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "R_edigeerimine" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Abi" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Raadionupp" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Valikunupp" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "nupp" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Näide" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Leht1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Leht2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Vaikimisi font:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Vidin" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Valitud vidinateema ei toeta värviskeemi." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Kohandatud värviskeemi kasutamine" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normaalsed aknad:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Tekstiaknad:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Valitud:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Kohtspikrid:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Taust" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Esiplaan" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Värv" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Paigaldamine" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Eemaldamine" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Valitud ikooniteema eelvaade" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Ikooniteema" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Valitud kursoriteema eelvaade" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Kursorite suurus" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Väiksem" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Suurem" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Märkus: Mitte kõik töölaua programmid ei toeta töö-käigus muutuvat " -"kursoriteemat. Siin tehtud muudatused ei pruugi olla täielikult rakendunud " -"enne järgmist sisselogimist." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Hiirekursor" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Akna ääris" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Luba antialising" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialiasing" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Luba vihjamine" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Vihjamise stiil: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Vihjamine" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Alampiksli kujutamine: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Alampiksli geomeetria" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Font" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Tööriistariba stiil: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Tööriistariba Ikooni suurus: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Piltide näitamine nuppudel" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Piltide näitamine menüüs" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI Valikud" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Sündmuse heli mängimine" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Sündmuse heli mängimine kasutaja sisendi tagasideks" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Heliefekt" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Muu" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Vali ikooniteema" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Ikooniteema)" diff -Nru lxappearance-0.5.2~ppa2/po/fa.po lxappearance-0.5.0/po/fa.po --- lxappearance-0.5.2~ppa2/po/fa.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/fa.po 2010-10-12 15:20:22.000000000 +0000 @@ -7,20 +7,18 @@ msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2010-11-05 16:52+0200\n" -"Last-Translator: Ali \n" +"POT-Creation-Date: 2010-08-16 05:40+0000\n" +"PO-Revision-Date: 2010-10-09 13:57+0330\n" +"Last-Translator: Mostafa \n" "Language-Team: Persian \n" -"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Persian\n" "X-Poedit-Country: Iran\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 +#: ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "سفارشی سازی نما و شما" @@ -28,302 +26,228 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "سفارشی سازی نمای و شمای رومیزی و برنامه های خود" -#: ../data/ui/about.ui.in.h:1 -#, fuzzy -msgid "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" msgstr "کپی رایت (C) ۲۰۱۰ پروژه LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "سفارشی سازی نمای و شمای رومیزی خود" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "مترجمین" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "فقط آیکن" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "فقط متن" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "متن ذیل آیکن ها" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "متن کنار آیکن ها" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "همانند ایتم های منو" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "آیکن کوچکتر نوار ابزار" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "ایکن بزرگ نوار ابزار" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "همانند دکمه ها" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "همانند آیکن های کشیدن" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "گزینه های میانگر گرافیکی کاربری" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "همانند محاروه ها" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "نکنه: همه برنامه های رو میزی تغییر تم نشانگر در حرکت را پشتیبانی نمی کنند. پس تغییرات شما اینجا شاید به طور کامل در همه برنامه ها تا هنگام ورود مجدد اعمال نشوند." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "افکت صوتی" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "پس زمینه" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "بزرگتر" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "دکمه چک" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "رنگ" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "شمای رنگ در تم برنامک انتخابی کنونی پشتیبانی نمی شود." -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "قلم پیشفرض:" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "دمو" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "بازبینی سبک برنامک انتخابی" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "پیش نما" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "فایل" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "تم آیکن" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "اصلاح" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "فقط آیکن" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "کمک" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "نصب" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "دکمه های رادیویی" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "ایکن بزرگ نوار ابزار" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "دکمه چک" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "نشانگر موشی" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "دکمه" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "پنجره های معمولی:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "دمو" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "دیگر" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "صفحه ۲" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "صفحه ۱" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "قلم پیشفرض:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "ابزارک" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "شمای رنگ در تم برنامک انتخابی کنونی پشتیبانی نمی شود." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "استفاده از شمای رنگ سفارشی" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "پخش صدا" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "پنجره های معمولی:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "بازبینی تم نشانگر انتخابی" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "متن پنجره ها:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "بازبینی تم آیکن انتخابی" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "ایتم ها انتخاب شده:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "بازبینی سبک برنامک انتخابی" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "نکات‌ابزار:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "دکمه های رادیویی" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "پس زمینه" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "حذف" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "پیش نما" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "همانند دکمه ها" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "رنگ" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "همانند محاروه ها" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "نصب" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "همانند آیکن های کشیدن" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "حذف" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "همانند ایتم های منو" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "بازبینی تم آیکن انتخابی" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "ایتم ها انتخاب شده:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "تم آیکن" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "نمایش تصاویر در منوها" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "بازبینی تم نشانگر انتخابی" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "نمایش تصویر بر روی دکمه ها" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "اندازه ی نشانگر" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "آیکن کوچکتر نوار ابزار" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "کوچکتر" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "بزرگتر" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"نکنه: همه برنامه های رو میزی تغییر تم نشانگر در حرکت را پشتیبانی نمی " -"کنند. پس تغییرات شما اینجا شاید به طور کامل در همه برنامه ها تا هنگام ورود " -"مجدد اعمال نشوند." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "نشانگر موشی" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "محدوده ی پنجره" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "متن ذیل آیکن ها" -#: ../data/ui/lxappearance.ui.h:56 -#, fuzzy -msgid "Hinting" -msgstr "گزینه های میانگر گرافیکی کاربری" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "متن کنار آیکن ها" -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "فقط متن" -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "متن پنجره ها:" -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "اندازه ایکن نوار ابزار:" -#: ../data/ui/lxappearance.ui.h:60 -#, fuzzy +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "سبک نوار ابزار:" -#: ../data/ui/lxappearance.ui.h:61 -#, fuzzy -msgid "Toolbar Icon Size: " -msgstr "اندازه آیکن نوار ابزار:" +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "نکات‌ابزار:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "نمایش تصویر بر روی دکمه ها" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "استفاده از شمای رنگ سفارشی" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "نمایش تصاویر در منوها" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "ابزارک" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "گزینه های میانگر گرافیکی کاربری" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "محدوده ی پنجره" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "پخش صدا" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "اصلاح" -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "پخش صوتی به عنوان بازخورد برای ورودی کاربر" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "فایل" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "افکت صوتی" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "کمک" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "دیگر" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "دکمه" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "پخش صوتی به عنوان بازخورد برای خروجی کاربر" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "انتخاب یک تم آیکن" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (آیکن تم)" + diff -Nru lxappearance-0.5.2~ppa2/po/fi.po lxappearance-0.5.0/po/fi.po --- lxappearance-0.5.2~ppa2/po/fi.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/fi.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,323 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-03-10 20:11+0200\n" -"Last-Translator: Juhani \n" -"Language-Team: LANGUAGE \n" -"Language: fi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Muokkaa ulkonäköä ja tuntumaa" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Muokkaa ohjelmiesi sekä työpöytäsi ulkonäköä ja tuntumaa" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE-projekti" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Muokkaa työpöytäsi ulkonäköä ja tuntumaa" - -# Muutkin tätä kääntäneet voisivat laittaa nimensä tähän. -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Juhani Numminen " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Vain kuvakkeet" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Vain teksti" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Teksti kuvakkeiden alla" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Teksti kuvakkeiden vieressä" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Sama kuin valikkokohteet" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Pienet työkalupalkin kuvakkeet" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Isot työkalupalkin kuvakkeet" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Sama kuin nappulat" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Sama kuin liikuteltavat kuvakkeet" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Sama kuin valintaikkunat" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Ei mitään" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Vähän" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Keskitaso" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Täysi" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Esikatsele valittua ikkunaelementtiteemaa" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Tiedosto" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Muokkaa" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Apua" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Valintanappi" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Valintapainike" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "painike" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Sivu 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Sivu 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Oletuskirjasin:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Ikkunaelementti" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Nykyinen ikkunaelementtiteema ei tue värikarttoja." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Käytä omaa värikarttaa" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Tavalliset ikkunat:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Teksti-ikkunat:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Valitut kohteet:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Työkaluvihjeet:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Taustakuva" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Etuala" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Värit" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Asenna" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Poista" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Esikatsele valittua kuvaketeemaa" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Kuvaketeema" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Esikatsele valittua hiiriteemaa" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Hiiren kuvakkeen koko" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Pienempi" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Suurempi" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Huomio: Kaikki ohjelmasi eivät saata tukea ajonaikaista hiiriteeman " -"vaihtamista. Kaikki muutoksesi eivät välttämättä tule voimaan ennen " -"seuraavaa sisäänkirjautumista." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Hiiren kuvake" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Ikkunan reunat" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Ota käyttöön antialiasointi" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialiasointi" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Ota käyttöön vihjeistys" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Vihjeistystyyli: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Vihjeistys" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Alikuvapisteen geometria: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Alikuvapisteen geometria" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Kirjasin" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Työkalupalkin tyyli: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Työkalupalkin kuvakkeiden koko: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Näytä kuvat painikkeissa" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Näytä kuvat valikoissa" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Käyttöliittymäasetukset" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Toista tapahtumaäänet" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Toista tapahtumaäänet vastakaikuna käyttäjän syötteeseen" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Ääniefekti" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Muut" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Valitse kuvaketeema" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (kuvaketeema)" diff -Nru lxappearance-0.5.2~ppa2/po/fo.po lxappearance-0.5.0/po/fo.po --- lxappearance-0.5.2~ppa2/po/fo.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/fo.po 2010-10-06 17:05:11.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2010-10-22 08:52+0200\n" +"POT-Creation-Date: 2010-09-13 05:43+0000\n" +"PO-Revision-Date: 2010-09-13 08:30+0200\n" "Last-Translator: Gunleif Joensen \n" "Language-Team: Føroyabólkurin\n" "Language: fo\n" @@ -17,7 +17,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.6.1\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Tillaga útsjónd og kenslu" @@ -26,16 +26,16 @@ msgstr "" "Tillagar útsjóndina og kensluna, av tínum skriviborðið og nýtsluskipanum" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Upphavsrættur (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Upphavsrættur (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Tillagar útsjóndina og kensluna av tínum skriviborði" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "" "Gunleif Joensen\n" @@ -43,289 +43,218 @@ "Sjónarmið viðvíkjandi týðingini kunnu sendast til:\n" "" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Einans ímyndir" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Einans tekstur" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekst niðanfyri ímyndum" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekst við síðuni av ímyndum" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Eins og valmyndaliðir" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Lítla amboðsstongsímynd" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Stóra amboðsstongsímynd" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Eins og knappar" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Eins og at draga ímyndir" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Eins og samrøður" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "GUI kostir" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." msgstr "" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" msgstr "" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Bakgrund" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Størri" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" msgstr "" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Litur" -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." msgstr "" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Forsett Stavsnið:" + +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" msgstr "" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Undansýning av tí valda widgetsniðinum" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fíla" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Ímyndstema" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Ritstjórna" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Einans ímyndir" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Hjálp" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Legg inn" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Útvarpsknappur" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Stóra amboðsstongsímynd" -#: ../data/ui/lxappearance.ui.h:25 -#, fuzzy -msgid "Check Button" -msgstr "knappur" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Músavísi" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "knappur" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Vanligir gluggar:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Roynd" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Aðrir" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Síða1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Síða2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Forsett Stavsnið:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Litaskipan er ikki stuðla av tí núverandi valda widget tema" - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Nýt tillagaða litaskipan" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Spæl av hendinga ljóð" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Vanligir gluggar:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Undansýning av tí valdu vísitemuni " -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Tekstgluggar:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Undansýning av tí valdu temuni " -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Valdir liðir:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Amboðsráð:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Útvarpsknappur" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Bakgrund" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Tak burtur" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Forgrund" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Eins og knappar" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Litur" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Eins og samrøður" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Legg inn" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Tak burtur" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Eins og valmyndaliðir" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Undansýning av tí valdu temuni " +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Valdir liðir:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Ímyndstema" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Sýn myndir í valmyndum" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Undansýning av tí valdu vísitemuni " +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Sýn myndir á knappum" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Stødd á vísum" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Lítla amboðsstongsímynd" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Minni" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Størri" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"viðmerking Ikki allar skriviborðsnýtsluskipanir stuðla broytan av " -"vísitema stundisliga. So tínar broytingar munnu ikki verða virkjaðar til " -"fullnar, fyri enn næstu innritan." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Músavísi" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Tekst niðanfyri ímyndum" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Gluggakantur" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Tekst við síðuni av ímyndum" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Einans tekstur" -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Tekstgluggar:" -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Ímyndastødd á amboðsstong:" -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Style: " +msgstr "Snið á amboðsstong:" -#: ../data/ui/lxappearance.ui.h:56 +#: ../data/ui/lxappearance.glade.h:44 #, fuzzy -msgid "Hinting" -msgstr "GUI kostir" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" +msgid "Tooltips:" +msgstr "Amboðsráð:" -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" msgstr "" -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" msgstr "" -#: ../data/ui/lxappearance.ui.h:60 -#, fuzzy -msgid "Toolbar Style: " -msgstr "Snið á amboðsstong:" - -#: ../data/ui/lxappearance.ui.h:61 -#, fuzzy -msgid "Toolbar Icon Size: " -msgstr "Ímyndastødd á amboðsstong:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Sýn myndir á knappum" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Sýn myndir í valmyndum" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Gluggakantur" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI kostir" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Ritstjórna" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Spæl av hendinga ljóð" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Fíla" -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "spæl av hendigarljóð, sum afturboðan um brúkarainntak" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Hjálp" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Ljóðeffekt" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "knappur" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Aðrir" +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "spal av hendigarljóð, sum afturboðan um brúkarainntak" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Vel eina ímyndatemu" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ímyndatema)" diff -Nru lxappearance-0.5.2~ppa2/po/fr.po lxappearance-0.5.0/po/fr.po --- lxappearance-0.5.2~ppa2/po/fr.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/fr.po 2010-10-12 15:20:22.000000000 +0000 @@ -7,18 +7,16 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-01-05 15:29+0200\n" -"Last-Translator: Cilyan \n" +"POT-Creation-Date: 2010-10-07 06:08+0000\n" +"PO-Revision-Date: 2010-10-01 22:04+0200\n" +"Last-Translator: Julien Lavergne \n" "Language-Team: French\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Personnaliser l'apparence" @@ -26,301 +24,236 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Personnaliser l'apparence du bureau et des applications" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Personnaliser l'apparence du bureau" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" -msgstr "" -"GoKhlaYeh \n" -"Cilyan Olowen " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Icônes seulement" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Texte seulement" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Texte en-dessous des icônes" +msgstr "GoKhlaYeh " -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Texte au-dessus des icônes" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Comme les entrées de menu" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Petites icônes" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Grandes icônes" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Comme les boutons" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Comme les icônes de glisser-déposer" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Options de l'interface graphique" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Comme les boîtes de dialogue" +#: ../data/ui/lxappearance.glade.h:2 +#, fuzzy +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +" Toutes les applications ne supportent pas le changement de " +"thème de curseur en direct. Vos changements pourraient ne pas être " +" entièrement appliqués avant la prochaine connexion." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Aucun" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Effets sonores" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Léger" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Arrière-plan" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Moyen" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Plus gros" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Complet" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Case à cocher" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Couleur" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "La sélection des couleurs n'est pas supportée par le thème sélectionné." -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Police par défaut:" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Démonstration" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Aperçu du thème d'interface séléctionné" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fichier" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Thème d'icônes" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Édition" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Icônes seulement" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Aide" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Installer" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Bouton radio" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Case à cocher" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Curseur de la souris" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "bouton" +#: ../data/ui/lxappearance.glade.h:18 +#, fuzzy +msgid "Normal windows:" +msgstr "Fenêtre normale:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Démonstration" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Autres" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Page1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Page2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Police par défaut :" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Interface" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" msgstr "" -"La sélection des couleurs n'est pas supportée par le thème sélectionné." -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Personnaliser le thème de couleurs" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Fenêtres normales :" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Prévisualisation du thème de curseur sélectionné" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Fenêtres de texte :" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Prévisualisation du thème d'icônes sélectionné" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Éléments sélectionnés :" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Bulles d'aide :" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Bouton radio" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Arrière-plan" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Enlever" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Premier plan" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Couleur" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Installer" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Enlever" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Prévisualisation du thème d'icônes sélectionné" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Élément sélectionnés " -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Thème d'icônes" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Montrer les images dans les menus" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Prévisualisation du thème de curseur sélectionné" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Montrer les images dans les boutons" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Taille des curseurs" -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Plus petit" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Plus gros" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" msgstr "" -"Note : Toutes les applications ne supportent pas le changement de " -"thème de curseur à la volée. Vos changements pourraient ne pas être " -"entièrement appliqués avant la prochaine connexion." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Curseur de la souris" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Bordures des fenêtres" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Activer l'anticrénelage" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Anticrénelage" -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Activer le hinting" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Smaller" +msgstr "" -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Mode de hinting : " +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Texte en-dessous des icônes" -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Texte au-dessus des icônes" -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Géométrie des sous-pixels : " +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Texte seulement" -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Géométrie des sous-pixels" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Police" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Style de la barre d'outils : " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Taille des icônes de la barre d'outils : " +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Montrer les images dans les boutons" +#: ../data/ui/lxappearance.glade.h:46 +#, fuzzy +msgid "Use customized color scheme" +msgstr "Personnaliser les couleurs" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Montrer les images dans les menus" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Options de l'interface graphique" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Activer les notifications sonores" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" msgstr "" -"Envoyer des notifications sonores en réponse aux actions de l'utilisateur" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Effets sonores" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Autres" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "bouton" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Sélectionnez un thème d'icônes" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (thème d'icônes)" diff -Nru lxappearance-0.5.2~ppa2/po/gl.po lxappearance-0.5.0/po/gl.po --- lxappearance-0.5.2~ppa2/po/gl.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/gl.po 2010-10-12 15:20:22.000000000 +0000 @@ -2,330 +2,256 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-01-11 19:29+0200\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2010-10-09 06:00+0000\n" +"PO-Revision-Date: 2010-09-03 18:10+0100\n" +"Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: Proxecto Trasno \n" -"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Galician\n" +"X-Generator: Pootle 1.1.0\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Personalizar a aparencia e o comportamento" #: ../data/lxappearance.desktop.in.h:2 msgid "Customizes look and feel of your desktop and applications" -msgstr "" -"Personalizar a aparencia e comportamento do seu escritorio e aplicativos" +msgstr "Personalizar a aparencia e comportamento do seu escritorio e aplicativos" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Dereitos de autoría (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Dereitos de autor (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Personalizar a aparencia e comportamento do escritorio" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "" -"Miguel Anxo Bouzada , 2010, 2011\n" +"Miguel Anxo Bouzada , 2010\n" "Proxecto Trasno " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Só iconas" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Só texto" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Texto baixo as iconas" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Texto ao carón das iconas" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Igual que nos elementos do menú" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Iconas pequenas na barra de ferramentas" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Iconas grandes na barra de ferramentas" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Igual que nos botóns" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Igual que ao arrastrar iconas" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Opcións do IGU" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Igual que nos diálogos" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr " Nota: Non todos os aplicativos de escritorio permiten cambiar o tema do punteiro ao voo. Polo que non se aplicaran todos os seus cambios ata o seguinte inicio de sesión." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Ningún" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Efecto sonoro" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Leve" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Fondo" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Medio" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Máis grande" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Completo" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Caixa de selección" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Cor" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "O esquema de cor no é admitido polo tema seleccionado actualmente de trebellos." -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Tipo de letra predeterminado:" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demostración" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Vista previa do tema de controis seleccionado" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Primeiro plano" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Ficheiro" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Temas de iconas" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Editar" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Só iconas" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Axuda" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Instalar" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Botón de selección" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Iconas grandes na barra de ferramentas" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Caixa de selección" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Punteiro do rato" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "botón" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Xanelas normais:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demostración" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Outro" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Páxina1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" -msgstr "Páxina2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Tipo de letra predeterminado:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Controis" +msgstr "Páxina3" -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" -"O esquema de cor no é admitido polo tema de controis seleccionado " -"actualmente." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Reproducir sons en eventos" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Empregar un esquema de cor personalizado" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "Reproducir sons nos eventos para informar ao usuario" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Xanelas normais:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Vista previa do tema de punteriro seleccionado" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Texto das xanelas:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Vista previa do tema de iconas seleccionado" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Elementos seleccionados:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Vista previa do tema de trebellos seleccionado" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Mensaxes emerxentes:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Botón de selección" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Fondo" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Quitar" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Primeiro plano" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "Igual que nos botóns" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Cor" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "Igual que nos dialogos" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instalar" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "Igual que ao arrastrar iconas" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Retirar" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "Igual que nos elementos do menú" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Vista previa do tema de iconas seleccionado" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Elementos seleccionados:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema de iconas" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Amosar imaxes nos menús" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Vista previa do tema de punteiro seleccionado" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Amosar imaxes no botóns" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Tamaño dos punteiros" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Iconas pequenas na barra de ferramentas" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Máis pequeno" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Máis grande" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Texto debaixo das iconas" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -" Nota: Non todos os aplicativos de escritorio permiten cambiar o tema " -"do punteiro ao voo. Polo que non se aplicaran todos os seus cambios ata o " -"seguinte inicio de sesión." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Texto ao lado das iconas" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Punteiro do rato" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Só texto" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Bordo da xanela" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Texto das xanelas:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Activar o suavizado" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Suavizado" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Activar as suxestións" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Estilo do consello: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Suxestión" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Xeometría do subpíxel: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Xeometria do subpíxel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Tipo de letra" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Tamaño das iconas da barra de ferramentas: " -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas: " -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Tamaño das iconas da barra de ferramentas: " +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Suxestións:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Amosar imaxes no botóns" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Empregar esquema de cor personalizado" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Amosar imaxes nos menús" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Trebello" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opcións da interface de usuario" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Bordo da xanela" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Reproducir sons en eventos" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Editar" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Reproducir sons nas accións para informar ao usuario" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Ficheiro" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Efecto sonoro" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Axuda" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Outros" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "botón" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Seleccione un tema de iconas" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (tema de iconas)" +msgstr "*.tar.gz, *.tar.bz2 (Tema de iconas)" #~ msgid "Column" #~ msgstr "Columna" @@ -375,6 +301,9 @@ #~ msgid "Size" #~ msgstr "Tamaño" +#~ msgid "_Font:" +#~ msgstr "_Tipo de letra:" + #~ msgid "Appearance" #~ msgstr "Aparencia" diff -Nru lxappearance-0.5.2~ppa2/po/he.po lxappearance-0.5.0/po/he.po --- lxappearance-0.5.2~ppa2/po/he.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/he.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,21 +7,20 @@ msgstr "" "Project-Id-Version: LXAppearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-11-13 15:26+0200\n" -"Last-Translator: Yaron \n" +"POT-Creation-Date: 2010-08-13 05:37+0000\n" +"PO-Revision-Date: 2010-08-13 15:12+0200\n" +"Last-Translator: \n" "Language-Team: Gezer \n" -"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Poedit-Language: Hebrew\n" -"X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: ISRAEL\n" +"X-Poedit-SourceCharset: utf-8\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 +#: ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "התאמת המראה והתחושה" @@ -29,297 +28,228 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "התאמת המראה והתחושה של שולחן העבודה והיישומים שלך" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "כל הזכויות שמורות (C) 2011 מיזם LXDE" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "כל הזכויות שמורות (C) 2010 מיזם LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "התאמת המראה והתחושה של שולחן העבודה שלך" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" -msgstr "ירון שהרבני " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "סמלים בלבד" +msgstr "ירון שהרבני GUI Options" +msgstr "אפשרויות מנשק המשתמש" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "טקסט מתחת לסמלים" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "תשומת לבך: לא כל יישומי שולחן העבודה תומכים בשינוי עיצוב הסמן שלך באופן מיידי. לכן השינויים בהגדרות יחלו לחלוטין על כל היישומים רק עם הכניסה הבאה." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "טקסט לצד הסמלים" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "פעלולי שמע" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "כמו פריטי התפריט" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "רקע" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "סמל קטן בסרגל הכלים" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "גדול יותר" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "סמל גדול בסרגל הכלים" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "לחצן סימון" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "כמו הלחצנים" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "צבע" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "כמו לחצני הגרירה" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "ערכת הצבע אינה נתמכת על ידי ערכת הנושא של הווידג׳ט הנבחר." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "כמו תיבות הדו־שיח" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "גופן ברירת המחדל:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "ללא" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "פצפון" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "בינוני" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "מלא" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "הדגמה" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "תצוגה מקדימה של סגנון הווידג׳ט הנבחר" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "קדמה" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_קובץ" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "ערכת נושא לסמלים" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "ע_ריכה" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "סמלים בלבד" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "ע_זרה" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "התקנה" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "לחצן בחירה" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "סמל גדול בסרגל הכלים" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "לחצן סימון" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "סמן העכבר" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "לחצן" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "חלונות רגילים:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "הדגמה" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "אחר" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "עמוד1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "עמוד2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "גופן בררת המחדל:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "וידג׳ט" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "ערכת הצבע אינה נתמכת על ידי ערכת הנושא של הווידג׳ט הנבחר." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "שימוש בערכת צבעים מותאמת אישית" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "השמעת צלילים לאירועים" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "חלונות רגילים:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "הצגה מקדימה של ערכת הסמנים הנבחרת" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "חלונות טקסט:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "תצוגה מקדימה של ערכת הסמלים הנבחרת" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "הפריטים הנבחרים:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "תצוגה מקדימה של סגנון הווידג׳ט הנבחר" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "חלוניות מידע:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "לחצן בחירה" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "רקע" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "הסרה" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "קדמה" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "כמו הלחצנים" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "צבע" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "כמו תיבות הדו־שיח" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "התקנה" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "כמו לחצני הגרירה" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "הסרה" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "כמו פריטי התפריט" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "תצוגה מקדימה של ערכת הסמלים הנבחרת" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "הפריטים הנבחרים:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "ערכת נושא לסמלים" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "הצגת תמונות בתפריטים" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "הצגה מקדימה של ערכת הסמנים הנבחרת" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "הצגת תמונות על הלחצנים" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "גודל הסמנים" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "סמל קטן בסרגל הכלים" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "קטן יותר" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "גדול יותר" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "טקסט מתחת לסמלים" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"תשומת לבך: לא כל יישומי שולחן העבודה תומכים בשינוי עיצוב הסמן שלך " -"באופן מיידי. לכן השינויים בהגדרות יחלו לחלוטין על כל היישומים רק עם הכניסה " -"הבאה." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "טקסט לצד הסמלים" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "סמן העכבר" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "טקסט בלבד" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "מסגרת החלון" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "חלונות טקסט:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "הפעלת החלקת קצוות" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "החלקת קצוות" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "הפעלת רמיזה" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "סגנון הרמיזה:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "רמיזה" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "גאומטריית תת־פיקסלים:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "גאומטריית תת־פיקסלים" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "גופן" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "גודל סמלי סרגל הכלים:" -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "סגנון סרגל הכלים:" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "גודל סמלי סרגל הכלים:" +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "חלוניות מידע:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "הצגת תמונות על הלחצנים" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "שימוש בערכת צבעים מותאמת אישית" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "הצגת תמונות בתפריטים" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "וידג׳ט" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "אפשרויות מנשק המשתמש" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "מסגרת החלון" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "השמעת צלילים לאירועים" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "ע_ריכה" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "יש לנגן צלילי אירועים כמשוב לקלט המשתמש" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_קובץ" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "פעלולי שמע" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "ע_זרה" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "אחר" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "לחצן" -#: ../src/utils.c:217 +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "נגינת צלילי אירועים כמשוב לקלט מהמשתמש" + +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "בחירת ערכת סמלים" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ערכת סמלים)" + diff -Nru lxappearance-0.5.2~ppa2/po/hr.po lxappearance-0.5.0/po/hr.po --- lxappearance-0.5.2~ppa2/po/hr.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/hr.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,320 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-05-06 11:55+0200\n" -"Last-Translator: zvacet \n" -"Language-Team: LANGUAGE \n" -"Language: hr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Prilagođava izgled i dojam" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Prilagođava izgled i dojam vaše radne površine i programa" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Autorska prava (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Prilagođava izgled i dojam vaše radne površine" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Ivica Kolić " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Samo ikone" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Samo tekst" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekst ispod ikona" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekst uz ikone" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Isto kao i stavke izbornika" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Mala ikona alatne trake" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Velike ikone alatne trake" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Isto kao i povlačenje ikona" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Isto kao i dijalozi" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "NIjedan" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Srednje" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Cijeli" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Datoteka" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Uredi" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Pomoć" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Stranica1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Stranica2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Zadani font:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Koristi prilagođenu shemu boja" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normalni prozori:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Tekst prozori:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Odabrane stavke:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Pozadina" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Prvi plan" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Boja" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instaliraj" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Ukloni" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Pregled odabrane teme ikone" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema ikone" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Pregled odabrane teme pokazivača" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Veličina pokazivača" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Manje" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Veće" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Pokazivač miša" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Granica prozora" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Font" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Stil alatne trake: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Veličina ikona alatne trake: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Prikaži slike u izbornicima" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opcije korisničkog sučelja" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Sviraj zvuk događaja" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Zvučni efekt" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Ostalo" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Odaberi temu ikone" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Tema ikone)" diff -Nru lxappearance-0.5.2~ppa2/po/hu.po lxappearance-0.5.0/po/hu.po --- lxappearance-0.5.2~ppa2/po/hu.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/hu.po 2010-10-06 17:04:55.000000000 +0000 @@ -1,22 +1,22 @@ # Hungarian translation of lxappearance. -# Copyright (C) 2006-2011 The LXDE Team +# Copyright (C) 2006-2010 The LXDE Team # This file is distributed under the same license as the lxappearance package. -# Laszlo Dvornik , 2010-2011. +# Laszlo Dvornik , 2010. # msgid "" msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-09-03 15:13+0200\n" -"Last-Translator: Laszlo Dvornik \n" -"Language-Team: Hungarian\n" -"Language: hu\n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-07 22:12+0200\n" +"Last-Translator: Laszlo Dvornik \n" +"Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Megjelenés testreszabása" @@ -24,297 +24,233 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "A munkaasztal és az alkalmazások megjelenésének testreszabása" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "A munkaasztal megjelenésének testreszabása" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" -msgstr "Dvornik László " +msgstr "Dvornik László " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Csak ikonok" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Csak szöveg" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "GUI beállításai" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Szöveg az ikonok alatt" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Megjegyzés: Nem minden munkaasztal alkalmazás támogatja a menet " +"közbeni kurzorváltást. Ezért az itteni változtatások a következő " +"bejelentkezésig lehet, hogy nem minden alkalmazásban fognak érvényesülni." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Szöveg az ikonok mellett" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Hangeffektusok" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Azonos a menüelemekkel" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Háttér" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Kis eszköztár ikon" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Nagyobb" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Nagy eszköztár ikon" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Jelölőnégyzet" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Azonos a gombokéval" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Szín" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Azonos a húzás ikonokkal" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "A színséma nem támogatott a jelenleg kijelölt elemtémánál." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Azonos a párbeszédablakokéval" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Alapértelmezett betűkészlet:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Nincs" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Enyhe" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Közepes" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Teljes" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demó" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "A kijelölt elemstílus előnézete" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Előtér" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fájl" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Ikontéma" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "S_zerkesztés" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Csak ikonok" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Súgó" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Telepítés" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Választógomb" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Nagy eszköztár ikon" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Jelölőnégyzet" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Egérkurzor" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "gomb" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Normál ablakok:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demó" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Egyéb" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "1. oldal" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "2. oldal" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Alapértelmezett betűkészlet:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Elem" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "A színséma nem támogatott a jelenleg kijelölt elemtémánál." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Eseményhangok lejátszása" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Egyedi színséma használata" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "Eseményhangok lejátszása visszajelzésként a felhasználói bevitelhez" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normál ablakok:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "A kijelölt kurzortéma előnézete" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Szöveges ablakok:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "A kijelölt ikontéma előnézete" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Kijelölt elemek:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "A kijelölt elemstílus előnézete" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Eszköztippek:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Választógomb" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Háttér" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Eltávolítás" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Előtér" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "Azonos a gombokéval" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Szín" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "Azonos a párbeszédablakokéval" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Telepítés" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "Azonos a húzás ikonokkal" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Eltávolítás" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "Azonos a menüelemekkel" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "A kijelölt ikontéma előnézete" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Kijelölt elemek:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Ikontéma" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Képek megjelenítése a menükben" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "A kijelölt kurzortéma előnézete" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Képek megjelenítése a gombokon" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Kurzorok mérete" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Kis eszköztár ikon" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Kisebb" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Nagyobb" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Szöveg az ikonok alatt" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Megjegyzés: Nem minden munkaasztal alkalmazás támogatja a menet " -"közbeni kurzorváltást. Ezért az itteni változtatások a következő " -"bejelentkezésig lehet, hogy nem minden alkalmazásban fognak érvényesülni." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Szöveg az ikonok mellett" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Egérkurzor" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Csak szöveg" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Ablakkeret" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Szöveges ablakok:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Elsimítás engedélyezése" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Élsimítás" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Hinting engedélyezése" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Hintingstílus: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Képponton belüli geometria: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Képponton belüli geometria" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Betűkészlet" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Eszköztár ikon mérete: " -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "Eszköztár stílusa: " -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Eszköztárikon mérete: " +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Eszköztippek:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Képek megjelenítése a gombokon" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Egyedi színséma használata" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Képek megjelenítése a menükben" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Elem" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI beállításai" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Ablakkeret" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Eseményhangok lejátszása" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "S_zerkesztés" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Eseményhangok lejátszása visszajelzésként a felhasználói bevitelhez" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Fájl" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Hangeffektusok" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Súgó" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Egyéb" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "gomb" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Válassz egy ikontémát" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ikontéma)" diff -Nru lxappearance-0.5.2~ppa2/po/id.po lxappearance-0.5.0/po/id.po --- lxappearance-0.5.2~ppa2/po/id.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/id.po 2010-10-06 16:55:34.000000000 +0000 @@ -2,23 +2,20 @@ # Copyright (C) 2010 THE lxappearance'S COPYRIGHT HOLDER # This file is distributed under the same license as the lxappearance package. # Andika Triwidada , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: lxappearance master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-08-21 10:24+0200\n" -"Last-Translator: andika \n" +"POT-Creation-Date: 2010-09-07 05:44+0000\n" +"PO-Revision-Date: 2010-09-05 16:07+0700\n" +"Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian Translation Team \n" -"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Ubah Tampilan dan Rasa" @@ -26,297 +23,227 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Ubah tampilan dan rasa dari desktop dan aplikasi Anda" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Hak Cipta (C) 2011 Projek LXDE" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Hak Cipta (C) 2010 Projek LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Ubah tampilan dan rasa dari desktop Anda" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Andika Triwidada , 2010." -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Hanya ikon" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Hanya teks" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Opsi GUINote: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Catatan: Tidak semua aplikasi desktop mendukung pengubahan tema kursor sambil-jalan. Maka perubahan Anda mungkin tidak diterapkan sepenuhnya atas semua aplikasi sampai login berikutnya." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Teks di samping ikon" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Efek Suara" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Sama dengan butir menu" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Latar belakang" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Ikon bilah alat kecil" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Lebih besar" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Ikon bilah alat besar" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Tombol Centang" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Sama dengan tombol" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Warna" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Sama dengan ikon seret" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Skema warna tak didukung oleh tema widget yang kini dipilih." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Sama dengan dialog" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Fonta bawaan:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Tak ada" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Sedikit" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Sedang" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Penuh" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Pratilik gaya widget yang dipilih" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Latar depan" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Berkas" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Tema Ikon" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Sunting" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Hanya ikon" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "Ba_ntuan" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Pasang" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Tombol Radio" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Ikon bilah alat besar" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Tombol Centang" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Kursor Tetikus" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "tombol" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Jendela normal:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Lainnya" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Hal1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Hal2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Fonta bawaan:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Skema warna tak didukung oleh tema widget yang kini dipilih." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Pakai skema warna ubahan" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Mainkan suara kejadian" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Jendela normal:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Pratilik tema kursor yang dipilih" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Jendela teks:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Pratilik tema ikon yang dipilih" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Objek yang dipilih:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Pratilik gaya widget yang dipilih" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Tooltip:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Tombol Radio" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Latar belakang" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Buang" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Latar depan" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Sama dengan tombol" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Warna" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Sama dengan dialog" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Pasang" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Sama dengan ikon seret" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Buang" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Sama dengan butir menu" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Pratilik tema ikon yang dipilih" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Objek yang dipilih:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema Ikon" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Tampilkan gambar di menu" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Pratilik tema kursor yang dipilih" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Tampilkan gambar pada tombol" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Ukuran kursor" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Ikon bilah alat kecil" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Lebih kecil" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Lebih besar" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Teks di bawah ikon" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Catatan: Tidak semua aplikasi desktop mendukung pengubahan tema " -"kursor sambil-jalan. Maka perubahan Anda mungkin tidak diterapkan sepenuhnya " -"atas semua aplikasi sampai login berikutnya." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Teks di samping ikon" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Kursor Tetikus" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Hanya teks" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Bingkai Jendela" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Jendela teks:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Aktifkan antialias" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialias" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Aktifkan hint" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Gaya hint" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hint" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometri sub-piksel" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometri sub-piksel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Fonta" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Ukuran Ikon Bilah Alat:" -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "Gaya Bilah Alat:" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Ukuran Ikon Bilah Alat:" +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Tooltip:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Tampilkan gambar pada tombol" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Pakai skema warna ubahan" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Tampilkan gambar di menu" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opsi GUI" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Bingkai Jendela" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Mainkan suara kejadian" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Sunting" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Mainkan suara kejadian sebagai umpan balik ke masukan pengguna" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Berkas" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Efek Suara" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "Ba_ntuan" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Lainnya" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "tombol" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "mainkan suara kejadian sebagai umpan balik ke masukan pengguna" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Pilih tema ikon" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema Ikon)" diff -Nru lxappearance-0.5.2~ppa2/po/it.po lxappearance-0.5.0/po/it.po --- lxappearance-0.5.2~ppa2/po/it.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/it.po 2010-10-06 17:02:15.000000000 +0000 @@ -7,318 +7,249 @@ msgstr "" "Project-Id-Version: 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-05-25 19:44+0200\n" -"Last-Translator: Alessandro \n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-08 13:00+0100\n" +"Last-Translator: Andrea Florio \n" "Language-Team: it \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" -msgstr "Personalizza Aspetto e Stile" +msgstr "Personalizza aspetto e stile" #: ../data/lxappearance.desktop.in.h:2 msgid "Customizes look and feel of your desktop and applications" msgstr "Personalizza l'aspetto e lo stile del tuo desktop e delle applicazioni" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Personalizza l'aspetto e lo stile del tuo desktop" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" -msgstr "" -"Andrea Florio Alessandro Pellizzari " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Solo icone" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Solo testo" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Testo sotto le icone" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Testo a fianco delle icone" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Come gli elementi di menu" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Icona piccola della barra strumenti" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Icona della barra degli strumenti larga" +msgstr "Andrea Florio " -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Come i bottoni" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Come il trascinamento icone" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Opzioni GUI" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Come i dialoghi" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Nota: Non tutte le applicazioni desktop supportano il cambio del tema " +"del cursore al volo. Quindi i tuoi cambiamenti potrebbero non essere " +"completamente applicati fino al prossimo login." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Nessuno" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Effetti Sonori" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Leggero" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Sfondo" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Medio" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Più grande" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Pieno" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Pulsante di selezione" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Colore" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Lo schema del colore non è supportato dal tema attualmente selezionato" -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Font predefinito" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Anteprima dello stile delle finestre selezionato" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Testo" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_File" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Tema di icone" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Modifica" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Solo icone" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Aiuto" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Installa" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Pulsante Radio" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Icona della barra degli strumenti larga" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Pulsante di selezione" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Puntatore del mouse" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "pulsante" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Finestra normale:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Altro" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Pagina1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Pagina2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Font predefinito:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Lo schema colore non è supportato dal tema attualmente selezionato" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Esegui suoni di avviso" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Usa schema colore personalizzato" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Finestra normale:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Anteprima del tema del puntatore selezionato" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Finestre di testo:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Anteprima del tema di icone selezionato" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Oggetti selezionati:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Anteprima dello stile delle finestre selezionato" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Tooltips:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Pulsante Radio" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Sfondo" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Rimuovi" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Testo" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Colore" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Installa" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Rimuovi" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Anteprima del tema di icone selezionato" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema di icone" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Anteprima del tema del puntatore selezionato" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" -msgstr "Dimensioni dei cursori" +msgstr "" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Più piccolo" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Più grande" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" msgstr "" -"Nota: Non tutte le applicazioni desktop supportano il cambio del tema " -"del cursore al volo. Quindi i tuoi cambiamenti potrebbero non essere " -"completamente applicati fino al prossimo login." -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Puntatore del mouse" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Solo testo" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Bordo finestra" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Abilita antialias" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialias" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Abilita hinting" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Stile hinting: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometria sub-pixel: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometria sub-pixel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Font" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Stile Toolbar: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Dimensioni Icona Toolbar: " +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Mostra immagini nei bottoni" +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Mostra immagini nei menu" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opzioni GUI" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Esegui suoni di avviso" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Finestra" -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "Esegui suoni di avviso alle azioni dell'utente" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Bordo finestra" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Effetti Sonori" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Modifica" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Altro" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_File" + +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Aiuto" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "pulsante" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Seleziona un tema di icone" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "(Tema di icone) *.tar.gz, *.tar.bz2" diff -Nru lxappearance-0.5.2~ppa2/po/ja.po lxappearance-0.5.0/po/ja.po --- lxappearance-0.5.2~ppa2/po/ja.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/ja.po 2010-10-12 15:20:22.000000000 +0000 @@ -8,17 +8,16 @@ msgstr "" "Project-Id-Version: lxappearance 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" +"POT-Creation-Date: 2010-10-07 18:39+0900\n" "PO-Revision-Date: 2010-10-07 18:41+0900\n" "Last-Translator: Hironao Komatsu \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "ルックアンドフィールを設定します" @@ -27,298 +26,234 @@ msgstr "" "あなたのデスクトップとアプリケーションのルックアンドフィールを設定します" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "デスクトップのルックアンドフィールを設定します" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Hironao Komatsu " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "アイコンのみ" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "テキストのみ" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "GUI のオプション" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "アイコンの下にテキスト" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"注意: デスクトップアプリケーションのすべてが実行中のカーソルテーマの変" +"更をサポートしているわけではありません。よって、ここでの変更の一部は次回のロ" +"グインまで反映されないことがあります。" -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "アイコンの横にテキスト" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "効果音" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "メニューアイテムと同じ" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "背景色" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "小さなツールバーアイコン" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "大きく" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "大きなツールバーアイコン" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "チェックボタン" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "ボタンと同じ" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "色" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "ドラッグアイコンと同じ" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "" +"現在選択しているウィジェットテーマはカラースキームをサポートしていません。" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "ダイアログと同じ" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "デフォルトのフォント:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "なし" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "微小" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "中間" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "完全" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "デモ" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "選択中のウィジェットスタイルのプレビュー" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "前景色" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "ファイル(_F)" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "アイコンテーマ" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "編集(_E)" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "アイコンのみ" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "ヘルプ(_H)" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "インストール" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "ラジオボタン" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "大きなツールバーアイコン" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "チェックボタン" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "マウスカーソル" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "ボタン" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "通常のウィンドウ:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "デモ" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "その他" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "ページ1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "ページ2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "デフォルトのフォント:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "ウィジェット" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" -"現在選択しているウィジェットテーマはカラースキームをサポートしていません。" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "イベント音を鳴らす" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "独自のカラースキームを使用する" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "ユーザ入力のフィードバックとしてイベント音を鳴らす" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "通常のウィンドウ:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "選択中のカーソルテーマのプレビュー" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "テキストウィンドウ:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "選択中のアイコンテーマのプレビュー" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "選択中のアイテム:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "選択中のウィジェットスタイルのプレビュー" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "ツールチップ:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "ラジオボタン" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "背景色" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "削除" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "前景色" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "ボタンと同じ" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "色" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "ダイアログと同じ" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "インストール" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "ドラッグアイコンと同じ" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "削除" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "メニューアイテムと同じ" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "選択中のアイコンテーマのプレビュー" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "選択中のアイテム:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "アイコンテーマ" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "メニューに画像を表示する" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "選択中のカーソルテーマのプレビュー" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "ボタンに画像を表示する" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "カーソルの大きさ" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "小さなツールバーアイコン" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "小さく" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "大きく" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "アイコンの下にテキスト" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"注意: デスクトップアプリケーションのすべてが実行中のカーソルテーマの変" -"更をサポートしているわけではありません。よって、ここでの変更の一部は次回のロ" -"グインまで反映されないことがあります。" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "アイコンの横にテキスト" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "マウスカーソル" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "テキストのみ" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "ウィンドウ境界" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "テキストウィンドウ:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "アンチエイリアシングを有効にする" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "アンチエイリアシング" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "ヒンティングを有効にする" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "ヒンティングのスタイル: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "ヒンティング" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "サブピクセルの配列: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "サブピクセルの配列" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "フォント" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "ツールバーのアイコンのサイズ: " -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "ツールバーのスタイル: " -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "ツールバーのアイコンのサイズ: " +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "ツールチップ:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "ボタンに画像を表示する" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "独自のカラースキームを使用する" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "メニューに画像を表示する" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "ウィジェット" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI のオプション" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "ウィンドウ境界" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "イベント音を鳴らす" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "編集(_E)" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "ユーザ入力のフィードバックとしてイベント音を鳴らす" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "ファイル(_F)" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "効果音" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "ヘルプ(_H)" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "その他" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "ボタン" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "アイコンテーマの選択" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (アイコンテーマ)" diff -Nru lxappearance-0.5.2~ppa2/po/kk.po lxappearance-0.5.0/po/kk.po --- lxappearance-0.5.2~ppa2/po/kk.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/kk.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,323 +0,0 @@ -# Kazakh translation for lxappearance. -# Copyright (C) 2012 The LXDE team -# This file is distributed under the same license as the LXDE package. -# Baurzhan Muftakhidinov , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-05-01 14:34+0600\n" -"Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh \n" -"Language: kk\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Kazakh\n" -"X-Poedit-Country: KAZAKHSTAN\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Сыртқы түрін баптау" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Жұмыс үстелі мен қолданбаларыңыздың сыртқы түрін баптау" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE жобасы" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Жұмыс үстеліңіздің сыртқы түрін баптау" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Baurzhan Muftakhidinov 2012" - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Тек таңбашалар" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Тек мәтін" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Мәтін таңбашалардың астында" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Мәтін таңбашалардың қасында" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Мәзір нәрселері сияқты" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Кіші панель таңбашалары" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Үлкен панель таңбашалары" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Батырмалар сияқты" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Тарту таңбашалары сияқты" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Сұхбаттар сияқты" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Ешнәрсе" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Әлсіз" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Орташа" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Толық" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Таңдалған интерфейс темасын алдын-ала қарау" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Файл" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "Тү_зету" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Көмек" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Ауыстыру батырмасы" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Белгілеу батымасы" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "батырма" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Демо" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Page1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Page2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Бастапқы қаріп:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Виджет" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Ағымдағы таңдалған интерфейс темасы түстер схемасын қолдамайды." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Бапталған түстер схемасын қолдану" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Қалыпты терезелер:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Мәтін терезелері:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Таңдалған нәрселер:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Қалқымалы кеңестер:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Фон" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Алдыңғы көрінісі" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Түстер" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Орнату" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Өшіру" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Таңдалған таңбашалар темасын алдын-ала қарау" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Таңбашалар" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Таңдалған курсор темасын алдын-ала қарау" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Курсорлар өлшемі" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Кішірек" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Үлкенірек" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Ескерту: Қолданбалардың барлығы курсор темасын ауыстыруды жұмыс істеу " -"кезінде қолдай бермейді. Өзгерістер сіз жүйеге келесі рет кіргенше дейін " -"іске аспауы мүмкін." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Тышқан курсоры" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Терезе шегі" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Антиалиасингті іске қосу" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Антиалиасинг" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Тегістеуді іске қосу" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Тегістеу түрі:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Тегістеу" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Субпиксель геометриясы:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Субпиксель геометриясы" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Қаріп" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Саймандар панелінің стилі:" - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Панель таңбашасы өлшемі:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Батырмаларда суреттерді көрсету" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Мәзірлерде суреттерді көрсету" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Интерфейс" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Оқиғалар дыбыстарын іске қосу" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Пайдаланушы енгізуге жауап ретінде оқиғалар дыбыстарын ойнату" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Дыбыстар" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Басқа" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Таңбашалар темасын таңдаңыз" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Таңбашалар темасы)" diff -Nru lxappearance-0.5.2~ppa2/po/ko.po lxappearance-0.5.0/po/ko.po --- lxappearance-0.5.2~ppa2/po/ko.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/ko.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,320 +0,0 @@ -# Korean translation for the lxappearance package. -# Copyright (C) 2009-2012 Free software foundation Inc. -# This file is distributed under the same license as the lxappearance package. -# Seong-ho Cho , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: lxappearance\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-04-04 21:48+0900\n" -"Last-Translator: Seong-ho Cho \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "겉보기를 조정합니다" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "데스크톱과 프로그램의 겉보기를 조정합니다" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "데스크톱의 겉보기를 조정합니다" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Seong-ho Cho " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "아이콘만" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "글자만" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "아이콘 아래 글자배치" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "아이콘 옆에 글자 배치" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "메뉴 항목 처럼" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "도구 막대 아이콘" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "큰 도구막대 아이콘" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "단추처럼" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "드래그 아이콘 처럼" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "대화상자처럼" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "안함" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "조금" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "적당히" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "완전히" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "수직RGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "수직BGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "선택한 위젯 스타일 미리 보기" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "파일(_F)" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "편집(_E)" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "도움말(_H)" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "라디오 단추" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "체크 단추" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "단추" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "데모" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "페이지1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "페이지2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "기본 글꼴:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "위젯" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "현재 선택한 위젯 태마에서 색상 스킴을 지원하지 않습니다." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "사용자 정의 색상 스킴 사용" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "일반 창:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "글자 창:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "선택한 항목:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "도움말 풍선:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "배경" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "전경" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "색상" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "설치" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "제거" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "선택한 아이콘 테마 미리 보기" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "아이콘 테마" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "선택한 커서 테마 미리 보기" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "커서 크기" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "작게" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "크게" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"참고: 모든 데스크톱 프로그램이 그때 그때마다 커서를 바꾸는 것을 지원하" -"는 것은 아닙니다. 그래서 여기서 바꾼 사항은 다음 로그인 전까지 모든 프로그램" -"에 완전히 적용되지 않을 수도 있습니다." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "마우스 커서" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "창 테두리" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "안티앨리어싱 활성화" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "안티앨리어싱" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "힌팅 활성화" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "힌팅 방식:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "힌팅" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "서브픽셀 배치:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "서브픽셀 배치" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "글꼴" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "도구 막대 스타일:" - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "도구막대 아이콘 크기:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "단추에 그림 표시" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "메뉴에 그림 표시" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI 옵션" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "이벤트 소리 재생" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "사용자이 입력에 대한 반응으로 이벤트 소리 재생" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "소리 효과" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "기타" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "아이콘 테마를 선택하십시오" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (아이콘 테마)" diff -Nru lxappearance-0.5.2~ppa2/po/lg.po lxappearance-0.5.0/po/lg.po --- lxappearance-0.5.2~ppa2/po/lg.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/lg.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,324 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: lxappearance 0.5.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-22 23:21+0200\n" -"Last-Translator: kizito \n" -"Language-Team: Luganda \n" -"Language: lg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Tegeka eby'endabika n'enneyisa" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "W'otegekera endabika n'enneyisa y'awakolerwa ne puloguramu" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "W'okyusiza endabika n'enneyisa y'awakolerwa wa kompyuta yo" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Kizito Birabwa " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Bufaananyi bwokka nga tekuli bigambo" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Bigambo byokka" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Bigambo wansi w'obufaananyi" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Bigambo wabbali w'obufaananyi" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Ng'obw'oku menyu" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Butono" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Bunene" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Ng'obw'oku mapeesa" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Ng'obutambizika" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Ng'obw'omu buboozi" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Waleme okuba" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Katono" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Bwa wakkati" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Nzijjuvu" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Endabika y'obutundu bw'awakolerwa obw'olulyo olwo" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fayiro" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Kyusa" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Nyamba" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Ppeesa lya kiradiyo" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Ppeesa ery'akasaze" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "ppeesa" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Kulagako" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Oludda 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Oludda 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Enkula y'ennukuta eya bulijjo:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Butundu bw'awakolerwa" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" -"Ekika ky'obutundu bw'awakolerwa ky'olonze tekikolagana na kukyusa olulyo lwa " -"langi za kyo." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Weyiyize olulyo lwa langi" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Madirisa ga bulijjo:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Amadirisa agalaga ebigambo:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Ebirondedwa:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Ebigambo eby'okuwa amagezi:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Bwaliriro" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Bwanjo" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Langi" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Kozes'olwo" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Luggyemu" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Endabika y'obufaananyi obw'omu lulyo olwo" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Lulyo lw'obufaananyi" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Endabika y'obusonga obw'omu lulyo olwo" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Bunene bw'obusonga" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Kendeeza" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Yongera bunene" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Genderera: Ng'okyusizza mu ndabika y'akasonga, puloguramu ezimu " -"zisigala zikozesa endabika enkadde okutuusa lw'oddamu okuzitandika oba " -"lw'otandika olutuula olupya." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Akasonga" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Olukoloboze olwetoolola ddirisa" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Wabewo okugyamu aliyasi" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Okuseeteeza" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Wabewo hinti" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Kika kya hinti: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinti" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Entereeza y'obutundu bwa pikiseli: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Entereeza y'obutundu bwa pikiseli" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Nkula y'ennukuta" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Musono: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Bunene bw'obufaanayi: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Amapeesa gabeko obufaananyi" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Menyu zibeko n'obufaananyi" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Eby'endabika y'olubaawo lw'ebiyamba" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Vugisa amalaboozi agalaga nti waliwo ekiguddewo" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "vugisa malaboozi omukozesa nga alina by'ayingiza" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Maloboozi" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Birala" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Londa olulyo lw'obufaanayinyi obuyunzi" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Lulyo lw'obufaananyi)" diff -Nru lxappearance-0.5.2~ppa2/po/lt.po lxappearance-0.5.0/po/lt.po --- lxappearance-0.5.2~ppa2/po/lt.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/lt.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,325 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-05-17 09:09+0200\n" -"Last-Translator: Algimantas \n" -"Language-Team: LANGUAGE \n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Derinti išvaizdą" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Derina jūsų darbastalio ir programų išvaizdą" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Autorinės teisės (C) 2011 LXDE Projektas" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Derina jūsų darbastalio išvaizdą" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "" -"Julius Vitkauskas \n" -"Algimantas Margevičius " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Tik piktogramos" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Tik tekstas" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekstas po piktogramomis" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekstas šalia piktogramų" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Taip kaip meniu elementai" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Maža įrankių juostos piktograma" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Didelė įrankių juostos piktograma" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Taip kaip mygtukai" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Taip kaip vilkimo piktogramos" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Taip kaip dialogai" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Joks" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Lengvas" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Vidutinis" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Pilnas" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Išbandyti pasirinktą darbastalio temą" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Failas" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Keisti" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Pagalba" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Akutė" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Žymimasis langelis" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "mygtukas" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demonstracija" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Puslapis1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Puslapis2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Numatytasis šriftas:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Valdiklis" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Jūsų pasirinkta tema nepalaiko šios spalvų schemos." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Naudoti savą spalvų schemą" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normalūs langai:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Teksto langai:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Pasirinkti elementai:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Patarimai:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Fonas" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Priekis" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Spalva" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Diegti" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Pašalinti" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Išbandyti pasirinktą piktogramų temą" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Piktogramų tema" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Išbandyti pasirinktą kursoriaus temą" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Žymeklių dydis" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Mažesnis" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Didesnis" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Pastaba: ne visos programos palaiko žymeklio temos pakeitimą jų " -"veikimo metu. Jūsų nustatymai gali nepasikeisti, kol neprisijungsite prie " -"sistemos iš naujo." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Pelės žymeklis" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Lango rėmelis" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Įjungti glotninimą" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Glotninimas" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Įjungti taškinę korekciją" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Taškinės korekcijos stilius:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Taškinė korekcija" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Popikselinis glotninimas:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Popikselinis glotninimas" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Šriftas" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Įrankių juostos stilius:" - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Įrankių juostos piktogramų dydis:" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Rodyti paveikslėlius mygtukuose" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Rodyti paveikslėlius meniu" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI nusatymai" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Groti įvykių garsus" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Groti įvykių garsus, kaip atsaką į naudotojo įvestį" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Garso efektas" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Kita" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Pasirinkti piktogramų temą" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Piktogramų tema)" diff -Nru lxappearance-0.5.2~ppa2/po/nl.po lxappearance-0.5.0/po/nl.po --- lxappearance-0.5.2~ppa2/po/nl.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/nl.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,326 +0,0 @@ -# Dutch translation of the lxappearance package. -# Copyright (C) the author of the lxappearance package. -# This file is distributed under the same license as the -# lxappearance package. -# Pjotr, 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: lxappearance\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-09-08 19:39+0200\n" -"Last-Translator: Pjotr <>\n" -"Language-Team: Dutch\n" -"Language: nl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Uiterlijk en bediening aanpassen" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Past uiterlijk en bediening aan van uw bureaublad en toepassingen" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Auteursrecht (C) 2011 LXDE-Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Past uiterlijk en bediening aan van uw werkomgeving" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "" -"Pjotr\n" -"Enkele anderen wier namen per ongeluk zijn verwijderd (Excuus!)." - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Alleen pictogrammen" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Alleen-tekst" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekst onder pictogrammen" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekst naast pictogrammen" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Zelfde als menu-onderdelen" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Klein werkbalkpictogram" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Groot werkbalkpictogram" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Zelfde als knoppen" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Zelfde als sleep-pictogrammen" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Zelfde als dialogen" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Geen" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Gering" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Gemiddeld" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Volledig" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Vooruitblik van de gekozen widgetstijl" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Bestand" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "Be_werken" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Hulp" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Radioknop" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Controleknop" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "knop" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demonstratie" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Pagina 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Pagina 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Standaardlettertype:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" -"Kleurenschema wordt niet ondersteund door het thans gekozen widget-thema." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Gebruik aangepast kleurenschema" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normale vensters:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Tekstvensters:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Geselecteerde elementen:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Gereedschaptips:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Achtergrond" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Voorgrond" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Kleur" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Installeer" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Verwijderen" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Vooruitblik van het gekozen pictogramthema" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Pictogramthema" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Vooruitblik van het gekozen aanwijzerthema" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Grootte van aanwijzers" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Kleiner" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Groter" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Let op: Niet alle toepassingen ondersteunen een verandering van het " -"muispijlthema zonder herstart. Dus uw veranderingen hier zouden pas volledig " -"van kracht kunnen zijn na uw volgende aanmelding." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Muispijl" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Vensterrand" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Anti-kartelvorming inschakelen" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Anti-kartelvorming" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Vormsuggesties inschakelen" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Stijl van vormsuggesties: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Vormsuggesties" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Subpixelgeometrie: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Subpixelgeometrie" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Lettertype" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Stijl van werkbalk: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Grootte van werkbalkpictogram: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Toon afbeeldingen op knoppen" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Toon afbeeldingen in menu's" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opties voor de gebruikersomgeving" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Speel gebeurtenisgeluiden af" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Speel gebeurtenisgeluiden af als terugkoppeling op gebruikersinvoer" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Geluideffect" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Ander" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Kies een pictogramthema" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (pictogramthema)" diff -Nru lxappearance-0.5.2~ppa2/po/pa.po lxappearance-0.5.0/po/pa.po --- lxappearance-0.5.2~ppa2/po/pa.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/pa.po 2010-10-12 15:20:22.000000000 +0000 @@ -6,18 +6,17 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" +"POT-Creation-Date: 2010-10-09 06:00+0000\n" "PO-Revision-Date: 2010-10-10 07:57+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "ਦਿੱਖ ਤੇ ਪਰਭਾਵ ਪਸੰਦ ਮੁਤਾਬਕ" @@ -25,301 +24,234 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "ਆਪਣੇ ਡੈਸਕਟਾਪ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਦਿੱਖ ਤੇ ਪਰਭਾਵ ਆਪਣੇ ਮੁਤਾਬਕ ਬਣਾਓ" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "ਆਪਣੇ ਡੈਸਕਟਾਪ ਦੀ ਦਿੱਖ ਤੇ ਪਰਭਾਵ ਬਦਲੋ" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "" "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੧੦\n" "ਪੰਜਾਬੀ ਓਪਨਸੋਰਸ ਟੀਮ (POST)\n" "http://www.satuj.com" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "ਕੇਵਲ ਆਈਕਾਨ" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "ਕੇਵਲ ਟੈਕਸਟ" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "ਆਈਕਾਨ ਹੇਠ ਟੈਕਸਟ" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "ਆਈਕਾਨ ਨਾਲ ਟੈਕਸਟ" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "ਮੇਨੂ ਆਈਟਮ ਵਜੋਂ" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "ਛੋਟੇ ਟੂਲਬਾਰ ਆਈਕਾਨ" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "ਵੱਡੇ ਟੂਲਬਾਰ ਆਈਕਾਨ" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "ਬਟਨ ਵਜੋਂ" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "ਡਰੈਗ ਆਈਕਾਨ ਵਜੋਂ" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "ਡਾਈਲਾਗ ਵਜੋਂ" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "GUI ਚੋਣਾਂ" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." msgstr "" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "ਸਾਊਂਡ ਪਰਭਾਵ" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "ਬੈਕਗਰਾਊਂਡ" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "ਹੋਰ ਵੱਡਾ" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "ਚੈੱਕ ਬਟਨ" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "ਰੰਗ" -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." msgstr "" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "ਡਿਫਾਲਟ ਫੋਂਟ:" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "ਚੁਣੇ ਵਿਦਜੈੱਟ ਸਟਾਈਲ ਦੀ ਝਲਕ ਵੇਖੋ" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "ਡੈਮੋ" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "ਫਾਇਲ(_F)" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "ਫਾਰਗਰਾਊਂਡ" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "ਸੋਧ(_E)" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "ਆਈਕਾਨ ਥੀਮ" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "ਮੱਦਦ(_H)" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "ਕੇਵਲ ਆਈਕਾਨ" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "ਰੇਡੀਓ ਬਟਨ" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "ਇੰਸਟਾਲ" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "ਚੈੱਕ ਬਟਨ" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "ਵੱਡੇ ਟੂਲਬਾਰ ਆਈਕਾਨ" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "ਬਟਨ" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "ਮਾਊਸ ਕਰਸਰ" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "ਡੈਮੋ" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "ਸਧਾਰਨ ਵਿੰਡੋਜ਼:" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "ਹੋਰ" + +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "ਪੇਜ਼1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "ਪੇਜ਼2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "ਡਿਫਾਲਟ ਫੋਂਟ:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "ਵਿਦਜੈੱਟ" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "ਈਵੈਂਟ ਸਾਊਂਡ ਚਲਾਓ" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "ਪਸੰਦੀਦਾ ਰੰਗ ਸਕੀਮ ਵਰਤੋਂ" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "ਯੂਜ਼ਰ ਇੰਪੁੱਟ ਦੇ ਜਵਾਬ ਵਿੱਚ ਈਵੈਂਟ ਸਾਊਂਡ ਚਲਾਓ" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "ਸਧਾਰਨ ਵਿੰਡੋਜ਼:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "ਚੁਣੇ ਕਰਸਰ ਥੀਮ ਦੀ ਝਲਕ ਵੇਖੋ" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "ਟੈਕਸਟ ਵਿੰਡੋਜ਼:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "ਚੁਣੇ ਆਈਕਾਨ ਥੀਮ ਦੀ ਝਲਕ ਵੇਖੋ" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "ਚੁਣੇ ਵਿਦਜੈੱਟ ਸਟਾਈਲ ਦੀ ਝਲਕ ਵੇਖੋ" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "ਟੂਲ-ਟਿੱਪ:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "ਰੇਡੀਓ ਬਟਨ" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "ਬੈਕਗਰਾਊਂਡ" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "ਹਟਾਓ" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "ਫਾਰਗਰਾਊਂਡ" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "ਬਟਨ ਵਜੋਂ" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "ਰੰਗ" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "ਡਾਈਲਾਗ ਵਜੋਂ" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "ਇੰਸਟਾਲ" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "ਡਰੈਗ ਆਈਕਾਨ ਵਜੋਂ" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "ਹਟਾਓ" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "ਮੇਨੂ ਆਈਟਮ ਵਜੋਂ" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "ਚੁਣੇ ਆਈਕਾਨ ਥੀਮ ਦੀ ਝਲਕ ਵੇਖੋ" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "ਆਈਕਾਨ ਥੀਮ" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "ਮੇਨੂ 'ਚ ਚਿੱਤਰ ਵੇਖੋ" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "ਚੁਣੇ ਕਰਸਰ ਥੀਮ ਦੀ ਝਲਕ ਵੇਖੋ" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "ਬਟਨ ਉੱਤੇ ਚਿੱਤਰ ਵੇਖੋ" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "ਕਰਸਰ ਦਾ ਆਕਾਰ" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "ਛੋਟੇ ਟੂਲਬਾਰ ਆਈਕਾਨ" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "ਹੋਰ ਛੋਟੇ" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "ਹੋਰ ਵੱਡਾ" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "ਮਾਊਸ ਕਰਸਰ" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "ਵਿੰਡੋ ਬਾਰਡਰ" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "ਆਈਕਾਨ ਹੇਠ ਟੈਕਸਟ" -#: ../data/ui/lxappearance.ui.h:56 -#, fuzzy -msgid "Hinting" -msgstr "GUI ਚੋਣਾਂ" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "ਆਈਕਾਨ ਨਾਲ ਟੈਕਸਟ" -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "ਕੇਵਲ ਟੈਕਸਟ" -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "ਟੈਕਸਟ ਵਿੰਡੋਜ਼:" -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "ਟੂਲਬਾਰ ਆਈਕਾਨ ਆਕਾਰ:" -#: ../data/ui/lxappearance.ui.h:60 -#, fuzzy -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "ਟੂਲਬਾਰ ਸਟਾਇਲ:" -#: ../data/ui/lxappearance.ui.h:61 -#, fuzzy -msgid "Toolbar Icon Size: " -msgstr "ਟੂਲਬਾਰ ਆਈਕਾਨ ਆਕਾਰ:" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "ਟੂਲ-ਟਿੱਪ:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "ਬਟਨ ਉੱਤੇ ਚਿੱਤਰ ਵੇਖੋ" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "ਪਸੰਦੀਦਾ ਰੰਗ ਸਕੀਮ ਵਰਤੋਂ" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "ਮੇਨੂ 'ਚ ਚਿੱਤਰ ਵੇਖੋ" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "ਵਿਦਜੈੱਟ" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI ਚੋਣਾਂ" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "ਵਿੰਡੋ ਬਾਰਡਰ" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "ਈਵੈਂਟ ਸਾਊਂਡ ਚਲਾਓ" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "ਸੋਧ(_E)" -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "ਯੂਜ਼ਰ ਇੰਪੁੱਟ ਦੇ ਜਵਾਬ ਵਿੱਚ ਈਵੈਂਟ ਸਾਊਂਡ ਚਲਾਓ" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "ਫਾਇਲ(_F)" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "ਸਾਊਂਡ ਪਰਭਾਵ" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "ਮੱਦਦ(_H)" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "ਹੋਰ" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "ਬਟਨ" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "ਇੱਕ ਆਈਕਾਨ ਥੀਮ ਚੁਣੋ" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ਆਈਕਾਨ ਥੀਮ)" + diff -Nru lxappearance-0.5.2~ppa2/po/pl.po lxappearance-0.5.0/po/pl.po --- lxappearance-0.5.2~ppa2/po/pl.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/pl.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,323 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Piotr Sokół , 2010, 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: lxappearance 0.5.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-28 19:35+0200\n" -"Last-Translator: Artur \n" -"Language-Team: Polish <>\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Preferencje wyglądu" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Dostosowuje wygląd środowiska graficznego" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Dostosowuje wygląd środowiska graficznego" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Piotr Sokół , 2010, 2011" - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Tylko ikony" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Tylko etykiety" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Etykiety poniżej ikon" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Etykiety obok ikon" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Taki jak elementów menu" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Małe ikony paska narzędzi" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Duże ikony paska narzędzi" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Taki jak przycisków" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Taki jak ikon przeciągania" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Taki jak okien dialogowych" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Brak" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Mały" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Średnie" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Pełny" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Podgląd wybranego stylu widżetów" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Plik" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Edycja" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "Pomo_c" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Przycisk pojedynczego wyboru" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Pole wyboru" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "Przycisk" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Prezentacja" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Karta1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Karta2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Domyślna czcionka:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widżety" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Schematy kolorów nie są obsługiwane przez bieżący motyw." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Własne" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normalne okna:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Pola wejściowe:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Wybrane elementy:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Podpowiedzi:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Drugoplanowy" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Pierwszoplanowy" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Kolory" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Zainstaluj" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Usuń" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Podgląd wybranego stylu ikon" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Motyw ikon" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Podgląd wybranego stylu kursora" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Rozmiar" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Mniejszy" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Większy" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Uwaga: Nie wszystkie programy obsługują natychmiastową zmianę kursora " -"myszy. Modyfikacje mogą zostać w pełni wprowadzone po ponownym zalogowaniu " -"do środowiska graficznego." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Kursory myszy" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Obramowanie okien" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Włącz antyalising" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antyaliasing" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Włącz wygładzanie" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Styl wygładzania:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Wygładzanie" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometria pod-pikseli: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometria pod-pikseli" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Czcionka" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Styl paska narzędziowego: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Rozmiar ikon paska narzędziowego: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Wyświetlanie ikon na przyciskach" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Wyświetlanie ikon w menu" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Interfejs użytkownika" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Odtwarzanie zdarzeń dźwiękowych" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Odtwarzanie zdarzeń dźwiękowych jako reakcja na wprowadzania danych" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Dźwięki" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Inne" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Wybór pliku" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (zestawy ikon)" diff -Nru lxappearance-0.5.2~ppa2/po/pt.po lxappearance-0.5.0/po/pt.po --- lxappearance-0.5.2~ppa2/po/pt.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/pt.po 2010-10-12 15:20:22.000000000 +0000 @@ -1,26 +1,23 @@ # Portuguese translation for LXAPPEARANCE. # Copyright (C) 2010 The LXAPPEARANCE Copyright Holder. # This file is distributed under the same license as the LXAPPEARANCE package. -# Sérgio Marques , 2010-2012. +# Sérgio Marques , 2010. # Adaptado ao acordo ortográfico de 1990 msgid "" msgstr "" -"Project-Id-Version: lxappearance\n" +"Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-05-18 10:48-0000\n" +"POT-Creation-Date: 2010-10-07 06:08+0000\n" +"PO-Revision-Date: 2010-09-15 16:15-0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Personalizar aparência e comportamento" @@ -28,297 +25,227 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Personaliza o aspeto do seu ambiente de trabalho e das aplicações" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Direitos de autor (C) 2011 Projeto LXDE" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Direitos de autor (C) 2010 Projeto LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" -msgstr "Personaliza a aparência do seu ambiente de trabalho" +msgstr "Personaliza o aspecto do seu ambiente de trabalho" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Só ícones" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Opções de interface" -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Só texto" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Nota: nem todas as aplicações suportam a alteração imediata dos cursores. Assim, algumas alterações efetuadas poderão não ser aplicadas até ao próximo início de sessão." -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Texto por baixo dos ícones" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Texto ao lado dos ícones" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Efeitos sonoros" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "O mesmo dos itens de menu" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Fundo" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Ícones pequenos" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Maior" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Ícones grandes" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Botão de verificação" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "O mesmo dos botões" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Cor" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "O mesmo dos ícones arrastáveis" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "O esquema de cores não é suportado pelo tema atual." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "O mesmo dos diálogos" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Tipo de letra por omissão:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Nenhum" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Ligeiro" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Média" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Total" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Antevisão do estilo do \"widget\" selecionado" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Primeiro plano" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Ficheiro" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Tema de ícones" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Editar" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Apenas ícones" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Ajuda" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Instalar" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Botão de opção" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Ícones grandes" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Botão de seleção" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Cursor do rato" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "botão" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Janelas normais:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demonstração" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Outros" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Página1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Página2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Tipo de letra padrão:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "O esquema de cores não é suportado pelo tema atual." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Reproduzir sons de eventos" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Utilizar esquema personalizado" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "Reproduzir sons como resposta à ação do utilizador" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Janelas normais:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Antevisão do tema de cursor selecionado" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Janelas de texto:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Antevisão do tema de ícones selecionado" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Itens selecionados:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Antevisão do estilo do \"widget\" selecionado" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Dicas:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Botão rádio" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Fundo" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Remover" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Principal" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "O mesmo dos botões" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Cor" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "O mesmo dos diálogos" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instalar" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "O mesmo dos ícones arrastáveis" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Remover" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "O mesmo dos itens de menu" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Antevisão do tema de ícones selecionado" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Itens selecionados:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema de ícones" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Mostrar imagens nos menus" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Antevisão do tema de cursor selecionado" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Mostrar imagens nos botões" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Tamanho dos cursores" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Ícones pequenos" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Menor" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Maior" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Texto por baixo dos ícones" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Nota: nem todas as aplicações suportam a alteração imediata dos " -"cursores. Assim, algumas alterações efetuadas poderão não ser aplicadas até " -"ao próximo início de sessão." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Texto ao lado dos ícones" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Cursor do rato" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Apenas texto" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Contornos da janela" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Janelas de texto:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Ativar suavização" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Suavização" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Ativar ajustes" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Estilo dos ajustes: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Ajustes" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometria de subpixel: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometria de subpixel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Tipo de letra" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Estilo da barra de ferramentas: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Tamanho da barra de ícones: " +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Tamanho do ícone na barra de ferramentas:" + +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" +msgstr "Estilo da barra de ferramentas:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Mostrar imagens nos botões" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Dicas de ferramentas:" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Mostrar imagens nos menus" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Utilizar esquema personalizado" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opções de interface" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "\"Widget\"" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Reproduzir sons de eventos" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Contornos da janela" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Reproduzir sons como resposta à ação do utilizador" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Editar" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Efeitos sonoros" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Ficheiro" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Outros" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Ajuda" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "botão" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Selecione um tema de ícones" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Tema de ícones)" +msgstr "*.tar.gz, *.tar.bz2 (Tema de ícone)" diff -Nru lxappearance-0.5.2~ppa2/po/pt_BR.po lxappearance-0.5.0/po/pt_BR.po --- lxappearance-0.5.2~ppa2/po/pt_BR.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/pt_BR.po 2010-10-06 17:04:36.000000000 +0000 @@ -2,24 +2,20 @@ # Copyright (C) 2010 The creators of LXAPPEARANCE. # This file is distributed under the same license as the LXAPPEARANCE package. # Henrique P. Machado , 2010. -# Sérgio Cipolla , 2010-2011. # msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-06-11 14:05+0200\n" -"Last-Translator: Sérgio \n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-10 00:21-03:00\n" +"Last-Translator: Henrique P. Machado \n" "Language-Team: Brazilian Porguese \n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.5\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Personalizar visual" @@ -27,301 +23,235 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Personaliza o visual de sua área de trabalho e aplicativos" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Personaliza o visual de sua área de trabalho" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" -msgstr "" -"Henrique P. Machado \n" -"Sérgio Cipolla " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Somente ícones" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Somente texto" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Texto abaixo de ícones" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Texto ao lado de ícones" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "O mesmo que nos itens de menu" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Ícones pequenos" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Ícones grandes" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "O mesmo que nos botões" +msgstr "Henrique P. Machado " -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "O mesmo que em ícones arrastáveis" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Opções de gráficos" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "O mesmo que nos diálogos" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Nota: Nem todos os aplicativos da área de trabalho suportam mudança " +"do tema do cursor em tempo real. Então suas alterações aqui podem não ser " +"aplicadas a todos os aplicativos até o próximo início de sessão." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Nenhum(a)" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Efeito de som" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Leve" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Plano de fundo" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Médio" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Enorme" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Completo" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Botão de verificação" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Cor" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "" +"O esquema de cores não tem suporte pelo tema do widget selecionado " +"atualmente." -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Fonte padrão:" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Visualização do estilo do widget selecionado" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Primeiro plano" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Arquivo" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Tema de ícones" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Editar" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Somente ícones" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "Aj_uda" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Instalar" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Botão de rádio" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Ícone da barra de ferramentas grande" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Botão de verificação" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Cursor do mouse" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "botão" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Janelas normais:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Outros" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Página 1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Página 2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Fonte padrão:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "" -"O esquema de cores não tem suporte pelo tema do widget selecionado " -"atualmente." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Reproduzir sons de eventos" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Usar esquema de cor personalizado" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "Reproduzir sons de eventos como feedback à entrada do usuário" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Janelas normais:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Visualização do tema de cursor selecionado" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Janelas de texto:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Visualização do tema de ícones selecionado" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Itens selecionados:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Visualização do estilo do widget selecionado" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Dicas de ferramentas:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Botão de rádio" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Plano de fundo" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Remover" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Primeiro plano" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "O mesmo que botões" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Cor" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "O mesmo que diálogos" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instalar" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "O mesmo que ícones arrastáveis" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Remover" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "O mesmo que itens de menu" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Visualização do tema de ícones selecionado" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Itens selecionados:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema de ícones" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Mostrar imagens em menus" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Visualização do tema de cursor selecionado" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Mostrar imagens em botões" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Tamanho dos cursores" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Ícone da barra de ferramentas pequeno" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Menor" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Enorme" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Texto abaixo de ícones" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Nota: nem todos os aplicativos da área de trabalho suportam mudança " -"do tema do cursor em tempo real. Então suas alterações aqui podem não ser " -"aplicadas a todos os aplicativos até o próximo início de sessão." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Texto ao lado de ícones" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Cursor do mouse" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Somente texto" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Borda da janela" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Janelas de texto:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Habilitar antialiasing" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialiasing" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Habilitar hinting" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Estilo do hinting:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometria de subpixel:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometria de subpixel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Fonte" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Estilo da barra de ferramentas: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Tamanho dos ícones na barra de ferramentas: " +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Tamanho do ícone da barra de ferramentas:" + +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" +msgstr "Estilo da barra de ferramentas:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Mostrar imagens em botões" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Dicas de ferramentas:" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Mostrar imagens em menus" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Usar esquema de cor personalizado" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opções gráficas" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Reproduzir sons de eventos" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Borda da janela" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Reproduzir sons de eventos como resposta a entradas do usuário" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Editar" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Efeitos de som" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Arquivo" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Outros" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "Aj_uda" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "botão" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Selecione um tema de ícones" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (tema de ícones)" +msgstr "*.tar.gz, *.tar.bz2 (Tema de ícone)" diff -Nru lxappearance-0.5.2~ppa2/po/ro.po lxappearance-0.5.0/po/ro.po --- lxappearance-0.5.2~ppa2/po/ro.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/ro.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,323 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-04-19 13:43+0200\n" -"Last-Translator: Mișu \n" -"Language-Team: LANGUAGE \n" -"Language: ro\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2);;\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Personalizați desktopul" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Personalizați aspectul desktopului și al programelor" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Drepturi de autor (C) 2011 Proiectul LXDE" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Personalizați-vă desktopul" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Mișu Moldovan " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Doar iconițe" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Doar text" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Text sub iconițe" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Text lângă iconițe" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Precum elementele din meniuri" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Iconițe mici în bara cu unelte" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Iconițe mari în bara cu unelte" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Precum butoanele" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Precum iconițele de drag&drop" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Precum ferestrele de tip dialog" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Fără" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Ușor" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Mediu" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Complet" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Previzualizare a stilului GTK+ selectat" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Fișier" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Editare" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Ajutor" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Buton radio" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Bifă" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "buton" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Pagina1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Pagina2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Font implicit:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Temă GTK+" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Tema GTK+ selectată curent nu are suport pentru scheme de culoare." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Utilizează o schemă personalizată de culori" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Ferestre obișnuite:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Ferestre cu text" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Elemente selectate:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Indicii:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Fundal" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Prim-plan" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Culoare" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instalare" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Eliminare" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Previzualizare a temei de iconițe selectate" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Temă de iconițe" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Previzualizare a temei de cursor selectate" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Mărimea cursorului" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Mai mici" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Mai mare" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Notă: Nu toate programele suportă schimbarea dinamică a cursorului. " -"Prin urmare, s-ar putea ca unele modificări din această secțiune să fie " -"aplicate complet doar la următoarea autentificare." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Cursor de maus" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Chenarul ferestrei" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Activare antialias" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Antialias" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Activare hinting" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Stil de hinting: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Geometrie sub-pixel: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Geometrie sub-pixel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Font" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Stil al barei cu unelte: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Mărime a iconițelor din bara cu unelte: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Arată imagini pe butoane" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Arată imagini în meniuri" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Opțiuni GUI" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Redă evenimente sonore" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Redă evenimente sonore ca feedback pentru inputul utilizatorului" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Sunete" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Altele" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Selectați o temă de iconițe" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (teme de iconițe)" diff -Nru lxappearance-0.5.2~ppa2/po/ru.po lxappearance-0.5.0/po/ru.po --- lxappearance-0.5.2~ppa2/po/ru.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/ru.po 2010-10-06 17:04:15.000000000 +0000 @@ -8,21 +8,19 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-08-08 14:23+0200\n" -"Last-Translator: Max \n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-08 11:32+0300\n" +"Last-Translator: Alexander Kazancev \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Настройка внешнего вида" @@ -30,298 +28,234 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Настройте тему рабочего стола и приложений" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright (C) 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Настройте тему рабочего стола" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Alexander Kazancev" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Только значки" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Только текст" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Параметры графического интерфейса" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Текст под значками" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Замечание: Не все приложения поддерживают смену темы курсора на лету. " +"Поэтому ваши изменения могут быть применены только при следующем запуске " +"приложения." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Текст рядом со значками" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Звуковые эффекты" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Также как элементы меню" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "В фоне" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Маленькие значки панели" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Больше" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Большие иконки панели" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Флажок" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Также как кнопки" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Цвет" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Также как перемещаемые значки" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Цветовая схема не поддерживается текущей выбранной темой." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Также как диалоги" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Шрифт по умолчанию:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Нет" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Слабое" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Среднее" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Полное" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Демонстрация" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Предпросмотр выбранной темы окон" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Передний план" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Файл" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Темы значков" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Правка" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Только значки" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Справка" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Установить" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Переключатель" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Большие иконки панели" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Флажок" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Курсор мыши" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "кнопка" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Нормальные окна:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Демонстрация" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Другие" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Страница 1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Страница 2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Шрифт по умолчанию:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Виджет" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Цветовая схема не поддерживается текущей выбранной темой." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Проигрывать звук события" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Использовать изменённую цветовую схему" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "проигрывать звук события как ответ ввода пользователя" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Нормальные окна:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Предпросмотр выбранной темы курсоров" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Текст окон:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Предпросмотр выбранной темы значков" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Выбранные элементы:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Предпросмотр выбранной темы окон" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Подсказки:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Переключатель" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "В фоне" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Удалить" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Передний план" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "Также как кнопки" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Цвет" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "Также как диалоги" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Установить" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "Также как перемещаемые значки" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Удалить" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "Также как элементы меню" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Предпросмотр выбранной темы значков" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Выбранные элементы:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Темы значков" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Показывать изображения в меню" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Предпросмотр выбранной темы курсоров" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Показывать изображения на кнопках" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Размер курсоров" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Маленькие значки панели" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Меньше" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Больше" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Текст под значками" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Замечание: Не все приложения поддерживают смену темы курсора на лету. " -"Поэтому ваши изменения могут быть применены только при следующем запуске " -"приложения." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Текст рядом со значками" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Курсор мыши" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Только текст" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Рамка окна" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Текст окон:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Включить сглаживание" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Сглаживание" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Включить хинтование" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Стиль хинтования: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Хинтование" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Субпиксельная геометрия: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Субпиксельная геометрия" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Шрифт" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Стиль панели инструментов: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Размер значков панели инструментов: " +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Размер иконок панели:" + +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" +msgstr "Стиль панели инструментов:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Показывать изображения на кнопках" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Подсказки:" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Показывать изображения в меню" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Использовать измененную цветовую схему" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Параметры графического интерфейса" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Виджет" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Проигрывать звук события" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Рамка окна" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "проигрывать звук события как ответ на ввод пользователя" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Правка" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Звуковые эффекты" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Файл" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Другие" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Справка" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "кнопка" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Выберите тему значков" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Тема значков)" @@ -377,6 +311,9 @@ #~ msgid "Icon" #~ msgstr "Значки" +#~ msgid "_Font:" +#~ msgstr "_Шрифт:" + #~ msgid "Appearance" #~ msgstr "Внешний вид" diff -Nru lxappearance-0.5.2~ppa2/po/sl.po lxappearance-0.5.0/po/sl.po --- lxappearance-0.5.2~ppa2/po/sl.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/sl.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,321 +0,0 @@ -# Slovenian translation of lxappearance. -# Copyright (C) 2011 Free Software Foundation, Inc. -# This file is distributed under the same license as the lxappearance package. -# Klemen Košir , 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: lxappearance\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-11-20 10:54+0100\n" -"Last-Translator: Klemen Košir \n" -"Language-Team: Slovenian \n" -"Language: sl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -"%100==4 ? 3 : 0);\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Videz in občutek" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Prilagodite videz in občutek namizja" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Avtorske pravice © 2011 Projekt LXDE" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Prilagodite videz in občutek namizja" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Klemen Košir " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Ikone" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Besedilo" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Besedilo pod ikonami" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Besedilo poleg ikon" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Enaka predmetom menija" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Majhne ikone" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Velike ikone" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Enaka gumbom" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Enaka vlečnim ikonam" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Enaka pogovornim oknom" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Brez" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Rahlo" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Srednje" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Polno" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Predogled izbranega sloga gradnikov" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Datoteka" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Uredi" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "Pomo_č" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Izbirni gumb" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Označno polje" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "Gumb" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Preizkus" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Zavihek 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Zavihek 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Privzeta pisava:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Gradniki" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Trenutna tema gradnikov ne podpira barvnih shem." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Uporabi prilagojeno barvno shemo" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Običajna okna:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Besedilna okna:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Izbrani predmeti:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Orodni namigi:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Ozadje" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Ospredje" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Barva" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Namesti" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Odstrani" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Predogled izbrane teme ikon" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema ikon" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Predogled izbrane teme kazalke" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Velikost kazalke" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Manjša" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Večja" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Opomba: Vsi programi ne podpirajo sprotnega spreminjanja teme " -"kazalke. Nekatere spremembe bodo uveljavljene šele ob naslednji prijavi." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Kazalka" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Obroba oken" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Omogoči glajenje robov" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Glajenje robov" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Omogoči glajenje pisave" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Slog glajenja pisave: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Glajenje pisave" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Podtočkovna geometrija: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Podtočkovna geometrija" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Pisava" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Slog orodne vrstice: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Velikost ikon orodne vrstice: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Pokaži slilke na gumbih" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Pokaži slike v menijih" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Grafični vmesnik" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Predvajaj zvoke ob dogodkih" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Predvajaj zvoke kot odziv vnosu uporabnika" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Zvočni učinki" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Drugo" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Izberite temo ikon" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Tema ikon)" diff -Nru lxappearance-0.5.2~ppa2/po/sr.po lxappearance-0.5.0/po/sr.po --- lxappearance-0.5.2~ppa2/po/sr.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/sr.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,18 +7,17 @@ msgstr "" "Project-Id-Version: LXAppearance package\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" +"POT-Creation-Date: 2010-08-17 05:37+0000\n" "PO-Revision-Date: 2010-08-17 13:56+0100\n" "Last-Translator: Jay Alexander Fleming \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 +#: ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Подешавања изгледа" @@ -26,304 +25,231 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Прилагодите изглед радне површи и програма" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "LXDE Project — 2011. Сва права задржана." +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "LXDE Project — 2010. Сва права задржана." -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Прилагодите изглед радне површи" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Serbian (sr) — Jay A. Fleming " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Само иконе" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Само текст" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Текст испод икона" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Текст поред икона" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Исто као ставке менија" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Мале иконе у траци са алатима" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Велике иконе у траци са алатима" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Исто као дугмад" - -#: ../data/ui/lxappearance.ui.h:9 -#, fuzzy -msgid "Same as drag icons" -msgstr "Исто као превучене иконе" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Подешавања графичког корисничког интерфејса" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Исто као дијалози" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Напомена: Аутоматску промену изгледа показивача не подржавају сви програми. Ове промене у тим програмима биће видљиве након наредног пријављивања на систем." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Звучни догађаји" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Позадина" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Веће" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Дугме за потврду" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Боје" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Одабрана тема контрола не подржава шему боја." -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Подразумевани фонт:" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Демо" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Преглед изгледа одабраног виџета" +#: ../data/ui/lxappearance.glade.h:12 +#, fuzzy +msgid "Foreground" +msgstr "Боја исцртавања" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Датотека" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Тема икона" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Уреди" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Само иконе" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Помоћ" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Инсталирај" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Радио дугме" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Велике иконе у траци са алатима" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Дугме за потврду" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Показивач миша" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "дугме" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Прозори - подразумевано:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Демо" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Остало" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Страна1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Страна2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Подразумевани фонт:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Контрола" +#: ../data/ui/lxappearance.glade.h:22 +#, fuzzy +msgid "Play event sounds" +msgstr "Озвучи догађаје" -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Одабрана тема контрола не подржава шему боја." +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Преглед одабране теме показивача" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Користи прилагођену шему боја" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Преглед одабране теме икона" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Прозори - подразумевано:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Преглед изгледа одабраног виџета" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Прозори за текст:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Радио дугме" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Одабране ставке:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Уклони" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Облачићи са саветима:" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Исто као дугмад" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Позадина" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Исто као дијалози" -#: ../data/ui/lxappearance.ui.h:39 +#: ../data/ui/lxappearance.glade.h:30 #, fuzzy -msgid "Foreground" -msgstr "Боја исцртавања" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Боје" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Инсталирај" +msgid "Same as drag icons" +msgstr "Исто као превучене иконе" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Уклони" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Исто као ставке менија" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Преглед одабране теме икона" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Одабране ставке:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Тема икона" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Прикажи слике у менијима" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Преглед одабране теме показивача" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Прикажи слике на дугмадима" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Величина показивача" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Мале иконе у траци са алатима" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Мање" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Веће" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Напомена: Аутоматску промену изгледа показивача не подржавају сви " -"програми. Ове промене у тим програмима биће видљиве након наредног " -"пријављивања на систем." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Показивач миша" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Ивица прозора" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Текст испод икона" -#: ../data/ui/lxappearance.ui.h:56 -#, fuzzy -msgid "Hinting" -msgstr "Подешавања графичког корисничког интерфејса" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Текст поред икона" -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Само текст" -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Прозори за текст:" -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Величина икона у траци са алатима: " -#: ../data/ui/lxappearance.ui.h:60 -#, fuzzy +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "Изглед траке са алатима: " -#: ../data/ui/lxappearance.ui.h:61 -#, fuzzy -msgid "Toolbar Icon Size: " -msgstr "Величина икона у траци са алатима: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Облачићи са саветима:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Прикажи слике на дугмадима" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Користи прилагођену шему боја" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Прикажи слике у менијима" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Контрола" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Подешавања графичког корисничког интерфејса" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Ивица прозора" -#: ../data/ui/lxappearance.ui.h:65 -#, fuzzy -msgid "Play event sounds" -msgstr "Озвучи догађаје" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Уреди" -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "додели звук догађају као одговор на корисничку акцију" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Датотека" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Звучни догађаји" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Помоћ" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Остало" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "дугме" -#: ../src/utils.c:217 +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "додели звук догађају као одговор на корисничку акцију" + +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Изаберите пакет са темом икона" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (тема икона)" + diff -Nru lxappearance-0.5.2~ppa2/po/sr@latin.po lxappearance-0.5.0/po/sr@latin.po --- lxappearance-0.5.2~ppa2/po/sr@latin.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/sr@latin.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,18 +7,17 @@ msgstr "" "Project-Id-Version: LXAppearance package\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" +"POT-Creation-Date: 2010-08-17 05:37+0000\n" "PO-Revision-Date: 2010-08-17 13:56+0100\n" "Last-Translator: Jay Alexander Fleming \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 +#: ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Podešavanja izgleda" @@ -26,304 +25,231 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Prilagodite izgled radne površi i programa" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "LXDE Project — 2011. Sva prava zadržana." +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "LXDE Project — 2010. Sva prava zadržana." -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Prilagodite izgled radne površi" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Serbian (sr) — Jay A. Fleming " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Samo ikone" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Samo tekst" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Tekst ispod ikona" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Tekst pored ikona" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Isto kao stavke menija" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Male ikone u traci sa alatima" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Velike ikone u traci sa alatima" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Isto kao dugmad" - -#: ../data/ui/lxappearance.ui.h:9 -#, fuzzy -msgid "Same as drag icons" -msgstr "Isto kao prevučene ikone" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Podešavanja grafičkog korisničkog interfejsa" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Isto kao dijalozi" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Napomena: Automatsku promenu izgleda pokazivača ne podržavaju svi programi. Ove promene u tim programima biće vidljive nakon narednog prijavljivanja na sistem." -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Zvučni događaji" -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Pozadina" -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Veće" -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Dugme za potvrdu" -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Boje" -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Odabrana tema kontrola ne podržava šemu boja." -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Podrazumevani font:" -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Pregled izgleda odabranog vidžeta" +#: ../data/ui/lxappearance.glade.h:12 +#, fuzzy +msgid "Foreground" +msgstr "Boja iscrtavanja" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Datoteka" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Tema ikona" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Uredi" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Samo ikone" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Pomoć" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Instaliraj" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Radio dugme" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Velike ikone u traci sa alatima" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Dugme za potvrdu" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Pokazivač miša" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "dugme" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Prozori - podrazumevano:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Ostalo" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Strana1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Strana2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Podrazumevani font:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Kontrola" +#: ../data/ui/lxappearance.glade.h:22 +#, fuzzy +msgid "Play event sounds" +msgstr "Ozvuči događaje" -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Odabrana tema kontrola ne podržava šemu boja." +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Pregled odabrane teme pokazivača" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Koristi prilagođenu šemu boja" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Pregled odabrane teme ikona" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Prozori - podrazumevano:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Pregled izgleda odabranog vidžeta" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Prozori za tekst:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Radio dugme" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Odabrane stavke:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Ukloni" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Oblačići sa savetima:" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Isto kao dugmad" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Pozadina" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Isto kao dijalozi" -#: ../data/ui/lxappearance.ui.h:39 +#: ../data/ui/lxappearance.glade.h:30 #, fuzzy -msgid "Foreground" -msgstr "Boja iscrtavanja" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Boje" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Instaliraj" +msgid "Same as drag icons" +msgstr "Isto kao prevučene ikone" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Ukloni" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Isto kao stavke menija" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Pregled odabrane teme ikona" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Odabrane stavke:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Tema ikona" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Prikaži slike u menijima" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Pregled odabrane teme pokazivača" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Prikaži slike na dugmadima" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Veličina pokazivača" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Male ikone u traci sa alatima" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Manje" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Veće" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Napomena: Automatsku promenu izgleda pokazivača ne podržavaju svi " -"programi. Ove promene u tim programima biće vidljive nakon narednog " -"prijavljivanja na sistem." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Pokazivač miša" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Ivica prozora" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Tekst ispod ikona" -#: ../data/ui/lxappearance.ui.h:56 -#, fuzzy -msgid "Hinting" -msgstr "Podešavanja grafičkog korisničkog interfejsa" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Tekst pored ikona" -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Samo tekst" -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Prozori za tekst:" -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Veličina ikona u traci sa alatima: " -#: ../data/ui/lxappearance.ui.h:60 -#, fuzzy +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "Izgled trake sa alatima: " -#: ../data/ui/lxappearance.ui.h:61 -#, fuzzy -msgid "Toolbar Icon Size: " -msgstr "Veličina ikona u traci sa alatima: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Oblačići sa savetima:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Prikaži slike na dugmadima" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Koristi prilagođenu šemu boja" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Prikaži slike u menijima" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Kontrola" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Podešavanja grafičkog korisničkog interfejsa" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Ivica prozora" -#: ../data/ui/lxappearance.ui.h:65 -#, fuzzy -msgid "Play event sounds" -msgstr "Ozvuči događaje" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Uredi" -#: ../data/ui/lxappearance.ui.h:66 -#, fuzzy -msgid "Play event sounds as feedback to user input" -msgstr "dodeli zvuk događaju kao odgovor na korisničku akciju" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Datoteka" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Zvučni događaji" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Pomoć" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Ostalo" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "dugme" -#: ../src/utils.c:217 +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "dodeli zvuk događaju kao odgovor na korisničku akciju" + +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Izaberite paket sa temom ikona" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (tema ikona)" + diff -Nru lxappearance-0.5.2~ppa2/po/sv.po lxappearance-0.5.0/po/sv.po --- lxappearance-0.5.2~ppa2/po/sv.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/sv.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-22 17:34+0200\n" +"POT-Creation-Date: 2010-08-08 01:59+0800\n" +"PO-Revision-Date: 2010-09-28 02:30+0200\n" "Last-Translator: Martin \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Hantera utseende och beteende" @@ -26,16 +26,16 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Hanterar utseende och beteende för skrivbordsmiljö och program" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright © 2011 LXDE Project" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Copyright © 2010 LXDE Project" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Hanterar utseende och beteende för din skrivbordsmiljö" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "" "Martin Bagge \n" @@ -43,287 +43,220 @@ "Fel på översättningen? Kontakta då tp-sv@listor.tp-sv.se med dina " "kommentarer!" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Bara ikoner" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Bara text" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "GUI-alternativ" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Text under ikoner" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"OBS! Alla skrivbordsprogram har inte stöd för att byta tema för " +"muspekaren under drift. Vissa ändringar här slår därför igenom först nästa " +"gång du loggar in." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Text brevid ikoner" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Ljudeffekt" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Samma som menyalternativ" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Bakgrund" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Liten ikon i vertygsfält" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Större" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Stor ikon i vertygsfält" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Kryssruta" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Samma som knappar" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Färg" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Samma som flyttikoner" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Färgchemat stöds inte av widget-temat som är valt." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Samma som informationsrutor" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Standardteckensnitt:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Ingen" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Lite" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Mellan" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Komplett" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Förhandsvisning av aktuell widget-stil" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Förgrund" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Arkiv" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Ikontema" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Redigera" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Bara ikoner" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Hjälp" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Installera" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Radioknapp" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Stor ikon i vertygsfält" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Kryssruta" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Muspekare" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "knapp" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Normalt fönster:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Annat" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Sida 1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Sida 2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Standardteckensnitt:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Färgchemat stöds inte av widget-temat som är valt." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Använd anpassat färgschema" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Spela händelseljud" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normalt fönster:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Förhandsgranska valt muspekartema" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Textfönster:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Förhandsgranska valt ikontema" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Valda alternativ:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Förhandsvisning av aktuell widget-stil" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Verktygstips:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Radioknapp" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Bakgrund" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Ta bort" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Förgrund" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Samma som knappar" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Färg" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Samma som informationsrutor" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Installera" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Samma som flyttikoner" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Ta bort" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Samma som menyalternativ" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Förhandsgranska valt ikontema" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Valda alternativ:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Ikontema" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Visa bilder i menyer" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Förhandsgranska valt muspekartema" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Visa bilder på knappar" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Storlek på pekare" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Liten ikon i vertygsfält" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Mindre" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Större" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Text under ikoner" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"OBS! Alla skrivbordsprogram har inte stöd för att byta tema för " -"muspekaren under drift. Vissa ändringar här slår därför igenom först nästa " -"gång du loggar in." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Text brevid ikoner" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Muspekare" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Bara text" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Fönsterkant" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Textfönster:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Aktivera kantutjämning" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Kantutjämning" - -# hinting är oöversatt i gimp också. facterm? -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Aktivera hinting" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Hinting-typ: " - -# hinting är oöversatt även i gimp. fackterm? -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Hinting" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Subpixel-geometri: " - -# den här översättningen är jag inte särdeles stolt över //brother -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Subpixel-geometri" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Teckensnitt" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Ikonstorlek i verktygsfältet: " -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "Verktygsfältets stil: " -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Storlek på ikoner i verktygsfältet: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Verktygstips:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Visa bilder på knappar" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Använd anpassat färgschema" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Visa bilder i menyer" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI-alternativ" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Fönsterkant" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Spela händelseljud" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Redigera" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Spela händelseljud som återkoppling till användarens inmatning" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Arkiv" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Ljudeffekt" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Hjälp" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Annat" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "knapp" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "spela händelseljud som återkoppling till användarens inmatning" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Välj ikontema" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Ikontema)" diff -Nru lxappearance-0.5.2~ppa2/po/te.po lxappearance-0.5.0/po/te.po --- lxappearance-0.5.2~ppa2/po/te.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/te.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,321 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-04-11 04:09+0200\n" -"Last-Translator: PraveenIlla \n" -"Language-Team: LANGUAGE \n" -"Language: te\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "రూపాన్ని మలచుకుని అనందించండి" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "మీ డెస్క్‍టాప్ మరియు అనువర్తనాల దర్శనమును అనురూపిస్తుంది" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "నకలుహక్కు (C) 2011 LXDE ప్రోజెక్టు" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "మీ డెస్క్‍టాప్ యొక్క రూపాన్ని మరియు అనుభవాన్ని అనురూపిస్తుంది" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Praveen Illa , 2011." - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "ప్రతీకలు మాత్రమే" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "పాఠ్యం మాత్రమే" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "ప్రతీకల కింద పాఠ్యం" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "ప్రతీకల ప్రక్క పాఠ్యం" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "మెనూ అంశాల వలె" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "చిన్న సాధనపట్టీ ప్రతీక" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "పెద్ద సాధనపట్టీ ప్రతీక" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "బటన్ల వలె" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "లాగే ప్రతీకల వలె" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "సంవాదాల వలె" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "ఏదీకాదు" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "కొద్ది" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "మధ్యస్థం" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "మొత్తం" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "ఎంచుకున్న విడ్జెట్ శైలి యొక్క మునుజూపు" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "ఫైల్ (_F)" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "సవరణ (_E)" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "సహాయం (_H)" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "రేడియో బటన్" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "తనిఖీ బటన్" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "బటన్" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "ఉపపాదన" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "పేజీ1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "పేజీ2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "అప్రమేయ ఫాంటు:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "విడ్జెట్" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "రంగు ప్రణాళిక ప్రస్తుతం ఎంచుకున్న విడ్జెట్ థీముకు సహకరించుటలేదు." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "అనురూపిత వర్ణ ప్రణాళికను వాడు" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "సాధారణ విండోలు:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "పాఠ్య విండోలు:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "ఎంచుకున్న అంశాలు:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "సాధనచిట్కాలు:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "నేపథ్యం" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "ముందుభాగము" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "రంగు" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "స్థాపించు" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "తొలగించు" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "ఎంచుకున్న ప్రతీక థీము యొక్క మునుజూపు" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "ప్రతీక థీము" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "ఎంచుకున్న కర్సర్ థీము యొక్క మునుజూపు" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "కర్సర్ యొక్క పరిమాణం" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "చిన్నది" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "అతిపెద్ద" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"గమనిక: సూచకము అలంకారం మార్పు అన్ని డెస్క్‍టాప్ అనువర్తనాలు సహకరించకపోవచ్చు.అందువలన మీరు " -"చేసిన మార్పులు మీ తరుపరి ప్రవేశం వరకు అన్ని అనువర్తనాలకు పూర్తిగా అనువర్తించబడకపోవచ్చు." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "మౌస్ కర్సర్" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "విండో సరిహద్దు" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "యాంటీఅలియాసింగును చేతనపరుచు" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "యాంటీఅలియాసింగ్" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "హింటింగ్ చేతనపరుచు" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "హింటింగ్ శైలి: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "హింటింగ్" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "ఉప-పిక్సెల్ జ్యామితి. " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "ఉప-పిక్సెల్ జ్యామితి" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "ఫాంటు" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "సాధనపట్టీ శైలి: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "సాధనపట్టీ ప్రతీక పరిమాణం: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "బటన్ల మీద బొమ్మలను చూపించు" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "మెనూల నందు బొమ్మలను చూపించు" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI ఐచ్ఛికాలు" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "కార్యక్రమాల ధ్వనులను ఆడించు" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "వాడుకరి ఇన్‌పుట్‌కి ఫీడ్‌బ్యాక్ వలె కార్యక్రమ శబ్దాలను ఆడించు" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "శబ్ధ ప్రభావం" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "ఇతర" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "ఒక ప్రతీక థీమును ఎంచుకొను" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (ప్రతీక థీము)" diff -Nru lxappearance-0.5.2~ppa2/po/tr.po lxappearance-0.5.0/po/tr.po --- lxappearance-0.5.2~ppa2/po/tr.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/tr.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,19 +7,18 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-05-06 15:12+0200\n" -"Last-Translator: Necdet \n" +"POT-Creation-Date: 2010-09-04 05:43+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: Mehmet Gülmen \n" "Language-Team: tr \n" -"Language: tr\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Country: TURKEY\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 +#: ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Görünümü Özelleştir" @@ -27,298 +26,229 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Masaüstünüzün ve uygulamaların görünümünü özelleştirir." -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Telif Hakkı (C) 2011 LXDE Projesi" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Telif Hakkı (C) 2010 LXDE Projesi" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Masaüstünüzün Görünümünü Özelleştirin" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Mehmet Gülmen memetgulmen@gmail.com" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Sadece simgeler" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Sadece metin" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Grafik Arayüz Tercihleri" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Simge altında metin" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Not: Bütün masaüstü uygulamaları imleç temasının anında değişmesini desteklemez. Yani burada yaptığınız değişikliğin tamamen uygulanması için bir sonraki oturumu beklemeniz gerekebilir." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Simge yanında metin" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Ses Efektleri" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Menü öğelerinin aynısı" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Arkaplan" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Küçük araç çubuğu simgesi" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Daha Büyük" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Büyük araç çubuğu simgesi" +# Serbest çeviri. "Check Button"dan kasıt Türkçe'de onay kutusu olarak geçen, birden fazlası tıklanabilen kare kutu. +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Onay Kutusu" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Düğmelerin aynısı" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Renk" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Sürükleme simgelerinin aynısı" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Renk teması şu an seçilmiş olan widget teması ile uyumlu değil." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Diyalogların aynısı" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Varsayılan yazıtipi:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Hiçbiri" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Çok küçük" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Orta" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Tam" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Demo" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Seçilen widget temasının önizlemesi" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Ön plan" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "D_osya" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Simge teması" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Düzenle" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Sadece simgeler" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Yardım" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Kur" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Seçenek Düğmesi" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Büyük araç çubuğu simgesi" -# Serbest çeviri. "Check Button"dan kasıt Türkçe'de onay kutusu olarak geçen, birden fazlası tıklanabilen kare kutu. -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Onay Kutusu" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Fare İmleci" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "düğme" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Normal pencereler:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Demo" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Diğer" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Sayfa1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Sayfa2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Varsayılan yazıtipi:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Renk teması şu an seçilmiş olan widget teması ile uyumlu değil." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Değiştirilmiş renk şemasını kullan" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Olay seslerini çal" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Normal pencereler:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Seçilen imleç temasını önizle" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Metin pencereleri:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Seçilen simge temasını önizle" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Seçilen Öğeler" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Seçilen widget temasının önizlemesi" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "İpuçları:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Seçenek Düğmesi" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Arkaplan" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Kaldır" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Ön plan" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Düğmelerin aynısı" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Renk" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Diyalogların aynısı" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Kur" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Sürükleme simgelerinin aynısı" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Kaldır" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Menü öğelerinin aynısı" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Seçilen simge temasını önizle" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Seçilen Öğeler" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Simge teması" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Menülerde resimleri göster" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Seçilen imleç temasını önizle" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Düğmelerde resimleri göster" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "İmleç boyutu" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Küçük araç çubuğu simgesi" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Daha Küçük" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Daha Büyük" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Simge altında metin" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Not: Bütün masaüstü uygulamaları imleç temasının anında değişmesini " -"desteklemez. Yani burada yaptığınız değişikliğin tamamen uygulanması için " -"bir sonraki oturumu beklemeniz gerekebilir." +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Simge yanında metin" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Fare İmleci" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Sadece metin" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Pencere Kenarı" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Metin pencereleri:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Düzgünleştirmeyi etkinleştir" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Düzgünleştirmek" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "İpucu gösterimini etkinleştir" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "İpucu biçimi:" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "İpucu" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Alt-pixel geometrisi: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Alt-piksel geometrisi" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Yazı tipi" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Araç Çubuğu Simge Boyutu:" -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " -msgstr "Araç Çubuğu Biçimi: " +msgstr "Araç Çubuğu Stili" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Araç Çubuğu Simge Boyutu: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "İpuçları:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Düğmelerde resimleri göster" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Değiştirilmiş renk şemasını kullan" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Menülerde resimleri göster" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Grafik Arayüz Tercihleri" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Pencere Kenarı" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Olay seslerini çal" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Düzenle" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Kulanıcı girdilerine karşılık olarak olay seslerini oynat" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "D_osya" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Ses Efektleri" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Yardım" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Diğer" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "düğme" -#: ../src/utils.c:217 +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "olay seslerini kullanıcı girdilerine karşılık olarak çal" + +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Bir simge teması seç" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*tar.gz, *tar.bz2 (Simge Teması)" + diff -Nru lxappearance-0.5.2~ppa2/po/tt_RU.po lxappearance-0.5.0/po/tt_RU.po --- lxappearance-0.5.2~ppa2/po/tt_RU.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/tt_RU.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,320 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Ainur Shakirov , 2011. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-08-18 01:30+0400\n" -"Last-Translator: Ainur Shakirov \n" -"Language-Team: Tatar <>\n" -"Language: tt_RU\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.2\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "Тышкы кыяфәт" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "Сезнең эш өстәле һәм кушымтаның тышкы кыяфәтен көйләгез" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Copyright (C) 2011 LXDE Project" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "Эш өстәленең тышкы кыяфәтен көйләгез" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Ainur Shakirov " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Билгечекләр генә" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Текст кына" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Текст билгечек астында" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Текст билгечек янында" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Меню өлешләре шикелле үк" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Панельнең кече билгечекләре" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Панельнең зур билгечекләре" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Төймә шикелле үк" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Күчермәле билгечекләр шикелле үк" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Диалоглар шикелле үк" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Юк" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Зәгыйфь" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Уртак" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Тулы" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Сайланган тәрәзә тышын алдан каравы" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Файл" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Үзгәртү" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Белешмә" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Күчерткеч" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Байракчык" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "төймә" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Күрсәтү" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "Бит 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "Бит 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Үрнәкле хәреф:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Виджет" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Төс схемасын бу виджет тышы белән кулланып булмый." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Үзгәртелгән төс схемасын куллану" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Гадәти тәрәзәләр:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Тәрәзәнең тексты:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Сайланган өлешләр:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Ярдәмчекләр:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Җирлек" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Алгы план" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Төс" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Урнаштыру" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Бетерү" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Сайланган билгечек тышын алдан каравы" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Билгечек тышы" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Сайланган курсор тышын алдан каравы" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "Курсорның зурлыгы" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "Кечерәк" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Зуррак" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Искәрмә: Кайбер кушымталар курсор тышын хәзер үк үзгәртә алмаска " -"мөмкиннәр. Бу очракта аларны яңадан җибәрергә кирәк." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Тычканчык курсоры" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Тәрәзә чиге" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Шомаруны эшләтү" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Шомарту" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Хинтингны эшләтү" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Хинтинг стиле: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Хинтинг" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Суб-пикселлы геометрия: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Суб-пикселлы геометрия" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Хәреф" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Корал панеленең стиле: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Корал панеленең билгечек зурлыгы: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Төймәләрдә рәсемнәр күрсәтү" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Менюда рәсемнәр күрсәтү" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "График интерфейс көйләүләре" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Вакыйга тавышын уйнату" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Кулланучының кертүенә җавап булып вакыйга тавышын уйнату" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Тавыш эффектлары" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Башкалар" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "Билгечек тышын сайлагыз" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Билгечек тышы)" diff -Nru lxappearance-0.5.2~ppa2/po/ug.po lxappearance-0.5.0/po/ug.po --- lxappearance-0.5.2~ppa2/po/ug.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/ug.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,322 +0,0 @@ -# Uyghur translation for lxappearance. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Gheyret Kenji , 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: lxappearance\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-11-29 08:44+0200\n" -"Last-Translator: Gheyret \n" -"Language-Team: Uyghur Computer Science Association \n" -"Language: ug\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "كۆرۈنۈش ۋە تۇيغۇنى ئۆزلەشتۈرۈش" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "ئۈستەلئۈستىنىڭ ۋە پروگراممىلارنىڭ كۆرۈنۈش ۋە تۇيغۇسىنى ئۆزلەشتۈرۈش" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "نەشر ھوقۇقى (C) LXDE قۇرۇلۇشى" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "ئۈستەلئۈستىنىڭ كۆرۈنۈش ۋە تۇيغۇسىنى ئۆزلەشتۈرۈش" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Gheyret Kenji " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "سىنبەلگىلەرلا" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "تېكىستلا" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "تېكىست سىنبەلگە ئاستىدا" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "تېكىست سىنبەلگە يېنىدا" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "تىزىملىك تۈرلىرىگە ئوخشاش" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "كىچىك قورال بالداق سىنبەلگىسى" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "چوڭ قورال بالداق سىنبەلگىسى" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "توپچىلارغا ئوخشاش" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "سۆرەش سىنبەلگىسىگە ئوخشاش" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "سۆزلەشكۈلەرگە ئوخشاش" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "يوق" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "ئاز" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "ئوتتۇراھال" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "تامامەن" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "تاللانغان ۋىجېت ئۇسلۇبىنى ئالدىن كۆزىتىش" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "ھۆججەت(_F)" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "تەھرىر(_E)" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "ياردەم(_H)" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "تاق تاللاش كۇنۇپكىسى" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Check توپچىسى" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "كۇنۇپكا" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "ئۈلگە كۆرسىتىش" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "بەت 1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "بەت 2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "كۆڭۈلدىكى خەت نۇسخىسى:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "ۋىجېت" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "ھازىر تاللانغان ۋىجېت ئۆرنىكى بۇ رەڭ لايىھىسىنى قوللىمايدۇ." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "ئۆزلەشتۈرۈلگەن رەڭ لايىھىسى ئىشلىتىش" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "نورمال كۆزنەكلەر:" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "تېكىست كۆزنەكلىرى:" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "تاللانغان تۈرلەر:" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "كۆرسەتمىلەر:" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "تەگلىك" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "ئالدى كۆرۈنۈش" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "رەڭ" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "ئورنات" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "چىقىرىۋەت" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "تاللانغان سىنبەلگىنى ئالدىن كۆزىتىش" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "سىنبەلگە تېمىسى" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "تاللانغان ئۆرنەكنى ئالدىن كۆزىتىش" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "نۇربەلگىلەرنىڭ چوڭلۇقى:" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "كىچىكرەك" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "چوڭراق" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"دىققەت: نۇربەلگە ئۆرنىكىنىڭ ئۆزگىرىشى بارلىق پروگراممىلاردا شۇ ھامان " -"قوللىنىلماسلىقى مۇمكىن. شۇڭا كېيىنكى قېتىم كىرگەندە ئاندىن ھەممە " -"پروگراممىلاردا ئۆزگىرىشلەرنى كۆرەلەيسىز." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "چاشقىنەك نۇربەلگىسى" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "كۆزنەك گىرۋىكى" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "سىلىقلاشنى ئىناۋەتلىك قىلىش" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "سىلىقلاش" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "خىنتلاشنى ئىناۋەتلىك قىلىش" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "خىنتلاش ئۇسلۇبى: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "خىنتلاش" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "تارماق پىكسېلنىڭ گېئومېتىرىيىسى:" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "تارماق پىكسېلنىڭ گېئومېتىرىيىسى" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "خەت نۇسخا" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "قورال بالدىقى ئۇسلۇبى: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "قورال بالدىقى چوڭلۇقى: " - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "توپچىلارنى سۈرەتلەرنى كۆرسىتىش" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "تىزىملىكلەردە سۈرەتلەرنى كۆرسىتىش" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "گرافىكىلىق كۆرۈنمەيۈز(GUI) تاللانمىسى" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "ھادىسە ئاۋازىنى قويۇش" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "ئاۋاز چىقىرىش ئارقىلىق ئىشلەتكۈچى كىرگۈزۈشىگە ئىنكاس قايتۇرۇش" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr " ئۈن ئۈنۈمى" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "باشقا" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "سىنبەلگىلىك ئۆرنەك تاللايدۇ" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (سىنبەلگە ئۆرنىكى)" diff -Nru lxappearance-0.5.2~ppa2/po/uk.po lxappearance-0.5.0/po/uk.po --- lxappearance-0.5.2~ppa2/po/uk.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/uk.po 2010-10-06 17:03:37.000000000 +0000 @@ -7,19 +7,18 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-22 22:44+0200\n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2009-09-20 01:29+0200\n" "Last-Translator: Y P \n" "Language-Team: Ukrainian\n" -"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Pootle 1.1.0\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Налаштувати вигляд і відображення" @@ -27,297 +26,233 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Налаштовує вигляд Вашого робочого столу і програм" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Всі права застережено (C) 2011 Проект LXDE" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Всі права застережено (C) 2010 Проект LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Налаштовує вигляд Вашого робочого столу" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Тільки іконки" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Тільки текст" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Опції GUI" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Текст під іконками" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"Примітка: Не всі програми робочого столу підримують зміну теми " +"курсора на льоту. Тому, можливо, не всі зміни будуть повністю застосовані " +"відразу, а лише після поновного входу в систему." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Текст поруч з іконками" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Звуковий ефект" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Так само як пукти меню" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Тло" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Маленькі іконки панелі інструментів" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Більше" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Велика іконка панелі інструментів" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Кнопка перевірки" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Так само як кнопки" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Колір" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Так само іконки перетягування" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Схема кольору не підтримується поточною темою віджетів." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Так само як діалоги" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Шрифт по замовчуванню:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Немає" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Незначний" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Середній" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Повний" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Демонстрація" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Перегляд вибраного стилю віджетів" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Передній план" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Файл" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Тема іконок" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Редагувати" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Тільки іконки" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Допомога" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Встановити" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Кнопка радіо" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Велика іконка панелі інструментів" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Кнопка перевірки" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Курсор мишки" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "кнопка" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Звичайне вікно:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Демонстрація" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Інше:" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Сторінка 1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Сторінка 2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Шрифт по замовчуванню:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Віджет" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Схема кольору не підтримується поточною темою віджетів." +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Програти звуки подій" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Використовувати власну схему кольорів" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "програвати звуки подій як відгук на дії користувача" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Звичайне вікно:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "Перегляд вибраної теми курсору" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Вікно тексту:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "Перегляд вибраної теми іконок" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Вибрані пункти:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "Перегляд вибраного стилю віджетів" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Підказки:" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Кнопка радіо" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Тло" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "Вилучити" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Передній план" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "Так само як кнопки" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Колір" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "Так само як діалоги" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Встановити" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "Так само іконки перетягування" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Вилучити" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "Так само як пукти меню" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Перегляд вибраної теми іконок" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "Вибрані пункти:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Тема іконок" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "Показати малюнки в меню" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Перегляд вибраної теми курсору" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "Показати малюнки на кнопках" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "Розмір курсорів" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "Маленькі іконки панелі інструментів" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "Менше" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Більше" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "Текст під іконками" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Примітка: Не всі програми робочого столу підримують зміну теми " -"курсора на льоту. Тому, можливо, не всі зміни будуть повністю застосовані " -"відразу, а лише після поновного входу в систему." +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "Текст поруч з іконками" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Курсор мишки" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "Тільки текст" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Границя вікна" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "Вікно тексту:" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Включити згладження" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Згладжування" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Включити підказки" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Стиль підказок: " - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Підказка" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Суб-піксельна геометрія: " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Суб-піксельна геометрія" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Фонт" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "Стиль панелі інструментів: " - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Розмір іконок панелі інструментів: " +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "Розмір іконок панелі інструментів:" + +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" +msgstr "Стиль панелі інструментів:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Показати малюнки на кнопках" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "Підказки:" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Показати малюнки в меню" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "Використовувати власну схему кольорів" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Опції GUI" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "Віджет" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Програти звуки подій" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "Границя вікна" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Програвати звуки подій як відгук на ввід користувача" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "_Редагувати" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Звуковий ефект" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "_Файл" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Інше" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "_Допомога" + +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "кнопка" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Вибрати тему іконок" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Тема іконок)" diff -Nru lxappearance-0.5.2~ppa2/po/vi.po lxappearance-0.5.0/po/vi.po --- lxappearance-0.5.2~ppa2/po/vi.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/vi.po 2010-10-06 16:55:34.000000000 +0000 @@ -7,20 +7,19 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-07-23 04:04+0200\n" -"Last-Translator: Duy Hung \n" +"POT-Creation-Date: 2010-09-04 05:43+0000\n" +"PO-Revision-Date: 2010-09-05 10:58+0700\n" +"Last-Translator: Tran Duy Hung \n" "Language-Team: vi \n" -"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" +"Language: \n" "X-Poedit-Language: Vietnamese\n" "X-Poedit-Country: Viet Nam\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 +#: ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "Tùy chỉnh Giao diện" @@ -28,297 +27,228 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "Tùy chỉnh giao diện cho máy tính và ứng dụng của bạn" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "Bản quyền © 2011 Dự án LXDE" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "Bản quyền © 2010 Dự án LXDE" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "Tùy chỉnh giao diện máy tính" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "translator-credits" -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "Chỉ biểu tượng" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "Chỉ có chữ" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "Tùy chọn GUI" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "Chữ dưới biểu tượng" +#: ../data/ui/lxappearance.glade.h:2 +msgid "Note: Not all of the desktop applications support changing cursor theme on-the-fly. So your changes here might not be fully applied to all applications till next login." +msgstr "Chú ý: Không phải tất cả ứng dụng đều hỗ trợ thay đổi kiểu con trỏ chuột ngay lập tức. Vì vậy những gì bạn vừa thay đổi có thể chỉ thật sự có hiệu lực trong lần đăng nhập tới." -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "Chữ bên cạnh biểu tượng" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "Hiệu ứng Âm thanh" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "Giống như mục trình đơn" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "Nền sau" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "Biểu tượng thanh công cụ nhỏ" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "Lớn hơn" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "Biểu tượng thanh công cụ lớn" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "Check Button" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "Giống như nút nhấn" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "Màu sắc" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "Giống như biểu tượng kéo thả" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "Sơ đồ màu không được hỗ trợ trong chủ đề widget đang được chọn." -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "Giống như hộp thoại" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "Phông mặc định:" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "Không" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "Mỏng" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "Vừa" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "Đầy" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "Mẫu" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "Xem trước kiểu dáng widget được chọn" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "Nền trước" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "_Tập tin" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "Đề tài Biểu tượng" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "_Chỉnh sửa" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "Chỉ biểu tượng" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "_Trợ giúp" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "Cài đặt" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "Radio Button" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "Biểu tượng thanh công cụ lớn" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "Check Button" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "Con trỏ Chuột" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "nút" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "Những cửa sổ thường:" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "Mẫu" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "Khác" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "Trang 1" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "Trang 2" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "Phông mặc định:" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "Widget" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "Sơ đồ màu không được hỗ trợ trong chủ đề widget đang được chọn." - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "Dùng sơ đồ màu sắc tùy chọn" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "Phát âm thanh cho sự kiện" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "Những cửa sổ thường:" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Preview of the selected cursor theme" +msgstr "Xem trước chủ đề con trỏ được chọn" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "Cửa sổ văn bản:" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected icon theme" +msgstr "Xem trước chủ đề biểu tượng được chọn" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "Mục được chọn:" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected widget style" +msgstr "Xem trước kiểu dáng widget được chọn" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "Mẹo:" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Radio Button" +msgstr "Radio Button" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "Nền sau" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Remove" +msgstr "Xóa" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "Nền trước" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Same as buttons" +msgstr "Giống như nút nhấn" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "Màu sắc" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as dialogs" +msgstr "Giống như hộp thoại" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "Cài đặt" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as drag icons" +msgstr "Giống như biểu tượng kéo thả" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "Xóa" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as menu items" +msgstr "Giống như mục trình đơn" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "Xem trước chủ đề biểu tượng được chọn" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Selected items:" +msgstr "Mục được chọn:" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "Đề tài Biểu tượng" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Show images in menus" +msgstr "Hiển thị hình ảnh trong trình đơn" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "Xem trước chủ đề con trỏ được chọn" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images on buttons" +msgstr "Hiển thị hình ảnh trên nút nhấn" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:35 msgid "Size of cursors" msgstr "Kích thước con trỏ" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:36 +msgid "Small toolbar icon" +msgstr "Biểu tượng thanh công cụ nhỏ" + +#: ../data/ui/lxappearance.glade.h:37 msgid "Smaller" msgstr "Nhỏ hơn" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "Lớn hơn" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"Chú ý: Không phải tất cả ứng dụng đều hỗ trợ thay đổi kiểu con trỏ " -"chuột ngay lập tức. Vì vậy những gì bạn vừa thay đổi có thể chỉ thật sự có " -"hiệu lực trong lần đăng nhập tới." - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "Con trỏ Chuột" +#: ../data/ui/lxappearance.glade.h:38 +msgid "Text below icons" +msgstr "Chữ dưới biểu tượng" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "Viền Cửa sổ" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text beside icons" +msgstr "Chữ bên cạnh biểu tượng" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "Bật chống răng cưa" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "Chống răng cưa" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "Bật gợi ý" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "Kiểu dáng gợi ý:" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text only" +msgstr "Chỉ có chữ" -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "Tùy chọn GUI" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text windows:" +msgstr "Cửa sổ văn bản:" -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "Hình học sub-pixel : " - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "Hình học sub-pixel" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "Font" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Toolbar Icon Size: " +msgstr "Kích thước Biểu tượng Thanh công cụ:" -#: ../data/ui/lxappearance.ui.h:60 +#: ../data/ui/lxappearance.glade.h:43 msgid "Toolbar Style: " msgstr "Kiểu dánh Thanh công cụ:" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "Kích thước Biểu tượng Thanh công cụ:" +#: ../data/ui/lxappearance.glade.h:44 +msgid "Tooltips:" +msgstr "Mẹo:" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "Hiển thị hình ảnh trên nút nhấn" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Use customized color scheme" +msgstr "Dùng sơ đồ màu sắc tùy chọn" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "Hiển thị hình ảnh trong trình đơn" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Widget" +msgstr "Widget" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "Tùy chọn GUI" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Window Border" +msgstr "Viền Cửa sổ" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "Phát âm thanh cho sự kiện" +#: ../data/ui/lxappearance.glade.h:48 +msgid "_Edit" +msgstr "_Chỉnh sửa" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "Phát âm thanh phản hồi khi người dùng nhập liệu" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_File" +msgstr "_Tập tin" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "Hiệu ứng Âm thanh" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_Help" +msgstr "_Trợ giúp" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "Khác" +#: ../data/ui/lxappearance.glade.h:51 +msgid "button" +msgstr "nút" -#: ../src/utils.c:217 +#: ../data/ui/lxappearance.glade.h:52 +msgid "play event sounds as feedback to user input" +msgstr "phát âm thanh khi người dùng nhập" + +#: ../src/utils.c:212 msgid "Select an icon theme" msgstr "Chọn một đề tài biểu tượng" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Đề tài Biểu tượng)" + diff -Nru lxappearance-0.5.2~ppa2/po/zh_CN.po lxappearance-0.5.0/po/zh_CN.po --- lxappearance-0.5.2~ppa2/po/zh_CN.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/zh_CN.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,321 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2011-08-16 08:31+0200\n" -"Last-Translator: Yinghua_Wang \n" -"Language-Team: LANGUAGE \n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 -msgid "Customize Look and Feel" -msgstr "自定义外观和体验" - -#: ../data/lxappearance.desktop.in.h:2 -msgid "Customizes look and feel of your desktop and applications" -msgstr "自定义您桌面和应用程序的外观和体验" - -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "版权所有 (C) 2011 LXDE 项目" - -#: ../data/ui/about.ui.in.h:2 -msgid "Customizes look and feel of your desktop" -msgstr "自定义您桌面的外观和体验" - -#. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 -msgid "translator-credits" -msgstr "Yinghua Wang " - -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "仅图标" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "仅文本" - -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "文本在图标下" - -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "文本在图标旁" - -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "与菜单项目相同" - -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "小工具栏图标" - -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "大工具栏图标" - -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "与按钮相同" - -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "与拖动图标相同" - -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "与对话框相同" - -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "无" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "轻度" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "中等" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "完全" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" - -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "预览选择的窗体样式" - -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "文件(_F)" - -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "编辑(_E)" - -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "帮助(_H)" - -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "单选按钮" - -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "复选按钮" - -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "按钮" - -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "演示" - -#: ../data/ui/lxappearance.ui.h:28 -msgid "Page1" -msgstr "页1" - -#: ../data/ui/lxappearance.ui.h:29 -msgid "Page2" -msgstr "页2" - -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "默认字体：" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "窗体" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "当前选择的窗体主题不支持颜色方案。" - -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "使用自定义的色彩方案" - -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "正常窗口：" - -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "文本窗口：" - -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "选择的项目：" - -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "工具提示：" - -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "背景" - -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "前景色" - -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "颜色" - -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "安装" - -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "移除" - -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "预览选择的图标主题" - -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "图标主题" - -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "预览选择的鼠标主题" - -#: ../data/ui/lxappearance.ui.h:46 -msgid "Size of cursors" -msgstr "光标大小" - -#: ../data/ui/lxappearance.ui.h:47 -msgid "Smaller" -msgstr "较小" - -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "较大" - -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"注： 有些桌面应用程序不支持实时更改鼠标主题。因此您在这里所作的更改可" -"能要到下次登录时才能完全应用。" - -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "鼠标光标" - -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "窗口边框" - -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "启用平滑" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "平滑" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "启用微调" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "微调样式：" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "微调" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "次像素几何属性：" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "次像素几何属性" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "字体" - -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " -msgstr "工具栏样式：" - -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "工具栏图标尺寸：" - -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "在按钮上显示图像" - -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "在菜单中显示图像" - -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "GUI 选项" - -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "播放事件声音" - -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "播放事件声音作为用户输入的反馈" - -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "音效" - -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "其他" - -#: ../src/utils.c:217 -msgid "Select an icon theme" -msgstr "选择一个图标主题" - -#: ../src/utils.c:224 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (图标主题)" diff -Nru lxappearance-0.5.2~ppa2/po/zh_TW.po lxappearance-0.5.0/po/zh_TW.po --- lxappearance-0.5.2~ppa2/po/zh_TW.po 2012-05-20 14:29:02.000000000 +0000 +++ lxappearance-0.5.0/po/zh_TW.po 2010-10-06 17:03:07.000000000 +0000 @@ -7,21 +7,18 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 16:27+0200\n" -"PO-Revision-Date: 2012-04-14 10:49+0200\n" -"Last-Translator: Walter \n" +"POT-Creation-Date: 2010-10-07 01:02+0800\n" +"PO-Revision-Date: 2010-08-08 01:59+0800\n" +"Last-Translator: 洪任諭 \n" "Language-Team: zh_TW \n" -"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: TAIWAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.ui.h:19 +#: ../data/lxappearance.desktop.in.h:1 ../data/ui/lxappearance.glade.h:9 msgid "Customize Look and Feel" msgstr "自訂外觀風格" @@ -29,296 +26,232 @@ msgid "Customizes look and feel of your desktop and applications" msgstr "自訂桌面和應用程式的外觀風格" -#: ../data/ui/about.ui.in.h:1 -msgid "Copyright (C) 2011 LXDE Project" -msgstr "版權所有 (C) 2011 LXDE 專案" +#: ../data/ui/about.glade.in.h:1 +msgid "Copyright (C) 2010 LXDE Project" +msgstr "版權所有 (C) 2010 LXDE 專案" -#: ../data/ui/about.ui.in.h:2 +#: ../data/ui/about.glade.in.h:2 msgid "Customizes look and feel of your desktop" msgstr "自訂桌面外觀風格" #. Please replace this line with your own names, one name per line. -#: ../data/ui/about.ui.in.h:4 +#: ../data/ui/about.glade.in.h:4 msgid "translator-credits" msgstr "洪任諭 (PCMan) " -#: ../data/ui/lxappearance.ui.h:1 -msgid "Icons only" -msgstr "只有圖示" - -#: ../data/ui/lxappearance.ui.h:2 -msgid "Text only" -msgstr "只有文字" +#: ../data/ui/lxappearance.glade.h:1 +msgid "GUI Options" +msgstr "圖形介面選項" -#: ../data/ui/lxappearance.ui.h:3 -msgid "Text below icons" -msgstr "文字在圖示下方" +#: ../data/ui/lxappearance.glade.h:2 +msgid "" +"Note: Not all of the desktop applications support changing cursor " +"theme on-the-fly. So your changes here might not be fully applied to all " +"applications till next login." +msgstr "" +"注意：並非所有桌面應用程式都能支援動態變更滑鼠游標，所以你的部份變更可" +"能要到下次登入時才會被完全套用。" -#: ../data/ui/lxappearance.ui.h:4 -msgid "Text beside icons" -msgstr "文字在圖示旁" +#: ../data/ui/lxappearance.glade.h:3 +msgid "Sound Effect" +msgstr "音效" -#: ../data/ui/lxappearance.ui.h:5 -msgid "Same as menu items" -msgstr "和選單項目相同" +#: ../data/ui/lxappearance.glade.h:4 +msgid "Background" +msgstr "背景" -#: ../data/ui/lxappearance.ui.h:6 -msgid "Small toolbar icon" -msgstr "小型工具列圖示" +#: ../data/ui/lxappearance.glade.h:5 +msgid "Bigger" +msgstr "較大" -#: ../data/ui/lxappearance.ui.h:7 -msgid "Large toolbar icon" -msgstr "大型工具列圖示" +#: ../data/ui/lxappearance.glade.h:6 +msgid "Check Button" +msgstr "核取方塊" -#: ../data/ui/lxappearance.ui.h:8 -msgid "Same as buttons" -msgstr "和按鈕相同" +#: ../data/ui/lxappearance.glade.h:7 +msgid "Color" +msgstr "色彩" -#: ../data/ui/lxappearance.ui.h:9 -msgid "Same as drag icons" -msgstr "和滑鼠拖放時相同" +#: ../data/ui/lxappearance.glade.h:8 +msgid "Color scheme is not supported by currently selected widget theme." +msgstr "目前選取的佈景主題不支援變更色彩" -#: ../data/ui/lxappearance.ui.h:10 -msgid "Same as dialogs" -msgstr "和對話框相同" +#: ../data/ui/lxappearance.glade.h:10 +msgid "Default font:" +msgstr "預設字型：" -#: ../data/ui/lxappearance.ui.h:11 -msgid "None" -msgstr "無" - -#: ../data/ui/lxappearance.ui.h:12 -msgid "Slight" -msgstr "輕微" - -#: ../data/ui/lxappearance.ui.h:13 -msgid "Medium" -msgstr "中等" - -#: ../data/ui/lxappearance.ui.h:14 -msgid "Full" -msgstr "完整" - -#: ../data/ui/lxappearance.ui.h:15 -msgid "RGB" -msgstr "RGB" - -#: ../data/ui/lxappearance.ui.h:16 -msgid "BGR" -msgstr "BGR" - -#: ../data/ui/lxappearance.ui.h:17 -msgid "VRGB" -msgstr "VRGB" - -#: ../data/ui/lxappearance.ui.h:18 -msgid "VBGR" -msgstr "VBGR" +#: ../data/ui/lxappearance.glade.h:11 +msgid "Demo" +msgstr "展示" -#: ../data/ui/lxappearance.ui.h:20 -msgid "Preview of the selected widget style" -msgstr "預覽選取的圖形元件風格" +#: ../data/ui/lxappearance.glade.h:12 +msgid "Foreground" +msgstr "前景" -#: ../data/ui/lxappearance.ui.h:21 -msgid "_File" -msgstr "檔案(_F)" +#: ../data/ui/lxappearance.glade.h:13 +msgid "Icon Theme" +msgstr "圖示佈景主題" -#: ../data/ui/lxappearance.ui.h:22 -msgid "_Edit" -msgstr "編輯(_E)" +#: ../data/ui/lxappearance.glade.h:14 +msgid "Icons only" +msgstr "只有圖示" -#: ../data/ui/lxappearance.ui.h:23 -msgid "_Help" -msgstr "說明(_H)" +#: ../data/ui/lxappearance.glade.h:15 +msgid "Install" +msgstr "安裝" -#: ../data/ui/lxappearance.ui.h:24 -msgid "Radio Button" -msgstr "單選按鈕" +#: ../data/ui/lxappearance.glade.h:16 +msgid "Large toolbar icon" +msgstr "大型工具列圖示" -#: ../data/ui/lxappearance.ui.h:25 -msgid "Check Button" -msgstr "核取方塊" +#: ../data/ui/lxappearance.glade.h:17 +msgid "Mouse Cursor" +msgstr "滑鼠游標" -#: ../data/ui/lxappearance.ui.h:26 -msgid "button" -msgstr "按鈕" +#: ../data/ui/lxappearance.glade.h:18 +msgid "Normal windows:" +msgstr "正常視窗：" -#: ../data/ui/lxappearance.ui.h:27 -msgid "Demo" -msgstr "展示" +#: ../data/ui/lxappearance.glade.h:19 +msgid "Other" +msgstr "其他" -#: ../data/ui/lxappearance.ui.h:28 +#: ../data/ui/lxappearance.glade.h:20 msgid "Page1" msgstr "第一頁" -#: ../data/ui/lxappearance.ui.h:29 +#: ../data/ui/lxappearance.glade.h:21 msgid "Page2" msgstr "第二頁" -#: ../data/ui/lxappearance.ui.h:30 -msgid "Default font:" -msgstr "預設字型：" - -#: ../data/ui/lxappearance.ui.h:31 -msgid "Widget" -msgstr "圖形元件" - -#: ../data/ui/lxappearance.ui.h:32 -msgid "Color scheme is not supported by currently selected widget theme." -msgstr "目前選取的圖形元件佈景主題不支援配色方案" +#: ../data/ui/lxappearance.glade.h:22 +msgid "Play event sounds" +msgstr "播放事件音效" -#: ../data/ui/lxappearance.ui.h:33 -msgid "Use customized color scheme" -msgstr "使用自訂配色方案" +#: ../data/ui/lxappearance.glade.h:23 +msgid "Play event sounds as feedback to user input" +msgstr "使用者輸入時播放回饋音效" -#: ../data/ui/lxappearance.ui.h:34 -msgid "Normal windows:" -msgstr "正常視窗：" +#: ../data/ui/lxappearance.glade.h:24 +msgid "Preview of the selected cursor theme" +msgstr "預覽選取的滑鼠游標佈景主題" -#: ../data/ui/lxappearance.ui.h:35 -msgid "Text windows:" -msgstr "文字視窗：" +#: ../data/ui/lxappearance.glade.h:25 +msgid "Preview of the selected icon theme" +msgstr "預覽選取的圖示佈景主題" -#: ../data/ui/lxappearance.ui.h:36 -msgid "Selected items:" -msgstr "所選項目：" +#: ../data/ui/lxappearance.glade.h:26 +msgid "Preview of the selected widget style" +msgstr "預覽選取的視窗元件佈景主題" -#: ../data/ui/lxappearance.ui.h:37 -msgid "Tooltips:" -msgstr "工具提示：" +#: ../data/ui/lxappearance.glade.h:27 +msgid "Radio Button" +msgstr "Radio 按鈕" -#: ../data/ui/lxappearance.ui.h:38 -msgid "Background" -msgstr "背景" +#: ../data/ui/lxappearance.glade.h:28 +msgid "Remove" +msgstr "移除" -#: ../data/ui/lxappearance.ui.h:39 -msgid "Foreground" -msgstr "前景" +#: ../data/ui/lxappearance.glade.h:29 +msgid "Same as buttons" +msgstr "和按鈕相同" -#: ../data/ui/lxappearance.ui.h:40 -msgid "Color" -msgstr "色彩" +#: ../data/ui/lxappearance.glade.h:30 +msgid "Same as dialogs" +msgstr "和對話框相同" -#: ../data/ui/lxappearance.ui.h:41 -msgid "Install" -msgstr "安裝" +#: ../data/ui/lxappearance.glade.h:31 +msgid "Same as drag icons" +msgstr "和滑鼠拖放時相同" -#: ../data/ui/lxappearance.ui.h:42 -msgid "Remove" -msgstr "移除" +#: ../data/ui/lxappearance.glade.h:32 +msgid "Same as menu items" +msgstr "和選單項目相同" -#: ../data/ui/lxappearance.ui.h:43 -msgid "Preview of the selected icon theme" -msgstr "預覽選取的圖示佈景主題" +#: ../data/ui/lxappearance.glade.h:33 +msgid "Selected items:" +msgstr "選取的項目：" -#: ../data/ui/lxappearance.ui.h:44 -msgid "Icon Theme" -msgstr "圖示佈景主題" +#: ../data/ui/lxappearance.glade.h:34 +msgid "Show images in menus" +msgstr "在選單中顯示圖示" -#: ../data/ui/lxappearance.ui.h:45 -msgid "Preview of the selected cursor theme" -msgstr "預覽選取的滑鼠游標佈景主題" +#: ../data/ui/lxappearance.glade.h:35 +msgid "Show images on buttons" +msgstr "在按鈕上顯示圖示" -#: ../data/ui/lxappearance.ui.h:46 +#: ../data/ui/lxappearance.glade.h:36 msgid "Size of cursors" msgstr "游標大小" -#: ../data/ui/lxappearance.ui.h:47 +#: ../data/ui/lxappearance.glade.h:37 +msgid "Small toolbar icon" +msgstr "小型工具列圖示" + +#: ../data/ui/lxappearance.glade.h:38 msgid "Smaller" msgstr "較小" -#: ../data/ui/lxappearance.ui.h:48 -msgid "Bigger" -msgstr "較大" +#: ../data/ui/lxappearance.glade.h:39 +msgid "Text below icons" +msgstr "文字在圖示下方" -#: ../data/ui/lxappearance.ui.h:49 -msgid "" -"Note: Not all of the desktop applications support changing cursor " -"theme on-the-fly. So your changes here might not be fully applied to all " -"applications till next login." -msgstr "" -"注意：並非所有桌面應用程式都能支援動態變更滑鼠游標，所以你的部份變更可" -"能要到下次登入時才會被完全套用。" +#: ../data/ui/lxappearance.glade.h:40 +msgid "Text beside icons" +msgstr "文字在圖示旁" -#: ../data/ui/lxappearance.ui.h:50 -msgid "Mouse Cursor" -msgstr "滑鼠游標" +#: ../data/ui/lxappearance.glade.h:41 +msgid "Text only" +msgstr "只有文字" -#: ../data/ui/lxappearance.ui.h:51 -msgid "Window Border" -msgstr "視窗邊框" +#: ../data/ui/lxappearance.glade.h:42 +msgid "Text windows:" +msgstr "文字視窗：" -#: ../data/ui/lxappearance.ui.h:52 -msgid "Enable antialising" -msgstr "啟用反鋸齒" - -#: ../data/ui/lxappearance.ui.h:53 -msgid "Antialising" -msgstr "反鋸齒" - -#: ../data/ui/lxappearance.ui.h:54 -msgid "Enable hinting" -msgstr "啟用修飾" - -#: ../data/ui/lxappearance.ui.h:55 -msgid "Hinting style: " -msgstr "修飾風格：" - -#: ../data/ui/lxappearance.ui.h:56 -msgid "Hinting" -msgstr "修飾" - -#: ../data/ui/lxappearance.ui.h:57 -msgid "Sub-pixel geometry: " -msgstr "次像素配置：" - -#: ../data/ui/lxappearance.ui.h:58 -msgid "Sub-pixel geometry" -msgstr "次像素配置" - -#: ../data/ui/lxappearance.ui.h:59 -msgid "Font" -msgstr "字型" +#: ../data/ui/lxappearance.glade.h:43 +msgid "Toolbar Icon Size:" +msgstr "工具列圖示大小：" -#: ../data/ui/lxappearance.ui.h:60 -msgid "Toolbar Style: " +#: ../data/ui/lxappearance.glade.h:44 +msgid "Toolbar Style:" msgstr "工具列風格：" -#: ../data/ui/lxappearance.ui.h:61 -msgid "Toolbar Icon Size: " -msgstr "工具列圖示大小：" +#: ../data/ui/lxappearance.glade.h:45 +msgid "Tooltips:" +msgstr "工具提示：" -#: ../data/ui/lxappearance.ui.h:62 -msgid "Show images on buttons" -msgstr "在按鈕顯示圖示" +#: ../data/ui/lxappearance.glade.h:46 +msgid "Use customized color scheme" +msgstr "使用自訂的色彩" -#: ../data/ui/lxappearance.ui.h:63 -msgid "Show images in menus" -msgstr "在選單顯示圖示" +#: ../data/ui/lxappearance.glade.h:47 +msgid "Widget" +msgstr "圖形元件" -#: ../data/ui/lxappearance.ui.h:64 -msgid "GUI Options" -msgstr "圖形介面選項" +#: ../data/ui/lxappearance.glade.h:48 +msgid "Window Border" +msgstr "視窗邊框" -#: ../data/ui/lxappearance.ui.h:65 -msgid "Play event sounds" -msgstr "播放事件音效" +#: ../data/ui/lxappearance.glade.h:49 +msgid "_Edit" +msgstr "編輯(_E)" -#: ../data/ui/lxappearance.ui.h:66 -msgid "Play event sounds as feedback to user input" -msgstr "使用者輸入時播放事件音效作為回饋" +#: ../data/ui/lxappearance.glade.h:50 +msgid "_File" +msgstr "檔案(_F)" -#: ../data/ui/lxappearance.ui.h:67 -msgid "Sound Effect" -msgstr "音效" +#: ../data/ui/lxappearance.glade.h:51 +msgid "_Help" +msgstr "說明(_H)" -#: ../data/ui/lxappearance.ui.h:68 -msgid "Other" -msgstr "其他" +#: ../data/ui/lxappearance.glade.h:52 +msgid "button" +msgstr "按鈕" -#: ../src/utils.c:217 +#: ../src/utils.c:212 msgid "Select an icon theme" -msgstr "選取圖示佈景主題" +msgstr "選取一個圖示佈景主題" -#: ../src/utils.c:224 +#: ../src/utils.c:219 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (圖示佈景主題)" diff -Nru lxappearance-0.5.2~ppa2/src/Makefile.am lxappearance-0.5.0/src/Makefile.am --- lxappearance-0.5.2~ppa2/src/Makefile.am 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/Makefile.am 2010-10-06 16:55:34.000000000 +0000 @@ -23,8 +23,6 @@ icon-theme.h \ cursor-theme.c \ cursor-theme.h \ - font.c \ - font.h \ other.c \ other.h \ utils.c \ @@ -37,8 +35,6 @@ $(GTK_CFLAGS) \ $(XLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(ADDITIONAL_FLAGS) \ -Werror-implicit-function-declaration \ $(NULL) @@ -46,7 +42,6 @@ $(GTK_LIBS) \ $(XLIB_LIBS) \ $(GMODULE_LIBS) \ - $(DBUS_LIBS) \ $(INTLLIBS) \ $(NULL) diff -Nru lxappearance-0.5.2~ppa2/src/Makefile.in lxappearance-0.5.0/src/Makefile.in --- lxappearance-0.5.2~ppa2/src/Makefile.in 2012-05-20 14:36:36.000000000 +0000 +++ lxappearance-0.5.0/src/Makefile.in 2010-10-12 15:20:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,15 +56,13 @@ lxappearance-color-scheme.$(OBJEXT) \ lxappearance-icon-theme.$(OBJEXT) \ lxappearance-cursor-theme.$(OBJEXT) \ - lxappearance-font.$(OBJEXT) lxappearance-other.$(OBJEXT) \ - lxappearance-utils.$(OBJEXT) lxappearance-plugin.$(OBJEXT) \ - $(am__objects_1) + lxappearance-other.$(OBJEXT) lxappearance-utils.$(OBJEXT) \ + lxappearance-plugin.$(OBJEXT) $(am__objects_1) lxappearance_OBJECTS = $(am_lxappearance_OBJECTS) am__DEPENDENCIES_1 = lxappearance_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) lxappearance_LINK = $(CCLD) $(lxappearance_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_xml_purge_OBJECTS = xml_purge-xml-purge.$(OBJEXT) @@ -76,25 +74,10 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(lxappearance_SOURCES) $(xml_purge_SOURCES) DIST_SOURCES = $(lxappearance_SOURCES) $(xml_purge_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -118,21 +101,13 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } HEADERS = $(lxappearance_include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -146,8 +121,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ @@ -174,15 +147,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -199,8 +167,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -213,9 +179,6 @@ XGETTEXT = @XGETTEXT@ XLIB_CFLAGS = @XLIB_CFLAGS@ XLIB_LIBS = @XLIB_LIBS@ -XMLCATALOG = @XMLCATALOG@ -XML_CATALOG_FILE = @XML_CATALOG_FILE@ -XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -239,8 +202,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -282,8 +243,6 @@ icon-theme.h \ cursor-theme.c \ cursor-theme.h \ - font.c \ - font.h \ other.c \ other.h \ utils.c \ @@ -296,8 +255,6 @@ $(GTK_CFLAGS) \ $(XLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(ADDITIONAL_FLAGS) \ -Werror-implicit-function-declaration \ $(NULL) @@ -305,7 +262,6 @@ $(GTK_LIBS) \ $(XLIB_LIBS) \ $(GMODULE_LIBS) \ - $(DBUS_LIBS) \ $(INTLLIBS) \ $(NULL) @@ -316,7 +272,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -341,9 +297,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @@ -386,12 +342,12 @@ clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -lxappearance$(EXEEXT): $(lxappearance_OBJECTS) $(lxappearance_DEPENDENCIES) $(EXTRA_lxappearance_DEPENDENCIES) +lxappearance$(EXEEXT): $(lxappearance_OBJECTS) $(lxappearance_DEPENDENCIES) @rm -f lxappearance$(EXEEXT) - $(AM_V_CCLD)$(lxappearance_LINK) $(lxappearance_OBJECTS) $(lxappearance_LDADD) $(LIBS) -xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) $(EXTRA_xml_purge_DEPENDENCIES) + $(lxappearance_LINK) $(lxappearance_OBJECTS) $(lxappearance_LDADD) $(LIBS) +xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) @rm -f xml-purge$(EXEEXT) - $(AM_V_CCLD)$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS) + $(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -401,7 +357,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-color-scheme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-cursor-theme.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-font.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-icon-theme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-lxappearance.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-other.Po@am__quote@ @@ -411,158 +366,144 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_purge-xml-purge.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` lxappearance-lxappearance.o: lxappearance.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-lxappearance.o -MD -MP -MF $(DEPDIR)/lxappearance-lxappearance.Tpo -c -o lxappearance-lxappearance.o `test -f 'lxappearance.c' || echo '$(srcdir)/'`lxappearance.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-lxappearance.Tpo $(DEPDIR)/lxappearance-lxappearance.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lxappearance.c' object='lxappearance-lxappearance.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-lxappearance.o -MD -MP -MF $(DEPDIR)/lxappearance-lxappearance.Tpo -c -o lxappearance-lxappearance.o `test -f 'lxappearance.c' || echo '$(srcdir)/'`lxappearance.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-lxappearance.Tpo $(DEPDIR)/lxappearance-lxappearance.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lxappearance.c' object='lxappearance-lxappearance.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-lxappearance.o `test -f 'lxappearance.c' || echo '$(srcdir)/'`lxappearance.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-lxappearance.o `test -f 'lxappearance.c' || echo '$(srcdir)/'`lxappearance.c lxappearance-lxappearance.obj: lxappearance.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-lxappearance.obj -MD -MP -MF $(DEPDIR)/lxappearance-lxappearance.Tpo -c -o lxappearance-lxappearance.obj `if test -f 'lxappearance.c'; then $(CYGPATH_W) 'lxappearance.c'; else $(CYGPATH_W) '$(srcdir)/lxappearance.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-lxappearance.Tpo $(DEPDIR)/lxappearance-lxappearance.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lxappearance.c' object='lxappearance-lxappearance.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-lxappearance.obj -MD -MP -MF $(DEPDIR)/lxappearance-lxappearance.Tpo -c -o lxappearance-lxappearance.obj `if test -f 'lxappearance.c'; then $(CYGPATH_W) 'lxappearance.c'; else $(CYGPATH_W) '$(srcdir)/lxappearance.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-lxappearance.Tpo $(DEPDIR)/lxappearance-lxappearance.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lxappearance.c' object='lxappearance-lxappearance.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-lxappearance.obj `if test -f 'lxappearance.c'; then $(CYGPATH_W) 'lxappearance.c'; else $(CYGPATH_W) '$(srcdir)/lxappearance.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-lxappearance.obj `if test -f 'lxappearance.c'; then $(CYGPATH_W) 'lxappearance.c'; else $(CYGPATH_W) '$(srcdir)/lxappearance.c'; fi` lxappearance-widget-theme.o: widget-theme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-widget-theme.o -MD -MP -MF $(DEPDIR)/lxappearance-widget-theme.Tpo -c -o lxappearance-widget-theme.o `test -f 'widget-theme.c' || echo '$(srcdir)/'`widget-theme.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-widget-theme.Tpo $(DEPDIR)/lxappearance-widget-theme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widget-theme.c' object='lxappearance-widget-theme.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-widget-theme.o -MD -MP -MF $(DEPDIR)/lxappearance-widget-theme.Tpo -c -o lxappearance-widget-theme.o `test -f 'widget-theme.c' || echo '$(srcdir)/'`widget-theme.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-widget-theme.Tpo $(DEPDIR)/lxappearance-widget-theme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widget-theme.c' object='lxappearance-widget-theme.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-widget-theme.o `test -f 'widget-theme.c' || echo '$(srcdir)/'`widget-theme.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-widget-theme.o `test -f 'widget-theme.c' || echo '$(srcdir)/'`widget-theme.c lxappearance-widget-theme.obj: widget-theme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-widget-theme.obj -MD -MP -MF $(DEPDIR)/lxappearance-widget-theme.Tpo -c -o lxappearance-widget-theme.obj `if test -f 'widget-theme.c'; then $(CYGPATH_W) 'widget-theme.c'; else $(CYGPATH_W) '$(srcdir)/widget-theme.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-widget-theme.Tpo $(DEPDIR)/lxappearance-widget-theme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widget-theme.c' object='lxappearance-widget-theme.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-widget-theme.obj -MD -MP -MF $(DEPDIR)/lxappearance-widget-theme.Tpo -c -o lxappearance-widget-theme.obj `if test -f 'widget-theme.c'; then $(CYGPATH_W) 'widget-theme.c'; else $(CYGPATH_W) '$(srcdir)/widget-theme.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-widget-theme.Tpo $(DEPDIR)/lxappearance-widget-theme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widget-theme.c' object='lxappearance-widget-theme.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-widget-theme.obj `if test -f 'widget-theme.c'; then $(CYGPATH_W) 'widget-theme.c'; else $(CYGPATH_W) '$(srcdir)/widget-theme.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-widget-theme.obj `if test -f 'widget-theme.c'; then $(CYGPATH_W) 'widget-theme.c'; else $(CYGPATH_W) '$(srcdir)/widget-theme.c'; fi` lxappearance-color-scheme.o: color-scheme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-color-scheme.o -MD -MP -MF $(DEPDIR)/lxappearance-color-scheme.Tpo -c -o lxappearance-color-scheme.o `test -f 'color-scheme.c' || echo '$(srcdir)/'`color-scheme.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-color-scheme.Tpo $(DEPDIR)/lxappearance-color-scheme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='color-scheme.c' object='lxappearance-color-scheme.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-color-scheme.o -MD -MP -MF $(DEPDIR)/lxappearance-color-scheme.Tpo -c -o lxappearance-color-scheme.o `test -f 'color-scheme.c' || echo '$(srcdir)/'`color-scheme.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-color-scheme.Tpo $(DEPDIR)/lxappearance-color-scheme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='color-scheme.c' object='lxappearance-color-scheme.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-color-scheme.o `test -f 'color-scheme.c' || echo '$(srcdir)/'`color-scheme.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-color-scheme.o `test -f 'color-scheme.c' || echo '$(srcdir)/'`color-scheme.c lxappearance-color-scheme.obj: color-scheme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-color-scheme.obj -MD -MP -MF $(DEPDIR)/lxappearance-color-scheme.Tpo -c -o lxappearance-color-scheme.obj `if test -f 'color-scheme.c'; then $(CYGPATH_W) 'color-scheme.c'; else $(CYGPATH_W) '$(srcdir)/color-scheme.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-color-scheme.Tpo $(DEPDIR)/lxappearance-color-scheme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='color-scheme.c' object='lxappearance-color-scheme.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-color-scheme.obj -MD -MP -MF $(DEPDIR)/lxappearance-color-scheme.Tpo -c -o lxappearance-color-scheme.obj `if test -f 'color-scheme.c'; then $(CYGPATH_W) 'color-scheme.c'; else $(CYGPATH_W) '$(srcdir)/color-scheme.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-color-scheme.Tpo $(DEPDIR)/lxappearance-color-scheme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='color-scheme.c' object='lxappearance-color-scheme.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-color-scheme.obj `if test -f 'color-scheme.c'; then $(CYGPATH_W) 'color-scheme.c'; else $(CYGPATH_W) '$(srcdir)/color-scheme.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-color-scheme.obj `if test -f 'color-scheme.c'; then $(CYGPATH_W) 'color-scheme.c'; else $(CYGPATH_W) '$(srcdir)/color-scheme.c'; fi` lxappearance-icon-theme.o: icon-theme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-icon-theme.o -MD -MP -MF $(DEPDIR)/lxappearance-icon-theme.Tpo -c -o lxappearance-icon-theme.o `test -f 'icon-theme.c' || echo '$(srcdir)/'`icon-theme.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-icon-theme.Tpo $(DEPDIR)/lxappearance-icon-theme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='icon-theme.c' object='lxappearance-icon-theme.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-icon-theme.o -MD -MP -MF $(DEPDIR)/lxappearance-icon-theme.Tpo -c -o lxappearance-icon-theme.o `test -f 'icon-theme.c' || echo '$(srcdir)/'`icon-theme.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-icon-theme.Tpo $(DEPDIR)/lxappearance-icon-theme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='icon-theme.c' object='lxappearance-icon-theme.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-icon-theme.o `test -f 'icon-theme.c' || echo '$(srcdir)/'`icon-theme.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-icon-theme.o `test -f 'icon-theme.c' || echo '$(srcdir)/'`icon-theme.c lxappearance-icon-theme.obj: icon-theme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-icon-theme.obj -MD -MP -MF $(DEPDIR)/lxappearance-icon-theme.Tpo -c -o lxappearance-icon-theme.obj `if test -f 'icon-theme.c'; then $(CYGPATH_W) 'icon-theme.c'; else $(CYGPATH_W) '$(srcdir)/icon-theme.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-icon-theme.Tpo $(DEPDIR)/lxappearance-icon-theme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='icon-theme.c' object='lxappearance-icon-theme.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-icon-theme.obj -MD -MP -MF $(DEPDIR)/lxappearance-icon-theme.Tpo -c -o lxappearance-icon-theme.obj `if test -f 'icon-theme.c'; then $(CYGPATH_W) 'icon-theme.c'; else $(CYGPATH_W) '$(srcdir)/icon-theme.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-icon-theme.Tpo $(DEPDIR)/lxappearance-icon-theme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='icon-theme.c' object='lxappearance-icon-theme.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-icon-theme.obj `if test -f 'icon-theme.c'; then $(CYGPATH_W) 'icon-theme.c'; else $(CYGPATH_W) '$(srcdir)/icon-theme.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-icon-theme.obj `if test -f 'icon-theme.c'; then $(CYGPATH_W) 'icon-theme.c'; else $(CYGPATH_W) '$(srcdir)/icon-theme.c'; fi` lxappearance-cursor-theme.o: cursor-theme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-cursor-theme.o -MD -MP -MF $(DEPDIR)/lxappearance-cursor-theme.Tpo -c -o lxappearance-cursor-theme.o `test -f 'cursor-theme.c' || echo '$(srcdir)/'`cursor-theme.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-cursor-theme.Tpo $(DEPDIR)/lxappearance-cursor-theme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cursor-theme.c' object='lxappearance-cursor-theme.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-cursor-theme.o -MD -MP -MF $(DEPDIR)/lxappearance-cursor-theme.Tpo -c -o lxappearance-cursor-theme.o `test -f 'cursor-theme.c' || echo '$(srcdir)/'`cursor-theme.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-cursor-theme.Tpo $(DEPDIR)/lxappearance-cursor-theme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cursor-theme.c' object='lxappearance-cursor-theme.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-cursor-theme.o `test -f 'cursor-theme.c' || echo '$(srcdir)/'`cursor-theme.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-cursor-theme.o `test -f 'cursor-theme.c' || echo '$(srcdir)/'`cursor-theme.c lxappearance-cursor-theme.obj: cursor-theme.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-cursor-theme.obj -MD -MP -MF $(DEPDIR)/lxappearance-cursor-theme.Tpo -c -o lxappearance-cursor-theme.obj `if test -f 'cursor-theme.c'; then $(CYGPATH_W) 'cursor-theme.c'; else $(CYGPATH_W) '$(srcdir)/cursor-theme.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-cursor-theme.Tpo $(DEPDIR)/lxappearance-cursor-theme.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cursor-theme.c' object='lxappearance-cursor-theme.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-cursor-theme.obj `if test -f 'cursor-theme.c'; then $(CYGPATH_W) 'cursor-theme.c'; else $(CYGPATH_W) '$(srcdir)/cursor-theme.c'; fi` - -lxappearance-font.o: font.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-font.o -MD -MP -MF $(DEPDIR)/lxappearance-font.Tpo -c -o lxappearance-font.o `test -f 'font.c' || echo '$(srcdir)/'`font.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-font.Tpo $(DEPDIR)/lxappearance-font.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='font.c' object='lxappearance-font.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-cursor-theme.obj -MD -MP -MF $(DEPDIR)/lxappearance-cursor-theme.Tpo -c -o lxappearance-cursor-theme.obj `if test -f 'cursor-theme.c'; then $(CYGPATH_W) 'cursor-theme.c'; else $(CYGPATH_W) '$(srcdir)/cursor-theme.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-cursor-theme.Tpo $(DEPDIR)/lxappearance-cursor-theme.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cursor-theme.c' object='lxappearance-cursor-theme.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-font.o `test -f 'font.c' || echo '$(srcdir)/'`font.c - -lxappearance-font.obj: font.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-font.obj -MD -MP -MF $(DEPDIR)/lxappearance-font.Tpo -c -o lxappearance-font.obj `if test -f 'font.c'; then $(CYGPATH_W) 'font.c'; else $(CYGPATH_W) '$(srcdir)/font.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-font.Tpo $(DEPDIR)/lxappearance-font.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='font.c' object='lxappearance-font.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-font.obj `if test -f 'font.c'; then $(CYGPATH_W) 'font.c'; else $(CYGPATH_W) '$(srcdir)/font.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-cursor-theme.obj `if test -f 'cursor-theme.c'; then $(CYGPATH_W) 'cursor-theme.c'; else $(CYGPATH_W) '$(srcdir)/cursor-theme.c'; fi` lxappearance-other.o: other.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-other.o -MD -MP -MF $(DEPDIR)/lxappearance-other.Tpo -c -o lxappearance-other.o `test -f 'other.c' || echo '$(srcdir)/'`other.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-other.Tpo $(DEPDIR)/lxappearance-other.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='other.c' object='lxappearance-other.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-other.o -MD -MP -MF $(DEPDIR)/lxappearance-other.Tpo -c -o lxappearance-other.o `test -f 'other.c' || echo '$(srcdir)/'`other.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-other.Tpo $(DEPDIR)/lxappearance-other.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='other.c' object='lxappearance-other.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-other.o `test -f 'other.c' || echo '$(srcdir)/'`other.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-other.o `test -f 'other.c' || echo '$(srcdir)/'`other.c lxappearance-other.obj: other.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-other.obj -MD -MP -MF $(DEPDIR)/lxappearance-other.Tpo -c -o lxappearance-other.obj `if test -f 'other.c'; then $(CYGPATH_W) 'other.c'; else $(CYGPATH_W) '$(srcdir)/other.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-other.Tpo $(DEPDIR)/lxappearance-other.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='other.c' object='lxappearance-other.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-other.obj -MD -MP -MF $(DEPDIR)/lxappearance-other.Tpo -c -o lxappearance-other.obj `if test -f 'other.c'; then $(CYGPATH_W) 'other.c'; else $(CYGPATH_W) '$(srcdir)/other.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-other.Tpo $(DEPDIR)/lxappearance-other.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='other.c' object='lxappearance-other.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-other.obj `if test -f 'other.c'; then $(CYGPATH_W) 'other.c'; else $(CYGPATH_W) '$(srcdir)/other.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-other.obj `if test -f 'other.c'; then $(CYGPATH_W) 'other.c'; else $(CYGPATH_W) '$(srcdir)/other.c'; fi` lxappearance-utils.o: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-utils.o -MD -MP -MF $(DEPDIR)/lxappearance-utils.Tpo -c -o lxappearance-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-utils.Tpo $(DEPDIR)/lxappearance-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='lxappearance-utils.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-utils.o -MD -MP -MF $(DEPDIR)/lxappearance-utils.Tpo -c -o lxappearance-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-utils.Tpo $(DEPDIR)/lxappearance-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='lxappearance-utils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c lxappearance-utils.obj: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-utils.obj -MD -MP -MF $(DEPDIR)/lxappearance-utils.Tpo -c -o lxappearance-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-utils.Tpo $(DEPDIR)/lxappearance-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='lxappearance-utils.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-utils.obj -MD -MP -MF $(DEPDIR)/lxappearance-utils.Tpo -c -o lxappearance-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-utils.Tpo $(DEPDIR)/lxappearance-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='lxappearance-utils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` lxappearance-plugin.o: plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-plugin.o -MD -MP -MF $(DEPDIR)/lxappearance-plugin.Tpo -c -o lxappearance-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-plugin.Tpo $(DEPDIR)/lxappearance-plugin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='lxappearance-plugin.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-plugin.o -MD -MP -MF $(DEPDIR)/lxappearance-plugin.Tpo -c -o lxappearance-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-plugin.Tpo $(DEPDIR)/lxappearance-plugin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin.c' object='lxappearance-plugin.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c lxappearance-plugin.obj: plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-plugin.obj -MD -MP -MF $(DEPDIR)/lxappearance-plugin.Tpo -c -o lxappearance-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lxappearance-plugin.Tpo $(DEPDIR)/lxappearance-plugin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='lxappearance-plugin.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-plugin.obj -MD -MP -MF $(DEPDIR)/lxappearance-plugin.Tpo -c -o lxappearance-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-plugin.Tpo $(DEPDIR)/lxappearance-plugin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plugin.c' object='lxappearance-plugin.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` xml_purge-xml-purge.o: $(top_srcdir)/src/xml-purge.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c xml_purge-xml-purge.obj: $(top_srcdir)/src/xml-purge.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f '$(top_srcdir)/src/xml-purge.c'; then $(CYGPATH_W) '$(top_srcdir)/src/xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/xml-purge.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/xml-purge.c' object='xml_purge-xml-purge.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f '$(top_srcdir)/src/xml-purge.c'; then $(CYGPATH_W) '$(top_srcdir)/src/xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/xml-purge.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/xml-purge.c' object='xml_purge-xml-purge.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.obj `if test -f '$(top_srcdir)/src/xml-purge.c'; then $(CYGPATH_W) '$(top_srcdir)/src/xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/xml-purge.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.obj `if test -f '$(top_srcdir)/src/xml-purge.c'; then $(CYGPATH_W) '$(top_srcdir)/src/xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/xml-purge.c'; fi` install-lxappearance_includeHEADERS: $(lxappearance_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(lxappearance_includedir)" || $(MKDIR_P) "$(DESTDIR)$(lxappearance_includedir)" @@ -580,7 +521,9 @@ @$(NORMAL_UNINSTALL) @list='$(lxappearance_include_HEADERS)'; test -n "$(lxappearance_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(lxappearance_includedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(lxappearance_includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(lxappearance_includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -681,15 +624,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru lxappearance-0.5.2~ppa2/src/font.c lxappearance-0.5.0/src/font.c --- lxappearance-0.5.2~ppa2/src/font.c 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/font.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -// font.c -// -// Copyright 2010 Hong Jen Yee (PCMan) -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -// MA 02110-1301, USA. - - -#include "lxappearance.h" -#include "font.h" -#include - -static const char* font_hinting_style[]={ - "hintnone", - "hintslight", - "hintmedium", - "hintfull" -}; - -static const char* font_rgba[]={ - "none", - "rgb", - "bgr", - "vrgb", - "vbgr" - }; - -static void on_hinting_style_changed(GtkComboBox* combo, gpointer user_data) -{ - gint pos_combo = gtk_combo_box_get_active(combo); - if (pos_combo >= 0) - { - app.hinting_style = font_hinting_style[pos_combo]; - lxappearance_changed(); - } - -} - -static void on_font_rgba_changed(GtkComboBox* combo, gpointer user_data) -{ - gint pos_combo = gtk_combo_box_get_active(combo); - if (pos_combo >= 0) - { - app.font_rgba = font_rgba[pos_combo]; - lxappearance_changed(); - } -} - -static int convert_list_to_pos(char* font, const char* list[]) -{ - - int pos, i; - - for (i = 0; i <= 3; i = i + 1) - { - if (g_strcmp0(list[i],font) == 0) - pos = i; - } - - return pos ; - -} - -void font_init(GtkBuilder* b) -{ - int idx; - app.enable_antialising_check = GTK_WIDGET(gtk_builder_get_object(b, "enable_antialising")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(app.enable_antialising_check), app.enable_antialising); - g_signal_connect(app.enable_antialising_check, "toggled", G_CALLBACK(on_check_button_toggled), &app.enable_antialising); - - app.enable_hinting_check = GTK_WIDGET(gtk_builder_get_object(b, "enable_hinting")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(app.enable_hinting_check), app.enable_hinting); - g_signal_connect(app.enable_hinting_check, "toggled", G_CALLBACK(on_check_button_toggled), &app.enable_hinting); - - app.hinting_style_combo = GTK_WIDGET(gtk_builder_get_object(b, "hinting_style")); - idx = convert_list_to_pos(app.hinting_style, font_hinting_style); - gtk_combo_box_set_active(GTK_COMBO_BOX(app.hinting_style_combo), idx); - g_signal_connect(app.hinting_style_combo, "changed", G_CALLBACK(on_hinting_style_changed), NULL); - - app.font_rgba_combo = GTK_WIDGET(gtk_builder_get_object(b, "font_rgba")); - idx = convert_list_to_pos(app.font_rgba, font_rgba); - gtk_combo_box_set_active(GTK_COMBO_BOX(app.font_rgba_combo), idx); - g_signal_connect(app.font_rgba_combo, "changed", G_CALLBACK(on_font_rgba_changed), NULL); - -} - diff -Nru lxappearance-0.5.2~ppa2/src/font.h lxappearance-0.5.0/src/font.h --- lxappearance-0.5.2~ppa2/src/font.h 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/font.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -// font.h -// -// Copyright 2010 Hong Jen Yee (PCMan) -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -// MA 02110-1301, USA. - - -#ifndef __FONT_H__ -#define __FONT_H__ - -G_BEGIN_DECLS - -void font_init(GtkBuilder* b); - -G_END_DECLS - -#endif /* __FONT_H__ */ diff -Nru lxappearance-0.5.2~ppa2/src/lxappearance.c lxappearance-0.5.0/src/lxappearance.c --- lxappearance-0.5.2~ppa2/src/lxappearance.c 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/lxappearance.c 2010-08-12 22:53:00.000000000 +0000 @@ -34,15 +34,10 @@ #include #include -#if ENABLE_DBUS -#include -#endif - #include "widget-theme.h" #include "color-scheme.h" #include "icon-theme.h" #include "cursor-theme.h" -#include "font.h" #include "other.h" #include "plugin.h" @@ -51,63 +46,19 @@ Atom lxsession_atom = 0; static const char* lxsession_name = NULL; -/* Dbus functions Copy from lxsession-logout - TODO Create a library fro this ? -*/ - -static gboolean check_lxde_dbus() -{ -#if ENABLE_DBUS - DBusError error; - dbus_error_init(&error); - DBusConnection * connection = dbus_bus_get(DBUS_BUS_SESSION, &error); - if (connection == NULL) - { - g_warning(G_STRLOC ": Failed to connect to the session message bus: %s", error.message); - dbus_error_free(&error); - return FALSE; - } - - DBusMessage * test = dbus_message_new_method_call ( - "org.lxde.SessionManager", - "/org/lxde/SessionManager", - "org.lxde.SessionManager", - "Logout"); - - if (dbus_message_has_interface(test, "org.lxde.SessionManager")) - { - return TRUE; - } - else - { - return FALSE; - } -#else - return FALSE; -#endif -} - static void check_lxsession() { - lxsession_atom = XInternAtom( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "_LXSESSION", True ); + lxsession_atom = XInternAtom( GDK_DISPLAY(), "_LXSESSION", True ); if( lxsession_atom != None ) { - XGrabServer( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) ); - if( XGetSelectionOwner( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), lxsession_atom ) ) + XGrabServer( GDK_DISPLAY() ); + if( XGetSelectionOwner( GDK_DISPLAY(), lxsession_atom ) ) { app.use_lxsession = TRUE; lxsession_name = g_getenv("DESKTOP_SESSION"); } - XUngrabServer( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) ); + XUngrabServer( GDK_DISPLAY() ); } - - /* Check Lxsession also with dbus */ - if (check_lxde_dbus()) - { - app.use_lxsession = TRUE; - lxsession_name = g_getenv("DESKTOP_SESSION"); - } - } static GOptionEntry option_entries[] = @@ -148,11 +99,6 @@ static void reload_all_programs() { -#if GTK_CHECK_VERSION(3, 0, 0) - -/* TODO Port this to something else than gdk_event_send_clientmessage_toall */ - -#else GdkEventClient event; event.type = GDK_CLIENT_EVENT; event.send_event = TRUE; @@ -172,7 +118,6 @@ } event.data_format = 8; gdk_event_send_clientmessage_toall((GdkEvent *)&event); -#endif } static const char* bool2str(gboolean val) @@ -180,7 +125,6 @@ return val ? "TRUE" : "FALSE"; } - static void lxappearance_save_gtkrc() { static const char* tb_styles[]={ @@ -228,9 +172,6 @@ "gtk-enable-event-sounds=%d\n" "gtk-enable-input-feedback-sounds=%d\n" #endif - "gtk-xft-antialias=%d\n" - "gtk-xft-hinting=%d\n" - , app.cursor_theme_size, tb_styles[app.toolbar_style], tb_icon_sizes[app.toolbar_icon_size], @@ -238,25 +179,15 @@ app.menu_images ? 1 : 0, #if GTK_CHECK_VERSION(2, 14, 0) app.enable_event_sound ? 1 : 0, - app.enable_input_feedback ? 1 : 0, + app.enable_input_feedback ? 1 : 0 #endif - app.enable_antialising ? 1 : 0, - app.enable_hinting ? 1 : 0 ); - if(app.hinting_style) - g_string_append_printf(content, - "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style); - - if(app.font_rgba) - g_string_append_printf(content, - "gtk-xft-rgba=\"%s\"\n", app.font_rgba); - if(app.color_scheme) { char* escaped = g_strescape(app.color_scheme, NULL); g_string_append_printf(content, - "gtk-color-scheme=\"%s\"\n", + "gtk-color-scheme=\"\"\n", escaped); g_free(escaped); } @@ -266,83 +197,7 @@ g_get_home_dir()); g_file_set_contents(file_path, content->str, content->len, NULL); - - /* Save also in GTK3 folder - Content shold be different from the gtk2 one - */ - GString* content_gtk3 = g_string_sized_new(512); - char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL); - char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL); - - if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR)) - { - g_mkdir_with_parents(file_path_gtk3, 0755); - } - - - g_string_append(content_gtk3, "[Settings] \n"); - - if(app.widget_theme) - g_string_append_printf(content_gtk3, - "gtk-theme-name=%s\n", app.widget_theme); - if(app.icon_theme) - g_string_append_printf(content_gtk3, - "gtk-icon-theme-name=%s\n", app.icon_theme); - if(app.default_font) - g_string_append_printf(content_gtk3, - "gtk-font-name=%s\n", app.default_font); - if(app.cursor_theme) - g_string_append_printf(content_gtk3, - "gtk-cursor-theme-name=%s\n", app.cursor_theme); - save_cursor_theme_name(); - - g_string_append_printf(content_gtk3, - "gtk-cursor-theme-size=%d\n" - "gtk-toolbar-style=%s\n" - "gtk-toolbar-icon-size=%s\n" - "gtk-button-images=%d\n" - "gtk-menu-images=%d\n" -#if GTK_CHECK_VERSION(2, 14, 0) - "gtk-enable-event-sounds=%d\n" - "gtk-enable-input-feedback-sounds=%d\n" -#endif - "gtk-xft-antialias=%d\n" - "gtk-xft-hinting=%d\n" - - , app.cursor_theme_size, - tb_styles[app.toolbar_style], - tb_icon_sizes[app.toolbar_icon_size], - app.button_images ? 1 : 0, - app.menu_images ? 1 : 0, -#if GTK_CHECK_VERSION(2, 14, 0) - app.enable_event_sound ? 1 : 0, - app.enable_input_feedback ? 1 : 0, -#endif - app.enable_antialising ? 1 : 0, - app.enable_hinting ? 1 : 0 - ); - - if(app.hinting_style) - g_string_append_printf(content_gtk3, - "gtk-xft-hintstyle=%s\n", app.hinting_style); - - if(app.font_rgba) - g_string_append_printf(content_gtk3, - "gtk-xft-rgba=%s\n", app.font_rgba); - - if(app.color_scheme) - { - char* escaped = g_strescape(app.color_scheme, NULL); - g_string_append_printf(content_gtk3, - "gtk-color-scheme=%s\n", - escaped); - g_free(escaped); - } - - g_file_set_contents(file_path_settings, content_gtk3->str, content_gtk3->len, NULL); - g_string_free(content, TRUE); - g_string_free(content_gtk3, TRUE); g_free(file_path); } @@ -394,10 +249,6 @@ g_key_file_set_integer( kf, "GTK", "iNet/EnableEventSounds", app.enable_event_sound); g_key_file_set_integer( kf, "GTK", "iNet/EnableInputFeedbackSounds", app.enable_input_feedback); #endif - g_key_file_set_integer( kf, "GTK", "iXft/Antialias", app.enable_antialising); - g_key_file_set_integer( kf, "GTK", "iXft/Hinting", app.enable_hinting); - g_key_file_set_string( kf, "GTK", "sXft/HintStyle", app.hinting_style); - g_key_file_set_string( kf, "GTK", "sXft/RGBA", app.font_rgba); buf = g_key_file_to_data( kf, &len, NULL ); g_key_file_free(kf); @@ -457,10 +308,6 @@ "gtk-enable-event-sounds", &app.enable_event_sound, "gtk-enable-input-feedback-sounds", &app.enable_input_feedback, #endif - "gtk-xft-antialias", &app.enable_antialising, - "gtk-xft-hinting", &app.enable_hinting, - "gtk-xft-hintstyle", &app.hinting_style, - "gtk-xft-rgba", &app.font_rgba, NULL); /* try to figure out cursor theme used. */ if(!app.cursor_theme || g_strcmp0(app.cursor_theme, "default") == 0) @@ -564,7 +411,6 @@ color_scheme_init(b); icon_theme_init(b); cursor_theme_init(b); - font_init(b); other_init(b); /* the page for window manager plugins */ app.wm_page = GTK_WIDGET(gtk_builder_get_object(b, "wm_page")); @@ -591,14 +437,3 @@ gtk_dialog_set_response_sensitive(GTK_DIALOG(app.dlg), GTK_RESPONSE_APPLY, TRUE); } } - -void on_check_button_toggled(GtkToggleButton* btn, gpointer user_data) -{ - gboolean* val = (gboolean*)user_data; - gboolean new_val = gtk_toggle_button_get_active(btn); - if(new_val != *val) - { - *val = new_val; - lxappearance_changed(); - } -} diff -Nru lxappearance-0.5.2~ppa2/src/lxappearance.h lxappearance-0.5.0/src/lxappearance.h --- lxappearance-0.5.2~ppa2/src/lxappearance.h 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/lxappearance.h 2010-08-07 17:45:05.000000000 +0000 @@ -69,13 +69,6 @@ GtkWidget* button_images_check; GtkWidget* menu_images_check; - /* font rendering */ - GtkWidget* font_rgba_combo; - GtkWidget* hinting_style_combo; - - GtkWidget* enable_antialising_check; - GtkWidget* enable_hinting_check; - /* the page for window manager plugins */ GtkWidget* wm_page; @@ -87,8 +80,6 @@ char* color_scheme; int toolbar_style; int toolbar_icon_size; - char* hinting_style; - char* font_rgba; gboolean button_images; gboolean menu_images; @@ -100,9 +91,6 @@ gboolean enable_input_feedback; #endif - gboolean enable_antialising; - gboolean enable_hinting; - gboolean changed; gboolean use_lxsession; }; @@ -111,6 +99,4 @@ void lxappearance_changed(); -void on_check_button_toggled(GtkToggleButton* btn, gpointer user_data); - #endif diff -Nru lxappearance-0.5.2~ppa2/src/other.c lxappearance-0.5.0/src/other.c --- lxappearance-0.5.2~ppa2/src/other.c 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/other.c 2010-08-07 16:19:09.000000000 +0000 @@ -34,6 +34,17 @@ lxappearance_changed(); } +static void on_check_button_toggled(GtkToggleButton* btn, gpointer user_data) +{ + gboolean* val = (gboolean*)user_data; + gboolean new_val = gtk_toggle_button_get_active(btn); + if(new_val != *val) + { + *val = new_val; + lxappearance_changed(); + } +} + void other_init(GtkBuilder* b) { int idx; @@ -67,6 +78,5 @@ /* event sound support */ gtk_widget_show_all(GTK_WIDGET(gtk_builder_get_object(b, "sound_effect"))); #endif - } diff -Nru lxappearance-0.5.2~ppa2/src/plugin.c lxappearance-0.5.0/src/plugin.c --- lxappearance-0.5.2~ppa2/src/plugin.c 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/plugin.c 2010-08-07 17:56:33.000000000 +0000 @@ -43,7 +43,7 @@ void plugins_init(GtkBuilder* builder) { GDir* dir = g_dir_open(PLUGIN_DIR, 0, NULL); - const char* name = NULL; + const char* name; if(!dir) return; while(name = g_dir_read_name(dir)) diff -Nru lxappearance-0.5.2~ppa2/src/utils.c lxappearance-0.5.0/src/utils.c --- lxappearance-0.5.2~ppa2/src/utils.c 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/utils.c 2010-08-07 17:58:38.000000000 +0000 @@ -58,11 +58,7 @@ { gint res; GtkWidget* dlg = gtk_dialog_new_with_buttons(title, parent, -#if GTK_CHECK_VERSION(3, 0, 0) - GTK_DIALOG_MODAL, -#else GTK_DIALOG_NO_SEPARATOR|GTK_DIALOG_MODAL, -#endif GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); GtkWidget* progress = gtk_progress_bar_new(); GtkWidget* vbox = gtk_dialog_get_content_area(GTK_DIALOG(dlg)); @@ -77,7 +73,7 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); gtk_widget_show(progress); gtk_box_pack_start(GTK_BOX(vbox), progress, FALSE, TRUE, 0); - gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress)); + gtk_progress_set_activity_mode(GTK_PROGRESS(progress), TRUE); g_signal_connect(dlg, "response", G_CALLBACK(on_progress_dlg_response), &pid); res = gtk_dialog_run(GTK_DIALOG(dlg)); @@ -164,7 +160,7 @@ if(dir) { char* name; - while((name = (char*)g_dir_read_name(dir)) != NULL) + while(name = (char*)g_dir_read_name(dir)) { char* index_theme = g_build_filename(tmp_dir, name, "index.theme", NULL); gboolean is_theme = g_file_test(index_theme, G_FILE_TEST_EXISTS); @@ -192,7 +188,6 @@ g_free(theme_target); g_free(theme_tmp); } - g_free(name); } g_dir_close(dir); diff -Nru lxappearance-0.5.2~ppa2/src/xml-purge.c lxappearance-0.5.0/src/xml-purge.c --- lxappearance-0.5.2~ppa2/src/xml-purge.c 2012-05-19 22:08:32.000000000 +0000 +++ lxappearance-0.5.0/src/xml-purge.c 2010-08-07 16:19:09.000000000 +0000 @@ -82,7 +82,7 @@ } } } - + fclose( fo ); error: