[SCM] freetuxtv/master: Revert "Revert "Merge tag 'dfsg_clean/0.6.6'""
rak at users.alioth.debian.org
rak at users.alioth.debian.org
Sun Aug 24 12:45:08 UTC 2014
The following commit has been merged in the master branch:
commit f2a87091a24213662bc1ac3f08ea717d075deab3
Author: Ryan Kavanagh <rak at debian.org>
Date: Sun Aug 24 14:22:11 2014 +0200
Revert "Revert "Merge tag 'dfsg_clean/0.6.6'""
We need to bring in the new upstream changes. See the following post on
merging branches after having reverted a previous merge of theirs:
http://opensource.apple.com/source/Git/Git-26/src/git-htmldocs/howto/revert-a-faulty-merge.txt
This reverts commit 458a5bde22e27bac5289bee20203e8b27be89492.
diff --git a/ChangeLog b/ChangeLog
index bfff2e7..6300bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+FreetuxTV 0.6.6 (2014-01-18)
+ - Use correctly libvlc options
+ - Add Turkish translation
+ - Add Spanish translation
+ - Add missing logo size
+ - Download icons options
+
FreetuxTV 0.6.5 (2012-05-08)
- Fix crash when displaying channels group
- Use defined bug tracker URL in configure.ac
diff --git a/Makefile.in b/Makefile.in
index b3a921f..98b9cf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,30 +79,48 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing mkinstalldirs
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in COPYING compile config.guess config.sub \
+ install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -90,11 +152,33 @@ am__installdirs = "$(DESTDIR)$(freetuxtvdocdir)"
DATA = $(freetuxtvdoc_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -105,6 +189,7 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -132,6 +217,7 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -396,8 +482,11 @@ distclean-libtool:
-rm -f libtool config.lt
install-freetuxtvdocDATA: $(freetuxtvdoc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(freetuxtvdocdir)" || $(MKDIR_P) "$(DESTDIR)$(freetuxtvdocdir)"
@list='$(freetuxtvdoc_DATA)'; test -n "$(freetuxtvdocdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(freetuxtvdocdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(freetuxtvdocdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -414,22 +503,25 @@ uninstall-freetuxtvdocDATA:
dir='$(DESTDIR)$(freetuxtvdocdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -444,57 +536,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -510,12 +557,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -527,15 +569,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -544,9 +582,31 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -582,13 +642,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -617,40 +674,36 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -661,8 +714,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
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*) \
@@ -674,9 +725,9 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -708,7 +759,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
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'
@@ -847,26 +898,25 @@ ps-am:
uninstall-am: uninstall-freetuxtvdocDATA uninstall-local
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool 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-libtool 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 \
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distclean-hdr distclean-libtool 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-freetuxtvdocDATA 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 mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-freetuxtvdocDATA uninstall-local
+ tags tags-am uninstall uninstall-am uninstall-freetuxtvdocDATA \
+ uninstall-local
# Remove doc directory on uninstall
diff --git a/aclocal.m4 b/aclocal.m4
index c2989c8..c3d0a52 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 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.
@@ -12,13 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
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.69],,
+[m4_warning([this file was generated for autoconf 2.69.
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'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -337,7 +337,6 @@ msgstr ""
dnl
glib_DEFUN([GLIB_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
GLIB_LC_MESSAGES
GLIB_WITH_NLS
@@ -1990,7 +1989,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -2354,7 +2360,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -3178,17 +3185,6 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -3305,7 +3301,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -3921,10 +3917,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3963,7 +3955,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4715,7 +4707,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5014,7 +5006,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -6903,9 +6895,6 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7067,7 +7056,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -9471,25 +9460,22 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 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
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
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.13.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -9505,24 +9491,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# 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.13.3])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-2013 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/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -9541,7 +9525,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -9567,22 +9551,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 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 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -9601,16 +9582,14 @@ AC_CONFIG_COMMANDS_PRE(
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-2013 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
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# 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,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -9620,7 +9599,7 @@ fi])])
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -9633,12 +9612,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -9646,8 +9626,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# 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'.
+ # 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
@@ -9687,16 +9667,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -9705,8 +9685,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -9714,7 +9694,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # 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.
am__obj=conftest.${OBJEXT-o}
@@ -9762,7 +9742,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -9772,9 +9752,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -9789,20 +9773,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -9815,7 +9797,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -9827,21 +9809,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -9859,7 +9839,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -9869,15 +9849,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 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 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -9893,7 +9870,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9922,31 +9899,40 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -9957,28 +9943,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
@@ -10006,15 +9996,12 @@ for _am_header in $config_headers :; do
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-2013 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.
@@ -10028,16 +10015,14 @@ if test x"${install_sh}" != xset; then
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 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
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -10054,20 +10039,17 @@ 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.
+# Copyright (C) 1996-2013 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
+# 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]),
@@ -10078,10 +10060,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
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]))
+ [AS_HELP_STRING([--]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
@@ -10089,18 +10072,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
]
)
-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.
+# Copyright (C) 2001-2013 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 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -10118,7 +10097,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -10143,15 +10122,12 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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 6
-
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
@@ -10180,15 +10156,12 @@ m4_define([AC_PROG_CC],
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 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 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -10196,11 +10169,10 @@ AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -10213,54 +10185,22 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006, 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 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 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_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -10270,7 +10210,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
# --------------------
# 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)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
@@ -10286,22 +10226,16 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 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_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -10312,32 +10246,40 @@ case `pwd` in
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # 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".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # 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".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@ -10347,46 +10289,118 @@ else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 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_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], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+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-2013 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.
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 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
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -10400,18 +10414,16 @@ 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-2013 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_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -10421,76 +10433,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Substitute a variable $(am__untar) that extract such
# 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}'])
-m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff --git a/compile b/compile
index b1f4749..531136b 100755
--- a/compile
+++ b/compile
@@ -1,10 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -79,6 +78,53 @@ func_file_conv ()
esac
}
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
@@ -109,43 +155,34 @@ func_cl_wrapper ()
;;
esac
;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
-l*)
- lib=${1#-l}
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- set x "$@" "$dir/$lib.dll.lib"
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- set x "$@" "$dir/$lib.lib"
- break
- fi
- done
- IFS=$save_IFS
-
- test "$found" != yes && set x "$@" "$lib.lib"
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
shift
;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
-L*)
- func_file_conv "${1#-L}"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
+ func_cl_dashL "${1#-L}"
;;
-static)
shared=false
diff --git a/config.guess b/config.guess
index d622a44..b79252d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2013-06-10'
# This file 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
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -54,9 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@@ -852,21 +874,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1227,19 +1256,21 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@ EOF
exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
diff --git a/config.sub b/config.sub
index c894da4..9633db7 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,18 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2013-08-10'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file 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
+# This file 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 3 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.
+# 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 <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-02-10'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -123,7 +116,7 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -225,6 +218,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -253,10 +252,12 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
- | c4x | clipper \
+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
@@ -267,7 +268,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -285,16 +286,17 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 \
+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
- | or32 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -364,13 +366,13 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -383,7 +385,8 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -401,12 +404,13 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -782,11 +786,15 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@@ -822,7 +830,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-msys
;;
mvs)
@@ -1013,7 +1021,11 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1340,21 +1352,21 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1486,9 +1498,6 @@ case $os in
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
@@ -1537,6 +1546,12 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ c8051-*)
+ os=-elf
+ ;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
@@ -1577,6 +1592,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
diff --git a/configure b/configure
index 636393f..7ccaee0 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for freetuxtv 0.6.5.
+# Generated by GNU Autoconf 2.69 for freetuxtv 0.6.6.
#
# Report bugs to <http://code.google.com/p/freetuxtv/issues/list>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # 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+"$@"}
+ export CONFIG_SHELL
+ # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='freetuxtv'
PACKAGE_TARNAME='freetuxtv'
-PACKAGE_VERSION='0.6.5'
-PACKAGE_STRING='freetuxtv 0.6.5'
+PACKAGE_VERSION='0.6.6'
+PACKAGE_STRING='freetuxtv 0.6.6'
PACKAGE_BUGREPORT='http://code.google.com/p/freetuxtv/issues/list'
PACKAGE_URL='http://code.google.com/p/freetuxtv/'
@@ -672,7 +692,6 @@ INTLTOOL_V_MERGE_OPTIONS
INTLTOOL__v_MERGE_0
INTLTOOL__v_MERGE_
INTLTOOL_V_MERGE
-AM_DEFAULT_VERBOSITY
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
@@ -745,6 +764,10 @@ LIBVLCGTK_LT_VERSION
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
am__untar
am__tar
AMTAR
@@ -809,6 +832,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_maintainer_mode
enable_dependency_tracking
enable_shared
@@ -1307,8 +1331,6 @@ target=$target_alias
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
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1394,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# 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 freetuxtv 0.6.5 to adapt to many kinds of systems.
+\`configure' configures freetuxtv 0.6.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1464,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of freetuxtv 0.6.5:";;
+ short | recursive ) echo "Configuration of freetuxtv 0.6.6:";;
esac
cat <<\_ACEOF
@@ -1472,10 +1494,15 @@ Optional Features:
--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-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
+ --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
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-shared[=PKGS] build shared libraries [default=no]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -1605,10 +1632,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-freetuxtv configure 0.6.5
-generated by GNU Autoconf 2.68
+freetuxtv configure 0.6.6
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1684,7 +1711,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2028,8 +2055,8 @@ 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 freetuxtv $as_me 0.6.5, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by freetuxtv $as_me 0.6.6, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2377,7 +2404,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.11'
+am__api_version='1.13'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2445,7 +2472,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2503,9 +2530,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2516,32 +2540,40 @@ case `pwd` in
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
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # 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
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # 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
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -2553,6 +2585,16 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -2575,12 +2617,12 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -2592,10 +2634,10 @@ if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2614,7 +2656,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2654,7 +2696,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2705,7 +2747,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2734,12 +2776,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2758,7 +2794,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2822,6 +2858,45 @@ else
fi
rmdir .tst 2>/dev/null
+# 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=1;;
+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='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -2843,8 +2918,9 @@ fi
# Define the identity of the package.
+
PACKAGE=freetuxtv
- VERSION=0.6.5
+ VERSION=0.6.6
cat >>confdefs.h <<_ACEOF
@@ -2872,18 +2948,29 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# 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}'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
ac_config_headers="$ac_config_headers config.h"
@@ -2939,7 +3026,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2979,7 +3066,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3032,7 +3119,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3073,7 +3160,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3131,7 +3218,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3175,7 +3262,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3621,8 +3708,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3725,7 +3811,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -3781,8 +3867,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# 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'.
+ # 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
@@ -3817,16 +3903,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -3835,8 +3921,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -3844,7 +3930,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # 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.
am__obj=conftest.${OBJEXT-o}
@@ -4149,7 +4235,7 @@ do
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -4225,7 +4311,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4291,7 +4377,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4358,7 +4444,7 @@ do
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -4614,7 +4700,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4658,7 +4744,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4847,7 +4933,8 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -5082,7 +5169,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5122,7 +5209,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5248,10 +5335,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5290,7 +5373,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5428,7 +5511,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5468,7 +5551,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5572,7 +5655,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5616,7 +5699,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5741,7 +5824,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5781,7 +5864,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5840,7 +5923,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5880,7 +5963,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6388,7 +6471,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -6529,7 +6619,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6569,7 +6659,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6649,7 +6739,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6689,7 +6779,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6741,7 +6831,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6781,7 +6871,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6833,7 +6923,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6873,7 +6963,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6925,7 +7015,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6965,7 +7055,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7017,7 +7107,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7057,7 +7147,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8183,7 +8273,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -10353,17 +10443,6 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -10480,7 +10559,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -12165,7 +12244,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$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
@@ -12429,7 +12508,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_UPDATE="$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
@@ -12469,7 +12548,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_MERGE="$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
@@ -12509,7 +12588,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_EXTRACT="$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
@@ -12693,7 +12772,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XGETTEXT="$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
@@ -12733,7 +12812,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGMERGE="$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
@@ -12773,7 +12852,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGFMT="$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
@@ -12813,7 +12892,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$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
@@ -12864,7 +12943,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_PERL="$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
@@ -13150,7 +13229,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$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
@@ -13193,7 +13272,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$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
@@ -14446,11 +14525,11 @@ else
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -14467,8 +14546,9 @@ main ()
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -14484,10 +14564,10 @@ main ()
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -14828,6 +14908,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -15158,16 +15246,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -15227,28 +15315,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -15269,8 +15345,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by freetuxtv $as_me 0.6.5, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by freetuxtv $as_me 0.6.6, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15336,11 +15412,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-freetuxtv config.status 0.6.5
-configured by $0, generated by GNU Autoconf 2.68,
+freetuxtv config.status 0.6.6
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -15431,7 +15507,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -16357,7 +16433,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -16370,7 +16446,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -16404,21 +16480,19 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
diff --git a/configure.ac b/configure.ac
index 0233675..51927b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Created by Anjuta application wizard.
-AC_INIT(freetuxtv, 0.6.5,
+AC_INIT(freetuxtv, 0.6.6,
http://code.google.com/p/freetuxtv/issues/list,,
http://code.google.com/p/freetuxtv/)
diff --git a/data/Makefile.in b/data/Makefile.in
index 6839221..cf78677 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,24 +79,42 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -85,9 +147,29 @@ am__installdirs = "$(DESTDIR)$(freetuxtvdatadir)" \
DATA = $(freetuxtvdata_DATA) $(xml_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -359,8 +441,11 @@ clean-libtool:
-rm -rf .libs _libs
install-freetuxtvdataDATA: $(freetuxtvdata_DATA)
@$(NORMAL_INSTALL)
- test -z "$(freetuxtvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(freetuxtvdatadir)"
@list='$(freetuxtvdata_DATA)'; test -n "$(freetuxtvdatadir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(freetuxtvdatadir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(freetuxtvdatadir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -377,8 +462,11 @@ uninstall-freetuxtvdataDATA:
dir='$(DESTDIR)$(freetuxtvdatadir)'; $(am__uninstall_files_from_dir)
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; test -n "$(xmldir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(xmldir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(xmldir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -395,22 +483,25 @@ uninstall-xmlDATA:
dir='$(DESTDIR)$(xmldir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -425,57 +516,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -491,12 +537,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -508,15 +549,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -525,6 +562,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -561,13 +613,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -692,24 +741,22 @@ ps-am:
uninstall-am: uninstall-freetuxtvdataDATA uninstall-xmlDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags 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-freetuxtvdataDATA install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-xmlDATA installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-freetuxtvdataDATA \
- uninstall-xmlDATA
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-generic distclean-libtool \
+ distclean-tags 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-freetuxtvdataDATA install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ install-xmlDATA installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-freetuxtvdataDATA uninstall-xmlDATA
@INTLTOOL_XML_NOMERGE_RULE@
diff --git a/data/channels_groups.xml.in b/data/channels_groups.xml.in
index 17c2f8e..5b8d326 100644
--- a/data/channels_groups.xml.in
+++ b/data/channels_groups.xml.in
@@ -21,98 +21,245 @@
<language lang="Darty" id="darty">
<channels_group name="Darty TV" uri="http://dartybox-news.fr/ftp/dartyboxtvpc.m3u" required_isp="Darty"/>
</language>
+ <language id="af" _lang="Afrikaans Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_af.m3u" _name="Web TV (Afrikaans)"></channels_group>
+ </language>
+ <language id="sq" _lang="Albanian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sq.m3u" _name="Web TV (Albanian)"></channels_group>
+ </language>
+ <language id="am" _lang="Amharic Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_am.m3u" _name="Web TV (Amharic)"></channels_group>
+ </language>
<language id="ar" _lang="Arabic Web TV and Radio">
- <channels_group _name="Web Radio (Arabic)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_ar.m3u" />
- <channels_group _name="Web TV (Arabic)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ar.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ar.m3u" _name="Web TV (Arabic)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ar.m3u" _name="Web Radio (Arabic)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_ar.m3u" _name="Web Cam (Arabic)"></channels_group>
+ </language>
+ <language id="hy" _lang="Armenian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hy.m3u" _name="Web TV (Armenian)"></channels_group>
+ </language>
+ <language id="az" _lang="Azerbaijani Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_az.m3u" _name="Web TV (Azerbaijani)"></channels_group>
+ </language>
+ <language id="bn" _lang="Bengali/Bangla Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_bn.m3u" _name="Web TV (Bengali/Bangla)"></channels_group>
+ </language>
+ <language id="bg" _lang="Bulgarian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_bg.m3u" _name="Web TV (Bulgarian)"></channels_group>
+ </language>
+ <language id="km" _lang="Cambodian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_km.m3u" _name="Web TV (Cambodian)"></channels_group>
</language>
<language id="ca" _lang="Catalan Web TV and Radio">
- <channels_group _name="Web Radio (Catalan)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_ca.m3u" />
- <channels_group _name="Web TV (Catalan)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ca.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ca.m3u" _name="Web TV (Catalan)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ca.m3u" _name="Web Radio (Catalan)"></channels_group>
</language>
<language id="zh" _lang="Chinese Web TV and Radio">
- <channels_group _name="Web Radio (Chinese)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_zh.m3u" />
- <channels_group _name="Web TV (Chinese)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_zh.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_zh.m3u" _name="Web TV (Chinese)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_zh.m3u" _name="Web Radio (Chinese)"></channels_group>
+ </language>
+ <language id="hr" _lang="Croatian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hr.m3u" _name="Web TV (Croatian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_hr.m3u" _name="Web Radio (Croatian)"></channels_group>
</language>
<language id="cs" _lang="Czech Web TV and Radio">
- <channels_group _name="Web TV (Czech)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_cs.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_cs.m3u" _name="Web TV (Czech)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_cs.m3u" _name="Web Radio (Czech)"></channels_group>
+ </language>
+ <language id="da" _lang="Danish Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_da.m3u" _name="Web TV (Danish)"></channels_group>
</language>
<language id="nl" _lang="Dutch Web TV and Radio">
- <channels_group _name="Web TV (Dutch)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_nl.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_nl.m3u" _name="Web TV (Dutch)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_nl.m3u" _name="Web Radio (Dutch)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_nl.m3u" _name="Web Cam (Dutch)"></channels_group>
</language>
<language id="en" _lang="English Web TV and Radio">
- <channels_group _name="Web Programmes (English)" uri="http://database.freetuxtv.net/playlists/playlist_programmes_en.m3u" />
- <channels_group _name="Web Radio (English)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_en.m3u" />
- <channels_group _name="Web TV (English)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_en.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_en.m3u" _name="Web TV (English)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_en.m3u" _name="Web Radio (English)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_programmes_en.m3u" _name="Web Programmes (English)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_en.m3u" _name="Web Cam (English)"></channels_group>
+ </language>
+ <language id="et" _lang="Estonian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_et.m3u" _name="Web TV (Estonian)"></channels_group>
+ </language>
+ <language id="fi" _lang="Finnish Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_fi.m3u" _name="Web TV (Finnish)"></channels_group>
</language>
<language id="fr" _lang="French Web TV and Radio">
- <channels_group _name="Web Programmes (French)" uri="http://database.freetuxtv.net/playlists/playlist_programmes_fr.m3u" />
- <channels_group _name="Web Radio (French)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_fr.m3u" />
- <channels_group _name="Web TV (French)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_fr.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_fr.m3u" _name="Web TV (French)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_fr.m3u" _name="Web Radio (French)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_programmes_fr.m3u" _name="Web Programmes (French)"></channels_group>
+ </language>
+ <language id="ka" _lang="Georgian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ka.m3u" _name="Web TV (Georgian)"></channels_group>
</language>
<language id="de" _lang="German Web TV and Radio">
- <channels_group _name="Web Radio (German)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_de.m3u" />
- <channels_group _name="Web TV (German)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_de.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_de.m3u" _name="Web TV (German)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_de.m3u" _name="Web Radio (German)"></channels_group>
+ </language>
+ <language id="el" _lang="Greek Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_el.m3u" _name="Web TV (Greek)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_el.m3u" _name="Web Radio (Greek)"></channels_group>
+ </language>
+ <language id="iw" _lang="Hebrew Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_iw.m3u" _name="Web TV (Hebrew)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_iw.m3u" _name="Web Radio (Hebrew)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_iw.m3u" _name="Web Cam (Hebrew)"></channels_group>
+ </language>
+ <language id="hi" _lang="Hindi Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hi.m3u" _name="Web TV (Hindi)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_hi.m3u" _name="Web Radio (Hindi)"></channels_group>
</language>
<language id="hu" _lang="Hungarian Web TV and Radio">
- <channels_group _name="Web TV (Hungarian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_hu.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hu.m3u" _name="Web TV (Hungarian)"></channels_group>
</language>
- <language id="el" _lang="Greek Web TV and Radio">
- <channels_group _name="Web TV (Greek)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_el.m3u" />
+ <language id="is" _lang="Icelandic Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_is.m3u" _name="Web TV (Icelandic)"></channels_group>
+ </language>
+ <language id="in" _lang="Indonesian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_in.m3u" _name="Web TV (Indonesian)"></channels_group>
+ </language>
+ <language id="ia" _lang="Interlingua Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ia.m3u" _name="Web Radio (Interlingua)"></channels_group>
+ </language>
+ <language id="ga" _lang="Irish Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ga.m3u" _name="Web TV (Irish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ga.m3u" _name="Web Radio (Irish)"></channels_group>
</language>
<language id="it" _lang="Italian Web TV and Radio">
- <channels_group _name="Web Radio (Italian)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_it.m3u" />
- <channels_group _name="Web TV (Italian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_it.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_it.m3u" _name="Web TV (Italian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_it.m3u" _name="Web Radio (Italian)"></channels_group>
</language>
<language id="ja" _lang="Japanese Web TV and Radio">
- <channels_group _name="Web TV (Japanese)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ja.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ja.m3u" _name="Web TV (Japanese)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ja.m3u" _name="Web Radio (Japanese)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_ja.m3u" _name="Web Cam (Japanese)"></channels_group>
+ </language>
+ <language id="kk" _lang="Kazakh Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_kk.m3u" _name="Web TV (Kazakh)"></channels_group>
</language>
<language id="ko" _lang="Korean Web TV and Radio">
- <channels_group _name="Web TV (Korean)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ko.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ko.m3u" _name="Web TV (Korean)"></channels_group>
+ </language>
+ <language id="ku" _lang="Kurdish Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ku.m3u" _name="Web TV (Kurdish)"></channels_group>
</language>
<language id="la" _lang="Latin Web TV and Radio">
- <channels_group _name="Web TV (Latin)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_la.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_la.m3u" _name="Web TV (Latin)"></channels_group>
+ </language>
+ <language id="lv" _lang="Latvian/Lettish Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_lv.m3u" _name="Web TV (Latvian/Lettish)"></channels_group>
+ </language>
+ <language id="lt" _lang="Lithuanian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_lt.m3u" _name="Web TV (Lithuanian)"></channels_group>
+ </language>
+ <language id="mk" _lang="Macedonian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mk.m3u" _name="Web TV (Macedonian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_mk.m3u" _name="Web Radio (Macedonian)"></channels_group>
</language>
- <language id="el" _lang="Modern Greek Web TV and Radio">
- <channels_group _name="Web TV (Modern Greek)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_el.m3u" />
+ <language id="ms" _lang="Malay Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ms.m3u" _name="Web TV (Malay)"></channels_group>
+ </language>
+ <language id="ml" _lang="Malayalam Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ml.m3u" _name="Web TV (Malayalam)"></channels_group>
+ </language>
+ <language id="mt" _lang="Maltese Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mt.m3u" _name="Web TV (Maltese)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_mt.m3u" _name="Web Radio (Maltese)"></channels_group>
+ </language>
+ <language id="mo" _lang="Moldavian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mo.m3u" _name="Web TV (Moldavian)"></channels_group>
+ </language>
+ <language id="mn" _lang="Mongolian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mn.m3u" _name="Web TV (Mongolian)"></channels_group>
</language>
<language id="no" _lang="Norwegian Web TV and Radio">
- <channels_group _name="Web TV (Norwegian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_no.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_no.m3u" _name="Web TV (Norwegian)"></channels_group>
</language>
<language id="fa" _lang="Persian Web TV and Radio">
- <channels_group _name="Web TV (Persian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_fa.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_fa.m3u" _name="Web TV (Persian)"></channels_group>
</language>
<language id="pl" _lang="Polish Web TV and Radio">
- <channels_group _name="Web TV (Polish)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_pl.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_pl.m3u" _name="Web TV (Polish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_pl.m3u" _name="Web Radio (Polish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_pl.m3u" _name="Web Cam (Polish)"></channels_group>
</language>
<language id="pt" _lang="Portuguese Web TV and Radio">
- <channels_group _name="Web TV (Portuguese)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_pt.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_pt.m3u" _name="Web TV (Portuguese)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_pt.m3u" _name="Web Radio (Portuguese)"></channels_group>
+ </language>
+ <language id="pa" _lang="Punjabi Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_pa.m3u" _name="Web TV (Punjabi)"></channels_group>
</language>
<language id="ro" _lang="Romanian Web TV and Radio">
- <channels_group _name="Web TV (Romanian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ro.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ro.m3u" _name="Web TV (Romanian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ro.m3u" _name="Web Radio (Romanian)"></channels_group>
</language>
<language id="ru" _lang="Russian Web TV and Radio">
- <channels_group _name="Web Radio (Russian)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_ru.m3u" />
- <channels_group _name="Web TV (Russian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ru.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ru.m3u" _name="Web TV (Russian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ru.m3u" _name="Web Radio (Russian)"></channels_group>
+ </language>
+ <language id="sr" _lang="Serbian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sr.m3u" _name="Web TV (Serbian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_sr.m3u" _name="Web Radio (Serbian)"></channels_group>
+ </language>
+ <language id="sh" _lang="Serbo-Croatian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sh.m3u" _name="Web TV (Serbo-Croatian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_sh.m3u" _name="Web Radio (Serbo-Croatian)"></channels_group>
</language>
<language id="sk" _lang="Slovak Web TV and Radio">
- <channels_group _name="Web TV (Slovak)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_sk.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sk.m3u" _name="Web TV (Slovak)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_sk.m3u" _name="Web Radio (Slovak)"></channels_group>
+ </language>
+ <language id="sl" _lang="Slovenian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sl.m3u" _name="Web TV (Slovenian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_sl.m3u" _name="Web Radio (Slovenian)"></channels_group>
</language>
<language id="es" _lang="Spanish Web TV and Radio">
- <channels_group _name="Web Radio (Spanish)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_es.m3u" />
- <channels_group _name="Web TV (Spanish)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_es.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_es.m3u" _name="Web TV (Spanish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_es.m3u" _name="Web Radio (Spanish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_programmes_es.m3u" _name="Web Programmes (Spanish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_es.m3u" _name="Web Cam (Spanish)"></channels_group>
</language>
<language id="sv" _lang="Swedish Web TV and Radio">
- <channels_group _name="Web TV (Swedish)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_sv.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sv.m3u" _name="Web TV (Swedish)"></channels_group>
+ </language>
+ <language id="tl" _lang="Tagalog Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_tl.m3u" _name="Web TV (Tagalog)"></channels_group>
+ </language>
+ <language id="ta" _lang="Tamil Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ta.m3u" _name="Web TV (Tamil)"></channels_group>
</language>
<language id="th" _lang="Thai Web TV and Radio">
- <channels_group _name="Web TV (Thai)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_th.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_th.m3u" _name="Web TV (Thai)"></channels_group>
</language>
<language id="tr" _lang="Turkish Web TV and Radio">
- <channels_group _name="Web TV (Turkish)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_tr.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_tr.m3u" _name="Web TV (Turkish)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_tr.m3u" _name="Web Radio (Turkish)"></channels_group>
+ </language>
+ <language id="tk" _lang="Turkmen Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_tk.m3u" _name="Web TV (Turkmen)"></channels_group>
+ </language>
+ <language id="uk" _lang="Ukrainian Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_uk.m3u" _name="Web TV (Ukrainian)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_uk.m3u" _name="Web Cam (Ukrainian)"></channels_group>
+ </language>
+ <language id="ur" _lang="Urdu Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ur.m3u" _name="Web TV (Urdu)"></channels_group>
+ </language>
+ <language id="uz" _lang="Uzbek Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_uz.m3u" _name="Web TV (Uzbek)"></channels_group>
+ </language>
+ <language id="vi" _lang="Vietnamese Web TV and Radio">
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_vi.m3u" _name="Web TV (Vietnamese)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_vi.m3u" _name="Web Radio (Vietnamese)"></channels_group>
</language>
<language id="none" _lang="No lang Web TV and Radio">
- <channels_group _name="Web TV (No lang)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_none.m3u" />
- <channels_group _name="Web Radio (No lang)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_none.m3u" />
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_none.m3u" _name="Web TV (No lang)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_none.m3u" _name="Web Radio (No lang)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_programmes_none.m3u" _name="Web Programmes (No lang)"></channels_group>
+ <channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_none.m3u" _name="Web Cam (No lang)"></channels_group>
</language>
<language id="webcam" _lang="WebCam">
<channels_group _name="WebCam" uri="http://database.freetuxtv.net/playlists/playlist_webcam_all.m3u" />
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index b71eb00..835cd07 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -10,6 +10,8 @@ public_icons = \
hicolor_apps_22x22_freetuxtv.png \
hicolor_apps_32x32_freetuxtv.png \
hicolor_apps_48x48_freetuxtv.png \
+ hicolor_apps_64x64_freetuxtv.png \
+ hicolor_apps_128x128_freetuxtv.png \
hicolor_apps_scalable_freetuxtv.svg \
$(NULL)
@@ -21,6 +23,8 @@ noinst_DATA = \
hicolor_apps_22x22_freetuxtv.svg \
hicolor_apps_32x32_freetuxtv.svg \
hicolor_apps_48x48_freetuxtv.svg \
+ hicolor_apps_64x64_freetuxtv.svg \
+ hicolor_apps_128x128_freetuxtv.svg \
$(NULL)
EXTRA_DIST = \
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 33527d0..6be3971 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,18 +79,36 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DATA = $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -231,6 +293,8 @@ public_icons = \
hicolor_apps_22x22_freetuxtv.png \
hicolor_apps_32x32_freetuxtv.png \
hicolor_apps_48x48_freetuxtv.png \
+ hicolor_apps_64x64_freetuxtv.png \
+ hicolor_apps_128x128_freetuxtv.png \
hicolor_apps_scalable_freetuxtv.svg \
$(NULL)
@@ -242,6 +306,8 @@ noinst_DATA = \
hicolor_apps_22x22_freetuxtv.svg \
hicolor_apps_32x32_freetuxtv.svg \
hicolor_apps_48x48_freetuxtv.svg \
+ hicolor_apps_64x64_freetuxtv.svg \
+ hicolor_apps_128x128_freetuxtv.svg \
$(NULL)
EXTRA_DIST = \
@@ -292,11 +358,11 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -432,16 +498,17 @@ uninstall-am: uninstall-local
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-local 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 \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-local
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-data-local 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-local
update-icon-cache:
diff --git a/data/icons/hicolor_apps_128x128_freetuxtv.png b/data/icons/hicolor_apps_128x128_freetuxtv.png
new file mode 100644
index 0000000..3f8b9e8
Binary files /dev/null and b/data/icons/hicolor_apps_128x128_freetuxtv.png differ
diff --git a/data/icons/hicolor_apps_scalable_freetuxtv.svg b/data/icons/hicolor_apps_128x128_freetuxtv.svg
similarity index 95%
copy from data/icons/hicolor_apps_scalable_freetuxtv.svg
copy to data/icons/hicolor_apps_128x128_freetuxtv.svg
index fec4cce..241c531 100644
--- a/data/icons/hicolor_apps_scalable_freetuxtv.svg
+++ b/data/icons/hicolor_apps_128x128_freetuxtv.svg
@@ -10,12 +10,15 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="500"
- height="500"
+ width="128"
+ height="128"
id="svg19089"
version="1.1"
- inkscape:version="0.47 r22583"
- sodipodi:docname="Nouveau document 2">
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="hicdolor_apps_48x48_freetuxtv.svg"
+ inkscape:export-filename="/home/ebeuque/Informatique/Personnel/Projets/autres/freetuxtv/freetuxtv/data/icons/hicolor_apps_scalable_freetuxtv.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
id="defs19091">
<inkscape:perspective
@@ -965,16 +968,16 @@
borderopacity="0.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="0"
- inkscape:zoom="0.83671875"
- inkscape:cx="557.14254"
- inkscape:cy="295.79446"
+ inkscape:zoom="2.366598"
+ inkscape:cx="143.41893"
+ inkscape:cy="52.903635"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1440"
- inkscape:window-height="829"
+ inkscape:window-height="827"
inkscape:window-x="0"
- inkscape:window-y="39"
+ inkscape:window-y="25"
inkscape:window-maximized="1" />
<metadata
id="metadata19094">
@@ -984,7 +987,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -992,10 +995,10 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(207.14254,-519.37979)">
+ transform="translate(207.14254,-891.37979)">
<g
id="g19804"
- transform="matrix(3.442352,0,0,3.442352,-104.673,-1879.0964)">
+ transform="matrix(0.88124211,0,0,0.88124211,-180.91034,277.36989)">
<rect
style="fill:none;stroke:none"
id="rect18907"
@@ -1016,7 +1019,8 @@
style="fill:#3d81d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m -15830.189,5839.7611 9.314,-4.2487 c 0,0 -8.674,19.5152 -4.032,31.3243 4.644,11.8094 18.933,42.6546 9.92,70.5703 -9.012,27.9151 -32.826,45.4327 -32.826,45.4327 -15.298,10.3098 -19.567,4.6983 -5.713,-3.8538 0,0 22.437,-14.1574 29.007,-39.6193 7.755,-30.0518 -11.28,-43.7916 -15.804,-62.5015 l -60.402,119.9419 c -21.695,20.9602 -67.692,11.7487 -64.711,-15.7297 1.853,-17.0859 25.062,-21.0854 35.252,-20.4317 9.736,0.6249 23.702,8.089 31.799,14.6181 l 68.196,-135.5026 z"
id="path18913"
- sodipodi:nodetypes="ccssccsccszcc" />
+ sodipodi:nodetypes="ccssccsccszcc"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccssccsccszcc"
id="path18915"
@@ -1024,7 +1028,8 @@
style="fill:#ecd000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:export-filename="/home/smorge/SEBASTIENs/ACTIVITEs/EN COURS/freetuxtv/freetuxtv-1.png"
inkscape:export-xdpi="30.536354"
- inkscape:export-ydpi="30.536354" />
+ inkscape:export-ydpi="30.536354"
+ inkscape:connector-curvature="0" />
</g>
<g
transform="translate(40.381598,120.28663)"
@@ -1032,21 +1037,25 @@
<path
style="fill:#000000;fill-opacity:1;stroke:none"
d="m -15690.342,5918.3309 c -84.807,1.4896 -145.741,66.5755 -153.274,129.8026 -7.559,63.4563 -3.247,76.5545 -18.678,127.3472 l 346.839,0 c -15.428,-50.7884 -11.118,-63.893 -18.678,-127.3472 -7.532,-63.227 -68.442,-128.313 -153.25,-129.8026 l -2.959,0 z"
- id="path18919" />
+ id="path18919"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccsccc"
id="path18921"
d="m -15469.405,6154.8583 16.44,104.7341 c 0,0 30.033,-16.7156 55.873,-11.7295 25.843,4.9859 63.837,33.3542 86.435,26.8411 10.928,-3.15 5.332,-19.2677 -5.116,-33.0683 -44.014,-51.2128 -89.856,-75.4203 -153.632,-86.7774 z"
- style="fill:#000000;stroke:none" />
+ style="fill:#000000;stroke:none"
+ inkscape:connector-curvature="0" />
<path
style="fill:#000000;stroke:none"
d="m -15905.167,6154.8583 -16.441,104.7341 c 0,0 -30.032,-16.7156 -55.873,-11.7295 -25.842,4.9859 -63.837,33.3542 -86.435,26.8411 -10.928,-3.15 -5.331,-19.2677 5.116,-33.0683 44.014,-51.2128 89.857,-75.4203 153.633,-86.7774 z"
id="path18923"
- sodipodi:nodetypes="ccsccc" />
+ sodipodi:nodetypes="ccsccc"
+ inkscape:connector-curvature="0" />
<path
id="path18925"
d="m -15928.384,6137.378 c 0,91.6973 0,183.3946 0,275.092 159.676,0 319.353,0 479.03,0 0,-92.058 0,-184.1158 0,-276.1736 -159.677,0 -319.354,-1e-4 -479.03,0 l 0,0.5408 0,0.5408 z"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
<rect
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="rect18927"
@@ -1057,7 +1066,8 @@
<path
style="opacity:0.5;fill:url(#radialGradient19872);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m -15922.565,6140.6116 0,24.0119 c -34.172,7.6069 -67.054,21.9243 -94.811,43.624 -15.394,13.1547 -31.051,26.2747 -42.532,43.2216 -3.024,5.4324 -7.953,11.8555 -5.939,18.3241 41.473,-37.6863 91.515,-64.9136 143.282,-85.8797 l 0,217.7442 183.445,0 c 1.359,-5.3744 2.716,-10.7498 4.076,-16.1242 l -155.747,0 0,-228.7977 c 71.156,10e-5 142.303,10e-5 213.459,0 1.359,-5.3744 2.717,-10.7499 4.075,-16.1242 l -249.308,0 z"
- id="path18929" />
+ id="path18929"
+ inkscape:connector-curvature="0" />
<rect
y="6158.9028"
x="-15886.94"
@@ -1075,7 +1085,8 @@
<path
id="path18935"
d="m -15884.798,6381.2038 c 47.266,0 94.533,0 141.799,0 18.522,-73.3771 37.043,-146.7541 55.565,-220.1312 -65.789,10e-5 -131.577,0 -197.364,0 0,73.3771 0,146.7541 0,220.1312 z"
- style="opacity:0.5;fill:url(#linearGradient19876);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="opacity:0.5;fill:url(#linearGradient19876);fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
<rect
style="fill:none;stroke:#ffffff;stroke-width:1.40635264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect18937"
@@ -1086,7 +1097,8 @@
<path
id="path18939"
d="m -15811.58,6161.5157 c -0.266,0.4393 -0.477,1.0158 -0.534,1.5724 -0.03,0.2921 -1.053,0.4595 -2.288,0.3662 -1.646,-0.1247 -2.224,0.024 -2.117,0.5384 0.1,0.4611 -0.441,0.7115 -1.561,0.7325 -0.936,0.017 -1.831,0.1857 -2.032,0.3876 -0.199,0.202 -1.226,0.3928 -2.266,0.4308 l -1.903,0.065 1.861,0.3231 c 1.016,0.1808 1.706,0.5186 1.56,0.7323 -0.144,0.2135 0.298,0.7799 0.962,1.2494 0.93,0.6563 1.36,0.7095 1.926,0.2369 0.492,-0.4114 1.045,-0.4469 1.688,-0.1076 2.459,1.3028 5.145,1.2415 7.783,-0.1724 1.813,-0.9711 2.751,-1.2138 3.144,-0.8185 0.848,0.8539 -0.519,1.8542 -4.149,3.0587 -2.32,0.7698 -3.47,0.9197 -4.319,0.5386 -1.23,-0.554 -2.801,-0.219 -2.801,0.6031 0,0.8415 3.74,2.7993 4.747,2.4772 1.237,-0.3952 1.792,0.4729 0.813,1.2923 -1.086,0.9077 -6.372,0.052 -6.372,-1.0339 0,-0.4357 -0.404,-1.1132 -0.899,-1.4863 -0.496,-0.3734 -0.766,-1.0441 -0.599,-1.4863 0.168,-0.4421 0.126,-0.7474 -0.127,-0.6892 -0.542,0.125 -2.237,-0.4615 -3.357,-1.1632 -1.568,-0.9848 -2.143,-1.1423 -3.037,-0.7971 -0.778,0.3008 -0.794,0.4164 -0.129,0.8402 0.772,0.4912 0.637,0.5845 -1.198,0.7323 -0.361,0.029 -0.951,0.4115 -1.282,0.8402 -0.765,0.9849 0.546,2.0957 2.48,2.1325 0.726,0.014 1.661,0.2592 2.096,0.5385 0.619,0.3966 0.404,0.5796 -0.983,0.8615 -1.426,0.2891 -1.593,0.4497 -0.899,0.8402 0.474,0.2669 0.726,0.695 0.557,0.9693 -0.169,0.2781 0.606,0.5169 1.753,0.5169 1.388,0 2.349,-0.3619 2.994,-1.077 0.729,-0.8139 1.115,-0.9123 1.667,-0.4524 0.394,0.3298 1.433,0.9919 2.31,1.4647 0.876,0.4729 1.645,1.108 1.689,1.4002 0.135,0.8971 -1.644,0.9064 -2.523,0.022 -0.455,-0.4599 -0.594,-0.8402 -0.299,-0.8402 0.295,0 0.674,0.2464 0.855,0.5385 0.179,0.2925 0.715,0.5386 1.197,0.5386 0.679,0 0.598,-0.1973 -0.343,-0.8616 -1.008,-0.7107 -1.458,-0.743 -2.607,-0.2155 -1.247,0.5727 -1.298,0.6968 -0.472,1.1632 0.968,0.5453 0.76,1.5218 -0.32,1.5079 -0.376,-0.011 -0.304,-0.2291 0.17,-0.5385 0.437,-0.2835 0.546,-0.5169 0.258,-0.5169 -0.865,0 -2.108,0.9779 -1.732,1.357 0.192,0.1932 2.431,0.4252 4.96,0.5385 2.53,0.1128 4.728,0.3475 4.876,0.4954 0.375,0.379 0.595,0.33 2.566,-0.3877 1.815,-0.6612 2.447,-1.556 0.791,-1.1201 -1.307,0.345 -3.94,-0.7586 -3.507,-1.4648 0.195,-0.3169 0.916,-0.4371 1.626,-0.2585 0.759,0.1926 1.99,-0.034 2.993,-0.56 0.93,-0.4887 2.021,-1.0507 2.438,-1.2494 0.418,-0.1984 0.856,-0.6698 0.983,-1.0554 0.167,-0.5084 -0.121,-0.6062 -1.069,-0.3662 -0.721,0.182 -1.461,0.1649 -1.647,-0.021 -0.598,-0.6033 0.793,-1.7662 2.118,-1.7662 0.706,0 1.15,-0.2234 0.983,-0.4955 -0.537,-0.8778 0.58,-1.0666 2.309,-0.4094 1.384,0.5268 1.756,0.4943 2.139,-0.1291 0.255,-0.4168 2.326,-1.6574 4.598,-2.7572 2.27,-1.0995 3.845,-2.0108 3.506,-2.0249 -0.34,-0.014 -1.05,-0.1706 -1.583,-0.3447 -0.718,-0.2341 -0.783,-0.1645 -0.257,0.2155 0.543,0.3906 0.341,0.6424 -0.898,1.0771 -1.696,0.5961 -2.641,0.054 -1.518,-0.8618 0.358,-0.2933 1.708,-0.8927 3.015,-1.3354 3.152,-1.0683 5.282,-2.0482 5.282,-2.4556 0,-0.1826 -0.656,-0.724 -1.454,-1.1847 -1.05,-0.6067 -1.868,-0.7172 -3.014,-0.3877 -1.545,0.4435 -2.833,0.2747 -2.781,-0.3016 l -18.817,0 z m 44.52,0 c 0.02,0.9978 0.847,0.997 1.262,0 l -1.262,0 z m 2.543,0 c 0.111,0.1002 0.187,0.1707 0.321,0.3015 0.862,0.8362 1.133,1.4613 0.792,1.874 -0.434,0.5268 -3.1,0.5882 -5.753,0.1507 -1.988,-0.3277 -3.654,0.073 -3.377,0.7972 0.41,1.0784 -0.602,1.4891 -1.369,0.5599 -0.787,-0.9561 -1.636,-1.0256 -1.454,-0.1291 0.101,0.4668 -0.759,0.6081 -3.037,0.4953 -3.011,-0.149 -6.506,0.8557 -5.709,1.6587 0.528,0.5302 -0.972,2.0609 -1.732,1.7663 -0.38,-0.1468 -0.819,-0.051 -0.983,0.2155 -0.163,0.2666 -0.603,0.3549 -0.962,0.2153 -0.863,-0.3342 -4.893,1.6441 -4.214,2.0678 0.29,0.1799 1.275,0.1117 2.182,-0.1507 2.174,-0.628 2.541,0.082 1.069,2.0895 -0.815,1.1099 -1.648,1.6154 -2.652,1.6154 -0.798,0 -1.595,0.2415 -1.774,0.5387 -0.184,0.297 -0.559,0.387 -0.833,0.2153 -0.661,-0.4105 -4.17,0.7687 -4.17,1.4002 0,0.4931 0.631,0.6063 4.426,0.7108 1.138,0.03 2.186,0.345 2.309,0.7108 0.245,0.7334 -0.21,0.9405 -3.314,1.5079 -1.895,0.3465 -1.955,0.4234 -0.77,0.7323 0.726,0.1892 1.193,0.5473 1.047,0.797 -0.394,0.6774 1.676,1.2627 2.887,0.8186 0.582,-0.213 2.938,-0.4169 5.239,-0.474 2.304,-0.054 4.396,-0.2273 4.619,-0.3661 0.222,-0.1389 0.716,0.4139 1.133,1.2278 0.419,0.814 1.274,1.9428 1.881,2.4987 0.614,0.5559 1.112,1.2893 1.112,1.6371 0,0.3478 0.454,1.0478 1.005,1.5509 0.698,0.6368 0.92,1.3705 0.749,2.4556 -0.28,1.7925 0.621,2.1578 1.069,0.4308 0.241,-0.9333 0.43,-1.033 1.048,-0.5169 1.801,1.5056 1.352,3.3477 -0.962,3.9203 -0.724,0.1795 -0.542,0.2809 0.577,0.3232 0.898,0.034 2.02,0.5185 2.502,1.0554 0.821,0.9139 0.814,1.0392 -0.171,1.9388 -0.995,0.9058 -0.993,0.9753 -0.128,1.6155 0.839,0.6231 0.796,0.7379 -0.534,1.2493 -0.799,0.3069 -1.455,0.828 -1.455,1.1632 0,0.4438 0.21,0.426 0.769,-0.043 1.227,-1.0245 2.097,-0.07 1.027,1.1201 -0.496,0.5553 -0.69,1.0243 -0.427,1.034 0.261,0.011 0.05,0.3311 -0.493,0.7323 -0.614,0.4696 -0.729,0.8492 -0.362,1.0771 0.312,0.1943 0.398,0.6459 0.192,0.9909 -0.237,0.4016 -0.07,0.3557 0.469,-0.086 0.958,-0.7814 1.619,-0.1413 0.963,0.9262 -0.273,0.4455 0.119,1.5126 1.048,2.908 2.045,3.0547 3.489,4.2579 5.153,4.2866 0.782,0.014 1.44,0.3238 1.476,0.6893 0.03,0.3652 0.117,0.8069 0.149,0.9693 0.141,0.6285 3.237,-1.6417 3.293,-2.4126 0.03,-0.4485 0.02,-1.3305 -0.04,-1.9601 -0.06,-0.6294 0.141,-1.3168 0.448,-1.5079 0.308,-0.1913 0.556,-0.7715 0.556,-1.314 0,-1.1436 4.654,-5.4555 5.389,-4.9974 0.272,0.1694 1.179,0.01 2.01,-0.3447 1.493,-0.6226 2.234,-1.6295 2.331,-3.1879 0.03,-0.4385 0.341,-0.7192 0.705,-0.6462 0.361,0.072 1.121,-0.3521 1.69,-0.9263 0.828,-0.832 1.708,-1.0148 4.361,-0.9693 2.047,0.034 3.933,-0.278 4.897,-0.7755 0.866,-0.4451 2.405,-0.9962 3.422,-1.2277 l 1.838,-0.4093 -1.838,-0.4093 c -1.017,-0.2246 -2.354,-0.2817 -2.973,-0.1293 -1.333,0.3271 -2.216,-0.737 -1.005,-1.2062 0.462,-0.1774 0.762,-0.7064 0.684,-1.1848 -0.1,-0.6033 0.336,-0.9146 1.369,-1.0339 1.145,-0.1322 1.534,0.081 1.754,0.9262 0.348,1.3469 1.754,1.4672 1.754,0.1508 0,-1.2385 -2.878,-2.9538 -4.235,-2.5203 -1.439,0.4596 -2.32,-0.1547 -1.561,-1.0769 0.45,-0.5469 0.314,-0.8359 -0.534,-1.2925 -1.506,-0.8121 -0.776,-1.7386 1.047,-1.3356 1.204,0.2663 1.473,0.1457 1.412,-0.6246 -0.114,-1.3484 1.716,-1.2396 3.528,0.2155 0.819,0.6581 1.874,1.2062 2.351,1.2062 0.675,0 0.616,-0.1941 -0.299,-0.8401 -1.499,-1.0578 -1.055,-1.8094 1.07,-1.8094 1.564,0 1.589,-0.056 0.619,-0.797 -0.562,-0.4292 -0.781,-0.8179 -0.491,-0.8616 0.29,-0.046 -0.173,-0.2244 -1.026,-0.4093 -2.019,-0.4363 -2.043,-1.2914 -0.04,-1.7232 l 1.582,-0.3232 -1.689,-0.086 c -0.925,-0.034 -1.817,-0.2821 -1.988,-0.56 -0.516,-0.8426 1.628,-1.6366 3.442,-1.2709 1.275,0.2568 1.625,0.1829 1.326,-0.3016 -0.22,-0.3572 -0.532,-0.5213 -0.685,-0.3661 -0.515,0.5192 -2.341,-0.8283 -2.073,-1.5294 0.144,-0.3803 0,-0.9539 -0.321,-1.2709 -0.412,-0.4143 -0.154,-0.7332 0.855,-1.1201 0.771,-0.2958 1.412,-0.8829 1.412,-1.314 0,-0.431 0.41,-1.0318 0.919,-1.3571 0.781,-0.5 0.712,-0.568 -0.449,-0.323 -1.643,0.3469 -2.283,-0.097 -1.476,-1.0771 0.329,-0.3978 1.621,-0.7323 2.909,-0.7323 1.543,0 2.268,-0.2107 2.18,-0.6463 -0.08,-0.3583 0.407,-0.7388 1.07,-0.84 0.657,-0.1013 1.804,-0.4959 2.544,-0.8833 l 1.347,-0.6893 -2.117,-0.3876 c -1.162,-0.1977 -2.528,-0.1122 -3.057,0.1723 -1.34,0.7189 -3.482,0.9296 -4.277,0.4308 -0.369,-0.2307 -1.378,-0.048 -2.245,0.3877 -1.541,0.7747 -2.527,0.3887 -1.839,-0.7323 0.229,-0.3731 -0.905,-0.5128 -3.507,-0.3878 -2.824,0.1363 -4.771,0.5885 -7.162,1.6802 -1.884,0.859 -3.653,1.3624 -4.17,1.1631 -1.3,-0.5028 -0.492,-1.1012 4.106,-2.951 2.61,-1.0506 4.979,-1.6156 6.67,-1.6156 1.44,0 3.407,-0.3689 4.384,-0.8184 l 1.774,-0.8187 -2.971,0.3017 c -3.124,0.3333 -4.356,-0.2794 -2.695,-1.3356 0.164,-0.1046 0.153,-0.1764 0.04,-0.2369 l -3.849,0 c -1.648,0.1417 -3.671,0.3937 -5.773,0.7323 -1.725,0.2776 -3.354,0.3553 -3.615,0.1938 -0.402,-0.2503 -0.259,-0.5858 0.258,-0.9261 l -7.207,0 c -0.169,0.023 -0.357,0.021 -0.577,0 l -6.137,0 z m 193.601,15.9183 c -2.751,7.0882 -12.303,4.2071 -19.587,6.2684 -6.339,0.3391 0.933,6.6984 -6.97,3.8773 -8.874,-2.1715 5.01,9.5011 -1.475,5.9667 -0.899,-3.7296 -11.179,-4.0639 -4.941,0.2155 -3.742,-0.9765 -6.388,-6.9516 -5.793,0.6677 -0.181,2.5187 10.297,6.7165 5.131,7.733 -2.484,-10.1223 -8.652,8.1997 -11.376,0.1078 7.025,4.2281 6.052,-18.1779 0.193,-11.8473 -6.359,2.4713 4.643,12.0059 -4.341,7.2376 -4.311,-2.4588 -8.774,2.858 -9.537,0.5385 -5.497,2.4173 -10.334,0.5702 -15.93,4.8251 1.254,-2.3629 -4.238,-6.1561 -1.989,-0.086 -1.544,0.8075 -3.392,2.502 -5.281,3.5542 -0.113,0.063 -0.228,0.1145 -0.342,0.1724 -0.03,0.015 -0.08,0.026 -0.107,0.043 -0.193,0.096 -0.382,0.2011 -0.578,0.28 -0.08,0.031 -0.159,0.057 -0.235,0.086 -0.148,0.056 -0.278,0.1095 -0.427,0.1508 -0.07,0.017 -0.15,0.03 -0.215,0.043 -0.03,0.011 -0.06,0.02 -0.08,0.021 -0.182,0.041 -0.353,0.069 -0.535,0.086 -0.204,0.02 -0.416,0.036 -0.619,0.021 -0.08,-0.011 -0.156,-0.031 -0.235,-0.043 -0.1,-0.014 -0.2,-0.021 -0.299,-0.043 -0.03,-0.011 -0.06,-0.019 -0.09,-0.021 -0.1,-0.028 -0.2,-0.072 -0.299,-0.1077 -0.1,-0.038 -0.2,-0.081 -0.299,-0.1293 0.112,0.2329 0.203,0.4576 0.278,0.6462 0.08,0.1832 0.127,0.3514 0.171,0.4954 0.09,0.3015 0.132,0.5188 0.106,0.6678 -0.108,0.5661 -1.027,0.062 -2.073,-0.8617 -0.262,-0.2327 -0.543,-0.5009 -0.813,-0.7754 -0.265,-0.2718 -0.54,-0.5484 -0.791,-0.8401 -0.02,-0.01 0.02,-0.021 0,-0.021 -0.38,-0.4388 -0.741,-0.8683 -1.026,-1.2925 0,-0.011 0.02,-0.019 0,-0.022 -0.191,-0.2845 -0.349,-0.5457 -0.471,-0.7969 -0.121,-0.2514 -0.182,-0.471 -0.213,-0.6678 -0.07,-0.3931 0.06,-0.6648 0.491,-0.7108 0.213,-0.022 0.51,0.018 0.876,0.1077 0.185,0.047 0.373,0.1122 0.6,0.1938 0.454,0.1633 1.005,0.3967 1.646,0.7108 0.424,0.039 0.807,0.07 1.176,0.086 0.366,0.015 0.713,0.01 1.027,0 1.704,-0.025 2.658,-0.3468 3.014,-0.8401 0.03,-0.046 0.06,-0.081 0.09,-0.1292 0.06,-0.096 0.06,-0.2165 0.06,-0.3232 0.02,-0.1066 0,-0.2074 -0.02,-0.323 -0.06,-0.2308 -0.168,-0.4753 -0.342,-0.7324 -0.09,-0.1261 -0.189,-0.2576 -0.299,-0.3877 l 0,-0.022 c -0.112,-0.1283 -0.25,-0.2563 -0.386,-0.3877 -0.02,-0.011 -0.02,0 -0.02,0 -0.689,-0.6779 -1.657,-1.3825 -2.78,-2.0248 l -0.02,0 c -0.904,-0.5152 -1.897,-0.9919 -2.908,-1.3787 -0.252,-0.096 -0.517,-0.1948 -0.77,-0.2799 -2.026,-0.6793 -4.019,-0.9658 -5.411,-0.4738 -0.09,-0.09 -0.155,-0.1745 -0.213,-0.2585 -0.02,-0.012 0.03,-0.02 0,-0.021 -0.112,-0.1685 -0.176,-0.3247 -0.213,-0.4738 -0.113,-0.4531 0.02,-0.8276 -0.13,-1.1417 -0.02,-0.053 -0.09,-0.1009 -0.127,-0.1508 -0.06,-0.051 -0.1,-0.1017 -0.172,-0.1508 -0.07,-0.047 -0.155,-0.085 -0.256,-0.1292 -0.41,-0.18 -1.075,-0.3615 -2.181,-0.517 -0.02,0.011 -0.02,0.019 -0.02,0.022 -0.06,0.063 -0.09,0.1213 -0.129,0.1723 -0.02,0.014 -0.04,0.03 -0.06,0.043 -0.03,0.031 -0.05,0.058 -0.09,0.086 -0.03,0.028 -0.08,0.041 -0.106,0.065 -0.02,0.011 -0.02,0.033 -0.04,0.043 -0.06,0.031 -0.09,0.044 -0.15,0.064 -0.06,0.016 -0.106,0.033 -0.15,0.043 -0.642,0.1352 -1.375,-0.4151 -2.138,-0.6677 -0.1,-0.034 -0.198,-0.065 -0.299,-0.086 -0.03,-0.011 -0.04,0 -0.06,0 -0.03,-0.011 -0.07,-0.019 -0.107,-0.021 -0.08,-0.011 -0.154,-0.025 -0.235,-0.021 -0.06,0 -0.132,0.033 -0.192,0.043 -0.02,0 -0.02,-0.011 -0.04,0 -0.07,0.014 -0.13,0.021 -0.192,0.043 -0.02,0.011 -0.04,0.019 -0.06,0.021 -0.03,0.014 -0.06,0.029 -0.09,0.043 -0.06,0.025 -0.115,0.051 -0.172,0.086 -0.131,0.08 -0.254,0.1886 -0.384,0.3231 -0.02,0.018 -0.03,0.025 -0.06,0.043 -0.216,0.2401 -0.426,0.5584 -0.641,0.9908 -0.184,-0.014 -0.383,-0.01 -0.556,0 -0.535,0.014 -1.029,0.1162 -1.496,0.2586 -1.244,0.3807 -2.336,1.115 -3.721,1.7662 -0.176,0.081 -0.351,0.1591 -0.535,0.2369 -0.55,0.234 -1.144,0.4573 -1.817,0.6248 -0.03,0.1236 -0.07,0.2464 -0.107,0.3662 -0.203,0.5987 -0.494,1.1434 -0.856,1.6586 -0.144,0.2061 -0.306,0.4079 -0.469,0.6031 -0.166,0.1949 -0.333,0.3748 -0.514,0.5601 -0.363,0.3706 -0.786,0.737 -1.198,1.077 -0.617,0.5076 -1.265,0.9952 -1.924,1.4648 -0.662,0.4712 -1.345,0.9308 -1.967,1.4001 -0.205,0.1541 -0.383,0.3173 -0.578,0.474 -0.395,0.3178 -0.78,0.6336 -1.111,0.9692 0.239,0.3512 0.401,0.673 0.513,0.9693 0.06,0.1521 0.1,0.2915 0.129,0.4308 0.02,0.1363 0.06,0.2628 0.06,0.3878 0,0.1197 -0.03,0.2341 -0.06,0.3446 -0.08,0.3511 -0.257,0.6677 -0.514,0.9478 -0.258,0.2772 -0.582,0.5159 -0.962,0.7539 -1.647,1.032 -4.178,1.8502 -5.175,3.662 -0.155,0.2787 -0.271,0.5738 -0.342,0.9047 -0.222,0.9937 -0.04,2.2297 0.791,3.8557 0.437,0.9801 1.07,1.2803 1.796,1.2494 0.1,-0.011 0.212,-0.01 0.321,-0.021 2.565,-0.4061 6.01,-4.1146 5.944,3.0373 1.424,3.8119 4.503,2.0063 6.266,-0.9263 0.1,-0.1628 0.189,-0.305 0.277,-0.4739 1.076,-2.0294 1.498,-4.4592 0.365,-5.9452 -0.09,-0.1241 -0.207,-0.2345 -0.322,-0.3446 1.001,-4.1156 5.704,-10.935 9.751,-9.8441 -0.232,0.3727 -0.534,0.8772 -0.876,1.4647 -0.173,0.2938 -0.372,0.5962 -0.557,0.9263 -1.652,2.973 -3.579,7.2058 -1.988,8.5086 l 0.02,0 c 0.09,0.069 0.17,0.1205 0.278,0.1723 l 0.02,0 c 0.665,0.3166 1.744,0.2981 3.378,-0.237 0.272,-0.088 0.552,-0.184 0.855,-0.3016 1.582,-0.1265 2.656,-0.079 3.336,0.065 l 0.02,0 c 0.333,0.072 0.577,0.1647 0.727,0.28 l 0.02,0 c 0.442,0.3503 0.108,0.8685 -0.684,1.3355 -1.15,0.6786 -3.268,1.2638 -5.325,1.1202 -0.158,-0.013 -0.314,-0.022 -0.471,-0.043 0.226,0.8258 0.37,1.4787 0.428,2.0249 0.02,0.1821 0.04,0.361 0.04,0.5169 0,0.1498 -0.03,0.3033 -0.04,0.4308 -0.02,0.1261 -0.02,0.26 -0.06,0.3662 -0.346,1.1023 -1.582,1.191 -3.571,1.4432 -0.02,0.189 -0.04,0.3796 -0.09,0.5601 -0.124,0.5417 -0.346,1.0218 -0.642,1.4863 -0.1,0.1547 -0.206,0.3067 -0.32,0.4524 -0.346,0.4377 -0.749,0.8301 -1.219,1.1848 -1.563,1.1812 -3.738,1.9122 -5.881,2.0678 -0.215,0.015 -0.426,0.016 -0.641,0.021 -2.77,0.057 -5.392,-0.8367 -6.48,-2.8434 -0.613,-6.5361 0.309,3.4809 -3.185,4.5666 -0.124,0.039 -0.248,0.07 -0.385,0.086 -0.406,0.045 -0.869,-0.024 -1.39,-0.237 -3.344,3.1027 -8.045,7.8804 -12.894,8.487 0.121,0.071 0.225,0.1501 0.342,0.237 0.02,0.011 0.02,-0.011 0.02,0 1.656,1.2186 2.871,3.8732 2.93,6.096 0.03,0.1591 0.03,0.2986 0,0.4523 -0.02,0.4673 -0.115,0.8968 -0.257,1.2925 -0.06,0.1345 -0.111,0.2643 -0.171,0.3877 -0.07,0.1199 -0.118,0.2367 -0.193,0.3446 -0.152,0.2161 -0.323,0.4 -0.534,0.5601 -0.112,0.081 -0.218,0.1512 -0.342,0.2154 -0.245,0.128 -0.545,0.2239 -0.856,0.28 -0.158,0.029 -0.318,0.057 -0.491,0.065 -0.347,0.015 -0.735,-0.012 -1.155,-0.086 -0.422,-0.072 -0.869,-0.1935 -1.369,-0.3662 -0.254,-0.087 -0.494,-0.1863 -0.769,-0.3017 -0.932,0.011 -1.709,0.221 -2.31,0.5818 -0.171,0.1033 -0.325,0.2182 -0.47,0.3446 -0.66,0.5685 -1.05,1.3608 -1.24,2.2617 -0.06,0.2003 -0.09,0.3936 -0.107,0.6031 -0.06,0.4239 -0.03,0.8453 0,1.2925 0.03,0.4421 0.1,0.8909 0.214,1.3356 0.06,0.2223 0.121,0.4482 0.192,0.6677 0.08,0.2191 0.168,0.4325 0.256,0.6462 l 0,0.021 c 0.09,0.2095 0.177,0.4016 0.279,0.6031 0.111,0.2098 0.22,0.4045 0.342,0.6031 0.119,0.1947 0.231,0.3784 0.363,0.5602 0.139,0.1874 0.276,0.3677 0.427,0.5385 0.148,0.1659 0.313,0.3264 0.471,0.4739 l 0.02,0 c 0.159,0.1452 0.302,0.2845 0.47,0.4092 0.177,0.1316 0.37,0.2377 0.556,0.3447 0.184,0.1034 0.363,0.2017 0.557,0.28 l 0.02,0 c 0.05,0.018 0.08,0.026 0.127,0.043 0.536,0.1957 1.109,0.2956 1.711,0.2586 0.02,-3e-4 0.02,2e-4 0.02,0 0.323,-0.021 0.665,-0.093 1.005,-0.1938 0.114,-0.034 0.225,-0.062 0.341,-0.1078 0.466,-0.1759 0.949,-0.4334 1.434,-0.7755 l 0.02,0 c 0.245,-0.1725 0.502,-0.3629 0.748,-0.5815 0.428,-0.651 0.898,-1.4116 1.433,-2.1972 0.269,-0.3913 0.543,-0.7779 0.834,-1.1847 0.583,-0.8161 1.212,-1.6484 1.882,-2.4556 0.333,-0.4022 0.676,-0.8028 1.027,-1.1848 1.053,-1.1435 2.182,-2.1569 3.356,-2.9079 0.196,-0.1252 0.401,-0.2356 0.599,-0.3447 0.199,-0.1089 0.396,-0.21 0.599,-0.3016 0.805,-0.3651 1.631,-0.6011 2.459,-0.6246 0.206,-0.011 0.412,0 0.62,0.021 0.208,0.018 0.41,0.062 0.62,0.1076 l 0.02,0 c 0.206,0.046 0.416,0.1003 0.62,0.1724 l 0.02,0 c 0.204,0.072 0.394,0.1788 0.598,0.2801 l 0.02,0 c 0.414,0.2062 0.826,0.4655 1.24,0.797 0.211,0.1689 0.432,0.3344 0.641,0.5385 0.208,0.2012 0.392,0.431 0.599,0.6678 0.144,0.025 0.286,0.041 0.428,0.086 l 0.02,0 c 0.135,0.043 0.274,0.1131 0.406,0.1722 l 0.02,0 c 0.132,0.059 0.255,0.1399 0.386,0.2153 0.401,0.2332 0.786,0.5174 1.154,0.8617 1.464,1.3655 2.656,3.4111 3.529,4.5451 0.144,0.1888 0.278,0.3642 0.405,0.4955 0.07,0.064 0.113,0.1241 0.172,0.1723 0.12,0.1014 0.239,0.1543 0.341,0.1723 0.1,0.017 0.18,-0.01 0.257,-0.086 0.117,-0.1134 0.229,-0.3519 0.3,-0.7108 l 0,-0.021 c 0.02,-0.1185 0.02,-0.2397 0.04,-0.3877 l 0,-0.021 c 0.06,-0.4596 0.1,-1.0575 0.107,-1.831 0.1,0.09 0.106,0.091 0.15,0.1294 -0.548,-0.5842 -3.323,-3.4423 -5.046,-5.7945 -0.249,-0.3398 -0.471,-0.6811 -0.662,-0.9909 -0.535,-0.8507 -0.825,-1.5563 -0.664,-1.9386 0.02,-0.034 0.03,-0.054 0.06,-0.086 0.267,-0.3516 1.103,-0.2942 2.76,0.3877 4.828,2.8081 9.829,14.3821 10.84,11.2658 -0.315,1.463 -1.338,3.051 -0.576,2.7141 0.07,-0.03 0.138,-0.068 0.235,-0.1293 0.197,-0.1238 0.447,-0.3264 0.791,-0.6031 0.34,-0.2713 0.769,-0.6111 1.282,-1.0554 -0.359,-0.3859 -0.643,-0.7412 -0.855,-1.0556 -0.211,-0.3142 -0.366,-0.5871 -0.449,-0.8401 -0.09,-0.2592 -0.109,-0.4829 -0.08,-0.6892 0.02,-0.097 0.04,-0.1935 0.08,-0.2801 0.03,-0.087 0.1,-0.1806 0.15,-0.2585 0.06,-0.08 0.133,-0.164 0.213,-0.2369 0.712,-0.6579 2.168,-1.0014 3.571,-1.5293 0.469,-0.1757 0.922,-0.372 1.348,-0.6032 0.704,-0.3842 1.326,-0.8639 1.689,-1.5294 l 0,-0.021 c 0.218,-0.3991 0.349,-0.8545 0.364,-1.4001 l 0,-0.022 c 0.02,-0.364 -0.06,-0.7645 -0.15,-1.2063 l 0,-0.021 c -0.06,-0.2236 -0.109,-0.4438 -0.193,-0.6894 0.592,-1.4012 1.208,-2.3689 1.818,-2.9942 0.172,-0.1785 0.338,-0.3264 0.514,-0.4522 0.35,-0.2511 0.714,-0.4052 1.068,-0.4739 0.445,-0.087 0.875,-0.046 1.327,0.086 0.181,0.053 0.371,0.1152 0.555,0.1938 0.181,0.08 0.353,0.1797 0.535,0.28 l 0.02,0 c 0.364,0.1992 0.724,0.4346 1.091,0.6893 0.552,0.386 1.125,0.8015 1.689,1.2063 -0.118,-0.1236 -0.234,-0.225 -0.321,-0.3447 -0.17,-0.2374 -0.262,-0.47 -0.32,-0.6892 -0.02,-0.097 -0.05,-0.2079 -0.06,-0.3016 -0.02,-0.262 0.04,-0.4866 0.149,-0.711 0.03,-0.01 0.03,-0.02 0.03,-0.021 0.03,-0.072 0.09,-0.1472 0.149,-0.2154 0.08,-0.109 0.171,-0.2266 0.278,-0.3232 0.06,-0.039 0.08,-0.071 0.129,-0.1077 0.142,-0.114 0.299,-0.2101 0.47,-0.3015 0.202,-0.1092 0.416,-0.2056 0.641,-0.2801 0.02,-0.011 0.03,0 0.04,0 0.02,-0.011 0.02,-0.019 0.04,-0.022 l 0.03,0 c 0.191,-0.058 0.381,-0.1189 0.576,-0.1507 0.02,-0.011 0.04,0 0.06,0 0.225,-0.033 0.45,-0.048 0.664,-0.043 1.419,0.043 2.428,0.9946 0.726,3.3388 6.544,2.5887 5.149,10.0574 -2.308,6.1175 -5.102,-2.7136 -17.302,4.0377 -8.681,8.3793 6.395,-1.4759 11.284,0.1188 6.842,7.4962 -0.704,0.8543 -1.905,1.5244 -3.336,2.1109 -0.113,0 -0.151,-1e-4 -0.279,0 -4.745,0.011 -11.373,-4.9285 -14.027,-2.2401 -3.919,3.9687 -7.226,0.087 -11.097,-0.711 -5.022,-1.035 0.428,-8.6669 -7.078,-6.8498 -4.611,1.1167 -9.497,3.557 -13.877,3.0372 -3.831,-0.4544 -5.157,1.2551 -6.736,3.8773 -1.905,3.1668 -2.704,7.0973 -5.709,10.1241 -3.272,3.2941 -4.3,7.3027 -3.999,12.278 0.278,4.5454 -1.34,8.0035 2.075,11.9336 3.023,3.4767 4.239,10.1335 10.221,9.9302 4.898,-0.1669 10.829,-3.9842 14.412,-1.8525 2.569,1.5295 4.972,0.723 6.308,2.628 2.396,3.4206 -0.617,9.2751 2.801,13.4413 2.721,3.3149 4.626,8.8121 2.16,13.2259 -2.805,5.0199 0.675,9.6559 1.282,14.6044 0.695,5.6635 5.786,10.7644 5.496,15.7031 -0.274,4.6744 4.675,3.5923 7.804,3.0803 5.448,-0.8914 9.186,-5.823 10.435,-10.684 1.112,-4.3264 2.51,-7.4611 2.908,-12.192 0.345,-4.123 9.698,-6.7498 7.27,-13.2045 -1.797,-4.7793 -2.759,-10.1397 1.027,-14.5614 3.517,-4.111 8.018,-7.3293 10.177,-12.6012 0.991,-2.4079 3.973,-8.2602 3.379,-8.25 -2.916,0.048 -9.47,3.1689 -11.568,-1.8095 -2.04,-4.8434 -6.92,-8.0548 -7.248,-13.6566 -0.246,-4.143 -5.27,-8.5025 -5.474,-11.5673 1.372,-0.6182 2.58,-0.6915 3.613,0.2801 3.628,8.0671 8.638,14.8741 10.628,23.8238 7.523,-1.1631 17.198,-6.101 20.633,-13.7644 -3.624,-2.5963 -3.915,-8.4313 -7.825,-2.8865 -5.712,2.2263 -10.068,-17.276 -2.032,-6.6775 6.432,5.2364 19.167,2.5064 23.136,9.3917 -0.609,4.5931 4.694,-3.6417 3.401,3.0156 0.179,5.3021 3.507,17.1611 6.971,18.0079 0.879,-9.3756 6.849,-18.0721 15.801,-21.1314 5.725,0.7927 3.599,12.7035 9.344,9.1764 0.236,9.8418 2.664,6.6466 7.463,7.4531 0.523,7.1305 7.919,2.7648 7.27,-1.9171 -1.343,-5.109 -7.489,-14.4772 1.347,-13.0537 5.952,-1.2925 16.739,-7.9356 13.578,-14.2383 3.206,-1.9893 -5.311,-9.3096 2.674,-11.8257 -1.146,0.087 -10.887,-0.9851 -3.871,-4.739 6.199,-4.8418 -0.195,5.6201 4.747,0.28 4.883,-0.8019 3.911,14.1523 7.527,5.7083 -4.494,-4.5206 0.979,-11.7894 5.709,-11.2873 6.051,-2.2336 15.524,-20.7722 4.854,-19.8173 -5.556,-4.9944 8.813,-13.2009 14.562,-10.9856 6.462,1.7625 8.488,-1.652 13.706,-5.0191 3.922,-0.074 -0.642,5.0234 4.319,1.0771 l 0,-17.9218 c -4.515,-1.446 -8.501,-3.4199 -13.963,-3.1019 -2.489,-2.6674 -5.122,-2.9991 -8.403,-1.637 2.489,-3.4801 -8.165,-2.4982 -7.463,1.0339 -5.465,-0.9501 -14.914,3.556 -14.39,-3.4465 -0.799,-4.1055 -10.59,1.2409 -14.669,-2.1325 -4.047,3.2275 -6.162,-5.1079 -8.04,-1.637 7.137,3.1523 -2.751,-1.2632 -0.256,2.4341 -10.539,3.6028 -1.161,-3.8161 3.549,-4.8036 1.605,-5.8538 -12.516,-0.3964 -11.055,-5.7513 l -0.749,-0.065 -0.04,-0.021 z m -258.497,2.4557 c -0.353,0 -0.435,0.1598 -0.32,0.517 0.139,0.4221 1.256,0.8608 2.587,1.0124 1.966,0.2241 2.384,0.4729 2.609,1.594 0.257,1.282 0.748,1.5363 3.506,1.7663 0.629,0.053 1.341,0.2923 1.582,0.5386 0.241,0.2463 2.096,0.315 4.127,0.1508 2.031,-0.1642 4.495,-0.2928 5.453,-0.3016 1.077,-0.011 1.62,-0.2403 1.412,-0.5817 -0.187,-0.3051 -0.05,-0.9445 0.342,-1.4431 0.606,-0.7835 0.6,-0.8352 -0.09,-0.3016 -0.436,0.3396 -1.392,0.5908 -2.117,0.5817 -0.724,-0.012 -3.331,0.1183 -5.795,0.2584 -4.6,0.2614 -6.843,-0.4052 -6.843,-2.0033 0,-0.3821 -0.877,-0.7913 -1.988,-0.9478 -1.089,-0.1532 -2.651,-0.4566 -3.485,-0.6677 -0.442,-0.1111 -0.771,-0.1733 -0.984,-0.1724 z m 11.975,7.9054 c -1.585,0 -3.935,1.9574 -3.935,3.2742 0,1.5109 1.641,4.1609 2.609,4.2004 0.446,0.017 3.19,0.1061 6.094,0.1939 3.665,0.1112 5.909,0.4543 7.377,1.1201 1.162,0.5266 2.54,1.0054 3.058,1.0556 1.608,0.1552 2.209,1.1589 1.369,2.2401 -0.672,0.8592 -0.652,0.8671 0.149,0.2369 0.756,-0.5958 0.975,-0.5393 1.454,0.3662 0.312,0.5843 0.577,1.3921 0.577,1.8095 0,0.5121 0.393,0.7019 1.241,0.5384 1.54,-0.2966 2.195,0.5601 1.111,1.4648 -0.645,0.5394 -0.967,0.4819 -1.732,-0.2154 -0.859,-0.7828 -1.061,-0.7802 -2.138,-0.021 -0.938,0.6616 -1.046,0.9785 -0.556,1.5725 0.34,0.4119 0.403,0.7746 0.149,0.797 -0.252,0.022 -1.52,0.079 -2.821,0.1292 -1.787,0.07 -2.433,0.3316 -2.566,1.034 -0.132,0.6725 0.183,0.9321 1.068,0.9262 0.674,-0.011 1.534,-0.2254 1.925,-0.4739 0.763,-0.4872 4.833,1.2189 4.833,2.0249 0,0.2537 0.628,0.6207 1.411,0.8185 1.083,0.2738 1.269,0.4669 0.706,0.8185 -0.516,0.3212 -0.268,0.4633 0.855,0.4309 0.892,-0.025 2.551,0.4227 3.678,1.0124 2.666,1.3926 2.632,1.3945 1.496,0.1292 -0.951,-1.0586 -0.936,-1.083 0.108,-1.3571 1.688,-0.4446 1.169,-2.2741 -1.412,-4.8466 -2.245,-2.2375 -2.312,-2.3613 -1.325,-3.1018 1.382,-1.0391 1.506,-1.0012 3.464,0.8401 1.324,1.2466 1.857,1.4583 2.415,0.9908 0.397,-0.3306 0.6,-0.8415 0.428,-1.1201 -0.17,-0.279 0.193,-0.6121 0.813,-0.7755 1.054,-0.2776 1.061,-0.3761 0.256,-1.2708 -0.475,-0.5277 -1.145,-0.8477 -1.497,-0.7108 -0.356,0.1366 -1.091,-0.2451 -1.625,-0.8401 -0.537,-0.599 -1.638,-1.0771 -2.458,-1.0771 -1.776,0 -3.056,-1.7882 -1.796,-2.4987 0.424,-0.2391 0.609,-0.6753 0.406,-0.9693 -0.474,-0.6803 -3.393,-2.0744 -4.02,-1.9171 -0.261,0.065 -0.863,-0.034 -1.326,-0.2155 -0.742,-0.2895 -0.704,-0.4112 0.192,-1.0769 0.857,-0.6349 0.87,-0.754 0.15,-0.754 -0.473,1e-4 -0.997,0.2454 -1.176,0.5386 -0.204,0.3307 -0.664,0.3398 -1.219,0.043 -0.488,-0.2643 -1.146,-0.5098 -1.433,-0.5386 -0.291,-0.029 -0.512,-0.3087 -0.512,-0.6246 0,-1.0379 -1.775,-1.8993 -3.401,-1.6587 -0.88,0.1297 -1.487,0.4493 -1.325,0.7108 0.474,0.7731 -1.289,1.1669 -2.117,0.474 -0.421,-0.3503 -0.98,-0.4776 -1.262,-0.3016 -0.717,0.4451 -1.404,-0.7847 -1.219,-2.2187 0.121,-0.9446 -0.101,-1.1981 -1.068,-1.1847 -0.676,0.011 -1.575,0.3119 -2.011,0.6677 -0.916,0.7459 -1.174,3.5276 -0.428,4.4373 0.332,0.4042 0.264,0.7543 -0.15,1.0126 -0.964,0.6005 -2.052,-1.3097 -1.967,-3.4466 l 0.04,-1.8955 0.342,2.1108 c 0.283,1.8267 0.381,1.9782 0.685,0.9048 0.498,-1.7702 -0.554,-3.8126 -1.968,-3.8126 z m -9.751,4.6312 c -0.182,0 -0.335,0.067 -0.492,0.1508 -1.928,1.0393 -1.977,3.7265 -0.06,3.7265 1.435,0 1.585,0.4423 0.749,2.1325 -0.999,2.0165 -1.509,2.2836 -2.779,1.4863 -0.787,-0.4963 -1.323,-0.4954 -2.246,-0.043 -2.19,1.0725 -5.585,1.257 -7.548,0.4308 -1.015,-0.4269 -1.839,-1.0284 -1.839,-1.3356 0,-0.614 -2.587,-0.7522 -3.977,-0.2153 -0.7,0.271 -0.732,0.4386 -0.171,0.7969 0.385,0.2472 1.059,0.4254 1.497,0.4094 0.521,-0.018 0.439,-0.1727 -0.257,-0.474 -0.86,-0.3723 -0.897,-0.4864 -0.171,-0.517 1.363,-0.056 1.739,1.0659 0.47,1.4003 -0.821,0.2165 -1.065,0.6719 -0.962,1.6585 0.193,1.8109 -1.051,2.1229 -1.689,0.4309 -0.597,-1.5803 -2.379,-2.1644 -5.324,-1.7665 -2.378,0.3213 -3.885,-0.749 -2.31,-1.637 0.824,-0.4634 0.81,-0.5668 -0.256,-1.1416 -0.874,-0.4721 -1.343,-0.4692 -1.882,-0.021 -0.544,0.4561 -1.155,0.374 -2.481,-0.3231 -2.319,-1.2183 -5.797,-1.841 -6.585,-1.1848 -0.413,0.346 -1.139,0.2323 -2.203,-0.323 -1.486,-0.7744 -1.741,-0.7628 -3.357,0.2154 -4.259,2.5766 -5.828,3.2629 -6.307,2.7787 -0.311,-0.3137 0.327,-1.0091 1.754,-1.874 1.247,-0.7596 2,-1.3885 1.645,-1.4002 -0.355,-0.014 -1.395,0.4615 -2.331,1.034 -1.362,0.8352 -1.864,0.9032 -2.523,0.3877 -0.688,-0.5381 -0.726,-0.5172 -0.235,0.1508 0.722,0.9832 1.314,3.9967 0.877,4.4374 -0.58,0.5836 -1.733,-0.8197 -1.733,-2.111 0,-0.695 -0.166,-1.27 -0.384,-1.2925 -0.508,-0.052 -1.164,-0.2126 -2.01,-0.4738 l 0,21.4113 c 1.112,0.4782 1.827,0.5992 2.159,0.3231 0.433,-0.3632 0.877,-0.1454 1.476,0.7754 0.471,0.7256 0.855,1.4977 0.855,1.6803 0,0.5414 2.33,2.3069 3.058,2.3263 1.118,0.03 2.352,3.5634 1.603,4.5882 -0.261,0.3589 0.109,0.815 0.963,1.2063 1.36,0.6239 1.367,0.6498 0.406,1.8093 -0.535,0.6474 -0.656,0.9115 -0.256,0.5601 1.005,-0.8851 2.993,0.1355 2.181,1.1201 -0.66,0.8003 -0.223,1.3786 1.048,1.3786 1.324,0 5.773,4.412 5.773,5.7298 0,1.2616 -0.806,1.9973 -1.304,1.1848 -0.736,-1.197 -1.055,-0.4024 -1.113,2.7571 -0.03,1.827 -0.138,4.7732 -0.235,6.5268 -0.186,3.3295 1.085,7.2585 2.288,7.0223 0.321,-0.063 0.619,0.4046 0.663,1.0339 0.118,1.7481 2.322,4.963 3.763,5.5144 0.706,0.271 1.133,0.7637 0.941,1.077 -0.208,0.3415 0.05,0.489 0.62,0.3877 0.765,-0.132 1.175,0.4645 1.925,2.7573 0.529,1.6072 1.431,3.4268 1.988,4.028 0.738,0.7918 0.868,1.2585 0.449,1.6801 -0.418,0.4214 -0.135,0.9611 1.049,2.0249 0.9,0.8078 1.651,1.9756 1.668,2.5849 0.03,1.1913 2.944,3.8616 3.548,3.2526 0.201,-0.2022 -0.06,-0.5984 -0.555,-0.8832 -0.507,-0.2848 -0.92,-0.7688 -0.92,-1.0769 0,-0.3086 -0.712,-1.6305 -1.582,-2.9296 -0.873,-1.2992 -1.583,-2.531 -1.582,-2.7357 0,-0.2044 -0.525,-1.3734 -1.177,-2.6064 -0.91,-1.7321 -1.039,-2.3981 -0.556,-2.8864 0.724,-0.7273 2.267,0.2455 2.267,1.4217 0,0.3702 1.046,2.1337 2.352,3.9203 1.307,1.7865 2.395,3.4234 2.395,3.662 0,0.2388 0.782,1.3932 1.753,2.5417 2.338,2.7672 2.99,4.0649 2.652,5.3637 -0.364,1.3959 1.345,2.7604 7.078,5.6221 3.647,1.8203 4.582,2.1017 5.388,1.5939 0.799,-0.5019 1.322,-0.3818 2.887,0.6893 2.486,1.6983 5.864,3.425 6.692,3.425 1.308,0 3.615,2.8188 3.615,4.4157 0,1.3144 0.113,1.4746 0.769,0.9263 0.639,-0.5344 0.877,-0.4396 1.347,0.6031 0.322,0.7081 0.936,1.1857 1.668,1.3356 0.1,0.018 0.18,0.033 0.278,0.043 0.75,0.063 1.636,0.3476 1.967,0.6246 0.303,0.2532 0.609,0.2124 0.92,-0.1077 0.06,-0.053 0.104,-0.1246 0.15,-0.1939 0.06,-0.07 0.09,-0.1297 0.149,-0.2154 1.412,-2.2809 3.822,1.1363 3.742,5.3205 -0.03,1.8671 -0.408,2.8427 -1.774,4.5236 -0.959,1.1785 -2.04,3.296 -2.396,4.7174 -0.585,2.3336 -0.557,2.6403 0.3,3.1234 0.897,0.5056 0.877,0.588 -0.171,1.4001 l -1.112,0.8617 1.753,3.985 c 0.963,2.1918 2.324,5.754 3.016,7.9269 1.063,3.342 1.575,4.1671 3.271,5.3205 1.101,0.7496 2.848,2.1271 3.892,3.0802 l 1.903,1.7449 -0.663,9.1548 c -0.356,5.0379 -0.714,10.4769 -0.791,12.0841 -0.09,1.9099 -0.637,3.9187 -1.583,5.7945 -1.044,2.0721 -1.361,3.3061 -1.133,4.4589 0.105,0.5339 0.09,1.3091 -0.02,2.0464 l 14.177,0 c 0.02,-0.068 0.04,-0.1226 0.06,-0.1939 0.191,-0.6313 1.121,-0.9985 2.993,-1.2494 4.315,-0.5758 5.346,-2.5115 2.909,-5.4282 -0.792,-0.9488 -1.123,-1.5557 -0.983,-1.7879 0.02,-0.029 0.05,-0.047 0.09,-0.064 0.221,-0.1185 0.78,0.048 1.667,0.56 0.868,0.502 1.299,0.6892 1.903,0.5601 0.122,-0.026 0.242,-0.057 0.385,-0.1077 0.282,-0.1023 0.625,-0.2492 1.047,-0.4524 1.834,-0.8812 3.136,-2.698 5.924,-8.2931 1.129,-2.2638 1.309,-3.0977 0.876,-4.0496 -0.295,-0.6568 -0.387,-1.4455 -0.192,-1.7663 0.06,-0.08 0.158,-0.1893 0.3,-0.3232 0.281,-0.2677 0.719,-0.6163 1.218,-0.9908 1.24,-0.936 2.825,-1.9817 3.144,-1.9817 0.172,0 0.574,-0.3689 0.897,-0.7971 0.323,-0.4281 1.526,-0.8562 2.674,-0.9692 2.006,-0.1974 2.128,-0.3492 3.528,-3.6189 1.189,-2.7724 1.459,-4.1797 1.475,-7.7331 0.02,-3.0622 0.23,-4.5048 0.727,-4.8035 0.388,-0.2335 1.59,-1.7283 2.651,-3.2957 1.27,-1.8792 1.945,-3.5075 2.011,-4.825 0.02,-0.1649 0.02,-0.3193 0,-0.4739 -0.08,-1.0821 -0.617,-1.9092 -1.625,-2.4342 -0.854,-0.4441 -1.865,-1.2632 -2.245,-1.8094 -0.51,-0.7303 -1.557,-1.055 -3.935,-1.2278 -2.081,-0.1515 -3.016,-0.3531 -3.955,-1.0554 -0.157,-0.1174 -0.288,-0.2403 -0.45,-0.3878 -0.164,-0.1474 -0.333,-0.3136 -0.513,-0.4955 -2.036,-2.0523 -2.968,-2.1081 -4.363,-0.323 -0.749,0.9606 -1.454,1.2993 -2.437,1.1847 -0.628,-0.073 -1.022,-0.2423 -1.176,-0.4524 -0.02,-0.034 -0.06,-0.07 -0.06,-0.1077 -0.113,-0.3302 0.312,-0.7222 1.261,-0.9477 0.669,-0.1592 1.272,-0.6862 1.369,-1.1848 0.257,-1.3426 -0.681,-1.1343 -2.694,0.6462 -0.615,0.5437 -1.218,0.9846 -1.626,1.1847 -0.08,0.039 -0.172,0.066 -0.235,0.086 -0.13,0.043 -0.213,0.046 -0.256,0 -0.555,-0.5593 2.828,-5.0074 3.507,-4.6097 0.128,0.076 0.186,0.072 0.171,0 -0.02,-0.023 0,-0.07 -0.04,-0.1077 -0.08,-0.1541 -0.266,-0.4212 -0.555,-0.7539 -0.509,-0.5823 -0.893,-1.156 -0.941,-1.4216 -0.02,-0.039 -0.02,-0.083 0,-0.1078 0.31,-0.9767 -0.391,-2.1943 -1.539,-3.1664 -0.143,-0.1218 -0.315,-0.2317 -0.471,-0.3447 -1.092,-0.7903 -2.461,-1.357 -3.743,-1.357 -1.449,0 -2.276,-0.4458 -3.784,-2.0033 -1.063,-1.0957 -2.511,-2.5562 -3.229,-3.2526 -0.719,-0.6965 -1.167,-1.5126 -0.983,-1.8094 0.216,-0.3555 -0.589,-0.4083 -2.352,-0.1724 -0.421,0.056 -0.81,0.088 -1.154,0.1077 -1.031,0.057 -1.698,-0.06 -1.862,-0.3231 -0.185,-0.3071 -0.597,-0.5068 -0.941,-0.4524 -0.07,0.011 -0.157,0.022 -0.235,0.022 -0.08,2e-4 -0.151,-0.02 -0.234,-0.022 -0.169,-0.018 -0.345,-0.056 -0.534,-0.1076 -0.193,-0.051 -0.381,-0.1173 -0.578,-0.1938 -0.983,-0.3832 -1.966,-1.0395 -1.989,-1.4864 -0.02,-0.3726 -0.252,-0.1407 -0.513,0.517 -0.264,0.6575 -0.691,1.2061 -0.963,1.2061 -0.272,0 -0.398,0.4395 -0.256,0.991 0.02,0.091 0.06,0.1761 0.06,0.2585 0.08,0.4941 -0.06,0.8533 -0.256,1.0124 -0.03,0.028 -0.07,0.051 -0.107,0.065 -0.317,0.1274 -0.762,-0.095 -1.112,-0.7539 -0.343,-0.6499 -0.396,-1.0962 -0.128,-1.7017 l 0,-0.021 c 0.09,-0.204 0.22,-0.4146 0.385,-0.6677 0.417,-0.6386 0.543,-1.0358 0.469,-1.1848 -0.06,-0.1046 -0.177,-0.082 -0.384,0.022 -0.309,0.1558 -0.786,0.5382 -1.368,1.1633 -0.249,0.266 -0.52,0.4954 -0.792,0.6677 -0.179,0.1148 -0.35,0.1976 -0.512,0.2585 -0.163,0.062 -0.321,0.088 -0.45,0.086 -0.07,0 -0.123,0 -0.171,-0.021 -0.169,-0.065 -0.291,-0.098 -0.428,-0.043 -0.03,0.012 -0.09,0.042 -0.128,0.065 -0.364,0.2712 -0.735,1.1855 -1.539,3.4681 -0.02,0.071 -0.06,0.1444 -0.09,0.1938 -0.03,0.048 -0.07,0.082 -0.106,0.1076 -0.117,0.072 -0.271,0.048 -0.492,-0.086 -0.08,-0.045 -0.167,-0.082 -0.257,-0.1507 -0.181,-0.1381 -0.387,-0.3415 -0.641,-0.5816 -0.894,-0.8457 -1.296,-1.0944 -2.245,-0.9478 -0.158,0.023 -0.343,0.062 -0.535,0.1077 -0.193,0.046 -0.383,0.1076 -0.62,0.1723 -0.252,0.067 -0.485,0.125 -0.684,0.1724 -0.19,0.045 -0.382,0.084 -0.536,0.1076 -0.153,0.021 -0.279,0.021 -0.405,0.021 -0.08,0 -0.152,0 -0.214,0 -0.02,-0.011 -0.05,-0.019 -0.06,-0.021 -0.02,0 -0.02,0 -0.04,0 -0.08,-0.017 -0.141,-0.052 -0.214,-0.086 -0.07,-0.028 -0.132,-0.049 -0.193,-0.086 -0.02,-0.014 -0.02,-0.03 -0.04,-0.043 -0.02,-0.014 -0.03,-0.03 -0.06,-0.043 -0.296,-0.2171 -0.61,-0.5534 -1.049,-1.077 -1.255,-1.5015 -1.353,-1.9253 -1.048,-4.9328 0.328,-3.2422 0.329,-3.2932 -1.112,-3.705 -0.804,-0.2293 -2.297,-0.4293 -3.314,-0.4523 -1.73,-0.039 -1.831,-0.1502 -1.667,-1.6372 0.1,-0.8732 0.371,-1.8368 0.598,-2.1325 0.229,-0.2957 0.562,-1.5367 0.748,-2.7787 0.304,-2.0016 0.226,-2.2618 -0.683,-2.2618 -2.317,0 -3.656,0.9686 -3.829,2.7573 -0.153,1.6106 -0.352,1.7832 -2.523,2.154 -2.931,0.5004 -4.316,-0.322 -5.794,-3.4034 -1.038,-2.1652 -1.476,-6.762 -0.706,-7.5392 0.21,-0.2104 0.318,-1.2042 0.235,-2.1756 -0.133,-1.5418 0.09,-1.9049 1.839,-2.9941 2.375,-1.4773 2.965,-1.6008 4.833,-1.0125 0.776,0.2447 2.21,0.5616 3.186,0.7324 1.59,0.2779 1.697,0.2466 1.069,-0.5169 -0.599,-0.7267 -0.538,-0.9881 0.342,-1.6371 0.666,-0.4899 1.505,-0.6318 2.352,-0.3878 0.726,0.2095 1.944,0.3594 2.716,0.3231 1.604,-0.074 3.004,1.6141 3.271,3.985 0.205,1.8205 1.439,3.8773 2.331,3.8773 0.896,0 0.827,-0.6959 -0.405,-5.0405 -0.583,-2.0438 -1.049,-4.0457 -1.049,-4.4373 0,-0.3916 1.25,-1.9993 2.802,-3.5757 1.553,-1.5765 2.731,-3.0002 2.587,-3.145 -0.144,-0.1446 0.105,-0.3981 0.577,-0.5816 0.476,-0.1834 0.748,-0.534 0.598,-0.7755 -0.149,-0.2412 0,-0.5913 0.3,-0.7754 0.364,-0.2256 0.326,-0.6869 -0.06,-1.4002 -0.652,-1.2284 -0.459,-3.9203 0.279,-3.9203 0.277,0 0.653,0.5834 0.855,1.3139 0.301,1.0868 0.387,1.1356 0.427,0.2586 0.08,-1.6338 2.618,-5.019 3.743,-5.019 1.977,0 2.658,-0.5473 2.01,-1.5941 -0.468,-0.7536 -0.403,-1.2677 0.299,-2.3478 0.493,-0.7595 1.251,-1.3787 1.689,-1.3787 0.439,0 1.927,-0.5784 3.294,-1.2709 1.702,-0.8609 2.806,-1.1088 3.527,-0.8184 0.609,0.245 0.756,0.4525 0.321,0.4738 -1.048,0.053 -2.694,1.6175 -2.694,2.5849 0,0.6445 0.228,0.5954 1.176,-0.2585 0.655,-0.5881 1.964,-1.3784 2.887,-1.7448 0.921,-0.3663 1.826,-1.0131 1.988,-1.4432 0.165,-0.4301 0.519,-0.6343 0.813,-0.4523 0.291,0.1818 0.534,0.1098 0.534,-0.1509 0,-1.0808 -0.671,-0.9833 -1.903,0.2585 -1.052,1.0612 -1.459,1.2027 -2.074,0.6893 -0.418,-0.3509 -0.604,-0.9172 -0.406,-1.2492 0.268,-0.4507 0.16,-0.4508 -0.405,0 -0.602,0.4765 -1.06,0.2995 -2.182,-0.8616 -1.489,-1.539 -1.433,-2.1326 0.192,-2.1326 0.542,0 0.963,-0.3756 0.963,-0.8616 0,-1.3449 -3.524,-0.5512 -5.347,1.2063 -1.052,1.0174 -1.66,1.2976 -2.052,0.9047 -0.77,-0.7766 3.725,-4.7356 5.88,-5.1698 0.908,-0.183 2.823,-0.3231 4.255,-0.3231 1.435,0 3.13,-0.2818 3.764,-0.6247 0.634,-0.3433 1.868,-0.7673 2.737,-0.9478 1.373,-0.2844 1.582,-0.5718 1.582,-2.0895 0,-2.3361 -0.665,-2.7619 -3.037,-1.9385 -1.341,0.4662 -2.101,0.5241 -2.33,0.1508 -0.428,-0.6984 1.265,-1.9912 2.694,-2.0464 0.768,-0.029 0.858,-0.1116 0.299,-0.3231 -0.436,-0.1648 -1.403,-0.7368 -2.159,-1.271 -0.758,-0.5341 -1.503,-0.8575 -1.647,-0.7108 -0.146,0.1466 -0.651,-0.337 -1.133,-1.077 -0.481,-0.7397 -0.714,-1.357 -0.513,-1.357 0.203,0 -0.171,-0.5605 -0.813,-1.2494 -0.641,-0.6889 -1.285,-1.9326 -1.433,-2.7573 -0.43,-2.3934 -0.725,-2.4827 -2.309,-0.7754 -0.894,0.9626 -1.816,1.4748 -2.288,1.2924 -0.43,-0.1673 -0.95,-0.032 -1.155,0.3016 -0.25,0.4126 -0.74,0.2158 -1.496,-0.6031 -1.244,-1.3452 -1.556,-2.4356 -0.834,-2.8865 0.742,-0.4622 0.566,-1.8094 -0.235,-1.8094 -0.392,0 -1.383,-0.6443 -2.224,-1.4432 -1.188,-1.1292 -2.094,-1.4903 -4.062,-1.5509 -2.363,-0.072 -2.58,0.039 -3.229,1.594 -0.46,1.1013 -0.516,1.968 -0.193,2.6064 0.325,0.6399 0.269,1.2384 -0.149,1.7448 -0.344,0.4196 -0.449,0.7539 -0.236,0.7539 0.218,0 0.133,0.3352 -0.193,0.7324 -0.454,0.5509 -0.337,1.0337 0.471,2.0679 1.301,1.6661 1.339,3.4612 0.128,5.1913 -0.593,0.8497 -0.956,2.4437 -1.005,4.4804 -0.06,2.3273 -0.299,3.3095 -0.984,3.8127 -0.8,0.5885 -1.212,0.4323 -3.014,-1.2709 -1.902,-1.799 -2.053,-2.1725 -1.839,-4.1789 l 0.214,-2.2187 -2.33,-0.2584 c -1.533,-0.1737 -3.322,-0.9325 -5.176,-2.2187 -1.561,-1.0821 -3.074,-1.8353 -3.357,-1.6587 -0.641,0.3983 -1.342,-0.6709 -1.369,-2.0893 -0.02,-0.7936 -0.312,-1.0073 -1.197,-0.8832 -0.869,0.1217 -1.313,-0.2133 -1.688,-1.2062 -0.736,-1.9504 -0.138,-3.2266 3.271,-6.8285 0.801,-0.8451 1.33,-1.7287 1.176,-1.9817 -0.387,-0.6281 1.603,-1.6481 2.523,-1.2925 0.409,0.1579 1.308,-0.1784 2.009,-0.7538 1.384,-1.1376 1.458,-1.0594 -1.582,-2.0033 -1.392,-0.4329 0.283,-1.3421 2.138,-1.1633 1.643,0.1584 1.797,0.3346 1.947,2.1756 0.12,1.4485 -0.05,2.0897 -0.663,2.3265 -0.673,0.2601 -0.552,0.4813 0.619,1.0986 1.386,0.73 1.52,0.6963 2.46,-0.5602 0.933,-1.246 1.064,-1.269 2.203,-0.517 0.672,0.443 1.469,0.6508 1.753,0.474 0.834,-0.5205 -1.764,-2.936 -3.55,-3.2957 -0.899,-0.181 -1.986,-0.8976 -2.438,-1.5941 -0.861,-1.321 -0.761,-1.4437 1.134,-1.2924 1.251,0.1003 4.384,-1.3306 4.384,-2.0033 0,-0.2289 -0.34,-0.8765 -0.749,-1.4432 -0.54,-0.7414 -0.577,-1.2317 -0.171,-1.7232 0.752,-0.9148 -0.931,-2.1957 -2.909,-2.2187 -1.256,-0.014 -1.396,0.13 -0.962,0.9478 0.388,0.7303 0.169,1.3893 -0.877,2.7357 -1.284,1.6544 -1.394,1.68 -2.052,0.7754 -0.383,-0.5313 -0.727,-1.472 -0.727,-2.1109 0,-0.639 -0.334,-1.4619 -0.749,-1.8094 -0.609,-0.5095 -0.933,-0.3631 -1.647,0.7322 -0.951,1.4644 -1.817,1.3724 -1.817,-0.1937 0,-0.5471 -0.488,-1.1013 -1.132,-1.271 -0.891,-0.2348 -1.019,-0.4507 -0.557,-1.0124 0.81,-0.9836 -1.07,-3.1331 -2.458,-3.2096 l -0.04,0 z m -48.261,5.4714 c -0.291,0 -0.893,0.2337 -1.326,0.517 -0.435,0.2834 -0.549,0.5169 -0.257,0.5169 0.288,0 0.89,-0.2335 1.326,-0.5169 0.436,-0.2833 0.546,-0.517 0.257,-0.517 z m 150.321,5.9882 c -0.38,0 -0.94,0.053 -1.71,0.1723 -1.378,0.2147 -2.928,0.3559 -3.443,0.3232 -0.514,-0.032 -0.791,0.1451 -0.642,0.3877 0.408,0.6653 -2.135,2.1472 -3.805,2.2186 l -1.455,0.065 1.582,0.3447 c 0.869,0.1875 1.449,0.5585 1.306,0.8185 -0.306,0.5453 1.339,1.2806 2.971,1.3355 0.615,0.021 2.394,-0.4766 3.956,-1.12 3.169,-1.3068 3.961,-2.0721 2.822,-2.7142 -0.421,-0.2379 -0.769,-0.8076 -0.769,-1.2493 0,-0.4117 -0.179,-0.5801 -0.813,-0.5817 z m 229.694,12.0197 c -2.046,2.4428 -4.975,5.4553 -6.5,5.9021 -4.19,2.9027 -2.666,17.7942 2.63,8.8747 0.931,-2.9169 3.227,-4.4445 3.87,-6.7207 l 0,-2.4772 c -0.108,-0.447 -0.274,-0.9238 -0.512,-1.4431 0.158,-0.2554 0.341,-0.4866 0.512,-0.7109 l 0,-3.4249 z m -324.356,20.7866 c 0.29,0 0.535,0.2248 0.535,0.517 0,0.2925 -0.245,0.5384 -0.535,0.5384 -0.289,0 -0.535,-0.2459 -0.535,-0.5384 0,-0.2922 0.246,-0.517 0.535,-0.517 z m 1.07,2.8865 c 0.06,-0.011 0.113,-0.011 0.171,0 0.286,0.019 0.592,0.144 1.027,0.3446 0.752,0.3452 1.734,1.3974 2.18,2.348 0.682,1.4463 1.231,1.8152 3.293,2.197 1.356,0.2513 2.55,0.7458 2.673,1.1201 0.124,0.3746 -0.08,0.6207 -0.449,0.5386 -0.389,-0.086 -0.804,0.5311 -0.984,1.4432 -0.314,1.5921 -0.32,1.5966 -0.984,0.3877 -0.363,-0.6658 -0.862,-1.1026 -1.111,-0.9477 -0.25,0.1545 -0.34,-0.1725 -0.193,-0.7325 0.172,-0.6593 -0.11,-1.2267 -0.791,-1.5939 -0.882,-0.4752 -1.207,-0.3123 -2.01,0.9046 -0.526,0.798 -1.084,2.5191 -1.24,3.8343 -0.182,1.5155 -0.453,2.1518 -0.727,1.7233 -0.236,-0.372 -0.341,-1.3355 -0.256,-2.1326 0.08,-0.7974 0,-1.6648 -0.193,-1.9602 -0.462,-0.7489 0.717,-2.2562 1.967,-2.4987 3,-0.5819 -1.653,-2.5961 -5.175,-2.2402 -1.958,0.1979 -2.061,0.1635 -0.897,-0.3447 0.724,-0.3164 1.824,-1.0362 2.437,-1.6155 0.517,-0.4912 0.865,-0.745 1.262,-0.7754 z m 180.3,3.188 c 0.201,-0.011 0.403,-0.011 0.62,0 2.719,2.1859 -5.277,4.1789 0.129,7.9485 0.338,2.6855 4.311,0.4711 0.704,3.468 6.304,8.4154 -9.241,6.4269 -3.784,-1.3786 -3.198,-3.6932 -3.949,-9.7942 2.331,-10.0379 z m -170.121,0.4953 c 0.226,-0.036 0.45,0.05 0.576,0.2585 0.171,0.277 0.102,0.6473 -0.171,0.8186 -0.272,0.171 -0.642,0.105 -0.813,-0.1723 -0.169,-0.2767 -0.08,-0.6475 0.193,-0.8186 0.07,-0.044 0.139,-0.072 0.215,-0.086 z m 181.347,0.8617 c 2.226,5.3894 -5.411,3.5285 0,0 z m -176.837,3.2741 c 0.07,-0.01 0.09,-0.01 0.128,0 0.111,0.019 0.153,0.097 0.108,0.2155 -0.158,0.4107 -1.062,0.9368 -2.031,1.2063 -0.967,0.2694 -2.582,1.1363 -3.571,1.8956 -0.987,0.759 -2.106,1.3785 -2.481,1.3785 -1.019,0 1.431,-1.7088 5.11,-3.5758 1.36,-0.6889 2.306,-1.0713 2.737,-1.1201 z m 269.296,88.2518 c -0.125,0.033 -0.117,0.1237 -0.02,0.3016 0.189,0.3109 -0.253,0.9816 -0.985,1.4648 -0.731,0.4833 -1.229,1.0652 -1.09,1.2924 0.141,0.2271 -0.103,0.713 -0.534,1.077 -0.573,0.4792 -0.64,0.8442 -0.234,1.3355 0.306,0.3736 0.381,0.8038 0.149,0.9479 -0.839,0.5204 -4.051,-0.059 -4.342,-0.7756 -0.412,-1.0273 -1.624,-1.1506 -1.624,-0.1723 0,0.4447 -0.579,1.0561 -1.283,1.3787 -0.723,0.332 -1.157,0.871 -1.005,1.2708 0.146,0.3883 0.106,1.0067 -0.107,1.3571 -0.283,0.4604 -0.596,0.3843 -1.112,-0.323 -0.685,-0.9452 -0.709,-0.9545 -0.769,0.043 -0.03,0.5673 -0.03,1.3144 0.02,1.6587 0.08,0.6569 -3.119,3.3603 -3.978,3.3603 -0.518,0 -2.949,1.2263 -5.881,2.9726 -1.927,1.149 -2.269,2.951 -0.855,4.5235 0.517,0.5779 0.736,1.3405 0.513,1.9172 -0.342,0.8965 -0.423,0.8881 -1.132,-0.086 -0.436,-0.5962 -0.75,-0.7398 -0.75,-0.3446 0,0.376 0.505,1.3988 1.113,2.2618 1.232,1.7422 2.808,8.4347 2.437,10.3825 -0.184,0.965 0.09,1.4362 1.262,2.0463 1.422,0.7402 1.648,0.6984 3.486,-0.56 1.096,-0.7497 2.709,-1.3357 3.656,-1.3357 1.078,0 2.219,-0.4691 3.122,-1.3138 0.783,-0.7307 2.043,-1.3356 2.779,-1.3356 0.734,0 2.039,-0.2527 2.93,-0.56 2.439,-0.8397 6.543,0.8118 7.655,3.0803 0.457,0.9378 0.97,1.695 1.133,1.7017 0.165,0.011 0.692,-0.8515 1.198,-1.9172 0.676,-1.4292 1.062,-1.7957 1.497,-1.357 0.435,0.4387 0.443,0.9728 -0.02,1.9817 -0.811,1.7919 -0.776,2.1146 0.128,1.3571 0.544,-0.4539 0.847,-0.4545 1.111,-0.021 0.2,0.3261 0.227,0.7161 0.06,0.8832 -0.166,0.1674 0.287,1.0156 1.005,1.8741 0.717,0.8586 1.304,1.8972 1.304,2.3049 0,1.158 3.249,1.8344 4.319,0.9046 0.776,-0.6719 0.992,-0.6323 1.84,0.3017 1.246,1.3668 1.172,1.3664 2.374,-0.1724 0.603,-0.7732 1.47,-1.2561 2.116,-1.1848 0.756,0.083 1.15,-0.2194 1.24,-0.9477 0.17,-1.3406 1.129,-4.1458 2.374,-6.8931 1.243,-2.7425 2.574,-13.6949 1.626,-13.4198 -0.5,0.1452 -3.23,-1.8038 -3.23,-2.3047 0,-0.2436 -0.585,-1.0702 -1.305,-1.8525 -0.719,-0.7828 -1.191,-1.6394 -1.048,-1.8741 0.145,-0.2342 -0.221,-0.5655 -0.811,-0.7539 -1.45,-0.4633 -3.165,-4.0164 -3.165,-6.5483 0,-1.3696 -0.347,-2.3528 -1.026,-2.9726 -0.565,-0.5142 -1.194,-1.7086 -1.39,-2.628 -0.197,-0.9195 -0.478,-1.8779 -0.642,-2.1541 -0.396,-0.674 -1.601,2.7415 -1.668,4.7389 -0.06,1.6074 -1.814,6.1176 -2.395,6.1176 -0.172,0 -1.628,-0.9622 -3.228,-2.154 -2.722,-2.0249 -2.894,-2.2803 -2.566,-3.8557 0.193,-0.9269 0.574,-1.9198 0.834,-2.1973 0.626,-0.6683 0.594,-2.0493 -0.04,-1.6586 -0.27,0.1682 -0.599,0.084 -0.771,-0.1938 -0.171,-0.2784 -0.739,-0.484 -1.24,-0.4524 -0.502,0.032 -1.47,-0.1172 -2.159,-0.3447 -0.407,-0.1344 -0.701,-0.1916 -0.856,-0.1723 l -0.02,0 z m -346.959,14.4108 c -0.06,-0.011 -0.114,0.019 -0.17,0.021 -0.08,0.014 -0.144,0.022 -0.214,0.065 -0.122,0.076 -0.194,0.1943 -0.235,0.323 l 0,0.3878 c 0.02,0.037 0.02,0.073 0.04,0.1076 0.168,0.277 0.536,0.3651 0.812,0.1939 0.273,-0.1709 0.337,-0.5417 0.171,-0.8186 -0.101,-0.1557 -0.243,-0.2588 -0.407,-0.2799 z m 2.995,3.2095 c -0.08,0.012 -0.146,0.045 -0.215,0.086 -0.276,0.1711 -0.359,0.5201 -0.191,0.797 0.171,0.2769 0.537,0.3649 0.812,0.1939 0.273,-0.1713 0.342,-0.5417 0.171,-0.8186 -0.129,-0.2075 -0.35,-0.2934 -0.577,-0.2584 z m 7.548,2.1109 c -0.06,-0.01 -0.09,0.013 -0.15,0.021 -0.08,0.014 -0.167,0.045 -0.235,0.086 -0.278,0.1713 -0.364,0.5202 -0.192,0.797 0.169,0.2768 0.538,0.3651 0.811,0.1937 0.278,-0.1711 0.364,-0.5415 0.194,-0.8184 -0.09,-0.1556 -0.261,-0.261 -0.428,-0.28 z m 4.575,1.077 c -0.08,0.013 -0.146,0.045 -0.213,0.086 -0.278,0.1712 -0.34,0.5201 -0.171,0.797 0.171,0.2767 0.516,0.365 0.792,0.1939 0.272,-0.1712 0.362,-0.5419 0.191,-0.8185 -0.127,-0.2078 -0.373,-0.2935 -0.599,-0.2586 z m 337.764,18.051 c -0.06,-0.011 -0.113,0.02 -0.171,0.022 -0.08,0.013 -0.144,0.022 -0.214,0.064 -0.276,0.1711 -0.363,0.5418 -0.192,0.8185 0.169,0.277 0.539,0.3648 0.812,0.1938 0.276,-0.1711 0.34,-0.5416 0.171,-0.8184 -0.1,-0.1558 -0.24,-0.2589 -0.406,-0.2801 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<rect
style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="rect18941"
@@ -1101,7 +1113,8 @@
id="path18943"
d="m -10709.312,6469.5727 c -42.542,1.0077 -87.338,9.1813 -121,37.0312 -19.772,16.7999 -32.035,45.5339 -23.593,71.125 4.561,12.0928 17.685,18.746 30.187,19.3438 25.668,3.1687 51.732,0.3132 77.563,1.2468 50.428,-0.4191 100.933,0.7611 151.312,-0.9344 13.632,-2.288 24.417,-14.9208 24.813,-28.625 3.532,-23.5966 -9.446,-46.08 -27.375,-60.5624 -30.489,-26.7235 -71.672,-39.8232 -111.907,-38.625 z m 375.282,-0.063 c -44.591,1.4042 -89.967,20.3043 -117.844,55.75 -12.475,17.2401 -16.757,42.2912 -5.062,60.9688 9.248,12.7518 26.088,12.1622 40.187,12.0938 68.48,-0.9896 137.008,1.4051 205.469,-0.7813 13.692,-1.0746 29.823,-7.9398 32.687,-22.9687 7.677,-28.5407 -8.823,-58.371 -32.469,-74.1563 -35.357,-24.9816 -80.553,-30.8663 -122.968,-30.9063 z"
style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter7804)"
- transform="matrix(0.70059678,0,0,0.70576536,-8323.3149,1768.4725)" />
+ transform="matrix(0.70059678,0,0,0.70576536,-8323.3149,1768.4725)"
+ inkscape:connector-curvature="0" />
<path
transform="matrix(0.67375101,0,0,0.63282235,-9915.7151,1343.0013)"
d="m -8482.1193,8040.1943 c 0,19.8554 -130.3773,35.9514 -291.2059,35.9514 -160.8286,0 -291.2059,-16.096 -291.2059,-35.9514 0,-19.8553 130.3773,-35.9513 291.2059,-35.9513 160.8286,0 291.2059,16.096 291.2059,35.9513 z"
@@ -1128,16 +1141,19 @@
<path
d="m -8498.8531,7266.8057 c 21.0124,0 26.4152,-14.5185 24.7806,-30.8017 -2.6484,-26.3763 -42.1317,-52.8965 -82.1412,-52.8965 -60.8431,0 -95.3297,26.1257 -95.3297,57.7086 0,23.374 16.7547,26.1257 35.6481,26.1257 27.9997,0 72.3416,-0.1361 117.0422,-0.1361 z"
id="path18951"
- style="fill:#c28f00;fill-opacity:1;stroke:#c28f00;stroke-width:1.31368029px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#c28f00;fill-opacity:1;stroke:#c28f00;stroke-width:1.31368029px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
<path
d="m -9230.2786,5905.805 c -21.611,0.4586 -46.25,4.5895 -60,23.0625 -4.813,7.2653 -7.813,19.8454 0.344,25.875 11.653,5.5298 25.024,1.57 37.5,2.7596 24.776,-0.3654 49.758,1.1058 74.4061,-0.9783 9.2946,-4.7332 7.6562,-18.6088 2.3125,-25.7813 -11.9156,-17.0176 -34.3396,-25.1542 -54.5626,-24.9375 z"
id="path18953"
style="fill:#ecd000;fill-opacity:1;stroke:none;filter:url(#filter10358)"
- transform="matrix(1.3136803,0,0,1.3136803,3566.7902,-567.3186)" />
+ transform="matrix(1.3136803,0,0,1.3136803,3566.7902,-567.3186)"
+ inkscape:connector-curvature="0" />
<path
d="m -8490.5743,7230.7189 a 51.39775,36.618844 0 0 1 -102.7955,0 51.39775,36.618844 0 1 1 102.7955,0 z"
id="path18955"
- style="color:#000000;fill:url(#linearGradient19882);fill-opacity:1;stroke:none;stroke-width:2.05566597;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19882);fill-opacity:1;stroke:none;stroke-width:2.05566597;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(-1.1778525,0,0,1.186542,-25641.212,-2179.7748)"
@@ -1145,151 +1161,185 @@
<path
style="fill:#c28f00;fill-opacity:1;stroke:#c28f00;stroke-width:1.31368029px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="path18959"
- d="m -8498.8531,7266.8057 c 21.0124,0 26.4152,-14.5185 24.7806,-30.8017 -2.6484,-26.3763 -42.1317,-52.8965 -82.1412,-52.8965 -60.8431,0 -95.3297,26.1257 -95.3297,57.7086 0,23.374 16.7547,26.1257 35.6481,26.1257 27.9997,0 72.3416,-0.1361 117.0422,-0.1361 z" />
+ d="m -8498.8531,7266.8057 c 21.0124,0 26.4152,-14.5185 24.7806,-30.8017 -2.6484,-26.3763 -42.1317,-52.8965 -82.1412,-52.8965 -60.8431,0 -95.3297,26.1257 -95.3297,57.7086 0,23.374 16.7547,26.1257 35.6481,26.1257 27.9997,0 72.3416,-0.1361 117.0422,-0.1361 z"
+ inkscape:connector-curvature="0" />
<path
transform="matrix(1.3136803,0,0,1.3136803,3566.7902,-567.3186)"
style="fill:#ecd000;fill-opacity:1;stroke:none;filter:url(#filter10358)"
id="path18961"
- d="m -9230.2786,5905.805 c -21.611,0.4586 -46.25,4.5895 -60,23.0625 -4.813,7.2653 -7.813,19.8454 0.344,25.875 11.653,5.5298 25.024,1.57 37.5,2.7596 24.776,-0.3654 49.758,1.1058 74.4061,-0.9783 9.2946,-4.7332 7.6562,-18.6088 2.3125,-25.7813 -11.9156,-17.0176 -34.3396,-25.1542 -54.5626,-24.9375 z" />
+ d="m -9230.2786,5905.805 c -21.611,0.4586 -46.25,4.5895 -60,23.0625 -4.813,7.2653 -7.813,19.8454 0.344,25.875 11.653,5.5298 25.024,1.57 37.5,2.7596 24.776,-0.3654 49.758,1.1058 74.4061,-0.9783 9.2946,-4.7332 7.6562,-18.6088 2.3125,-25.7813 -11.9156,-17.0176 -34.3396,-25.1542 -54.5626,-24.9375 z"
+ inkscape:connector-curvature="0" />
<path
style="color:#000000;fill:url(#linearGradient19884);fill-opacity:1;stroke:none;stroke-width:2.05566597;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path18963"
- d="m -8490.5743,7230.7189 a 51.39775,36.618844 0 0 1 -102.7955,0 51.39775,36.618844 0 1 1 102.7955,0 z" />
+ d="m -8490.5743,7230.7189 a 51.39775,36.618844 0 0 1 -102.7955,0 51.39775,36.618844 0 1 1 102.7955,0 z"
+ inkscape:connector-curvature="0" />
</g>
<path
d="m -15424.607,6231.787 c 5.743,-0.4822 30.393,-1.4325 56.897,14.0621 30.292,17.708 37.328,14.9527 37.328,14.9527 l 4.252,7.4377 c -22.6,-2.2877 -53.311,-23.3669 -75.248,-27.5996 -7.414,-1.4305 -15.162,-1.0609 -22.459,0.174 l -1.991,-8.905 c 0,0 0.399,-0.053 1.221,-0.1219 z"
id="path18965"
- style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
id="path18967"
d="m -15452.591,6165.7033 c 34.173,7.6069 67.054,21.9243 94.812,43.624 15.394,13.1547 31.05,26.2747 42.531,43.2215 3.024,5.4324 7.953,11.8556 5.939,18.3242 -41.473,-37.6863 -91.515,-64.9136 -143.282,-85.8797 l 0,-19.29 z"
- style="fill:url(#linearGradient19886);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19886);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
style="fill:#4c4c4c;fill-opacity:1;stroke:none"
id="path18969"
- d="m -15949.965,6231.787 c -5.743,-0.4822 -30.393,-1.4325 -56.897,14.0621 -30.292,17.708 -37.328,14.9527 -37.328,14.9527 l -4.252,7.4377 c 22.599,-2.2877 53.31,-23.3669 75.247,-27.5996 7.415,-1.4305 15.163,-1.0609 22.459,0.174 l 1.992,-8.905 c 0,0 -0.4,-0.053 -1.221,-0.1219 z" />
+ d="m -15949.965,6231.787 c -5.743,-0.4822 -30.393,-1.4325 -56.897,14.0621 -30.292,17.708 -37.328,14.9527 -37.328,14.9527 l -4.252,7.4377 c 22.599,-2.2877 53.31,-23.3669 75.247,-27.5996 7.415,-1.4305 15.163,-1.0609 22.459,0.174 l 1.992,-8.905 c 0,0 -0.4,-0.053 -1.221,-0.1219 z"
+ inkscape:connector-curvature="0" />
<path
transform="matrix(1.5174057,0,0,1.5286002,-1572.9387,-4584.9209)"
style="color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12102);enable-background:accumulate"
id="path18971"
- d="m -9382.9769,6994.5019 c 3.863,15.2823 13.555,28.897 28.437,33.9375 4.887,1.7177 9.87,2.0482 14.688,1.3125 1.405,1.7654 2.916,3.3897 4.187,4.7812 7.826,7.9768 13.863,18.1647 23.031,24.5938 6.386,2.9946 13.205,-0.8042 16.875,-6.125 7.676,-9.636 17.214,-18.0334 23.657,-28.5 1.009,-1.7572 1.286,-3.5704 1.062,-5.3125 3.503,0.2916 7.036,0.1156 10.5,-0.5625 13.596,-1.7778 25.786,-11.5621 30.813,-24.125 l -75.844,0 c 1.065,2.7549 2.486,5.3358 4.187,7.7187 -2.226,-0.2708 -4.471,-0.3928 -6.718,-0.375 0.946,-2.3761 1.719,-4.8384 2.343,-7.3437 l -77.218,0 z" />
+ d="m -9382.9769,6994.5019 c 3.863,15.2823 13.555,28.897 28.437,33.9375 4.887,1.7177 9.87,2.0482 14.688,1.3125 1.405,1.7654 2.916,3.3897 4.187,4.7812 7.826,7.9768 13.863,18.1647 23.031,24.5938 6.386,2.9946 13.205,-0.8042 16.875,-6.125 7.676,-9.636 17.214,-18.0334 23.657,-28.5 1.009,-1.7572 1.286,-3.5704 1.062,-5.3125 3.503,0.2916 7.036,0.1156 10.5,-0.5625 13.596,-1.7778 25.786,-11.5621 30.813,-24.125 l -75.844,0 c 1.065,2.7549 2.486,5.3358 4.187,7.7187 -2.226,-0.2708 -4.471,-0.3928 -6.718,-0.375 0.946,-2.3761 1.719,-4.8384 2.343,-7.3437 l -77.218,0 z"
+ inkscape:connector-curvature="0" />
<path
style="color:#000000;fill:url(#linearGradient19888);fill-opacity:1;stroke:none;stroke-width:1.14415216;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path18973"
- d="m -15573.05,6023.8578 a 114.77613,99.564144 0 0 1 -229.551,0 114.77613,99.564144 0 1 1 229.551,0 z" />
+ d="m -15573.05,6023.8578 a 114.77613,99.564144 0 0 1 -229.551,0 114.77613,99.564144 0 1 1 229.551,0 z"
+ inkscape:connector-curvature="0" />
<g
id="g18975"
transform="translate(0,-18.572963)">
<path
d="m -15741.76,6007.8597 c -0.705,0 -1.42,0.014 -2.126,0.045 a 9.2113512,9.279307 0 0 0 -0.05,0 c -38.727,1.8494 -64.852,36.5482 -68.767,70.2569 0,0.045 0,0.09 0,0.1345 -0.02,0.06 -0.05,0.1179 -0.05,0.1784 l 0.05,0 c -1.672,12.0491 -0.858,24.698 2.346,36.7566 l 16.782,0 c -1.819,-6.936 -2.833,-14.3633 -2.833,-22.0806 0,-38.3945 24.421,-69.4987 54.51,-69.4987 22.497,0 41.768,17.4143 50.083,42.2435 0.03,0.076 0.07,0.1465 0.09,0.2229 0.06,0.1511 0.125,0.2948 0.177,0.4461 -0.02,0.016 -0.03,0.027 -0.05,0.046 2.657,8.1888 4.162,17.1268 4.162,26.5416 0,7.7172 -1.013,15.1445 -2.833,22.0807 l 6.509,0 c -2.371,-5.6568 -3.676,-11.8097 -3.676,-18.2445 0,-27.8084 24.275,-50.362 54.246,-50.362 15.371,0 29.269,5.9497 39.143,15.4788 5.569,4.5702 10.174,10.2316 13.196,16.7726 a 9.2113512,9.279307 0 0 0 0.177,0.3569 c 5.725,11.1527 5.014,24.3482 0.09,35.9982 l 20.058,0 c 4.186,-14.2938 3.571,-29.9091 -3.63,-44.1616 -0.06,-0.115 -0.07,-0.2419 -0.125,-0.3568 l -0.05,0.045 c -12.589,-26.8533 -41.689,-41.7236 -70.142,-39.7007 l 0,-0.045 c -0.1,0 -0.204,0.041 -0.31,0.045 -16.332,0.7504 -31.76,7.9241 -43.528,18.9135 -7.055,-14.179 -18.059,-26.4641 -33.033,-34.7047 a 9.2113512,9.279307 0 0 0 -0.177,-0.045 c -9.248,-4.8714 -19.678,-7.4525 -30.244,-7.3602 z"
id="path18977"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:13;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:AlArabiya;-inkscape-font-specification:AlArabiya" />
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:13;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:AlArabiya;-inkscape-font-specification:AlArabiya"
+ inkscape:connector-curvature="0" />
<path
d="m -15578.894,6096.9961 a 54.2675,50.352238 0 0 1 -108.535,0 54.2675,50.352238 0 1 1 108.535,0 z"
id="path18979"
- style="color:#000000;fill:#838383;fill-opacity:1;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#838383;fill-opacity:1;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15581.508,6112.4647 c -11.792,9.4368 -31.046,15.6126 -52.827,15.6126 -19.854,0 -37.63,-5.1073 -49.551,-13.1593 7.791,18.953 27.541,32.4296 50.703,32.4296 24.154,0 44.641,-14.6444 51.675,-34.8829 z"
id="path18981"
- style="color:#000000;fill:url(#radialGradient19890);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#radialGradient19890);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="M 230.5625,89.15625 C 209.8308,88.739692 191.20134,112.31236 200.59375,132 c 9.83037,23.32855 46.5842,26.90158 60.65625,5.78125 9.87539,-13.04031 6.23537,-33.71256 -7.875,-42.25 -6.64233,-4.600103 -14.80406,-6.737157 -22.8125,-6.375 z"
transform="matrix(1.3791254,-0.32777949,0.29049116,1.2403359,-15988.904,6017.1495)"
id="path18983"
- style="color:#000000;fill:#d7d7d7;fill-opacity:1;stroke:#838383;stroke-width:2.1166954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11252);enable-background:accumulate" />
+ style="color:#000000;fill:#d7d7d7;fill-opacity:1;stroke:#838383;stroke-width:2.1166954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11252);enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15656.997,6100.8024 a 13.527192,21.134448 0 0 1 -27.054,0 13.527192,21.134448 0 1 1 27.054,0 z"
id="path18985"
- style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15687.432,6093.1694 a 54.481819,69.519419 0 0 1 -108.963,0 54.481819,69.519419 0 1 1 108.963,0 z"
id="path18987"
- style="color:#000000;fill:#bababa;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#bababa;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -9344.8839,6940.6894 c -16.572,1.2878 -26.662,18.2484 -27.75,33.5 -2.085,17.8273 6.525,39.6722 25.625,43.625 16.197,1.4815 28.45,-14.6436 30.344,-29.5 3.554,-17.9245 -3.761,-40.3792 -22.25,-46.9375 -1.943,-0.5059 -3.954,-0.8119 -5.969,-0.6875 z"
id="path18989"
style="color:#000000;fill:#d7d7d7;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11182);enable-background:accumulate"
- transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)" />
+ transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)"
+ inkscape:connector-curvature="0" />
<path
d="m -15741.892,6023.6508 c -15.231,0 -27.615,5.9568 -37.503,18.8131 2.005,-0.2506 4.056,-0.4015 6.111,-0.4015 41.76,0 59.466,36.3133 59.466,78.6101 0,13.3439 -2.67,25.8767 -7.44,36.8011 19.838,-10.3896 33.83,-35.2674 33.83,-64.3242 0,-38.3944 -24.377,-69.4986 -54.464,-69.4986 z"
id="path18991"
- style="color:#000000;fill:url(#linearGradient19892);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19892);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15777.316,6040.3788 c -11.666,12.7503 -19.087,31.6336 -19.087,52.7706 0,38.3945 24.422,69.5433 54.511,69.5433 18.715,0 35.225,-12.0338 45.033,-30.3779 -7.828,7.1375 -16.815,11.1968 -26.393,11.1968 -30.191,0 -54.686,-40.3745 -54.686,-90.1967 0,-4.3939 0.252,-8.7102 0.622,-12.9361 z"
id="path18993"
- style="color:#000000;fill:url(#radialGradient19894);fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#radialGradient19894);fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15692.568,6099.9823 a 14.027546,23.846116 0 0 1 -28.054,0 14.027546,23.846116 0 1 1 28.054,0 z"
id="path18995"
- style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15740.567,6010.7186 c -29.39,0 -56.762,22.4467 -65.161,50.2688 l 0.08,0 c 9.193,-21.8845 34.135,-41.2555 62.127,-41.2555 27.993,0 53.813,19.371 63.004,41.2555 l 0.1,0 c -8.401,-27.8221 -30.762,-50.2688 -60.155,-50.2688 z"
id="path18997"
- style="color:#000000;fill:url(#linearGradient19896);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19896);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15628.761,6034.8121 c -21.591,0 -40.473,8.6897 -50.701,21.6345 12.251,-7.3322 27.712,-13.9658 45.803,-13.9658 26.71,0 50.842,11.9125 62.153,26.1883 -6.082,-19.4034 -29.404,-33.857 -57.255,-33.857 z"
id="path18999"
- style="color:#000000;fill:url(#linearGradient19898);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19898);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15687.432,6093.1694 a 54.481819,69.519419 0 0 1 -108.963,0 54.481819,69.519419 0 1 1 108.963,0 z"
id="path19001"
- style="color:#000000;fill:none;stroke:#878787;stroke-width:2.84441304;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#878787;stroke-width:2.84441304;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15633.183,6046.6239 c -10.717,0 -20.679,2.9207 -29.093,7.8953 31.034,1.1415 55.837,25.3231 55.837,55.0459 0,13.9973 -5.509,26.7657 -14.567,36.4888 24.112,-5.1248 42.112,-25.1411 42.112,-49.0682 0,-27.8085 -24.318,-50.3618 -54.289,-50.3618 z"
id="path19003"
- style="color:#000000;fill:url(#linearGradient19900);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19900);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15711.561,6077.7153 c -5.291,3.4128 -9.076,12.0674 -9.076,22.2592 0,13.1697 6.288,23.865 14.036,23.865 3.214,0 6.181,-1.8622 8.546,-4.9515 -0.744,0.1548 -1.487,0.2677 -2.26,0.2677 -8.948,0 -16.206,-10.7845 -16.206,-24.0879 0,-6.8159 1.901,-12.9707 4.96,-17.3525 z"
id="path19005"
- style="color:#000000;fill:url(#linearGradient19902);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19902);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15578.894,6096.9961 a 54.2675,50.352238 0 0 1 -108.535,0 54.2675,50.352238 0 1 1 108.535,0 z"
id="path19007"
- style="color:#000000;fill:none;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15677.863,6083.0681 c -3.723,3.7651 -6.199,10.3102 -6.199,17.7539 0,11.6716 6.081,21.0993 13.55,21.0993 3.22,0 6.179,-1.7468 8.501,-4.6837 -0.851,0.1868 -1.719,0.3123 -2.612,0.3123 -8.951,0 -16.209,-9.7859 -16.209,-21.8577 0,-4.7037 1.094,-9.0582 2.969,-12.6241 z"
id="path19009"
- style="color:#000000;fill:url(#linearGradient19904);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19904);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15706.601,6076.154 c -2.073,0 -4.029,0.7694 -5.801,2.1412 6.853,9.645 6.643,16.1479 6.643,16.1479 l 11.868,-4.5055 c -2.232,-8.1463 -7.076,-13.7836 -12.71,-13.7836 z"
id="path19011"
- style="fill:url(#linearGradient19906);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19906);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15670.512,6079.6779 c -2.214,0 -3.426,0.3991 -5.271,1.8735 5.552,7.0495 5.316,15.1221 5.316,15.1221 l 12.132,-4.9516 c -2.176,-7.1197 -6.792,-12.044 -12.177,-12.044 z"
id="path19013"
- style="fill:url(#linearGradient19908);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19908);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15691.147,6128.2557 c -21.918,0 -45.744,13.4945 -47.513,19.9394 -1.628,5.9302 2.659,11.7854 4.649,14.2299 2.006,2.4674 30.464,35.7131 33.343,38.3627 2.881,2.6494 5.05,4.8175 10.059,4.8175 2.296,0 -0.815,0 1.474,0 5.009,0 7.109,-2.1681 9.987,-4.8175 2.882,-2.6496 31.294,-35.8953 33.3,-38.3627 1.989,-2.4445 6.322,-8.2997 4.693,-14.2299 -1.768,-6.4449 -25.595,-19.9394 -47.511,-19.9394 l -2.481,0 z"
id="path19015"
- style="fill:url(#linearGradient19910);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19910);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -9309.7269,7007.9081 c -10.072,1.0206 -21.939,3.5909 -28.469,11.7813 1.071,6.9256 8.092,10.7687 11.805,16.2015 6.015,6.0007 10.155,14.7869 18.132,18.2047 6.978,-0.2354 9.579,-8.3993 14.282,-12.2812 5.246,-7.4945 14.344,-13.1743 16.875,-22.1875 -1.914,-4.6916 -8.203,-5.6101 -12.125,-8.0625 -6.546,-2.5805 -13.396,-4.0088 -20.5,-3.6563 z"
id="path19017"
style="fill:none;stroke:none;filter:url(#filter10487)"
- transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)" />
+ transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)"
+ inkscape:connector-curvature="0" />
<path
d="m -9308.3209,7009.8769 c -9.706,0.823 -21.168,2.7052 -27.656,10.5625 2.806,7.2492 10.013,11.5276 14.375,17.8125 4.285,4.9168 7.767,11.614 14.187,13.75 6.288,-2.1033 8.862,-9.2677 13.438,-13.5313 4.856,-6.189 12.599,-11.2224 14.562,-18.9375 -4.08,-4.2952 -10.91,-5.9918 -16.562,-8.0937 -4.008,-1.1109 -8.184,-1.6444 -12.344,-1.5625 z"
id="path19019"
style="fill:#ecd000;fill-opacity:1;stroke:none;filter:url(#filter10857)"
- transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)" />
+ transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)"
+ inkscape:connector-curvature="0" />
<path
d="m -15691.147,6128.2557 c -12.888,0 -26.398,4.6587 -35.736,9.8137 41.358,8.8433 58.809,18.4876 70.895,36.2212 5.044,-5.8893 9.428,-10.9894 10.14,-11.8656 1.989,-2.4445 6.322,-8.2997 4.693,-14.2299 -1.768,-6.4449 -25.595,-19.9394 -47.511,-19.9394 l -2.481,0 z"
id="path19021"
- style="fill:url(#linearGradient19912);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19912);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15733.169,6142.0393 c -3.045,2.2789 -5.03,4.4728 -5.491,6.1558 -1.628,5.9302 2.659,11.7854 4.649,14.2299 2.006,2.4674 30.464,35.7131 33.343,38.3627 2.881,2.6494 5.043,4.8175 10.052,4.8175 l 1.461,0 c 5.01,0 7.129,-2.1681 10.007,-4.8175 0.143,-0.1291 0.59,-0.6287 0.842,-0.8924 -5.474,-2.1595 -10.572,-5.2069 -14.791,-9.4565 -4.132,-4.1638 -21.428,-23.5957 -33.077,-35.3295 -3.8,-3.8286 -5.899,-8.4905 -6.995,-13.07 z"
id="path19023"
- style="fill:url(#linearGradient19914);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19914);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15691.147,6128.2557 c -21.918,0 -45.744,13.4945 -47.513,19.9394 -1.628,5.9302 2.659,11.7854 4.649,14.2299 2.006,2.4674 30.464,35.7131 33.343,38.3627 2.881,2.6494 5.05,4.8175 10.059,4.8175 2.296,0 -0.815,0 1.474,0 5.009,0 7.109,-2.1681 9.987,-4.8175 2.882,-2.6496 31.294,-35.8953 33.3,-38.3627 1.989,-2.4445 6.322,-8.2997 4.693,-14.2299 -1.768,-6.4449 -25.595,-19.9394 -47.511,-19.9394 l -2.481,0 z"
id="path19025"
- style="fill:none;stroke:url(#linearGradient19916);stroke-width:4.26661968;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:url(#linearGradient19916);stroke-width:4.26661968;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
</g>
</g>
<path
id="path19027"
d="m -15876.582,5882.4746 c 1.592,9.4468 7.431,17.3368 10.875,26.1158 -0.8,-10.6805 -7.64,-19.688 -8.8,-30.2657 -0.691,1.3834 -1.383,2.7666 -2.075,4.1499 z m 63.68,29.1923 c 2.213,25.3946 25.07,44.8131 22.896,71.049 -0.181,6.273 -1.417,12.4429 -3.256,18.424 11.515,-25.3547 5.396,-54.4655 -5.366,-79.0625 -5.151,-10.6618 -6.008,-22.8903 -2.29,-34.165 -3.994,7.9182 -7.99,15.8364 -11.984,23.7545 z m 19.64,89.473 c -0.237,0.2524 -0.335,1.1748 0,0 z m -150.54,-51.0865 c -6.98,0.34 -16.918,4.4298 -14.704,13.1651 2.927,8.8349 14.731,10.3244 22.753,9.3015 7.18,-1.0033 13.722,-5.6019 15.741,-12.8074 -6.693,-5.4226 -14.954,-10.0338 -23.79,-9.6592 z m 19.962,75.0914 c -11.914,0.8595 -27.861,5.9416 -29.73,19.712 -1.452,15.2387 15.114,24.5678 28.478,25.3286 13.726,1.2919 29.645,-1.6254 38.508,-13.0428 1.008,-5.1689 10.103,-12.1286 3.348,-15.5771 -11.526,-8.9143 -25.494,-17.0601 -40.604,-16.4207 z"
- style="fill:url(#radialGradient19918);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ style="fill:url(#radialGradient19918);fill-opacity:1;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
<g
transform="matrix(1.2588426,0,0,1.2588426,4091.4591,-1477.7431)"
id="g19029">
@@ -1298,16 +1348,19 @@
<path
id="path19033"
d="m -15617.469,5888.8438 c -0.6,-0.01 -0.541,0.6182 -0.593,2.375 -0.604,8.0502 -1.209,16.106 -1.813,24.1562 56.149,15.2688 103.466,65.3655 110.281,123.9375 l 26.188,0 c -0.475,-3.4692 -1.369,-6.9222 -1.5,-10.375 -10.631,-67.15 -65.745,-122.2218 -130.625,-139.5 -0.986,-0.362 -1.577,-0.5896 -1.938,-0.5937 z"
- style="fill:#649ada;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#649ada;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
<path
id="path19035"
d="m -15605.969,5827.7188 c -0.595,0.1567 -0.56,1.0976 -0.625,3.2812 -0.834,11.1181 -1.666,22.2258 -2.5,33.3438 78.652,21.3881 144.769,92.2792 152.688,174.6562 -0.01,0.1081 -0.02,0.2066 -0.03,0.3125 l 36.219,0 c -0.295,-6.0371 -2.208,-12.1303 -2.437,-18.1563 -14.682,-92.7389 -90.803,-168.7624 -180.406,-192.625 -1.589,-0.5832 -2.444,-0.9344 -2.907,-0.8124 z"
- style="fill:#ebcf00;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#ebcf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
</g>
<path
style="fill:url(#radialGradient19920);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m -15602.719,5833.1562 c -0.352,9.376 -2.19,19.3699 -1.625,28.375 72.159,21.245 132.374,82.0679 148.625,156.1876 1.523,5.6571 2.195,12.0716 3,17.6874 9.311,-0.2301 18.694,0 28.031,-0.125 -3.672,-33.5326 -14.533,-66.2074 -32.744,-94.6666 -32.652,-52.2669 -85.841,-91.4918 -145.256,-107.9271 l -0.03,0.4687 z m -12.906,79.2813 c 55.337,16.4015 101.009,65.1195 109.531,122.8437 5.991,-0.1081 12.265,0.3359 18.094,-0.1562 -7.932,-65.2162 -59.36,-120.4547 -121.294,-139.718 -6.58,-4.0699 -5.184,3.6949 -5.697,8.503 -0.211,2.8425 -0.423,5.685 -0.634,8.5275 z"
- id="path19037" />
+ id="path19037"
+ inkscape:connector-curvature="0" />
</g>
</g>
</g>
diff --git a/data/icons/hicolor_apps_64x64_freetuxtv.png b/data/icons/hicolor_apps_64x64_freetuxtv.png
new file mode 100644
index 0000000..299816e
Binary files /dev/null and b/data/icons/hicolor_apps_64x64_freetuxtv.png differ
diff --git a/data/icons/hicolor_apps_scalable_freetuxtv.svg b/data/icons/hicolor_apps_64x64_freetuxtv.svg
similarity index 95%
copy from data/icons/hicolor_apps_scalable_freetuxtv.svg
copy to data/icons/hicolor_apps_64x64_freetuxtv.svg
index fec4cce..80c4e8c 100644
--- a/data/icons/hicolor_apps_scalable_freetuxtv.svg
+++ b/data/icons/hicolor_apps_64x64_freetuxtv.svg
@@ -10,12 +10,15 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="500"
- height="500"
+ width="64"
+ height="64"
id="svg19089"
version="1.1"
- inkscape:version="0.47 r22583"
- sodipodi:docname="Nouveau document 2">
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="hicolor_apps_64x64_freetuxtv.svg"
+ inkscape:export-filename="/home/ebeuque/Informatique/Personnel/Projets/autres/freetuxtv/freetuxtv/data/icons/hicolor_apps_scalable_freetuxtv.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<defs
id="defs19091">
<inkscape:perspective
@@ -965,16 +968,16 @@
borderopacity="0.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="0"
- inkscape:zoom="0.83671875"
- inkscape:cx="557.14254"
- inkscape:cy="295.79446"
+ inkscape:zoom="2.366598"
+ inkscape:cx="143.41893"
+ inkscape:cy="52.903635"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1440"
- inkscape:window-height="829"
+ inkscape:window-height="827"
inkscape:window-x="0"
- inkscape:window-y="39"
+ inkscape:window-y="25"
inkscape:window-maximized="1" />
<metadata
id="metadata19094">
@@ -984,7 +987,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -992,10 +995,10 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(207.14254,-519.37979)">
+ transform="translate(207.14254,-955.37979)">
<g
id="g19804"
- transform="matrix(3.442352,0,0,3.442352,-104.673,-1879.0964)">
+ transform="matrix(0.44062106,0,0,0.44062106,-194.02644,648.37484)">
<rect
style="fill:none;stroke:none"
id="rect18907"
@@ -1016,7 +1019,8 @@
style="fill:#3d81d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m -15830.189,5839.7611 9.314,-4.2487 c 0,0 -8.674,19.5152 -4.032,31.3243 4.644,11.8094 18.933,42.6546 9.92,70.5703 -9.012,27.9151 -32.826,45.4327 -32.826,45.4327 -15.298,10.3098 -19.567,4.6983 -5.713,-3.8538 0,0 22.437,-14.1574 29.007,-39.6193 7.755,-30.0518 -11.28,-43.7916 -15.804,-62.5015 l -60.402,119.9419 c -21.695,20.9602 -67.692,11.7487 -64.711,-15.7297 1.853,-17.0859 25.062,-21.0854 35.252,-20.4317 9.736,0.6249 23.702,8.089 31.799,14.6181 l 68.196,-135.5026 z"
id="path18913"
- sodipodi:nodetypes="ccssccsccszcc" />
+ sodipodi:nodetypes="ccssccsccszcc"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccssccsccszcc"
id="path18915"
@@ -1024,7 +1028,8 @@
style="fill:#ecd000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:export-filename="/home/smorge/SEBASTIENs/ACTIVITEs/EN COURS/freetuxtv/freetuxtv-1.png"
inkscape:export-xdpi="30.536354"
- inkscape:export-ydpi="30.536354" />
+ inkscape:export-ydpi="30.536354"
+ inkscape:connector-curvature="0" />
</g>
<g
transform="translate(40.381598,120.28663)"
@@ -1032,21 +1037,25 @@
<path
style="fill:#000000;fill-opacity:1;stroke:none"
d="m -15690.342,5918.3309 c -84.807,1.4896 -145.741,66.5755 -153.274,129.8026 -7.559,63.4563 -3.247,76.5545 -18.678,127.3472 l 346.839,0 c -15.428,-50.7884 -11.118,-63.893 -18.678,-127.3472 -7.532,-63.227 -68.442,-128.313 -153.25,-129.8026 l -2.959,0 z"
- id="path18919" />
+ id="path18919"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccsccc"
id="path18921"
d="m -15469.405,6154.8583 16.44,104.7341 c 0,0 30.033,-16.7156 55.873,-11.7295 25.843,4.9859 63.837,33.3542 86.435,26.8411 10.928,-3.15 5.332,-19.2677 -5.116,-33.0683 -44.014,-51.2128 -89.856,-75.4203 -153.632,-86.7774 z"
- style="fill:#000000;stroke:none" />
+ style="fill:#000000;stroke:none"
+ inkscape:connector-curvature="0" />
<path
style="fill:#000000;stroke:none"
d="m -15905.167,6154.8583 -16.441,104.7341 c 0,0 -30.032,-16.7156 -55.873,-11.7295 -25.842,4.9859 -63.837,33.3542 -86.435,26.8411 -10.928,-3.15 -5.331,-19.2677 5.116,-33.0683 44.014,-51.2128 89.857,-75.4203 153.633,-86.7774 z"
id="path18923"
- sodipodi:nodetypes="ccsccc" />
+ sodipodi:nodetypes="ccsccc"
+ inkscape:connector-curvature="0" />
<path
id="path18925"
d="m -15928.384,6137.378 c 0,91.6973 0,183.3946 0,275.092 159.676,0 319.353,0 479.03,0 0,-92.058 0,-184.1158 0,-276.1736 -159.677,0 -319.354,-1e-4 -479.03,0 l 0,0.5408 0,0.5408 z"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
<rect
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="rect18927"
@@ -1057,7 +1066,8 @@
<path
style="opacity:0.5;fill:url(#radialGradient19872);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m -15922.565,6140.6116 0,24.0119 c -34.172,7.6069 -67.054,21.9243 -94.811,43.624 -15.394,13.1547 -31.051,26.2747 -42.532,43.2216 -3.024,5.4324 -7.953,11.8555 -5.939,18.3241 41.473,-37.6863 91.515,-64.9136 143.282,-85.8797 l 0,217.7442 183.445,0 c 1.359,-5.3744 2.716,-10.7498 4.076,-16.1242 l -155.747,0 0,-228.7977 c 71.156,10e-5 142.303,10e-5 213.459,0 1.359,-5.3744 2.717,-10.7499 4.075,-16.1242 l -249.308,0 z"
- id="path18929" />
+ id="path18929"
+ inkscape:connector-curvature="0" />
<rect
y="6158.9028"
x="-15886.94"
@@ -1075,7 +1085,8 @@
<path
id="path18935"
d="m -15884.798,6381.2038 c 47.266,0 94.533,0 141.799,0 18.522,-73.3771 37.043,-146.7541 55.565,-220.1312 -65.789,10e-5 -131.577,0 -197.364,0 0,73.3771 0,146.7541 0,220.1312 z"
- style="opacity:0.5;fill:url(#linearGradient19876);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="opacity:0.5;fill:url(#linearGradient19876);fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
<rect
style="fill:none;stroke:#ffffff;stroke-width:1.40635264;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect18937"
@@ -1086,7 +1097,8 @@
<path
id="path18939"
d="m -15811.58,6161.5157 c -0.266,0.4393 -0.477,1.0158 -0.534,1.5724 -0.03,0.2921 -1.053,0.4595 -2.288,0.3662 -1.646,-0.1247 -2.224,0.024 -2.117,0.5384 0.1,0.4611 -0.441,0.7115 -1.561,0.7325 -0.936,0.017 -1.831,0.1857 -2.032,0.3876 -0.199,0.202 -1.226,0.3928 -2.266,0.4308 l -1.903,0.065 1.861,0.3231 c 1.016,0.1808 1.706,0.5186 1.56,0.7323 -0.144,0.2135 0.298,0.7799 0.962,1.2494 0.93,0.6563 1.36,0.7095 1.926,0.2369 0.492,-0.4114 1.045,-0.4469 1.688,-0.1076 2.459,1.3028 5.145,1.2415 7.783,-0.1724 1.813,-0.9711 2.751,-1.2138 3.144,-0.8185 0.848,0.8539 -0.519,1.8542 -4.149,3.0587 -2.32,0.7698 -3.47,0.9197 -4.319,0.5386 -1.23,-0.554 -2.801,-0.219 -2.801,0.6031 0,0.8415 3.74,2.7993 4.747,2.4772 1.237,-0.3952 1.792,0.4729 0.813,1.2923 -1.086,0.9077 -6.372,0.052 -6.372,-1.0339 0,-0.4357 -0.404,-1.1132 -0.899,-1.4863 -0.496,-0.3734 -0.766,-1.0441 -0.599,-1.4863 0.168,-0.4421 0.126,-0.7474 -0.127,-0.6892 -0.542,0.125 -2.237,-0.4615 -3.357,-1.1632 -1.568,-0.9848 -2.143,-1.1423 -3.037,-0.7971 -0.778,0.3008 -0.794,0.4164 -0.129,0.8402 0.772,0.4912 0.637,0.5845 -1.198,0.7323 -0.361,0.029 -0.951,0.4115 -1.282,0.8402 -0.765,0.9849 0.546,2.0957 2.48,2.1325 0.726,0.014 1.661,0.2592 2.096,0.5385 0.619,0.3966 0.404,0.5796 -0.983,0.8615 -1.426,0.2891 -1.593,0.4497 -0.899,0.8402 0.474,0.2669 0.726,0.695 0.557,0.9693 -0.169,0.2781 0.606,0.5169 1.753,0.5169 1.388,0 2.349,-0.3619 2.994,-1.077 0.729,-0.8139 1.115,-0.9123 1.667,-0.4524 0.394,0.3298 1.433,0.9919 2.31,1.4647 0.876,0.4729 1.645,1.108 1.689,1.4002 0.135,0.8971 -1.644,0.9064 -2.523,0.022 -0.455,-0.4599 -0.594,-0.8402 -0.299,-0.8402 0.295,0 0.674,0.2464 0.855,0.5385 0.179,0.2925 0.715,0.5386 1.197,0.5386 0.679,0 0.598,-0.1973 -0.343,-0.8616 -1.008,-0.7107 -1.458,-0.743 -2.607,-0.2155 -1.247,0.5727 -1.298,0.6968 -0.472,1.1632 0.968,0.5453 0.76,1.5218 -0.32,1.5079 -0.376,-0.011 -0.304,-0.2291 0.17,-0.5385 0.437,-0.2835 0.546,-0.5169 0.258,-0.5169 -0.865,0 -2.108,0.9779 -1.732,1.357 0.192,0.1932 2.431,0.4252 4.96,0.5385 2.53,0.1128 4.728,0.3475 4.876,0.4954 0.375,0.379 0.595,0.33 2.566,-0.3877 1.815,-0.6612 2.447,-1.556 0.791,-1.1201 -1.307,0.345 -3.94,-0.7586 -3.507,-1.4648 0.195,-0.3169 0.916,-0.4371 1.626,-0.2585 0.759,0.1926 1.99,-0.034 2.993,-0.56 0.93,-0.4887 2.021,-1.0507 2.438,-1.2494 0.418,-0.1984 0.856,-0.6698 0.983,-1.0554 0.167,-0.5084 -0.121,-0.6062 -1.069,-0.3662 -0.721,0.182 -1.461,0.1649 -1.647,-0.021 -0.598,-0.6033 0.793,-1.7662 2.118,-1.7662 0.706,0 1.15,-0.2234 0.983,-0.4955 -0.537,-0.8778 0.58,-1.0666 2.309,-0.4094 1.384,0.5268 1.756,0.4943 2.139,-0.1291 0.255,-0.4168 2.326,-1.6574 4.598,-2.7572 2.27,-1.0995 3.845,-2.0108 3.506,-2.0249 -0.34,-0.014 -1.05,-0.1706 -1.583,-0.3447 -0.718,-0.2341 -0.783,-0.1645 -0.257,0.2155 0.543,0.3906 0.341,0.6424 -0.898,1.0771 -1.696,0.5961 -2.641,0.054 -1.518,-0.8618 0.358,-0.2933 1.708,-0.8927 3.015,-1.3354 3.152,-1.0683 5.282,-2.0482 5.282,-2.4556 0,-0.1826 -0.656,-0.724 -1.454,-1.1847 -1.05,-0.6067 -1.868,-0.7172 -3.014,-0.3877 -1.545,0.4435 -2.833,0.2747 -2.781,-0.3016 l -18.817,0 z m 44.52,0 c 0.02,0.9978 0.847,0.997 1.262,0 l -1.262,0 z m 2.543,0 c 0.111,0.1002 0.187,0.1707 0.321,0.3015 0.862,0.8362 1.133,1.4613 0.792,1.874 -0.434,0.5268 -3.1,0.5882 -5.753,0.1507 -1.988,-0.3277 -3.654,0.073 -3.377,0.7972 0.41,1.0784 -0.602,1.4891 -1.369,0.5599 -0.787,-0.9561 -1.636,-1.0256 -1.454,-0.1291 0.101,0.4668 -0.759,0.6081 -3.037,0.4953 -3.011,-0.149 -6.506,0.8557 -5.709,1.6587 0.528,0.5302 -0.972,2.0609 -1.732,1.7663 -0.38,-0.1468 -0.819,-0.051 -0.983,0.2155 -0.163,0.2666 -0.603,0.3549 -0.962,0.2153 -0.863,-0.3342 -4.893,1.6441 -4.214,2.0678 0.29,0.1799 1.275,0.1117 2.182,-0.1507 2.174,-0.628 2.541,0.082 1.069,2.0895 -0.815,1.1099 -1.648,1.6154 -2.652,1.6154 -0.798,0 -1.595,0.2415 -1.774,0.5387 -0.184,0.297 -0.559,0.387 -0.833,0.2153 -0.661,-0.4105 -4.17,0.7687 -4.17,1.4002 0,0.4931 0.631,0.6063 4.426,0.7108 1.138,0.03 2.186,0.345 2.309,0.7108 0.245,0.7334 -0.21,0.9405 -3.314,1.5079 -1.895,0.3465 -1.955,0.4234 -0.77,0.7323 0.726,0.1892 1.193,0.5473 1.047,0.797 -0.394,0.6774 1.676,1.2627 2.887,0.8186 0.582,-0.213 2.938,-0.4169 5.239,-0.474 2.304,-0.054 4.396,-0.2273 4.619,-0.3661 0.222,-0.1389 0.716,0.4139 1.133,1.2278 0.419,0.814 1.274,1.9428 1.881,2.4987 0.614,0.5559 1.112,1.2893 1.112,1.6371 0,0.3478 0.454,1.0478 1.005,1.5509 0.698,0.6368 0.92,1.3705 0.749,2.4556 -0.28,1.7925 0.621,2.1578 1.069,0.4308 0.241,-0.9333 0.43,-1.033 1.048,-0.5169 1.801,1.5056 1.352,3.3477 -0.962,3.9203 -0.724,0.1795 -0.542,0.2809 0.577,0.3232 0.898,0.034 2.02,0.5185 2.502,1.0554 0.821,0.9139 0.814,1.0392 -0.171,1.9388 -0.995,0.9058 -0.993,0.9753 -0.128,1.6155 0.839,0.6231 0.796,0.7379 -0.534,1.2493 -0.799,0.3069 -1.455,0.828 -1.455,1.1632 0,0.4438 0.21,0.426 0.769,-0.043 1.227,-1.0245 2.097,-0.07 1.027,1.1201 -0.496,0.5553 -0.69,1.0243 -0.427,1.034 0.261,0.011 0.05,0.3311 -0.493,0.7323 -0.614,0.4696 -0.729,0.8492 -0.362,1.0771 0.312,0.1943 0.398,0.6459 0.192,0.9909 -0.237,0.4016 -0.07,0.3557 0.469,-0.086 0.958,-0.7814 1.619,-0.1413 0.963,0.9262 -0.273,0.4455 0.119,1.5126 1.048,2.908 2.045,3.0547 3.489,4.2579 5.153,4.2866 0.782,0.014 1.44,0.3238 1.476,0.6893 0.03,0.3652 0.117,0.8069 0.149,0.9693 0.141,0.6285 3.237,-1.6417 3.293,-2.4126 0.03,-0.4485 0.02,-1.3305 -0.04,-1.9601 -0.06,-0.6294 0.141,-1.3168 0.448,-1.5079 0.308,-0.1913 0.556,-0.7715 0.556,-1.314 0,-1.1436 4.654,-5.4555 5.389,-4.9974 0.272,0.1694 1.179,0.01 2.01,-0.3447 1.493,-0.6226 2.234,-1.6295 2.331,-3.1879 0.03,-0.4385 0.341,-0.7192 0.705,-0.6462 0.361,0.072 1.121,-0.3521 1.69,-0.9263 0.828,-0.832 1.708,-1.0148 4.361,-0.9693 2.047,0.034 3.933,-0.278 4.897,-0.7755 0.866,-0.4451 2.405,-0.9962 3.422,-1.2277 l 1.838,-0.4093 -1.838,-0.4093 c -1.017,-0.2246 -2.354,-0.2817 -2.973,-0.1293 -1.333,0.3271 -2.216,-0.737 -1.005,-1.2062 0.462,-0.1774 0.762,-0.7064 0.684,-1.1848 -0.1,-0.6033 0.336,-0.9146 1.369,-1.0339 1.145,-0.1322 1.534,0.081 1.754,0.9262 0.348,1.3469 1.754,1.4672 1.754,0.1508 0,-1.2385 -2.878,-2.9538 -4.235,-2.5203 -1.439,0.4596 -2.32,-0.1547 -1.561,-1.0769 0.45,-0.5469 0.314,-0.8359 -0.534,-1.2925 -1.506,-0.8121 -0.776,-1.7386 1.047,-1.3356 1.204,0.2663 1.473,0.1457 1.412,-0.6246 -0.114,-1.3484 1.716,-1.2396 3.528,0.2155 0.819,0.6581 1.874,1.2062 2.351,1.2062 0.675,0 0.616,-0.1941 -0.299,-0.8401 -1.499,-1.0578 -1.055,-1.8094 1.07,-1.8094 1.564,0 1.589,-0.056 0.619,-0.797 -0.562,-0.4292 -0.781,-0.8179 -0.491,-0.8616 0.29,-0.046 -0.173,-0.2244 -1.026,-0.4093 -2.019,-0.4363 -2.043,-1.2914 -0.04,-1.7232 l 1.582,-0.3232 -1.689,-0.086 c -0.925,-0.034 -1.817,-0.2821 -1.988,-0.56 -0.516,-0.8426 1.628,-1.6366 3.442,-1.2709 1.275,0.2568 1.625,0.1829 1.326,-0.3016 -0.22,-0.3572 -0.532,-0.5213 -0.685,-0.3661 -0.515,0.5192 -2.341,-0.8283 -2.073,-1.5294 0.144,-0.3803 0,-0.9539 -0.321,-1.2709 -0.412,-0.4143 -0.154,-0.7332 0.855,-1.1201 0.771,-0.2958 1.412,-0.8829 1.412,-1.314 0,-0.431 0.41,-1.0318 0.919,-1.3571 0.781,-0.5 0.712,-0.568 -0.449,-0.323 -1.643,0.3469 -2.283,-0.097 -1.476,-1.0771 0.329,-0.3978 1.621,-0.7323 2.909,-0.7323 1.543,0 2.268,-0.2107 2.18,-0.6463 -0.08,-0.3583 0.407,-0.7388 1.07,-0.84 0.657,-0.1013 1.804,-0.4959 2.544,-0.8833 l 1.347,-0.6893 -2.117,-0.3876 c -1.162,-0.1977 -2.528,-0.1122 -3.057,0.1723 -1.34,0.7189 -3.482,0.9296 -4.277,0.4308 -0.369,-0.2307 -1.378,-0.048 -2.245,0.3877 -1.541,0.7747 -2.527,0.3887 -1.839,-0.7323 0.229,-0.3731 -0.905,-0.5128 -3.507,-0.3878 -2.824,0.1363 -4.771,0.5885 -7.162,1.6802 -1.884,0.859 -3.653,1.3624 -4.17,1.1631 -1.3,-0.5028 -0.492,-1.1012 4.106,-2.951 2.61,-1.0506 4.979,-1.6156 6.67,-1.6156 1.44,0 3.407,-0.3689 4.384,-0.8184 l 1.774,-0.8187 -2.971,0.3017 c -3.124,0.3333 -4.356,-0.2794 -2.695,-1.3356 0.164,-0.1046 0.153,-0.1764 0.04,-0.2369 l -3.849,0 c -1.648,0.1417 -3.671,0.3937 -5.773,0.7323 -1.725,0.2776 -3.354,0.3553 -3.615,0.1938 -0.402,-0.2503 -0.259,-0.5858 0.258,-0.9261 l -7.207,0 c -0.169,0.023 -0.357,0.021 -0.577,0 l -6.137,0 z m 193.601,15.9183 c -2.751,7.0882 -12.303,4.2071 -19.587,6.2684 -6.339,0.3391 0.933,6.6984 -6.97,3.8773 -8.874,-2.1715 5.01,9.5011 -1.475,5.9667 -0.899,-3.7296 -11.179,-4.0639 -4.941,0.2155 -3.742,-0.9765 -6.388,-6.9516 -5.793,0.6677 -0.181,2.5187 10.297,6.7165 5.131,7.733 -2.484,-10.1223 -8.652,8.1997 -11.376,0.1078 7.025,4.2281 6.052,-18.1779 0.193,-11.8473 -6.359,2.4713 4.643,12.0059 -4.341,7.2376 -4.311,-2.4588 -8.774,2.858 -9.537,0.5385 -5.497,2.4173 -10.334,0.5702 -15.93,4.8251 1.254,-2.3629 -4.238,-6.1561 -1.989,-0.086 -1.544,0.8075 -3.392,2.502 -5.281,3.5542 -0.113,0.063 -0.228,0.1145 -0.342,0.1724 -0.03,0.015 -0.08,0.026 -0.107,0.043 -0.193,0.096 -0.382,0.2011 -0.578,0.28 -0.08,0.031 -0.159,0.057 -0.235,0.086 -0.148,0.056 -0.278,0.1095 -0.427,0.1508 -0.07,0.017 -0.15,0.03 -0.215,0.043 -0.03,0.011 -0.06,0.02 -0.08,0.021 -0.182,0.041 -0.353,0.069 -0.535,0.086 -0.204,0.02 -0.416,0.036 -0.619,0.021 -0.08,-0.011 -0.156,-0.031 -0.235,-0.043 -0.1,-0.014 -0.2,-0.021 -0.299,-0.043 -0.03,-0.011 -0.06,-0.019 -0.09,-0.021 -0.1,-0.028 -0.2,-0.072 -0.299,-0.1077 -0.1,-0.038 -0.2,-0.081 -0.299,-0.1293 0.112,0.2329 0.203,0.4576 0.278,0.6462 0.08,0.1832 0.127,0.3514 0.171,0.4954 0.09,0.3015 0.132,0.5188 0.106,0.6678 -0.108,0.5661 -1.027,0.062 -2.073,-0.8617 -0.262,-0.2327 -0.543,-0.5009 -0.813,-0.7754 -0.265,-0.2718 -0.54,-0.5484 -0.791,-0.8401 -0.02,-0.01 0.02,-0.021 0,-0.021 -0.38,-0.4388 -0.741,-0.8683 -1.026,-1.2925 0,-0.011 0.02,-0.019 0,-0.022 -0.191,-0.2845 -0.349,-0.5457 -0.471,-0.7969 -0.121,-0.2514 -0.182,-0.471 -0.213,-0.6678 -0.07,-0.3931 0.06,-0.6648 0.491,-0.7108 0.213,-0.022 0.51,0.018 0.876,0.1077 0.185,0.047 0.373,0.1122 0.6,0.1938 0.454,0.1633 1.005,0.3967 1.646,0.7108 0.424,0.039 0.807,0.07 1.176,0.086 0.366,0.015 0.713,0.01 1.027,0 1.704,-0.025 2.658,-0.3468 3.014,-0.8401 0.03,-0.046 0.06,-0.081 0.09,-0.1292 0.06,-0.096 0.06,-0.2165 0.06,-0.3232 0.02,-0.1066 0,-0.2074 -0.02,-0.323 -0.06,-0.2308 -0.168,-0.4753 -0.342,-0.7324 -0.09,-0.1261 -0.189,-0.2576 -0.299,-0.3877 l 0,-0.022 c -0.112,-0.1283 -0.25,-0.2563 -0.386,-0.3877 -0.02,-0.011 -0.02,0 -0.02,0 -0.689,-0.6779 -1.657,-1.3825 -2.78,-2.0248 l -0.02,0 c -0.904,-0.5152 -1.897,-0.9919 -2.908,-1.3787 -0.252,-0.096 -0.517,-0.1948 -0.77,-0.2799 -2.026,-0.6793 -4.019,-0.9658 -5.411,-0.4738 -0.09,-0.09 -0.155,-0.1745 -0.213,-0.2585 -0.02,-0.012 0.03,-0.02 0,-0.021 -0.112,-0.1685 -0.176,-0.3247 -0.213,-0.4738 -0.113,-0.4531 0.02,-0.8276 -0.13,-1.1417 -0.02,-0.053 -0.09,-0.1009 -0.127,-0.1508 -0.06,-0.051 -0.1,-0.1017 -0.172,-0.1508 -0.07,-0.047 -0.155,-0.085 -0.256,-0.1292 -0.41,-0.18 -1.075,-0.3615 -2.181,-0.517 -0.02,0.011 -0.02,0.019 -0.02,0.022 -0.06,0.063 -0.09,0.1213 -0.129,0.1723 -0.02,0.014 -0.04,0.03 -0.06,0.043 -0.03,0.031 -0.05,0.058 -0.09,0.086 -0.03,0.028 -0.08,0.041 -0.106,0.065 -0.02,0.011 -0.02,0.033 -0.04,0.043 -0.06,0.031 -0.09,0.044 -0.15,0.064 -0.06,0.016 -0.106,0.033 -0.15,0.043 -0.642,0.1352 -1.375,-0.4151 -2.138,-0.6677 -0.1,-0.034 -0.198,-0.065 -0.299,-0.086 -0.03,-0.011 -0.04,0 -0.06,0 -0.03,-0.011 -0.07,-0.019 -0.107,-0.021 -0.08,-0.011 -0.154,-0.025 -0.235,-0.021 -0.06,0 -0.132,0.033 -0.192,0.043 -0.02,0 -0.02,-0.011 -0.04,0 -0.07,0.014 -0.13,0.021 -0.192,0.043 -0.02,0.011 -0.04,0.019 -0.06,0.021 -0.03,0.014 -0.06,0.029 -0.09,0.043 -0.06,0.025 -0.115,0.051 -0.172,0.086 -0.131,0.08 -0.254,0.1886 -0.384,0.3231 -0.02,0.018 -0.03,0.025 -0.06,0.043 -0.216,0.2401 -0.426,0.5584 -0.641,0.9908 -0.184,-0.014 -0.383,-0.01 -0.556,0 -0.535,0.014 -1.029,0.1162 -1.496,0.2586 -1.244,0.3807 -2.336,1.115 -3.721,1.7662 -0.176,0.081 -0.351,0.1591 -0.535,0.2369 -0.55,0.234 -1.144,0.4573 -1.817,0.6248 -0.03,0.1236 -0.07,0.2464 -0.107,0.3662 -0.203,0.5987 -0.494,1.1434 -0.856,1.6586 -0.144,0.2061 -0.306,0.4079 -0.469,0.6031 -0.166,0.1949 -0.333,0.3748 -0.514,0.5601 -0.363,0.3706 -0.786,0.737 -1.198,1.077 -0.617,0.5076 -1.265,0.9952 -1.924,1.4648 -0.662,0.4712 -1.345,0.9308 -1.967,1.4001 -0.205,0.1541 -0.383,0.3173 -0.578,0.474 -0.395,0.3178 -0.78,0.6336 -1.111,0.9692 0.239,0.3512 0.401,0.673 0.513,0.9693 0.06,0.1521 0.1,0.2915 0.129,0.4308 0.02,0.1363 0.06,0.2628 0.06,0.3878 0,0.1197 -0.03,0.2341 -0.06,0.3446 -0.08,0.3511 -0.257,0.6677 -0.514,0.9478 -0.258,0.2772 -0.582,0.5159 -0.962,0.7539 -1.647,1.032 -4.178,1.8502 -5.175,3.662 -0.155,0.2787 -0.271,0.5738 -0.342,0.9047 -0.222,0.9937 -0.04,2.2297 0.791,3.8557 0.437,0.9801 1.07,1.2803 1.796,1.2494 0.1,-0.011 0.212,-0.01 0.321,-0.021 2.565,-0.4061 6.01,-4.1146 5.944,3.0373 1.424,3.8119 4.503,2.0063 6.266,-0.9263 0.1,-0.1628 0.189,-0.305 0.277,-0.4739 1.076,-2.0294 1.498,-4.4592 0.365,-5.9452 -0.09,-0.1241 -0.207,-0.2345 -0.322,-0.3446 1.001,-4.1156 5.704,-10.935 9.751,-9.8441 -0.232,0.3727 -0.534,0.8772 -0.876,1.4647 -0.173,0.2938 -0.372,0.5962 -0.557,0.9263 -1.652,2.973 -3.579,7.2058 -1.988,8.5086 l 0.02,0 c 0.09,0.069 0.17,0.1205 0.278,0.1723 l 0.02,0 c 0.665,0.3166 1.744,0.2981 3.378,-0.237 0.272,-0.088 0.552,-0.184 0.855,-0.3016 1.582,-0.1265 2.656,-0.079 3.336,0.065 l 0.02,0 c 0.333,0.072 0.577,0.1647 0.727,0.28 l 0.02,0 c 0.442,0.3503 0.108,0.8685 -0.684,1.3355 -1.15,0.6786 -3.268,1.2638 -5.325,1.1202 -0.158,-0.013 -0.314,-0.022 -0.471,-0.043 0.226,0.8258 0.37,1.4787 0.428,2.0249 0.02,0.1821 0.04,0.361 0.04,0.5169 0,0.1498 -0.03,0.3033 -0.04,0.4308 -0.02,0.1261 -0.02,0.26 -0.06,0.3662 -0.346,1.1023 -1.582,1.191 -3.571,1.4432 -0.02,0.189 -0.04,0.3796 -0.09,0.5601 -0.124,0.5417 -0.346,1.0218 -0.642,1.4863 -0.1,0.1547 -0.206,0.3067 -0.32,0.4524 -0.346,0.4377 -0.749,0.8301 -1.219,1.1848 -1.563,1.1812 -3.738,1.9122 -5.881,2.0678 -0.215,0.015 -0.426,0.016 -0.641,0.021 -2.77,0.057 -5.392,-0.8367 -6.48,-2.8434 -0.613,-6.5361 0.309,3.4809 -3.185,4.5666 -0.124,0.039 -0.248,0.07 -0.385,0.086 -0.406,0.045 -0.869,-0.024 -1.39,-0.237 -3.344,3.1027 -8.045,7.8804 -12.894,8.487 0.121,0.071 0.225,0.1501 0.342,0.237 0.02,0.011 0.02,-0.011 0.02,0 1.656,1.2186 2.871,3.8732 2.93,6.096 0.03,0.1591 0.03,0.2986 0,0.4523 -0.02,0.4673 -0.115,0.8968 -0.257,1.2925 -0.06,0.1345 -0.111,0.2643 -0.171,0.3877 -0.07,0.1199 -0.118,0.2367 -0.193,0.3446 -0.152,0.2161 -0.323,0.4 -0.534,0.5601 -0.112,0.081 -0.218,0.1512 -0.342,0.2154 -0.245,0.128 -0.545,0.2239 -0.856,0.28 -0.158,0.029 -0.318,0.057 -0.491,0.065 -0.347,0.015 -0.735,-0.012 -1.155,-0.086 -0.422,-0.072 -0.869,-0.1935 -1.369,-0.3662 -0.254,-0.087 -0.494,-0.1863 -0.769,-0.3017 -0.932,0.011 -1.709,0.221 -2.31,0.5818 -0.171,0.1033 -0.325,0.2182 -0.47,0.3446 -0.66,0.5685 -1.05,1.3608 -1.24,2.2617 -0.06,0.2003 -0.09,0.3936 -0.107,0.6031 -0.06,0.4239 -0.03,0.8453 0,1.2925 0.03,0.4421 0.1,0.8909 0.214,1.3356 0.06,0.2223 0.121,0.4482 0.192,0.6677 0.08,0.2191 0.168,0.4325 0.256,0.6462 l 0,0.021 c 0.09,0.2095 0.177,0.4016 0.279,0.6031 0.111,0.2098 0.22,0.4045 0.342,0.6031 0.119,0.1947 0.231,0.3784 0.363,0.5602 0.139,0.1874 0.276,0.3677 0.427,0.5385 0.148,0.1659 0.313,0.3264 0.471,0.4739 l 0.02,0 c 0.159,0.1452 0.302,0.2845 0.47,0.4092 0.177,0.1316 0.37,0.2377 0.556,0.3447 0.184,0.1034 0.363,0.2017 0.557,0.28 l 0.02,0 c 0.05,0.018 0.08,0.026 0.127,0.043 0.536,0.1957 1.109,0.2956 1.711,0.2586 0.02,-3e-4 0.02,2e-4 0.02,0 0.323,-0.021 0.665,-0.093 1.005,-0.1938 0.114,-0.034 0.225,-0.062 0.341,-0.1078 0.466,-0.1759 0.949,-0.4334 1.434,-0.7755 l 0.02,0 c 0.245,-0.1725 0.502,-0.3629 0.748,-0.5815 0.428,-0.651 0.898,-1.4116 1.433,-2.1972 0.269,-0.3913 0.543,-0.7779 0.834,-1.1847 0.583,-0.8161 1.212,-1.6484 1.882,-2.4556 0.333,-0.4022 0.676,-0.8028 1.027,-1.1848 1.053,-1.1435 2.182,-2.1569 3.356,-2.9079 0.196,-0.1252 0.401,-0.2356 0.599,-0.3447 0.199,-0.1089 0.396,-0.21 0.599,-0.3016 0.805,-0.3651 1.631,-0.6011 2.459,-0.6246 0.206,-0.011 0.412,0 0.62,0.021 0.208,0.018 0.41,0.062 0.62,0.1076 l 0.02,0 c 0.206,0.046 0.416,0.1003 0.62,0.1724 l 0.02,0 c 0.204,0.072 0.394,0.1788 0.598,0.2801 l 0.02,0 c 0.414,0.2062 0.826,0.4655 1.24,0.797 0.211,0.1689 0.432,0.3344 0.641,0.5385 0.208,0.2012 0.392,0.431 0.599,0.6678 0.144,0.025 0.286,0.041 0.428,0.086 l 0.02,0 c 0.135,0.043 0.274,0.1131 0.406,0.1722 l 0.02,0 c 0.132,0.059 0.255,0.1399 0.386,0.2153 0.401,0.2332 0.786,0.5174 1.154,0.8617 1.464,1.3655 2.656,3.4111 3.529,4.5451 0.144,0.1888 0.278,0.3642 0.405,0.4955 0.07,0.064 0.113,0.1241 0.172,0.1723 0.12,0.1014 0.239,0.1543 0.341,0.1723 0.1,0.017 0.18,-0.01 0.257,-0.086 0.117,-0.1134 0.229,-0.3519 0.3,-0.7108 l 0,-0.021 c 0.02,-0.1185 0.02,-0.2397 0.04,-0.3877 l 0,-0.021 c 0.06,-0.4596 0.1,-1.0575 0.107,-1.831 0.1,0.09 0.106,0.091 0.15,0.1294 -0.548,-0.5842 -3.323,-3.4423 -5.046,-5.7945 -0.249,-0.3398 -0.471,-0.6811 -0.662,-0.9909 -0.535,-0.8507 -0.825,-1.5563 -0.664,-1.9386 0.02,-0.034 0.03,-0.054 0.06,-0.086 0.267,-0.3516 1.103,-0.2942 2.76,0.3877 4.828,2.8081 9.829,14.3821 10.84,11.2658 -0.315,1.463 -1.338,3.051 -0.576,2.7141 0.07,-0.03 0.138,-0.068 0.235,-0.1293 0.197,-0.1238 0.447,-0.3264 0.791,-0.6031 0.34,-0.2713 0.769,-0.6111 1.282,-1.0554 -0.359,-0.3859 -0.643,-0.7412 -0.855,-1.0556 -0.211,-0.3142 -0.366,-0.5871 -0.449,-0.8401 -0.09,-0.2592 -0.109,-0.4829 -0.08,-0.6892 0.02,-0.097 0.04,-0.1935 0.08,-0.2801 0.03,-0.087 0.1,-0.1806 0.15,-0.2585 0.06,-0.08 0.133,-0.164 0.213,-0.2369 0.712,-0.6579 2.168,-1.0014 3.571,-1.5293 0.469,-0.1757 0.922,-0.372 1.348,-0.6032 0.704,-0.3842 1.326,-0.8639 1.689,-1.5294 l 0,-0.021 c 0.218,-0.3991 0.349,-0.8545 0.364,-1.4001 l 0,-0.022 c 0.02,-0.364 -0.06,-0.7645 -0.15,-1.2063 l 0,-0.021 c -0.06,-0.2236 -0.109,-0.4438 -0.193,-0.6894 0.592,-1.4012 1.208,-2.3689 1.818,-2.9942 0.172,-0.1785 0.338,-0.3264 0.514,-0.4522 0.35,-0.2511 0.714,-0.4052 1.068,-0.4739 0.445,-0.087 0.875,-0.046 1.327,0.086 0.181,0.053 0.371,0.1152 0.555,0.1938 0.181,0.08 0.353,0.1797 0.535,0.28 l 0.02,0 c 0.364,0.1992 0.724,0.4346 1.091,0.6893 0.552,0.386 1.125,0.8015 1.689,1.2063 -0.118,-0.1236 -0.234,-0.225 -0.321,-0.3447 -0.17,-0.2374 -0.262,-0.47 -0.32,-0.6892 -0.02,-0.097 -0.05,-0.2079 -0.06,-0.3016 -0.02,-0.262 0.04,-0.4866 0.149,-0.711 0.03,-0.01 0.03,-0.02 0.03,-0.021 0.03,-0.072 0.09,-0.1472 0.149,-0.2154 0.08,-0.109 0.171,-0.2266 0.278,-0.3232 0.06,-0.039 0.08,-0.071 0.129,-0.1077 0.142,-0.114 0.299,-0.2101 0.47,-0.3015 0.202,-0.1092 0.416,-0.2056 0.641,-0.2801 0.02,-0.011 0.03,0 0.04,0 0.02,-0.011 0.02,-0.019 0.04,-0.022 l 0.03,0 c 0.191,-0.058 0.381,-0.1189 0.576,-0.1507 0.02,-0.011 0.04,0 0.06,0 0.225,-0.033 0.45,-0.048 0.664,-0.043 1.419,0.043 2.428,0.9946 0.726,3.3388 6.544,2.5887 5.149,10.0574 -2.308,6.1175 -5.102,-2.7136 -17.302,4.0377 -8.681,8.3793 6.395,-1.4759 11.284,0.1188 6.842,7.4962 -0.704,0.8543 -1.905,1.5244 -3.336,2.1109 -0.113,0 -0.151,-1e-4 -0.279,0 -4.745,0.011 -11.373,-4.9285 -14.027,-2.2401 -3.919,3.9687 -7.226,0.087 -11.097,-0.711 -5.022,-1.035 0.428,-8.6669 -7.078,-6.8498 -4.611,1.1167 -9.497,3.557 -13.877,3.0372 -3.831,-0.4544 -5.157,1.2551 -6.736,3.8773 -1.905,3.1668 -2.704,7.0973 -5.709,10.1241 -3.272,3.2941 -4.3,7.3027 -3.999,12.278 0.278,4.5454 -1.34,8.0035 2.075,11.9336 3.023,3.4767 4.239,10.1335 10.221,9.9302 4.898,-0.1669 10.829,-3.9842 14.412,-1.8525 2.569,1.5295 4.972,0.723 6.308,2.628 2.396,3.4206 -0.617,9.2751 2.801,13.4413 2.721,3.3149 4.626,8.8121 2.16,13.2259 -2.805,5.0199 0.675,9.6559 1.282,14.6044 0.695,5.6635 5.786,10.7644 5.496,15.7031 -0.274,4.6744 4.675,3.5923 7.804,3.0803 5.448,-0.8914 9.186,-5.823 10.435,-10.684 1.112,-4.3264 2.51,-7.4611 2.908,-12.192 0.345,-4.123 9.698,-6.7498 7.27,-13.2045 -1.797,-4.7793 -2.759,-10.1397 1.027,-14.5614 3.517,-4.111 8.018,-7.3293 10.177,-12.6012 0.991,-2.4079 3.973,-8.2602 3.379,-8.25 -2.916,0.048 -9.47,3.1689 -11.568,-1.8095 -2.04,-4.8434 -6.92,-8.0548 -7.248,-13.6566 -0.246,-4.143 -5.27,-8.5025 -5.474,-11.5673 1.372,-0.6182 2.58,-0.6915 3.613,0.2801 3.628,8.0671 8.638,14.8741 10.628,23.8238 7.523,-1.1631 17.198,-6.101 20.633,-13.7644 -3.624,-2.5963 -3.915,-8.4313 -7.825,-2.8865 -5.712,2.2263 -10.068,-17.276 -2.032,-6.6775 6.432,5.2364 19.167,2.5064 23.136,9.3917 -0.609,4.5931 4.694,-3.6417 3.401,3.0156 0.179,5.3021 3.507,17.1611 6.971,18.0079 0.879,-9.3756 6.849,-18.0721 15.801,-21.1314 5.725,0.7927 3.599,12.7035 9.344,9.1764 0.236,9.8418 2.664,6.6466 7.463,7.4531 0.523,7.1305 7.919,2.7648 7.27,-1.9171 -1.343,-5.109 -7.489,-14.4772 1.347,-13.0537 5.952,-1.2925 16.739,-7.9356 13.578,-14.2383 3.206,-1.9893 -5.311,-9.3096 2.674,-11.8257 -1.146,0.087 -10.887,-0.9851 -3.871,-4.739 6.199,-4.8418 -0.195,5.6201 4.747,0.28 4.883,-0.8019 3.911,14.1523 7.527,5.7083 -4.494,-4.5206 0.979,-11.7894 5.709,-11.2873 6.051,-2.2336 15.524,-20.7722 4.854,-19.8173 -5.556,-4.9944 8.813,-13.2009 14.562,-10.9856 6.462,1.7625 8.488,-1.652 13.706,-5.0191 3.922,-0.074 -0.642,5.0234 4.319,1.0771 l 0,-17.9218 c -4.515,-1.446 -8.501,-3.4199 -13.963,-3.1019 -2.489,-2.6674 -5.122,-2.9991 -8.403,-1.637 2.489,-3.4801 -8.165,-2.4982 -7.463,1.0339 -5.465,-0.9501 -14.914,3.556 -14.39,-3.4465 -0.799,-4.1055 -10.59,1.2409 -14.669,-2.1325 -4.047,3.2275 -6.162,-5.1079 -8.04,-1.637 7.137,3.1523 -2.751,-1.2632 -0.256,2.4341 -10.539,3.6028 -1.161,-3.8161 3.549,-4.8036 1.605,-5.8538 -12.516,-0.3964 -11.055,-5.7513 l -0.749,-0.065 -0.04,-0.021 z m -258.497,2.4557 c -0.353,0 -0.435,0.1598 -0.32,0.517 0.139,0.4221 1.256,0.8608 2.587,1.0124 1.966,0.2241 2.384,0.4729 2.609,1.594 0.257,1.282 0.748,1.5363 3.506,1.7663 0.629,0.053 1.341,0.2923 1.582,0.5386 0.241,0.2463 2.096,0.315 4.127,0.1508 2.031,-0.1642 4.495,-0.2928 5.453,-0.3016 1.077,-0.011 1.62,-0.2403 1.412,-0.5817 -0.187,-0.3051 -0.05,-0.9445 0.342,-1.4431 0.606,-0.7835 0.6,-0.8352 -0.09,-0.3016 -0.436,0.3396 -1.392,0.5908 -2.117,0.5817 -0.724,-0.012 -3.331,0.1183 -5.795,0.2584 -4.6,0.2614 -6.843,-0.4052 -6.843,-2.0033 0,-0.3821 -0.877,-0.7913 -1.988,-0.9478 -1.089,-0.1532 -2.651,-0.4566 -3.485,-0.6677 -0.442,-0.1111 -0.771,-0.1733 -0.984,-0.1724 z m 11.975,7.9054 c -1.585,0 -3.935,1.9574 -3.935,3.2742 0,1.5109 1.641,4.1609 2.609,4.2004 0.446,0.017 3.19,0.1061 6.094,0.1939 3.665,0.1112 5.909,0.4543 7.377,1.1201 1.162,0.5266 2.54,1.0054 3.058,1.0556 1.608,0.1552 2.209,1.1589 1.369,2.2401 -0.672,0.8592 -0.652,0.8671 0.149,0.2369 0.756,-0.5958 0.975,-0.5393 1.454,0.3662 0.312,0.5843 0.577,1.3921 0.577,1.8095 0,0.5121 0.393,0.7019 1.241,0.5384 1.54,-0.2966 2.195,0.5601 1.111,1.4648 -0.645,0.5394 -0.967,0.4819 -1.732,-0.2154 -0.859,-0.7828 -1.061,-0.7802 -2.138,-0.021 -0.938,0.6616 -1.046,0.9785 -0.556,1.5725 0.34,0.4119 0.403,0.7746 0.149,0.797 -0.252,0.022 -1.52,0.079 -2.821,0.1292 -1.787,0.07 -2.433,0.3316 -2.566,1.034 -0.132,0.6725 0.183,0.9321 1.068,0.9262 0.674,-0.011 1.534,-0.2254 1.925,-0.4739 0.763,-0.4872 4.833,1.2189 4.833,2.0249 0,0.2537 0.628,0.6207 1.411,0.8185 1.083,0.2738 1.269,0.4669 0.706,0.8185 -0.516,0.3212 -0.268,0.4633 0.855,0.4309 0.892,-0.025 2.551,0.4227 3.678,1.0124 2.666,1.3926 2.632,1.3945 1.496,0.1292 -0.951,-1.0586 -0.936,-1.083 0.108,-1.3571 1.688,-0.4446 1.169,-2.2741 -1.412,-4.8466 -2.245,-2.2375 -2.312,-2.3613 -1.325,-3.1018 1.382,-1.0391 1.506,-1.0012 3.464,0.8401 1.324,1.2466 1.857,1.4583 2.415,0.9908 0.397,-0.3306 0.6,-0.8415 0.428,-1.1201 -0.17,-0.279 0.193,-0.6121 0.813,-0.7755 1.054,-0.2776 1.061,-0.3761 0.256,-1.2708 -0.475,-0.5277 -1.145,-0.8477 -1.497,-0.7108 -0.356,0.1366 -1.091,-0.2451 -1.625,-0.8401 -0.537,-0.599 -1.638,-1.0771 -2.458,-1.0771 -1.776,0 -3.056,-1.7882 -1.796,-2.4987 0.424,-0.2391 0.609,-0.6753 0.406,-0.9693 -0.474,-0.6803 -3.393,-2.0744 -4.02,-1.9171 -0.261,0.065 -0.863,-0.034 -1.326,-0.2155 -0.742,-0.2895 -0.704,-0.4112 0.192,-1.0769 0.857,-0.6349 0.87,-0.754 0.15,-0.754 -0.473,1e-4 -0.997,0.2454 -1.176,0.5386 -0.204,0.3307 -0.664,0.3398 -1.219,0.043 -0.488,-0.2643 -1.146,-0.5098 -1.433,-0.5386 -0.291,-0.029 -0.512,-0.3087 -0.512,-0.6246 0,-1.0379 -1.775,-1.8993 -3.401,-1.6587 -0.88,0.1297 -1.487,0.4493 -1.325,0.7108 0.474,0.7731 -1.289,1.1669 -2.117,0.474 -0.421,-0.3503 -0.98,-0.4776 -1.262,-0.3016 -0.717,0.4451 -1.404,-0.7847 -1.219,-2.2187 0.121,-0.9446 -0.101,-1.1981 -1.068,-1.1847 -0.676,0.011 -1.575,0.3119 -2.011,0.6677 -0.916,0.7459 -1.174,3.5276 -0.428,4.4373 0.332,0.4042 0.264,0.7543 -0.15,1.0126 -0.964,0.6005 -2.052,-1.3097 -1.967,-3.4466 l 0.04,-1.8955 0.342,2.1108 c 0.283,1.8267 0.381,1.9782 0.685,0.9048 0.498,-1.7702 -0.554,-3.8126 -1.968,-3.8126 z m -9.751,4.6312 c -0.182,0 -0.335,0.067 -0.492,0.1508 -1.928,1.0393 -1.977,3.7265 -0.06,3.7265 1.435,0 1.585,0.4423 0.749,2.1325 -0.999,2.0165 -1.509,2.2836 -2.779,1.4863 -0.787,-0.4963 -1.323,-0.4954 -2.246,-0.043 -2.19,1.0725 -5.585,1.257 -7.548,0.4308 -1.015,-0.4269 -1.839,-1.0284 -1.839,-1.3356 0,-0.614 -2.587,-0.7522 -3.977,-0.2153 -0.7,0.271 -0.732,0.4386 -0.171,0.7969 0.385,0.2472 1.059,0.4254 1.497,0.4094 0.521,-0.018 0.439,-0.1727 -0.257,-0.474 -0.86,-0.3723 -0.897,-0.4864 -0.171,-0.517 1.363,-0.056 1.739,1.0659 0.47,1.4003 -0.821,0.2165 -1.065,0.6719 -0.962,1.6585 0.193,1.8109 -1.051,2.1229 -1.689,0.4309 -0.597,-1.5803 -2.379,-2.1644 -5.324,-1.7665 -2.378,0.3213 -3.885,-0.749 -2.31,-1.637 0.824,-0.4634 0.81,-0.5668 -0.256,-1.1416 -0.874,-0.4721 -1.343,-0.4692 -1.882,-0.021 -0.544,0.4561 -1.155,0.374 -2.481,-0.3231 -2.319,-1.2183 -5.797,-1.841 -6.585,-1.1848 -0.413,0.346 -1.139,0.2323 -2.203,-0.323 -1.486,-0.7744 -1.741,-0.7628 -3.357,0.2154 -4.259,2.5766 -5.828,3.2629 -6.307,2.7787 -0.311,-0.3137 0.327,-1.0091 1.754,-1.874 1.247,-0.7596 2,-1.3885 1.645,-1.4002 -0.355,-0.014 -1.395,0.4615 -2.331,1.034 -1.362,0.8352 -1.864,0.9032 -2.523,0.3877 -0.688,-0.5381 -0.726,-0.5172 -0.235,0.1508 0.722,0.9832 1.314,3.9967 0.877,4.4374 -0.58,0.5836 -1.733,-0.8197 -1.733,-2.111 0,-0.695 -0.166,-1.27 -0.384,-1.2925 -0.508,-0.052 -1.164,-0.2126 -2.01,-0.4738 l 0,21.4113 c 1.112,0.4782 1.827,0.5992 2.159,0.3231 0.433,-0.3632 0.877,-0.1454 1.476,0.7754 0.471,0.7256 0.855,1.4977 0.855,1.6803 0,0.5414 2.33,2.3069 3.058,2.3263 1.118,0.03 2.352,3.5634 1.603,4.5882 -0.261,0.3589 0.109,0.815 0.963,1.2063 1.36,0.6239 1.367,0.6498 0.406,1.8093 -0.535,0.6474 -0.656,0.9115 -0.256,0.5601 1.005,-0.8851 2.993,0.1355 2.181,1.1201 -0.66,0.8003 -0.223,1.3786 1.048,1.3786 1.324,0 5.773,4.412 5.773,5.7298 0,1.2616 -0.806,1.9973 -1.304,1.1848 -0.736,-1.197 -1.055,-0.4024 -1.113,2.7571 -0.03,1.827 -0.138,4.7732 -0.235,6.5268 -0.186,3.3295 1.085,7.2585 2.288,7.0223 0.321,-0.063 0.619,0.4046 0.663,1.0339 0.118,1.7481 2.322,4.963 3.763,5.5144 0.706,0.271 1.133,0.7637 0.941,1.077 -0.208,0.3415 0.05,0.489 0.62,0.3877 0.765,-0.132 1.175,0.4645 1.925,2.7573 0.529,1.6072 1.431,3.4268 1.988,4.028 0.738,0.7918 0.868,1.2585 0.449,1.6801 -0.418,0.4214 -0.135,0.9611 1.049,2.0249 0.9,0.8078 1.651,1.9756 1.668,2.5849 0.03,1.1913 2.944,3.8616 3.548,3.2526 0.201,-0.2022 -0.06,-0.5984 -0.555,-0.8832 -0.507,-0.2848 -0.92,-0.7688 -0.92,-1.0769 0,-0.3086 -0.712,-1.6305 -1.582,-2.9296 -0.873,-1.2992 -1.583,-2.531 -1.582,-2.7357 0,-0.2044 -0.525,-1.3734 -1.177,-2.6064 -0.91,-1.7321 -1.039,-2.3981 -0.556,-2.8864 0.724,-0.7273 2.267,0.2455 2.267,1.4217 0,0.3702 1.046,2.1337 2.352,3.9203 1.307,1.7865 2.395,3.4234 2.395,3.662 0,0.2388 0.782,1.3932 1.753,2.5417 2.338,2.7672 2.99,4.0649 2.652,5.3637 -0.364,1.3959 1.345,2.7604 7.078,5.6221 3.647,1.8203 4.582,2.1017 5.388,1.5939 0.799,-0.5019 1.322,-0.3818 2.887,0.6893 2.486,1.6983 5.864,3.425 6.692,3.425 1.308,0 3.615,2.8188 3.615,4.4157 0,1.3144 0.113,1.4746 0.769,0.9263 0.639,-0.5344 0.877,-0.4396 1.347,0.6031 0.322,0.7081 0.936,1.1857 1.668,1.3356 0.1,0.018 0.18,0.033 0.278,0.043 0.75,0.063 1.636,0.3476 1.967,0.6246 0.303,0.2532 0.609,0.2124 0.92,-0.1077 0.06,-0.053 0.104,-0.1246 0.15,-0.1939 0.06,-0.07 0.09,-0.1297 0.149,-0.2154 1.412,-2.2809 3.822,1.1363 3.742,5.3205 -0.03,1.8671 -0.408,2.8427 -1.774,4.5236 -0.959,1.1785 -2.04,3.296 -2.396,4.7174 -0.585,2.3336 -0.557,2.6403 0.3,3.1234 0.897,0.5056 0.877,0.588 -0.171,1.4001 l -1.112,0.8617 1.753,3.985 c 0.963,2.1918 2.324,5.754 3.016,7.9269 1.063,3.342 1.575,4.1671 3.271,5.3205 1.101,0.7496 2.848,2.1271 3.892,3.0802 l 1.903,1.7449 -0.663,9.1548 c -0.356,5.0379 -0.714,10.4769 -0.791,12.0841 -0.09,1.9099 -0.637,3.9187 -1.583,5.7945 -1.044,2.0721 -1.361,3.3061 -1.133,4.4589 0.105,0.5339 0.09,1.3091 -0.02,2.0464 l 14.177,0 c 0.02,-0.068 0.04,-0.1226 0.06,-0.1939 0.191,-0.6313 1.121,-0.9985 2.993,-1.2494 4.315,-0.5758 5.346,-2.5115 2.909,-5.4282 -0.792,-0.9488 -1.123,-1.5557 -0.983,-1.7879 0.02,-0.029 0.05,-0.047 0.09,-0.064 0.221,-0.1185 0.78,0.048 1.667,0.56 0.868,0.502 1.299,0.6892 1.903,0.5601 0.122,-0.026 0.242,-0.057 0.385,-0.1077 0.282,-0.1023 0.625,-0.2492 1.047,-0.4524 1.834,-0.8812 3.136,-2.698 5.924,-8.2931 1.129,-2.2638 1.309,-3.0977 0.876,-4.0496 -0.295,-0.6568 -0.387,-1.4455 -0.192,-1.7663 0.06,-0.08 0.158,-0.1893 0.3,-0.3232 0.281,-0.2677 0.719,-0.6163 1.218,-0.9908 1.24,-0.936 2.825,-1.9817 3.144,-1.9817 0.172,0 0.574,-0.3689 0.897,-0.7971 0.323,-0.4281 1.526,-0.8562 2.674,-0.9692 2.006,-0.1974 2.128,-0.3492 3.528,-3.6189 1.189,-2.7724 1.459,-4.1797 1.475,-7.7331 0.02,-3.0622 0.23,-4.5048 0.727,-4.8035 0.388,-0.2335 1.59,-1.7283 2.651,-3.2957 1.27,-1.8792 1.945,-3.5075 2.011,-4.825 0.02,-0.1649 0.02,-0.3193 0,-0.4739 -0.08,-1.0821 -0.617,-1.9092 -1.625,-2.4342 -0.854,-0.4441 -1.865,-1.2632 -2.245,-1.8094 -0.51,-0.7303 -1.557,-1.055 -3.935,-1.2278 -2.081,-0.1515 -3.016,-0.3531 -3.955,-1.0554 -0.157,-0.1174 -0.288,-0.2403 -0.45,-0.3878 -0.164,-0.1474 -0.333,-0.3136 -0.513,-0.4955 -2.036,-2.0523 -2.968,-2.1081 -4.363,-0.323 -0.749,0.9606 -1.454,1.2993 -2.437,1.1847 -0.628,-0.073 -1.022,-0.2423 -1.176,-0.4524 -0.02,-0.034 -0.06,-0.07 -0.06,-0.1077 -0.113,-0.3302 0.312,-0.7222 1.261,-0.9477 0.669,-0.1592 1.272,-0.6862 1.369,-1.1848 0.257,-1.3426 -0.681,-1.1343 -2.694,0.6462 -0.615,0.5437 -1.218,0.9846 -1.626,1.1847 -0.08,0.039 -0.172,0.066 -0.235,0.086 -0.13,0.043 -0.213,0.046 -0.256,0 -0.555,-0.5593 2.828,-5.0074 3.507,-4.6097 0.128,0.076 0.186,0.072 0.171,0 -0.02,-0.023 0,-0.07 -0.04,-0.1077 -0.08,-0.1541 -0.266,-0.4212 -0.555,-0.7539 -0.509,-0.5823 -0.893,-1.156 -0.941,-1.4216 -0.02,-0.039 -0.02,-0.083 0,-0.1078 0.31,-0.9767 -0.391,-2.1943 -1.539,-3.1664 -0.143,-0.1218 -0.315,-0.2317 -0.471,-0.3447 -1.092,-0.7903 -2.461,-1.357 -3.743,-1.357 -1.449,0 -2.276,-0.4458 -3.784,-2.0033 -1.063,-1.0957 -2.511,-2.5562 -3.229,-3.2526 -0.719,-0.6965 -1.167,-1.5126 -0.983,-1.8094 0.216,-0.3555 -0.589,-0.4083 -2.352,-0.1724 -0.421,0.056 -0.81,0.088 -1.154,0.1077 -1.031,0.057 -1.698,-0.06 -1.862,-0.3231 -0.185,-0.3071 -0.597,-0.5068 -0.941,-0.4524 -0.07,0.011 -0.157,0.022 -0.235,0.022 -0.08,2e-4 -0.151,-0.02 -0.234,-0.022 -0.169,-0.018 -0.345,-0.056 -0.534,-0.1076 -0.193,-0.051 -0.381,-0.1173 -0.578,-0.1938 -0.983,-0.3832 -1.966,-1.0395 -1.989,-1.4864 -0.02,-0.3726 -0.252,-0.1407 -0.513,0.517 -0.264,0.6575 -0.691,1.2061 -0.963,1.2061 -0.272,0 -0.398,0.4395 -0.256,0.991 0.02,0.091 0.06,0.1761 0.06,0.2585 0.08,0.4941 -0.06,0.8533 -0.256,1.0124 -0.03,0.028 -0.07,0.051 -0.107,0.065 -0.317,0.1274 -0.762,-0.095 -1.112,-0.7539 -0.343,-0.6499 -0.396,-1.0962 -0.128,-1.7017 l 0,-0.021 c 0.09,-0.204 0.22,-0.4146 0.385,-0.6677 0.417,-0.6386 0.543,-1.0358 0.469,-1.1848 -0.06,-0.1046 -0.177,-0.082 -0.384,0.022 -0.309,0.1558 -0.786,0.5382 -1.368,1.1633 -0.249,0.266 -0.52,0.4954 -0.792,0.6677 -0.179,0.1148 -0.35,0.1976 -0.512,0.2585 -0.163,0.062 -0.321,0.088 -0.45,0.086 -0.07,0 -0.123,0 -0.171,-0.021 -0.169,-0.065 -0.291,-0.098 -0.428,-0.043 -0.03,0.012 -0.09,0.042 -0.128,0.065 -0.364,0.2712 -0.735,1.1855 -1.539,3.4681 -0.02,0.071 -0.06,0.1444 -0.09,0.1938 -0.03,0.048 -0.07,0.082 -0.106,0.1076 -0.117,0.072 -0.271,0.048 -0.492,-0.086 -0.08,-0.045 -0.167,-0.082 -0.257,-0.1507 -0.181,-0.1381 -0.387,-0.3415 -0.641,-0.5816 -0.894,-0.8457 -1.296,-1.0944 -2.245,-0.9478 -0.158,0.023 -0.343,0.062 -0.535,0.1077 -0.193,0.046 -0.383,0.1076 -0.62,0.1723 -0.252,0.067 -0.485,0.125 -0.684,0.1724 -0.19,0.045 -0.382,0.084 -0.536,0.1076 -0.153,0.021 -0.279,0.021 -0.405,0.021 -0.08,0 -0.152,0 -0.214,0 -0.02,-0.011 -0.05,-0.019 -0.06,-0.021 -0.02,0 -0.02,0 -0.04,0 -0.08,-0.017 -0.141,-0.052 -0.214,-0.086 -0.07,-0.028 -0.132,-0.049 -0.193,-0.086 -0.02,-0.014 -0.02,-0.03 -0.04,-0.043 -0.02,-0.014 -0.03,-0.03 -0.06,-0.043 -0.296,-0.2171 -0.61,-0.5534 -1.049,-1.077 -1.255,-1.5015 -1.353,-1.9253 -1.048,-4.9328 0.328,-3.2422 0.329,-3.2932 -1.112,-3.705 -0.804,-0.2293 -2.297,-0.4293 -3.314,-0.4523 -1.73,-0.039 -1.831,-0.1502 -1.667,-1.6372 0.1,-0.8732 0.371,-1.8368 0.598,-2.1325 0.229,-0.2957 0.562,-1.5367 0.748,-2.7787 0.304,-2.0016 0.226,-2.2618 -0.683,-2.2618 -2.317,0 -3.656,0.9686 -3.829,2.7573 -0.153,1.6106 -0.352,1.7832 -2.523,2.154 -2.931,0.5004 -4.316,-0.322 -5.794,-3.4034 -1.038,-2.1652 -1.476,-6.762 -0.706,-7.5392 0.21,-0.2104 0.318,-1.2042 0.235,-2.1756 -0.133,-1.5418 0.09,-1.9049 1.839,-2.9941 2.375,-1.4773 2.965,-1.6008 4.833,-1.0125 0.776,0.2447 2.21,0.5616 3.186,0.7324 1.59,0.2779 1.697,0.2466 1.069,-0.5169 -0.599,-0.7267 -0.538,-0.9881 0.342,-1.6371 0.666,-0.4899 1.505,-0.6318 2.352,-0.3878 0.726,0.2095 1.944,0.3594 2.716,0.3231 1.604,-0.074 3.004,1.6141 3.271,3.985 0.205,1.8205 1.439,3.8773 2.331,3.8773 0.896,0 0.827,-0.6959 -0.405,-5.0405 -0.583,-2.0438 -1.049,-4.0457 -1.049,-4.4373 0,-0.3916 1.25,-1.9993 2.802,-3.5757 1.553,-1.5765 2.731,-3.0002 2.587,-3.145 -0.144,-0.1446 0.105,-0.3981 0.577,-0.5816 0.476,-0.1834 0.748,-0.534 0.598,-0.7755 -0.149,-0.2412 0,-0.5913 0.3,-0.7754 0.364,-0.2256 0.326,-0.6869 -0.06,-1.4002 -0.652,-1.2284 -0.459,-3.9203 0.279,-3.9203 0.277,0 0.653,0.5834 0.855,1.3139 0.301,1.0868 0.387,1.1356 0.427,0.2586 0.08,-1.6338 2.618,-5.019 3.743,-5.019 1.977,0 2.658,-0.5473 2.01,-1.5941 -0.468,-0.7536 -0.403,-1.2677 0.299,-2.3478 0.493,-0.7595 1.251,-1.3787 1.689,-1.3787 0.439,0 1.927,-0.5784 3.294,-1.2709 1.702,-0.8609 2.806,-1.1088 3.527,-0.8184 0.609,0.245 0.756,0.4525 0.321,0.4738 -1.048,0.053 -2.694,1.6175 -2.694,2.5849 0,0.6445 0.228,0.5954 1.176,-0.2585 0.655,-0.5881 1.964,-1.3784 2.887,-1.7448 0.921,-0.3663 1.826,-1.0131 1.988,-1.4432 0.165,-0.4301 0.519,-0.6343 0.813,-0.4523 0.291,0.1818 0.534,0.1098 0.534,-0.1509 0,-1.0808 -0.671,-0.9833 -1.903,0.2585 -1.052,1.0612 -1.459,1.2027 -2.074,0.6893 -0.418,-0.3509 -0.604,-0.9172 -0.406,-1.2492 0.268,-0.4507 0.16,-0.4508 -0.405,0 -0.602,0.4765 -1.06,0.2995 -2.182,-0.8616 -1.489,-1.539 -1.433,-2.1326 0.192,-2.1326 0.542,0 0.963,-0.3756 0.963,-0.8616 0,-1.3449 -3.524,-0.5512 -5.347,1.2063 -1.052,1.0174 -1.66,1.2976 -2.052,0.9047 -0.77,-0.7766 3.725,-4.7356 5.88,-5.1698 0.908,-0.183 2.823,-0.3231 4.255,-0.3231 1.435,0 3.13,-0.2818 3.764,-0.6247 0.634,-0.3433 1.868,-0.7673 2.737,-0.9478 1.373,-0.2844 1.582,-0.5718 1.582,-2.0895 0,-2.3361 -0.665,-2.7619 -3.037,-1.9385 -1.341,0.4662 -2.101,0.5241 -2.33,0.1508 -0.428,-0.6984 1.265,-1.9912 2.694,-2.0464 0.768,-0.029 0.858,-0.1116 0.299,-0.3231 -0.436,-0.1648 -1.403,-0.7368 -2.159,-1.271 -0.758,-0.5341 -1.503,-0.8575 -1.647,-0.7108 -0.146,0.1466 -0.651,-0.337 -1.133,-1.077 -0.481,-0.7397 -0.714,-1.357 -0.513,-1.357 0.203,0 -0.171,-0.5605 -0.813,-1.2494 -0.641,-0.6889 -1.285,-1.9326 -1.433,-2.7573 -0.43,-2.3934 -0.725,-2.4827 -2.309,-0.7754 -0.894,0.9626 -1.816,1.4748 -2.288,1.2924 -0.43,-0.1673 -0.95,-0.032 -1.155,0.3016 -0.25,0.4126 -0.74,0.2158 -1.496,-0.6031 -1.244,-1.3452 -1.556,-2.4356 -0.834,-2.8865 0.742,-0.4622 0.566,-1.8094 -0.235,-1.8094 -0.392,0 -1.383,-0.6443 -2.224,-1.4432 -1.188,-1.1292 -2.094,-1.4903 -4.062,-1.5509 -2.363,-0.072 -2.58,0.039 -3.229,1.594 -0.46,1.1013 -0.516,1.968 -0.193,2.6064 0.325,0.6399 0.269,1.2384 -0.149,1.7448 -0.344,0.4196 -0.449,0.7539 -0.236,0.7539 0.218,0 0.133,0.3352 -0.193,0.7324 -0.454,0.5509 -0.337,1.0337 0.471,2.0679 1.301,1.6661 1.339,3.4612 0.128,5.1913 -0.593,0.8497 -0.956,2.4437 -1.005,4.4804 -0.06,2.3273 -0.299,3.3095 -0.984,3.8127 -0.8,0.5885 -1.212,0.4323 -3.014,-1.2709 -1.902,-1.799 -2.053,-2.1725 -1.839,-4.1789 l 0.214,-2.2187 -2.33,-0.2584 c -1.533,-0.1737 -3.322,-0.9325 -5.176,-2.2187 -1.561,-1.0821 -3.074,-1.8353 -3.357,-1.6587 -0.641,0.3983 -1.342,-0.6709 -1.369,-2.0893 -0.02,-0.7936 -0.312,-1.0073 -1.197,-0.8832 -0.869,0.1217 -1.313,-0.2133 -1.688,-1.2062 -0.736,-1.9504 -0.138,-3.2266 3.271,-6.8285 0.801,-0.8451 1.33,-1.7287 1.176,-1.9817 -0.387,-0.6281 1.603,-1.6481 2.523,-1.2925 0.409,0.1579 1.308,-0.1784 2.009,-0.7538 1.384,-1.1376 1.458,-1.0594 -1.582,-2.0033 -1.392,-0.4329 0.283,-1.3421 2.138,-1.1633 1.643,0.1584 1.797,0.3346 1.947,2.1756 0.12,1.4485 -0.05,2.0897 -0.663,2.3265 -0.673,0.2601 -0.552,0.4813 0.619,1.0986 1.386,0.73 1.52,0.6963 2.46,-0.5602 0.933,-1.246 1.064,-1.269 2.203,-0.517 0.672,0.443 1.469,0.6508 1.753,0.474 0.834,-0.5205 -1.764,-2.936 -3.55,-3.2957 -0.899,-0.181 -1.986,-0.8976 -2.438,-1.5941 -0.861,-1.321 -0.761,-1.4437 1.134,-1.2924 1.251,0.1003 4.384,-1.3306 4.384,-2.0033 0,-0.2289 -0.34,-0.8765 -0.749,-1.4432 -0.54,-0.7414 -0.577,-1.2317 -0.171,-1.7232 0.752,-0.9148 -0.931,-2.1957 -2.909,-2.2187 -1.256,-0.014 -1.396,0.13 -0.962,0.9478 0.388,0.7303 0.169,1.3893 -0.877,2.7357 -1.284,1.6544 -1.394,1.68 -2.052,0.7754 -0.383,-0.5313 -0.727,-1.472 -0.727,-2.1109 0,-0.639 -0.334,-1.4619 -0.749,-1.8094 -0.609,-0.5095 -0.933,-0.3631 -1.647,0.7322 -0.951,1.4644 -1.817,1.3724 -1.817,-0.1937 0,-0.5471 -0.488,-1.1013 -1.132,-1.271 -0.891,-0.2348 -1.019,-0.4507 -0.557,-1.0124 0.81,-0.9836 -1.07,-3.1331 -2.458,-3.2096 l -0.04,0 z m -48.261,5.4714 c -0.291,0 -0.893,0.2337 -1.326,0.517 -0.435,0.2834 -0.549,0.5169 -0.257,0.5169 0.288,0 0.89,-0.2335 1.326,-0.5169 0.436,-0.2833 0.546,-0.517 0.257,-0.517 z m 150.321,5.9882 c -0.38,0 -0.94,0.053 -1.71,0.1723 -1.378,0.2147 -2.928,0.3559 -3.443,0.3232 -0.514,-0.032 -0.791,0.1451 -0.642,0.3877 0.408,0.6653 -2.135,2.1472 -3.805,2.2186 l -1.455,0.065 1.582,0.3447 c 0.869,0.1875 1.449,0.5585 1.306,0.8185 -0.306,0.5453 1.339,1.2806 2.971,1.3355 0.615,0.021 2.394,-0.4766 3.956,-1.12 3.169,-1.3068 3.961,-2.0721 2.822,-2.7142 -0.421,-0.2379 -0.769,-0.8076 -0.769,-1.2493 0,-0.4117 -0.179,-0.5801 -0.813,-0.5817 z m 229.694,12.0197 c -2.046,2.4428 -4.975,5.4553 -6.5,5.9021 -4.19,2.9027 -2.666,17.7942 2.63,8.8747 0.931,-2.9169 3.227,-4.4445 3.87,-6.7207 l 0,-2.4772 c -0.108,-0.447 -0.274,-0.9238 -0.512,-1.4431 0.158,-0.2554 0.341,-0.4866 0.512,-0.7109 l 0,-3.4249 z m -324.356,20.7866 c 0.29,0 0.535,0.2248 0.535,0.517 0,0.2925 -0.245,0.5384 -0.535,0.5384 -0.289,0 -0.535,-0.2459 -0.535,-0.5384 0,-0.2922 0.246,-0.517 0.535,-0.517 z m 1.07,2.8865 c 0.06,-0.011 0.113,-0.011 0.171,0 0.286,0.019 0.592,0.144 1.027,0.3446 0.752,0.3452 1.734,1.3974 2.18,2.348 0.682,1.4463 1.231,1.8152 3.293,2.197 1.356,0.2513 2.55,0.7458 2.673,1.1201 0.124,0.3746 -0.08,0.6207 -0.449,0.5386 -0.389,-0.086 -0.804,0.5311 -0.984,1.4432 -0.314,1.5921 -0.32,1.5966 -0.984,0.3877 -0.363,-0.6658 -0.862,-1.1026 -1.111,-0.9477 -0.25,0.1545 -0.34,-0.1725 -0.193,-0.7325 0.172,-0.6593 -0.11,-1.2267 -0.791,-1.5939 -0.882,-0.4752 -1.207,-0.3123 -2.01,0.9046 -0.526,0.798 -1.084,2.5191 -1.24,3.8343 -0.182,1.5155 -0.453,2.1518 -0.727,1.7233 -0.236,-0.372 -0.341,-1.3355 -0.256,-2.1326 0.08,-0.7974 0,-1.6648 -0.193,-1.9602 -0.462,-0.7489 0.717,-2.2562 1.967,-2.4987 3,-0.5819 -1.653,-2.5961 -5.175,-2.2402 -1.958,0.1979 -2.061,0.1635 -0.897,-0.3447 0.724,-0.3164 1.824,-1.0362 2.437,-1.6155 0.517,-0.4912 0.865,-0.745 1.262,-0.7754 z m 180.3,3.188 c 0.201,-0.011 0.403,-0.011 0.62,0 2.719,2.1859 -5.277,4.1789 0.129,7.9485 0.338,2.6855 4.311,0.4711 0.704,3.468 6.304,8.4154 -9.241,6.4269 -3.784,-1.3786 -3.198,-3.6932 -3.949,-9.7942 2.331,-10.0379 z m -170.121,0.4953 c 0.226,-0.036 0.45,0.05 0.576,0.2585 0.171,0.277 0.102,0.6473 -0.171,0.8186 -0.272,0.171 -0.642,0.105 -0.813,-0.1723 -0.169,-0.2767 -0.08,-0.6475 0.193,-0.8186 0.07,-0.044 0.139,-0.072 0.215,-0.086 z m 181.347,0.8617 c 2.226,5.3894 -5.411,3.5285 0,0 z m -176.837,3.2741 c 0.07,-0.01 0.09,-0.01 0.128,0 0.111,0.019 0.153,0.097 0.108,0.2155 -0.158,0.4107 -1.062,0.9368 -2.031,1.2063 -0.967,0.2694 -2.582,1.1363 -3.571,1.8956 -0.987,0.759 -2.106,1.3785 -2.481,1.3785 -1.019,0 1.431,-1.7088 5.11,-3.5758 1.36,-0.6889 2.306,-1.0713 2.737,-1.1201 z m 269.296,88.2518 c -0.125,0.033 -0.117,0.1237 -0.02,0.3016 0.189,0.3109 -0.253,0.9816 -0.985,1.4648 -0.731,0.4833 -1.229,1.0652 -1.09,1.2924 0.141,0.2271 -0.103,0.713 -0.534,1.077 -0.573,0.4792 -0.64,0.8442 -0.234,1.3355 0.306,0.3736 0.381,0.8038 0.149,0.9479 -0.839,0.5204 -4.051,-0.059 -4.342,-0.7756 -0.412,-1.0273 -1.624,-1.1506 -1.624,-0.1723 0,0.4447 -0.579,1.0561 -1.283,1.3787 -0.723,0.332 -1.157,0.871 -1.005,1.2708 0.146,0.3883 0.106,1.0067 -0.107,1.3571 -0.283,0.4604 -0.596,0.3843 -1.112,-0.323 -0.685,-0.9452 -0.709,-0.9545 -0.769,0.043 -0.03,0.5673 -0.03,1.3144 0.02,1.6587 0.08,0.6569 -3.119,3.3603 -3.978,3.3603 -0.518,0 -2.949,1.2263 -5.881,2.9726 -1.927,1.149 -2.269,2.951 -0.855,4.5235 0.517,0.5779 0.736,1.3405 0.513,1.9172 -0.342,0.8965 -0.423,0.8881 -1.132,-0.086 -0.436,-0.5962 -0.75,-0.7398 -0.75,-0.3446 0,0.376 0.505,1.3988 1.113,2.2618 1.232,1.7422 2.808,8.4347 2.437,10.3825 -0.184,0.965 0.09,1.4362 1.262,2.0463 1.422,0.7402 1.648,0.6984 3.486,-0.56 1.096,-0.7497 2.709,-1.3357 3.656,-1.3357 1.078,0 2.219,-0.4691 3.122,-1.3138 0.783,-0.7307 2.043,-1.3356 2.779,-1.3356 0.734,0 2.039,-0.2527 2.93,-0.56 2.439,-0.8397 6.543,0.8118 7.655,3.0803 0.457,0.9378 0.97,1.695 1.133,1.7017 0.165,0.011 0.692,-0.8515 1.198,-1.9172 0.676,-1.4292 1.062,-1.7957 1.497,-1.357 0.435,0.4387 0.443,0.9728 -0.02,1.9817 -0.811,1.7919 -0.776,2.1146 0.128,1.3571 0.544,-0.4539 0.847,-0.4545 1.111,-0.021 0.2,0.3261 0.227,0.7161 0.06,0.8832 -0.166,0.1674 0.287,1.0156 1.005,1.8741 0.717,0.8586 1.304,1.8972 1.304,2.3049 0,1.158 3.249,1.8344 4.319,0.9046 0.776,-0.6719 0.992,-0.6323 1.84,0.3017 1.246,1.3668 1.172,1.3664 2.374,-0.1724 0.603,-0.7732 1.47,-1.2561 2.116,-1.1848 0.756,0.083 1.15,-0.2194 1.24,-0.9477 0.17,-1.3406 1.129,-4.1458 2.374,-6.8931 1.243,-2.7425 2.574,-13.6949 1.626,-13.4198 -0.5,0.1452 -3.23,-1.8038 -3.23,-2.3047 0,-0.2436 -0.585,-1.0702 -1.305,-1.8525 -0.719,-0.7828 -1.191,-1.6394 -1.048,-1.8741 0.145,-0.2342 -0.221,-0.5655 -0.811,-0.7539 -1.45,-0.4633 -3.165,-4.0164 -3.165,-6.5483 0,-1.3696 -0.347,-2.3528 -1.026,-2.9726 -0.565,-0.5142 -1.194,-1.7086 -1.39,-2.628 -0.197,-0.9195 -0.478,-1.8779 -0.642,-2.1541 -0.396,-0.674 -1.601,2.7415 -1.668,4.7389 -0.06,1.6074 -1.814,6.1176 -2.395,6.1176 -0.172,0 -1.628,-0.9622 -3.228,-2.154 -2.722,-2.0249 -2.894,-2.2803 -2.566,-3.8557 0.193,-0.9269 0.574,-1.9198 0.834,-2.1973 0.626,-0.6683 0.594,-2.0493 -0.04,-1.6586 -0.27,0.1682 -0.599,0.084 -0.771,-0.1938 -0.171,-0.2784 -0.739,-0.484 -1.24,-0.4524 -0.502,0.032 -1.47,-0.1172 -2.159,-0.3447 -0.407,-0.1344 -0.701,-0.1916 -0.856,-0.1723 l -0.02,0 z m -346.959,14.4108 c -0.06,-0.011 -0.114,0.019 -0.17,0.021 -0.08,0.014 -0.144,0.022 -0.214,0.065 -0.122,0.076 -0.194,0.1943 -0.235,0.323 l 0,0.3878 c 0.02,0.037 0.02,0.073 0.04,0.1076 0.168,0.277 0.536,0.3651 0.812,0.1939 0.273,-0.1709 0.337,-0.5417 0.171,-0.8186 -0.101,-0.1557 -0.243,-0.2588 -0.407,-0.2799 z m 2.995,3.2095 c -0.08,0.012 -0.146,0.045 -0.215,0.086 -0.276,0.1711 -0.359,0.5201 -0.191,0.797 0.171,0.2769 0.537,0.3649 0.812,0.1939 0.273,-0.1713 0.342,-0.5417 0.171,-0.8186 -0.129,-0.2075 -0.35,-0.2934 -0.577,-0.2584 z m 7.548,2.1109 c -0.06,-0.01 -0.09,0.013 -0.15,0.021 -0.08,0.014 -0.167,0.045 -0.235,0.086 -0.278,0.1713 -0.364,0.5202 -0.192,0.797 0.169,0.2768 0.538,0.3651 0.811,0.1937 0.278,-0.1711 0.364,-0.5415 0.194,-0.8184 -0.09,-0.1556 -0.261,-0.261 -0.428,-0.28 z m 4.575,1.077 c -0.08,0.013 -0.146,0.045 -0.213,0.086 -0.278,0.1712 -0.34,0.5201 -0.171,0.797 0.171,0.2767 0.516,0.365 0.792,0.1939 0.272,-0.1712 0.362,-0.5419 0.191,-0.8185 -0.127,-0.2078 -0.373,-0.2935 -0.599,-0.2586 z m 337.764,18.051 c -0.06,-0.011 -0.113,0.02 -0.171,0.022 -0.08,0.013 -0.144,0.022 -0.214,0.064 -0.276,0.1711 -0.363,0.5418 -0.192,0.8185 0.169,0.277 0.539,0.3648 0.812,0.1938 0.276,-0.1711 0.34,-0.5416 0.171,-0.8184 -0.1,-0.1558 -0.24,-0.2589 -0.406,-0.2801 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<rect
style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="rect18941"
@@ -1101,7 +1113,8 @@
id="path18943"
d="m -10709.312,6469.5727 c -42.542,1.0077 -87.338,9.1813 -121,37.0312 -19.772,16.7999 -32.035,45.5339 -23.593,71.125 4.561,12.0928 17.685,18.746 30.187,19.3438 25.668,3.1687 51.732,0.3132 77.563,1.2468 50.428,-0.4191 100.933,0.7611 151.312,-0.9344 13.632,-2.288 24.417,-14.9208 24.813,-28.625 3.532,-23.5966 -9.446,-46.08 -27.375,-60.5624 -30.489,-26.7235 -71.672,-39.8232 -111.907,-38.625 z m 375.282,-0.063 c -44.591,1.4042 -89.967,20.3043 -117.844,55.75 -12.475,17.2401 -16.757,42.2912 -5.062,60.9688 9.248,12.7518 26.088,12.1622 40.187,12.0938 68.48,-0.9896 137.008,1.4051 205.469,-0.7813 13.692,-1.0746 29.823,-7.9398 32.687,-22.9687 7.677,-28.5407 -8.823,-58.371 -32.469,-74.1563 -35.357,-24.9816 -80.553,-30.8663 -122.968,-30.9063 z"
style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter7804)"
- transform="matrix(0.70059678,0,0,0.70576536,-8323.3149,1768.4725)" />
+ transform="matrix(0.70059678,0,0,0.70576536,-8323.3149,1768.4725)"
+ inkscape:connector-curvature="0" />
<path
transform="matrix(0.67375101,0,0,0.63282235,-9915.7151,1343.0013)"
d="m -8482.1193,8040.1943 c 0,19.8554 -130.3773,35.9514 -291.2059,35.9514 -160.8286,0 -291.2059,-16.096 -291.2059,-35.9514 0,-19.8553 130.3773,-35.9513 291.2059,-35.9513 160.8286,0 291.2059,16.096 291.2059,35.9513 z"
@@ -1128,16 +1141,19 @@
<path
d="m -8498.8531,7266.8057 c 21.0124,0 26.4152,-14.5185 24.7806,-30.8017 -2.6484,-26.3763 -42.1317,-52.8965 -82.1412,-52.8965 -60.8431,0 -95.3297,26.1257 -95.3297,57.7086 0,23.374 16.7547,26.1257 35.6481,26.1257 27.9997,0 72.3416,-0.1361 117.0422,-0.1361 z"
id="path18951"
- style="fill:#c28f00;fill-opacity:1;stroke:#c28f00;stroke-width:1.31368029px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#c28f00;fill-opacity:1;stroke:#c28f00;stroke-width:1.31368029px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
<path
d="m -9230.2786,5905.805 c -21.611,0.4586 -46.25,4.5895 -60,23.0625 -4.813,7.2653 -7.813,19.8454 0.344,25.875 11.653,5.5298 25.024,1.57 37.5,2.7596 24.776,-0.3654 49.758,1.1058 74.4061,-0.9783 9.2946,-4.7332 7.6562,-18.6088 2.3125,-25.7813 -11.9156,-17.0176 -34.3396,-25.1542 -54.5626,-24.9375 z"
id="path18953"
style="fill:#ecd000;fill-opacity:1;stroke:none;filter:url(#filter10358)"
- transform="matrix(1.3136803,0,0,1.3136803,3566.7902,-567.3186)" />
+ transform="matrix(1.3136803,0,0,1.3136803,3566.7902,-567.3186)"
+ inkscape:connector-curvature="0" />
<path
d="m -8490.5743,7230.7189 a 51.39775,36.618844 0 0 1 -102.7955,0 51.39775,36.618844 0 1 1 102.7955,0 z"
id="path18955"
- style="color:#000000;fill:url(#linearGradient19882);fill-opacity:1;stroke:none;stroke-width:2.05566597;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19882);fill-opacity:1;stroke:none;stroke-width:2.05566597;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(-1.1778525,0,0,1.186542,-25641.212,-2179.7748)"
@@ -1145,151 +1161,185 @@
<path
style="fill:#c28f00;fill-opacity:1;stroke:#c28f00;stroke-width:1.31368029px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="path18959"
- d="m -8498.8531,7266.8057 c 21.0124,0 26.4152,-14.5185 24.7806,-30.8017 -2.6484,-26.3763 -42.1317,-52.8965 -82.1412,-52.8965 -60.8431,0 -95.3297,26.1257 -95.3297,57.7086 0,23.374 16.7547,26.1257 35.6481,26.1257 27.9997,0 72.3416,-0.1361 117.0422,-0.1361 z" />
+ d="m -8498.8531,7266.8057 c 21.0124,0 26.4152,-14.5185 24.7806,-30.8017 -2.6484,-26.3763 -42.1317,-52.8965 -82.1412,-52.8965 -60.8431,0 -95.3297,26.1257 -95.3297,57.7086 0,23.374 16.7547,26.1257 35.6481,26.1257 27.9997,0 72.3416,-0.1361 117.0422,-0.1361 z"
+ inkscape:connector-curvature="0" />
<path
transform="matrix(1.3136803,0,0,1.3136803,3566.7902,-567.3186)"
style="fill:#ecd000;fill-opacity:1;stroke:none;filter:url(#filter10358)"
id="path18961"
- d="m -9230.2786,5905.805 c -21.611,0.4586 -46.25,4.5895 -60,23.0625 -4.813,7.2653 -7.813,19.8454 0.344,25.875 11.653,5.5298 25.024,1.57 37.5,2.7596 24.776,-0.3654 49.758,1.1058 74.4061,-0.9783 9.2946,-4.7332 7.6562,-18.6088 2.3125,-25.7813 -11.9156,-17.0176 -34.3396,-25.1542 -54.5626,-24.9375 z" />
+ d="m -9230.2786,5905.805 c -21.611,0.4586 -46.25,4.5895 -60,23.0625 -4.813,7.2653 -7.813,19.8454 0.344,25.875 11.653,5.5298 25.024,1.57 37.5,2.7596 24.776,-0.3654 49.758,1.1058 74.4061,-0.9783 9.2946,-4.7332 7.6562,-18.6088 2.3125,-25.7813 -11.9156,-17.0176 -34.3396,-25.1542 -54.5626,-24.9375 z"
+ inkscape:connector-curvature="0" />
<path
style="color:#000000;fill:url(#linearGradient19884);fill-opacity:1;stroke:none;stroke-width:2.05566597;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path18963"
- d="m -8490.5743,7230.7189 a 51.39775,36.618844 0 0 1 -102.7955,0 51.39775,36.618844 0 1 1 102.7955,0 z" />
+ d="m -8490.5743,7230.7189 a 51.39775,36.618844 0 0 1 -102.7955,0 51.39775,36.618844 0 1 1 102.7955,0 z"
+ inkscape:connector-curvature="0" />
</g>
<path
d="m -15424.607,6231.787 c 5.743,-0.4822 30.393,-1.4325 56.897,14.0621 30.292,17.708 37.328,14.9527 37.328,14.9527 l 4.252,7.4377 c -22.6,-2.2877 -53.311,-23.3669 -75.248,-27.5996 -7.414,-1.4305 -15.162,-1.0609 -22.459,0.174 l -1.991,-8.905 c 0,0 0.399,-0.053 1.221,-0.1219 z"
id="path18965"
- style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
id="path18967"
d="m -15452.591,6165.7033 c 34.173,7.6069 67.054,21.9243 94.812,43.624 15.394,13.1547 31.05,26.2747 42.531,43.2215 3.024,5.4324 7.953,11.8556 5.939,18.3242 -41.473,-37.6863 -91.515,-64.9136 -143.282,-85.8797 l 0,-19.29 z"
- style="fill:url(#linearGradient19886);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19886);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
style="fill:#4c4c4c;fill-opacity:1;stroke:none"
id="path18969"
- d="m -15949.965,6231.787 c -5.743,-0.4822 -30.393,-1.4325 -56.897,14.0621 -30.292,17.708 -37.328,14.9527 -37.328,14.9527 l -4.252,7.4377 c 22.599,-2.2877 53.31,-23.3669 75.247,-27.5996 7.415,-1.4305 15.163,-1.0609 22.459,0.174 l 1.992,-8.905 c 0,0 -0.4,-0.053 -1.221,-0.1219 z" />
+ d="m -15949.965,6231.787 c -5.743,-0.4822 -30.393,-1.4325 -56.897,14.0621 -30.292,17.708 -37.328,14.9527 -37.328,14.9527 l -4.252,7.4377 c 22.599,-2.2877 53.31,-23.3669 75.247,-27.5996 7.415,-1.4305 15.163,-1.0609 22.459,0.174 l 1.992,-8.905 c 0,0 -0.4,-0.053 -1.221,-0.1219 z"
+ inkscape:connector-curvature="0" />
<path
transform="matrix(1.5174057,0,0,1.5286002,-1572.9387,-4584.9209)"
style="color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12102);enable-background:accumulate"
id="path18971"
- d="m -9382.9769,6994.5019 c 3.863,15.2823 13.555,28.897 28.437,33.9375 4.887,1.7177 9.87,2.0482 14.688,1.3125 1.405,1.7654 2.916,3.3897 4.187,4.7812 7.826,7.9768 13.863,18.1647 23.031,24.5938 6.386,2.9946 13.205,-0.8042 16.875,-6.125 7.676,-9.636 17.214,-18.0334 23.657,-28.5 1.009,-1.7572 1.286,-3.5704 1.062,-5.3125 3.503,0.2916 7.036,0.1156 10.5,-0.5625 13.596,-1.7778 25.786,-11.5621 30.813,-24.125 l -75.844,0 c 1.065,2.7549 2.486,5.3358 4.187,7.7187 -2.226,-0.2708 -4.471,-0.3928 -6.718,-0.375 0.946,-2.3761 1.719,-4.8384 2.343,-7.3437 l -77.218,0 z" />
+ d="m -9382.9769,6994.5019 c 3.863,15.2823 13.555,28.897 28.437,33.9375 4.887,1.7177 9.87,2.0482 14.688,1.3125 1.405,1.7654 2.916,3.3897 4.187,4.7812 7.826,7.9768 13.863,18.1647 23.031,24.5938 6.386,2.9946 13.205,-0.8042 16.875,-6.125 7.676,-9.636 17.214,-18.0334 23.657,-28.5 1.009,-1.7572 1.286,-3.5704 1.062,-5.3125 3.503,0.2916 7.036,0.1156 10.5,-0.5625 13.596,-1.7778 25.786,-11.5621 30.813,-24.125 l -75.844,0 c 1.065,2.7549 2.486,5.3358 4.187,7.7187 -2.226,-0.2708 -4.471,-0.3928 -6.718,-0.375 0.946,-2.3761 1.719,-4.8384 2.343,-7.3437 l -77.218,0 z"
+ inkscape:connector-curvature="0" />
<path
style="color:#000000;fill:url(#linearGradient19888);fill-opacity:1;stroke:none;stroke-width:1.14415216;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path18973"
- d="m -15573.05,6023.8578 a 114.77613,99.564144 0 0 1 -229.551,0 114.77613,99.564144 0 1 1 229.551,0 z" />
+ d="m -15573.05,6023.8578 a 114.77613,99.564144 0 0 1 -229.551,0 114.77613,99.564144 0 1 1 229.551,0 z"
+ inkscape:connector-curvature="0" />
<g
id="g18975"
transform="translate(0,-18.572963)">
<path
d="m -15741.76,6007.8597 c -0.705,0 -1.42,0.014 -2.126,0.045 a 9.2113512,9.279307 0 0 0 -0.05,0 c -38.727,1.8494 -64.852,36.5482 -68.767,70.2569 0,0.045 0,0.09 0,0.1345 -0.02,0.06 -0.05,0.1179 -0.05,0.1784 l 0.05,0 c -1.672,12.0491 -0.858,24.698 2.346,36.7566 l 16.782,0 c -1.819,-6.936 -2.833,-14.3633 -2.833,-22.0806 0,-38.3945 24.421,-69.4987 54.51,-69.4987 22.497,0 41.768,17.4143 50.083,42.2435 0.03,0.076 0.07,0.1465 0.09,0.2229 0.06,0.1511 0.125,0.2948 0.177,0.4461 -0.02,0.016 -0.03,0.027 -0.05,0.046 2.657,8.1888 4.162,17.1268 4.162,26.5416 0,7.7172 -1.013,15.1445 -2.833,22.0807 l 6.509,0 c -2.371,-5.6568 -3.676,-11.8097 -3.676,-18.2445 0,-27.8084 24.275,-50.362 54.246,-50.362 15.371,0 29.269,5.9497 39.143,15.4788 5.569,4.5702 10.174,10.2316 13.196,16.7726 a 9.2113512,9.279307 0 0 0 0.177,0.3569 c 5.725,11.1527 5.014,24.3482 0.09,35.9982 l 20.058,0 c 4.186,-14.2938 3.571,-29.9091 -3.63,-44.1616 -0.06,-0.115 -0.07,-0.2419 -0.125,-0.3568 l -0.05,0.045 c -12.589,-26.8533 -41.689,-41.7236 -70.142,-39.7007 l 0,-0.045 c -0.1,0 -0.204,0.041 -0.31,0.045 -16.332,0.7504 -31.76,7.9241 -43.528,18.9135 -7.055,-14.179 -18.059,-26.4641 -33.033,-34.7047 a 9.2113512,9.279307 0 0 0 -0.177,-0.045 c -9.248,-4.8714 -19.678,-7.4525 -30.244,-7.3602 z"
id="path18977"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:13;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:AlArabiya;-inkscape-font-specification:AlArabiya" />
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:13;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:AlArabiya;-inkscape-font-specification:AlArabiya"
+ inkscape:connector-curvature="0" />
<path
d="m -15578.894,6096.9961 a 54.2675,50.352238 0 0 1 -108.535,0 54.2675,50.352238 0 1 1 108.535,0 z"
id="path18979"
- style="color:#000000;fill:#838383;fill-opacity:1;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#838383;fill-opacity:1;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15581.508,6112.4647 c -11.792,9.4368 -31.046,15.6126 -52.827,15.6126 -19.854,0 -37.63,-5.1073 -49.551,-13.1593 7.791,18.953 27.541,32.4296 50.703,32.4296 24.154,0 44.641,-14.6444 51.675,-34.8829 z"
id="path18981"
- style="color:#000000;fill:url(#radialGradient19890);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#radialGradient19890);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="M 230.5625,89.15625 C 209.8308,88.739692 191.20134,112.31236 200.59375,132 c 9.83037,23.32855 46.5842,26.90158 60.65625,5.78125 9.87539,-13.04031 6.23537,-33.71256 -7.875,-42.25 -6.64233,-4.600103 -14.80406,-6.737157 -22.8125,-6.375 z"
transform="matrix(1.3791254,-0.32777949,0.29049116,1.2403359,-15988.904,6017.1495)"
id="path18983"
- style="color:#000000;fill:#d7d7d7;fill-opacity:1;stroke:#838383;stroke-width:2.1166954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11252);enable-background:accumulate" />
+ style="color:#000000;fill:#d7d7d7;fill-opacity:1;stroke:#838383;stroke-width:2.1166954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11252);enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15656.997,6100.8024 a 13.527192,21.134448 0 0 1 -27.054,0 13.527192,21.134448 0 1 1 27.054,0 z"
id="path18985"
- style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15687.432,6093.1694 a 54.481819,69.519419 0 0 1 -108.963,0 54.481819,69.519419 0 1 1 108.963,0 z"
id="path18987"
- style="color:#000000;fill:#bababa;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#bababa;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -9344.8839,6940.6894 c -16.572,1.2878 -26.662,18.2484 -27.75,33.5 -2.085,17.8273 6.525,39.6722 25.625,43.625 16.197,1.4815 28.45,-14.6436 30.344,-29.5 3.554,-17.9245 -3.761,-40.3792 -22.25,-46.9375 -1.943,-0.5059 -3.954,-0.8119 -5.969,-0.6875 z"
id="path18989"
style="color:#000000;fill:#d7d7d7;fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11182);enable-background:accumulate"
- transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)" />
+ transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)"
+ inkscape:connector-curvature="0" />
<path
d="m -15741.892,6023.6508 c -15.231,0 -27.615,5.9568 -37.503,18.8131 2.005,-0.2506 4.056,-0.4015 6.111,-0.4015 41.76,0 59.466,36.3133 59.466,78.6101 0,13.3439 -2.67,25.8767 -7.44,36.8011 19.838,-10.3896 33.83,-35.2674 33.83,-64.3242 0,-38.3944 -24.377,-69.4986 -54.464,-69.4986 z"
id="path18991"
- style="color:#000000;fill:url(#linearGradient19892);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19892);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15777.316,6040.3788 c -11.666,12.7503 -19.087,31.6336 -19.087,52.7706 0,38.3945 24.422,69.5433 54.511,69.5433 18.715,0 35.225,-12.0338 45.033,-30.3779 -7.828,7.1375 -16.815,11.1968 -26.393,11.1968 -30.191,0 -54.686,-40.3745 -54.686,-90.1967 0,-4.3939 0.252,-8.7102 0.622,-12.9361 z"
id="path18993"
- style="color:#000000;fill:url(#radialGradient19894);fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#radialGradient19894);fill-opacity:1;stroke:none;stroke-width:1.96890533;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15692.568,6099.9823 a 14.027546,23.846116 0 0 1 -28.054,0 14.027546,23.846116 0 1 1 28.054,0 z"
id="path18995"
- style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#000000;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15740.567,6010.7186 c -29.39,0 -56.762,22.4467 -65.161,50.2688 l 0.08,0 c 9.193,-21.8845 34.135,-41.2555 62.127,-41.2555 27.993,0 53.813,19.371 63.004,41.2555 l 0.1,0 c -8.401,-27.8221 -30.762,-50.2688 -60.155,-50.2688 z"
id="path18997"
- style="color:#000000;fill:url(#linearGradient19896);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19896);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15628.761,6034.8121 c -21.591,0 -40.473,8.6897 -50.701,21.6345 12.251,-7.3322 27.712,-13.9658 45.803,-13.9658 26.71,0 50.842,11.9125 62.153,26.1883 -6.082,-19.4034 -29.404,-33.857 -57.255,-33.857 z"
id="path18999"
- style="color:#000000;fill:url(#linearGradient19898);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19898);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15687.432,6093.1694 a 54.481819,69.519419 0 0 1 -108.963,0 54.481819,69.519419 0 1 1 108.963,0 z"
id="path19001"
- style="color:#000000;fill:none;stroke:#878787;stroke-width:2.84441304;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#878787;stroke-width:2.84441304;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15633.183,6046.6239 c -10.717,0 -20.679,2.9207 -29.093,7.8953 31.034,1.1415 55.837,25.3231 55.837,55.0459 0,13.9973 -5.509,26.7657 -14.567,36.4888 24.112,-5.1248 42.112,-25.1411 42.112,-49.0682 0,-27.8085 -24.318,-50.3618 -54.289,-50.3618 z"
id="path19003"
- style="color:#000000;fill:url(#linearGradient19900);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19900);fill-opacity:1;stroke:none;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15711.561,6077.7153 c -5.291,3.4128 -9.076,12.0674 -9.076,22.2592 0,13.1697 6.288,23.865 14.036,23.865 3.214,0 6.181,-1.8622 8.546,-4.9515 -0.744,0.1548 -1.487,0.2677 -2.26,0.2677 -8.948,0 -16.206,-10.7845 -16.206,-24.0879 0,-6.8159 1.901,-12.9707 4.96,-17.3525 z"
id="path19005"
- style="color:#000000;fill:url(#linearGradient19902);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19902);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15578.894,6096.9961 a 54.2675,50.352238 0 0 1 -108.535,0 54.2675,50.352238 0 1 1 108.535,0 z"
id="path19007"
- style="color:#000000;fill:none;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#838383;stroke-width:2.84441352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15677.863,6083.0681 c -3.723,3.7651 -6.199,10.3102 -6.199,17.7539 0,11.6716 6.081,21.0993 13.55,21.0993 3.22,0 6.179,-1.7468 8.501,-4.6837 -0.851,0.1868 -1.719,0.3123 -2.612,0.3123 -8.951,0 -16.209,-9.7859 -16.209,-21.8577 0,-4.7037 1.094,-9.0582 2.969,-12.6241 z"
id="path19009"
- style="color:#000000;fill:url(#linearGradient19904);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:url(#linearGradient19904);fill-opacity:1;stroke:#000000;stroke-width:2.84441304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
<path
d="m -15706.601,6076.154 c -2.073,0 -4.029,0.7694 -5.801,2.1412 6.853,9.645 6.643,16.1479 6.643,16.1479 l 11.868,-4.5055 c -2.232,-8.1463 -7.076,-13.7836 -12.71,-13.7836 z"
id="path19011"
- style="fill:url(#linearGradient19906);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19906);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15670.512,6079.6779 c -2.214,0 -3.426,0.3991 -5.271,1.8735 5.552,7.0495 5.316,15.1221 5.316,15.1221 l 12.132,-4.9516 c -2.176,-7.1197 -6.792,-12.044 -12.177,-12.044 z"
id="path19013"
- style="fill:url(#linearGradient19908);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19908);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15691.147,6128.2557 c -21.918,0 -45.744,13.4945 -47.513,19.9394 -1.628,5.9302 2.659,11.7854 4.649,14.2299 2.006,2.4674 30.464,35.7131 33.343,38.3627 2.881,2.6494 5.05,4.8175 10.059,4.8175 2.296,0 -0.815,0 1.474,0 5.009,0 7.109,-2.1681 9.987,-4.8175 2.882,-2.6496 31.294,-35.8953 33.3,-38.3627 1.989,-2.4445 6.322,-8.2997 4.693,-14.2299 -1.768,-6.4449 -25.595,-19.9394 -47.511,-19.9394 l -2.481,0 z"
id="path19015"
- style="fill:url(#linearGradient19910);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19910);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -9309.7269,7007.9081 c -10.072,1.0206 -21.939,3.5909 -28.469,11.7813 1.071,6.9256 8.092,10.7687 11.805,16.2015 6.015,6.0007 10.155,14.7869 18.132,18.2047 6.978,-0.2354 9.579,-8.3993 14.282,-12.2812 5.246,-7.4945 14.344,-13.1743 16.875,-22.1875 -1.914,-4.6916 -8.203,-5.6101 -12.125,-8.0625 -6.546,-2.5805 -13.396,-4.0088 -20.5,-3.6563 z"
id="path19017"
style="fill:none;stroke:none;filter:url(#filter10487)"
- transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)" />
+ transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)"
+ inkscape:connector-curvature="0" />
<path
d="m -9308.3209,7009.8769 c -9.706,0.823 -21.168,2.7052 -27.656,10.5625 2.806,7.2492 10.013,11.5276 14.375,17.8125 4.285,4.9168 7.767,11.614 14.187,13.75 6.288,-2.1033 8.862,-9.2677 13.438,-13.5313 4.856,-6.189 12.599,-11.2224 14.562,-18.9375 -4.08,-4.2952 -10.91,-5.9918 -16.562,-8.0937 -4.008,-1.1109 -8.184,-1.6444 -12.344,-1.5625 z"
id="path19019"
style="fill:#ecd000;fill-opacity:1;stroke:none;filter:url(#filter10857)"
- transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)" />
+ transform="matrix(1.4169893,0,0,1.427443,-2501.0468,-3869.3789)"
+ inkscape:connector-curvature="0" />
<path
d="m -15691.147,6128.2557 c -12.888,0 -26.398,4.6587 -35.736,9.8137 41.358,8.8433 58.809,18.4876 70.895,36.2212 5.044,-5.8893 9.428,-10.9894 10.14,-11.8656 1.989,-2.4445 6.322,-8.2997 4.693,-14.2299 -1.768,-6.4449 -25.595,-19.9394 -47.511,-19.9394 l -2.481,0 z"
id="path19021"
- style="fill:url(#linearGradient19912);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19912);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15733.169,6142.0393 c -3.045,2.2789 -5.03,4.4728 -5.491,6.1558 -1.628,5.9302 2.659,11.7854 4.649,14.2299 2.006,2.4674 30.464,35.7131 33.343,38.3627 2.881,2.6494 5.043,4.8175 10.052,4.8175 l 1.461,0 c 5.01,0 7.129,-2.1681 10.007,-4.8175 0.143,-0.1291 0.59,-0.6287 0.842,-0.8924 -5.474,-2.1595 -10.572,-5.2069 -14.791,-9.4565 -4.132,-4.1638 -21.428,-23.5957 -33.077,-35.3295 -3.8,-3.8286 -5.899,-8.4905 -6.995,-13.07 z"
id="path19023"
- style="fill:url(#linearGradient19914);fill-opacity:1;stroke:none" />
+ style="fill:url(#linearGradient19914);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
<path
d="m -15691.147,6128.2557 c -21.918,0 -45.744,13.4945 -47.513,19.9394 -1.628,5.9302 2.659,11.7854 4.649,14.2299 2.006,2.4674 30.464,35.7131 33.343,38.3627 2.881,2.6494 5.05,4.8175 10.059,4.8175 2.296,0 -0.815,0 1.474,0 5.009,0 7.109,-2.1681 9.987,-4.8175 2.882,-2.6496 31.294,-35.8953 33.3,-38.3627 1.989,-2.4445 6.322,-8.2997 4.693,-14.2299 -1.768,-6.4449 -25.595,-19.9394 -47.511,-19.9394 l -2.481,0 z"
id="path19025"
- style="fill:none;stroke:url(#linearGradient19916);stroke-width:4.26661968;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:url(#linearGradient19916);stroke-width:4.26661968;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
</g>
</g>
<path
id="path19027"
d="m -15876.582,5882.4746 c 1.592,9.4468 7.431,17.3368 10.875,26.1158 -0.8,-10.6805 -7.64,-19.688 -8.8,-30.2657 -0.691,1.3834 -1.383,2.7666 -2.075,4.1499 z m 63.68,29.1923 c 2.213,25.3946 25.07,44.8131 22.896,71.049 -0.181,6.273 -1.417,12.4429 -3.256,18.424 11.515,-25.3547 5.396,-54.4655 -5.366,-79.0625 -5.151,-10.6618 -6.008,-22.8903 -2.29,-34.165 -3.994,7.9182 -7.99,15.8364 -11.984,23.7545 z m 19.64,89.473 c -0.237,0.2524 -0.335,1.1748 0,0 z m -150.54,-51.0865 c -6.98,0.34 -16.918,4.4298 -14.704,13.1651 2.927,8.8349 14.731,10.3244 22.753,9.3015 7.18,-1.0033 13.722,-5.6019 15.741,-12.8074 -6.693,-5.4226 -14.954,-10.0338 -23.79,-9.6592 z m 19.962,75.0914 c -11.914,0.8595 -27.861,5.9416 -29.73,19.712 -1.452,15.2387 15.114,24.5678 28.478,25.3286 13.726,1.2919 29.645,-1.6254 38.508,-13.0428 1.008,-5.1689 10.103,-12.1286 3.348,-15.5771 -11.526,-8.9143 -25.494,-17.0601 -40.604,-16.4207 z"
- style="fill:url(#radialGradient19918);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ style="fill:url(#radialGradient19918);fill-opacity:1;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
<g
transform="matrix(1.2588426,0,0,1.2588426,4091.4591,-1477.7431)"
id="g19029">
@@ -1298,16 +1348,19 @@
<path
id="path19033"
d="m -15617.469,5888.8438 c -0.6,-0.01 -0.541,0.6182 -0.593,2.375 -0.604,8.0502 -1.209,16.106 -1.813,24.1562 56.149,15.2688 103.466,65.3655 110.281,123.9375 l 26.188,0 c -0.475,-3.4692 -1.369,-6.9222 -1.5,-10.375 -10.631,-67.15 -65.745,-122.2218 -130.625,-139.5 -0.986,-0.362 -1.577,-0.5896 -1.938,-0.5937 z"
- style="fill:#649ada;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#649ada;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
<path
id="path19035"
d="m -15605.969,5827.7188 c -0.595,0.1567 -0.56,1.0976 -0.625,3.2812 -0.834,11.1181 -1.666,22.2258 -2.5,33.3438 78.652,21.3881 144.769,92.2792 152.688,174.6562 -0.01,0.1081 -0.02,0.2066 -0.03,0.3125 l 36.219,0 c -0.295,-6.0371 -2.208,-12.1303 -2.437,-18.1563 -14.682,-92.7389 -90.803,-168.7624 -180.406,-192.625 -1.589,-0.5832 -2.444,-0.9344 -2.907,-0.8124 z"
- style="fill:#ebcf00;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ style="fill:#ebcf00;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ inkscape:connector-curvature="0" />
</g>
<path
style="fill:url(#radialGradient19920);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m -15602.719,5833.1562 c -0.352,9.376 -2.19,19.3699 -1.625,28.375 72.159,21.245 132.374,82.0679 148.625,156.1876 1.523,5.6571 2.195,12.0716 3,17.6874 9.311,-0.2301 18.694,0 28.031,-0.125 -3.672,-33.5326 -14.533,-66.2074 -32.744,-94.6666 -32.652,-52.2669 -85.841,-91.4918 -145.256,-107.9271 l -0.03,0.4687 z m -12.906,79.2813 c 55.337,16.4015 101.009,65.1195 109.531,122.8437 5.991,-0.1081 12.265,0.3359 18.094,-0.1562 -7.932,-65.2162 -59.36,-120.4547 -121.294,-139.718 -6.58,-4.0699 -5.184,3.6949 -5.697,8.503 -0.211,2.8425 -0.423,5.685 -0.634,8.5275 z"
- id="path19037" />
+ id="path19037"
+ inkscape:connector-curvature="0" />
</g>
</g>
</g>
diff --git a/data/images/Makefile.in b/data/images/Makefile.in
index e1930fd..2e74acf 100644
--- a/data/images/Makefile.in
+++ b/data/images/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -15,6 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -34,29 +78,67 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -304,22 +386,25 @@ clean-libtool:
-rm -rf .libs _libs
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -334,57 +419,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -400,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -417,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -434,6 +465,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -470,13 +516,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -597,22 +640,20 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags 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-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 \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-generic distclean-libtool \
+ distclean-tags 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-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 mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/images/channels/Makefile.in b/data/images/channels/Makefile.in
index c70cc07..1adb460 100644
--- a/data/images/channels/Makefile.in
+++ b/data/images/channels/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,17 +79,34 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/images/channels
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +136,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(channelsdir)"
DATA = $(channels_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -702,8 +764,11 @@ clean-libtool:
-rm -rf .libs _libs
install-channelsDATA: $(channels_DATA)
@$(NORMAL_INSTALL)
- test -z "$(channelsdir)" || $(MKDIR_P) "$(DESTDIR)$(channelsdir)"
@list='$(channels_DATA)'; test -n "$(channelsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(channelsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(channelsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -718,11 +783,11 @@ uninstall-channelsDATA:
@list='$(channels_DATA)'; test -n "$(channelsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(channelsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -861,16 +926,17 @@ uninstall-am: uninstall-channelsDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-channelsDATA 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 \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-channelsDATA
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-channelsDATA 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-channelsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/images/groups/Makefile.in b/data/images/groups/Makefile.in
index 5cf435f..beefc96 100644
--- a/data/images/groups/Makefile.in
+++ b/data/images/groups/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -15,6 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -34,17 +78,35 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/images/groups
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -258,11 +320,11 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -398,15 +460,16 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool 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-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool 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-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/menu/Makefile.in b/data/menu/Makefile.in
index 0765f66..0793c57 100644
--- a/data/menu/Makefile.in
+++ b/data/menu/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,17 +79,34 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/menu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +136,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(desktopdir)"
DATA = $(desktop_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -299,8 +361,11 @@ clean-libtool:
-rm -rf .libs _libs
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -315,11 +380,11 @@ uninstall-desktopDATA:
@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)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -459,16 +524,17 @@ uninstall-am: uninstall-desktopDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-desktopDATA 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 \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-desktopDATA
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-desktopDATA 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-desktopDATA
@INTLTOOL_DESKTOP_RULE@
diff --git a/data/ui/Makefile.in b/data/ui/Makefile.in
index fbba5ad..8da5e7f 100644
--- a/data/ui/Makefile.in
+++ b/data/ui/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,17 +79,34 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/ui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +136,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(freetuxtvuidir)"
DATA = $(freetuxtvui_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -302,8 +364,11 @@ clean-libtool:
-rm -rf .libs _libs
install-freetuxtvuiDATA: $(freetuxtvui_DATA)
@$(NORMAL_INSTALL)
- test -z "$(freetuxtvuidir)" || $(MKDIR_P) "$(DESTDIR)$(freetuxtvuidir)"
@list='$(freetuxtvui_DATA)'; test -n "$(freetuxtvuidir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(freetuxtvuidir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(freetuxtvuidir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -318,11 +383,11 @@ uninstall-freetuxtvuiDATA:
@list='$(freetuxtvui_DATA)'; test -n "$(freetuxtvuidir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(freetuxtvuidir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -461,17 +526,17 @@ uninstall-am: uninstall-freetuxtvuiDATA uninstall-local
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool 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-freetuxtvuiDATA \
- 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 maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-am uninstall-freetuxtvuiDATA \
- uninstall-local
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool 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-freetuxtvuiDATA 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-freetuxtvuiDATA uninstall-local
# Remove ui directory on uninstall
diff --git a/depcomp b/depcomp
index bd0ac08..4ebd5b3 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 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
@@ -28,9 +27,9 @@ scriptversion=2011-12-04.11; # UTC
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,8 +39,8 @@ as side-effects.
Environment variables:
depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ 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.
@@ -57,6 +56,66 @@ EOF
;;
esac
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
+# A tabulation character.
+tab=' '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -80,26 +142,32 @@ if test "$depmode" = hp; then
fi
if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
- # 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'
- depmode=msvisualcpp
+ # 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'
+ 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
+ # 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
+
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
fi
case "$depmode" in
@@ -122,8 +190,7 @@ gcc3)
done
"$@"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -131,13 +198,17 @@ gcc3)
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
@@ -145,33 +216,31 @@ gcc)
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+ # The second -e expression handles DOS-style file names with drive
+ # letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+## 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.
## 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"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -189,8 +258,7 @@ sgi)
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -198,43 +266,41 @@ sgi)
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
-
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
+ # the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
echo >> "$depfile"
-
# The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile"
;;
+xlc)
+ # 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
+ ;;
+
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
@@ -247,9 +313,7 @@ aix)
"$@" -M
fi
stat=$?
-
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
@@ -258,44 +322,100 @@ aix)
do
test -f "$tmpdepfile" && break
done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ aix_post_process_depfile
+ ;;
+
+tcc)
+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+ # FIXME: That version still under development at the moment of writing.
+ # Make that this statement remains true also for stable, released
+ # versions.
+ # It will wrap lines (doesn't matter whether long or short) with a
+ # trailing '\', as in:
+ #
+ # foo.o : \
+ # foo.c \
+ # foo.h \
+ #
+ # It will put a trailing '\' even on the last line, and will use leading
+ # spaces rather than leading tabs (at least since its commit 0394caf7
+ # "Emit spaces for -MD").
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
fi
+ rm -f "$depfile"
+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+ # We have to change lines of the first kind to '$object: \'.
+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+ # And for each line of the second kind, we have to emit a 'dep.h:'
+ # dummy dependency, to avoid the deleted-header problem.
+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\' :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
+ set_dir_from "$object"
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ set_base_from "$source"
+ tmpdepfile=$base.d
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir=$base.d-lock
+ trap "
+ echo '$0: caught signal, cleaning up...' >&2
+ rmdir '$lockdir'
+ exit 1
+ " 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0; do
+ # mkdir is a portable test-and-set.
+ if mkdir "$lockdir" 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rmdir "$lockdir"
+ break
+ else
+ # If the lock is being held by a different process, wait
+ # until the winning process is done or we timeout.
+ while test -d "$lockdir" && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -307,8 +427,8 @@ icc)
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
# Some versions of the HPUX 10.20 sed can't process this invocation
# correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -319,9 +439,8 @@ hp2)
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
@@ -332,8 +451,7 @@ hp2)
"$@" +Maked
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
@@ -343,77 +461,61 @@ hp2)
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add 'dependent.h:' lines.
sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ set_dir_from "$object"
+ set_base_from "$object"
+
+ if test "$libtool" = yes; then
+ # Libtool generates 2 separate objects for the 2 libraries. These
+ # two compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir$base.o.d # libtool 1.5
+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ # Same post-processing that is required for AIX mode.
+ aix_post_process_depfile
+ ;;
msvc7)
if test "$libtool" = yes; then
@@ -424,8 +526,7 @@ msvc7)
"$@" $showIncludes > "$tmpdepfile"
stat=$?
grep -v '^Note: including file: ' "$tmpdepfile"
- if test "$stat" = 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -443,14 +544,15 @@ msvc7)
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
-s/\(.*\)/ \1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
- s/.*/ /
+ s/.*/'"$tab"'/
G
p
}' >> "$depfile"
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
rm -f "$tmpdepfile"
;;
@@ -478,7 +580,7 @@ dashmstdout)
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -498,18 +600,18 @@ dashmstdout)
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
+ # Require at least two characters before searching for ':'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -562,11 +664,12 @@ makedepend)
# 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"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process the last invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed '1,2d' "$tmpdepfile" \
+ | tr ' ' "$nl" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
@@ -583,7 +686,7 @@ cpp)
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -602,10 +705,10 @@ cpp)
esac
done
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E \
+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ | sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -637,23 +740,23 @@ msvisualcpp)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
*)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+ echo "$tab" >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
diff --git a/install-sh b/install-sh
index a9244eb..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call `install-sh -d' without argument.
+ # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
@@ -240,7 +240,7 @@ fi
for src
do
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
@@ -354,7 +354,7 @@ do
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
+ # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 850ee74..8c2471a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -15,6 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -34,29 +78,67 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -304,22 +386,25 @@ clean-libtool:
-rm -rf .libs _libs
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -334,57 +419,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -400,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -417,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -434,6 +465,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -470,13 +516,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -597,22 +640,20 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags 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-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 \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-generic distclean-libtool \
+ distclean-tags 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-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 mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/libdbevolution/Makefile.in b/lib/libdbevolution/Makefile.in
index 5425adb..6a7d153 100644
--- a/lib/libdbevolution/Makefile.in
+++ b/lib/libdbevolution/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -17,6 +16,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +80,13 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = lib/libdbevolution
-DIST_COMMON = $(libdbevolutioninclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp $(libdbevolutioninclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -80,25 +124,73 @@ am__DEPENDENCIES_1 =
libdbevolution_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libdbevolution_la_OBJECTS = db-evolution-instance.lo
libdbevolution_la_OBJECTS = $(am_libdbevolution_la_OBJECTS)
-libdbevolution_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libdbevolution_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libdbevolution_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(libdbevolution_la_LDFLAGS) $(LDFLAGS) \
+ -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libdbevolution_la_SOURCES)
DIST_SOURCES = $(libdbevolution_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(libdbevolutioninclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -331,9 +423,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -341,6 +433,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
@@ -356,14 +450,17 @@ uninstall-libLTLIBRARIES:
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
libdbevolution.la: $(libdbevolution_la_OBJECTS) $(libdbevolution_la_DEPENDENCIES) $(EXTRA_libdbevolution_la_DEPENDENCIES)
- $(libdbevolution_la_LINK) -rpath $(libdir) $(libdbevolution_la_OBJECTS) $(libdbevolution_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libdbevolution_la_LINK) -rpath $(libdir) $(libdbevolution_la_OBJECTS) $(libdbevolution_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -374,25 +471,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/db-evolution-instance.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -401,8 +498,11 @@ clean-libtool:
-rm -rf .libs _libs
install-libdbevolutionincludeHEADERS: $(libdbevolutioninclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libdbevolutionincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdbevolutionincludedir)"
@list='$(libdbevolutioninclude_HEADERS)'; test -n "$(libdbevolutionincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdbevolutionincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdbevolutionincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -418,26 +518,15 @@ uninstall-libdbevolutionincludeHEADERS:
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(libdbevolutionincludedir)'; $(am__uninstall_files_from_dir)
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -449,15 +538,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -466,6 +551,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -611,20 +711,20 @@ uninstall-am: uninstall-libLTLIBRARIES \
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags 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-libLTLIBRARIES install-libdbevolutionincludeHEADERS \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-libLTLIBRARIES \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags 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-libLTLIBRARIES \
+ install-libdbevolutionincludeHEADERS install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-libdbevolutionincludeHEADERS
diff --git a/lib/libvlc-gtk/Makefile.in b/lib/libvlc-gtk/Makefile.in
index c96ac4e..20e226c 100644
--- a/lib/libvlc-gtk/Makefile.in
+++ b/lib/libvlc-gtk/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -17,6 +16,51 @@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +80,13 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = lib/libvlc-gtk
-DIST_COMMON = $(libvlcgtkinclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp $(libvlcgtkinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -81,25 +125,72 @@ libvlc_gtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libvlc_gtk_la_OBJECTS = gtk-libvlc-instance.lo gtk-libvlc-media.lo \
gtk-libvlc-media-player.lo
libvlc_gtk_la_OBJECTS = $(am_libvlc_gtk_la_OBJECTS)
-libvlc_gtk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libvlc_gtk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libvlc_gtk_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libvlc_gtk_la_SOURCES)
DIST_SOURCES = $(libvlc_gtk_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(libvlcgtkinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -342,9 +433,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -352,6 +443,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
@@ -367,14 +460,17 @@ uninstall-libLTLIBRARIES:
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
libvlc-gtk.la: $(libvlc_gtk_la_OBJECTS) $(libvlc_gtk_la_DEPENDENCIES) $(EXTRA_libvlc_gtk_la_DEPENDENCIES)
- $(libvlc_gtk_la_LINK) -rpath $(libdir) $(libvlc_gtk_la_OBJECTS) $(libvlc_gtk_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libvlc_gtk_la_LINK) -rpath $(libdir) $(libvlc_gtk_la_OBJECTS) $(libvlc_gtk_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -387,25 +483,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtk-libvlc-media.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -414,8 +510,11 @@ clean-libtool:
-rm -rf .libs _libs
install-libvlcgtkincludeHEADERS: $(libvlcgtkinclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libvlcgtkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libvlcgtkincludedir)"
@list='$(libvlcgtkinclude_HEADERS)'; test -n "$(libvlcgtkincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libvlcgtkincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libvlcgtkincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -431,26 +530,15 @@ uninstall-libvlcgtkincludeHEADERS:
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(libvlcgtkincludedir)'; $(am__uninstall_files_from_dir)
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -462,15 +550,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -479,6 +563,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -624,20 +723,20 @@ uninstall-am: uninstall-libLTLIBRARIES \
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags 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-libLTLIBRARIES install-libvlcgtkincludeHEADERS \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-libLTLIBRARIES \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags 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-libLTLIBRARIES \
+ install-libvlcgtkincludeHEADERS install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-libvlcgtkincludeHEADERS
diff --git a/lib/libvlc-gtk/gtk-libvlc-instance.c b/lib/libvlc-gtk/gtk-libvlc-instance.c
index e037a4c..9054e0e 100644
--- a/lib/libvlc-gtk/gtk-libvlc-instance.c
+++ b/lib/libvlc-gtk/gtk-libvlc-instance.c
@@ -149,7 +149,7 @@ GtkLibvlcInstance*
gtk_libvlc_instance_new (const gchar* vlc_args[], GLogFunc log_func, GError** error)
{
if(error != NULL){
- g_return_if_fail(*error == NULL);
+ g_return_val_if_fail(*error == NULL, NULL);
}
GError* pError = NULL;
@@ -175,13 +175,16 @@ gtk_libvlc_instance_new (const gchar* vlc_args[], GLogFunc log_func, GError** er
libvlc_exception_init (&_vlcexcep);
#endif // LIBVLC_OLD_VLCEXCEPTION
+ int iVlcArgsCount = 0;
+
if(vlc_args){
szListOptions = g_strjoinv(" ", (gchar**)vlc_args);
+ iVlcArgsCount = g_strv_length((gchar**)vlc_args);
}
if(szListOptions){
g_log(GTK_LIBVLC_LOG_DOMAIN, G_LOG_LEVEL_INFO,
- "Using instance vlc options [%s]\n", szListOptions);
+ "Using instance vlc with %d options [%s]\n", iVlcArgsCount, szListOptions);
g_free(szListOptions);
szListOptions = NULL;
}
@@ -190,20 +193,20 @@ gtk_libvlc_instance_new (const gchar* vlc_args[], GLogFunc log_func, GError** er
if(vlc_args == NULL){
priv->libvlc_instance = libvlc_new(0, NULL, &_vlcexcep);
}else{
- priv->libvlc_instance = libvlc_new(sizeof(vlc_args) / sizeof(vlc_args[0]), (gchar**)vlc_args, &_vlcexcep);
+ priv->libvlc_instance = libvlc_new(iVlcArgsCount, (gchar**)vlc_args, &_vlcexcep);
}
#else
#ifdef LIBVLC_OLD_VLCEXCEPTION
if(vlc_args == NULL){
priv->libvlc_instance = libvlc_new(0, NULL, &_vlcexcep);
}else{
- priv->libvlc_instance = libvlc_new(sizeof(vlc_args) / sizeof(vlc_args[0]), vlc_args, &_vlcexcep);
+ priv->libvlc_instance = libvlc_new(iVlcArgsCount, vlc_args, &_vlcexcep);
}
#else
if(vlc_args == NULL){
priv->libvlc_instance = libvlc_new(0, NULL);
}else{
- priv->libvlc_instance = libvlc_new(sizeof(vlc_args) / sizeof(vlc_args[0]), vlc_args);
+ priv->libvlc_instance = libvlc_new(iVlcArgsCount, vlc_args);
}
#endif // LIBVLC_OLD_VLCEXCEPTION
#endif // LIBVLC_OLD_INSTANCE
@@ -251,9 +254,9 @@ gtk_libvlc_instance_new (const gchar* vlc_args[], GLogFunc log_func, GError** er
LIBVLC_INSTANCE_HANDLE
gtk_libvlc_instance_get_libvlc_instance(GtkLibvlcInstance* pLibvlcInstance, GError** error)
{
- g_return_if_fail(pLibvlcInstance != NULL);
+ g_return_val_if_fail(pLibvlcInstance != NULL, NULL);
if(error != NULL){
- g_return_if_fail(*error == NULL);
+ g_return_val_if_fail(*error == NULL, NULL);
}
LIBVLC_INSTANCE_HANDLE handle;
diff --git a/lib/libvlc-gtk/gtk-libvlc-media-player.c b/lib/libvlc-gtk/gtk-libvlc-media-player.c
index 1a3b586..d8617ae 100644
--- a/lib/libvlc-gtk/gtk-libvlc-media-player.c
+++ b/lib/libvlc-gtk/gtk-libvlc-media-player.c
@@ -708,7 +708,7 @@ gtk_libvlc_media_player_play_media(GtkLibvlcMediaPlayer *self, GtkLibvlcMedia *m
raise_error(self, error, &_vlcexcep);
#else
libvlc_media_t *m;
- m = libvlc_media_new_path (libvlc_instance, media->mrl);
+ m = libvlc_media_new_location (libvlc_instance, media->mrl);
raise_error(self, error, NULL);
if(list_options != NULL){
@@ -771,8 +771,8 @@ gtk_libvlc_media_player_set_current_path(GtkLibvlcMediaPlayer *self, GtkTreePath
static gboolean
idle_play_next_function(gpointer ptrdata){
GtkLibvlcMediaPlayer *self;
- g_return_if_fail(ptrdata != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(ptrdata));
+ g_return_val_if_fail(ptrdata != NULL, FALSE);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(ptrdata), FALSE);
self = GTK_LIBVLC_MEDIA_PLAYER(ptrdata);
@@ -925,8 +925,8 @@ on_buttonpress_event (GtkWidget *widget, GdkEventButton *event, gpointer user_da
GtkWidget *
gtk_libvlc_media_player_new (GtkLibvlcInstance* libvlc_instance, GError** error)
{
- g_return_if_fail(libvlc_instance != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_INSTANCE(libvlc_instance));
+ g_return_val_if_fail(libvlc_instance != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_LIBVLC_INSTANCE(libvlc_instance), NULL);
GtkLibvlcMediaPlayer *self = NULL;
@@ -986,8 +986,8 @@ gtk_libvlc_media_player_add_media (GtkLibvlcMediaPlayer *self, GtkLibvlcMedia *m
GtkLibvlcMedia*
gtk_libvlc_media_player_get_current_media (GtkLibvlcMediaPlayer *self)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), NULL);
GtkLibvlcMediaPlayerPrivate* priv;
priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -998,9 +998,9 @@ gtk_libvlc_media_player_get_current_media (GtkLibvlcMediaPlayer *self)
GtkLibvlcMedia*
gtk_libvlc_media_player_get_media_from_path (GtkLibvlcMediaPlayer *self, GtkTreePath *path)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
- g_return_if_fail(path != NULL);
+ g_return_val_if_fail(self != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), NULL);
+ g_return_val_if_fail(path != NULL, NULL);
// Get the media from the path
GtkLibvlcMedia *media;
@@ -1244,11 +1244,11 @@ gtk_libvlc_media_player_pause (GtkLibvlcMediaPlayer *self, GError **error)
gboolean
gtk_libvlc_media_player_can_pause (GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
- g_return_if_fail(self->libvlc_instance != NULL);
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
+ g_return_val_if_fail(self->libvlc_instance != NULL, FALSE);
if(error != NULL){
- g_return_if_fail(*error == NULL);
+ g_return_val_if_fail(*error == NULL, FALSE);
}
GError* pError = NULL;
@@ -1258,7 +1258,7 @@ gtk_libvlc_media_player_can_pause (GtkLibvlcMediaPlayer *self, GError** error)
// Create the media player if not initialized
gtk_libvlc_media_player_initialize (self, &pError);
- g_return_if_fail(priv->initialized == TRUE);
+ g_return_val_if_fail(priv->initialized == TRUE, FALSE);
#ifdef LIBVLC_OLD_VLCEXCEPTION
libvlc_exception_t _vlcexcep;
@@ -1682,8 +1682,8 @@ gtk_libvlc_media_player_set_fullscreen (GtkLibvlcMediaPlayer *self, gboolean ful
gboolean
gtk_libvlc_media_player_get_fullscreen (GtkLibvlcMediaPlayer *self)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
GtkLibvlcMediaPlayerPrivate* priv;
priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -1737,11 +1737,11 @@ gtk_libvlc_media_player_set_accel_group (GtkLibvlcMediaPlayer *self,
gboolean
gtk_libvlc_media_player_is_playing (GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
- g_return_if_fail(self->libvlc_instance != NULL);
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
+ g_return_val_if_fail(self->libvlc_instance != NULL, FALSE);
if(error != NULL){
- g_return_if_fail(*error == NULL);
+ g_return_val_if_fail(*error == NULL, FALSE);
}
GError* pError = NULL;
@@ -1803,11 +1803,13 @@ gtk_libvlc_media_player_is_playing (GtkLibvlcMediaPlayer *self, GError** error)
GtkLibvlcState
gtk_libvlc_media_player_get_state (GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
- g_return_if_fail(self->libvlc_instance != NULL);
+ GtkLibvlcState gtkstate = GTK_LIBVLC_STATE_NOTHING_SPECIAL;
+
+ g_return_val_if_fail(self != NULL, gtkstate);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), gtkstate);
+ g_return_val_if_fail(self->libvlc_instance != NULL, gtkstate);
if(error != NULL){
- g_return_if_fail(*error == NULL);
+ g_return_val_if_fail(*error == NULL, gtkstate);
}
GError* pError = NULL;
@@ -1819,8 +1821,6 @@ gtk_libvlc_media_player_get_state (GtkLibvlcMediaPlayer *self, GError** error)
gtk_libvlc_media_player_initialize (self, &pError);
g_return_if_fail(priv->initialized == TRUE);
- GtkLibvlcState gtkstate = GTK_LIBVLC_STATE_NOTHING_SPECIAL;
-
if(pError == NULL){
#ifdef LIBVLC_OLD_VLCEXCEPTION
@@ -1832,7 +1832,7 @@ gtk_libvlc_media_player_get_state (GtkLibvlcMediaPlayer *self, GError** error)
libvlc_instance_t *libvlc_instance;
libvlc_instance = (libvlc_instance_t *)
gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, &pError);
- g_return_if_fail(libvlc_instance != NULL);
+ g_return_val_if_fail(libvlc_instance != NULL, gtkstate);
libvlc_input_t *input_t;
if(libvlc_instance != NULL){
@@ -1872,7 +1872,7 @@ gtk_libvlc_media_player_get_state (GtkLibvlcMediaPlayer *self, GError** error)
}
}
#else
- g_return_if_fail(priv->libvlc_mediaplayer != NULL);
+ g_return_val_if_fail(priv->libvlc_mediaplayer != NULL, gtkstate);
libvlc_state_t state;
@@ -1948,13 +1948,14 @@ gtk_libvlc_media_player_state_tostring (GtkLibvlcState state)
case GTK_LIBVLC_STATE_ERROR:
return "GTK_LIBVLC_STATE_ERROR";
}
+ return "";
}
glong
gtk_libvlc_media_player_get_length(GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, 0);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), 0);
GtkLibvlcMediaPlayerPrivate* priv;
priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -1970,7 +1971,7 @@ gtk_libvlc_media_player_get_length(GtkLibvlcMediaPlayer *self, GError** error)
libvlc_instance_t *libvlc_instance;
libvlc_instance = (libvlc_instance_t *)
gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, error);
- g_return_if_fail(libvlc_instance != NULL);
+ g_return_val_if_fail(libvlc_instance != NULL, 0);
libvlc_input_t *input_t;
input_t = libvlc_playlist_get_input(libvlc_instance,
@@ -2006,8 +2007,8 @@ gtk_libvlc_media_player_get_length(GtkLibvlcMediaPlayer *self, GError** error)
glong
gtk_libvlc_media_player_get_time(GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, 0);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), 0);
GtkLibvlcMediaPlayerPrivate* priv;
priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -2023,7 +2024,7 @@ gtk_libvlc_media_player_get_time(GtkLibvlcMediaPlayer *self, GError** error)
libvlc_instance_t *libvlc_instance;
libvlc_instance = (libvlc_instance_t *)
gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, error);
- g_return_if_fail(libvlc_instance != NULL);
+ g_return_val_if_fail(libvlc_instance != NULL, 0);
libvlc_input_t *input_t;
input_t = libvlc_playlist_get_input(libvlc_instance,
@@ -2099,8 +2100,8 @@ gtk_libvlc_media_player_set_time(GtkLibvlcMediaPlayer *self, glong time, GError*
gfloat
gtk_libvlc_media_player_get_position(GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, 0.0);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), 0.0);
GtkLibvlcMediaPlayerPrivate* priv;
priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -2116,7 +2117,7 @@ gtk_libvlc_media_player_get_position(GtkLibvlcMediaPlayer *self, GError** error)
libvlc_instance_t *libvlc_instance;
libvlc_instance = (libvlc_instance_t *)
gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, error);
- g_return_if_fail(libvlc_instance != NULL);
+ g_return_val_if_fail(libvlc_instance != NULL, 0.0);
libvlc_input_t *input_t;
input_t = libvlc_playlist_get_input(libvlc_instance,
@@ -2196,8 +2197,8 @@ gtk_libvlc_media_player_set_position(GtkLibvlcMediaPlayer *self, gfloat position
gboolean
gtk_libvlc_media_player_is_seekable (GtkLibvlcMediaPlayer *self, GError** error)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
GtkLibvlcMediaPlayerPrivate* priv;
priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -2317,7 +2318,7 @@ gtk_libvlc_media_player_set_loop (GtkLibvlcMediaPlayer *self, gboolean b)
GtkLibvlcInstance*
gtk_libvlc_media_player_get_instance (GtkLibvlcMediaPlayer *self)
{
- g_return_if_fail(self != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+ g_return_val_if_fail(self != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), NULL);
return self->libvlc_instance;
}
diff --git a/lib/libvlc-gtk/gtk-libvlc-media.c b/lib/libvlc-gtk/gtk-libvlc-media.c
index b1c232a..6193c49 100644
--- a/lib/libvlc-gtk/gtk-libvlc-media.c
+++ b/lib/libvlc-gtk/gtk-libvlc-media.c
@@ -88,7 +88,7 @@ gtk_libvlc_media_class_init (GtkLibvlcMediaClass *klass)
GtkLibvlcMedia*
gtk_libvlc_media_new (gchar* mrl)
{
- g_return_if_fail(mrl != NULL);
+ g_return_val_if_fail(mrl != NULL, NULL);
GtkLibvlcMedia *self = NULL;
self = g_object_new (GTK_TYPE_LIBVLC_MEDIA, NULL);
@@ -229,8 +229,8 @@ gtk_libvlc_media_add_options (GtkLibvlcMedia* media, gchar** options)
const gchar**
gtk_libvlc_media_get_options (GtkLibvlcMedia* media)
{
- g_return_if_fail(media != NULL);
- g_return_if_fail(GTK_IS_LIBVLC_MEDIA(media));
+ g_return_val_if_fail(media != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA(media), NULL);
GtkLibvlcMediaPrivate* priv;
gchar** options = NULL;
diff --git a/ltmain.sh b/ltmain.sh
index c7d06c3..3825a2a 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1"
+VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1"
TIMESTAMP=""
package_revision=1.3337
diff --git a/missing b/missing
index 86a8fc3..cdea514 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# 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
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake at gnu.org>."
exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake at gnu.org>."
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
;;
-esac
-
-exit 0
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 4191a45..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
-
-nl='
-'
-IFS=" "" $nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake at gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/LINGUAS b/po/LINGUAS
index 6cab4e7..bfd30da 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,7 +1,12 @@
# please keep this list sorted alphabetically
#
de
+es
fr
+lt
+pl
pt
+ru
+tr
zh_CN
zh_TW
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b466048..cf6f8b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,6 +38,8 @@ src/freetuxtv-window-add-recording.c
src/freetuxtv-window-add-recording.h
src/freetuxtv-window-channel-properties.c
src/freetuxtv-window-channel-properties.h
+src/freetuxtv-window-tv-channels-database.c
+src/freetuxtv-window-tv-channels-database.h
src/freetuxtv-window-main.c
src/freetuxtv-window-main.h
src/lib-m3uparser.c
diff --git a/po/de.po b/po/de.po
index c2e2e74..6f611c7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freetuxtv.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
"PO-Revision-Date: 2010-08-09 20:00+0200\n"
"Last-Translator: Benni <bestofbenni@@googlemail.com>\n"
"Language-Team: DE <DE at li.org>\n"
@@ -21,147 +21,127 @@ msgstr ""
#: ../data/ui/addrecording.glade.h:1
#, fuzzy
-msgid "<b>Recording period</b>"
-msgstr "<b>Aufzeichnungszeitraum</b>"
+msgid "Add a recording"
+msgstr "Aufzeichnung hinzufügen"
#: ../data/ui/addrecording.glade.h:2
#, fuzzy
-msgid "Add a recording"
-msgstr "Aufzeichnung hinzufügen"
+msgid "Selected channel:"
+msgstr "Ausgewählter Sender:"
#: ../data/ui/addrecording.glade.h:3
#, fuzzy
-msgid "Duration:"
-msgstr "Dauer:"
+msgid "Title:"
+msgstr "Titel:"
#: ../data/ui/addrecording.glade.h:4
#, fuzzy
-msgid "End time:"
-msgstr "Endzeit:"
+msgid "Start time:"
+msgstr "Startzeit:"
#: ../data/ui/addrecording.glade.h:5
#, fuzzy
-msgid "Selected channel:"
-msgstr "Ausgewählter Sender:"
+msgid "Duration:"
+msgstr "Dauer:"
#: ../data/ui/addrecording.glade.h:6
#, fuzzy
-msgid "Start time:"
-msgstr "Startzeit:"
+msgid "End time:"
+msgstr "Endzeit:"
#: ../data/ui/addrecording.glade.h:7
#, fuzzy
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../data/ui/addrecording.glade.h:8
-#, fuzzy
msgid "minutes"
msgstr "Minuten"
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
+#: ../data/ui/addrecording.glade.h:8
#, fuzzy
-msgid "<b>Processing of channels' name</b>"
-msgstr "<b>Verarbeitung des Sendernamens</b>"
+msgid "<b>Recording period</b>"
+msgstr "<b>Aufzeichnungszeitraum</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Gruppe hinzufügen"
#: ../data/ui/addchannelsgroups.glade.h:2
#, fuzzy
-msgid "<b>Special group type:</b>"
-msgstr "<b>Spezieller Gruppentyp:</b>"
+msgid "Channels groups file:"
+msgstr "Sendergruppendatei: "
#: ../data/ui/addchannelsgroups.glade.h:3
-msgid "Add a group"
-msgstr "Gruppe hinzufügen"
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
#: ../data/ui/addchannelsgroups.glade.h:4
#, fuzzy
-msgid "Channels groups file:"
-msgstr "Sendergruppendatei: "
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Wähle einen oder mehrere Sendergruppen zum hinzufügen aus und klicke auf "
+"Hinzufügen."
#: ../data/ui/addchannelsgroups.glade.h:5
#, fuzzy
-msgid "Custom channels group"
-msgstr "Benutzerdefinierte Sendergruppe"
+msgid "Languages/Channels group"
+msgstr "Sprachen/Sendergruppe"
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
+#: ../data/ui/addchannelsgroups.glade.h:6
#, fuzzy
-msgid "Delete this text before the name:"
-msgstr "Folgendes vor dem Namen löschen:"
+msgid "Required ISP"
+msgstr "Erforderlicher ISP"
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-#, fuzzy
-msgid "Delete this text behind the name:"
-msgstr "Folgendes hinter dem Namen löschen: "
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
msgstr "Bestehende Sendergruppe"
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "Favoriten"
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
#, fuzzy
msgid "Group's name:"
msgstr "Gruppenname:"
-#: ../data/ui/addchannelsgroups.glade.h:11
-#, fuzzy
-msgid "Languages/Channels group"
-msgstr "Sprachen/Sendergruppe"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
msgid "Name of the group which will be added"
msgstr "Name der Gruppe die hinzugefügt wird"
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-#, fuzzy
-msgid "Playlist's URI of the group which will be added"
-msgstr "URI der Wiedergabeliste der Gruppe die hinzugefügt wird"
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
#, fuzzy
msgid "Playlist's URI:"
msgstr "URI der Wiedergabeliste:"
-#: ../data/ui/addchannelsgroups.glade.h:15
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
#, fuzzy
-msgid "Required ISP"
-msgstr "Erforderlicher ISP"
+msgid "Playlist's URI of the group which will be added"
+msgstr "URI der Wiedergabeliste der Gruppe die hinzugefügt wird"
-#: ../data/ui/addchannelsgroups.glade.h:16
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
#, fuzzy
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+msgid "Delete this text before the name:"
+msgstr "Folgendes vor dem Namen löschen:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+#, fuzzy
+msgid "Text or regexp which must be deleted at the end of the channel's name"
msgstr ""
-"Wähle einen oder mehrere Sendergruppen zum hinzufügen aus und klicke auf "
-"Hinzufügen."
+"Text oder regulärer Ausdruck der hinter dem Sendernamen gelöscht werden soll"
-#: ../data/ui/addchannelsgroups.glade.h:17
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
#, fuzzy
-msgid "Special group"
-msgstr "Spezielle Gruppe"
+msgid "Delete this text behind the name:"
+msgstr "Folgendes hinter dem Namen löschen: "
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
#, fuzzy
msgid ""
"Text or regexp which must be deleted at the beginning of the channel's name"
msgstr ""
"Text oder regulärer Ausdruck der vor dem Sendernamen gelöscht werden soll"
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-#, fuzzy
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr ""
-"Text oder regulärer Ausdruck der hinter dem Sendernamen gelöscht werden soll"
-
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
msgid ""
"You can easily use regular expressions to delete some text in the channel's "
"name of the groupe. For example, if in your playlist, you have a name like "
@@ -173,687 +153,1249 @@ msgstr ""
"NT1\" oder \"12 - NRJ 12\" heißt, kann FreetuxTV die Nummer des Senders vor "
"dem Namen entfernen, indem man reguläre Ausdrücke \"[0-9]* - \" nutzt."
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+#, fuzzy
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>Verarbeitung des Sendernamens</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+#, fuzzy
+msgid "Custom channels group"
+msgstr "Benutzerdefinierte Sendergruppe"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Favoriten"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+#, fuzzy
+msgid "<b>Special group type:</b>"
+msgstr "<b>Spezieller Gruppentyp:</b>"
+
#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
-msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+#, fuzzy
+msgid "Special group"
+msgstr "Spezielle Gruppe"
#: ../data/ui/channelproperties.glade.h:1
-msgid "<b>Channel VLC options:</b>"
-msgstr "<b>VLC Senderoptionen:</b>"
-
-#: ../data/ui/channelproperties.glade.h:2
msgid "Channel properties"
msgstr "Sendereigenschaften"
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Sendername:"
+
#: ../data/ui/channelproperties.glade.h:3
msgid "Channel's URI:"
msgstr "URI der Sender:"
#: ../data/ui/channelproperties.glade.h:4
-msgid "Channel's name:"
-msgstr "Sendername:"
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>VLC Senderoptionen:</b>"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Allgemein"
-#: ../data/ui/channelproperties.glade.h:5
+#: ../data/ui/channelproperties.glade.h:6
#, fuzzy
msgid "Deinterlacement:"
msgstr "_Zeilenentflechtung"
-#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
-msgid "General"
-msgstr "Allgemein"
-
#: ../data/ui/channelproperties.glade.h:7
-msgid "Options"
-msgstr ""
-
-#: ../data/ui/channelproperties.glade.h:8
-#: ../src/freetuxtv-window-channel-properties.c:175
+#: ../src/freetuxtv-window-channel-properties.c:176
#, fuzzy
msgid "none"
msgstr "nichts"
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr ""
+
#: ../data/ui/freetuxtv.glade.h:1
-msgid " channels"
-msgstr " Sender"
+msgid "GNU General Public License v3"
+msgstr "GNU General Public License v3"
#: ../data/ui/freetuxtv.glade.h:2
-msgid "+"
-msgstr "+"
+msgid "Web TV channels player"
+msgstr "Web TV Player"
#: ../data/ui/freetuxtv.glade.h:3
-msgid "-"
-msgstr "-"
-
-#: ../data/ui/freetuxtv.glade.h:4
-msgid "0"
-msgstr "0"
+msgid "Project's Web Site"
+msgstr "Webseite des Projekts"
+#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+#, fuzzy
+msgid "translator-credits"
+msgstr ""
+"Benjamin Schmidt (bejonet)\n"
+"Ettore Atalan (Atalanttore)"
#: ../data/ui/freetuxtv.glade.h:6
-#, fuzzy
-msgid "<b>Configuration file (vlcrc)</b>"
-msgstr "<b>Konfigurationsdatei (vlcrc)</b>"
+msgid "Group properties"
+msgstr "Gruppeneigenschaften"
-#: ../data/ui/freetuxtv.glade.h:7
+#: ../data/ui/freetuxtv.glade.h:18
#, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Verbindung</b>"
+msgid "Number of channels:"
+msgstr "Anzahl der Sender:"
+
+#: ../data/ui/freetuxtv.glade.h:19
+msgid "0"
+msgstr "0"
+
+#: ../data/ui/freetuxtv.glade.h:20
+msgid "Details"
+msgstr "Details"
-#: ../data/ui/freetuxtv.glade.h:8
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "Datei ansehen"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../data/ui/freetuxtv.glade.h:23
+msgid "Play last channel on startup"
+msgstr "Spiele den letzen Sender beim Starten"
+
+#: ../data/ui/freetuxtv.glade.h:24
+msgid "<b>Startup</b>"
+msgstr "<b>Startvorgang</b>"
+
+#: ../data/ui/freetuxtv.glade.h:25
#, fuzzy
-msgid "<b>Destination</b>"
-msgstr "<b>Ziel</b>"
+msgid "Enable desktop notifications"
+msgstr "Desktop-Benachrichtigungen aktivieren"
-#: ../data/ui/freetuxtv.glade.h:9
+#: ../data/ui/freetuxtv.glade.h:26
msgid "<b>Notifications</b>"
msgstr "<b>Mitteilungen</b>"
-#: ../data/ui/freetuxtv.glade.h:11
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#: ../data/ui/freetuxtv.glade.h:27
+#, fuzzy
+msgid "Ignore diacritics"
+msgstr "Diakritische Zeichen ignorieren"
-#: ../data/ui/freetuxtv.glade.h:12
+#: ../data/ui/freetuxtv.glade.h:28
#, fuzzy
msgid "<b>Search of channels</b>"
msgstr "<b>Sendersuche</b>"
-#: ../data/ui/freetuxtv.glade.h:13
-msgid "<b>Startup</b>"
-msgstr "<b>Startvorgang</b>"
+#: ../data/ui/freetuxtv.glade.h:29
+#, fuzzy
+msgid "None"
+msgstr "Kein"
-#: ../data/ui/freetuxtv.glade.h:14
+#: ../data/ui/freetuxtv.glade.h:30
#, fuzzy
-msgid "<b>Transcoding options</b>"
-msgstr "<b>Transkodieroptionen</b>"
+msgid "Use a custom configuration file"
+msgstr "Eine benutzerdefinierte Konfigurationsdatei verwenden"
+
+#: ../data/ui/freetuxtv.glade.h:31
+#, fuzzy
+msgid "Use the VLC configuration file"
+msgstr "VLC Konfigurationsdatei verwenden"
-#: ../data/ui/freetuxtv.glade.h:15
+#: ../data/ui/freetuxtv.glade.h:32
#, fuzzy
msgid "<i>Restart the application after changing this option.</i>"
msgstr "<i>Programm nach dem Ändern dieser Option neustarten.</i>"
-#: ../data/ui/freetuxtv.glade.h:16
-msgid "Activate/Deactivate the window always on top"
-msgstr "Aktivieren/Deaktivieren Fenster immer im Vordergrund"
+#: ../data/ui/freetuxtv.glade.h:33
+#, fuzzy
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>Konfigurationsdatei (vlcrc)</b>"
-#: ../data/ui/freetuxtv.glade.h:17
-msgid "Channels"
-msgstr "Sender"
+#: ../data/ui/freetuxtv.glade.h:34
+#, fuzzy
+msgid "LibVLC"
+msgstr "LibVLC"
-#: ../data/ui/freetuxtv.glade.h:18
-msgid "Channels' search text area"
-msgstr "Sender-Suchfeld"
-
-#: ../data/ui/freetuxtv.glade.h:19
-msgid "Delete the search text area"
-msgstr "Das Suchfeld leeren"
-
-#: ../data/ui/freetuxtv.glade.h:22
-msgid "Details"
-msgstr "Details"
-
-#: ../data/ui/freetuxtv.glade.h:23
-#, fuzzy
-msgid "Directory Record:"
-msgstr "Ordner der Aufzeichnung: "
-
-#: ../data/ui/freetuxtv.glade.h:24
-#, fuzzy
-msgid "Download timeout (seconds) :"
-msgstr "Zeitüberschreitung beim Herunterladen (Sekunden) :"
-
-#: ../data/ui/freetuxtv.glade.h:25
-#, fuzzy
-msgid "Enable desktop notifications"
-msgstr "Desktop-Benachrichtigungen aktivieren"
-
-#: ../data/ui/freetuxtv.glade.h:26
-#, fuzzy
-msgid "Format:"
-msgstr "Format:"
-
-#: ../data/ui/freetuxtv.glade.h:27 ../data/menu/freetuxtv.desktop.in.h:1
-msgid "FreetuxTV"
-msgstr "FreetuxTV"
-
-#: ../data/ui/freetuxtv.glade.h:28
-msgid "Fullscreen mode"
-msgstr "Vollbild"
-
-#: ../data/ui/freetuxtv.glade.h:29
-msgid "GNU General Public License v3"
-msgstr "GNU General Public License v3"
-
-#: ../data/ui/freetuxtv.glade.h:31
-msgid "Go back to the normal mode"
-msgstr "Zurück in normalen Modus"
-
-#: ../data/ui/freetuxtv.glade.h:32
-msgid "Go to the current channel playing"
-msgstr "Gehe zum aktuell spielenden Kanal"
-
-#: ../data/ui/freetuxtv.glade.h:33
-msgid "Group properties"
-msgstr "Gruppeneigenschaften"
-
-#: ../data/ui/freetuxtv.glade.h:35
-msgid "HTTP"
-msgstr "HTTP"
+#: ../data/ui/freetuxtv.glade.h:35
+#, fuzzy
+msgid "Directory Record:"
+msgstr "Ordner der Aufzeichnung: "
#: ../data/ui/freetuxtv.glade.h:36
#, fuzzy
-msgid "Ignore diacritics"
-msgstr "Diakritische Zeichen ignorieren"
+msgid "Select a directory"
+msgstr "Wähle eine Verzeichnis"
#: ../data/ui/freetuxtv.glade.h:37
#, fuzzy
-msgid "In progress"
-msgstr "In Bearbeitung"
+msgid "<b>Destination</b>"
+msgstr "<b>Ziel</b>"
#: ../data/ui/freetuxtv.glade.h:38
-msgid "Jump to current channel"
-msgstr "Gehe zum aktuellen Kanal"
+msgid "No transcoding"
+msgstr "Keine Transkodierung"
#: ../data/ui/freetuxtv.glade.h:39
-#, fuzzy
-msgid "LibVLC"
-msgstr "LibVLC"
+msgid "Predefined transcoding formats"
+msgstr "Vordefinierte Transkodierformate"
#: ../data/ui/freetuxtv.glade.h:40
-msgid "Manual proxy configuration"
-msgstr "Manuelle Proxykonfiguration"
+#, fuzzy
+msgid "Format:"
+msgstr "Format:"
+
+#: ../data/ui/freetuxtv.glade.h:41
+#, fuzzy
+msgid "<b>Transcoding options</b>"
+msgstr "<b>Transkodieroptionen</b>"
#: ../data/ui/freetuxtv.glade.h:42
-msgid "Network"
-msgstr "Netzwerk"
+msgid "Recordings"
+msgstr "Aufzeichnungen"
#: ../data/ui/freetuxtv.glade.h:43
-msgid "Next channel"
-msgstr "Nächster Sender"
+#, fuzzy
+msgid "Download timeout (seconds) :"
+msgstr "Zeitüberschreitung beim Herunterladen (Sekunden) :"
#: ../data/ui/freetuxtv.glade.h:44
-msgid "No proxy"
-msgstr "Kein Proxy"
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Verbindung</b>"
#: ../data/ui/freetuxtv.glade.h:45
-msgid "No transcoding"
-msgstr "Keine Transkodierung"
+msgid "No proxy"
+msgstr "Kein Proxy"
#: ../data/ui/freetuxtv.glade.h:46
-#, fuzzy
-msgid "None"
-msgstr "Kein"
+msgid "Manual proxy configuration"
+msgstr "Manuelle Proxykonfiguration"
#: ../data/ui/freetuxtv.glade.h:47
-#, fuzzy
-msgid "Number of channels:"
-msgstr "Anzahl der Sender:"
+msgid "Proxy server:"
+msgstr "Proxy Server: "
#: ../data/ui/freetuxtv.glade.h:48
-msgid "Password:"
-msgstr "Passwort: "
+msgid "Proxy port:"
+msgstr "Proxy Port: "
#: ../data/ui/freetuxtv.glade.h:49
-msgid "Play last channel on startup"
-msgstr "Spiele den letzen Sender beim Starten"
+msgid "Proxy type:"
+msgstr "Proxy Typ: "
#: ../data/ui/freetuxtv.glade.h:50
-msgid "Play the current channel"
-msgstr "Spiele den aktuellen Sender"
+#, fuzzy
+msgid "Use authentification"
+msgstr "Authentifizierung verwenden"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "Passwort: "
#: ../data/ui/freetuxtv.glade.h:53
-msgid "Predefined transcoding formats"
-msgstr "Vordefinierte Transkodierformate"
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
#: ../data/ui/freetuxtv.glade.h:54
-msgid "Preferences"
-msgstr "Einstellungen"
+msgid "Network"
+msgstr "Netzwerk"
#: ../data/ui/freetuxtv.glade.h:55
-msgid "Previous channel"
-msgstr "Vorheriger Sender"
+msgid "HTTP"
+msgstr "HTTP"
#: ../data/ui/freetuxtv.glade.h:56
-msgid "Project's Web Site"
-msgstr "Webseite des Projekts"
+#, fuzzy
+msgid "SOCKS"
+msgstr "SOCKS"
#: ../data/ui/freetuxtv.glade.h:57
-msgid "Proxy port:"
-msgstr "Proxy Port: "
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr "Video - Theora + Vorbis (OGG)"
#: ../data/ui/freetuxtv.glade.h:58
-msgid "Proxy server:"
-msgstr "Proxy Server: "
+#, fuzzy
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
#: ../data/ui/freetuxtv.glade.h:59
-msgid "Proxy type:"
-msgstr "Proxy Typ: "
+msgid "ogg"
+msgstr "ogg"
#: ../data/ui/freetuxtv.glade.h:60
-msgid "Record the current channel"
-msgstr "Aktuellen Sender aufzeichnen"
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr "Video - H.264 + MPGA (MP4)"
#: ../data/ui/freetuxtv.glade.h:61
-msgid "Recordings"
-msgstr "Aufzeichnungen"
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
#: ../data/ui/freetuxtv.glade.h:62
-#, fuzzy
-msgid "SOCKS"
-msgstr "SOCKS"
+msgid "mp4"
+msgstr "mp4"
#: ../data/ui/freetuxtv.glade.h:63
#, fuzzy
-msgid "Search:"
-msgstr "Suche:"
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr "Video - MPEG-2 + MPGA (TS)"
#: ../data/ui/freetuxtv.glade.h:64
#, fuzzy
-msgid "Select a directory"
-msgstr "Wähle eine Verzeichnis"
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
#: ../data/ui/freetuxtv.glade.h:65
-msgid "Small mode"
-msgstr "Minimale Ansicht"
+#, fuzzy
+msgid "ts"
+msgstr "ts"
-#: ../data/ui/freetuxtv.glade.h:66
-msgid "Stop playing the current channel"
-msgstr "Stoppe die Wiedergabe des aktuellen Senders"
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
#: ../data/ui/freetuxtv.glade.h:67
#, fuzzy
-msgid "Terminated"
-msgstr "Beendet"
+msgid "Search:"
+msgstr "Suche:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "Sender-Suchfeld"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "Das Suchfeld leeren"
#: ../data/ui/freetuxtv.glade.h:70
-#, fuzzy
-msgid "Use a custom configuration file"
-msgstr "Eine benutzerdefinierte Konfigurationsdatei verwenden"
+msgid "Jump to current channel"
+msgstr "Gehe zum aktuellen Kanal"
#: ../data/ui/freetuxtv.glade.h:71
-#, fuzzy
-msgid "Use authentification"
-msgstr "Authentifizierung verwenden"
+msgid "Go to the current channel playing"
+msgstr "Gehe zum aktuell spielenden Kanal"
#: ../data/ui/freetuxtv.glade.h:72
-#, fuzzy
-msgid "Use the VLC configuration file"
-msgstr "VLC Konfigurationsdatei verwenden"
+msgid "Channels"
+msgstr "Sender"
#: ../data/ui/freetuxtv.glade.h:73
-msgid "Username:"
-msgstr "Benutzername:"
+#, fuzzy
+msgid "In progress"
+msgstr "In Bearbeitung"
#: ../data/ui/freetuxtv.glade.h:74
-msgid "Video - H.264 + MPGA (MP4)"
-msgstr "Video - H.264 + MPGA (MP4)"
+#, fuzzy
+msgid "Terminated"
+msgstr "Beendet"
#: ../data/ui/freetuxtv.glade.h:75
-#, fuzzy
-msgid "Video - MPEG-2 + MPGA (TS)"
-msgstr "Video - MPEG-2 + MPGA (TS)"
+msgid "00:00:00"
+msgstr "00:00:00"
#: ../data/ui/freetuxtv.glade.h:76
-msgid "Video - Theora + Vorbis (OGG)"
-msgstr "Video - Theora + Vorbis (OGG)"
+msgid "Previous channel"
+msgstr "Vorheriger Sender"
#: ../data/ui/freetuxtv.glade.h:77
-msgid "View file"
-msgstr "Datei ansehen"
+msgid "Play the current channel"
+msgstr "Spiele den aktuellen Sender"
#: ../data/ui/freetuxtv.glade.h:78
-#, fuzzy
-msgid "Vol:"
-msgstr "Lautstärke:"
+msgid "Stop playing the current channel"
+msgstr "Stoppe die Wiedergabe des aktuellen Senders"
#: ../data/ui/freetuxtv.glade.h:79
-msgid "Web TV channels player"
-msgstr "Web TV Player"
+msgid "Record the current channel"
+msgstr "Aktuellen Sender aufzeichnen"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "Nächster Sender"
#: ../data/ui/freetuxtv.glade.h:81
-msgid "mp4"
-msgstr "mp4"
+#, fuzzy
+msgid "Vol:"
+msgstr "Lautstärke:"
#: ../data/ui/freetuxtv.glade.h:82
-msgid "ogg"
-msgstr "ogg"
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
-#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:84
-#, fuzzy
-msgid "translator-credits"
-msgstr ""
-"Benjamin Schmidt (bejonet)\n"
-"Ettore Atalan (Atalanttore)"
+msgid "Fullscreen mode"
+msgstr "Vollbild"
#: ../data/ui/freetuxtv.glade.h:85
-#, fuzzy
-msgid "ts"
-msgstr "ts"
+msgid "Small mode"
+msgstr "Minimale Ansicht"
#: ../data/ui/freetuxtv.glade.h:86
-msgid ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
-msgstr ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
+msgid " channels"
+msgstr " Sender"
#: ../data/ui/freetuxtv.glade.h:87
-#, fuzzy
-msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
-msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgid "Go back to the normal mode"
+msgstr "Zurück in normalen Modus"
#: ../data/ui/freetuxtv.glade.h:88
-#, fuzzy
-msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
-msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgid "Activate/Deactivate the window always on top"
+msgstr "Aktivieren/Deaktivieren Fenster immer im Vordergrund"
#: ../data/channels_groups.xml.in.h:1
msgid "Alice (Unofficial)"
msgstr "Alice (inoffiziell)"
#: ../data/channels_groups.xml.in.h:2
+msgid "SFR TV (Unofficial)"
+msgstr "SFR TV (inoffiziell)"
+
+#: ../data/channels_groups.xml.in.h:3
+#, fuzzy
+msgid "Afrikaans Web TV and Radio"
+msgstr "Persisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:4
+#, fuzzy
+msgid "Web TV (Afrikaans)"
+msgstr "Internet-TV (persisch)"
+
+#: ../data/channels_groups.xml.in.h:5
+#, fuzzy
+msgid "Albanian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:6
+#, fuzzy
+msgid "Web TV (Albanian)"
+msgstr "Internet-TV (rumänisch)"
+
+#: ../data/channels_groups.xml.in.h:7
+#, fuzzy
+msgid "Amharic Web TV and Radio"
+msgstr "Arabisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:8
+#, fuzzy
+msgid "Web TV (Amharic)"
+msgstr "Internet-TV (arabisch)"
+
+#: ../data/channels_groups.xml.in.h:9
msgid "Arabic Web TV and Radio"
msgstr "Arabisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:3
+#: ../data/channels_groups.xml.in.h:10
+msgid "Web TV (Arabic)"
+msgstr "Internet-TV (arabisch)"
+
+#: ../data/channels_groups.xml.in.h:11
+msgid "Web Radio (Arabic)"
+msgstr "Internetradio (arabisch)"
+
+#: ../data/channels_groups.xml.in.h:12
+#, fuzzy
+msgid "Web Cam (Arabic)"
+msgstr "Internet-TV (arabisch)"
+
+#: ../data/channels_groups.xml.in.h:13
+#, fuzzy
+msgid "Armenian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:14
+#, fuzzy
+msgid "Web TV (Armenian)"
+msgstr "Internet-TV (rumänisch)"
+
+#: ../data/channels_groups.xml.in.h:15
+#, fuzzy
+msgid "Azerbaijani Web TV and Radio"
+msgstr "Persisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:16
+#, fuzzy
+msgid "Web TV (Azerbaijani)"
+msgstr "Internet-TV (persisch)"
+
+#: ../data/channels_groups.xml.in.h:17
+#, fuzzy
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "Ungarisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:18
+#, fuzzy
+msgid "Web TV (Bengali/Bangla)"
+msgstr "Internet-TV (ungarisch)"
+
+#: ../data/channels_groups.xml.in.h:19
+#, fuzzy
+msgid "Bulgarian Web TV and Radio"
+msgstr "Ungarisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:20
+#, fuzzy
+msgid "Web TV (Bulgarian)"
+msgstr "Internet-TV (ungarisch)"
+
+#: ../data/channels_groups.xml.in.h:21
+#, fuzzy
+msgid "Cambodian Web TV and Radio"
+msgstr "Italienisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:22
+#, fuzzy
+msgid "Web TV (Cambodian)"
+msgstr "Internet-TV (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:23
msgid "Catalan Web TV and Radio"
msgstr "Katalanisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:4
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr "Internet-TV (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr "Internetradio (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:26
msgid "Chinese Web TV and Radio"
msgstr "Chinesisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:5
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr "Internet-TV (chinesisch)"
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr "Internetradio (chinesisch)"
+
+#: ../data/channels_groups.xml.in.h:29
+#, fuzzy
+msgid "Croatian Web TV and Radio"
+msgstr "Katalanisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:30
+#, fuzzy
+msgid "Web TV (Croatian)"
+msgstr "Internet-TV (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:31
+#, fuzzy
+msgid "Web Radio (Croatian)"
+msgstr "Internetradio (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:32
msgid "Czech Web TV and Radio"
msgstr "Tschechisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:6
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr "Internet-TV (tschechisch)"
+
+#: ../data/channels_groups.xml.in.h:34
+#, fuzzy
+msgid "Web Radio (Czech)"
+msgstr "Internetradio (französisch)"
+
+#: ../data/channels_groups.xml.in.h:35
+#, fuzzy
+msgid "Danish Web TV and Radio"
+msgstr "Spanisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:36
+#, fuzzy
+msgid "Web TV (Danish)"
+msgstr "Internet-TV (spanisch)"
+
+#: ../data/channels_groups.xml.in.h:37
msgid "Dutch Web TV and Radio"
msgstr "Niederländisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:7
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr "Internet-TV (niederländisch)"
+
+#: ../data/channels_groups.xml.in.h:39
+#, fuzzy
+msgid "Web Radio (Dutch)"
+msgstr "Internetradio (französisch)"
+
+#: ../data/channels_groups.xml.in.h:40
+#, fuzzy
+msgid "Web Cam (Dutch)"
+msgstr "Internet-TV (niederländisch)"
+
+#: ../data/channels_groups.xml.in.h:41
msgid "English Web TV and Radio"
msgstr "Englisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:8
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr "Internet-TV (englisch)"
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr "Internetradio (englisch)"
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr "Webprogramme (englisch)"
+
+#: ../data/channels_groups.xml.in.h:45
+#, fuzzy
+msgid "Web Cam (English)"
+msgstr "Internet-TV (englisch)"
+
+#: ../data/channels_groups.xml.in.h:46
+#, fuzzy
+msgid "Estonian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:47
+#, fuzzy
+msgid "Web TV (Estonian)"
+msgstr "Internet-TV (rumänisch)"
+
+#: ../data/channels_groups.xml.in.h:48
+#, fuzzy
+msgid "Finnish Web TV and Radio"
+msgstr "Spanisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:49
+#, fuzzy
+msgid "Web TV (Finnish)"
+msgstr "Internet-TV (spanisch)"
+
+#: ../data/channels_groups.xml.in.h:50
msgid "French Web TV and Radio"
msgstr "Französisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:9
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr "Internet-TV (französisch)"
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr "Internetradio (französisch)"
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr "Webprogramme (französisch)"
+
+#: ../data/channels_groups.xml.in.h:54
+#, fuzzy
+msgid "Georgian Web TV and Radio"
+msgstr "Deutsches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:55
+#, fuzzy
+msgid "Web TV (Georgian)"
+msgstr "Internet-TV (deutsch)"
+
+#: ../data/channels_groups.xml.in.h:56
msgid "German Web TV and Radio"
msgstr "Deutsches Web TV und Radio"
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr "Internet-TV (deutsch)"
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr "Internetradio (deutsch)"
+
# latin?
-#: ../data/channels_groups.xml.in.h:10
+#: ../data/channels_groups.xml.in.h:59
#, fuzzy
msgid "Greek Web TV and Radio"
msgstr "Griechisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:11
+#: ../data/channels_groups.xml.in.h:60
+#, fuzzy
+msgid "Web TV (Greek)"
+msgstr "Internet-TV (griechisch)"
+
+#: ../data/channels_groups.xml.in.h:61
+#, fuzzy
+msgid "Web Radio (Greek)"
+msgstr "Internetradio (deutsch)"
+
+# latin?
+#: ../data/channels_groups.xml.in.h:62
+#, fuzzy
+msgid "Hebrew Web TV and Radio"
+msgstr "Griechisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:63
+#, fuzzy
+msgid "Web TV (Hebrew)"
+msgstr "Internet-TV (griechisch)"
+
+#: ../data/channels_groups.xml.in.h:64
+#, fuzzy
+msgid "Web Radio (Hebrew)"
+msgstr "Internetradio (französisch)"
+
+#: ../data/channels_groups.xml.in.h:65
+#, fuzzy
+msgid "Web Cam (Hebrew)"
+msgstr "Internet-TV (griechisch)"
+
+#: ../data/channels_groups.xml.in.h:66
+#, fuzzy
+msgid "Hindi Web TV and Radio"
+msgstr "Lateinisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:67
+#, fuzzy
+msgid "Web TV (Hindi)"
+msgstr "Internet-TV (lateinisch)"
+
+#: ../data/channels_groups.xml.in.h:68
+#, fuzzy
+msgid "Web Radio (Hindi)"
+msgstr "Internetradio (chinesisch)"
+
+#: ../data/channels_groups.xml.in.h:69
msgid "Hungarian Web TV and Radio"
msgstr "Ungarisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:12
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr "Internet-TV (ungarisch)"
+
+#: ../data/channels_groups.xml.in.h:71
+#, fuzzy
+msgid "Icelandic Web TV and Radio"
+msgstr "Italienisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:72
+#, fuzzy
+msgid "Web TV (Icelandic)"
+msgstr "Internet-TV (italienisch)"
+
+#: ../data/channels_groups.xml.in.h:73
+#, fuzzy
+msgid "Indonesian Web TV and Radio"
+msgstr "Persisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:74
+#, fuzzy
+msgid "Web TV (Indonesian)"
+msgstr "Internet-TV (persisch)"
+
+#: ../data/channels_groups.xml.in.h:75
+#, fuzzy
+msgid "Interlingua Web TV and Radio"
+msgstr "Italienisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:76
+#, fuzzy
+msgid "Web Radio (Interlingua)"
+msgstr "Internetradio (italienisch)"
+
+#: ../data/channels_groups.xml.in.h:77
+#, fuzzy
+msgid "Irish Web TV and Radio"
+msgstr "Türkisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:78
+#, fuzzy
+msgid "Web TV (Irish)"
+msgstr "Internet-TV (türkisch)"
+
+#: ../data/channels_groups.xml.in.h:79
+#, fuzzy
+msgid "Web Radio (Irish)"
+msgstr "Internetradio (englisch)"
+
+#: ../data/channels_groups.xml.in.h:80
msgid "Italian Web TV and Radio"
msgstr "Italienisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:13
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr "Internet-TV (italienisch)"
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr "Internetradio (italienisch)"
+
+#: ../data/channels_groups.xml.in.h:83
msgid "Japanese Web TV and Radio"
msgstr "Japanisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:14
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr "Internet-TV (japanisch)"
+
+#: ../data/channels_groups.xml.in.h:85
+#, fuzzy
+msgid "Web Radio (Japanese)"
+msgstr "Internetradio (chinesisch)"
+
+#: ../data/channels_groups.xml.in.h:86
+#, fuzzy
+msgid "Web Cam (Japanese)"
+msgstr "Internet-TV (japanisch)"
+
+#: ../data/channels_groups.xml.in.h:87
+#, fuzzy
+msgid "Kazakh Web TV and Radio"
+msgstr "Tschechisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:88
+#, fuzzy
+msgid "Web TV (Kazakh)"
+msgstr "Internet-TV (tschechisch)"
+
+#: ../data/channels_groups.xml.in.h:89
msgid "Korean Web TV and Radio"
msgstr "Koreanisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:15
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr "Internet-TV (koreanisch)"
+
+#: ../data/channels_groups.xml.in.h:91
+#, fuzzy
+msgid "Kurdish Web TV and Radio"
+msgstr "Türkisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:92
+#, fuzzy
+msgid "Web TV (Kurdish)"
+msgstr "Internet-TV (türkisch)"
+
+#: ../data/channels_groups.xml.in.h:93
msgid "Latin Web TV and Radio"
msgstr "Lateinisches Web TV und Radio"
-# latin?
-#: ../data/channels_groups.xml.in.h:16
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
+msgstr "Internet-TV (lateinisch)"
+
+#: ../data/channels_groups.xml.in.h:95
#, fuzzy
-msgid "Modern Greek Web TV and Radio"
-msgstr "Neugriechisches Web TV und Radio"
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "Lateinisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:17
+#: ../data/channels_groups.xml.in.h:96
#, fuzzy
-msgid "No lang Web TV and Radio"
-msgstr "Sprachenloses Web TV und Radio"
+msgid "Web TV (Latvian/Lettish)"
+msgstr "Internet-TV (lateinisch)"
-#: ../data/channels_groups.xml.in.h:18
+#: ../data/channels_groups.xml.in.h:97
+#, fuzzy
+msgid "Lithuanian Web TV and Radio"
+msgstr "Italienisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:98
+#, fuzzy
+msgid "Web TV (Lithuanian)"
+msgstr "Internet-TV (italienisch)"
+
+#: ../data/channels_groups.xml.in.h:99
+#, fuzzy
+msgid "Macedonian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:100
+#, fuzzy
+msgid "Web TV (Macedonian)"
+msgstr "Internet-TV (rumänisch)"
+
+#: ../data/channels_groups.xml.in.h:101
+#, fuzzy
+msgid "Web Radio (Macedonian)"
+msgstr "Internetradio (italienisch)"
+
+#: ../data/channels_groups.xml.in.h:102
+#, fuzzy
+msgid "Malay Web TV and Radio"
+msgstr "Katalanisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:103
+#, fuzzy
+msgid "Web TV (Malay)"
+msgstr "Internet-TV (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:104
+#, fuzzy
+msgid "Malayalam Web TV and Radio"
+msgstr "Katalanisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:105
+#, fuzzy
+msgid "Web TV (Malayalam)"
+msgstr "Internet-TV (katalanisch)"
+
+#: ../data/channels_groups.xml.in.h:106
+#, fuzzy
+msgid "Maltese Web TV and Radio"
+msgstr "Japanisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:107
+#, fuzzy
+msgid "Web TV (Maltese)"
+msgstr "Internet-TV (japanisch)"
+
+#: ../data/channels_groups.xml.in.h:108
+#, fuzzy
+msgid "Web Radio (Maltese)"
+msgstr "Internetradio (chinesisch)"
+
+#: ../data/channels_groups.xml.in.h:109
+#, fuzzy
+msgid "Moldavian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:110
+#, fuzzy
+msgid "Web TV (Moldavian)"
+msgstr "Internet-TV (rumänisch)"
+
+#: ../data/channels_groups.xml.in.h:111
+#, fuzzy
+msgid "Mongolian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:112
+#, fuzzy
+msgid "Web TV (Mongolian)"
+msgstr "Internet-TV (rumänisch)"
+
+#: ../data/channels_groups.xml.in.h:113
msgid "Norwegian Web TV and Radio"
msgstr "Norwegisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:19
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
+msgstr "Internet-TV (norwegisch)"
+
+#: ../data/channels_groups.xml.in.h:115
msgid "Persian Web TV and Radio"
msgstr "Persisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:20
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
+msgstr "Internet-TV (persisch)"
+
+#: ../data/channels_groups.xml.in.h:117
msgid "Polish Web TV and Radio"
msgstr "Polnisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:21
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
+msgstr "Internet-TV (polnisch)"
+
+#: ../data/channels_groups.xml.in.h:119
+#, fuzzy
+msgid "Web Radio (Polish)"
+msgstr "Internetradio (englisch)"
+
+#: ../data/channels_groups.xml.in.h:120
+#, fuzzy
+msgid "Web Cam (Polish)"
+msgstr "Internet-TV (polnisch)"
+
+#: ../data/channels_groups.xml.in.h:121
msgid "Portuguese Web TV and Radio"
msgstr "Portugiesisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:22
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
+msgstr "Internet-TV (portugiesisch)"
+
+#: ../data/channels_groups.xml.in.h:123
+#, fuzzy
+msgid "Web Radio (Portuguese)"
+msgstr "Internet-TV (portugiesisch)"
+
+#: ../data/channels_groups.xml.in.h:124
+#, fuzzy
+msgid "Punjabi Web TV and Radio"
+msgstr "Arabisches Web TV und Radio"
+
+#: ../data/channels_groups.xml.in.h:125
+#, fuzzy
+msgid "Web TV (Punjabi)"
+msgstr "Internet-TV (arabisch)"
+
+#: ../data/channels_groups.xml.in.h:126
msgid "Romanian Web TV and Radio"
msgstr "Rumänisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:23
-msgid "Russian Web TV and Radio"
-msgstr "Russisches Web TV und Radio"
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
+msgstr "Internet-TV (rumänisch)"
-#: ../data/channels_groups.xml.in.h:24
-msgid "SFR TV (Unofficial)"
-msgstr "SFR TV (inoffiziell)"
+#: ../data/channels_groups.xml.in.h:128
+#, fuzzy
+msgid "Web Radio (Romanian)"
+msgstr "Internetradio (russisch)"
-#: ../data/channels_groups.xml.in.h:25
-msgid "Slovak Web TV and Radio"
-msgstr "Slovakisches Web TV und Radio"
+#: ../data/channels_groups.xml.in.h:129
+msgid "Russian Web TV and Radio"
+msgstr "Russisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:26
-msgid "Spanish Web TV and Radio"
-msgstr "Spanisches Web TV und Radio"
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
+msgstr "Internet-TV (russisch)"
-#: ../data/channels_groups.xml.in.h:27
-msgid "Swedish Web TV and Radio"
-msgstr "Schwedisches Web TV und Radio"
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
+msgstr "Internetradio (russisch)"
-#: ../data/channels_groups.xml.in.h:28
+#: ../data/channels_groups.xml.in.h:132
#, fuzzy
-msgid "Thai Web TV and Radio"
-msgstr "Thailändisches Web TV und Radio"
+msgid "Serbian Web TV and Radio"
+msgstr "Persisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:29
-msgid "Turkish Web TV and Radio"
-msgstr "Türkisches Web TV und Radio"
+#: ../data/channels_groups.xml.in.h:133
+#, fuzzy
+msgid "Web TV (Serbian)"
+msgstr "Internet-TV (persisch)"
-#: ../data/channels_groups.xml.in.h:30
-msgid "Web Programmes (English)"
-msgstr "Webprogramme (englisch)"
+#: ../data/channels_groups.xml.in.h:134
+#, fuzzy
+msgid "Web Radio (Serbian)"
+msgstr "Internetradio (deutsch)"
-#: ../data/channels_groups.xml.in.h:31
-msgid "Web Programmes (French)"
-msgstr "Webprogramme (französisch)"
+#: ../data/channels_groups.xml.in.h:135
+#, fuzzy
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "Persisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:32
-msgid "Web Radio (Arabic)"
-msgstr "Internetradio (arabisch)"
+#: ../data/channels_groups.xml.in.h:136
+#, fuzzy
+msgid "Web TV (Serbo-Croatian)"
+msgstr "Internet-TV (persisch)"
-#: ../data/channels_groups.xml.in.h:33
-msgid "Web Radio (Catalan)"
+#: ../data/channels_groups.xml.in.h:137
+#, fuzzy
+msgid "Web Radio (Serbo-Croatian)"
msgstr "Internetradio (katalanisch)"
-#: ../data/channels_groups.xml.in.h:34
-msgid "Web Radio (Chinese)"
-msgstr "Internetradio (chinesisch)"
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
+msgstr "Slovakisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:35
-msgid "Web Radio (English)"
-msgstr "Internetradio (englisch)"
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
+msgstr "Internet-TV (slovakisch)"
-#: ../data/channels_groups.xml.in.h:36
-msgid "Web Radio (French)"
-msgstr "Internetradio (französisch)"
+#: ../data/channels_groups.xml.in.h:140
+#, fuzzy
+msgid "Web Radio (Slovak)"
+msgstr "Internet-TV (slovakisch)"
-#: ../data/channels_groups.xml.in.h:37
-msgid "Web Radio (German)"
-msgstr "Internetradio (deutsch)"
+#: ../data/channels_groups.xml.in.h:141
+#, fuzzy
+msgid "Slovenian Web TV and Radio"
+msgstr "Slovakisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:38
-msgid "Web Radio (Italian)"
-msgstr "Internetradio (italienisch)"
+#: ../data/channels_groups.xml.in.h:142
+#, fuzzy
+msgid "Web TV (Slovenian)"
+msgstr "Internet-TV (slovakisch)"
-#: ../data/channels_groups.xml.in.h:39
+#: ../data/channels_groups.xml.in.h:143
#, fuzzy
-msgid "Web Radio (No lang)"
-msgstr "Internetradio (sprachenlos)"
+msgid "Web Radio (Slovenian)"
+msgstr "Internetradio (italienisch)"
-#: ../data/channels_groups.xml.in.h:40
-msgid "Web Radio (Russian)"
-msgstr "Internetradio (russisch)"
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr "Spanisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:41
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
+msgstr "Internet-TV (spanisch)"
+
+#: ../data/channels_groups.xml.in.h:146
msgid "Web Radio (Spanish)"
msgstr "Internetradio (spanisch)"
-#: ../data/channels_groups.xml.in.h:42
-msgid "Web TV (Arabic)"
-msgstr "Internet-TV (arabisch)"
+#: ../data/channels_groups.xml.in.h:147
+#, fuzzy
+msgid "Web Programmes (Spanish)"
+msgstr "Webprogramme (englisch)"
-#: ../data/channels_groups.xml.in.h:43
-msgid "Web TV (Catalan)"
-msgstr "Internet-TV (katalanisch)"
+#: ../data/channels_groups.xml.in.h:148
+#, fuzzy
+msgid "Web Cam (Spanish)"
+msgstr "Internet-TV (spanisch)"
-#: ../data/channels_groups.xml.in.h:44
-msgid "Web TV (Chinese)"
-msgstr "Internet-TV (chinesisch)"
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
+msgstr "Schwedisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:45
-msgid "Web TV (Czech)"
-msgstr "Internet-TV (tschechisch)"
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
+msgstr "Internet-TV (schwedisch)"
-#: ../data/channels_groups.xml.in.h:46
-msgid "Web TV (Dutch)"
-msgstr "Internet-TV (niederländisch)"
+#: ../data/channels_groups.xml.in.h:151
+#, fuzzy
+msgid "Tagalog Web TV and Radio"
+msgstr "Thailändisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:47
-msgid "Web TV (English)"
-msgstr "Internet-TV (englisch)"
+#: ../data/channels_groups.xml.in.h:152
+#, fuzzy
+msgid "Web TV (Tagalog)"
+msgstr "Internet-TV (thailändisch)"
-#: ../data/channels_groups.xml.in.h:48
-msgid "Web TV (French)"
-msgstr "Internet-TV (französisch)"
+#: ../data/channels_groups.xml.in.h:153
+#, fuzzy
+msgid "Tamil Web TV and Radio"
+msgstr "Thailändisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:49
-msgid "Web TV (German)"
-msgstr "Internet-TV (deutsch)"
+#: ../data/channels_groups.xml.in.h:154
+#, fuzzy
+msgid "Web TV (Tamil)"
+msgstr "Internet-TV (thailändisch)"
-#: ../data/channels_groups.xml.in.h:50
+#: ../data/channels_groups.xml.in.h:155
#, fuzzy
-msgid "Web TV (Greek)"
-msgstr "Internet-TV (griechisch)"
+msgid "Thai Web TV and Radio"
+msgstr "Thailändisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:51
-msgid "Web TV (Hungarian)"
-msgstr "Internet-TV (ungarisch)"
+#: ../data/channels_groups.xml.in.h:156
+#, fuzzy
+msgid "Web TV (Thai)"
+msgstr "Internet-TV (thailändisch)"
-#: ../data/channels_groups.xml.in.h:52
-msgid "Web TV (Italian)"
-msgstr "Internet-TV (italienisch)"
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
+msgstr "Türkisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:53
-msgid "Web TV (Japanese)"
-msgstr "Internet-TV (japanisch)"
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
+msgstr "Internet-TV (türkisch)"
-#: ../data/channels_groups.xml.in.h:54
-msgid "Web TV (Korean)"
-msgstr "Internet-TV (koreanisch)"
+#: ../data/channels_groups.xml.in.h:159
+#, fuzzy
+msgid "Web Radio (Turkish)"
+msgstr "Internet-TV (türkisch)"
-#: ../data/channels_groups.xml.in.h:55
-msgid "Web TV (Latin)"
-msgstr "Internet-TV (lateinisch)"
+#: ../data/channels_groups.xml.in.h:160
+#, fuzzy
+msgid "Turkmen Web TV and Radio"
+msgstr "Türkisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:56
-msgid "Web TV (Modern Greek)"
-msgstr "Internet-TV (griechisch)"
+#: ../data/channels_groups.xml.in.h:161
+#, fuzzy
+msgid "Web TV (Turkmen)"
+msgstr "Internet-TV (türkisch)"
-#: ../data/channels_groups.xml.in.h:57
+#: ../data/channels_groups.xml.in.h:162
#, fuzzy
-msgid "Web TV (No lang)"
-msgstr "Internet-TV (sprachenlos)"
+msgid "Ukrainian Web TV and Radio"
+msgstr "Rumänisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:58
-msgid "Web TV (Norwegian)"
-msgstr "Internet-TV (norwegisch)"
+#: ../data/channels_groups.xml.in.h:163
+#, fuzzy
+msgid "Web TV (Ukrainian)"
+msgstr "Internet-TV (rumänisch)"
-#: ../data/channels_groups.xml.in.h:59
-msgid "Web TV (Persian)"
-msgstr "Internet-TV (persisch)"
+#: ../data/channels_groups.xml.in.h:164
+#, fuzzy
+msgid "Web Cam (Ukrainian)"
+msgstr "Internet-TV (rumänisch)"
-#: ../data/channels_groups.xml.in.h:60
-msgid "Web TV (Polish)"
-msgstr "Internet-TV (polnisch)"
+#: ../data/channels_groups.xml.in.h:165
+#, fuzzy
+msgid "Urdu Web TV and Radio"
+msgstr "Niederländisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:61
-msgid "Web TV (Portuguese)"
-msgstr "Internet-TV (portugiesisch)"
+#: ../data/channels_groups.xml.in.h:166
+#, fuzzy
+msgid "Web TV (Urdu)"
+msgstr "Internet-TV (niederländisch)"
-#: ../data/channels_groups.xml.in.h:62
-msgid "Web TV (Romanian)"
-msgstr "Internet-TV (rumänisch)"
+# latin?
+#: ../data/channels_groups.xml.in.h:167
+#, fuzzy
+msgid "Uzbek Web TV and Radio"
+msgstr "Griechisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:63
-msgid "Web TV (Russian)"
-msgstr "Internet-TV (russisch)"
+#: ../data/channels_groups.xml.in.h:168
+#, fuzzy
+msgid "Web TV (Uzbek)"
+msgstr "Internet-TV (tschechisch)"
-#: ../data/channels_groups.xml.in.h:64
-msgid "Web TV (Slovak)"
-msgstr "Internet-TV (slovakisch)"
+#: ../data/channels_groups.xml.in.h:169
+#, fuzzy
+msgid "Vietnamese Web TV and Radio"
+msgstr "Chinesisches Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:65
-msgid "Web TV (Spanish)"
-msgstr "Internet-TV (spanisch)"
+#: ../data/channels_groups.xml.in.h:170
+#, fuzzy
+msgid "Web TV (Vietnamese)"
+msgstr "Internet-TV (chinesisch)"
-#: ../data/channels_groups.xml.in.h:66
-msgid "Web TV (Swedish)"
-msgstr "Internet-TV (schwedisch)"
+#: ../data/channels_groups.xml.in.h:171
+#, fuzzy
+msgid "Web Radio (Vietnamese)"
+msgstr "Internetradio (chinesisch)"
-#: ../data/channels_groups.xml.in.h:67
+#: ../data/channels_groups.xml.in.h:172
#, fuzzy
-msgid "Web TV (Thai)"
-msgstr "Internet-TV (thailändisch)"
+msgid "No lang Web TV and Radio"
+msgstr "Sprachenloses Web TV und Radio"
-#: ../data/channels_groups.xml.in.h:68
-msgid "Web TV (Turkish)"
-msgstr "Internet-TV (türkisch)"
+#: ../data/channels_groups.xml.in.h:173
+#, fuzzy
+msgid "Web TV (No lang)"
+msgstr "Internet-TV (sprachenlos)"
-#: ../data/channels_groups.xml.in.h:69
+#: ../data/channels_groups.xml.in.h:174
+#, fuzzy
+msgid "Web Radio (No lang)"
+msgstr "Internetradio (sprachenlos)"
+
+#: ../data/channels_groups.xml.in.h:175
+#, fuzzy
+msgid "Web Programmes (No lang)"
+msgstr "Webprogramme (englisch)"
+
+#: ../data/channels_groups.xml.in.h:176
+#, fuzzy
+msgid "Web Cam (No lang)"
+msgstr "Internet-TV (sprachenlos)"
+
+#: ../data/channels_groups.xml.in.h:177
#, fuzzy
msgid "WebCam"
msgstr "WebCam"
#: ../data/menu/freetuxtv.desktop.in.h:2
-msgid "FreetuxTV Television Channels Player"
-msgstr "FreetuxTV Internet-TV-Player"
-
-#: ../data/menu/freetuxtv.desktop.in.h:3
msgid "Television Channels Player"
msgstr "Internet-TV-Player"
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "FreetuxTV Internet-TV-Player"
+
#: ../data/menu/freetuxtv.desktop.in.h:4
#, fuzzy
msgid "Watch television channels from internet"
msgstr "Internet-TV anschauen"
-#: ../src/freetuxtv-cellrenderer-recordingslist.c:348
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
#, c-format
-msgid "%lld min"
+msgid "%ld min"
msgstr ""
#. Update status bar
@@ -881,17 +1423,17 @@ msgstr ""
"M3UParser gab diesen Fehler zurück:\n"
"%s."
-#: ../src/freetuxtv-channels-list.c:1322
+#: ../src/freetuxtv-channels-list.c:1335
msgid "Delete group's channels"
msgstr "Lösche Sender der Gruppe"
#. Add to favourite is only for channels
-#: ../src/freetuxtv-channels-list.c:1372
+#: ../src/freetuxtv-channels-list.c:1385
msgid "Add to favourites"
msgstr "Zu Favoriten hinzufügen"
#. Add favourites to a new group
-#: ../src/freetuxtv-channels-list.c:1388
+#: ../src/freetuxtv-channels-list.c:1401
msgid "New group"
msgstr "Neue Gruppe"
@@ -1258,7 +1800,7 @@ msgstr ""
"Möchten Sie die zugehörige Datei auf der Festplatte in den Mülleimer "
"verschieben?"
-#: ../src/freetuxtv-tv-channels-list.c:67
+#: ../src/freetuxtv-tv-channels-list.c:69
#, fuzzy, c-format
msgid "Synchronizing the tv channels list"
msgstr "Synchronisiere die TV-Senderliste"
@@ -1298,116 +1840,144 @@ msgstr "%1.1f MB"
msgid "%1.1f GB"
msgstr "%1.1f GB"
-#: ../src/freetuxtv-window-add-channels-group.c:376
+#: ../src/freetuxtv-window-add-channels-group.c:395
#, c-format
msgid "Please select a least one group !"
msgstr "Bitte wähle mindestens eine Gruppe aus!"
-#: ../src/freetuxtv-window-add-channels-group.c:382
-#: ../src/freetuxtv-window-add-channels-group.c:530
-#: ../src/freetuxtv-window-add-channels-group.c:584
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
#, fuzzy
msgid "Adding channels groups"
msgstr "Senderlisten hinzufügen"
#. Update progress dialog
-#: ../src/freetuxtv-window-add-channels-group.c:422
-#: ../src/freetuxtv-window-add-channels-group.c:466
-#: ../src/freetuxtv-window-add-channels-group.c:548
-#: ../src/freetuxtv-window-add-channels-group.c:592
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
#, fuzzy, c-format
msgid "Adding channels group: <i>%s</i>"
msgstr "Senderliste hinzufügen: <i>%s</i>"
-#: ../src/freetuxtv-window-add-channels-group.c:494
-#: ../src/freetuxtv-window-add-channels-group.c:561
-#: ../src/freetuxtv-window-add-channels-group.c:605
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
#, fuzzy, c-format
msgid "%d channels group(s) have been successfully added."
msgstr "%d Sendergruppe(n) wurde(n) erfolgreich hinzugefügt."
-#: ../src/freetuxtv-window-add-channels-group.c:522
-#: ../src/freetuxtv-window-add-channels-group.c:579
-#: ../src/freetuxtv-window-main.c:1980
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
#, c-format
msgid "Please enter the group's name !"
msgstr "Bitte gib einen Gruppennamen ein!"
-#: ../src/freetuxtv-window-add-channels-group.c:525
-#: ../src/freetuxtv-window-main.c:1985
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
#, c-format
msgid "Please enter the group's URI !"
msgstr "Bitte gib die URI der Gruppe ein!"
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "_Aktualisieren der TV-Senderliste"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, fuzzy, c-format
+msgid "Downloading the file '%s'"
+msgstr "Hole Datei \"%s\""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+#, fuzzy
+msgid "Synchronizing TV channels from file"
+msgstr "Synchronisiere die TV-Senderliste"
+
#. Menu : FreetuxTV
-#: ../src/freetuxtv-window-main.c:277
+#: ../src/freetuxtv-window-main.c:278
msgid "_FreetuxTV"
msgstr "_FreetuxTV"
#. End Menu : FreetuxTV
#. Menu : Channels
-#: ../src/freetuxtv-window-main.c:298
+#: ../src/freetuxtv-window-main.c:299
msgid "_Channels"
msgstr "_Sender"
-#: ../src/freetuxtv-window-main.c:302
+#: ../src/freetuxtv-window-main.c:303
msgid "_Add a group"
msgstr "_Gruppe hinzufügen"
-#: ../src/freetuxtv-window-main.c:308
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:311
#, fuzzy
-msgid "_Update TV channels list"
-msgstr "_Aktualisieren der TV-Senderliste"
+msgid "_Synchronize TV channels database"
+msgstr "Synchronisiere die TV-Senderliste"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
#. End Menu : Channels
#. Menu : Video
-#: ../src/freetuxtv-window-main.c:317
+#: ../src/freetuxtv-window-main.c:322
msgid "_Video"
msgstr "_Video"
#. SubMenu : Deinterlace
-#: ../src/freetuxtv-window-main.c:322
+#: ../src/freetuxtv-window-main.c:327
#, fuzzy
msgid "_Deinterlace"
msgstr "_Zeilenentflechtung"
-#: ../src/freetuxtv-window-main.c:327
+#: ../src/freetuxtv-window-main.c:332
msgid "Disable"
msgstr "Deaktivieren"
-#: ../src/freetuxtv-window-main.c:339
+#: ../src/freetuxtv-window-main.c:344
msgid "Blend"
msgstr "Blend"
-#: ../src/freetuxtv-window-main.c:348
+#: ../src/freetuxtv-window-main.c:353
msgid "Bob"
msgstr "Bob"
-#: ../src/freetuxtv-window-main.c:357
+#: ../src/freetuxtv-window-main.c:362
msgid "Discard"
msgstr "Streichen"
-#: ../src/freetuxtv-window-main.c:366
+#: ../src/freetuxtv-window-main.c:371
msgid "Linear"
msgstr "Linear"
-#: ../src/freetuxtv-window-main.c:375
+#: ../src/freetuxtv-window-main.c:380
msgid "Mean"
msgstr "Mean"
-#: ../src/freetuxtv-window-main.c:384
+#: ../src/freetuxtv-window-main.c:389
msgid "X"
msgstr "X"
#. End SubMenu : Deinterlace
#. End Menu : Video
#. Menu : Help
-#: ../src/freetuxtv-window-main.c:396
+#: ../src/freetuxtv-window-main.c:401
msgid "_Help"
msgstr "_Hilfe"
#. Create the menu items
-#: ../src/freetuxtv-window-main.c:1024
+#: ../src/freetuxtv-window-main.c:1029
#, fuzzy
msgid "Mute"
msgstr "Lautlos"
@@ -1433,55 +2003,68 @@ msgstr ""
msgid "An error occurred"
msgstr "Es ist ein Fehler aufgetreten"
-#: ../src/main.c:627
+#: ../src/main.c:607
+#, fuzzy, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "Synchronisiere die TV-Senderliste..."
+
+#: ../src/main.c:642
msgid "Initializing user configuration..."
msgstr "Initialisiere Benutzerkonfiguration..."
-#: ../src/main.c:634
+#: ../src/main.c:649
msgid "Loading user configuration..."
msgstr "Lade Benutzerkonfiguration..."
-#: ../src/main.c:693
+#: ../src/main.c:719
msgid "Synchronizing the list of tv channels..."
msgstr "Synchronisiere die TV-Senderliste..."
-#: ../src/main.c:726
+#: ../src/main.c:752
msgid "Loading the list of channels..."
msgstr "Lade Senderliste..."
-#: ../src/main.c:735
+#: ../src/main.c:761
#, fuzzy
msgid "Loading the list of recordings..."
msgstr "Lade Aufzeichnungsliste..."
-#: ../src/main.c:1051 ../src/main.c:1247
+#: ../src/main.c:1080 ../src/main.c:1276
#, fuzzy, c-format
msgid "Playing: %s"
msgstr "Wiedergabe: %s"
-#: ../src/main.c:1060
+#: ../src/main.c:1089
msgid "is playing"
msgstr "gibt wieder"
-#: ../src/main.c:1249
+#: ../src/main.c:1278
#, fuzzy, c-format
msgid "Stopping channel: %s"
msgstr "Stoppe Sender: %s"
-#: ../src/main.c:1293
+#: ../src/main.c:1322
msgid "is recording"
msgstr "nimmt auf"
-#: ../src/main.c:1340
+#: ../src/main.c:1369
#, fuzzy, c-format
msgid "Recording: %s"
msgstr "Aufzeichnung: %s"
-#: ../src/main.c:1465
+#: ../src/main.c:1494
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Sind Sie sicher, dass Sie beenden wollen?"
+# latin?
+#, fuzzy
+#~ msgid "Modern Greek Web TV and Radio"
+#~ msgstr "Neugriechisches Web TV und Radio"
+
+#~ msgid "Web TV (Modern Greek)"
+#~ msgstr "Internet-TV (griechisch)"
+
#~ msgid "60"
#~ msgstr "60"
diff --git a/po/pt.po b/po/es.po
similarity index 54%
copy from po/pt.po
copy to po/es.po
index 6b2215f..2a66e94 100644
--- a/po/pt.po
+++ b/po/es.po
@@ -1,148 +1,124 @@
-# Portugese translation of freetuxtv.
-# Copyright (C) 2008,2009,2010 GNU General Public License v3
-# This file is distributed under the same license as the freetuxtv package.
-# José JORGE <jjorge at free.fr>, 2009.
+# 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 <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: freetuxtv.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
-"PO-Revision-Date: 2009-12-13 22:57+0100\n"
-"Last-Translator: José JORGE <jjorge at free.fr>\n"
-"Language-Team: Portuguese <kde-i18n-doc at kde.org>\n"
-"Language: pt\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
+"PO-Revision-Date: 2012-11-3 16:22+GMT+4\n"
+"Last-Translator: Maximiliano Castañón Araneda <maximi89 at gmail.com>\n"
+"Language-Team: Español <es at li.org>\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.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/ui/addrecording.glade.h:1
-#, fuzzy
-msgid "<b>Recording period</b>"
-msgstr "<b>Destino</b>"
+msgid "Add a recording"
+msgstr "Agregar una grabación"
#: ../data/ui/addrecording.glade.h:2
-#, fuzzy
-msgid "Add a recording"
-msgstr "Adicionar um grupo"
+msgid "Selected channel:"
+msgstr "Canal seleccionado:"
#: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr ""
+msgid "Title:"
+msgstr "Título:"
#: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr ""
+msgid "Start time:"
+msgstr "Tiempo inicio:"
#: ../data/ui/addrecording.glade.h:5
-#, fuzzy
-msgid "Selected channel:"
-msgstr "canais"
+msgid "Duration:"
+msgstr "Duración:"
#: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr ""
+msgid "End time:"
+msgstr "Término:"
#: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr ""
+msgid "minutes"
+msgstr "minutos"
#: ../data/ui/addrecording.glade.h:8
-msgid "minutes"
-msgstr ""
+msgid "<b>Recording period</b>"
+msgstr "<b>Período de grabación</b>"
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "<b>Processing of channels' name</b>"
-msgstr ""
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Agrega un grupo"
#: ../data/ui/addchannelsgroups.glade.h:2
-#, fuzzy
-msgid "<b>Special group type:</b>"
-msgstr "Adicionar um grupo"
+msgid "Channels groups file:"
+msgstr "Archivo de grupos de canales:"
#: ../data/ui/addchannelsgroups.glade.h:3
-#, fuzzy
-msgid "Add a group"
-msgstr "Adicionar um grupo"
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
#: ../data/ui/addchannelsgroups.glade.h:4
-#, fuzzy
-msgid "Channels groups file:"
-msgstr "Ficheiro de grupos de canais :"
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Selecciona 1 o varios grupos de canales que quieras agregar y hace clic "
+"sobre el botón agregar."
#: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "Grupos de canais personalizados"
+msgid "Languages/Channels group"
+msgstr "Grupo Idioma/Canales"
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr ""
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "ISP Requerido"
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
msgstr ""
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
-msgstr "Grupos de canais conhecidos"
-
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr ""
+msgstr "Grupo existente de canales"
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
msgid "Group's name:"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:11
-#, fuzzy
-msgid "Languages/Channels group"
-msgstr "Grupos de canais personalizados"
+msgstr "Nombre grupo:"
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
msgid "Name of the group which will be added"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr ""
+msgstr "Nombre del grupo que será agregado"
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
-#, fuzzy
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
msgid "Playlist's URI:"
-msgstr "Endereço URI da lista de leitura :"
+msgstr "URI reproducción:"
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr ""
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "Lista de reproducción de URI que serán agregados"
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Elimina este texto antes del nombre:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:17
-#, fuzzy
-msgid "Special group"
-msgstr "Adicionar um grupo"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Elimina este texto detrás del nombre:"
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
msgid ""
"Text or regexp which must be deleted at the beginning of the channel's name"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
msgid ""
"You can easily use regular expressions to delete some text in the channel's "
"name of the groupe. For example, if in your playlist, you have a name like "
@@ -150,671 +126,1170 @@ msgid ""
"number before the name, by using the regular expression \"[0-9]* - \"."
msgstr ""
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>Nombre procesamiento de canales</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Grupo de canales personalizado"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Favoritos"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "<b>Special group type:</b>"
+msgstr "<b>Tipo de grupo especial:</b>"
+
#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
-msgstr ""
+msgid "Special group"
+msgstr "Grupo Especial"
#: ../data/ui/channelproperties.glade.h:1
-#, fuzzy
-msgid "<b>Channel VLC options:</b>"
-msgstr "<b>Destino</b>"
+msgid "Channel properties"
+msgstr "Propiedades del canal"
#: ../data/ui/channelproperties.glade.h:2
-#, fuzzy
-msgid "Channel properties"
-msgstr "Ficheiro de grupos de canais :"
+msgid "Channel's name:"
+msgstr "Nombre del canal:"
#: ../data/ui/channelproperties.glade.h:3
-#, fuzzy
msgid "Channel's URI:"
-msgstr "Canais"
+msgstr "URI del canal:"
#: ../data/ui/channelproperties.glade.h:4
-#, fuzzy
-msgid "Channel's name:"
-msgstr "Canais"
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>Opciones de canales VLC:</b>"
-#: ../data/ui/channelproperties.glade.h:5
-msgid "Deinterlacement:"
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
msgstr ""
-#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
-msgid "General"
-msgstr "Gerais"
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr ""
#: ../data/ui/channelproperties.glade.h:7
-msgid "Options"
-msgstr ""
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "ninguna"
#: ../data/ui/channelproperties.glade.h:8
-#: ../src/freetuxtv-window-channel-properties.c:175
-msgid "none"
-msgstr ""
+msgid "Options"
+msgstr "Opciones"
#: ../data/ui/freetuxtv.glade.h:1
-msgid " channels"
-msgstr "canais"
+msgid "GNU General Public License v3"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:2
-msgid "+"
-msgstr "+"
+msgid "Web TV channels player"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:3
-msgid "-"
-msgstr "-"
-
-#: ../data/ui/freetuxtv.glade.h:4
-msgid "0"
-msgstr "0"
+msgid "Project's Web Site"
+msgstr "Sitio web del proyecto"
+#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+msgid "translator-credits"
+msgstr "crédito traductores"
#: ../data/ui/freetuxtv.glade.h:6
-msgid "<b>Configuration file (vlcrc)</b>"
-msgstr ""
-
-#: ../data/ui/freetuxtv.glade.h:7
-#, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Notificações</b>"
-
-#: ../data/ui/freetuxtv.glade.h:8
-msgid "<b>Destination</b>"
-msgstr "<b>Destino</b>"
-
-#: ../data/ui/freetuxtv.glade.h:9
-msgid "<b>Notifications</b>"
-msgstr "<b>Notificações</b>"
-
-#: ../data/ui/freetuxtv.glade.h:11
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Versão : </b>"
-
-#: ../data/ui/freetuxtv.glade.h:12
-#, fuzzy
-msgid "<b>Search of channels</b>"
-msgstr "canais"
-
-#: ../data/ui/freetuxtv.glade.h:13
-msgid "<b>Startup</b>"
-msgstr "<b>Inicio</b>"
-
-#: ../data/ui/freetuxtv.glade.h:14
-#, fuzzy
-msgid "<b>Transcoding options</b>"
-msgstr "<b>Destino</b>"
-
-#: ../data/ui/freetuxtv.glade.h:15
-msgid "<i>Restart the application after changing this option.</i>"
-msgstr ""
-
-#: ../data/ui/freetuxtv.glade.h:16
-msgid "Activate/Deactivate the window always on top"
-msgstr ""
-
-#: ../data/ui/freetuxtv.glade.h:17
-msgid "Channels"
-msgstr "Canais"
+msgid "Group properties"
+msgstr "Propiedades del grupo"
#: ../data/ui/freetuxtv.glade.h:18
-msgid "Channels' search text area"
-msgstr ""
+msgid "Number of channels:"
+msgstr "Número de canales"
#: ../data/ui/freetuxtv.glade.h:19
-msgid "Delete the search text area"
+msgid "0"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:22
+#: ../data/ui/freetuxtv.glade.h:20
msgid "Details"
-msgstr "Detalhes"
+msgstr "Detalles"
+
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "Ver archivo"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "Preferencias"
#: ../data/ui/freetuxtv.glade.h:23
-#, fuzzy
-msgid "Directory Record:"
-msgstr "Pasta para as gravações :"
+msgid "Play last channel on startup"
+msgstr "Reproducir último canal en iniciar"
#: ../data/ui/freetuxtv.glade.h:24
-msgid "Download timeout (seconds) :"
-msgstr ""
+msgid "<b>Startup</b>"
+msgstr "<b>Inicio</b>"
#: ../data/ui/freetuxtv.glade.h:25
msgid "Enable desktop notifications"
-msgstr "Activar as notificações no ecrã"
+msgstr "Activar notificaciones del escritorio"
#: ../data/ui/freetuxtv.glade.h:26
-#, fuzzy
-msgid "Format:"
-msgstr "Formato :"
+msgid "<b>Notifications</b>"
+msgstr "<b>Notificaciones</b>"
-#: ../data/ui/freetuxtv.glade.h:27 ../data/menu/freetuxtv.desktop.in.h:1
-msgid "FreetuxTV"
-msgstr "FreetuxTV"
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:28
-msgid "Fullscreen mode"
-msgstr "Modo tela cheia"
+msgid "<b>Search of channels</b>"
+msgstr "<b>Búsqueda de canales</b>"
#: ../data/ui/freetuxtv.glade.h:29
-msgid "GNU General Public License v3"
-msgstr ""
+msgid "None"
+msgstr "Ninguno"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "Usar un archivo de configuración personalizado"
#: ../data/ui/freetuxtv.glade.h:31
-msgid "Go back to the normal mode"
-msgstr "Voltar ao modo normal"
+msgid "Use the VLC configuration file"
+msgstr "Usar el archivo de configuración de VLC"
#: ../data/ui/freetuxtv.glade.h:32
-#, fuzzy
-msgid "Go to the current channel playing"
-msgstr "Ler o canal actual"
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>Reinicia la aplicación después de hacer cambios.</i>"
#: ../data/ui/freetuxtv.glade.h:33
-msgid "Group properties"
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>Archivo configuración (vlcrc)</b>"
+
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:35
-msgid "HTTP"
-msgstr ""
+msgid "Directory Record:"
+msgstr "Directorio de grabación:"
#: ../data/ui/freetuxtv.glade.h:36
-msgid "Ignore diacritics"
-msgstr ""
+msgid "Select a directory"
+msgstr "Selecciona un directorio"
#: ../data/ui/freetuxtv.glade.h:37
-msgid "In progress"
-msgstr ""
+msgid "<b>Destination</b>"
+msgstr "<b>Destino</b>"
#: ../data/ui/freetuxtv.glade.h:38
-#, fuzzy
-msgid "Jump to current channel"
-msgstr "Ler o canal actual"
+msgid "No transcoding"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:39
-msgid "LibVLC"
+msgid "Predefined transcoding formats"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:40
-msgid "Manual proxy configuration"
+msgid "Format:"
+msgstr "Formato: "
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:42
-msgid "Network"
-msgstr ""
+msgid "Recordings"
+msgstr "Grabaciones"
#: ../data/ui/freetuxtv.glade.h:43
-#, fuzzy
-msgid "Next channel"
-msgstr "canais"
+msgid "Download timeout (seconds) :"
+msgstr "Tiempo fuera de la descarga (segundos) :"
#: ../data/ui/freetuxtv.glade.h:44
-msgid "No proxy"
-msgstr ""
+msgid "<b>Connection</b>"
+msgstr "<b>Conexión</b>"
#: ../data/ui/freetuxtv.glade.h:45
-msgid "No transcoding"
-msgstr "Sem transcodificação"
+msgid "No proxy"
+msgstr "Sin Proxy"
#: ../data/ui/freetuxtv.glade.h:46
-msgid "None"
-msgstr ""
+msgid "Manual proxy configuration"
+msgstr "Configuración manual del proxy"
#: ../data/ui/freetuxtv.glade.h:47
-#, fuzzy
-msgid "Number of channels:"
-msgstr "canais"
+msgid "Proxy server:"
+msgstr "Servidor Proxy:"
#: ../data/ui/freetuxtv.glade.h:48
-msgid "Password:"
-msgstr ""
+msgid "Proxy port:"
+msgstr "Puerto del Proxy:"
#: ../data/ui/freetuxtv.glade.h:49
-msgid "Play last channel on startup"
-msgstr "Ler o último canal ao arranque"
+msgid "Proxy type:"
+msgstr "Tipo Proxy:"
#: ../data/ui/freetuxtv.glade.h:50
-msgid "Play the current channel"
-msgstr "Ler o canal actual"
+msgid "Use authentification"
+msgstr "Usar autentificación"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "Nombre de Usuario:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "Clave:"
#: ../data/ui/freetuxtv.glade.h:53
-msgid "Predefined transcoding formats"
-msgstr "Formatos de transcodificação pré-definidos"
+msgid "<b>Proxy</b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:54
-msgid "Preferences"
-msgstr "Preferências"
+msgid "Network"
+msgstr "Red"
#: ../data/ui/freetuxtv.glade.h:55
-msgid "Previous channel"
-msgstr "Canal"
+msgid "HTTP"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:56
-msgid "Project's Web Site"
+msgid "SOCKS"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:57
-msgid "Proxy port:"
+msgid "Video - Theora + Vorbis (OGG)"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:58
-msgid "Proxy server:"
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:59
-msgid "Proxy type:"
+msgid "ogg"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:60
-#, fuzzy
-msgid "Record the current channel"
-msgstr "Ler o canal actual"
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:61
-msgid "Recordings"
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:62
-msgid "SOCKS"
+msgid "mp4"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:63
-msgid "Search:"
+msgid "Video - MPEG-2 + MPGA (TS)"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:64
-msgid "Select a directory"
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:65
-msgid "Small mode"
+msgid "ts"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:66
-#, fuzzy
-msgid "Stop playing the current channel"
-msgstr "Ler o canal actual"
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:67
-msgid "Terminated"
-msgstr ""
+msgid "Search:"
+msgstr "Búsqueda:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "Búsqueda de canales del área de texto"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "Borrar el texto del área de búsqueda"
#: ../data/ui/freetuxtv.glade.h:70
-msgid "Use a custom configuration file"
-msgstr ""
+msgid "Jump to current channel"
+msgstr "Saltar al canal actual"
#: ../data/ui/freetuxtv.glade.h:71
-msgid "Use authentification"
-msgstr ""
+msgid "Go to the current channel playing"
+msgstr "Ir a la lista de reproducción actual"
#: ../data/ui/freetuxtv.glade.h:72
-msgid "Use the VLC configuration file"
-msgstr ""
+msgid "Channels"
+msgstr "Canales"
#: ../data/ui/freetuxtv.glade.h:73
-msgid "Username:"
-msgstr ""
+msgid "In progress"
+msgstr "En progreso"
#: ../data/ui/freetuxtv.glade.h:74
-msgid "Video - H.264 + MPGA (MP4)"
-msgstr ""
+msgid "Terminated"
+msgstr "Terminado"
#: ../data/ui/freetuxtv.glade.h:75
-msgid "Video - MPEG-2 + MPGA (TS)"
+msgid "00:00:00"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:76
-msgid "Video - Theora + Vorbis (OGG)"
-msgstr ""
+msgid "Previous channel"
+msgstr "Canal anterior"
#: ../data/ui/freetuxtv.glade.h:77
-msgid "View file"
-msgstr ""
+msgid "Play the current channel"
+msgstr "Reproducir canal actual"
#: ../data/ui/freetuxtv.glade.h:78
-msgid "Vol:"
-msgstr ""
+msgid "Stop playing the current channel"
+msgstr "Parar reproducción del canal actual"
#: ../data/ui/freetuxtv.glade.h:79
-#, fuzzy
-msgid "Web TV channels player"
-msgstr "Actualizar a lista de canais \"%s\""
+msgid "Record the current channel"
+msgstr "Grabar el canal actual"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "Siguiente canal"
#: ../data/ui/freetuxtv.glade.h:81
-msgid "mp4"
+msgid "Vol:"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:82
-msgid "ogg"
+msgid "-"
msgstr ""
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: ../data/ui/freetuxtv.glade.h:84
-msgid "translator-credits"
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
msgstr ""
+#: ../data/ui/freetuxtv.glade.h:84
+msgid "Fullscreen mode"
+msgstr "Modo pantalla completa"
+
#: ../data/ui/freetuxtv.glade.h:85
-msgid "ts"
-msgstr ""
+msgid "Small mode"
+msgstr "Modo pequeño"
#: ../data/ui/freetuxtv.glade.h:86
-msgid ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
-msgstr ""
+msgid " channels"
+msgstr " canales"
#: ../data/ui/freetuxtv.glade.h:87
-msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
-msgstr ""
+msgid "Go back to the normal mode"
+msgstr "Volver a modo normal"
#: ../data/ui/freetuxtv.glade.h:88
-msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
-msgstr ""
+msgid "Activate/Deactivate the window always on top"
+msgstr "Activa/Desactiva ventana siempre encima"
#: ../data/channels_groups.xml.in.h:1
msgid "Alice (Unofficial)"
msgstr ""
#: ../data/channels_groups.xml.in.h:2
-msgid "Arabic Web TV and Radio"
+msgid "SFR TV (Unofficial)"
msgstr ""
#: ../data/channels_groups.xml.in.h:3
+#, fuzzy
+msgid "Afrikaans Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:4
+msgid "Web TV (Afrikaans)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:5
+#, fuzzy
+msgid "Albanian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:6
+msgid "Web TV (Albanian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:7
+#, fuzzy
+msgid "Amharic Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:8
+msgid "Web TV (Amharic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:9
+msgid "Arabic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:10
+msgid "Web TV (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:11
+msgid "Web Radio (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:12
+msgid "Web Cam (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:13
+#, fuzzy
+msgid "Armenian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:14
+msgid "Web TV (Armenian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:15
+#, fuzzy
+msgid "Azerbaijani Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:16
+msgid "Web TV (Azerbaijani)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:17
+#, fuzzy
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:18
+msgid "Web TV (Bengali/Bangla)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:19
+#, fuzzy
+msgid "Bulgarian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:20
+msgid "Web TV (Bulgarian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:21
+#, fuzzy
+msgid "Cambodian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:22
+msgid "Web TV (Cambodian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:23
msgid "Catalan Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:4
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:26
msgid "Chinese Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:5
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:29
+#, fuzzy
+msgid "Croatian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:30
+msgid "Web TV (Croatian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:31
+#, fuzzy
+msgid "Web Radio (Croatian)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:32
msgid "Czech Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:6
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:34
+#, fuzzy
+msgid "Web Radio (Czech)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:35
+#, fuzzy
+msgid "Danish Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:36
+#, fuzzy
+msgid "Web TV (Danish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:37
msgid "Dutch Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:7
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:39
+#, fuzzy
+msgid "Web Radio (Dutch)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:40
+msgid "Web Cam (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:41
msgid "English Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:8
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:45
+#, fuzzy
+msgid "Web Cam (English)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:46
+#, fuzzy
+msgid "Estonian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:47
+msgid "Web TV (Estonian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:48
+#, fuzzy
+msgid "Finnish Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:49
+#, fuzzy
+msgid "Web TV (Finnish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:50
msgid "French Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:9
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:54
+#, fuzzy
+msgid "Georgian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:55
+msgid "Web TV (Georgian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:56
msgid "German Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:10
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:59
msgid "Greek Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:11
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:61
+#, fuzzy
+msgid "Web Radio (Greek)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:62
+#, fuzzy
+msgid "Hebrew Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:63
+msgid "Web TV (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:64
+#, fuzzy
+msgid "Web Radio (Hebrew)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:65
+msgid "Web Cam (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:66
+#, fuzzy
+msgid "Hindi Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:67
+msgid "Web TV (Hindi)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:68
+#, fuzzy
+msgid "Web Radio (Hindi)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:69
msgid "Hungarian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:12
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:71
+#, fuzzy
+msgid "Icelandic Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:72
+msgid "Web TV (Icelandic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:73
+#, fuzzy
+msgid "Indonesian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:74
+msgid "Web TV (Indonesian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:75
+#, fuzzy
+msgid "Interlingua Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:76
+#, fuzzy
+msgid "Web Radio (Interlingua)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:77
+#, fuzzy
+msgid "Irish Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:78
+#, fuzzy
+msgid "Web TV (Irish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:79
+#, fuzzy
+msgid "Web Radio (Irish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:80
msgid "Italian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:13
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:83
msgid "Japanese Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:14
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:85
+#, fuzzy
+msgid "Web Radio (Japanese)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:86
+#, fuzzy
+msgid "Web Cam (Japanese)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:87
+#, fuzzy
+msgid "Kazakh Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:88
+msgid "Web TV (Kazakh)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:89
msgid "Korean Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:15
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:91
+#, fuzzy
+msgid "Kurdish Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:92
+msgid "Web TV (Kurdish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:93
msgid "Latin Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:16
-msgid "Modern Greek Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:17
-msgid "No lang Web TV and Radio"
-msgstr ""
+#: ../data/channels_groups.xml.in.h:95
+#, fuzzy
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
-#: ../data/channels_groups.xml.in.h:18
-msgid "Norwegian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:96
+msgid "Web TV (Latvian/Lettish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:19
-msgid "Persian Web TV and Radio"
-msgstr ""
+#: ../data/channels_groups.xml.in.h:97
+#, fuzzy
+msgid "Lithuanian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
-#: ../data/channels_groups.xml.in.h:20
-msgid "Polish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:98
+msgid "Web TV (Lithuanian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:21
-msgid "Portuguese Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:99
+#, fuzzy
+msgid "Macedonian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:100
+msgid "Web TV (Macedonian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:22
-msgid "Romanian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:101
+#, fuzzy
+msgid "Web Radio (Macedonian)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:102
+#, fuzzy
+msgid "Malay Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:103
+msgid "Web TV (Malay)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:23
-msgid "Russian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:104
+#, fuzzy
+msgid "Malayalam Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:105
+msgid "Web TV (Malayalam)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:24
-msgid "SFR TV (Unofficial)"
+#: ../data/channels_groups.xml.in.h:106
+#, fuzzy
+msgid "Maltese Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:107
+msgid "Web TV (Maltese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:25
-msgid "Slovak Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:108
+#, fuzzy
+msgid "Web Radio (Maltese)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:109
+#, fuzzy
+msgid "Moldavian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:110
+msgid "Web TV (Moldavian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:26
-msgid "Spanish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:111
+#, fuzzy
+msgid "Mongolian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:112
+msgid "Web TV (Mongolian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:27
-msgid "Swedish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:113
+msgid "Norwegian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:28
-msgid "Thai Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:29
-msgid "Turkish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:115
+msgid "Persian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:30
-msgid "Web Programmes (English)"
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:31
-msgid "Web Programmes (French)"
+#: ../data/channels_groups.xml.in.h:117
+msgid "Polish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:32
-msgid "Web Radio (Arabic)"
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:33
-msgid "Web Radio (Catalan)"
+#: ../data/channels_groups.xml.in.h:119
+#, fuzzy
+msgid "Web Radio (Polish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:120
+#, fuzzy
+msgid "Web Cam (Polish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:121
+msgid "Portuguese Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:34
-msgid "Web Radio (Chinese)"
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:35
-msgid "Web Radio (English)"
+#: ../data/channels_groups.xml.in.h:123
+#, fuzzy
+msgid "Web Radio (Portuguese)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:124
+#, fuzzy
+msgid "Punjabi Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:125
+msgid "Web TV (Punjabi)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:36
-msgid "Web Radio (French)"
+#: ../data/channels_groups.xml.in.h:126
+msgid "Romanian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:37
-msgid "Web Radio (German)"
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:38
-msgid "Web Radio (Italian)"
+#: ../data/channels_groups.xml.in.h:128
+#, fuzzy
+msgid "Web Radio (Romanian)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:129
+msgid "Russian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:39
-msgid "Web Radio (No lang)"
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:40
+#: ../data/channels_groups.xml.in.h:131
msgid "Web Radio (Russian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:41
-msgid "Web Radio (Spanish)"
-msgstr ""
+#: ../data/channels_groups.xml.in.h:132
+#, fuzzy
+msgid "Serbian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
-#: ../data/channels_groups.xml.in.h:42
-msgid "Web TV (Arabic)"
+#: ../data/channels_groups.xml.in.h:133
+msgid "Web TV (Serbian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:43
-msgid "Web TV (Catalan)"
-msgstr ""
+#: ../data/channels_groups.xml.in.h:134
+#, fuzzy
+msgid "Web Radio (Serbian)"
+msgstr "Radio Web (Español)"
-#: ../data/channels_groups.xml.in.h:44
-msgid "Web TV (Chinese)"
-msgstr ""
+#: ../data/channels_groups.xml.in.h:135
+#, fuzzy
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
-#: ../data/channels_groups.xml.in.h:45
-msgid "Web TV (Czech)"
+#: ../data/channels_groups.xml.in.h:136
+msgid "Web TV (Serbo-Croatian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:46
-msgid "Web TV (Dutch)"
+#: ../data/channels_groups.xml.in.h:137
+#, fuzzy
+msgid "Web Radio (Serbo-Croatian)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:47
-msgid "Web TV (English)"
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:48
-msgid "Web TV (French)"
+#: ../data/channels_groups.xml.in.h:140
+#, fuzzy
+msgid "Web Radio (Slovak)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:141
+#, fuzzy
+msgid "Slovenian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:142
+msgid "Web TV (Slovenian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:49
-msgid "Web TV (German)"
+#: ../data/channels_groups.xml.in.h:143
+#, fuzzy
+msgid "Web Radio (Slovenian)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:50
-msgid "Web TV (Greek)"
+#: ../data/channels_groups.xml.in.h:146
+msgid "Web Radio (Spanish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:147
+#, fuzzy
+msgid "Web Programmes (Spanish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:148
+#, fuzzy
+msgid "Web Cam (Spanish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:51
-msgid "Web TV (Hungarian)"
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:52
-msgid "Web TV (Italian)"
+#: ../data/channels_groups.xml.in.h:151
+#, fuzzy
+msgid "Tagalog Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:152
+msgid "Web TV (Tagalog)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:53
-msgid "Web TV (Japanese)"
+#: ../data/channels_groups.xml.in.h:153
+#, fuzzy
+msgid "Tamil Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:154
+msgid "Web TV (Tamil)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:54
-msgid "Web TV (Korean)"
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:55
-msgid "Web TV (Latin)"
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:56
-msgid "Web TV (Modern Greek)"
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:57
-msgid "Web TV (No lang)"
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:58
-msgid "Web TV (Norwegian)"
+#: ../data/channels_groups.xml.in.h:159
+#, fuzzy
+msgid "Web Radio (Turkish)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:160
+#, fuzzy
+msgid "Turkmen Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:161
+msgid "Web TV (Turkmen)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:59
-msgid "Web TV (Persian)"
+#: ../data/channels_groups.xml.in.h:162
+#, fuzzy
+msgid "Ukrainian Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:163
+msgid "Web TV (Ukrainian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:60
-msgid "Web TV (Polish)"
+#: ../data/channels_groups.xml.in.h:164
+msgid "Web Cam (Ukrainian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:61
-msgid "Web TV (Portuguese)"
+#: ../data/channels_groups.xml.in.h:165
+#, fuzzy
+msgid "Urdu Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:166
+msgid "Web TV (Urdu)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:62
-msgid "Web TV (Romanian)"
+#: ../data/channels_groups.xml.in.h:167
+#, fuzzy
+msgid "Uzbek Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:168
+msgid "Web TV (Uzbek)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:63
-msgid "Web TV (Russian)"
+#: ../data/channels_groups.xml.in.h:169
+#, fuzzy
+msgid "Vietnamese Web TV and Radio"
+msgstr "Español, Canales TV y Radio"
+
+#: ../data/channels_groups.xml.in.h:170
+msgid "Web TV (Vietnamese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:64
-msgid "Web TV (Slovak)"
+#: ../data/channels_groups.xml.in.h:171
+#, fuzzy
+msgid "Web Radio (Vietnamese)"
+msgstr "Radio Web (Español)"
+
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:65
-msgid "Web TV (Spanish)"
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:66
-msgid "Web TV (Swedish)"
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:67
-msgid "Web TV (Thai)"
+#: ../data/channels_groups.xml.in.h:175
+msgid "Web Programmes (No lang)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:68
-msgid "Web TV (Turkish)"
+#: ../data/channels_groups.xml.in.h:176
+msgid "Web Cam (No lang)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:69
+#: ../data/channels_groups.xml.in.h:177
msgid "WebCam"
msgstr ""
#: ../data/menu/freetuxtv.desktop.in.h:2
-msgid "FreetuxTV Television Channels Player"
+msgid "Television Channels Player"
msgstr ""
#: ../data/menu/freetuxtv.desktop.in.h:3
-msgid "Television Channels Player"
+msgid "FreetuxTV Television Channels Player"
msgstr ""
#: ../data/menu/freetuxtv.desktop.in.h:4
msgid "Watch television channels from internet"
-msgstr ""
+msgstr "Ver canales de TV desde Internet"
-#: ../src/freetuxtv-cellrenderer-recordingslist.c:348
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
#, c-format
-msgid "%lld min"
+msgid "%ld min"
msgstr ""
#. Update status bar
#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
#, c-format
msgid "Update \"%s\" channels list"
-msgstr "Actualizar a lista de canais \"%s\""
+msgstr "Actualizando \"%s\" lista de canales"
#. Get the file of the playlist
#: ../src/freetuxtv-channels-list.c:327 ../src/freetuxtv-channels-list.c:447
#, c-format
msgid "Getting the file: \"%s\""
-msgstr ""
+msgstr "Obteniendo el archivo: \"%s\""
#: ../src/freetuxtv-channels-list.c:358 ../src/freetuxtv-channels-list.c:478
#, c-format
@@ -825,20 +1300,19 @@ msgid ""
"%s."
msgstr ""
-#: ../src/freetuxtv-channels-list.c:1322
+#: ../src/freetuxtv-channels-list.c:1335
msgid "Delete group's channels"
-msgstr ""
+msgstr "Borrar grupo de canales"
#. Add to favourite is only for channels
-#: ../src/freetuxtv-channels-list.c:1372
+#: ../src/freetuxtv-channels-list.c:1385
msgid "Add to favourites"
-msgstr ""
+msgstr "Agregar a favoritos"
#. Add favourites to a new group
-#: ../src/freetuxtv-channels-list.c:1388
-#, fuzzy
+#: ../src/freetuxtv-channels-list.c:1401
msgid "New group"
-msgstr "Adicionar um grupo"
+msgstr "Nuevo grupo"
#: ../src/freetuxtv-db-sync.c:160
#, c-format
@@ -1093,10 +1567,10 @@ msgstr ""
msgid "Do you want to move the related file on the hard disk to the trash?"
msgstr ""
-#: ../src/freetuxtv-tv-channels-list.c:67
+#: ../src/freetuxtv-tv-channels-list.c:69
#, c-format
msgid "Synchronizing the tv channels list"
-msgstr ""
+msgstr "Sincronizando la lista de canales de TV"
#: ../src/freetuxtv-utils.c:37
#, c-format
@@ -1133,114 +1607,142 @@ msgstr ""
msgid "%1.1f GB"
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:376
+#: ../src/freetuxtv-window-add-channels-group.c:395
#, c-format
msgid "Please select a least one group !"
-msgstr ""
+msgstr "Por favor selecciona al menos 1 grupo !"
-#: ../src/freetuxtv-window-add-channels-group.c:382
-#: ../src/freetuxtv-window-add-channels-group.c:530
-#: ../src/freetuxtv-window-add-channels-group.c:584
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
msgid "Adding channels groups"
-msgstr ""
+msgstr "Agregando grupos de canales"
#. Update progress dialog
-#: ../src/freetuxtv-window-add-channels-group.c:422
-#: ../src/freetuxtv-window-add-channels-group.c:466
-#: ../src/freetuxtv-window-add-channels-group.c:548
-#: ../src/freetuxtv-window-add-channels-group.c:592
-#, fuzzy, c-format
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
+#, c-format
msgid "Adding channels group: <i>%s</i>"
-msgstr "Grupos de canais conhecidos"
+msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:494
-#: ../src/freetuxtv-window-add-channels-group.c:561
-#: ../src/freetuxtv-window-add-channels-group.c:605
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
#, c-format
msgid "%d channels group(s) have been successfully added."
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:522
-#: ../src/freetuxtv-window-add-channels-group.c:579
-#: ../src/freetuxtv-window-main.c:1980
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
#, c-format
msgid "Please enter the group's name !"
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:525
-#: ../src/freetuxtv-window-main.c:1985
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
#, c-format
msgid "Please enter the group's URI !"
msgstr ""
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "_Actualizar listado de canales de TV"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, fuzzy, c-format
+msgid "Downloading the file '%s'"
+msgstr "Obteniendo el archivo: \"%s\""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+#, fuzzy
+msgid "Synchronizing TV channels from file"
+msgstr "Sincronizando la lista de canales de TV"
+
#. Menu : FreetuxTV
-#: ../src/freetuxtv-window-main.c:277
+#: ../src/freetuxtv-window-main.c:278
msgid "_FreetuxTV"
msgstr ""
#. End Menu : FreetuxTV
#. Menu : Channels
-#: ../src/freetuxtv-window-main.c:298
+#: ../src/freetuxtv-window-main.c:299
msgid "_Channels"
-msgstr ""
+msgstr "_Canales"
-#: ../src/freetuxtv-window-main.c:302
+#: ../src/freetuxtv-window-main.c:303
msgid "_Add a group"
+msgstr "Agregar _grupo"
+
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
msgstr ""
-#: ../src/freetuxtv-window-main.c:308
+#: ../src/freetuxtv-window-main.c:311
#, fuzzy
-msgid "_Update TV channels list"
-msgstr "Actualizar a lista de canais \"%s\""
+msgid "_Synchronize TV channels database"
+msgstr "Sincronizando la lista de canales de TV"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
#. End Menu : Channels
#. Menu : Video
-#: ../src/freetuxtv-window-main.c:317
+#: ../src/freetuxtv-window-main.c:322
msgid "_Video"
msgstr ""
#. SubMenu : Deinterlace
-#: ../src/freetuxtv-window-main.c:322
+#: ../src/freetuxtv-window-main.c:327
msgid "_Deinterlace"
msgstr ""
-#: ../src/freetuxtv-window-main.c:327
+#: ../src/freetuxtv-window-main.c:332
msgid "Disable"
-msgstr ""
+msgstr "Desactivar"
-#: ../src/freetuxtv-window-main.c:339
+#: ../src/freetuxtv-window-main.c:344
msgid "Blend"
msgstr ""
-#: ../src/freetuxtv-window-main.c:348
+#: ../src/freetuxtv-window-main.c:353
msgid "Bob"
msgstr ""
-#: ../src/freetuxtv-window-main.c:357
+#: ../src/freetuxtv-window-main.c:362
msgid "Discard"
-msgstr ""
+msgstr "Cancelar"
-#: ../src/freetuxtv-window-main.c:366
+#: ../src/freetuxtv-window-main.c:371
msgid "Linear"
msgstr ""
-#: ../src/freetuxtv-window-main.c:375
+#: ../src/freetuxtv-window-main.c:380
msgid "Mean"
-msgstr ""
+msgstr "Significado"
-#: ../src/freetuxtv-window-main.c:384
+#: ../src/freetuxtv-window-main.c:389
msgid "X"
msgstr ""
#. End SubMenu : Deinterlace
#. End Menu : Video
#. Menu : Help
-#: ../src/freetuxtv-window-main.c:396
+#: ../src/freetuxtv-window-main.c:401
msgid "_Help"
-msgstr "_Ajuda"
+msgstr "_Ayuda"
#. Create the menu items
-#: ../src/freetuxtv-window-main.c:1024
+#: ../src/freetuxtv-window-main.c:1029
msgid "Mute"
msgstr ""
@@ -1259,80 +1761,56 @@ msgstr ""
#: ../src/main.c:581
msgid "An error occurred"
-msgstr ""
+msgstr "Ocurrió un error"
-#: ../src/main.c:627
+#: ../src/main.c:607
+#, fuzzy, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "Sincronizando la lista de canales de TV"
+
+#: ../src/main.c:642
msgid "Initializing user configuration..."
-msgstr ""
+msgstr "Inicializando configuración del usuario..."
-#: ../src/main.c:634
+#: ../src/main.c:649
msgid "Loading user configuration..."
-msgstr ""
+msgstr "Cargando configuración del usuario..."
-#: ../src/main.c:693
+#: ../src/main.c:719
msgid "Synchronizing the list of tv channels..."
msgstr ""
-#: ../src/main.c:726
+#: ../src/main.c:752
msgid "Loading the list of channels..."
-msgstr ""
+msgstr "Cargando listado de canales..."
-#: ../src/main.c:735
+#: ../src/main.c:761
msgid "Loading the list of recordings..."
-msgstr ""
+msgstr "Cargando listado de grabaciones..."
-#: ../src/main.c:1051 ../src/main.c:1247
+#: ../src/main.c:1080 ../src/main.c:1276
#, c-format
msgid "Playing: %s"
-msgstr ""
+msgstr "Reproduciendo: %s"
-#: ../src/main.c:1060
+#: ../src/main.c:1089
msgid "is playing"
-msgstr ""
+msgstr "está reproduciendo"
-#: ../src/main.c:1249
-#, fuzzy, c-format
+#: ../src/main.c:1278
+#, c-format
msgid "Stopping channel: %s"
-msgstr "canais"
+msgstr "Parando canal: %s"
-#: ../src/main.c:1293
+#: ../src/main.c:1322
msgid "is recording"
-msgstr ""
+msgstr "está grabando"
-#: ../src/main.c:1340
+#: ../src/main.c:1369
#, c-format
msgid "Recording: %s"
-msgstr ""
+msgstr "Grabando: %s"
-#: ../src/main.c:1465
+#: ../src/main.c:1494
msgid "Are you sure you want to quit?"
-msgstr ""
-
-#, fuzzy
-#~ msgid "60"
-#~ msgstr "0"
-
-#~ msgid "<b>Author : </b>"
-#~ msgstr "<b>Autor : </b>"
-
-#~ msgid "<b>Version : </b>"
-#~ msgstr "<b>Versão : </b>"
-
-#~ msgid ""
-#~ "<span size=\"xx-large\"><b>FreetuxTV</b></span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Web TV channels player</span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Loading...</span>"
-#~ msgstr ""
-#~ "<span size=\"xx-large\"><b>FreetuxTV</b></span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Leitor de canais TV pela rede</span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Carregando...</span>"
-
-#~ msgid "Eric Beuque"
-#~ msgstr "Eric Beuque"
-
-#~ msgid "_Update logos list"
-#~ msgstr "Act_ualizar a lista de logotipos"
+msgstr "Estás seguro que quieres salir?"
diff --git a/po/fr.po b/po/fr.po
index b056f5f..16de11c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freetuxtv.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
"PO-Revision-Date: 2010-08-03 23:14+0200\n"
"Last-Translator: Yannick LE NY <yleny at laposte.net>\n"
"Language-Team: FR <eric.beuque at gmail.com>\n"
@@ -18,125 +18,109 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../data/ui/addrecording.glade.h:1
-msgid "<b>Recording period</b>"
-msgstr "<b>Période d'enregistrement</b>"
-
-#: ../data/ui/addrecording.glade.h:2
msgid "Add a recording"
msgstr "Ajout d'un enregistrement"
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Chaîne séléctionné:"
+
#: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr "Durée :"
+msgid "Title:"
+msgstr "Titre :"
#: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr "Heure de fin :"
+msgid "Start time:"
+msgstr "Heure de début :"
#: ../data/ui/addrecording.glade.h:5
-msgid "Selected channel:"
-msgstr "Chaîne séléctionné:"
+msgid "Duration:"
+msgstr "Durée :"
#: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr "Heure de début :"
+msgid "End time:"
+msgstr "Heure de fin :"
#: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr "Titre :"
-
-#: ../data/ui/addrecording.glade.h:8
msgid "minutes"
msgstr "minutes"
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "<b>Processing of channels' name</b>"
-msgstr "<b>Traitement du nom des chaînes</b>"
-
-#: ../data/ui/addchannelsgroups.glade.h:2
-msgid "<b>Special group type:</b>"
-msgstr "<b>Type du groupe spécial :</b>"
+#: ../data/ui/addrecording.glade.h:8
+msgid "<b>Recording period</b>"
+msgstr "<b>Période d'enregistrement</b>"
-#: ../data/ui/addchannelsgroups.glade.h:3
+#: ../data/ui/addchannelsgroups.glade.h:1
msgid "Add a group"
msgstr "_Ajouter un groupe"
-#: ../data/ui/addchannelsgroups.glade.h:4
+#: ../data/ui/addchannelsgroups.glade.h:2
msgid "Channels groups file:"
msgstr "Fichier des groupes de chaînes :"
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Sélectionnez un ou plusieurs groupes de chaînes que vous voulez ajouter et "
+"cliquez sur le bouton Ajouter."
+
#: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "Groupe personnalisé de chaînes"
+msgid "Languages/Channels group"
+msgstr "Groupe Langues/Chaînes"
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr "Texte à enlever au début :"
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "FAI requis"
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
-msgstr "Texte à enlever à la fin :"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
msgstr "Groupe des chaînes existantes"
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "Favoris"
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
msgid "Group's name:"
msgstr "Nom du groupe :"
-#: ../data/ui/addchannelsgroups.glade.h:11
-msgid "Languages/Channels group"
-msgstr "Groupe Langues/Chaînes"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
msgid "Name of the group which will be added"
msgstr "Nom du groupe à ajouter"
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr "URI de la playlist du groupe à ajouter"
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
msgid "Playlist's URI:"
msgstr "URI de la playlist :"
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr "FAI requis"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "URI de la playlist du groupe à ajouter"
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Texte à enlever au début :"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
msgstr ""
-"Sélectionnez un ou plusieurs groupes de chaînes que vous voulez ajouter et "
-"cliquez sur le bouton Ajouter."
+"Texte ou expression régulière qui sera retiré à la fin du nom de la chaîne"
-#: ../data/ui/addchannelsgroups.glade.h:17
-msgid "Special group"
-msgstr "Groupe spécial"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Texte à enlever à la fin :"
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
msgid ""
"Text or regexp which must be deleted at the beginning of the channel's name"
msgstr ""
"Texte ou expression régulière qui sera retiré au début du nom de la chaîne"
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr ""
-"Texte ou expression régulière qui sera retiré à la fin du nom de la chaîne"
-
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
msgid ""
"You can easily use regular expressions to delete some text in the channel's "
"name of the groupe. For example, if in your playlist, you have a name like "
@@ -149,645 +133,1093 @@ msgstr ""
"12\", FreetuxTV peut enlever automatiquement le numéro de chaînes devant, en "
"spécifiant l'expression \"[0-9]* - \"."
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>Traitement du nom des chaînes</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Groupe personnalisé de chaînes"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Favoris"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "<b>Special group type:</b>"
+msgstr "<b>Type du groupe spécial :</b>"
+
#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
-msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgid "Special group"
+msgstr "Groupe spécial"
#: ../data/ui/channelproperties.glade.h:1
-msgid "<b>Channel VLC options:</b>"
-msgstr "<b>Options VLC de la chaîne:</b>"
-
-#: ../data/ui/channelproperties.glade.h:2
msgid "Channel properties"
msgstr "Propriété de la chaîne"
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Nom de la chaîne :"
+
#: ../data/ui/channelproperties.glade.h:3
msgid "Channel's URI:"
msgstr "URI de la chaîne :"
#: ../data/ui/channelproperties.glade.h:4
-msgid "Channel's name:"
-msgstr "Nom de la chaîne :"
-
-#: ../data/ui/channelproperties.glade.h:5
-msgid "Deinterlacement:"
-msgstr "Désentrelacement :"
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>Options VLC de la chaîne:</b>"
-#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
msgid "General"
msgstr "Général"
-#: ../data/ui/channelproperties.glade.h:7
-msgid "Options"
-msgstr "Options"
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Désentrelacement :"
-#: ../data/ui/channelproperties.glade.h:8
-#: ../src/freetuxtv-window-channel-properties.c:175
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
msgid "none"
msgstr "aucun"
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Options"
+
#: ../data/ui/freetuxtv.glade.h:1
-msgid " channels"
-msgstr " chaînes"
+msgid "GNU General Public License v3"
+msgstr "GNU General Public License v3"
#: ../data/ui/freetuxtv.glade.h:2
-msgid "+"
-msgstr "+"
+msgid "Web TV channels player"
+msgstr "Lecteur de chaînes de télévision et radio sur Internet"
#: ../data/ui/freetuxtv.glade.h:3
-msgid "-"
-msgstr "-"
-
-#: ../data/ui/freetuxtv.glade.h:4
-msgid "0"
-msgstr "0"
+msgid "Project's Web Site"
+msgstr "Site Web du projet"
+#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+msgid "translator-credits"
+msgstr "translator-credits"
#: ../data/ui/freetuxtv.glade.h:6
-msgid "<b>Configuration file (vlcrc)</b>"
-msgstr "<b>Fichier de configuration (vlcrc)</b>"
-
-#: ../data/ui/freetuxtv.glade.h:7
-msgid "<b>Connection</b>"
-msgstr "<b>Connexion</b>"
-
-#: ../data/ui/freetuxtv.glade.h:8
-msgid "<b>Destination</b>"
-msgstr "<b>Destination</b>"
-
-#: ../data/ui/freetuxtv.glade.h:9
-msgid "<b>Notifications</b>"
-msgstr "<b>Notifications</b>"
-
-#: ../data/ui/freetuxtv.glade.h:11
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/ui/freetuxtv.glade.h:12
-msgid "<b>Search of channels</b>"
-msgstr "<b>Recherche de chaînes</b>"
-
-#: ../data/ui/freetuxtv.glade.h:13
-msgid "<b>Startup</b>"
-msgstr "<b>Démarrage</b>"
-
-#: ../data/ui/freetuxtv.glade.h:14
-msgid "<b>Transcoding options</b>"
-msgstr "<b>Options de transcodage</b>"
-
-#: ../data/ui/freetuxtv.glade.h:15
-msgid "<i>Restart the application after changing this option.</i>"
-msgstr "<i>Redémarrer l'application après avoir changé cette option.</i>"
-
-#: ../data/ui/freetuxtv.glade.h:16
-msgid "Activate/Deactivate the window always on top"
-msgstr "Active/Désactive fenêtre toujours au premier plan"
-
-#: ../data/ui/freetuxtv.glade.h:17
-msgid "Channels"
-msgstr "Chaînes"
+msgid "Group properties"
+msgstr "Propriétés du groupe"
#: ../data/ui/freetuxtv.glade.h:18
-msgid "Channels' search text area"
-msgstr "Zone de recherche de chaînes"
+msgid "Number of channels:"
+msgstr "Nombre de chaînes :"
#: ../data/ui/freetuxtv.glade.h:19
-msgid "Delete the search text area"
-msgstr "Effacer la zone de texte de recherche"
+msgid "0"
+msgstr "0"
-#: ../data/ui/freetuxtv.glade.h:22
+#: ../data/ui/freetuxtv.glade.h:20
msgid "Details"
msgstr "Détails"
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "Voir le fichier"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "Préférences"
+
#: ../data/ui/freetuxtv.glade.h:23
-msgid "Directory Record:"
-msgstr "Dossier des enregistrements :"
+msgid "Play last channel on startup"
+msgstr "Lire la dernière chaîne au démarrage"
#: ../data/ui/freetuxtv.glade.h:24
-msgid "Download timeout (seconds) :"
-msgstr "Timeout de téléchargement (secondes) :"
+msgid "<b>Startup</b>"
+msgstr "<b>Démarrage</b>"
#: ../data/ui/freetuxtv.glade.h:25
msgid "Enable desktop notifications"
msgstr "Activer les notifications du bureau"
#: ../data/ui/freetuxtv.glade.h:26
-msgid "Format:"
-msgstr "Format :"
+msgid "<b>Notifications</b>"
+msgstr "<b>Notifications</b>"
-#: ../data/ui/freetuxtv.glade.h:27 ../data/menu/freetuxtv.desktop.in.h:1
-msgid "FreetuxTV"
-msgstr "FreetuxTV"
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr "Ignorer les diacritiques"
#: ../data/ui/freetuxtv.glade.h:28
-msgid "Fullscreen mode"
-msgstr "Mode plein écran"
+msgid "<b>Search of channels</b>"
+msgstr "<b>Recherche de chaînes</b>"
#: ../data/ui/freetuxtv.glade.h:29
-msgid "GNU General Public License v3"
-msgstr "GNU General Public License v3"
+msgid "None"
+msgstr "Aucun"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "Utiliser un fichier de configuration personalisé"
#: ../data/ui/freetuxtv.glade.h:31
-msgid "Go back to the normal mode"
-msgstr "Revenir au mode normal"
+msgid "Use the VLC configuration file"
+msgstr "Utiliser le fichier de configuration de VLC"
#: ../data/ui/freetuxtv.glade.h:32
-msgid "Go to the current channel playing"
-msgstr "Aller à la chaîne en cours de lecture"
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>Redémarrer l'application après avoir changé cette option.</i>"
#: ../data/ui/freetuxtv.glade.h:33
-msgid "Group properties"
-msgstr "Propriétés du groupe"
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>Fichier de configuration (vlcrc)</b>"
-#: ../data/ui/freetuxtv.glade.h:35
-msgid "HTTP"
-msgstr "HTTP"
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:35
+msgid "Directory Record:"
+msgstr "Dossier des enregistrements :"
#: ../data/ui/freetuxtv.glade.h:36
-msgid "Ignore diacritics"
-msgstr "Ignorer les diacritiques"
+msgid "Select a directory"
+msgstr "Choisissez un dossier"
#: ../data/ui/freetuxtv.glade.h:37
-msgid "In progress"
-msgstr "En cours"
+msgid "<b>Destination</b>"
+msgstr "<b>Destination</b>"
#: ../data/ui/freetuxtv.glade.h:38
-msgid "Jump to current channel"
-msgstr "Atteindre la chaîne en cours"
+msgid "No transcoding"
+msgstr "Pas de transcodage"
#: ../data/ui/freetuxtv.glade.h:39
-msgid "LibVLC"
-msgstr ""
+msgid "Predefined transcoding formats"
+msgstr "Formats prédéfinis de transcodage"
#: ../data/ui/freetuxtv.glade.h:40
-msgid "Manual proxy configuration"
-msgstr "Configuration manuelle du proxy"
+msgid "Format:"
+msgstr "Format :"
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
+msgstr "<b>Options de transcodage</b>"
#: ../data/ui/freetuxtv.glade.h:42
-msgid "Network"
-msgstr "Réseau"
+msgid "Recordings"
+msgstr "Enregistrements"
#: ../data/ui/freetuxtv.glade.h:43
-msgid "Next channel"
-msgstr "Chaîne suivante"
+msgid "Download timeout (seconds) :"
+msgstr "Timeout de téléchargement (secondes) :"
#: ../data/ui/freetuxtv.glade.h:44
-msgid "No proxy"
-msgstr "Aucun proxy"
+msgid "<b>Connection</b>"
+msgstr "<b>Connexion</b>"
#: ../data/ui/freetuxtv.glade.h:45
-msgid "No transcoding"
-msgstr "Pas de transcodage"
+msgid "No proxy"
+msgstr "Aucun proxy"
#: ../data/ui/freetuxtv.glade.h:46
-msgid "None"
-msgstr "Aucun"
+msgid "Manual proxy configuration"
+msgstr "Configuration manuelle du proxy"
#: ../data/ui/freetuxtv.glade.h:47
-msgid "Number of channels:"
-msgstr "Nombre de chaînes :"
+msgid "Proxy server:"
+msgstr "Serveur proxy:"
#: ../data/ui/freetuxtv.glade.h:48
-msgid "Password:"
-msgstr "Mot de passe"
+msgid "Proxy port:"
+msgstr "Port du proxy:"
#: ../data/ui/freetuxtv.glade.h:49
-msgid "Play last channel on startup"
-msgstr "Lire la dernière chaîne au démarrage"
+msgid "Proxy type:"
+msgstr "Type de proxy:"
#: ../data/ui/freetuxtv.glade.h:50
-msgid "Play the current channel"
-msgstr "Lire la chaîne en cours"
+msgid "Use authentification"
+msgstr "Utiliser l'authentification"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "Nom de l'utilisateur"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "Mot de passe"
#: ../data/ui/freetuxtv.glade.h:53
-msgid "Predefined transcoding formats"
-msgstr "Formats prédéfinis de transcodage"
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
#: ../data/ui/freetuxtv.glade.h:54
-msgid "Preferences"
-msgstr "Préférences"
+msgid "Network"
+msgstr "Réseau"
#: ../data/ui/freetuxtv.glade.h:55
-msgid "Previous channel"
-msgstr "Chaîne précédente"
+msgid "HTTP"
+msgstr "HTTP"
#: ../data/ui/freetuxtv.glade.h:56
-msgid "Project's Web Site"
-msgstr "Site Web du projet"
+msgid "SOCKS"
+msgstr "SOCKS"
#: ../data/ui/freetuxtv.glade.h:57
-msgid "Proxy port:"
-msgstr "Port du proxy:"
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr "Video - Theora + Vorbis (OGG)"
#: ../data/ui/freetuxtv.glade.h:58
-msgid "Proxy server:"
-msgstr "Serveur proxy:"
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:59
-msgid "Proxy type:"
-msgstr "Type de proxy:"
+msgid "ogg"
+msgstr "ogg"
#: ../data/ui/freetuxtv.glade.h:60
-msgid "Record the current channel"
-msgstr "Enregistre la chaîne en cours"
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr "Video - H.264 + MPGA (MP4)"
#: ../data/ui/freetuxtv.glade.h:61
-msgid "Recordings"
-msgstr "Enregistrements"
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
#: ../data/ui/freetuxtv.glade.h:62
-msgid "SOCKS"
-msgstr "SOCKS"
+msgid "mp4"
+msgstr "mp4"
#: ../data/ui/freetuxtv.glade.h:63
-msgid "Search:"
-msgstr "Recherche :"
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr "Video - MPEG-2 + MPGA (TS)"
#: ../data/ui/freetuxtv.glade.h:64
-msgid "Select a directory"
-msgstr "Choisissez un dossier"
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr ""
+"vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2,samplerate=44100"
#: ../data/ui/freetuxtv.glade.h:65
-msgid "Small mode"
-msgstr "Mode réduit"
+msgid "ts"
+msgstr ""
-#: ../data/ui/freetuxtv.glade.h:66
-msgid "Stop playing the current channel"
-msgstr "Arrêter la lecture de la chaîne en cours"
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
#: ../data/ui/freetuxtv.glade.h:67
-msgid "Terminated"
-msgstr "Terminé"
+msgid "Search:"
+msgstr "Recherche :"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "Zone de recherche de chaînes"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "Effacer la zone de texte de recherche"
#: ../data/ui/freetuxtv.glade.h:70
-msgid "Use a custom configuration file"
-msgstr "Utiliser un fichier de configuration personalisé"
+msgid "Jump to current channel"
+msgstr "Atteindre la chaîne en cours"
#: ../data/ui/freetuxtv.glade.h:71
-msgid "Use authentification"
-msgstr "Utiliser l'authentification"
+msgid "Go to the current channel playing"
+msgstr "Aller à la chaîne en cours de lecture"
#: ../data/ui/freetuxtv.glade.h:72
-msgid "Use the VLC configuration file"
-msgstr "Utiliser le fichier de configuration de VLC"
+msgid "Channels"
+msgstr "Chaînes"
#: ../data/ui/freetuxtv.glade.h:73
-msgid "Username:"
-msgstr "Nom de l'utilisateur"
+msgid "In progress"
+msgstr "En cours"
#: ../data/ui/freetuxtv.glade.h:74
-msgid "Video - H.264 + MPGA (MP4)"
-msgstr "Video - H.264 + MPGA (MP4)"
+msgid "Terminated"
+msgstr "Terminé"
#: ../data/ui/freetuxtv.glade.h:75
-msgid "Video - MPEG-2 + MPGA (TS)"
-msgstr "Video - MPEG-2 + MPGA (TS)"
+msgid "00:00:00"
+msgstr "00:00:00"
#: ../data/ui/freetuxtv.glade.h:76
-msgid "Video - Theora + Vorbis (OGG)"
-msgstr "Video - Theora + Vorbis (OGG)"
+msgid "Previous channel"
+msgstr "Chaîne précédente"
#: ../data/ui/freetuxtv.glade.h:77
-msgid "View file"
-msgstr "Voir le fichier"
+msgid "Play the current channel"
+msgstr "Lire la chaîne en cours"
#: ../data/ui/freetuxtv.glade.h:78
-msgid "Vol:"
-msgstr "Vol :"
+msgid "Stop playing the current channel"
+msgstr "Arrêter la lecture de la chaîne en cours"
#: ../data/ui/freetuxtv.glade.h:79
-msgid "Web TV channels player"
-msgstr "Lecteur de chaînes de télévision et radio sur Internet"
+msgid "Record the current channel"
+msgstr "Enregistre la chaîne en cours"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "Chaîne suivante"
#: ../data/ui/freetuxtv.glade.h:81
-msgid "mp4"
-msgstr "mp4"
+msgid "Vol:"
+msgstr "Vol :"
#: ../data/ui/freetuxtv.glade.h:82
-msgid "ogg"
-msgstr "ogg"
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
-#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:84
-msgid "translator-credits"
-msgstr "translator-credits"
+msgid "Fullscreen mode"
+msgstr "Mode plein écran"
#: ../data/ui/freetuxtv.glade.h:85
-msgid "ts"
-msgstr ""
+msgid "Small mode"
+msgstr "Mode réduit"
#: ../data/ui/freetuxtv.glade.h:86
-msgid ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
-msgstr ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
+msgid " channels"
+msgstr " chaînes"
#: ../data/ui/freetuxtv.glade.h:87
-msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
-msgstr ""
-"vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2,samplerate=44100"
+msgid "Go back to the normal mode"
+msgstr "Revenir au mode normal"
#: ../data/ui/freetuxtv.glade.h:88
-msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
-msgstr ""
+msgid "Activate/Deactivate the window always on top"
+msgstr "Active/Désactive fenêtre toujours au premier plan"
#: ../data/channels_groups.xml.in.h:1
msgid "Alice (Unofficial)"
msgstr "Alice (Non Officiel)"
#: ../data/channels_groups.xml.in.h:2
+msgid "SFR TV (Unofficial)"
+msgstr "SFR TV (Non Officiel)"
+
+#: ../data/channels_groups.xml.in.h:3
+msgid "Afrikaans Web TV and Radio"
+msgstr "Afrikaans : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:4
+msgid "Web TV (Afrikaans)"
+msgstr "Web TV (Afrikaans)"
+
+#: ../data/channels_groups.xml.in.h:5
+msgid "Albanian Web TV and Radio"
+msgstr "Albanais : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:6
+msgid "Web TV (Albanian)"
+msgstr "Web TV (Albanais)"
+
+#: ../data/channels_groups.xml.in.h:7
+msgid "Amharic Web TV and Radio"
+msgstr "Amharique : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:8
+msgid "Web TV (Amharic)"
+msgstr "Web TV (Amharique)"
+
+#: ../data/channels_groups.xml.in.h:9
msgid "Arabic Web TV and Radio"
msgstr "Arabe : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:3
+#: ../data/channels_groups.xml.in.h:10
+msgid "Web TV (Arabic)"
+msgstr "Web TV (Arabe)"
+
+#: ../data/channels_groups.xml.in.h:11
+msgid "Web Radio (Arabic)"
+msgstr "Web Radio (Arabe)"
+
+#: ../data/channels_groups.xml.in.h:12
+msgid "Web Cam (Arabic)"
+msgstr "Webcam (Arabe)"
+
+#: ../data/channels_groups.xml.in.h:13
+msgid "Armenian Web TV and Radio"
+msgstr "Arménien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:14
+msgid "Web TV (Armenian)"
+msgstr "Web TV (Arménien)"
+
+#: ../data/channels_groups.xml.in.h:15
+msgid "Azerbaijani Web TV and Radio"
+msgstr "Azerbaïdjanais : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:16
+msgid "Web TV (Azerbaijani)"
+msgstr "Web TV (Azerbaïdjanais)"
+
+#: ../data/channels_groups.xml.in.h:17
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "Bengali/Bangla : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:18
+msgid "Web TV (Bengali/Bangla)"
+msgstr "Web TV (Bengali/Bangla)"
+
+#: ../data/channels_groups.xml.in.h:19
+msgid "Bulgarian Web TV and Radio"
+msgstr "Bulgare : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:20
+msgid "Web TV (Bulgarian)"
+msgstr "Web TV (Bulgare)"
+
+#: ../data/channels_groups.xml.in.h:21
+msgid "Cambodian Web TV and Radio"
+msgstr "Cambodgien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:22
+msgid "Web TV (Cambodian)"
+msgstr "Web TV (Cambodgien)"
+
+#: ../data/channels_groups.xml.in.h:23
msgid "Catalan Web TV and Radio"
msgstr "Catalan : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:4
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr "Web TV (Catalan)"
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr "Web Radio (Catalan)"
+
+#: ../data/channels_groups.xml.in.h:26
msgid "Chinese Web TV and Radio"
msgstr "Chinois : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:5
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr "Web TV (Chinois)"
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr "Web Radio (Chinois)"
+
+#: ../data/channels_groups.xml.in.h:29
+msgid "Croatian Web TV and Radio"
+msgstr "Croate : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:30
+msgid "Web TV (Croatian)"
+msgstr "Web TV (Croate)"
+
+#: ../data/channels_groups.xml.in.h:31
+msgid "Web Radio (Croatian)"
+msgstr "Web Radio (Croate)"
+
+#: ../data/channels_groups.xml.in.h:32
msgid "Czech Web TV and Radio"
msgstr "Tchèque : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:6
-msgid "Dutch Web TV and Radio"
-msgstr "Néerlandais : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr "Web TV (Tchèque)"
+
+#: ../data/channels_groups.xml.in.h:34
+msgid "Web Radio (Czech)"
+msgstr "Web Radio (Tchèque)"
+
+#: ../data/channels_groups.xml.in.h:35
+msgid "Danish Web TV and Radio"
+msgstr "Danois : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:36
+msgid "Web TV (Danish)"
+msgstr "Web TV (Danois)"
+
+#: ../data/channels_groups.xml.in.h:37
+msgid "Dutch Web TV and Radio"
+msgstr "Néerlandais : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr "Web TV (Néerlandais)"
+
+#: ../data/channels_groups.xml.in.h:39
+msgid "Web Radio (Dutch)"
+msgstr "Web Radio (Néerlandais)"
+
+#: ../data/channels_groups.xml.in.h:40
+msgid "Web Cam (Dutch)"
+msgstr "Webcam (Néerlandais)"
+
+#: ../data/channels_groups.xml.in.h:41
+msgid "English Web TV and Radio"
+msgstr "Anglais : WebTV et WebRadio, WebEmissions"
+
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr "Web TV (Anglais)"
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr "Web Radio (Anglais)"
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr "Emissions TV/Radio sur le Web (Anglais)"
+
+#: ../data/channels_groups.xml.in.h:45
+msgid "Web Cam (English)"
+msgstr "Webcam (Anglais)"
+
+#: ../data/channels_groups.xml.in.h:46
+msgid "Estonian Web TV and Radio"
+msgstr "Estonien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:47
+msgid "Web TV (Estonian)"
+msgstr "Web TV (Estonien)"
+
+#: ../data/channels_groups.xml.in.h:48
+msgid "Finnish Web TV and Radio"
+msgstr "Finnois : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:49
+msgid "Web TV (Finnish)"
+msgstr "Web TV (Finnois)"
+
+#: ../data/channels_groups.xml.in.h:50
+msgid "French Web TV and Radio"
+msgstr "Français : WebTV et WebRadio, WebEmissions"
+
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr "Web TV (Français)"
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr "Web Radio (Français)"
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr "Emissions TV/Radio sur le Web (Français)"
+
+#: ../data/channels_groups.xml.in.h:54
+msgid "Georgian Web TV and Radio"
+msgstr "Géorgien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:55
+msgid "Web TV (Georgian)"
+msgstr "Web TV (Géorgien)"
+
+#: ../data/channels_groups.xml.in.h:56
+msgid "German Web TV and Radio"
+msgstr "Allemand : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr "Web TV (Allemand)"
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr "Web Radio (Allemand)"
+
+#: ../data/channels_groups.xml.in.h:59
+msgid "Greek Web TV and Radio"
+msgstr "Grec : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr "Web TV (Grec)"
+
+#: ../data/channels_groups.xml.in.h:61
+msgid "Web Radio (Greek)"
+msgstr "Web Radio (Grec)"
+
+#: ../data/channels_groups.xml.in.h:62
+msgid "Hebrew Web TV and Radio"
+msgstr "Hébreu : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:63
+msgid "Web TV (Hebrew)"
+msgstr "Web TV (Hébreu)"
+
+#: ../data/channels_groups.xml.in.h:64
+msgid "Web Radio (Hebrew)"
+msgstr "Web Radio (Hébreu)"
+
+#: ../data/channels_groups.xml.in.h:65
+msgid "Web Cam (Hebrew)"
+msgstr "Webcam (Hébreu)"
+
+#: ../data/channels_groups.xml.in.h:66
+msgid "Hindi Web TV and Radio"
+msgstr "Hindi : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:67
+msgid "Web TV (Hindi)"
+msgstr "Web TV (Hindi)"
+
+#: ../data/channels_groups.xml.in.h:68
+msgid "Web Radio (Hindi)"
+msgstr "Web Radio (Hindi)"
+
+#: ../data/channels_groups.xml.in.h:69
+msgid "Hungarian Web TV and Radio"
+msgstr "Hongrois : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr "Web TV (Hongrois)"
+
+#: ../data/channels_groups.xml.in.h:71
+msgid "Icelandic Web TV and Radio"
+msgstr "Islandais : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:72
+msgid "Web TV (Icelandic)"
+msgstr "Web TV (Islandais)"
+
+#: ../data/channels_groups.xml.in.h:73
+msgid "Indonesian Web TV and Radio"
+msgstr "Indonésien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:74
+msgid "Web TV (Indonesian)"
+msgstr "Web TV (Indonésien)"
+
+#: ../data/channels_groups.xml.in.h:75
+msgid "Interlingua Web TV and Radio"
+msgstr "Interlingua : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:76
+msgid "Web Radio (Interlingua)"
+msgstr "Web Radio (Interlingua)"
+
+#: ../data/channels_groups.xml.in.h:77
+msgid "Irish Web TV and Radio"
+msgstr "Irlandais : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:78
+msgid "Web TV (Irish)"
+msgstr "Web TV (Irlandais)"
+
+#: ../data/channels_groups.xml.in.h:79
+msgid "Web Radio (Irish)"
+msgstr "Web Radio (Irlandais)"
+
+#: ../data/channels_groups.xml.in.h:80
+msgid "Italian Web TV and Radio"
+msgstr "Italien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr "Web TV (Italien)"
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr "Web Radio (Italien)"
+
+#: ../data/channels_groups.xml.in.h:83
+msgid "Japanese Web TV and Radio"
+msgstr "Japonais : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr "Web TV (Japonais)"
+
+#: ../data/channels_groups.xml.in.h:85
+msgid "Web Radio (Japanese)"
+msgstr "Web Radio (Japonais)"
+
+#: ../data/channels_groups.xml.in.h:86
+msgid "Web Cam (Japanese)"
+msgstr "Webcam (Japonais)"
+
+#: ../data/channels_groups.xml.in.h:87
+msgid "Kazakh Web TV and Radio"
+msgstr "Kazakh : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:88
+msgid "Web TV (Kazakh)"
+msgstr "Web TV (Kazakh)"
+
+#: ../data/channels_groups.xml.in.h:89
+msgid "Korean Web TV and Radio"
+msgstr "Coréen : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr "Web TV (Coréen)"
+
+#: ../data/channels_groups.xml.in.h:91
+msgid "Kurdish Web TV and Radio"
+msgstr "Kurde : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:92
+msgid "Web TV (Kurdish)"
+msgstr "Web TV (Kurde)"
+
+#: ../data/channels_groups.xml.in.h:93
+msgid "Latin Web TV and Radio"
+msgstr "Latin : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
+msgstr "Web TV (Latin)"
+
+#: ../data/channels_groups.xml.in.h:95
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "Letton/Lette : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:96
+msgid "Web TV (Latvian/Lettish)"
+msgstr "Web TV (Letton/Lette)"
+
+#: ../data/channels_groups.xml.in.h:97
+msgid "Lithuanian Web TV and Radio"
+msgstr "Lituanien : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:98
+msgid "Web TV (Lithuanian)"
+msgstr "Web TV (Lituanien)"
+
+#: ../data/channels_groups.xml.in.h:99
+msgid "Macedonian Web TV and Radio"
+msgstr "Macédonienne : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:100
+msgid "Web TV (Macedonian)"
+msgstr "Web TV (Macédonienne)"
-#: ../data/channels_groups.xml.in.h:7
-msgid "English Web TV and Radio"
-msgstr "Anglais : WebTV et WebRadio, WebEmissions"
+#: ../data/channels_groups.xml.in.h:101
+msgid "Web Radio (Macedonian)"
+msgstr "Web Radio (Macédonienne)"
-#: ../data/channels_groups.xml.in.h:8
-msgid "French Web TV and Radio"
-msgstr "Français : WebTV et WebRadio, WebEmissions"
+#: ../data/channels_groups.xml.in.h:102
+msgid "Malay Web TV and Radio"
+msgstr "Malais : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:9
-msgid "German Web TV and Radio"
-msgstr "Allemand : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:103
+msgid "Web TV (Malay)"
+msgstr "Web TV (Malais)"
-#: ../data/channels_groups.xml.in.h:10
-msgid "Greek Web TV and Radio"
-msgstr "Grec : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:104
+msgid "Malayalam Web TV and Radio"
+msgstr "Malayalam : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:11
-msgid "Hungarian Web TV and Radio"
-msgstr "Hongrois : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:105
+msgid "Web TV (Malayalam)"
+msgstr "Web TV (Malayalam)"
-#: ../data/channels_groups.xml.in.h:12
-msgid "Italian Web TV and Radio"
-msgstr "Italien : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:106
+msgid "Maltese Web TV and Radio"
+msgstr "Maltais : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:13
-msgid "Japanese Web TV and Radio"
-msgstr "Japonais : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:107
+msgid "Web TV (Maltese)"
+msgstr "Web TV (Maltais)"
-#: ../data/channels_groups.xml.in.h:14
-msgid "Korean Web TV and Radio"
-msgstr "Coréen : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:108
+msgid "Web Radio (Maltese)"
+msgstr "Web Radio (Maltais)"
-#: ../data/channels_groups.xml.in.h:15
-msgid "Latin Web TV and Radio"
-msgstr "Latin : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:109
+msgid "Moldavian Web TV and Radio"
+msgstr "Moldave : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:16
-msgid "Modern Greek Web TV and Radio"
-msgstr "Grec : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:110
+msgid "Web TV (Moldavian)"
+msgstr "Web TV (Moldave)"
-#: ../data/channels_groups.xml.in.h:17
-msgid "No lang Web TV and Radio"
-msgstr "Sans langue : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:111
+msgid "Mongolian Web TV and Radio"
+msgstr "Mongol : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:18
+#: ../data/channels_groups.xml.in.h:112
+msgid "Web TV (Mongolian)"
+msgstr "Web TV (Mongol)"
+
+#: ../data/channels_groups.xml.in.h:113
msgid "Norwegian Web TV and Radio"
msgstr "Norvégien : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:19
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
+msgstr "Web TV (Norvégien)"
+
+#: ../data/channels_groups.xml.in.h:115
msgid "Persian Web TV and Radio"
msgstr "Persan : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:20
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
+msgstr "Web TV (Persan)"
+
+#: ../data/channels_groups.xml.in.h:117
msgid "Polish Web TV and Radio"
msgstr "Polonais : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:21
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
+msgstr "Web TV (Polonais)"
+
+#: ../data/channels_groups.xml.in.h:119
+msgid "Web Radio (Polish)"
+msgstr "Web Radio (Polonais)"
+
+#: ../data/channels_groups.xml.in.h:120
+msgid "Web Cam (Polish)"
+msgstr "Webcam (Polonais)"
+
+#: ../data/channels_groups.xml.in.h:121
msgid "Portuguese Web TV and Radio"
msgstr "Portugais : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:22
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
+msgstr "Web TV (Portugais)"
+
+#: ../data/channels_groups.xml.in.h:123
+msgid "Web Radio (Portuguese)"
+msgstr "Web Radio (Portugais)"
+
+#: ../data/channels_groups.xml.in.h:124
+msgid "Punjabi Web TV and Radio"
+msgstr "Panjābī : WebTV et WebRadio"
+
+#: ../data/channels_groups.xml.in.h:125
+msgid "Web TV (Punjabi)"
+msgstr "Web TV (Panjābī)"
+
+#: ../data/channels_groups.xml.in.h:126
msgid "Romanian Web TV and Radio"
msgstr "Roumain : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:23
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
+msgstr "Web TV (Roumain)"
+
+#: ../data/channels_groups.xml.in.h:128
+msgid "Web Radio (Romanian)"
+msgstr "Web Radio (Roumain)"
+
+#: ../data/channels_groups.xml.in.h:129
msgid "Russian Web TV and Radio"
msgstr "Russe : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:24
-msgid "SFR TV (Unofficial)"
-msgstr "SFR TV (Non Officiel)"
-
-#: ../data/channels_groups.xml.in.h:25
-msgid "Slovak Web TV and Radio"
-msgstr "Slovaque : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
+msgstr "Web TV (Russe)"
-#: ../data/channels_groups.xml.in.h:26
-msgid "Spanish Web TV and Radio"
-msgstr "Espagnol : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
+msgstr "Web Radio (Russe)"
-#: ../data/channels_groups.xml.in.h:27
-msgid "Swedish Web TV and Radio"
-msgstr "Suédois : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:132
+msgid "Serbian Web TV and Radio"
+msgstr "Serbe : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:28
-msgid "Thai Web TV and Radio"
-msgstr "Thai : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:133
+msgid "Web TV (Serbian)"
+msgstr "Web TV (Serbe)"
-#: ../data/channels_groups.xml.in.h:29
-msgid "Turkish Web TV and Radio"
-msgstr "Turc : WebTV et WebRadio"
+#: ../data/channels_groups.xml.in.h:134
+msgid "Web Radio (Serbian)"
+msgstr "Web Radio (Serbe)"
-#: ../data/channels_groups.xml.in.h:30
-msgid "Web Programmes (English)"
-msgstr "Emissions TV/Radio sur le Web (Anglais)"
+#: ../data/channels_groups.xml.in.h:135
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "Serbo-croate : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:31
-msgid "Web Programmes (French)"
-msgstr "Emissions TV/Radio sur le Web (Français)"
+#: ../data/channels_groups.xml.in.h:136
+msgid "Web TV (Serbo-Croatian)"
+msgstr "Web TV (Serbo-croate)"
-#: ../data/channels_groups.xml.in.h:32
-msgid "Web Radio (Arabic)"
-msgstr "Web Radio (Arabe)"
+#: ../data/channels_groups.xml.in.h:137
+msgid "Web Radio (Serbo-Croatian)"
+msgstr "Web Radio (Serbo-croate)"
-#: ../data/channels_groups.xml.in.h:33
-msgid "Web Radio (Catalan)"
-msgstr "Web Radio (Catalan)"
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
+msgstr "Slovaque : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:34
-msgid "Web Radio (Chinese)"
-msgstr "Web Radio (Chinois)"
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
+msgstr "Web TV (Slovaque)"
-#: ../data/channels_groups.xml.in.h:35
-msgid "Web Radio (English)"
-msgstr "Web Radio (Anglais)"
+#: ../data/channels_groups.xml.in.h:140
+msgid "Web Radio (Slovak)"
+msgstr "Web Radio (Slovaque)"
-#: ../data/channels_groups.xml.in.h:36
-msgid "Web Radio (French)"
-msgstr "Web Radio (Français)"
+#: ../data/channels_groups.xml.in.h:141
+msgid "Slovenian Web TV and Radio"
+msgstr "Slovène : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:37
-msgid "Web Radio (German)"
-msgstr "Web Radio (Allemand)"
+#: ../data/channels_groups.xml.in.h:142
+msgid "Web TV (Slovenian)"
+msgstr "Web TV (Slovène)"
-#: ../data/channels_groups.xml.in.h:38
-msgid "Web Radio (Italian)"
-msgstr "Web Radio (Italien)"
+#: ../data/channels_groups.xml.in.h:143
+msgid "Web Radio (Slovenian)"
+msgstr "Web Radio (Slovène)"
-#: ../data/channels_groups.xml.in.h:39
-msgid "Web Radio (No lang)"
-msgstr "Web Radio (Sans langue)"
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr "Espagnol : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:40
-msgid "Web Radio (Russian)"
-msgstr "Web Radio (Russe)"
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
+msgstr "Web TV (Espagnol)"
-#: ../data/channels_groups.xml.in.h:41
+#: ../data/channels_groups.xml.in.h:146
msgid "Web Radio (Spanish)"
msgstr "Web Radio (Espagnol)"
-#: ../data/channels_groups.xml.in.h:42
-msgid "Web TV (Arabic)"
-msgstr "Web TV (Arabe)"
+#: ../data/channels_groups.xml.in.h:147
+msgid "Web Programmes (Spanish)"
+msgstr "Emissions TV/Radio sur le Web (Espagnol)"
-#: ../data/channels_groups.xml.in.h:43
-msgid "Web TV (Catalan)"
-msgstr "Web TV (Catalan)"
+#: ../data/channels_groups.xml.in.h:148
+msgid "Web Cam (Spanish)"
+msgstr "Webcam (Espagnol)"
-#: ../data/channels_groups.xml.in.h:44
-msgid "Web TV (Chinese)"
-msgstr "Web TV (Chinois)"
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
+msgstr "Suédois : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:45
-msgid "Web TV (Czech)"
-msgstr "Web TV (Tchèque)"
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
+msgstr "Web TV (Suédois)"
-#: ../data/channels_groups.xml.in.h:46
-msgid "Web TV (Dutch)"
-msgstr "Web TV (Néerlandais)"
+#: ../data/channels_groups.xml.in.h:151
+msgid "Tagalog Web TV and Radio"
+msgstr "Tagalog : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:47
-msgid "Web TV (English)"
-msgstr "Web TV (Anglais)"
+#: ../data/channels_groups.xml.in.h:152
+msgid "Web TV (Tagalog)"
+msgstr "Web TV (Tagalog)"
-#: ../data/channels_groups.xml.in.h:48
-msgid "Web TV (French)"
-msgstr "Web TV (Français)"
+#: ../data/channels_groups.xml.in.h:153
+msgid "Tamil Web TV and Radio"
+msgstr "Tamoul : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:49
-msgid "Web TV (German)"
-msgstr "Web TV (Allemand)"
+#: ../data/channels_groups.xml.in.h:154
+msgid "Web TV (Tamil)"
+msgstr "Web TV (Tamoul)"
-#: ../data/channels_groups.xml.in.h:50
-msgid "Web TV (Greek)"
-msgstr "Web TV (Grec)"
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
+msgstr "Thai : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:51
-msgid "Web TV (Hungarian)"
-msgstr "Web TV (Hongrois)"
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
+msgstr "Web TV (Thai)"
-#: ../data/channels_groups.xml.in.h:52
-msgid "Web TV (Italian)"
-msgstr "Web TV (Italien)"
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
+msgstr "Turc : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:53
-msgid "Web TV (Japanese)"
-msgstr "Web TV (Japonais)"
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
+msgstr "Web TV (Turc)"
-#: ../data/channels_groups.xml.in.h:54
-msgid "Web TV (Korean)"
-msgstr "Web TV (Coréen)"
+#: ../data/channels_groups.xml.in.h:159
+msgid "Web Radio (Turkish)"
+msgstr "Web Radio (Turc)"
-#: ../data/channels_groups.xml.in.h:55
-msgid "Web TV (Latin)"
-msgstr "Web TV (Latin)"
+#: ../data/channels_groups.xml.in.h:160
+msgid "Turkmen Web TV and Radio"
+msgstr "Turkmène : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:56
-msgid "Web TV (Modern Greek)"
-msgstr "Web TV (Grec)"
+#: ../data/channels_groups.xml.in.h:161
+msgid "Web TV (Turkmen)"
+msgstr "Web TV (Turkmène)"
-#: ../data/channels_groups.xml.in.h:57
-msgid "Web TV (No lang)"
-msgstr "Web TV (Sans langue)"
+#: ../data/channels_groups.xml.in.h:162
+msgid "Ukrainian Web TV and Radio"
+msgstr "Ukrainien : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:58
-msgid "Web TV (Norwegian)"
-msgstr "Web TV (Norvégien)"
+#: ../data/channels_groups.xml.in.h:163
+msgid "Web TV (Ukrainian)"
+msgstr "Web TV (Ukrainien)"
-#: ../data/channels_groups.xml.in.h:59
-msgid "Web TV (Persian)"
-msgstr "Web TV (Persan)"
+#: ../data/channels_groups.xml.in.h:164
+msgid "Web Cam (Ukrainian)"
+msgstr "Webcam (Ukrainien)"
-#: ../data/channels_groups.xml.in.h:60
-msgid "Web TV (Polish)"
-msgstr "Web TV (Polonais)"
+#: ../data/channels_groups.xml.in.h:165
+msgid "Urdu Web TV and Radio"
+msgstr "Ourdou : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:61
-msgid "Web TV (Portuguese)"
-msgstr "Web TV (Portugais)"
+#: ../data/channels_groups.xml.in.h:166
+msgid "Web TV (Urdu)"
+msgstr "Web TV (Ourdou)"
-#: ../data/channels_groups.xml.in.h:62
-msgid "Web TV (Romanian)"
-msgstr "Web TV (Roumain)"
+#: ../data/channels_groups.xml.in.h:167
+msgid "Uzbek Web TV and Radio"
+msgstr "Ouzbek : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:63
-msgid "Web TV (Russian)"
-msgstr "Web TV (Russe)"
+#: ../data/channels_groups.xml.in.h:168
+msgid "Web TV (Uzbek)"
+msgstr "Web TV (Ouzbek)"
-#: ../data/channels_groups.xml.in.h:64
-msgid "Web TV (Slovak)"
-msgstr "Web TV (Slovaque)"
+#: ../data/channels_groups.xml.in.h:169
+msgid "Vietnamese Web TV and Radio"
+msgstr "Vietnamien : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:65
-msgid "Web TV (Spanish)"
-msgstr "Web TV (Espagnol)"
+#: ../data/channels_groups.xml.in.h:170
+msgid "Web TV (Vietnamese)"
+msgstr "Web TV (Vietnamien)"
-#: ../data/channels_groups.xml.in.h:66
-msgid "Web TV (Swedish)"
-msgstr "Web TV (Suédois)"
+#: ../data/channels_groups.xml.in.h:171
+msgid "Web Radio (Vietnamese)"
+msgstr "Web Radio (Vietnamien)"
-#: ../data/channels_groups.xml.in.h:67
-msgid "Web TV (Thai)"
-msgstr "Web TV (Thai)"
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
+msgstr "Sans langue : WebTV et WebRadio"
-#: ../data/channels_groups.xml.in.h:68
-msgid "Web TV (Turkish)"
-msgstr "Web TV (Turc)"
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
+msgstr "Web TV (Sans langue)"
-#: ../data/channels_groups.xml.in.h:69
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
+msgstr "Web Radio (Sans langue)"
+
+#: ../data/channels_groups.xml.in.h:175
+msgid "Web Programmes (No lang)"
+msgstr "Emissions TV/Radio sur le Web (Sans langue)"
+
+#: ../data/channels_groups.xml.in.h:176
+msgid "Web Cam (No lang)"
+msgstr "Webcam (Sans langue)"
+
+#: ../data/channels_groups.xml.in.h:177
msgid "WebCam"
msgstr "WebCam"
#: ../data/menu/freetuxtv.desktop.in.h:2
-msgid "FreetuxTV Television Channels Player"
-msgstr "Lecteur de chaînes de télévision FreetuxTV"
-
-#: ../data/menu/freetuxtv.desktop.in.h:3
msgid "Television Channels Player"
msgstr "Lecteur de chaînes de télévision"
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "Lecteur de chaînes de télévision FreetuxTV"
+
#: ../data/menu/freetuxtv.desktop.in.h:4
msgid "Watch television channels from internet"
msgstr "Visionnez les chaînes de télévision sur internet"
-#: ../src/freetuxtv-cellrenderer-recordingslist.c:348
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
#, c-format
-msgid "%lld min"
-msgstr "%lld min"
+msgid "%ld min"
+msgstr "%ld min"
#. Update status bar
#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
@@ -814,17 +1246,17 @@ msgstr ""
"M3UParser a retourné l'erreur :\n"
"%s."
-#: ../src/freetuxtv-channels-list.c:1322
+#: ../src/freetuxtv-channels-list.c:1335
msgid "Delete group's channels"
msgstr "Supprimer les chaînes du groupe"
#. Add to favourite is only for channels
-#: ../src/freetuxtv-channels-list.c:1372
+#: ../src/freetuxtv-channels-list.c:1385
msgid "Add to favourites"
msgstr "Ajouter aux favoris"
#. Add favourites to a new group
-#: ../src/freetuxtv-channels-list.c:1388
+#: ../src/freetuxtv-channels-list.c:1401
msgid "New group"
msgstr "Nouveau groupe"
@@ -1187,7 +1619,7 @@ msgid "Do you want to move the related file on the hard disk to the trash?"
msgstr ""
"Voulez-vous déplacer le fichier correspondant du disque dur vers la poubelle?"
-#: ../src/freetuxtv-tv-channels-list.c:67
+#: ../src/freetuxtv-tv-channels-list.c:69
#, c-format
msgid "Synchronizing the tv channels list"
msgstr "Synchronisation de la liste des chaînes TV"
@@ -1227,113 +1659,140 @@ msgstr "%1.1f Mo"
msgid "%1.1f GB"
msgstr "%1.1f Go"
-#: ../src/freetuxtv-window-add-channels-group.c:376
+#: ../src/freetuxtv-window-add-channels-group.c:395
#, c-format
msgid "Please select a least one group !"
msgstr "Veuillez sélectionner au moins un groupe !"
-#: ../src/freetuxtv-window-add-channels-group.c:382
-#: ../src/freetuxtv-window-add-channels-group.c:530
-#: ../src/freetuxtv-window-add-channels-group.c:584
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
msgid "Adding channels groups"
msgstr "Ajouter des groupes de chaînes"
#. Update progress dialog
-#: ../src/freetuxtv-window-add-channels-group.c:422
-#: ../src/freetuxtv-window-add-channels-group.c:466
-#: ../src/freetuxtv-window-add-channels-group.c:548
-#: ../src/freetuxtv-window-add-channels-group.c:592
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
#, c-format
msgid "Adding channels group: <i>%s</i>"
msgstr "Ajout du groupe de chaînes : <i>%s</i>"
-#: ../src/freetuxtv-window-add-channels-group.c:494
-#: ../src/freetuxtv-window-add-channels-group.c:561
-#: ../src/freetuxtv-window-add-channels-group.c:605
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
#, c-format
msgid "%d channels group(s) have been successfully added."
msgstr "%d groupe(s) de chaînes ont été ajouté(s) avec succès."
-#: ../src/freetuxtv-window-add-channels-group.c:522
-#: ../src/freetuxtv-window-add-channels-group.c:579
-#: ../src/freetuxtv-window-main.c:1980
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
#, c-format
msgid "Please enter the group's name !"
msgstr "Veuillez remplir le nom du groupe !"
-#: ../src/freetuxtv-window-add-channels-group.c:525
-#: ../src/freetuxtv-window-main.c:1985
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
#, c-format
msgid "Please enter the group's URI !"
msgstr "Veuillez remplir l'URI du groupe !"
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, c-format
+msgid "Updating TV channel: %s"
+msgstr "Mise à jour de la chaîne TV: %s"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr "Synchronisation des chaînes TV"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, c-format
+msgid "Downloading the file '%s'"
+msgstr "Récupération du fichier '%s'"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+msgid "Synchronizing TV channels from file"
+msgstr "Synchronisation de la liste des chaînes TV du fichier"
+
#. Menu : FreetuxTV
-#: ../src/freetuxtv-window-main.c:277
+#: ../src/freetuxtv-window-main.c:278
msgid "_FreetuxTV"
msgstr "_FreetuxTV"
#. End Menu : FreetuxTV
#. Menu : Channels
-#: ../src/freetuxtv-window-main.c:298
+#: ../src/freetuxtv-window-main.c:299
msgid "_Channels"
msgstr "_Chaînes"
-#: ../src/freetuxtv-window-main.c:302
+#: ../src/freetuxtv-window-main.c:303
msgid "_Add a group"
msgstr "_Ajouter un groupe"
-#: ../src/freetuxtv-window-main.c:308
-msgid "_Update TV channels list"
-msgstr "_Mettre à jour la liste des chaînes TV"
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:311
+msgid "_Synchronize TV channels database"
+msgstr "_Synchroniser la base de donnée des chaînes TV"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr "Synchroniser la liste des chaînes TV dans la base locale depuis le fichier XML"
#. End Menu : Channels
#. Menu : Video
-#: ../src/freetuxtv-window-main.c:317
+#: ../src/freetuxtv-window-main.c:322
msgid "_Video"
msgstr "_Vidéo"
#. SubMenu : Deinterlace
-#: ../src/freetuxtv-window-main.c:322
+#: ../src/freetuxtv-window-main.c:327
msgid "_Deinterlace"
msgstr "_Désentrelacement"
-#: ../src/freetuxtv-window-main.c:327
+#: ../src/freetuxtv-window-main.c:332
msgid "Disable"
msgstr "Désactiver"
-#: ../src/freetuxtv-window-main.c:339
+#: ../src/freetuxtv-window-main.c:344
msgid "Blend"
msgstr "Fondu"
-#: ../src/freetuxtv-window-main.c:348
+#: ../src/freetuxtv-window-main.c:353
msgid "Bob"
msgstr "Bob"
-#: ../src/freetuxtv-window-main.c:357
+#: ../src/freetuxtv-window-main.c:362
msgid "Discard"
msgstr "Négliger"
-#: ../src/freetuxtv-window-main.c:366
+#: ../src/freetuxtv-window-main.c:371
msgid "Linear"
msgstr "Linéaire"
-#: ../src/freetuxtv-window-main.c:375
+#: ../src/freetuxtv-window-main.c:380
msgid "Mean"
msgstr "Moyenne"
-#: ../src/freetuxtv-window-main.c:384
+#: ../src/freetuxtv-window-main.c:389
msgid "X"
msgstr "X"
#. End SubMenu : Deinterlace
#. End Menu : Video
#. Menu : Help
-#: ../src/freetuxtv-window-main.c:396
+#: ../src/freetuxtv-window-main.c:401
msgid "_Help"
msgstr "_Aide"
#. Create the menu items
-#: ../src/freetuxtv-window-main.c:1024
+#: ../src/freetuxtv-window-main.c:1029
msgid "Mute"
msgstr "Muet"
@@ -1357,53 +1816,64 @@ msgstr ""
msgid "An error occurred"
msgstr "Une erreur s'est produite"
-#: ../src/main.c:627
+#: ../src/main.c:607
+#, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "Synchronisation de la liste des chaînes TV: %s..."
+
+#: ../src/main.c:642
msgid "Initializing user configuration..."
msgstr "Initialisation configuration utilisateur"
-#: ../src/main.c:634
+#: ../src/main.c:649
msgid "Loading user configuration..."
msgstr "Chargement configuration utilisateur"
-#: ../src/main.c:693
+#: ../src/main.c:719
msgid "Synchronizing the list of tv channels..."
msgstr "Synchronisation de la liste des chaînes TV..."
-#: ../src/main.c:726
+#: ../src/main.c:752
msgid "Loading the list of channels..."
msgstr "Chargement de la liste des chaînes..."
-#: ../src/main.c:735
+#: ../src/main.c:761
msgid "Loading the list of recordings..."
msgstr "Chargement de la liste des enregistrements..."
-#: ../src/main.c:1051 ../src/main.c:1247
+#: ../src/main.c:1080 ../src/main.c:1276
#, c-format
msgid "Playing: %s"
msgstr "En cours de lecture : %s"
-#: ../src/main.c:1060
+#: ../src/main.c:1089
msgid "is playing"
msgstr "est en cours de lecture"
-#: ../src/main.c:1249
+#: ../src/main.c:1278
#, c-format
msgid "Stopping channel: %s"
msgstr "Arrêt de la chaîne : %s"
-#: ../src/main.c:1293
+#: ../src/main.c:1322
msgid "is recording"
msgstr "est en cours d'enregistrement"
-#: ../src/main.c:1340
+#: ../src/main.c:1369
#, c-format
msgid "Recording: %s"
msgstr "En cours d'enregistrement : %s"
-#: ../src/main.c:1465
+#: ../src/main.c:1494
msgid "Are you sure you want to quit?"
msgstr "Êtes-vous sûr de vouloir quitter?"
+#~ msgid "Modern Greek Web TV and Radio"
+#~ msgstr "Grec : WebTV et WebRadio"
+
+#~ msgid "Web TV (Modern Greek)"
+#~ msgstr "Web TV (Grec)"
+
#~ msgid "<span size=\"large\"><b>Process in progress</b></span>"
#~ msgstr "<span size=\"large\"><b>Traitement en cours</b></span>"
diff --git a/po/lt.po b/po/lt.po
new file mode 100644
index 0000000..6ed9541
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,1705 @@
+# 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 <EMAIL at ADDRESS>, YEAR.
+# Algimantas Margevičius <margevicius.algimantas at gmail.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-28 11:07+0200\n"
+"PO-Revision-Date: 2013-02-28 13:43+0200\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas at gmail.com>\n"
+"Language-Team: Lietuvių <>\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"
+"%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Pridėti įrašą"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Pasirinktas kanalas:"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Pavadinimas:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Pradžios laikas:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Trukmė:"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Pabaigos laikas:"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "minutės"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "<b>Recording period</b>"
+msgstr "<b>Įrašymo laikotarpis</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Pridėti grupę"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "Kanalų grupės failas:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Pasirinkite vieną ar kelias kanalų grupes, kurias norite pridėti ir "
+"paspauskite mygtuką pridėti."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Kalbos/Kanalų grupė"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "Reikalingas ISP"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Esamos kanalų grupės"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Grupės pavadinimas:"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr "Pridedamos grupės pavadinimas"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "Grojaraščio URI:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "Pridedamos grupės grojaraščio URI"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Prieš pavadinimą pašalinti šį tekstą:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr ""
+"Kanalo pavadinimo pabaigoje tekstas ar regexp išraiška kuri turi būti "
+"pašalinta"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Pašalinti šį tekstą pavadinimo pradžioje:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr ""
+"Kanalo pavadinimo pradžioje tekstas ar regexp išraiška kuri turi būti "
+"pašalinta"
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"Galite naudoti reguliariąsias išraiškas ir be didelio vargo pašalinti tekstą "
+"iš kanalo ar grupės pavadinimo. Pvz. jei jūsų grojaraštis pavadintas \"11 - "
+"NT1\" or \"12 - NRJ 12\", FreeetuxTV gali pašalinti kanalo numerį, naudojant "
+"reguliariąją išraišką „[0-9]* - “."
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>Apdorojamas kanalo pavadinimas</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Pasirinktinė kanalų grupė"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Mėgstamiausi"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "<b>Special group type:</b>"
+msgstr "<b>Specialios grupės tipas:</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Speciali grupė"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Kanalo savybės"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Kanalo pavadinimas:"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "Kanalo URI:"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>Kanalo VLC parinktys:</b>"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Bendra"
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Deinterliacija:"
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "joks"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Parinktys"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr "GNU bendroji viešoji licencija, 3 versija"
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"
+msgstr "Internetinės televizijos grotuvas"
+
+#: ../data/ui/freetuxtv.glade.h:3
+msgid "Project's Web Site"
+msgstr "Projekto tinklapis"
+
+#. TRANSLATORS: Replace this string with your names, one name per line.
+#: ../data/ui/freetuxtv.glade.h:5
+msgid "translator-credits"
+msgstr "Algimantas Margevičius <margevicius.algimantas at gmail.com>"
+
+#: ../data/ui/freetuxtv.glade.h:6
+msgid "Group properties"
+msgstr "Grupės savybės"
+
+#: ../data/ui/freetuxtv.glade.h:18
+msgid "Number of channels:"
+msgstr "Kanalų skaičius:"
+
+#: ../data/ui/freetuxtv.glade.h:19
+msgid "0"
+msgstr "0"
+
+#: ../data/ui/freetuxtv.glade.h:20
+msgid "Details"
+msgstr "Detalės"
+
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "Peržiūrėti failą"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "Nustatymai"
+
+#: ../data/ui/freetuxtv.glade.h:23
+msgid "Play last channel on startup"
+msgstr "Paleidžiant atkurti paskutinį kanalą"
+
+#: ../data/ui/freetuxtv.glade.h:24
+msgid "<b>Startup</b>"
+msgstr "<b>Paleidimas</b>"
+
+#: ../data/ui/freetuxtv.glade.h:25
+msgid "Enable desktop notifications"
+msgstr "Įjungti darbastalio pranešimus"
+
+#: ../data/ui/freetuxtv.glade.h:26
+msgid "<b>Notifications</b>"
+msgstr "<b>Pranešimai</b>"
+
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr "Nepaisyti diakritikų"
+
+#: ../data/ui/freetuxtv.glade.h:28
+msgid "<b>Search of channels</b>"
+msgstr "<b>Kanalų paieška</b>"
+
+#: ../data/ui/freetuxtv.glade.h:29
+msgid "None"
+msgstr "Joks"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "Naudoti pasirinktinį konfigūracijos failą"
+
+#: ../data/ui/freetuxtv.glade.h:31
+msgid "Use the VLC configuration file"
+msgstr "Naudoti VLC konfigūracijos failą"
+
+#: ../data/ui/freetuxtv.glade.h:32
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>Pakeitus šią parinkty, programą paleiskite iš naujo.</i>"
+
+#: ../data/ui/freetuxtv.glade.h:33
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>Konfigūracijos failas (vlcrc)</b>"
+
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
+msgstr "LibVLC"
+
+#: ../data/ui/freetuxtv.glade.h:35
+msgid "Directory Record:"
+msgstr "Įrašymo aplankas:"
+
+#: ../data/ui/freetuxtv.glade.h:36
+msgid "Select a directory"
+msgstr "Pasirinkti aplanką"
+
+#: ../data/ui/freetuxtv.glade.h:37
+msgid "<b>Destination</b>"
+msgstr "<b>Paskirties vieta</b>"
+
+#: ../data/ui/freetuxtv.glade.h:38
+msgid "No transcoding"
+msgstr "Neperkoduoti"
+
+#: ../data/ui/freetuxtv.glade.h:39
+msgid "Predefined transcoding formats"
+msgstr "Numatyti kodavimo formatai"
+
+#: ../data/ui/freetuxtv.glade.h:40
+msgid "Format:"
+msgstr "Formatas:"
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
+msgstr "<b>Perkodavimo nustatymai</b>"
+
+#: ../data/ui/freetuxtv.glade.h:42
+msgid "Recordings"
+msgstr "Įrašai"
+
+#: ../data/ui/freetuxtv.glade.h:43
+msgid "Download timeout (seconds) :"
+msgstr "Parsiuntimo galiojimo laikas (sekundėmis):"
+
+#: ../data/ui/freetuxtv.glade.h:44
+msgid "<b>Connection</b>"
+msgstr "<b>Prisijungimas</b>"
+
+#: ../data/ui/freetuxtv.glade.h:45
+msgid "No proxy"
+msgstr "Be tarpinio serverio"
+
+#: ../data/ui/freetuxtv.glade.h:46
+msgid "Manual proxy configuration"
+msgstr "Rankinis tarpinio serverio konfigūravimas"
+
+#: ../data/ui/freetuxtv.glade.h:47
+msgid "Proxy server:"
+msgstr "Tarpinis serveris:"
+
+#: ../data/ui/freetuxtv.glade.h:48
+msgid "Proxy port:"
+msgstr "Tarpinio serverio prievadas:"
+
+#: ../data/ui/freetuxtv.glade.h:49
+msgid "Proxy type:"
+msgstr "Tarpinio serverio tipas:"
+
+#: ../data/ui/freetuxtv.glade.h:50
+msgid "Use authentification"
+msgstr "Naudoti tapatybės nustatymą"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "Naudojo vardas:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+#: ../data/ui/freetuxtv.glade.h:53
+msgid "<b>Proxy</b>"
+msgstr "<b>Tarpinis serveris</b>"
+
+#: ../data/ui/freetuxtv.glade.h:54
+msgid "Network"
+msgstr "Tinklas"
+
+#: ../data/ui/freetuxtv.glade.h:55
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../data/ui/freetuxtv.glade.h:56
+msgid "SOCKS"
+msgstr "SOCKS"
+
+#: ../data/ui/freetuxtv.glade.h:57
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr "Video - Theora + Vorbis (OGG)"
+
+#: ../data/ui/freetuxtv.glade.h:58
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+
+#: ../data/ui/freetuxtv.glade.h:59
+msgid "ogg"
+msgstr "ogg"
+
+#: ../data/ui/freetuxtv.glade.h:60
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr "Video - H.264 + MPGA (MP4)"
+
+#: ../data/ui/freetuxtv.glade.h:61
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+
+#: ../data/ui/freetuxtv.glade.h:62
+msgid "mp4"
+msgstr "mp4"
+
+#: ../data/ui/freetuxtv.glade.h:63
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr "Video - MPEG-2 + MPGA (TS)"
+
+#: ../data/ui/freetuxtv.glade.h:64
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+
+#: ../data/ui/freetuxtv.glade.h:65
+msgid "ts"
+msgstr "ts"
+
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
+
+#: ../data/ui/freetuxtv.glade.h:67
+msgid "Search:"
+msgstr "Ieškoti:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "Kanalo teksto paieškos vieta"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "Išvalyti paieškos teksto lauką"
+
+#: ../data/ui/freetuxtv.glade.h:70
+msgid "Jump to current channel"
+msgstr "Peršokti į esamą kanalą"
+
+#: ../data/ui/freetuxtv.glade.h:71
+msgid "Go to the current channel playing"
+msgstr "Eiti į šiuo metu rodomą kanalą"
+
+#: ../data/ui/freetuxtv.glade.h:72
+msgid "Channels"
+msgstr "Kanalai"
+
+#: ../data/ui/freetuxtv.glade.h:73
+msgid "In progress"
+msgstr "Vykdoma"
+
+#: ../data/ui/freetuxtv.glade.h:74
+msgid "Terminated"
+msgstr "Nutraukta"
+
+#: ../data/ui/freetuxtv.glade.h:75
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../data/ui/freetuxtv.glade.h:76
+msgid "Previous channel"
+msgstr "Ankstesnis kanalas"
+
+#: ../data/ui/freetuxtv.glade.h:77
+msgid "Play the current channel"
+msgstr "Groti esamą kanalą"
+
+#: ../data/ui/freetuxtv.glade.h:78
+msgid "Stop playing the current channel"
+msgstr "Sustabdyti dabartinio kanalo atkūrimą"
+
+#: ../data/ui/freetuxtv.glade.h:79
+msgid "Record the current channel"
+msgstr "Įrašyti dabartinį kanalą"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "Sekantis kanalas"
+
+#: ../data/ui/freetuxtv.glade.h:81
+msgid "Vol:"
+msgstr "Garsas:"
+
+#: ../data/ui/freetuxtv.glade.h:82
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
+
+#: ../data/ui/freetuxtv.glade.h:84
+msgid "Fullscreen mode"
+msgstr "Viso ekrano režimas"
+
+#: ../data/ui/freetuxtv.glade.h:85
+msgid "Small mode"
+msgstr "Sumažintas režimas"
+
+#: ../data/ui/freetuxtv.glade.h:86
+msgid " channels"
+msgstr " kanalai"
+
+#: ../data/ui/freetuxtv.glade.h:87
+msgid "Go back to the normal mode"
+msgstr "Grįžti į įprastą režimą"
+
+#: ../data/ui/freetuxtv.glade.h:88
+msgid "Activate/Deactivate the window always on top"
+msgstr "Įjungti/Išjungti lango „visada viršuje“ būseną"
+
+#: ../data/channels_groups.xml.in.h:1
+msgid "Alice (Unofficial)"
+msgstr "Alice (Neoficiali)"
+
+#: ../data/channels_groups.xml.in.h:2
+msgid "SFR TV (Unofficial)"
+msgstr "SFR TV (Neoficiali)"
+
+#: ../data/channels_groups.xml.in.h:3
+msgid "Afrikaans Web TV and Radio"
+msgstr "Afrikiečių internetinė televizija ir radija"
+
+#: ../data/channels_groups.xml.in.h:4
+msgid "Web TV (Afrikaans)"
+msgstr "Internetinė televizija (afrikiečių)"
+
+#: ../data/channels_groups.xml.in.h:5
+msgid "Albanian Web TV and Radio"
+msgstr "Albanų internetinė televizija ir radija"
+
+msgid "Web TV (Albanian)"
+msgstr "Internetinė televizija (Albanų)"
+
+msgid "Amharic Web TV and Radio"
+msgstr "Amharų Internetinė televizija ir radijas"
+
+msgid "Web TV (Amharic)"
+msgstr "Internetinė televizija (Amharų)"
+
+msgid "Arabic Web TV and Radio"
+msgstr "Arabų Internetinė televizija ir radijas"
+
+msgid "Web TV (Arabic)"
+msgstr "Internetinė televizija (Arabų)"
+
+msgid "Web Radio (Arabic)"
+msgstr "Internetinė radija (Arabų)"
+
+msgid "Web Cam (Arabic)"
+msgstr "Interneto kamera (Arabų)"
+
+msgid "Armenian Web TV and Radio"
+msgstr "Armėnų Internetinė televizija ir radija"
+
+msgid "Web TV (Armenian)"
+msgstr "Internetinė televizija (Armėnų kalba)"
+
+msgid "Azerbaijani Web TV and Radio"
+msgstr "Azerbaidžano Internetinė televizija ir radija"
+
+msgid "Web TV (Azerbaijani)"
+msgstr "Internetinė televizija (Azerbaidžano)"
+
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "Bengalų / Bangalija interneto TV ir radijas"
+
+msgid "Web TV (Bengali/Bangla)"
+msgstr "Internetinė televizija (Bengalų / Bangalija)"
+
+msgid "Bulgarian Web TV and Radio"
+msgstr "Bulgarų Internetinė televizija ir radijas"
+
+msgid "Web TV (Bulgarian)"
+msgstr "Internetinė televizija (Bulgarų)"
+
+msgid "Cambodian Web TV and Radio"
+msgstr "Kambodžos Internetinė televizija ir radijas"
+
+msgid "Web TV (Cambodian)"
+msgstr "Internetinė televizija (Kambodžos)"
+
+msgid "Catalan Web TV and Radio"
+msgstr "Katalonų Internetinė televizija ir radija"
+
+msgid "Web TV (Catalan)"
+msgstr "Internetinė televizija (Katalonų)"
+
+msgid "Web Radio (Catalan)"
+msgstr "Internetinė radija (Katalonų)"
+
+msgid "Chinese Web TV and Radio"
+msgstr "Kinijos Internetinė televizija ir radija"
+
+msgid "Web TV (Chinese)"
+msgstr "Internetinė televizija (Kinų)"
+
+msgid "Web Radio (Chinese)"
+msgstr "Interneto radijo (Kinų)"
+
+msgid "Croatian Web TV and Radio"
+msgstr "Kroatijos Internetinė televizija ir radija"
+
+msgid "Web TV (Croatian)"
+msgstr "Internetinė televizija (Kroatų)"
+
+msgid "Web Radio (Croatian)"
+msgstr "Interneto radijo (Kroatų)"
+
+msgid "Czech Web TV and Radio"
+msgstr "Čekijos Internetinė televizija ir radija"
+
+msgid "Web TV (Czech)"
+msgstr "Internetinė televizija (Čekija)"
+
+msgid "Web Radio (Czech)"
+msgstr "Internetinė radija (Čekų)"
+
+msgid "Danish Web TV and Radio"
+msgstr "Danijos internetinė televizija ir radijas"
+
+msgid "Web TV (Danish)"
+msgstr "Internetinė televizija (Danų kalba)"
+
+msgid "Dutch Web TV and Radio"
+msgstr "Olandų Internetinė televizija ir radijas"
+
+msgid "Web TV (Dutch)"
+msgstr "Internetinė televizija (Olandų)"
+
+msgid "Web Radio (Dutch)"
+msgstr "Internetinė radija (Olandų)"
+
+msgid "Web Cam (Dutch)"
+msgstr "Interneto kamera (Olandų)"
+
+msgid "English Web TV and Radio"
+msgstr "Anglų Internetinė televizija ir radija"
+
+msgid "Web TV (English)"
+msgstr "Internetinė televizija (Anglų kalba)"
+
+msgid "Web Radio (English)"
+msgstr "Internetinė radija (Anglų kalba)"
+
+msgid "Web Programmes (English)"
+msgstr "Interneto programos (Anglų kalba)"
+
+msgid "Web Cam (English)"
+msgstr "Interneto kamera (Anglų k.)"
+
+msgid "Estonian Web TV and Radio"
+msgstr "Estijos Internetinė televizija ir radija"
+
+msgid "Web TV (Estonian)"
+msgstr "Internetinė televizija (Estų)"
+
+msgid "Finnish Web TV and Radio"
+msgstr "Suomijos Internetinė televizija ir radija"
+
+msgid "Web TV (Finnish)"
+msgstr "Internetinė televizija (Suomių kalba)"
+
+msgid "French Web TV and Radio"
+msgstr "Prancūzijos Internetinė televizija ir radija"
+
+msgid "Web TV (French)"
+msgstr "Internetinė televizija (Prancūzų kalba)"
+
+msgid "Web Radio (French)"
+msgstr "Interneto radijo (Prancūzų kalba)"
+
+msgid "Web Programmes (French)"
+msgstr "Tinklinės programos (Prancūzijoje)"
+
+msgid "Georgian Web TV and Radio"
+msgstr "Gruzijos Internetinė televizija ir radija"
+
+msgid "Web TV (Georgian)"
+msgstr "Internetinė televizija (Gruzinų)"
+
+msgid "German Web TV and Radio"
+msgstr "Vokietijos interneto TV ir radijas"
+
+msgid "Web TV (German)"
+msgstr "Internetinė televizija (Vokiečių kalba)"
+
+msgid "Web Radio (German)"
+msgstr "Interneto radijo (Vokiečių kalba)"
+
+msgid "Greek Web TV and Radio"
+msgstr "Graikijos Internetinė televizija ir radija"
+
+msgid "Web TV (Greek)"
+msgstr "Internetinė televizija (Graikų)"
+
+msgid "Web Radio (Greek)"
+msgstr "Internetinė radija (Graikų)"
+
+msgid "Hebrew Web TV and Radio"
+msgstr "Hebrajų Internetinė televizija ir radija"
+
+msgid "Web TV (Hebrew)"
+msgstr "Internetinė televizija (Hebrajų)"
+
+msgid "Web Radio (Hebrew)"
+msgstr "Internetinė radija (Hebrajų)"
+
+msgid "Web Cam (Hebrew)"
+msgstr "Interneto kamera (Hebrajų)"
+
+msgid "Hindi Web TV and Radio"
+msgstr "Hindi Internetinė televizija ir radija"
+
+msgid "Web TV (Hindi)"
+msgstr "Internetinė televizija (Hindi)"
+
+msgid "Web Radio (Hindi)"
+msgstr "Internetinė radija (Hindi)"
+
+msgid "Hungarian Web TV and Radio"
+msgstr "Vengrijos Internetinė televizija ir radijas"
+
+msgid "Web TV (Hungarian)"
+msgstr "Internetinė televizija (Vengrijos)"
+
+msgid "Icelandic Web TV and Radio"
+msgstr "Islandijos Internetinė televizija ir radija"
+
+msgid "Web TV (Icelandic)"
+msgstr "Internetinė televizija (Islandų)"
+
+msgid "Indonesian Web TV and Radio"
+msgstr "Indonezijos Internetinė televizija ir radijas"
+
+msgid "Web TV (Indonesian)"
+msgstr "Internetinė televizija (Indoneziečių)"
+
+msgid "Interlingua Web TV and Radio"
+msgstr "Interlingva Internetinė televizija ir radijas"
+
+msgid "Web Radio (Interlingua)"
+msgstr "Interneto radijo (Tarpinė kalba)"
+
+msgid "Irish Web TV and Radio"
+msgstr "Airijos Internetinė televizija ir radijas"
+
+msgid "Web TV (Irish)"
+msgstr "Internetinė televizija (Airija)"
+
+msgid "Web Radio (Irish)"
+msgstr "Interneto radijo (Airija)"
+
+msgid "Italian Web TV and Radio"
+msgstr "Italijos interneto TV ir radijas"
+
+msgid "Web TV (Italian)"
+msgstr "Internetinė televizija (Italų)"
+
+msgid "Web Radio (Italian)"
+msgstr "Internetinė radija (Italija)"
+
+msgid "Japanese Web TV and Radio"
+msgstr "Japonijos Internetinė televizija ir radija"
+
+msgid "Web TV (Japanese)"
+msgstr "Internetinė televizija (Japonų kalba)"
+
+msgid "Web Radio (Japanese)"
+msgstr "Internetinė radija (Japonų)"
+
+msgid "Web Cam (Japanese)"
+msgstr "Interneto kamera (Japonų kalba)"
+
+msgid "Kazakh Web TV and Radio"
+msgstr "Kazachų Internetinė televizija ir radijas"
+
+msgid "Web TV (Kazakh)"
+msgstr "Internetinė televizija (Kazachstanas)"
+
+msgid "Korean Web TV and Radio"
+msgstr "Korėjos interneto TV ir radijas"
+
+msgid "Web TV (Korean)"
+msgstr "Internetinė televizija (Korėjiečių)"
+
+msgid "Kurdish Web TV and Radio"
+msgstr "Kurdų Internetinė televizija ir radijas"
+
+msgid "Web TV (Kurdish)"
+msgstr "Internetinė televizija (Kurdų)"
+
+msgid "Latin Web TV and Radio"
+msgstr "Lotynų Internetinė televizija ir radijas"
+
+msgid "Web TV (Latin)"
+msgstr "Internetinė televizija (Lotynų)"
+
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "Latvijos / latvių Internetinė televizija ir radijas"
+
+msgid "Web TV (Latvian/Lettish)"
+msgstr "Internetinė televizija (Latvių / Latviešu valoda)"
+
+msgid "Lithuanian Web TV and Radio"
+msgstr "Lietuvos Internetinė televizija ir radijas"
+
+msgid "Web TV (Lithuanian)"
+msgstr "Internetinė televizija (Lietuvių)"
+
+msgid "Macedonian Web TV and Radio"
+msgstr "Makedonų Internetinė televizija ir radijas"
+
+msgid "Web TV (Macedonian)"
+msgstr "Internetinė televizija (Makedonijos)"
+
+msgid "Web Radio (Macedonian)"
+msgstr "Interneto radijo (Makedonijos)"
+
+msgid "Malay Web TV and Radio"
+msgstr "Malajų Internetinė televizija ir radijas"
+
+msgid "Web TV (Malay)"
+msgstr "Internetinė televizija (Malajų)"
+
+msgid "Malayalam Web TV and Radio"
+msgstr "Malajalių Internetinė televizija ir radijas"
+
+msgid "Web TV (Malayalam)"
+msgstr "Internetinė televizija (Malayalam)"
+
+msgid "Maltese Web TV and Radio"
+msgstr "Maltos Internetinė televizija ir radijas"
+
+msgid "Web TV (Maltese)"
+msgstr "Internetinė televizija (Maltiečių)"
+
+msgid "Web Radio (Maltese)"
+msgstr "Interneto radijo (Maltiečių)"
+
+msgid "Moldavian Web TV and Radio"
+msgstr "Moldavų Internetinė televizija ir radijas"
+
+msgid "Web TV (Moldavian)"
+msgstr "Internetinė televizija (Moldavijos)"
+
+msgid "Mongolian Web TV and Radio"
+msgstr "Mongolų Internetinė televizija ir radija"
+
+msgid "Web TV (Mongolian)"
+msgstr "Internetinė televizija (Mongolų)"
+
+msgid "Norwegian Web TV and Radio"
+msgstr "Norvegijos Internetinė televizija ir radija"
+
+msgid "Web TV (Norwegian)"
+msgstr "Internetinė televizija (Norvegų kalba)"
+
+msgid "Persian Web TV and Radio"
+msgstr "Persijos Internetinė televizija ir radija"
+
+msgid "Web TV (Persian)"
+msgstr "Internetinė televizija (Persian)"
+
+msgid "Polish Web TV and Radio"
+msgstr "Lenkijos Internetinė televizija ir radijas"
+
+msgid "Web TV (Polish)"
+msgstr "Internetinė televizija (Lenkų)"
+
+msgid "Web Radio (Polish)"
+msgstr "Interneto radijo (Lenkų)"
+
+msgid "Web Cam (Polish)"
+msgstr "Interneto kamera (Lenkų)"
+
+msgid "Portuguese Web TV and Radio"
+msgstr "Portugalijos Internetinė televizija ir radija"
+
+msgid "Web TV (Portuguese)"
+msgstr "Internetinė televizija (Portugalų)"
+
+msgid "Web Radio (Portuguese)"
+msgstr "Interneto radijo (Portugalų)"
+
+msgid "Punjabi Web TV and Radio"
+msgstr "Pandžabi Internetinė televizija ir radija"
+
+msgid "Web TV (Punjabi)"
+msgstr "Internetinė televizija (Pandžabų)"
+
+msgid "Romanian Web TV and Radio"
+msgstr "Rumunijos Internetinė televizija ir radija"
+
+msgid "Web TV (Romanian)"
+msgstr "Internetinė televizija (Rumunų)"
+
+msgid "Web Radio (Romanian)"
+msgstr "Interneto radijo (Rumunų)"
+
+msgid "Russian Web TV and Radio"
+msgstr "Rusijos Internetinė televizija ir radija"
+
+msgid "Web TV (Russian)"
+msgstr "Internetinė televizija (Rusų k.)"
+
+msgid "Web Radio (Russian)"
+msgstr "Web Radijas (Rusų k.)"
+
+msgid "Serbian Web TV and Radio"
+msgstr "Serbijos Internetinė televizija ir radija"
+
+msgid "Web TV (Serbian)"
+msgstr "Internetinė televizija (Serbijos)"
+
+msgid "Web Radio (Serbian)"
+msgstr "Internetinė radija (Indeksas)"
+
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "Serbų-horvatų Internetinė televizija ir radijas"
+
+msgid "Web TV (Serbo-Croatian)"
+msgstr "Internetinė televizija (Serbų-horvatų)"
+
+msgid "Web Radio (Serbo-Croatian)"
+msgstr "Internetinė radija (Serbų-horvatų)"
+
+msgid "Slovak Web TV and Radio"
+msgstr "Slovakijos Internetinė televizija ir radija"
+
+msgid "Web TV (Slovak)"
+msgstr "Internetinė televizija (Slovakijos)"
+
+msgid "Web Radio (Slovak)"
+msgstr "Internetinė radija (Slovakijos)"
+
+msgid "Slovenian Web TV and Radio"
+msgstr "Slovėnijos Internetinė televizija ir radija"
+
+msgid "Web TV (Slovenian)"
+msgstr "Internetinė televizija (Slovėnų)"
+
+msgid "Web Radio (Slovenian)"
+msgstr "Internetinė radija (Slovėnų)"
+
+msgid "Spanish Web TV and Radio"
+msgstr "Spanish Internetinė televizija ir radija"
+
+msgid "Web TV (Spanish)"
+msgstr "Internetinė televizija (Ispanų)"
+
+msgid "Web Radio (Spanish)"
+msgstr "Internetinė radija (Ispanų)"
+
+msgid "Web Programmes (Spanish)"
+msgstr "Interneto programos (Ispanų)"
+
+msgid "Web Cam (Spanish)"
+msgstr "Interneto kamera (Ispanų)"
+
+msgid "Swedish Web TV and Radio"
+msgstr "Švedijos Internetinė televizija ir radija"
+
+msgid "Web TV (Swedish)"
+msgstr "Internetinė televizija (Švedų kalba)"
+
+msgid "Tagalog Web TV and Radio"
+msgstr "Tagalų Internetinė televizija ir radijas"
+
+msgid "Web TV (Tagalog)"
+msgstr "Internetinė televizija (Tagalog)"
+
+msgid "Tamil Web TV and Radio"
+msgstr "Tamil Internetinė televizija ir radija"
+
+msgid "Web TV (Tamil)"
+msgstr "Internetinė televizija (Tamil)"
+
+msgid "Thai Web TV and Radio"
+msgstr "Tailando Internetinė televizija ir radija"
+
+msgid "Web TV (Thai)"
+msgstr "Internetinė televizija (Tajų)"
+
+msgid "Turkish Web TV and Radio"
+msgstr "Turkijos Internetinė televizija ir radija"
+
+msgid "Web TV (Turkish)"
+msgstr "Internetinė televizija (Turkish)"
+
+msgid "Web Radio (Turkish)"
+msgstr "Internetinė radija (Turkish)"
+
+msgid "Turkmen Web TV and Radio"
+msgstr "Turkmėnų Internetinė televizija ir radijas"
+
+msgid "Web TV (Turkmen)"
+msgstr "Internetinė televizija (Turkmėnų)"
+
+msgid "Ukrainian Web TV and Radio"
+msgstr "Ukrainos Internetinė televizija ir radija"
+
+msgid "Web TV (Ukrainian)"
+msgstr "Internetinė televizija (Ukrainiečių)"
+
+msgid "Web Cam (Ukrainian)"
+msgstr "Interneto kamera (Ukrainiečių)"
+
+msgid "Urdu Web TV and Radio"
+msgstr "Urdu Internetinė televizija ir radijas"
+
+msgid "Web TV (Urdu)"
+msgstr "Internetinė televizija (Urdu)"
+
+msgid "Uzbek Web TV and Radio"
+msgstr "Uzbekų Internetinė televizija ir radija"
+
+msgid "Web TV (Uzbek)"
+msgstr "Internetinė televizija (Uzbek)"
+
+msgid "Vietnamese Web TV and Radio"
+msgstr "Vietnamo Internetinė televizija ir radijas"
+
+msgid "Web TV (Vietnamese)"
+msgstr "Internetinė televizija (Vietnamese)"
+
+msgid "Web Radio (Vietnamese)"
+msgstr "Internetinė radija (Vietnamiečių)"
+
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
+msgstr "Internetinės televizijos ir radijas be kalbos"
+
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
+msgstr "Internetinė televizija (be kalbos)"
+
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
+msgstr "Internetinė radija (be kalbos)"
+
+#: ../data/channels_groups.xml.in.h:175
+msgid "Web Programmes (No lang)"
+msgstr "Interneto programos (be kalbos)"
+
+#: ../data/channels_groups.xml.in.h:176
+msgid "Web Cam (No lang)"
+msgstr "Internetinė kamera (be kalbos)"
+
+#: ../data/channels_groups.xml.in.h:177
+msgid "WebCam"
+msgstr "Internetinė kamera"
+
+#: ../data/menu/freetuxtv.desktop.in.h:2
+msgid "Television Channels Player"
+msgstr "Televizijos kanalų grotuvas"
+
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "FreetuxTV televizijos kanalų grotuvas"
+
+#: ../data/menu/freetuxtv.desktop.in.h:4
+msgid "Watch television channels from internet"
+msgstr "Žiūrėkite televiziją internete"
+
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
+#, c-format
+msgid "%ld min"
+msgstr "%ld min"
+
+#. Update status bar
+#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
+#, c-format
+msgid "Update \"%s\" channels list"
+msgstr "Atnaujinamas „%s“ kanalų sąrašas"
+
+#. Get the file of the playlist
+#: ../src/freetuxtv-channels-list.c:327 ../src/freetuxtv-channels-list.c:447
+#, c-format
+msgid "Getting the file: \"%s\""
+msgstr "Gaunamas failas: „%s“"
+
+#: ../src/freetuxtv-channels-list.c:358 ../src/freetuxtv-channels-list.c:478
+#, c-format
+msgid ""
+"Error when adding the channels.\n"
+"\n"
+"M3UParser has returned error:\n"
+"%s."
+msgstr ""
+"Klaida pridedant kanalą.\n"
+"\n"
+"M3UParser grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-channels-list.c:1335
+msgid "Delete group's channels"
+msgstr "Pašalinti grupės kanalus"
+
+#. Add to favourite is only for channels
+#: ../src/freetuxtv-channels-list.c:1385
+msgid "Add to favourites"
+msgstr "Pridėti į mėgstamus"
+
+#. Add favourites to a new group
+#: ../src/freetuxtv-channels-list.c:1401
+msgid "New group"
+msgstr "Nauja grupė"
+
+#: ../src/freetuxtv-db-sync.c:160
+#, c-format
+msgid ""
+"Cannot open database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Atverti duomenų bazės nepavyko.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:317 ../src/freetuxtv-db-sync.c:420
+#: ../src/freetuxtv-db-sync.c:1446
+#, c-format
+msgid ""
+"Error when displaying the channels.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atvaizduojant kanalus.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:478
+#, c-format
+msgid ""
+"Error when getting the channel.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida gaunant kanalus.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:552
+#, c-format
+msgid ""
+"Error when adding the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida pridedant kanalą „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:593
+#, c-format
+msgid ""
+"Error when deleting the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida šalinant kanalą „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:616
+#, c-format
+msgid ""
+"Error when updating the position of the channels in group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atanujinant kanalo vietą grupėje „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:669 ../src/freetuxtv-db-sync.c:708
+#, c-format
+msgid ""
+"Error when getting the channel by name.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida gaunant kanalą pagal vardą.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:748 ../src/freetuxtv-db-sync.c:991
+#: ../src/freetuxtv-db-sync.c:1014
+#, c-format
+msgid ""
+"Error when updating the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant kanalą „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:803 ../src/freetuxtv-db-sync.c:837
+#, c-format
+msgid ""
+"Error when adding the group \"%s\" in database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida pridedant grupę „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:881 ../src/freetuxtv-db-sync.c:922
+#: ../src/freetuxtv-db-sync.c:945
+#, c-format
+msgid ""
+"Error when updating the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant grupę „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1057
+#, c-format
+msgid ""
+"Error when updating the last update date of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant paskutinio grupės „%s“ atnaujinimo datą.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1091
+#, c-format
+msgid ""
+"Error when deleting the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida šalinant grupę „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1112
+#, c-format
+msgid ""
+"Error when updating the position of the groups.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant grupės vietą.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1147
+#, c-format
+msgid ""
+"Error when deleting the channels of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida šalinant kanalą iš grupės „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1184 ../src/freetuxtv-db-sync.c:1220
+#, c-format
+msgid ""
+"Error when updating the channels of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant grupės „%s“ kanalus.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1246
+#, c-format
+msgid ""
+"Error when deleting the tv channels list.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida šalinant tv kanalų sąrašą.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1290
+#, c-format
+msgid ""
+"Error when adding the tv channel '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida pridedant tv kanalą „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1354
+#, c-format
+msgid ""
+"Error when adding the recording '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida pridedant įrašą „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1480
+#, c-format
+msgid ""
+"Error when adding the label of channel logo '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida pridedant kanalo grupės logotipo antraštę „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1514
+#, c-format
+msgid ""
+"Error when linking the TV channel '%s' to channel.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida siejant tv kanalą „%s“ su kanalu.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1553
+#, c-format
+msgid ""
+"Error when getting the database version.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida gaunant duomenų bazės versiją.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1585
+#, c-format
+msgid ""
+"Error when updating the database version.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant duomenų bazės versiją.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1650
+#, c-format
+msgid ""
+"Error when migrating the database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida migruojant duomenų bazę.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1693
+#, c-format
+msgid ""
+"Error when updating the status of the recording \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atnaujinant įrašo „%s“ būseną.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1727
+#, c-format
+msgid ""
+"Error when deleting the recording \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Klaida šalinant įrašą „%s“.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-fileutils.c:87
+#, c-format
+msgid ""
+"Error when downloading the file from URL -> %s.\n"
+"\n"
+"CURL has returned error:\n"
+"%s."
+msgstr ""
+"Klaida atsiunčiant failą iš URL -> %s.\n"
+"\n"
+"SQLite grąžino klaidą:\n"
+"%s."
+
+#: ../src/freetuxtv-i18n.h:49
+msgid "%m/%d/%y"
+msgstr "%m/%d/%y"
+
+#: ../src/freetuxtv-i18n.h:50
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: ../src/freetuxtv-i18n.h:51
+msgid "%m/%d/%Y %H:%M"
+msgstr "%m/%d/%Y %H:%M"
+
+#: ../src/freetuxtv-recordings-list.c:448
+msgid "Do you want to move the related file on the hard disk to the trash?"
+msgstr "Ar norite susijusius failus, kietajame diske perkelti į šiukšlinę?"
+
+#: ../src/freetuxtv-tv-channels-list.c:69
+#, c-format
+msgid "Synchronizing the tv channels list"
+msgstr "Sinchronizuojamas tv kanalų sąrašas"
+
+#: ../src/freetuxtv-utils.c:37
+#, c-format
+msgid "%02dh%02dm%02ds"
+msgstr "%02dh%02dm%02ds"
+
+#: ../src/freetuxtv-utils.c:47
+#, c-format
+msgid "%02d:%02d:%02d"
+msgstr "%02d:%02d:%02d"
+
+#: ../src/freetuxtv-utils.c:54
+#, c-format
+msgid "%ld byte"
+msgstr "%ld byte"
+
+#: ../src/freetuxtv-utils.c:56
+#, c-format
+msgid "%ld bytes"
+msgstr "%ld bytes"
+
+#: ../src/freetuxtv-utils.c:58
+#, c-format
+msgid "%1.1f kB"
+msgstr "%1.1f kB"
+
+#: ../src/freetuxtv-utils.c:60
+#, c-format
+msgid "%1.1f MB"
+msgstr "%1.1f MB"
+
+#: ../src/freetuxtv-utils.c:62
+#, c-format
+msgid "%1.1f GB"
+msgstr "%1.1f GB"
+
+#: ../src/freetuxtv-window-add-channels-group.c:395
+#, c-format
+msgid "Please select a least one group !"
+msgstr "Pasirinkite bent vieną grupę!"
+
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
+msgid "Adding channels groups"
+msgstr "Pridedamos kanalų grupės"
+
+#. Update progress dialog
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
+#, c-format
+msgid "Adding channels group: <i>%s</i>"
+msgstr "Pridedamos kanalų grupės: <i>%s</i>"
+
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
+#, c-format
+msgid "%d channels group(s) have been successfully added."
+msgstr "%d kanalų grupė (-ės) sėkmingai pridėtos."
+
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
+#, c-format
+msgid "Please enter the group's name !"
+msgstr "Prašome įvesti grupės pavadinimą!"
+
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
+#, c-format
+msgid "Please enter the group's URI !"
+msgstr "Prašome įvesti grupės URI!"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, c-format
+msgid "Updating TV channel: %s"
+msgstr "Atnaujinami tv kanalai: %s"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr "TV kanalų sinchronizacija"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, c-format
+msgid "Downloading the file '%s'"
+msgstr "Atsiunčiamas failas „%s“"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+msgid "Synchronizing TV channels from file"
+msgstr "TV kanalai sinchronizuojami su failu"
+
+#. Menu : FreetuxTV
+#: ../src/freetuxtv-window-main.c:278
+msgid "_FreetuxTV"
+msgstr "_FreetuxTV"
+
+#. End Menu : FreetuxTV
+#. Menu : Channels
+#: ../src/freetuxtv-window-main.c:299
+msgid "_Channels"
+msgstr "_Kanalai"
+
+#: ../src/freetuxtv-window-main.c:303
+msgid "_Add a group"
+msgstr "_Pridėti grupę"
+
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr "Pridėti/sukurti kanalų grupes iš skirtingų šaltinių"
+
+#: ../src/freetuxtv-window-main.c:311
+msgid "_Synchronize TV channels database"
+msgstr "_Sinchronizuoti TV kanalų duomenų bazę"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
+"Sinchronizuoti TV kanalų sąrašą vietinėje duomenų bazėje iš XML duomenų bazės"
+
+#. End Menu : Channels
+#. Menu : Video
+#: ../src/freetuxtv-window-main.c:322
+msgid "_Video"
+msgstr "_Video"
+
+#. SubMenu : Deinterlace
+#: ../src/freetuxtv-window-main.c:327
+msgid "_Deinterlace"
+msgstr "_Deinterliacija"
+
+#: ../src/freetuxtv-window-main.c:332
+msgid "Disable"
+msgstr "Išjungti"
+
+#: ../src/freetuxtv-window-main.c:344
+msgid "Blend"
+msgstr "Maišyti"
+
+#: ../src/freetuxtv-window-main.c:353
+msgid "Bob"
+msgstr "Bob"
+
+#: ../src/freetuxtv-window-main.c:362
+msgid "Discard"
+msgstr "Atmesti"
+
+#: ../src/freetuxtv-window-main.c:371
+msgid "Linear"
+msgstr "Linijinis"
+
+#: ../src/freetuxtv-window-main.c:380
+msgid "Mean"
+msgstr "Vidutinis"
+
+#: ../src/freetuxtv-window-main.c:389
+msgid "X"
+msgstr "X"
+
+#. End SubMenu : Deinterlace
+#. End Menu : Video
+#. Menu : Help
+#: ../src/freetuxtv-window-main.c:401
+msgid "_Help"
+msgstr "Ž_inynas"
+
+#. Create the menu items
+#: ../src/freetuxtv-window-main.c:1029
+msgid "Mute"
+msgstr "Nutildyti"
+
+#: ../src/main.c:424
+#, c-format
+msgid "Recording: %s (%s) -> %s (%s)"
+msgstr "Įrašoma: %s (%s) -> %s (%s)"
+
+#: ../src/main.c:577
+#, c-format
+msgid ""
+"An error occurred while playing channel '%s' : %s\n"
+"\n"
+"If the problem persist, you can report that the link is dead at %s"
+msgstr ""
+"Atkuriant kanalą „%s“ įvyko klaida: %s\n"
+"\n"
+"Jei problema išlieka, jog nuoroda nebeveikia į %s"
+
+#: ../src/main.c:581
+msgid "An error occurred"
+msgstr "Įvyko klaida"
+
+#: ../src/main.c:607
+#, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "Sinchronizuojamas tv kanalų sąrašas: %s..."
+
+#: ../src/main.c:642
+msgid "Initializing user configuration..."
+msgstr "Inicijuojama naudotojo konfigūracija..."
+
+#: ../src/main.c:649
+msgid "Loading user configuration..."
+msgstr "Įkeliama naudotojo konfigūracija..."
+
+#: ../src/main.c:719
+msgid "Synchronizing the list of tv channels..."
+msgstr "Sinchronizuojamas tv kanalų sąrašas..."
+
+#: ../src/main.c:752
+msgid "Loading the list of channels..."
+msgstr "Įkeliamas kanalų sąrašas..."
+
+#: ../src/main.c:761
+msgid "Loading the list of recordings..."
+msgstr "Įkeliamas įrašų sąrašas..."
+
+#: ../src/main.c:1080 ../src/main.c:1276
+#, c-format
+msgid "Playing: %s"
+msgstr "Atkuriama: %s"
+
+#: ../src/main.c:1089
+msgid "is playing"
+msgstr "atkuriama"
+
+#: ../src/main.c:1278
+#, c-format
+msgid "Stopping channel: %s"
+msgstr "Sustabdomas kanalas: %s"
+
+#: ../src/main.c:1322
+msgid "is recording"
+msgstr "įrašinėjama"
+
+#: ../src/main.c:1369
+#, c-format
+msgid "Recording: %s"
+msgstr "Įrašoma: %s"
+
+#: ../src/main.c:1494
+msgid "Are you sure you want to quit?"
+msgstr "Ar tikrai norite išeiti?"
diff --git a/po/pt.po b/po/pl.po
similarity index 89%
copy from po/pt.po
copy to po/pl.po
index 6b2215f..f7af200 100644
--- a/po/pt.po
+++ b/po/pl.po
@@ -1,84 +1,76 @@
-# Portugese translation of freetuxtv.
-# Copyright (C) 2008,2009,2010 GNU General Public License v3
+# Polish translation of freetuxtv.
+# Copyright (C) 2013 GNU General Public License v3
# This file is distributed under the same license as the freetuxtv package.
-# José JORGE <jjorge at free.fr>, 2009.
+# Eric Beuque <eric.beuque at gmail.com>, 2013. (From patch)
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-24 21:41+0100\n"
-"PO-Revision-Date: 2009-12-13 22:57+0100\n"
-"Last-Translator: José JORGE <jjorge at free.fr>\n"
-"Language-Team: Portuguese <kde-i18n-doc at kde.org>\n"
-"Language: pt\n"
+"PO-Revision-Date: 2013-11-24 11:00+0100\n"
+"Last-Translator: Eric Beuque <eric.beuque at gmail.com>\n"
+"Language-Team: Polish <eric.beuque at gmail.com>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/ui/addrecording.glade.h:1
-#, fuzzy
msgid "<b>Recording period</b>"
-msgstr "<b>Destino</b>"
+msgstr "<b>okres nagrywania</b>"
#: ../data/ui/addrecording.glade.h:2
-#, fuzzy
msgid "Add a recording"
-msgstr "Adicionar um grupo"
+msgstr "Dodaj nagranie"
#: ../data/ui/addrecording.glade.h:3
msgid "Duration:"
-msgstr ""
+msgstr "Czas nagrywania"
#: ../data/ui/addrecording.glade.h:4
msgid "End time:"
-msgstr ""
+msgstr "Czas końcowy"
#: ../data/ui/addrecording.glade.h:5
-#, fuzzy
msgid "Selected channel:"
-msgstr "canais"
+msgstr "Wybierz kanał"
#: ../data/ui/addrecording.glade.h:6
msgid "Start time:"
-msgstr ""
+msgstr "Czas początkowy"
#: ../data/ui/addrecording.glade.h:7
msgid "Title:"
-msgstr ""
+msgstr "Tytuł"
#: ../data/ui/addrecording.glade.h:8
msgid "minutes"
-msgstr ""
+msgstr "minuty"
#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
msgid "<b>Processing of channels' name</b>"
msgstr ""
#: ../data/ui/addchannelsgroups.glade.h:2
-#, fuzzy
msgid "<b>Special group type:</b>"
-msgstr "Adicionar um grupo"
+msgstr ""
#: ../data/ui/addchannelsgroups.glade.h:3
-#, fuzzy
msgid "Add a group"
-msgstr "Adicionar um grupo"
+msgstr "Dodaj grupę"
#: ../data/ui/addchannelsgroups.glade.h:4
-#, fuzzy
msgid "Channels groups file:"
-msgstr "Ficheiro de grupos de canais :"
+msgstr "Plik grupy kanałów"
#: ../data/ui/addchannelsgroups.glade.h:5
msgid "Custom channels group"
-msgstr "Grupos de canais personalizados"
+msgstr "Grupa kanałów użytkownika"
#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
msgid "Delete this text before the name:"
-msgstr ""
+msgstr "Usuń tekst przed nazwą:"
#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
msgid "Delete this text behind the name:"
@@ -86,48 +78,46 @@ msgstr ""
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
-msgstr "Grupos de canais conhecidos"
+msgstr "Istniejące grupy kanałów"
#: ../data/ui/addchannelsgroups.glade.h:9
msgid "Favourites"
-msgstr ""
+msgstr "Ulubione"
#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
msgid "Group's name:"
-msgstr ""
+msgstr "Nazwa grupy:"
#: ../data/ui/addchannelsgroups.glade.h:11
-#, fuzzy
msgid "Languages/Channels group"
-msgstr "Grupos de canais personalizados"
+msgstr "ęzyki/Grupy kanałów"
#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
msgid "Name of the group which will be added"
-msgstr ""
+msgstr "Nazwa grupy jaka ma być dodana"
#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
msgid "Playlist's URI of the group which will be added"
-msgstr ""
+msgstr "URI Listy odtwarzania jaka ma być dodana"
#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
-#, fuzzy
msgid "Playlist's URI:"
-msgstr "Endereço URI da lista de leitura :"
+msgstr "URI Listy odtwarzania:"
#: ../data/ui/addchannelsgroups.glade.h:15
msgid "Required ISP"
-msgstr ""
+msgstr "Brakuje ISP"
#: ../data/ui/addchannelsgroups.glade.h:16
msgid ""
"Select one or several channels group you want to add and click on the add "
"button."
-msgstr ""
+msgstr "Wybierz jedną lub kilka grup kanałów jakie chcesz dodać i kliknij na "
+"przycisk."
#: ../data/ui/addchannelsgroups.glade.h:17
-#, fuzzy
msgid "Special group"
-msgstr "Adicionar um grupo"
+msgstr "Grupa specjalna"
#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
msgid ""
@@ -155,24 +145,20 @@ msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
msgstr ""
#: ../data/ui/channelproperties.glade.h:1
-#, fuzzy
msgid "<b>Channel VLC options:</b>"
-msgstr "<b>Destino</b>"
+msgstr ""
#: ../data/ui/channelproperties.glade.h:2
-#, fuzzy
msgid "Channel properties"
-msgstr "Ficheiro de grupos de canais :"
+msgstr "Właściwości kanału"
#: ../data/ui/channelproperties.glade.h:3
-#, fuzzy
msgid "Channel's URI:"
-msgstr "Canais"
+msgstr "URI kanału:"
#: ../data/ui/channelproperties.glade.h:4
-#, fuzzy
msgid "Channel's name:"
-msgstr "Canais"
+msgstr "Nazwa kanału"
#: ../data/ui/channelproperties.glade.h:5
msgid "Deinterlacement:"
@@ -180,11 +166,11 @@ msgstr ""
#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
msgid "General"
-msgstr "Gerais"
+msgstr "Ogólne"
#: ../data/ui/channelproperties.glade.h:7
msgid "Options"
-msgstr ""
+msgstr "Okcje"
#: ../data/ui/channelproperties.glade.h:8
#: ../src/freetuxtv-window-channel-properties.c:175
@@ -193,59 +179,55 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:1
msgid " channels"
-msgstr "canais"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:2
msgid "+"
-msgstr "+"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:3
msgid "-"
-msgstr "-"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:4
msgid "0"
-msgstr "0"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:5
msgid "00:00:00"
-msgstr "00:00:00"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:6
msgid "<b>Configuration file (vlcrc)</b>"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:7
-#, fuzzy
msgid "<b>Connection</b>"
-msgstr "<b>Notificações</b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:8
msgid "<b>Destination</b>"
-msgstr "<b>Destino</b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:9
msgid "<b>Notifications</b>"
-msgstr "<b>Notificações</b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:11
-#, fuzzy
msgid "<b>Proxy</b>"
-msgstr "<b>Versão : </b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:12
-#, fuzzy
msgid "<b>Search of channels</b>"
-msgstr "canais"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:13
msgid "<b>Startup</b>"
-msgstr "<b>Inicio</b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:14
-#, fuzzy
msgid "<b>Transcoding options</b>"
-msgstr "<b>Destino</b>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:15
msgid "<i>Restart the application after changing this option.</i>"
@@ -257,7 +239,7 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:17
msgid "Channels"
-msgstr "Canais"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:18
msgid "Channels' search text area"
@@ -269,12 +251,11 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:22
msgid "Details"
-msgstr "Detalhes"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:23
-#, fuzzy
msgid "Directory Record:"
-msgstr "Pasta para as gravações :"
+msgstr "Katalog Nagrania:"
#: ../data/ui/freetuxtv.glade.h:24
msgid "Download timeout (seconds) :"
@@ -282,20 +263,19 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:25
msgid "Enable desktop notifications"
-msgstr "Activar as notificações no ecrã"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:26
-#, fuzzy
msgid "Format:"
-msgstr "Formato :"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:27 ../data/menu/freetuxtv.desktop.in.h:1
msgid "FreetuxTV"
-msgstr "FreetuxTV"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:28
msgid "Fullscreen mode"
-msgstr "Modo tela cheia"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:29
msgid "GNU General Public License v3"
@@ -303,12 +283,11 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:31
msgid "Go back to the normal mode"
-msgstr "Voltar ao modo normal"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:32
-#, fuzzy
msgid "Go to the current channel playing"
-msgstr "Ler o canal actual"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:33
msgid "Group properties"
@@ -327,9 +306,8 @@ msgid "In progress"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:38
-#, fuzzy
msgid "Jump to current channel"
-msgstr "Ler o canal actual"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:39
msgid "LibVLC"
@@ -341,12 +319,11 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:42
msgid "Network"
-msgstr ""
+msgstr "Sieć"
#: ../data/ui/freetuxtv.glade.h:43
-#, fuzzy
msgid "Next channel"
-msgstr "canais"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:44
msgid "No proxy"
@@ -354,40 +331,39 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:45
msgid "No transcoding"
-msgstr "Sem transcodificação"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:46
msgid "None"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:47
-#, fuzzy
msgid "Number of channels:"
-msgstr "canais"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:48
msgid "Password:"
-msgstr ""
+msgstr "Hasłó:"
#: ../data/ui/freetuxtv.glade.h:49
msgid "Play last channel on startup"
-msgstr "Ler o último canal ao arranque"
+msgstr "Po uruchomieniu odtwarzaj ostatni kanał"
#: ../data/ui/freetuxtv.glade.h:50
msgid "Play the current channel"
-msgstr "Ler o canal actual"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:53
msgid "Predefined transcoding formats"
-msgstr "Formatos de transcodificação pré-definidos"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:54
msgid "Preferences"
-msgstr "Preferências"
+msgstr "Preferencje"
#: ../data/ui/freetuxtv.glade.h:55
msgid "Previous channel"
-msgstr "Canal"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:56
msgid "Project's Web Site"
@@ -406,9 +382,8 @@ msgid "Proxy type:"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:60
-#, fuzzy
msgid "Record the current channel"
-msgstr "Ler o canal actual"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:61
msgid "Recordings"
@@ -420,20 +395,19 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:63
msgid "Search:"
-msgstr ""
+msgstr "Szukaj:"
#: ../data/ui/freetuxtv.glade.h:64
msgid "Select a directory"
-msgstr ""
+msgstr "Wybierz katalog"
#: ../data/ui/freetuxtv.glade.h:65
msgid "Small mode"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:66
-#, fuzzy
msgid "Stop playing the current channel"
-msgstr "Ler o canal actual"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:67
msgid "Terminated"
@@ -453,7 +427,7 @@ msgstr ""
#: ../data/ui/freetuxtv.glade.h:73
msgid "Username:"
-msgstr ""
+msgstr "Nazwa użytkownika:"
#: ../data/ui/freetuxtv.glade.h:74
msgid "Video - H.264 + MPGA (MP4)"
@@ -476,9 +450,8 @@ msgid "Vol:"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:79
-#, fuzzy
msgid "Web TV channels player"
-msgstr "Actualizar a lista de canais \"%s\""
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:81
msgid "mp4"
@@ -808,7 +781,7 @@ msgstr ""
#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
#, c-format
msgid "Update \"%s\" channels list"
-msgstr "Actualizar a lista de canais \"%s\""
+msgstr ""
#. Get the file of the playlist
#: ../src/freetuxtv-channels-list.c:327 ../src/freetuxtv-channels-list.c:447
@@ -836,9 +809,8 @@ msgstr ""
#. Add favourites to a new group
#: ../src/freetuxtv-channels-list.c:1388
-#, fuzzy
msgid "New group"
-msgstr "Adicionar um grupo"
+msgstr ""
#: ../src/freetuxtv-db-sync.c:160
#, c-format
@@ -1149,9 +1121,9 @@ msgstr ""
#: ../src/freetuxtv-window-add-channels-group.c:466
#: ../src/freetuxtv-window-add-channels-group.c:548
#: ../src/freetuxtv-window-add-channels-group.c:592
-#, fuzzy, c-format
+#, c-format
msgid "Adding channels group: <i>%s</i>"
-msgstr "Grupos de canais conhecidos"
+msgstr ""
#: ../src/freetuxtv-window-add-channels-group.c:494
#: ../src/freetuxtv-window-add-channels-group.c:561
@@ -1189,9 +1161,8 @@ msgid "_Add a group"
msgstr ""
#: ../src/freetuxtv-window-main.c:308
-#, fuzzy
msgid "_Update TV channels list"
-msgstr "Actualizar a lista de canais \"%s\""
+msgstr ""
#. End Menu : Channels
#. Menu : Video
@@ -1237,7 +1208,7 @@ msgstr ""
#. Menu : Help
#: ../src/freetuxtv-window-main.c:396
msgid "_Help"
-msgstr "_Ajuda"
+msgstr ""
#. Create the menu items
#: ../src/freetuxtv-window-main.c:1024
@@ -1291,9 +1262,9 @@ msgid "is playing"
msgstr ""
#: ../src/main.c:1249
-#, fuzzy, c-format
+#, c-format
msgid "Stopping channel: %s"
-msgstr "canais"
+msgstr ""
#: ../src/main.c:1293
msgid "is recording"
@@ -1306,33 +1277,4 @@ msgstr ""
#: ../src/main.c:1465
msgid "Are you sure you want to quit?"
-msgstr ""
-
-#, fuzzy
-#~ msgid "60"
-#~ msgstr "0"
-
-#~ msgid "<b>Author : </b>"
-#~ msgstr "<b>Autor : </b>"
-
-#~ msgid "<b>Version : </b>"
-#~ msgstr "<b>Versão : </b>"
-
-#~ msgid ""
-#~ "<span size=\"xx-large\"><b>FreetuxTV</b></span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Web TV channels player</span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Loading...</span>"
-#~ msgstr ""
-#~ "<span size=\"xx-large\"><b>FreetuxTV</b></span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Leitor de canais TV pela rede</span>\n"
-#~ "\n"
-#~ "<span size=\"large\">Carregando...</span>"
-
-#~ msgid "Eric Beuque"
-#~ msgstr "Eric Beuque"
-
-#~ msgid "_Update logos list"
-#~ msgstr "Act_ualizar a lista de logotipos"
+msgstr "Zamknąć?"
diff --git a/po/pt.po b/po/pt.po
index 6b2215f..bfe054b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
"PO-Revision-Date: 2009-12-13 22:57+0100\n"
"Last-Translator: José JORGE <jjorge at free.fr>\n"
"Language-Team: Portuguese <kde-i18n-doc at kde.org>\n"
@@ -20,129 +20,111 @@ msgstr ""
#: ../data/ui/addrecording.glade.h:1
#, fuzzy
-msgid "<b>Recording period</b>"
-msgstr "<b>Destino</b>"
+msgid "Add a recording"
+msgstr "Adicionar um grupo"
#: ../data/ui/addrecording.glade.h:2
#, fuzzy
-msgid "Add a recording"
-msgstr "Adicionar um grupo"
+msgid "Selected channel:"
+msgstr "canais"
#: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
+msgid "Title:"
msgstr ""
#: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
+msgid "Start time:"
msgstr ""
#: ../data/ui/addrecording.glade.h:5
-#, fuzzy
-msgid "Selected channel:"
-msgstr "canais"
+msgid "Duration:"
+msgstr ""
#: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
+msgid "End time:"
msgstr ""
#: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr ""
-
-#: ../data/ui/addrecording.glade.h:8
msgid "minutes"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "<b>Processing of channels' name</b>"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:2
+#: ../data/ui/addrecording.glade.h:8
#, fuzzy
-msgid "<b>Special group type:</b>"
-msgstr "Adicionar um grupo"
+msgid "<b>Recording period</b>"
+msgstr "<b>Destino</b>"
-#: ../data/ui/addchannelsgroups.glade.h:3
+#: ../data/ui/addchannelsgroups.glade.h:1
#, fuzzy
msgid "Add a group"
msgstr "Adicionar um grupo"
-#: ../data/ui/addchannelsgroups.glade.h:4
+#: ../data/ui/addchannelsgroups.glade.h:2
#, fuzzy
msgid "Channels groups file:"
msgstr "Ficheiro de grupos de canais :"
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+
#: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
+#, fuzzy
+msgid "Languages/Channels group"
msgstr "Grupos de canais personalizados"
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
msgstr ""
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
msgstr "Grupos de canais conhecidos"
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
msgid "Group's name:"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:11
-#, fuzzy
-msgid "Languages/Channels group"
-msgstr "Grupos de canais personalizados"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
msgid "Name of the group which will be added"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
#, fuzzy
msgid "Playlist's URI:"
msgstr "Endereço URI da lista de leitura :"
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:17
-#, fuzzy
-msgid "Special group"
-msgstr "Adicionar um grupo"
-
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
-msgid ""
-"Text or regexp which must be deleted at the beginning of the channel's name"
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
msgid ""
"You can easily use regular expressions to delete some text in the channel's "
"name of the groupe. For example, if in your playlist, you have a name like "
@@ -150,20 +132,38 @@ msgid ""
"number before the name, by using the regular expression \"[0-9]* - \"."
msgstr ""
-#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
msgstr ""
-#: ../data/ui/channelproperties.glade.h:1
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Grupos de canais personalizados"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:21
#, fuzzy
-msgid "<b>Channel VLC options:</b>"
-msgstr "<b>Destino</b>"
+msgid "<b>Special group type:</b>"
+msgstr "Adicionar um grupo"
-#: ../data/ui/channelproperties.glade.h:2
+#: ../data/ui/addchannelsgroups.glade.h:22
+#, fuzzy
+msgid "Special group"
+msgstr "Adicionar um grupo"
+
+#: ../data/ui/channelproperties.glade.h:1
#, fuzzy
msgid "Channel properties"
msgstr "Ficheiro de grupos de canais :"
+#: ../data/ui/channelproperties.glade.h:2
+#, fuzzy
+msgid "Channel's name:"
+msgstr "Canais"
+
#: ../data/ui/channelproperties.glade.h:3
#, fuzzy
msgid "Channel's URI:"
@@ -171,637 +171,1070 @@ msgstr "Canais"
#: ../data/ui/channelproperties.glade.h:4
#, fuzzy
-msgid "Channel's name:"
-msgstr "Canais"
-
-#: ../data/ui/channelproperties.glade.h:5
-msgid "Deinterlacement:"
-msgstr ""
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>Destino</b>"
-#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
msgid "General"
msgstr "Gerais"
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr ""
+
#: ../data/ui/channelproperties.glade.h:7
-msgid "Options"
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
msgstr ""
#: ../data/ui/channelproperties.glade.h:8
-#: ../src/freetuxtv-window-channel-properties.c:175
-msgid "none"
+msgid "Options"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:1
-msgid " channels"
-msgstr "canais"
+msgid "GNU General Public License v3"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:2
-msgid "+"
-msgstr "+"
+#, fuzzy
+msgid "Web TV channels player"
+msgstr "Actualizar a lista de canais \"%s\""
#: ../data/ui/freetuxtv.glade.h:3
-msgid "-"
-msgstr "-"
-
-#: ../data/ui/freetuxtv.glade.h:4
-msgid "0"
-msgstr "0"
+msgid "Project's Web Site"
+msgstr ""
+#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+msgid "translator-credits"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:6
-msgid "<b>Configuration file (vlcrc)</b>"
+msgid "Group properties"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:7
-#, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Notificações</b>"
-
-#: ../data/ui/freetuxtv.glade.h:8
-msgid "<b>Destination</b>"
-msgstr "<b>Destino</b>"
-
-#: ../data/ui/freetuxtv.glade.h:9
-msgid "<b>Notifications</b>"
-msgstr "<b>Notificações</b>"
-
-#: ../data/ui/freetuxtv.glade.h:11
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Versão : </b>"
-
-#: ../data/ui/freetuxtv.glade.h:12
+#: ../data/ui/freetuxtv.glade.h:18
#, fuzzy
-msgid "<b>Search of channels</b>"
+msgid "Number of channels:"
msgstr "canais"
-#: ../data/ui/freetuxtv.glade.h:13
-msgid "<b>Startup</b>"
-msgstr "<b>Inicio</b>"
-
-#: ../data/ui/freetuxtv.glade.h:14
-#, fuzzy
-msgid "<b>Transcoding options</b>"
-msgstr "<b>Destino</b>"
-
-#: ../data/ui/freetuxtv.glade.h:15
-msgid "<i>Restart the application after changing this option.</i>"
-msgstr ""
-
-#: ../data/ui/freetuxtv.glade.h:16
-msgid "Activate/Deactivate the window always on top"
-msgstr ""
-
-#: ../data/ui/freetuxtv.glade.h:17
-msgid "Channels"
-msgstr "Canais"
+#: ../data/ui/freetuxtv.glade.h:19
+msgid "0"
+msgstr "0"
-#: ../data/ui/freetuxtv.glade.h:18
-msgid "Channels' search text area"
-msgstr ""
+#: ../data/ui/freetuxtv.glade.h:20
+msgid "Details"
+msgstr "Detalhes"
-#: ../data/ui/freetuxtv.glade.h:19
-msgid "Delete the search text area"
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:22
-msgid "Details"
-msgstr "Detalhes"
+msgid "Preferences"
+msgstr "Preferências"
#: ../data/ui/freetuxtv.glade.h:23
-#, fuzzy
-msgid "Directory Record:"
-msgstr "Pasta para as gravações :"
+msgid "Play last channel on startup"
+msgstr "Ler o último canal ao arranque"
#: ../data/ui/freetuxtv.glade.h:24
-msgid "Download timeout (seconds) :"
-msgstr ""
+msgid "<b>Startup</b>"
+msgstr "<b>Inicio</b>"
#: ../data/ui/freetuxtv.glade.h:25
msgid "Enable desktop notifications"
msgstr "Activar as notificações no ecrã"
#: ../data/ui/freetuxtv.glade.h:26
-#, fuzzy
-msgid "Format:"
-msgstr "Formato :"
+msgid "<b>Notifications</b>"
+msgstr "<b>Notificações</b>"
-#: ../data/ui/freetuxtv.glade.h:27 ../data/menu/freetuxtv.desktop.in.h:1
-msgid "FreetuxTV"
-msgstr "FreetuxTV"
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:28
-msgid "Fullscreen mode"
-msgstr "Modo tela cheia"
+#, fuzzy
+msgid "<b>Search of channels</b>"
+msgstr "canais"
#: ../data/ui/freetuxtv.glade.h:29
-msgid "GNU General Public License v3"
+msgid "None"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:31
-msgid "Go back to the normal mode"
-msgstr "Voltar ao modo normal"
+msgid "Use the VLC configuration file"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:32
-#, fuzzy
-msgid "Go to the current channel playing"
-msgstr "Ler o canal actual"
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:33
-msgid "Group properties"
+msgid "<b>Configuration file (vlcrc)</b>"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:35
-msgid "HTTP"
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
msgstr ""
+#: ../data/ui/freetuxtv.glade.h:35
+#, fuzzy
+msgid "Directory Record:"
+msgstr "Pasta para as gravações :"
+
#: ../data/ui/freetuxtv.glade.h:36
-msgid "Ignore diacritics"
+msgid "Select a directory"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:37
-msgid "In progress"
-msgstr ""
+msgid "<b>Destination</b>"
+msgstr "<b>Destino</b>"
#: ../data/ui/freetuxtv.glade.h:38
-#, fuzzy
-msgid "Jump to current channel"
-msgstr "Ler o canal actual"
+msgid "No transcoding"
+msgstr "Sem transcodificação"
#: ../data/ui/freetuxtv.glade.h:39
-msgid "LibVLC"
-msgstr ""
+msgid "Predefined transcoding formats"
+msgstr "Formatos de transcodificação pré-definidos"
#: ../data/ui/freetuxtv.glade.h:40
-msgid "Manual proxy configuration"
-msgstr ""
+#, fuzzy
+msgid "Format:"
+msgstr "Formato :"
+
+#: ../data/ui/freetuxtv.glade.h:41
+#, fuzzy
+msgid "<b>Transcoding options</b>"
+msgstr "<b>Destino</b>"
#: ../data/ui/freetuxtv.glade.h:42
-msgid "Network"
+msgid "Recordings"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:43
-#, fuzzy
-msgid "Next channel"
-msgstr "canais"
+msgid "Download timeout (seconds) :"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:44
-msgid "No proxy"
-msgstr ""
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Notificações</b>"
#: ../data/ui/freetuxtv.glade.h:45
-msgid "No transcoding"
-msgstr "Sem transcodificação"
+msgid "No proxy"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:46
-msgid "None"
+msgid "Manual proxy configuration"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:47
-#, fuzzy
-msgid "Number of channels:"
-msgstr "canais"
+msgid "Proxy server:"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:48
-msgid "Password:"
+msgid "Proxy port:"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:49
-msgid "Play last channel on startup"
-msgstr "Ler o último canal ao arranque"
+msgid "Proxy type:"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:50
-msgid "Play the current channel"
-msgstr "Ler o canal actual"
+msgid "Use authentification"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:53
-msgid "Predefined transcoding formats"
-msgstr "Formatos de transcodificação pré-definidos"
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Versão : </b>"
#: ../data/ui/freetuxtv.glade.h:54
-msgid "Preferences"
-msgstr "Preferências"
+msgid "Network"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:55
-msgid "Previous channel"
-msgstr "Canal"
+msgid "HTTP"
+msgstr ""
#: ../data/ui/freetuxtv.glade.h:56
-msgid "Project's Web Site"
+msgid "SOCKS"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:57
-msgid "Proxy port:"
+msgid "Video - Theora + Vorbis (OGG)"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:58
-msgid "Proxy server:"
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:59
-msgid "Proxy type:"
+msgid "ogg"
msgstr ""
#: ../data/ui/freetuxtv.glade.h:60
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:61
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:62
+msgid "mp4"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:63
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:64
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:65
+msgid "ts"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
+
+#: ../data/ui/freetuxtv.glade.h:67
+msgid "Search:"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:70
+#, fuzzy
+msgid "Jump to current channel"
+msgstr "Ler o canal actual"
+
+#: ../data/ui/freetuxtv.glade.h:71
+#, fuzzy
+msgid "Go to the current channel playing"
+msgstr "Ler o canal actual"
+
+#: ../data/ui/freetuxtv.glade.h:72
+msgid "Channels"
+msgstr "Canais"
+
+#: ../data/ui/freetuxtv.glade.h:73
+msgid "In progress"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:74
+msgid "Terminated"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:75
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../data/ui/freetuxtv.glade.h:76
+msgid "Previous channel"
+msgstr "Canal"
+
+#: ../data/ui/freetuxtv.glade.h:77
+msgid "Play the current channel"
+msgstr "Ler o canal actual"
+
+#: ../data/ui/freetuxtv.glade.h:78
+#, fuzzy
+msgid "Stop playing the current channel"
+msgstr "Ler o canal actual"
+
+#: ../data/ui/freetuxtv.glade.h:79
#, fuzzy
msgid "Record the current channel"
msgstr "Ler o canal actual"
-#: ../data/ui/freetuxtv.glade.h:61
-msgid "Recordings"
+#: ../data/ui/freetuxtv.glade.h:80
+#, fuzzy
+msgid "Next channel"
+msgstr "canais"
+
+#: ../data/ui/freetuxtv.glade.h:81
+msgid "Vol:"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:82
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
+
+#: ../data/ui/freetuxtv.glade.h:84
+msgid "Fullscreen mode"
+msgstr "Modo tela cheia"
+
+#: ../data/ui/freetuxtv.glade.h:85
+msgid "Small mode"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:86
+msgid " channels"
+msgstr "canais"
+
+#: ../data/ui/freetuxtv.glade.h:87
+msgid "Go back to the normal mode"
+msgstr "Voltar ao modo normal"
+
+#: ../data/ui/freetuxtv.glade.h:88
+msgid "Activate/Deactivate the window always on top"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:1
+msgid "Alice (Unofficial)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:2
+msgid "SFR TV (Unofficial)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:3
+msgid "Afrikaans Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:4
+msgid "Web TV (Afrikaans)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:5
+msgid "Albanian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:6
+msgid "Web TV (Albanian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:7
+msgid "Amharic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:8
+msgid "Web TV (Amharic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:9
+msgid "Arabic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:10
+msgid "Web TV (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:11
+msgid "Web Radio (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:12
+msgid "Web Cam (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:13
+msgid "Armenian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:14
+msgid "Web TV (Armenian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:15
+msgid "Azerbaijani Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:16
+msgid "Web TV (Azerbaijani)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:17
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:18
+msgid "Web TV (Bengali/Bangla)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:19
+msgid "Bulgarian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:20
+msgid "Web TV (Bulgarian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:21
+msgid "Cambodian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:22
+msgid "Web TV (Cambodian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:23
+msgid "Catalan Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:26
+msgid "Chinese Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:29
+msgid "Croatian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:30
+msgid "Web TV (Croatian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:31
+msgid "Web Radio (Croatian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:32
+msgid "Czech Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:34
+msgid "Web Radio (Czech)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:35
+msgid "Danish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:36
+msgid "Web TV (Danish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:37
+msgid "Dutch Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:39
+msgid "Web Radio (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:40
+msgid "Web Cam (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:41
+msgid "English Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:45
+msgid "Web Cam (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:46
+msgid "Estonian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:47
+msgid "Web TV (Estonian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:48
+msgid "Finnish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:49
+msgid "Web TV (Finnish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:50
+msgid "French Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:54
+msgid "Georgian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:55
+msgid "Web TV (Georgian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:56
+msgid "German Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:59
+msgid "Greek Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:61
+msgid "Web Radio (Greek)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:62
+msgid "Hebrew Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:63
+msgid "Web TV (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:64
+msgid "Web Radio (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:65
+msgid "Web Cam (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:66
+msgid "Hindi Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:67
+msgid "Web TV (Hindi)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:68
+msgid "Web Radio (Hindi)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:69
+msgid "Hungarian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:71
+msgid "Icelandic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:72
+msgid "Web TV (Icelandic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:73
+msgid "Indonesian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:74
+msgid "Web TV (Indonesian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:75
+msgid "Interlingua Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:76
+msgid "Web Radio (Interlingua)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:77
+msgid "Irish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:78
+msgid "Web TV (Irish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:79
+msgid "Web Radio (Irish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:80
+msgid "Italian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:62
-msgid "SOCKS"
+#: ../data/channels_groups.xml.in.h:83
+msgid "Japanese Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:63
-msgid "Search:"
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:64
-msgid "Select a directory"
+#: ../data/channels_groups.xml.in.h:85
+msgid "Web Radio (Japanese)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:65
-msgid "Small mode"
+#: ../data/channels_groups.xml.in.h:86
+msgid "Web Cam (Japanese)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:66
-#, fuzzy
-msgid "Stop playing the current channel"
-msgstr "Ler o canal actual"
+#: ../data/channels_groups.xml.in.h:87
+msgid "Kazakh Web TV and Radio"
+msgstr ""
-#: ../data/ui/freetuxtv.glade.h:67
-msgid "Terminated"
+#: ../data/channels_groups.xml.in.h:88
+msgid "Web TV (Kazakh)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:70
-msgid "Use a custom configuration file"
+#: ../data/channels_groups.xml.in.h:89
+msgid "Korean Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:71
-msgid "Use authentification"
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:72
-msgid "Use the VLC configuration file"
+#: ../data/channels_groups.xml.in.h:91
+msgid "Kurdish Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:73
-msgid "Username:"
+#: ../data/channels_groups.xml.in.h:92
+msgid "Web TV (Kurdish)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:74
-msgid "Video - H.264 + MPGA (MP4)"
+#: ../data/channels_groups.xml.in.h:93
+msgid "Latin Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:75
-msgid "Video - MPEG-2 + MPGA (TS)"
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:76
-msgid "Video - Theora + Vorbis (OGG)"
+#: ../data/channels_groups.xml.in.h:95
+msgid "Latvian/Lettish Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:77
-msgid "View file"
+#: ../data/channels_groups.xml.in.h:96
+msgid "Web TV (Latvian/Lettish)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:78
-msgid "Vol:"
+#: ../data/channels_groups.xml.in.h:97
+msgid "Lithuanian Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:79
-#, fuzzy
-msgid "Web TV channels player"
-msgstr "Actualizar a lista de canais \"%s\""
+#: ../data/channels_groups.xml.in.h:98
+msgid "Web TV (Lithuanian)"
+msgstr ""
-#: ../data/ui/freetuxtv.glade.h:81
-msgid "mp4"
+#: ../data/channels_groups.xml.in.h:99
+msgid "Macedonian Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:82
-msgid "ogg"
+#: ../data/channels_groups.xml.in.h:100
+msgid "Web TV (Macedonian)"
msgstr ""
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: ../data/ui/freetuxtv.glade.h:84
-msgid "translator-credits"
+#: ../data/channels_groups.xml.in.h:101
+msgid "Web Radio (Macedonian)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:85
-msgid "ts"
+#: ../data/channels_groups.xml.in.h:102
+msgid "Malay Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:86
-msgid ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
+#: ../data/channels_groups.xml.in.h:103
+#, fuzzy
+msgid "Web TV (Malay)"
+msgstr "Actualizar a lista de canais \"%s\""
+
+#: ../data/channels_groups.xml.in.h:104
+msgid "Malayalam Web TV and Radio"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:87
-msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+#: ../data/channels_groups.xml.in.h:105
+msgid "Web TV (Malayalam)"
msgstr ""
-#: ../data/ui/freetuxtv.glade.h:88
-msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+#: ../data/channels_groups.xml.in.h:106
+msgid "Maltese Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:1
-msgid "Alice (Unofficial)"
+#: ../data/channels_groups.xml.in.h:107
+msgid "Web TV (Maltese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:2
-msgid "Arabic Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:108
+msgid "Web Radio (Maltese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:3
-msgid "Catalan Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:109
+msgid "Moldavian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:4
-msgid "Chinese Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:110
+msgid "Web TV (Moldavian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:5
-msgid "Czech Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:111
+msgid "Mongolian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:6
-msgid "Dutch Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:112
+msgid "Web TV (Mongolian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:7
-msgid "English Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:113
+msgid "Norwegian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:8
-msgid "French Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:9
-msgid "German Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:115
+msgid "Persian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:10
-msgid "Greek Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:11
-msgid "Hungarian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:117
+msgid "Polish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:12
-msgid "Italian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:13
-msgid "Japanese Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:119
+msgid "Web Radio (Polish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:14
-msgid "Korean Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:120
+msgid "Web Cam (Polish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:15
-msgid "Latin Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:121
+msgid "Portuguese Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:16
-msgid "Modern Greek Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:17
-msgid "No lang Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:123
+msgid "Web Radio (Portuguese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:18
-msgid "Norwegian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:124
+msgid "Punjabi Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:19
-msgid "Persian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:125
+msgid "Web TV (Punjabi)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:20
-msgid "Polish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:126
+msgid "Romanian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:21
-msgid "Portuguese Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:22
-msgid "Romanian Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:128
+msgid "Web Radio (Romanian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:23
+#: ../data/channels_groups.xml.in.h:129
msgid "Russian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:24
-msgid "SFR TV (Unofficial)"
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:25
-msgid "Slovak Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:26
-msgid "Spanish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:132
+msgid "Serbian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:27
-msgid "Swedish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:133
+msgid "Web TV (Serbian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:28
-msgid "Thai Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:134
+msgid "Web Radio (Serbian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:29
-msgid "Turkish Web TV and Radio"
+#: ../data/channels_groups.xml.in.h:135
+msgid "Serbo-Croatian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:30
-msgid "Web Programmes (English)"
+#: ../data/channels_groups.xml.in.h:136
+msgid "Web TV (Serbo-Croatian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:31
-msgid "Web Programmes (French)"
+#: ../data/channels_groups.xml.in.h:137
+msgid "Web Radio (Serbo-Croatian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:32
-msgid "Web Radio (Arabic)"
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:33
-msgid "Web Radio (Catalan)"
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:34
-msgid "Web Radio (Chinese)"
+#: ../data/channels_groups.xml.in.h:140
+msgid "Web Radio (Slovak)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:35
-msgid "Web Radio (English)"
+#: ../data/channels_groups.xml.in.h:141
+msgid "Slovenian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:36
-msgid "Web Radio (French)"
+#: ../data/channels_groups.xml.in.h:142
+msgid "Web TV (Slovenian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:37
-msgid "Web Radio (German)"
+#: ../data/channels_groups.xml.in.h:143
+msgid "Web Radio (Slovenian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:38
-msgid "Web Radio (Italian)"
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:39
-msgid "Web Radio (No lang)"
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:40
-msgid "Web Radio (Russian)"
+#: ../data/channels_groups.xml.in.h:146
+msgid "Web Radio (Spanish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:41
-msgid "Web Radio (Spanish)"
+#: ../data/channels_groups.xml.in.h:147
+msgid "Web Programmes (Spanish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:42
-msgid "Web TV (Arabic)"
+#: ../data/channels_groups.xml.in.h:148
+msgid "Web Cam (Spanish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:43
-msgid "Web TV (Catalan)"
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:44
-msgid "Web TV (Chinese)"
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:45
-msgid "Web TV (Czech)"
+#: ../data/channels_groups.xml.in.h:151
+msgid "Tagalog Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:46
-msgid "Web TV (Dutch)"
+#: ../data/channels_groups.xml.in.h:152
+msgid "Web TV (Tagalog)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:47
-msgid "Web TV (English)"
+#: ../data/channels_groups.xml.in.h:153
+msgid "Tamil Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:48
-msgid "Web TV (French)"
+#: ../data/channels_groups.xml.in.h:154
+msgid "Web TV (Tamil)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:49
-msgid "Web TV (German)"
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:50
-msgid "Web TV (Greek)"
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:51
-msgid "Web TV (Hungarian)"
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:52
-msgid "Web TV (Italian)"
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:53
-msgid "Web TV (Japanese)"
+#: ../data/channels_groups.xml.in.h:159
+msgid "Web Radio (Turkish)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:54
-msgid "Web TV (Korean)"
+#: ../data/channels_groups.xml.in.h:160
+msgid "Turkmen Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:55
-msgid "Web TV (Latin)"
+#: ../data/channels_groups.xml.in.h:161
+msgid "Web TV (Turkmen)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:56
-msgid "Web TV (Modern Greek)"
+#: ../data/channels_groups.xml.in.h:162
+msgid "Ukrainian Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:57
-msgid "Web TV (No lang)"
+#: ../data/channels_groups.xml.in.h:163
+msgid "Web TV (Ukrainian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:58
-msgid "Web TV (Norwegian)"
+#: ../data/channels_groups.xml.in.h:164
+msgid "Web Cam (Ukrainian)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:59
-msgid "Web TV (Persian)"
+#: ../data/channels_groups.xml.in.h:165
+msgid "Urdu Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:60
-msgid "Web TV (Polish)"
+#: ../data/channels_groups.xml.in.h:166
+msgid "Web TV (Urdu)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:61
-msgid "Web TV (Portuguese)"
+#: ../data/channels_groups.xml.in.h:167
+msgid "Uzbek Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:62
-msgid "Web TV (Romanian)"
+#: ../data/channels_groups.xml.in.h:168
+msgid "Web TV (Uzbek)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:63
-msgid "Web TV (Russian)"
+#: ../data/channels_groups.xml.in.h:169
+msgid "Vietnamese Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:64
-msgid "Web TV (Slovak)"
+#: ../data/channels_groups.xml.in.h:170
+msgid "Web TV (Vietnamese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:65
-msgid "Web TV (Spanish)"
+#: ../data/channels_groups.xml.in.h:171
+msgid "Web Radio (Vietnamese)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:66
-msgid "Web TV (Swedish)"
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
msgstr ""
-#: ../data/channels_groups.xml.in.h:67
-msgid "Web TV (Thai)"
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:68
-msgid "Web TV (Turkish)"
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
msgstr ""
-#: ../data/channels_groups.xml.in.h:69
+#: ../data/channels_groups.xml.in.h:175
+msgid "Web Programmes (No lang)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:176
+msgid "Web Cam (No lang)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:177
msgid "WebCam"
msgstr ""
#: ../data/menu/freetuxtv.desktop.in.h:2
-msgid "FreetuxTV Television Channels Player"
+msgid "Television Channels Player"
msgstr ""
#: ../data/menu/freetuxtv.desktop.in.h:3
-msgid "Television Channels Player"
+msgid "FreetuxTV Television Channels Player"
msgstr ""
#: ../data/menu/freetuxtv.desktop.in.h:4
msgid "Watch television channels from internet"
msgstr ""
-#: ../src/freetuxtv-cellrenderer-recordingslist.c:348
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
#, c-format
-msgid "%lld min"
+msgid "%ld min"
msgstr ""
#. Update status bar
@@ -825,17 +1258,17 @@ msgid ""
"%s."
msgstr ""
-#: ../src/freetuxtv-channels-list.c:1322
+#: ../src/freetuxtv-channels-list.c:1335
msgid "Delete group's channels"
msgstr ""
#. Add to favourite is only for channels
-#: ../src/freetuxtv-channels-list.c:1372
+#: ../src/freetuxtv-channels-list.c:1385
msgid "Add to favourites"
msgstr ""
#. Add favourites to a new group
-#: ../src/freetuxtv-channels-list.c:1388
+#: ../src/freetuxtv-channels-list.c:1401
#, fuzzy
msgid "New group"
msgstr "Adicionar um grupo"
@@ -1093,7 +1526,7 @@ msgstr ""
msgid "Do you want to move the related file on the hard disk to the trash?"
msgstr ""
-#: ../src/freetuxtv-tv-channels-list.c:67
+#: ../src/freetuxtv-tv-channels-list.c:69
#, c-format
msgid "Synchronizing the tv channels list"
msgstr ""
@@ -1133,114 +1566,140 @@ msgstr ""
msgid "%1.1f GB"
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:376
+#: ../src/freetuxtv-window-add-channels-group.c:395
#, c-format
msgid "Please select a least one group !"
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:382
-#: ../src/freetuxtv-window-add-channels-group.c:530
-#: ../src/freetuxtv-window-add-channels-group.c:584
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
msgid "Adding channels groups"
msgstr ""
#. Update progress dialog
-#: ../src/freetuxtv-window-add-channels-group.c:422
-#: ../src/freetuxtv-window-add-channels-group.c:466
-#: ../src/freetuxtv-window-add-channels-group.c:548
-#: ../src/freetuxtv-window-add-channels-group.c:592
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
#, fuzzy, c-format
msgid "Adding channels group: <i>%s</i>"
msgstr "Grupos de canais conhecidos"
-#: ../src/freetuxtv-window-add-channels-group.c:494
-#: ../src/freetuxtv-window-add-channels-group.c:561
-#: ../src/freetuxtv-window-add-channels-group.c:605
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
#, c-format
msgid "%d channels group(s) have been successfully added."
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:522
-#: ../src/freetuxtv-window-add-channels-group.c:579
-#: ../src/freetuxtv-window-main.c:1980
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
#, c-format
msgid "Please enter the group's name !"
msgstr ""
-#: ../src/freetuxtv-window-add-channels-group.c:525
-#: ../src/freetuxtv-window-main.c:1985
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
#, c-format
msgid "Please enter the group's URI !"
msgstr ""
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "Actualizar a lista de canais \"%s\""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, c-format
+msgid "Downloading the file '%s'"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+msgid "Synchronizing TV channels from file"
+msgstr ""
+
#. Menu : FreetuxTV
-#: ../src/freetuxtv-window-main.c:277
+#: ../src/freetuxtv-window-main.c:278
msgid "_FreetuxTV"
msgstr ""
#. End Menu : FreetuxTV
#. Menu : Channels
-#: ../src/freetuxtv-window-main.c:298
+#: ../src/freetuxtv-window-main.c:299
msgid "_Channels"
msgstr ""
-#: ../src/freetuxtv-window-main.c:302
+#: ../src/freetuxtv-window-main.c:303
msgid "_Add a group"
msgstr ""
-#: ../src/freetuxtv-window-main.c:308
-#, fuzzy
-msgid "_Update TV channels list"
-msgstr "Actualizar a lista de canais \"%s\""
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:311
+msgid "_Synchronize TV channels database"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
#. End Menu : Channels
#. Menu : Video
-#: ../src/freetuxtv-window-main.c:317
+#: ../src/freetuxtv-window-main.c:322
msgid "_Video"
msgstr ""
#. SubMenu : Deinterlace
-#: ../src/freetuxtv-window-main.c:322
+#: ../src/freetuxtv-window-main.c:327
msgid "_Deinterlace"
msgstr ""
-#: ../src/freetuxtv-window-main.c:327
+#: ../src/freetuxtv-window-main.c:332
msgid "Disable"
msgstr ""
-#: ../src/freetuxtv-window-main.c:339
+#: ../src/freetuxtv-window-main.c:344
msgid "Blend"
msgstr ""
-#: ../src/freetuxtv-window-main.c:348
+#: ../src/freetuxtv-window-main.c:353
msgid "Bob"
msgstr ""
-#: ../src/freetuxtv-window-main.c:357
+#: ../src/freetuxtv-window-main.c:362
msgid "Discard"
msgstr ""
-#: ../src/freetuxtv-window-main.c:366
+#: ../src/freetuxtv-window-main.c:371
msgid "Linear"
msgstr ""
-#: ../src/freetuxtv-window-main.c:375
+#: ../src/freetuxtv-window-main.c:380
msgid "Mean"
msgstr ""
-#: ../src/freetuxtv-window-main.c:384
+#: ../src/freetuxtv-window-main.c:389
msgid "X"
msgstr ""
#. End SubMenu : Deinterlace
#. End Menu : Video
#. Menu : Help
-#: ../src/freetuxtv-window-main.c:396
+#: ../src/freetuxtv-window-main.c:401
msgid "_Help"
msgstr "_Ajuda"
#. Create the menu items
-#: ../src/freetuxtv-window-main.c:1024
+#: ../src/freetuxtv-window-main.c:1029
msgid "Mute"
msgstr ""
@@ -1261,50 +1720,55 @@ msgstr ""
msgid "An error occurred"
msgstr ""
-#: ../src/main.c:627
+#: ../src/main.c:607
+#, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr ""
+
+#: ../src/main.c:642
msgid "Initializing user configuration..."
msgstr ""
-#: ../src/main.c:634
+#: ../src/main.c:649
msgid "Loading user configuration..."
msgstr ""
-#: ../src/main.c:693
+#: ../src/main.c:719
msgid "Synchronizing the list of tv channels..."
msgstr ""
-#: ../src/main.c:726
+#: ../src/main.c:752
msgid "Loading the list of channels..."
msgstr ""
-#: ../src/main.c:735
+#: ../src/main.c:761
msgid "Loading the list of recordings..."
msgstr ""
-#: ../src/main.c:1051 ../src/main.c:1247
+#: ../src/main.c:1080 ../src/main.c:1276
#, c-format
msgid "Playing: %s"
msgstr ""
-#: ../src/main.c:1060
+#: ../src/main.c:1089
msgid "is playing"
msgstr ""
-#: ../src/main.c:1249
+#: ../src/main.c:1278
#, fuzzy, c-format
msgid "Stopping channel: %s"
msgstr "canais"
-#: ../src/main.c:1293
+#: ../src/main.c:1322
msgid "is recording"
msgstr ""
-#: ../src/main.c:1340
+#: ../src/main.c:1369
#, c-format
msgid "Recording: %s"
msgstr ""
-#: ../src/main.c:1465
+#: ../src/main.c:1494
msgid "Are you sure you want to quit?"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..a1bd84d
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,1812 @@
+# 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 <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
+"PO-Revision-Date: 2013-02-15 21:00+GMT+3\n"
+"Last-Translator: Eugen Z.<cdxncdxn at gmail.com>\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"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Добавить запись"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Выбранный"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Название:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Время начала:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Продолжительность"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Конец времени"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "минут(ы)"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "<b>Recording period</b>"
+msgstr "<b>Время записи</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Добавить список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "XML Файл со списками каналов:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Выделите один или несколько списков с каналами и нажмите кнопку добавить."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Язык/Список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "Необходимый провайдер"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "Интернет адрес"
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Готовые списки каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Название списка"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr ""
+"Название списка с каналами который будет добавлен.\n"
+"Например: Мои список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "Интернет адрес списка каналов:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr ""
+"Адрес содержащий список каналов который будет добавлен\n"
+"(ссылка на m3u файл или в другом читаемом формате)\n"
+"Например: http://database.freetuxtv.net/playlists/playlist_webtv_ru.m3u"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Удалить этот тест из начала названия:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr ""
+"Текст или регулярное выражение удаляемые из начала строки названия канала"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Удалить этот тест из конца названия:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr "Текст или регулярное выражение удаляемые с конца названия канала"
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"Вы можете использовать регулярные выражения, чтобы удалить текст в названиях "
+"каналов.\n"
+"Например, в списке воспроизведения названия:\n"
+"\"11 - Телеканал 2x2\". \n"
+"\"12 - Культура\". \n"
+"\"11 - \" и \"12 - \" перед именем канала удаляется с помощью фильтра: "
+"\"[0-9]* - \""
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>Обработка имен каналов</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Другой список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Избранное"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "<b>Special group type:</b>"
+msgstr "<b>Тип списка:</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Пустой список каналов"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Параметры канала"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Название канала"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "Интернет адрес канала"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>VLC параметры канала:</b>"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Основные"
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Устранение чересстрочности:"
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "не задано"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Параметры"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"
+msgstr "Приложение для просмотра и записи ТВ -каналов"
+
+#: ../data/ui/freetuxtv.glade.h:3
+msgid "Project's Web Site"
+msgstr "Сайт проекта"
+
+#. TRANSLATORS: Replace this string with your names, one name per line.
+#: ../data/ui/freetuxtv.glade.h:5
+msgid "translator-credits"
+msgstr "Eugen Z. <cdxncdxn at gmail.com>"
+
+#: ../data/ui/freetuxtv.glade.h:6
+msgid "Group properties"
+msgstr "Параметры группы"
+
+#: ../data/ui/freetuxtv.glade.h:18
+msgid "Number of channels:"
+msgstr "Количество каналов:"
+
+#: ../data/ui/freetuxtv.glade.h:19
+msgid "0"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:20
+msgid "Details"
+msgstr "Детали"
+
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "Посмотреть файл"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "Настройки"
+
+#: ../data/ui/freetuxtv.glade.h:23
+msgid "Play last channel on startup"
+msgstr "Включать последний просмотренный канал при запуске программы"
+
+#: ../data/ui/freetuxtv.glade.h:24
+msgid "<b>Startup</b>"
+msgstr "<b>Запуск</b>"
+
+#: ../data/ui/freetuxtv.glade.h:25
+msgid "Enable desktop notifications"
+msgstr "Показывать уведомления на рабочем столе"
+
+#: ../data/ui/freetuxtv.glade.h:26
+msgid "<b>Notifications</b>"
+msgstr "<b>Уведомления</b>"
+
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr "Игнорировать специальные символы"
+
+#: ../data/ui/freetuxtv.glade.h:28
+msgid "<b>Search of channels</b>"
+msgstr "<b>Поиск каналов</b>"
+
+#: ../data/ui/freetuxtv.glade.h:29
+msgid "None"
+msgstr "Не задано"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "Использовать альтернативный файл конфигурации"
+
+#: ../data/ui/freetuxtv.glade.h:31
+msgid "Use the VLC configuration file"
+msgstr "Использовать файл конфигурации VLC"
+
+#: ../data/ui/freetuxtv.glade.h:32
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>Требуется перезапуск приложения для применения этой настройки</i>"
+
+#: ../data/ui/freetuxtv.glade.h:33
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>Файл конфигурации (vlcrc)</b>"
+
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:35
+msgid "Directory Record:"
+msgstr "Каталог для записи:"
+
+#: ../data/ui/freetuxtv.glade.h:36
+msgid "Select a directory"
+msgstr "Выберите каталог"
+
+#: ../data/ui/freetuxtv.glade.h:37
+msgid "<b>Destination</b>"
+msgstr "<b>Место назначения</b>"
+
+#: ../data/ui/freetuxtv.glade.h:38
+msgid "No transcoding"
+msgstr "Не перекодировать"
+
+#: ../data/ui/freetuxtv.glade.h:39
+msgid "Predefined transcoding formats"
+msgstr "Выбрать формат кодирования"
+
+#: ../data/ui/freetuxtv.glade.h:40
+msgid "Format:"
+msgstr "Формат:"
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
+msgstr "<b>Настройки перекодирования</b>"
+
+#: ../data/ui/freetuxtv.glade.h:42
+msgid "Recordings"
+msgstr "Видеозаписи"
+
+#: ../data/ui/freetuxtv.glade.h:43
+msgid "Download timeout (seconds) :"
+msgstr "Максимальное время ожидания загрузки канала (в секундах):"
+
+#: ../data/ui/freetuxtv.glade.h:44
+msgid "<b>Connection</b>"
+msgstr "<b>Соединения</b>"
+
+#: ../data/ui/freetuxtv.glade.h:45
+msgid "No proxy"
+msgstr "Нет прокси сервера"
+
+#: ../data/ui/freetuxtv.glade.h:46
+msgid "Manual proxy configuration"
+msgstr "Настроить прокси вручную"
+
+#: ../data/ui/freetuxtv.glade.h:47
+msgid "Proxy server:"
+msgstr "Прокси сервер:"
+
+#: ../data/ui/freetuxtv.glade.h:48
+msgid "Proxy port:"
+msgstr "Порт прокси сервера:"
+
+#: ../data/ui/freetuxtv.glade.h:49
+msgid "Proxy type:"
+msgstr "Тип прокси:"
+
+#: ../data/ui/freetuxtv.glade.h:50
+msgid "Use authentification"
+msgstr "Использовать авторизацию"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../data/ui/freetuxtv.glade.h:53
+msgid "<b>Proxy</b>"
+msgstr "<b>Прокси</b>"
+
+#: ../data/ui/freetuxtv.glade.h:54
+msgid "Network"
+msgstr "Сеть"
+
+#: ../data/ui/freetuxtv.glade.h:55
+msgid "HTTP"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:56
+msgid "SOCKS"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:57
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:58
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:59
+msgid "ogg"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:60
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:61
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:62
+msgid "mp4"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:63
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:64
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:65
+msgid "ts"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:67
+msgid "Search:"
+msgstr "Поиск:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "Поле для поиска канала (по совпадению текста из названия)"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "Удалить текст из поля поиска"
+
+#: ../data/ui/freetuxtv.glade.h:70
+msgid "Jump to current channel"
+msgstr "Перейти на текущий канал"
+
+#: ../data/ui/freetuxtv.glade.h:71
+msgid "Go to the current channel playing"
+msgstr "Выделить текущий просматриваемый канал"
+
+#: ../data/ui/freetuxtv.glade.h:72
+msgid "Channels"
+msgstr "Каналы"
+
+#: ../data/ui/freetuxtv.glade.h:73
+msgid "In progress"
+msgstr "В процессе"
+
+#: ../data/ui/freetuxtv.glade.h:74
+msgid "Terminated"
+msgstr "Завершенные"
+
+#: ../data/ui/freetuxtv.glade.h:75
+msgid "00:00:00"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:76
+msgid "Previous channel"
+msgstr "Предыдущий канал"
+
+#: ../data/ui/freetuxtv.glade.h:77
+msgid "Play the current channel"
+msgstr "Включить просмотр текущего канала"
+
+#: ../data/ui/freetuxtv.glade.h:78
+msgid "Stop playing the current channel"
+msgstr "Остановить просмотр/запись текущего канала"
+
+#: ../data/ui/freetuxtv.glade.h:79
+msgid "Record the current channel"
+msgstr "Записать текущий канал"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "Следующий канал"
+
+#: ../data/ui/freetuxtv.glade.h:81
+msgid "Vol:"
+msgstr "Громкость"
+
+#: ../data/ui/freetuxtv.glade.h:82
+msgid "-"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:84
+msgid "Fullscreen mode"
+msgstr "Полноэкранный режим"
+
+#: ../data/ui/freetuxtv.glade.h:85
+msgid "Small mode"
+msgstr "Компактный режим проигрывателя"
+
+#: ../data/ui/freetuxtv.glade.h:86
+msgid " channels"
+msgstr " канала(ов)"
+
+#: ../data/ui/freetuxtv.glade.h:87
+msgid "Go back to the normal mode"
+msgstr "Вернуться в нормальный режим"
+
+#: ../data/ui/freetuxtv.glade.h:88
+msgid "Activate/Deactivate the window always on top"
+msgstr "Закрепить поверх всех окон"
+
+#: ../data/channels_groups.xml.in.h:1
+msgid "Alice (Unofficial)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:2
+msgid "SFR TV (Unofficial)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:3
+msgid "Afrikaans Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:4
+#, fuzzy
+msgid "Web TV (Afrikaans)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:5
+msgid "Albanian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:6
+#, fuzzy
+msgid "Web TV (Albanian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:7
+msgid "Amharic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:8
+#, fuzzy
+msgid "Web TV (Amharic)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:9
+msgid "Arabic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:10
+msgid "Web TV (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:11
+msgid "Web Radio (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:12
+msgid "Web Cam (Arabic)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:13
+msgid "Armenian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:14
+#, fuzzy
+msgid "Web TV (Armenian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:15
+msgid "Azerbaijani Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:16
+#, fuzzy
+msgid "Web TV (Azerbaijani)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:17
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:18
+#, fuzzy
+msgid "Web TV (Bengali/Bangla)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:19
+msgid "Bulgarian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:20
+#, fuzzy
+msgid "Web TV (Bulgarian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:21
+msgid "Cambodian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:22
+#, fuzzy
+msgid "Web TV (Cambodian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:23
+msgid "Catalan Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:26
+msgid "Chinese Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:29
+msgid "Croatian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:30
+#, fuzzy
+msgid "Web TV (Croatian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:31
+msgid "Web Radio (Croatian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:32
+msgid "Czech Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:34
+msgid "Web Radio (Czech)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:35
+msgid "Danish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:36
+#, fuzzy
+msgid "Web TV (Danish)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:37
+msgid "Dutch Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:39
+msgid "Web Radio (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:40
+msgid "Web Cam (Dutch)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:41
+msgid "English Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:45
+msgid "Web Cam (English)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:46
+msgid "Estonian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:47
+#, fuzzy
+msgid "Web TV (Estonian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:48
+msgid "Finnish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:49
+#, fuzzy
+msgid "Web TV (Finnish)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:50
+msgid "French Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:54
+msgid "Georgian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:55
+#, fuzzy
+msgid "Web TV (Georgian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:56
+msgid "German Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:59
+msgid "Greek Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:61
+msgid "Web Radio (Greek)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:62
+msgid "Hebrew Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:63
+msgid "Web TV (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:64
+msgid "Web Radio (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:65
+msgid "Web Cam (Hebrew)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:66
+msgid "Hindi Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:67
+#, fuzzy
+msgid "Web TV (Hindi)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:68
+msgid "Web Radio (Hindi)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:69
+msgid "Hungarian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:71
+msgid "Icelandic Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:72
+#, fuzzy
+msgid "Web TV (Icelandic)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:73
+msgid "Indonesian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:74
+#, fuzzy
+msgid "Web TV (Indonesian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:75
+msgid "Interlingua Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:76
+msgid "Web Radio (Interlingua)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:77
+msgid "Irish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:78
+#, fuzzy
+msgid "Web TV (Irish)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:79
+msgid "Web Radio (Irish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:80
+msgid "Italian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:83
+msgid "Japanese Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:85
+msgid "Web Radio (Japanese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:86
+msgid "Web Cam (Japanese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:87
+msgid "Kazakh Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:88
+#, fuzzy
+msgid "Web TV (Kazakh)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:89
+msgid "Korean Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:91
+msgid "Kurdish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:92
+#, fuzzy
+msgid "Web TV (Kurdish)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:93
+msgid "Latin Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:95
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:96
+#, fuzzy
+msgid "Web TV (Latvian/Lettish)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:97
+msgid "Lithuanian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:98
+#, fuzzy
+msgid "Web TV (Lithuanian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:99
+msgid "Macedonian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:100
+#, fuzzy
+msgid "Web TV (Macedonian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:101
+msgid "Web Radio (Macedonian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:102
+msgid "Malay Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:103
+#, fuzzy
+msgid "Web TV (Malay)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:104
+msgid "Malayalam Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:105
+msgid "Web TV (Malayalam)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:106
+msgid "Maltese Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:107
+#, fuzzy
+msgid "Web TV (Maltese)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:108
+msgid "Web Radio (Maltese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:109
+msgid "Moldavian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:110
+#, fuzzy
+msgid "Web TV (Moldavian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:111
+msgid "Mongolian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:112
+#, fuzzy
+msgid "Web TV (Mongolian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:113
+msgid "Norwegian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:115
+msgid "Persian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:117
+msgid "Polish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:119
+msgid "Web Radio (Polish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:120
+msgid "Web Cam (Polish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:121
+msgid "Portuguese Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:123
+msgid "Web Radio (Portuguese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:124
+msgid "Punjabi Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:125
+#, fuzzy
+msgid "Web TV (Punjabi)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:126
+msgid "Romanian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:128
+#, fuzzy
+msgid "Web Radio (Romanian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:129
+msgid "Russian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:132
+msgid "Serbian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:133
+#, fuzzy
+msgid "Web TV (Serbian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:134
+msgid "Web Radio (Serbian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:135
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:136
+#, fuzzy
+msgid "Web TV (Serbo-Croatian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:137
+msgid "Web Radio (Serbo-Croatian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:140
+msgid "Web Radio (Slovak)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:141
+msgid "Slovenian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:142
+#, fuzzy
+msgid "Web TV (Slovenian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:143
+msgid "Web Radio (Slovenian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:146
+msgid "Web Radio (Spanish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:147
+msgid "Web Programmes (Spanish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:148
+msgid "Web Cam (Spanish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:151
+msgid "Tagalog Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:152
+#, fuzzy
+msgid "Web TV (Tagalog)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:153
+msgid "Tamil Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:154
+#, fuzzy
+msgid "Web TV (Tamil)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:159
+msgid "Web Radio (Turkish)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:160
+msgid "Turkmen Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:161
+#, fuzzy
+msgid "Web TV (Turkmen)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:162
+msgid "Ukrainian Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:163
+#, fuzzy
+msgid "Web TV (Ukrainian)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:164
+msgid "Web Cam (Ukrainian)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:165
+msgid "Urdu Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:166
+#, fuzzy
+msgid "Web TV (Urdu)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:167
+msgid "Uzbek Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:168
+#, fuzzy
+msgid "Web TV (Uzbek)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:169
+msgid "Vietnamese Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:170
+#, fuzzy
+msgid "Web TV (Vietnamese)"
+msgstr "Интернет ТВ (Русскоязычные каналы)"
+
+#: ../data/channels_groups.xml.in.h:171
+msgid "Web Radio (Vietnamese)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:175
+msgid "Web Programmes (No lang)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:176
+msgid "Web Cam (No lang)"
+msgstr ""
+
+#: ../data/channels_groups.xml.in.h:177
+msgid "WebCam"
+msgstr ""
+
+#: ../data/menu/freetuxtv.desktop.in.h:2
+msgid "Television Channels Player"
+msgstr "Просмотр ТВ-каналов"
+
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "FreetuxTV Приложение для просмотра и записи ТВ-каналов"
+
+#: ../data/menu/freetuxtv.desktop.in.h:4
+msgid "Watch television channels from internet"
+msgstr "Просмотр и запись ТВ -каналов онлайн"
+
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
+#, fuzzy, c-format
+msgid "%ld min"
+msgstr "%lld мин"
+
+#. Update status bar
+#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
+#, c-format
+msgid "Update \"%s\" channels list"
+msgstr "Обновляется список каналов \"%s\""
+
+#. Get the file of the playlist
+#: ../src/freetuxtv-channels-list.c:327 ../src/freetuxtv-channels-list.c:447
+#, c-format
+msgid "Getting the file: \"%s\""
+msgstr "Получаем: \"%s\""
+
+#: ../src/freetuxtv-channels-list.c:358 ../src/freetuxtv-channels-list.c:478
+#, c-format
+msgid ""
+"Error when adding the channels.\n"
+"\n"
+"M3UParser has returned error:\n"
+"%s."
+msgstr ""
+"Ошибка при добавлении каналов.\n"
+"\n"
+"M3UParser вернул ошибку:\n"
+"%s."
+
+#: ../src/freetuxtv-channels-list.c:1335
+msgid "Delete group's channels"
+msgstr "Удалить содержимое списка"
+
+#. Add to favourite is only for channels
+#: ../src/freetuxtv-channels-list.c:1385
+msgid "Add to favourites"
+msgstr "Добавить в избранное"
+
+#. Add favourites to a new group
+#: ../src/freetuxtv-channels-list.c:1401
+msgid "New group"
+msgstr "Новый список"
+
+#: ../src/freetuxtv-db-sync.c:160
+#, c-format
+msgid ""
+"Cannot open database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:317 ../src/freetuxtv-db-sync.c:420
+#: ../src/freetuxtv-db-sync.c:1446
+#, c-format
+msgid ""
+"Error when displaying the channels.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:478
+#, c-format
+msgid ""
+"Error when getting the channel.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:552
+#, c-format
+msgid ""
+"Error when adding the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:593
+#, c-format
+msgid ""
+"Error when deleting the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:616
+#, c-format
+msgid ""
+"Error when updating the position of the channels in group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:669 ../src/freetuxtv-db-sync.c:708
+#, c-format
+msgid ""
+"Error when getting the channel by name.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:748 ../src/freetuxtv-db-sync.c:991
+#: ../src/freetuxtv-db-sync.c:1014
+#, c-format
+msgid ""
+"Error when updating the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:803 ../src/freetuxtv-db-sync.c:837
+#, c-format
+msgid ""
+"Error when adding the group \"%s\" in database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:881 ../src/freetuxtv-db-sync.c:922
+#: ../src/freetuxtv-db-sync.c:945
+#, c-format
+msgid ""
+"Error when updating the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1057
+#, c-format
+msgid ""
+"Error when updating the last update date of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1091
+#, c-format
+msgid ""
+"Error when deleting the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1112
+#, c-format
+msgid ""
+"Error when updating the position of the groups.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1147
+#, c-format
+msgid ""
+"Error when deleting the channels of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1184 ../src/freetuxtv-db-sync.c:1220
+#, c-format
+msgid ""
+"Error when updating the channels of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1246
+#, c-format
+msgid ""
+"Error when deleting the tv channels list.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1290
+#, c-format
+msgid ""
+"Error when adding the tv channel '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1354
+#, c-format
+msgid ""
+"Error when adding the recording '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1480
+#, c-format
+msgid ""
+"Error when adding the label of channel logo '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1514
+#, c-format
+msgid ""
+"Error when linking the TV channel '%s' to channel.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1553
+#, c-format
+msgid ""
+"Error when getting the database version.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1585
+#, c-format
+msgid ""
+"Error when updating the database version.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1650
+#, c-format
+msgid ""
+"Error when migrating the database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1693
+#, c-format
+msgid ""
+"Error when updating the status of the recording \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-db-sync.c:1727
+#, c-format
+msgid ""
+"Error when deleting the recording \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-fileutils.c:87
+#, c-format
+msgid ""
+"Error when downloading the file from URL -> %s.\n"
+"\n"
+"CURL has returned error:\n"
+"%s."
+msgstr ""
+
+#: ../src/freetuxtv-i18n.h:49
+msgid "%m/%d/%y"
+msgstr "%m/%d/%y"
+
+#: ../src/freetuxtv-i18n.h:50
+msgid "%m/%d/%Y"
+msgstr ""
+
+#: ../src/freetuxtv-i18n.h:51
+msgid "%m/%d/%Y %H:%M"
+msgstr "%m/%d/%Y %H:%M"
+
+#: ../src/freetuxtv-recordings-list.c:448
+msgid "Do you want to move the related file on the hard disk to the trash?"
+msgstr "Вы хотите поместить файл в корзину?"
+
+#: ../src/freetuxtv-tv-channels-list.c:69
+#, c-format
+msgid "Synchronizing the tv channels list"
+msgstr "Синхронизация списка каналов"
+
+#: ../src/freetuxtv-utils.c:37
+#, c-format
+msgid "%02dh%02dm%02ds"
+msgstr ""
+
+#: ../src/freetuxtv-utils.c:47
+#, c-format
+msgid "%02d:%02d:%02d"
+msgstr ""
+
+#: ../src/freetuxtv-utils.c:54
+#, c-format
+msgid "%ld byte"
+msgstr "%ld байт"
+
+#: ../src/freetuxtv-utils.c:56
+#, c-format
+msgid "%ld bytes"
+msgstr "%ld байт"
+
+#: ../src/freetuxtv-utils.c:58
+#, c-format
+msgid "%1.1f kB"
+msgstr "%1.1f Кб"
+
+#: ../src/freetuxtv-utils.c:60
+#, c-format
+msgid "%1.1f MB"
+msgstr "%1.1f Мб"
+
+#: ../src/freetuxtv-utils.c:62
+#, c-format
+msgid "%1.1f GB"
+msgstr "%1.1f Гб"
+
+#: ../src/freetuxtv-window-add-channels-group.c:395
+#, c-format
+msgid "Please select a least one group !"
+msgstr "Пожалуйста выделите как минимум один список!"
+
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
+msgid "Adding channels groups"
+msgstr "Добавление списков с каналами"
+
+#. Update progress dialog
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
+#, c-format
+msgid "Adding channels group: <i>%s</i>"
+msgstr "Добавление списка : <i>%s</i>"
+
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
+#, c-format
+msgid "%d channels group(s) have been successfully added."
+msgstr "Групп(а) каналов %d успешно добавлена."
+
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
+#, c-format
+msgid "Please enter the group's name !"
+msgstr "Пожалуйста введите имя списка каналов!"
+
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
+#, c-format
+msgid "Please enter the group's URI !"
+msgstr "Пожалуйста введите адрес списка каналов!"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "_Обновить список каналов"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, fuzzy, c-format
+msgid "Downloading the file '%s'"
+msgstr "Получаем: \"%s\""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+#, fuzzy
+msgid "Synchronizing TV channels from file"
+msgstr "Синхронизация списка каналов"
+
+#. Menu : FreetuxTV
+#: ../src/freetuxtv-window-main.c:278
+msgid "_FreetuxTV"
+msgstr "_FreetuxTV"
+
+#. End Menu : FreetuxTV
+#. Menu : Channels
+#: ../src/freetuxtv-window-main.c:299
+msgid "_Channels"
+msgstr "_Каналы"
+
+#: ../src/freetuxtv-window-main.c:303
+msgid "_Add a group"
+msgstr "_Добавить список с каналами"
+
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr "Добавить/Создать список каналов из различных источников"
+
+#: ../src/freetuxtv-window-main.c:311
+msgid "_Synchronize TV channels database"
+msgstr "_Синхронизировать базу данных с каналами"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
+"Синхронизировать список каналов из XML(стандартной) базы в локальную базу с "
+"каналами"
+
+#. End Menu : Channels
+#. Menu : Video
+#: ../src/freetuxtv-window-main.c:322
+msgid "_Video"
+msgstr "_Видео"
+
+#. SubMenu : Deinterlace
+#: ../src/freetuxtv-window-main.c:327
+msgid "_Deinterlace"
+msgstr "_Устранение чересстрочности"
+
+#: ../src/freetuxtv-window-main.c:332
+msgid "Disable"
+msgstr "Отключить"
+
+#: ../src/freetuxtv-window-main.c:344
+msgid "Blend"
+msgstr ""
+
+# Смешивание"
+#: ../src/freetuxtv-window-main.c:353
+msgid "Bob"
+msgstr ""
+
+# Удваивание(Bob)"
+#: ../src/freetuxtv-window-main.c:362
+msgid "Discard"
+msgstr ""
+
+# Не учитывать(Discard)"
+#: ../src/freetuxtv-window-main.c:371
+msgid "Linear"
+msgstr ""
+
+# Выравнивание(Linear)"
+#: ../src/freetuxtv-window-main.c:380
+msgid "Mean"
+msgstr ""
+
+# Смешивание(Mean)"
+#: ../src/freetuxtv-window-main.c:389
+msgid "X"
+msgstr ""
+
+# не учитывать(X)"
+#. End SubMenu : Deinterlace
+#. End Menu : Video
+#. Menu : Help
+#: ../src/freetuxtv-window-main.c:401
+msgid "_Help"
+msgstr "_Помощь"
+
+#. Create the menu items
+#: ../src/freetuxtv-window-main.c:1029
+msgid "Mute"
+msgstr "Приглушить"
+
+#: ../src/main.c:424
+#, c-format
+msgid "Recording: %s (%s) -> %s (%s)"
+msgstr "Запись: %s (%s) -> %s (%s)"
+
+#: ../src/main.c:577
+#, c-format
+msgid ""
+"An error occurred while playing channel '%s' : %s\n"
+"\n"
+"If the problem persist, you can report that the link is dead at %s"
+msgstr ""
+"Произошла ошибка при просмотре канала '%s' : %s\n"
+"\n"
+"Если ошибка не исчезает, вы можете сообщить о нерабочей ссылке %s"
+
+#: ../src/main.c:581
+msgid "An error occurred"
+msgstr "Произошла ошибка"
+
+#: ../src/main.c:607
+#, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "Синхронизируется список каналов: %s..."
+
+#: ../src/main.c:642
+msgid "Initializing user configuration..."
+msgstr "Определяются настройки пользователя..."
+
+#: ../src/main.c:649
+msgid "Loading user configuration..."
+msgstr "Загружаются настройки пользователя..."
+
+#: ../src/main.c:719
+msgid "Synchronizing the list of tv channels..."
+msgstr "Синхронизируется список каналов..."
+
+#: ../src/main.c:752
+msgid "Loading the list of channels..."
+msgstr "Загружается список каналов..."
+
+#: ../src/main.c:761
+msgid "Loading the list of recordings..."
+msgstr "Загружается список записей..."
+
+#: ../src/main.c:1080 ../src/main.c:1276
+#, c-format
+msgid "Playing: %s"
+msgstr "Проигрывается: %s"
+
+#: ../src/main.c:1089
+msgid "is playing"
+msgstr "воспроизводится"
+
+#: ../src/main.c:1278
+#, c-format
+msgid "Stopping channel: %s"
+msgstr "Остановка канала: %s"
+
+#: ../src/main.c:1322
+msgid "is recording"
+msgstr "записывается"
+
+#: ../src/main.c:1369
+#, c-format
+msgid "Recording: %s"
+msgstr "Записывается: %s"
+
+#: ../src/main.c:1494
+msgid "Are you sure you want to quit?"
+msgstr "Вы действительно хотите выйти?"
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000..2fba574
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,1982 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Şâkir Aşçı <sakirasci at gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
+"PO-Revision-Date: 2012-10-26 18:41+0300\n"
+"Last-Translator: Şâkir Aşçı <sakirasci at gmail.com>\n"
+"Language-Team: Ubuntu Türkçe Çeviri Takımı\n"
+"Language: tr\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: Virtaal 0.7.1\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Kayıt ekle"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Seçilen kanal:"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Başlık:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Başlanguç zamânı:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Süre:"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Bitiş zamânı:"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "dakîka"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "<b>Recording period</b>"
+msgstr "<b>Kaydetme aralığı</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Liste ekle"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "Kanalların liste dosyası:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Eklemek istediğiniz bir ya da daha fazla kanal listesini seçin ve ekle "
+"düğmesine tıklayın."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Dil/Kanal Listesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "Sağlayıcı"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "Bulunak"
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Öntanımlı kanal listesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Liste adı:"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr "Eklenecek liste adı"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "Liste bulunağı:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "Eklenecek listenin bulunağı"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Addan önceki şu metni sil:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr "Kanal adının sonundan silinecek olan metin ya da düzenli ifâde"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Addan sonraki şu metni sil:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr "Kanal adının başından silinecek olan metin ya da düzenli ifâde"
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"Listedeki kanal adından bâzı metinleri silmek için basit düzenli ifâdeler "
+"kullanabilirsiniz. Örneğin, ekleyeceğiniz listedeki kanalın \"54 - Kanal "
+"54\" ya da \"3 - TRT 3\" benzeri bir adı varsa, FreetuxTV kanalın adının "
+"öncesinde bulunan rakamları \"[0-9]*- \" düzenli ifâdesini kullanarak "
+"silebilir."
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>Kanalların adının işlenmesi</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Kişisel kanal listesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Gözdeler"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "<b>Special group type:</b>"
+msgstr "<b>Özel liste biçimi:</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Özel liste"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Kanal özellikleri"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Kanal adı:"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "Kanal Bulunağı:"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>Kanal VLC seçenekleri:</b>"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Genel"
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Görüntü ayrıştırma:"
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "yok"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Seçenekler"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr "GNU Genel Kamu Lisansu Sürüm 3"
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"
+msgstr "Genelağ TV kanalları oynatıcısı"
+
+#: ../data/ui/freetuxtv.glade.h:3
+msgid "Project's Web Site"
+msgstr "Proje Genelağ Sayfası"
+
+#. TRANSLATORS: Replace this string with your names, one name per line.
+#: ../data/ui/freetuxtv.glade.h:5
+msgid "translator-credits"
+msgstr "Şâkir Aşçı <sakirasci at gmail.com>"
+
+#: ../data/ui/freetuxtv.glade.h:6
+msgid "Group properties"
+msgstr "Liste özellikleri"
+
+#: ../data/ui/freetuxtv.glade.h:18
+msgid "Number of channels:"
+msgstr "Kanal sayısı:"
+
+#: ../data/ui/freetuxtv.glade.h:19
+msgid "0"
+msgstr "0"
+
+#: ../data/ui/freetuxtv.glade.h:20
+msgid "Details"
+msgstr "Ayrıntılar"
+
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "Dosyayı görüntüle"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ../data/ui/freetuxtv.glade.h:23
+msgid "Play last channel on startup"
+msgstr "Açılışta son izlenen kanalı oynat"
+
+#: ../data/ui/freetuxtv.glade.h:24
+msgid "<b>Startup</b>"
+msgstr "<b>Başlangıç</b>"
+
+#: ../data/ui/freetuxtv.glade.h:25
+msgid "Enable desktop notifications"
+msgstr "Masaüstü bildirimlerini etkinleştir"
+
+#: ../data/ui/freetuxtv.glade.h:26
+msgid "<b>Notifications</b>"
+msgstr "<b>Bildirimler</b>"
+
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr "Harf aksanlarını yoksay"
+
+#: ../data/ui/freetuxtv.glade.h:28
+msgid "<b>Search of channels</b>"
+msgstr "<b>Kanal arama</b>"
+
+#: ../data/ui/freetuxtv.glade.h:29
+msgid "None"
+msgstr "Yok"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "Özel yapılandırma dosyası kullan"
+
+#: ../data/ui/freetuxtv.glade.h:31
+msgid "Use the VLC configuration file"
+msgstr "VLC yapılandırma dosyasınu kullan"
+
+#: ../data/ui/freetuxtv.glade.h:32
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>Bu seçeneği değiştirdikten sonra uygulamayı yeniden başlatın.</i>"
+
+#: ../data/ui/freetuxtv.glade.h:33
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>Yapılandırma dosyası (vlcrc)</b>"
+
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
+msgstr "LibVLC"
+
+#: ../data/ui/freetuxtv.glade.h:35
+msgid "Directory Record:"
+msgstr "Kayıt Dizini:"
+
+#: ../data/ui/freetuxtv.glade.h:36
+msgid "Select a directory"
+msgstr "Dizin seçin"
+
+#: ../data/ui/freetuxtv.glade.h:37
+msgid "<b>Destination</b>"
+msgstr "<b>Hedef</b>"
+
+#: ../data/ui/freetuxtv.glade.h:38
+msgid "No transcoding"
+msgstr "Çözümleme yok"
+
+#: ../data/ui/freetuxtv.glade.h:39
+msgid "Predefined transcoding formats"
+msgstr "Öntanımlı çözümleme biçimleri"
+
+#: ../data/ui/freetuxtv.glade.h:40
+msgid "Format:"
+msgstr "Biçim:"
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
+msgstr "<b>Çözümleme seçenekleri</b>"
+
+#: ../data/ui/freetuxtv.glade.h:42
+msgid "Recordings"
+msgstr "Kayıtlar"
+
+#: ../data/ui/freetuxtv.glade.h:43
+msgid "Download timeout (seconds) :"
+msgstr "İndirme zamanaşımı (sâniye) :"
+
+#: ../data/ui/freetuxtv.glade.h:44
+msgid "<b>Connection</b>"
+msgstr "<b>Bağlantı</b>"
+
+#: ../data/ui/freetuxtv.glade.h:45
+msgid "No proxy"
+msgstr "Vekil sunucu yok"
+
+#: ../data/ui/freetuxtv.glade.h:46
+msgid "Manual proxy configuration"
+msgstr "Elle vekil sunucu yapılandırması"
+
+#: ../data/ui/freetuxtv.glade.h:47
+msgid "Proxy server:"
+msgstr "Vekil sunucu:"
+
+#: ../data/ui/freetuxtv.glade.h:48
+msgid "Proxy port:"
+msgstr "Vekil sunucu bağlantı noktası:"
+
+#: ../data/ui/freetuxtv.glade.h:49
+msgid "Proxy type:"
+msgstr "Vekil sunucu türü:"
+
+#: ../data/ui/freetuxtv.glade.h:50
+msgid "Use authentification"
+msgstr "Kimlik doğrulama kullan"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "Kullanıcı adı:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "Açarsöz:"
+
+#: ../data/ui/freetuxtv.glade.h:53
+msgid "<b>Proxy</b>"
+msgstr "<b>Vekil Sunucu</b>"
+
+#: ../data/ui/freetuxtv.glade.h:54
+msgid "Network"
+msgstr "Şebeke"
+
+#: ../data/ui/freetuxtv.glade.h:55
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../data/ui/freetuxtv.glade.h:56
+msgid "SOCKS"
+msgstr "SOCKS"
+
+#: ../data/ui/freetuxtv.glade.h:57
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr "İzleti - Theora + Vorbis (OGG)"
+
+#: ../data/ui/freetuxtv.glade.h:58
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+
+#: ../data/ui/freetuxtv.glade.h:59
+msgid "ogg"
+msgstr "ogg"
+
+#: ../data/ui/freetuxtv.glade.h:60
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr "İzleti - H.264 + MPGA (MP4)"
+
+#: ../data/ui/freetuxtv.glade.h:61
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+
+#: ../data/ui/freetuxtv.glade.h:62
+msgid "mp4"
+msgstr "mp4"
+
+#: ../data/ui/freetuxtv.glade.h:63
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr "İzleti - MPEG-2 + MPGA (TS)"
+
+#: ../data/ui/freetuxtv.glade.h:64
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+
+#: ../data/ui/freetuxtv.glade.h:65
+msgid "ts"
+msgstr "ts"
+
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
+
+#: ../data/ui/freetuxtv.glade.h:67
+msgid "Search:"
+msgstr "Ara:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "Kanal arama bölmesi"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "Arama metnini sil"
+
+#: ../data/ui/freetuxtv.glade.h:70
+msgid "Jump to current channel"
+msgstr "İzlenen kanala geç"
+
+#: ../data/ui/freetuxtv.glade.h:71
+msgid "Go to the current channel playing"
+msgstr "Şu anda yazılımda izlenen kanala git"
+
+#: ../data/ui/freetuxtv.glade.h:72
+msgid "Channels"
+msgstr "Kanallar"
+
+#: ../data/ui/freetuxtv.glade.h:73
+msgid "In progress"
+msgstr "İşlenenler"
+
+#: ../data/ui/freetuxtv.glade.h:74
+msgid "Terminated"
+msgstr "Durdurulanlar"
+
+#: ../data/ui/freetuxtv.glade.h:75
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../data/ui/freetuxtv.glade.h:76
+msgid "Previous channel"
+msgstr "Önceki kanal"
+
+#: ../data/ui/freetuxtv.glade.h:77
+msgid "Play the current channel"
+msgstr "Seçili kanalı izle"
+
+#: ../data/ui/freetuxtv.glade.h:78
+msgid "Stop playing the current channel"
+msgstr "Seçili kanalı izlemeyi durdur"
+
+#: ../data/ui/freetuxtv.glade.h:79
+msgid "Record the current channel"
+msgstr "Seçili kanalı kaydet"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "Sonraki kanal"
+
+#: ../data/ui/freetuxtv.glade.h:81
+msgid "Vol:"
+msgstr "Ses:"
+
+#: ../data/ui/freetuxtv.glade.h:82
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
+
+#: ../data/ui/freetuxtv.glade.h:84
+msgid "Fullscreen mode"
+msgstr "Tam ekran"
+
+#: ../data/ui/freetuxtv.glade.h:85
+msgid "Small mode"
+msgstr "Küçük görünüm"
+
+#: ../data/ui/freetuxtv.glade.h:86
+msgid " channels"
+msgstr " kanal"
+
+#: ../data/ui/freetuxtv.glade.h:87
+msgid "Go back to the normal mode"
+msgstr "Varsayılan görünüm"
+
+#: ../data/ui/freetuxtv.glade.h:88
+msgid "Activate/Deactivate the window always on top"
+msgstr "Pencereyi üstte tutmayı aç/kapat"
+
+#: ../data/channels_groups.xml.in.h:1
+msgid "Alice (Unofficial)"
+msgstr "Alice (Resmî olmayan)"
+
+#: ../data/channels_groups.xml.in.h:2
+msgid "SFR TV (Unofficial)"
+msgstr "SFR TV (Resmî olmayan)"
+
+#: ../data/channels_groups.xml.in.h:3
+#, fuzzy
+msgid "Afrikaans Web TV and Radio"
+msgstr "Farsça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:4
+#, fuzzy
+msgid "Web TV (Afrikaans)"
+msgstr "Genelağ Televizyonu (Farsça)"
+
+#: ../data/channels_groups.xml.in.h:5
+#, fuzzy
+msgid "Albanian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:6
+#, fuzzy
+msgid "Web TV (Albanian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:7
+#, fuzzy
+msgid "Amharic Web TV and Radio"
+msgstr "Arapça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:8
+#, fuzzy
+msgid "Web TV (Amharic)"
+msgstr "Genelağ Televizyonu (Arapça)"
+
+#: ../data/channels_groups.xml.in.h:9
+msgid "Arabic Web TV and Radio"
+msgstr "Arapça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:10
+msgid "Web TV (Arabic)"
+msgstr "Genelağ Televizyonu (Arapça)"
+
+#: ../data/channels_groups.xml.in.h:11
+msgid "Web Radio (Arabic)"
+msgstr "Genelağ Radyosu (Arapça)"
+
+#: ../data/channels_groups.xml.in.h:12
+#, fuzzy
+msgid "Web Cam (Arabic)"
+msgstr "Genelağ Televizyonu (Arapça)"
+
+#: ../data/channels_groups.xml.in.h:13
+#, fuzzy
+msgid "Armenian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:14
+#, fuzzy
+msgid "Web TV (Armenian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:15
+#, fuzzy
+msgid "Azerbaijani Web TV and Radio"
+msgstr "Farsça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:16
+#, fuzzy
+msgid "Web TV (Azerbaijani)"
+msgstr "Genelağ Televizyonu (Farsça)"
+
+#: ../data/channels_groups.xml.in.h:17
+#, fuzzy
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "Macarca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:18
+#, fuzzy
+msgid "Web TV (Bengali/Bangla)"
+msgstr "Genelağ Televizyonu (Macarca)"
+
+#: ../data/channels_groups.xml.in.h:19
+#, fuzzy
+msgid "Bulgarian Web TV and Radio"
+msgstr "Macarca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:20
+#, fuzzy
+msgid "Web TV (Bulgarian)"
+msgstr "Genelağ Televizyonu (Macarca)"
+
+#: ../data/channels_groups.xml.in.h:21
+#, fuzzy
+msgid "Cambodian Web TV and Radio"
+msgstr "İtalyanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:22
+#, fuzzy
+msgid "Web TV (Cambodian)"
+msgstr "Genelağ Televizyonu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:23
+msgid "Catalan Web TV and Radio"
+msgstr "Katalonca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr "Genelağ Televizyonu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr "Genelağ Radyosu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:26
+msgid "Chinese Web TV and Radio"
+msgstr "Çince Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr "Genelağ Televizyonu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr "Genelağ Radyosu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:29
+#, fuzzy
+msgid "Croatian Web TV and Radio"
+msgstr "Katalonca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:30
+#, fuzzy
+msgid "Web TV (Croatian)"
+msgstr "Genelağ Televizyonu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:31
+#, fuzzy
+msgid "Web Radio (Croatian)"
+msgstr "Genelağ Radyosu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:32
+msgid "Czech Web TV and Radio"
+msgstr "Çekçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr "Genelağ Televizyonu (Çekçe)"
+
+#: ../data/channels_groups.xml.in.h:34
+#, fuzzy
+msgid "Web Radio (Czech)"
+msgstr "Genelağ Radyosu (Fransızca)"
+
+#: ../data/channels_groups.xml.in.h:35
+#, fuzzy
+msgid "Danish Web TV and Radio"
+msgstr "İspanyolca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:36
+#, fuzzy
+msgid "Web TV (Danish)"
+msgstr "Genelağ Televizyonu (İspanyolca)"
+
+#: ../data/channels_groups.xml.in.h:37
+msgid "Dutch Web TV and Radio"
+msgstr "Flemenkçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr "Genelağ Televizyonu (Flemenkçe)"
+
+#: ../data/channels_groups.xml.in.h:39
+#, fuzzy
+msgid "Web Radio (Dutch)"
+msgstr "Genelağ Radyosu (Fransızca)"
+
+#: ../data/channels_groups.xml.in.h:40
+#, fuzzy
+msgid "Web Cam (Dutch)"
+msgstr "Genelağ Televizyonu (Flemenkçe)"
+
+#: ../data/channels_groups.xml.in.h:41
+msgid "English Web TV and Radio"
+msgstr "İngilizce Genelağ TV ve Radyosu"
+
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr "Genelağ Televizyonu (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr "Genelağ Radyosu (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr "Genelağ Programları (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:45
+#, fuzzy
+msgid "Web Cam (English)"
+msgstr "Genelağ Televizyonu (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:46
+#, fuzzy
+msgid "Estonian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:47
+#, fuzzy
+msgid "Web TV (Estonian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:48
+#, fuzzy
+msgid "Finnish Web TV and Radio"
+msgstr "İspanyolca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:49
+#, fuzzy
+msgid "Web TV (Finnish)"
+msgstr "Genelağ Televizyonu (İspanyolca)"
+
+#: ../data/channels_groups.xml.in.h:50
+msgid "French Web TV and Radio"
+msgstr "Fransızca Genelağ TV ve Radyosu"
+
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr "Genelağ Televizyonu (Fransızca)"
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr "Genelağ Radyosu (Fransızca)"
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr "Genelağ Programları (Fransızca)"
+
+#: ../data/channels_groups.xml.in.h:54
+#, fuzzy
+msgid "Georgian Web TV and Radio"
+msgstr "Almanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:55
+#, fuzzy
+msgid "Web TV (Georgian)"
+msgstr "Genelağ Televizyonu (Almanca)"
+
+#: ../data/channels_groups.xml.in.h:56
+msgid "German Web TV and Radio"
+msgstr "Almanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr "Genelağ Televizyonu (Almanca)"
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr "Genelağ Radyosu (Almanca)"
+
+#: ../data/channels_groups.xml.in.h:59
+msgid "Greek Web TV and Radio"
+msgstr "Yunanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr "Genelağ Televizyonu (Yunanca)"
+
+#: ../data/channels_groups.xml.in.h:61
+#, fuzzy
+msgid "Web Radio (Greek)"
+msgstr "Genelağ Radyosu (Almanca)"
+
+#: ../data/channels_groups.xml.in.h:62
+#, fuzzy
+msgid "Hebrew Web TV and Radio"
+msgstr "Yunanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:63
+#, fuzzy
+msgid "Web TV (Hebrew)"
+msgstr "Genelağ Televizyonu (Yunanca)"
+
+#: ../data/channels_groups.xml.in.h:64
+#, fuzzy
+msgid "Web Radio (Hebrew)"
+msgstr "Genelağ Radyosu (Fransızca)"
+
+#: ../data/channels_groups.xml.in.h:65
+#, fuzzy
+msgid "Web Cam (Hebrew)"
+msgstr "Genelağ Televizyonu (Yunanca)"
+
+#: ../data/channels_groups.xml.in.h:66
+#, fuzzy
+msgid "Hindi Web TV and Radio"
+msgstr "Latince Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:67
+#, fuzzy
+msgid "Web TV (Hindi)"
+msgstr "Genelağ Televizyonu (Latince)"
+
+#: ../data/channels_groups.xml.in.h:68
+#, fuzzy
+msgid "Web Radio (Hindi)"
+msgstr "Genelağ Radyosu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:69
+msgid "Hungarian Web TV and Radio"
+msgstr "Macarca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr "Genelağ Televizyonu (Macarca)"
+
+#: ../data/channels_groups.xml.in.h:71
+#, fuzzy
+msgid "Icelandic Web TV and Radio"
+msgstr "İtalyanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:72
+#, fuzzy
+msgid "Web TV (Icelandic)"
+msgstr "Genelağ Televizyonu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:73
+#, fuzzy
+msgid "Indonesian Web TV and Radio"
+msgstr "Farsça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:74
+#, fuzzy
+msgid "Web TV (Indonesian)"
+msgstr "Genelağ Televizyonu (Farsça)"
+
+#: ../data/channels_groups.xml.in.h:75
+#, fuzzy
+msgid "Interlingua Web TV and Radio"
+msgstr "İtalyanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:76
+#, fuzzy
+msgid "Web Radio (Interlingua)"
+msgstr "Genelağ Radyosu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:77
+#, fuzzy
+msgid "Irish Web TV and Radio"
+msgstr "Türkçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:78
+#, fuzzy
+msgid "Web TV (Irish)"
+msgstr "Genelağ Televizyonu (Türkçe)"
+
+#: ../data/channels_groups.xml.in.h:79
+#, fuzzy
+msgid "Web Radio (Irish)"
+msgstr "Genelağ Radyosu (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:80
+msgid "Italian Web TV and Radio"
+msgstr "İtalyanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr "Genelağ Televizyonu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr "Genelağ Radyosu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:83
+msgid "Japanese Web TV and Radio"
+msgstr "Japonca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr "Genelağ Televizyonu (Japonca)"
+
+#: ../data/channels_groups.xml.in.h:85
+#, fuzzy
+msgid "Web Radio (Japanese)"
+msgstr "Genelağ Radyosu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:86
+#, fuzzy
+msgid "Web Cam (Japanese)"
+msgstr "Genelağ Televizyonu (Japonca)"
+
+#: ../data/channels_groups.xml.in.h:87
+#, fuzzy
+msgid "Kazakh Web TV and Radio"
+msgstr "Çekçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:88
+#, fuzzy
+msgid "Web TV (Kazakh)"
+msgstr "Genelağ Televizyonu (Çekçe)"
+
+#: ../data/channels_groups.xml.in.h:89
+msgid "Korean Web TV and Radio"
+msgstr "Korece Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr "Genelağ Televizyonu (Korece)"
+
+#: ../data/channels_groups.xml.in.h:91
+#, fuzzy
+msgid "Kurdish Web TV and Radio"
+msgstr "Türkçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:92
+#, fuzzy
+msgid "Web TV (Kurdish)"
+msgstr "Genelağ Televizyonu (Türkçe)"
+
+#: ../data/channels_groups.xml.in.h:93
+msgid "Latin Web TV and Radio"
+msgstr "Latince Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
+msgstr "Genelağ Televizyonu (Latince)"
+
+#: ../data/channels_groups.xml.in.h:95
+#, fuzzy
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "Latince Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:96
+#, fuzzy
+msgid "Web TV (Latvian/Lettish)"
+msgstr "Genelağ Televizyonu (Latince)"
+
+#: ../data/channels_groups.xml.in.h:97
+#, fuzzy
+msgid "Lithuanian Web TV and Radio"
+msgstr "İtalyanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:98
+#, fuzzy
+msgid "Web TV (Lithuanian)"
+msgstr "Genelağ Televizyonu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:99
+#, fuzzy
+msgid "Macedonian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:100
+#, fuzzy
+msgid "Web TV (Macedonian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:101
+#, fuzzy
+msgid "Web Radio (Macedonian)"
+msgstr "Genelağ Radyosu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:102
+#, fuzzy
+msgid "Malay Web TV and Radio"
+msgstr "Katalonca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:103
+#, fuzzy
+msgid "Web TV (Malay)"
+msgstr "Genelağ Televizyonu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:104
+#, fuzzy
+msgid "Malayalam Web TV and Radio"
+msgstr "Katalonca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:105
+#, fuzzy
+msgid "Web TV (Malayalam)"
+msgstr "Genelağ Televizyonu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:106
+#, fuzzy
+msgid "Maltese Web TV and Radio"
+msgstr "Japonca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:107
+#, fuzzy
+msgid "Web TV (Maltese)"
+msgstr "Genelağ Televizyonu (Japonca)"
+
+#: ../data/channels_groups.xml.in.h:108
+#, fuzzy
+msgid "Web Radio (Maltese)"
+msgstr "Genelağ Radyosu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:109
+#, fuzzy
+msgid "Moldavian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:110
+#, fuzzy
+msgid "Web TV (Moldavian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:111
+#, fuzzy
+msgid "Mongolian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:112
+#, fuzzy
+msgid "Web TV (Mongolian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:113
+msgid "Norwegian Web TV and Radio"
+msgstr "Norveççe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
+msgstr "Genelağ Televizyonu (Norveççe)"
+
+#: ../data/channels_groups.xml.in.h:115
+msgid "Persian Web TV and Radio"
+msgstr "Farsça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
+msgstr "Genelağ Televizyonu (Farsça)"
+
+#: ../data/channels_groups.xml.in.h:117
+msgid "Polish Web TV and Radio"
+msgstr "Lehçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
+msgstr "Genelağ Televizyonu (Lehçe)"
+
+#: ../data/channels_groups.xml.in.h:119
+#, fuzzy
+msgid "Web Radio (Polish)"
+msgstr "Genelağ Radyosu (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:120
+#, fuzzy
+msgid "Web Cam (Polish)"
+msgstr "Genelağ Televizyonu (Lehçe)"
+
+#: ../data/channels_groups.xml.in.h:121
+msgid "Portuguese Web TV and Radio"
+msgstr "Portekizce Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
+msgstr "Genelağ Televizyonu (Portekizce)"
+
+#: ../data/channels_groups.xml.in.h:123
+#, fuzzy
+msgid "Web Radio (Portuguese)"
+msgstr "Genelağ Televizyonu (Portekizce)"
+
+#: ../data/channels_groups.xml.in.h:124
+#, fuzzy
+msgid "Punjabi Web TV and Radio"
+msgstr "Arapça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:125
+#, fuzzy
+msgid "Web TV (Punjabi)"
+msgstr "Genelağ Televizyonu (Arapça)"
+
+#: ../data/channels_groups.xml.in.h:126
+msgid "Romanian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:128
+#, fuzzy
+msgid "Web Radio (Romanian)"
+msgstr "Genelağ Radyosu (Rusça)"
+
+#: ../data/channels_groups.xml.in.h:129
+msgid "Russian Web TV and Radio"
+msgstr "Rusça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
+msgstr "Genelağ Televizyonu (Rusça)"
+
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
+msgstr "Genelağ Radyosu (Rusça)"
+
+#: ../data/channels_groups.xml.in.h:132
+#, fuzzy
+msgid "Serbian Web TV and Radio"
+msgstr "Farsça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:133
+#, fuzzy
+msgid "Web TV (Serbian)"
+msgstr "Genelağ Televizyonu (Farsça)"
+
+#: ../data/channels_groups.xml.in.h:134
+#, fuzzy
+msgid "Web Radio (Serbian)"
+msgstr "Genelağ Radyosu (Almanca)"
+
+#: ../data/channels_groups.xml.in.h:135
+#, fuzzy
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "Farsça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:136
+#, fuzzy
+msgid "Web TV (Serbo-Croatian)"
+msgstr "Genelağ Televizyonu (Farsça)"
+
+#: ../data/channels_groups.xml.in.h:137
+#, fuzzy
+msgid "Web Radio (Serbo-Croatian)"
+msgstr "Genelağ Radyosu (Katalonca)"
+
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
+msgstr "Slovakça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
+msgstr "Genelağ Televizyonu (Slovakça)"
+
+#: ../data/channels_groups.xml.in.h:140
+#, fuzzy
+msgid "Web Radio (Slovak)"
+msgstr "Genelağ Televizyonu (Slovakça)"
+
+#: ../data/channels_groups.xml.in.h:141
+#, fuzzy
+msgid "Slovenian Web TV and Radio"
+msgstr "Slovakça Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:142
+#, fuzzy
+msgid "Web TV (Slovenian)"
+msgstr "Genelağ Televizyonu (Slovakça)"
+
+#: ../data/channels_groups.xml.in.h:143
+#, fuzzy
+msgid "Web Radio (Slovenian)"
+msgstr "Genelağ Radyosu (İtalyanca)"
+
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr "İspanyolca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
+msgstr "Genelağ Televizyonu (İspanyolca)"
+
+#: ../data/channels_groups.xml.in.h:146
+msgid "Web Radio (Spanish)"
+msgstr "Genelağ Radyosu (İspanyolca)"
+
+#: ../data/channels_groups.xml.in.h:147
+#, fuzzy
+msgid "Web Programmes (Spanish)"
+msgstr "Genelağ Programları (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:148
+#, fuzzy
+msgid "Web Cam (Spanish)"
+msgstr "Genelağ Televizyonu (İspanyolca)"
+
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
+msgstr "İsveççe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
+msgstr "Genelağ Televizyonu (İsveççe)"
+
+#: ../data/channels_groups.xml.in.h:151
+#, fuzzy
+msgid "Tagalog Web TV and Radio"
+msgstr "Tayca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:152
+#, fuzzy
+msgid "Web TV (Tagalog)"
+msgstr "Genelağ Televizyonu (Tayca)"
+
+#: ../data/channels_groups.xml.in.h:153
+#, fuzzy
+msgid "Tamil Web TV and Radio"
+msgstr "Tayca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:154
+#, fuzzy
+msgid "Web TV (Tamil)"
+msgstr "Genelağ Televizyonu (Tayca)"
+
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
+msgstr "Tayca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
+msgstr "Genelağ Televizyonu (Tayca)"
+
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
+msgstr "Türkçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
+msgstr "Genelağ Televizyonu (Türkçe)"
+
+#: ../data/channels_groups.xml.in.h:159
+#, fuzzy
+msgid "Web Radio (Turkish)"
+msgstr "Genelağ Televizyonu (Türkçe)"
+
+#: ../data/channels_groups.xml.in.h:160
+#, fuzzy
+msgid "Turkmen Web TV and Radio"
+msgstr "Türkçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:161
+#, fuzzy
+msgid "Web TV (Turkmen)"
+msgstr "Genelağ Televizyonu (Türkçe)"
+
+#: ../data/channels_groups.xml.in.h:162
+#, fuzzy
+msgid "Ukrainian Web TV and Radio"
+msgstr "Romence Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:163
+#, fuzzy
+msgid "Web TV (Ukrainian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:164
+#, fuzzy
+msgid "Web Cam (Ukrainian)"
+msgstr "Genelağ Televizyonu (Romence)"
+
+#: ../data/channels_groups.xml.in.h:165
+#, fuzzy
+msgid "Urdu Web TV and Radio"
+msgstr "Flemenkçe Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:166
+#, fuzzy
+msgid "Web TV (Urdu)"
+msgstr "Genelağ Televizyonu (Flemenkçe)"
+
+#: ../data/channels_groups.xml.in.h:167
+#, fuzzy
+msgid "Uzbek Web TV and Radio"
+msgstr "Yunanca Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:168
+#, fuzzy
+msgid "Web TV (Uzbek)"
+msgstr "Genelağ Televizyonu (Çekçe)"
+
+#: ../data/channels_groups.xml.in.h:169
+#, fuzzy
+msgid "Vietnamese Web TV and Radio"
+msgstr "Çince Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:170
+#, fuzzy
+msgid "Web TV (Vietnamese)"
+msgstr "Genelağ Televizyonu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:171
+#, fuzzy
+msgid "Web Radio (Vietnamese)"
+msgstr "Genelağ Radyosu (Çince)"
+
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
+msgstr "Dil Ayrımsız Genelağ TV ve Radyoları"
+
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
+msgstr "Genelağ Televizyonu (Dil ayrımsız)"
+
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
+msgstr "Genelağ Radyosu (Dil ayrımsız)"
+
+#: ../data/channels_groups.xml.in.h:175
+#, fuzzy
+msgid "Web Programmes (No lang)"
+msgstr "Genelağ Programları (İngilizce)"
+
+#: ../data/channels_groups.xml.in.h:176
+#, fuzzy
+msgid "Web Cam (No lang)"
+msgstr "Genelağ Televizyonu (Dil ayrımsız)"
+
+#: ../data/channels_groups.xml.in.h:177
+msgid "WebCam"
+msgstr "Ağ Kamerası"
+
+#: ../data/menu/freetuxtv.desktop.in.h:2
+msgid "Television Channels Player"
+msgstr "Televizyon Kanalı Oynatıcı"
+
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "FreetuxTV Televizyon Kanalı Oynatıcı"
+
+#: ../data/menu/freetuxtv.desktop.in.h:4
+msgid "Watch television channels from internet"
+msgstr "Genelağdan televizyon kanallarını izleyin"
+
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
+#, fuzzy, c-format
+msgid "%ld min"
+msgstr "%lld min"
+
+#. Update status bar
+#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
+#, c-format
+msgid "Update \"%s\" channels list"
+msgstr "\"%s\" kanal listesini güncelle"
+
+#. Get the file of the playlist
+#: ../src/freetuxtv-channels-list.c:327 ../src/freetuxtv-channels-list.c:447
+#, c-format
+msgid "Getting the file: \"%s\""
+msgstr "\"%s\" dosyası alınıyor"
+
+#: ../src/freetuxtv-channels-list.c:358 ../src/freetuxtv-channels-list.c:478
+#, c-format
+msgid ""
+"Error when adding the channels.\n"
+"\n"
+"M3UParser has returned error:\n"
+"%s."
+msgstr ""
+"Kanallar eklenirken hatâ oluştu.\n"
+"\n"
+"M3UParser hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-channels-list.c:1335
+msgid "Delete group's channels"
+msgstr "Liste kanallarını sil"
+
+#. Add to favourite is only for channels
+#: ../src/freetuxtv-channels-list.c:1385
+msgid "Add to favourites"
+msgstr "Gözdelere ekle"
+
+#. Add favourites to a new group
+#: ../src/freetuxtv-channels-list.c:1401
+msgid "New group"
+msgstr "Yeni liste"
+
+#: ../src/freetuxtv-db-sync.c:160
+#, c-format
+msgid ""
+"Cannot open database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Veritabanı açılamıyor.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:317 ../src/freetuxtv-db-sync.c:420
+#: ../src/freetuxtv-db-sync.c:1446
+#, c-format
+msgid ""
+"Error when displaying the channels.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Kanallar görüntülenirken hatâ oluştu.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:478
+#, c-format
+msgid ""
+"Error when getting the channel.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Kanal yüklenirken hatâ oluştu.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:552
+#, c-format
+msgid ""
+"Error when adding the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" kanalı eklenirken hatâ oluştu.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:593
+#, c-format
+msgid ""
+"Error when deleting the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" kanalı silinirken hatâ oluştu.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:616
+#, c-format
+msgid ""
+"Error when updating the position of the channels in group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesindeki kanal konumları güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:669 ../src/freetuxtv-db-sync.c:708
+#, c-format
+msgid ""
+"Error when getting the channel by name.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Kanal adı alınırken hatâ oluştu.\n"
+"\n"
+"SQLite hatâ bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:748 ../src/freetuxtv-db-sync.c:991
+#: ../src/freetuxtv-db-sync.c:1014
+#, c-format
+msgid ""
+"Error when updating the channel \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" kanalı güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:803 ../src/freetuxtv-db-sync.c:837
+#, c-format
+msgid ""
+"Error when adding the group \"%s\" in database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesi veritabanına eklenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:881 ../src/freetuxtv-db-sync.c:922
+#: ../src/freetuxtv-db-sync.c:945
+#, c-format
+msgid ""
+"Error when updating the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesi güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1057
+#, c-format
+msgid ""
+"Error when updating the last update date of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesinin son güncellenme târihi güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1091
+#, c-format
+msgid ""
+"Error when deleting the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesi silinirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1112
+#, c-format
+msgid ""
+"Error when updating the position of the groups.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Listenin konumu güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1147
+#, c-format
+msgid ""
+"Error when deleting the channels of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesinin kanalları silinirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1184 ../src/freetuxtv-db-sync.c:1220
+#, c-format
+msgid ""
+"Error when updating the channels of the group \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" listesinin kanalları güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1246
+#, c-format
+msgid ""
+"Error when deleting the tv channels list.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"TV kanalları listesi silinirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1290
+#, c-format
+msgid ""
+"Error when adding the tv channel '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"'%s' TV kanalı eklenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1354
+#, c-format
+msgid ""
+"Error when adding the recording '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"'%s' TV kanalı eklenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1480
+#, c-format
+msgid ""
+"Error when adding the label of channel logo '%s'.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"'%s' kanal logosu etiketi eklenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1514
+#, c-format
+msgid ""
+"Error when linking the TV channel '%s' to channel.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"'%s' TV kanalı kanallara bağlanırken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1553
+#, c-format
+msgid ""
+"Error when getting the database version.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Veritabanı sürümü alınırken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1585
+#, c-format
+msgid ""
+"Error when updating the database version.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Veritabanı sürümü güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1650
+#, c-format
+msgid ""
+"Error when migrating the database.\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"Veritabanı taşınırken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1693
+#, c-format
+msgid ""
+"Error when updating the status of the recording \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" kaydının durumu güncellenirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-db-sync.c:1727
+#, c-format
+msgid ""
+"Error when deleting the recording \"%s\".\n"
+"\n"
+"SQLite has returned error:\n"
+"%s."
+msgstr ""
+"\"%s\" kaydı silinirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-fileutils.c:87
+#, c-format
+msgid ""
+"Error when downloading the file from URL -> %s.\n"
+"\n"
+"CURL has returned error:\n"
+"%s."
+msgstr ""
+"URL -> %s bağlantısından dosya indirilirken hatâ oluştu.\n"
+"\n"
+"SQLite hata bildirdi:\n"
+"%s."
+
+#: ../src/freetuxtv-i18n.h:49
+msgid "%m/%d/%y"
+msgstr "%m/%d/%y"
+
+#: ../src/freetuxtv-i18n.h:50
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: ../src/freetuxtv-i18n.h:51
+msgid "%m/%d/%Y %H:%M"
+msgstr "%m/%d/%Y %H:%M"
+
+#: ../src/freetuxtv-recordings-list.c:448
+msgid "Do you want to move the related file on the hard disk to the trash?"
+msgstr "Bellekte bulunan ilgili dosyayı çöpe taşımak istiyor musunuz?"
+
+#: ../src/freetuxtv-tv-channels-list.c:69
+#, c-format
+msgid "Synchronizing the tv channels list"
+msgstr "TV kanalları listesi eşleniyor"
+
+#: ../src/freetuxtv-utils.c:37
+#, c-format
+msgid "%02dh%02dm%02ds"
+msgstr "%02dh%02dm%02ds"
+
+#: ../src/freetuxtv-utils.c:47
+#, c-format
+msgid "%02d:%02d:%02d"
+msgstr "%02d:%02d:%02d"
+
+#: ../src/freetuxtv-utils.c:54
+#, c-format
+msgid "%ld byte"
+msgstr "%ld bayt"
+
+#: ../src/freetuxtv-utils.c:56
+#, c-format
+msgid "%ld bytes"
+msgstr "%ld bayt"
+
+#: ../src/freetuxtv-utils.c:58
+#, c-format
+msgid "%1.1f kB"
+msgstr "%1.1f kB"
+
+#: ../src/freetuxtv-utils.c:60
+#, c-format
+msgid "%1.1f MB"
+msgstr "%1.1f MB"
+
+#: ../src/freetuxtv-utils.c:62
+#, c-format
+msgid "%1.1f GB"
+msgstr "%1.1f GB"
+
+#: ../src/freetuxtv-window-add-channels-group.c:395
+#, c-format
+msgid "Please select a least one group !"
+msgstr "Lütfen en az bir liste seçin !"
+
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
+msgid "Adding channels groups"
+msgstr "Kanal listeleri ekleniyor"
+
+#. Update progress dialog
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
+#, c-format
+msgid "Adding channels group: <i>%s</i>"
+msgstr "Kanal listesi ekleniyor: <i>%s</i>"
+
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
+#, c-format
+msgid "%d channels group(s) have been successfully added."
+msgstr "%d kanal listesi başarılı bir şekilde eklendi."
+
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
+#, c-format
+msgid "Please enter the group's name !"
+msgstr "Lütfen liste adı yazın !"
+
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
+#, c-format
+msgid "Please enter the group's URI !"
+msgstr "Lütfen listenin bulunağını yazın !"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "_TV Kanal listesini güncelle"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, fuzzy, c-format
+msgid "Downloading the file '%s'"
+msgstr "\"%s\" dosyası alınıyor"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+#, fuzzy
+msgid "Synchronizing TV channels from file"
+msgstr "TV kanalları listesi eşleniyor"
+
+#. Menu : FreetuxTV
+#: ../src/freetuxtv-window-main.c:278
+msgid "_FreetuxTV"
+msgstr "_FreetuxTV"
+
+#. End Menu : FreetuxTV
+#. Menu : Channels
+#: ../src/freetuxtv-window-main.c:299
+msgid "_Channels"
+msgstr "_Kanallar"
+
+#: ../src/freetuxtv-window-main.c:303
+msgid "_Add a group"
+msgstr "_Liste ekle"
+
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:311
+#, fuzzy
+msgid "_Synchronize TV channels database"
+msgstr "TV kanalları listesi eşleniyor"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
+
+#. End Menu : Channels
+#. Menu : Video
+#: ../src/freetuxtv-window-main.c:322
+msgid "_Video"
+msgstr "_İzleti"
+
+#. SubMenu : Deinterlace
+#: ../src/freetuxtv-window-main.c:327
+msgid "_Deinterlace"
+msgstr "_Ayrıştırma"
+
+#: ../src/freetuxtv-window-main.c:332
+msgid "Disable"
+msgstr "Kapalı"
+
+#: ../src/freetuxtv-window-main.c:344
+msgid "Blend"
+msgstr "Harmanla"
+
+#: ../src/freetuxtv-window-main.c:353
+msgid "Bob"
+msgstr "Titret"
+
+#: ../src/freetuxtv-window-main.c:362
+msgid "Discard"
+msgstr "Boz"
+
+#: ../src/freetuxtv-window-main.c:371
+msgid "Linear"
+msgstr "Doğrusal"
+
+#: ../src/freetuxtv-window-main.c:380
+msgid "Mean"
+msgstr "Ortala"
+
+#: ../src/freetuxtv-window-main.c:389
+msgid "X"
+msgstr "X"
+
+#. End SubMenu : Deinterlace
+#. End Menu : Video
+#. Menu : Help
+#: ../src/freetuxtv-window-main.c:401
+msgid "_Help"
+msgstr "_Yardım"
+
+#. Create the menu items
+#: ../src/freetuxtv-window-main.c:1029
+msgid "Mute"
+msgstr "Sustur"
+
+#: ../src/main.c:424
+#, c-format
+msgid "Recording: %s (%s) -> %s (%s)"
+msgstr "Kaydediyor: %s (%s) -> %s (%s)"
+
+#: ../src/main.c:577
+#, c-format
+msgid ""
+"An error occurred while playing channel '%s' : %s\n"
+"\n"
+"If the problem persist, you can report that the link is dead at %s"
+msgstr ""
+"'%s' kanalı oynatılırken hatâ oluştu : %s\n"
+"Sorun devam ederse, kanal bağlantısının çalışmadığını %s bulunağına "
+"bildirebilirsiniz"
+
+#: ../src/main.c:581
+msgid "An error occurred"
+msgstr "Bir hatâ oluştu"
+
+#: ../src/main.c:607
+#, fuzzy, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "TV kanal listesi eşleniyor..."
+
+#: ../src/main.c:642
+msgid "Initializing user configuration..."
+msgstr "Kullanıcı yapılandırması başlatılıyor..."
+
+#: ../src/main.c:649
+msgid "Loading user configuration..."
+msgstr "Kullanıcı yapılandırması yükleniyor..."
+
+#: ../src/main.c:719
+msgid "Synchronizing the list of tv channels..."
+msgstr "TV kanal listesi eşleniyor..."
+
+#: ../src/main.c:752
+msgid "Loading the list of channels..."
+msgstr "Kanal listesi yükleniyor..."
+
+#: ../src/main.c:761
+msgid "Loading the list of recordings..."
+msgstr "Kayıt listesi yükleniyor..."
+
+#: ../src/main.c:1080 ../src/main.c:1276
+#, c-format
+msgid "Playing: %s"
+msgstr "%s oynatılıyor"
+
+#: ../src/main.c:1089
+msgid "is playing"
+msgstr "oynatılıyor"
+
+#: ../src/main.c:1278
+#, c-format
+msgid "Stopping channel: %s"
+msgstr "%s kanalı durduruluyor"
+
+#: ../src/main.c:1322
+msgid "is recording"
+msgstr "kaydediliyor"
+
+#: ../src/main.c:1369
+#, c-format
+msgid "Recording: %s"
+msgstr "Kaydediliyor: %s"
+
+#: ../src/main.c:1494
+msgid "Are you sure you want to quit?"
+msgstr "Çıkmak istediğinize emin misiniz?"
+
+#~ msgid "Modern Greek Web TV and Radio"
+#~ msgstr "Modern Yunanca Genelağ TV ve Radyoları"
+
+#~ msgid "Web TV (Modern Greek)"
+#~ msgstr "Genelağ Televizyonu (Modern Yunanca)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b2d12e1..0ce9976 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: freetuxtv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
"PO-Revision-Date: 2011-12-14 17:53+0800\n"
"Last-Translator: Dean Lee <xslidian at gmail.com>\n"
"Language-Team: Chinese Simplified <xslidian+freetuxtv at gmail.com>\n"
@@ -18,784 +18,1325 @@ msgstr ""
"X-Poedit-Language: Chinese\n"
#: ../data/ui/addrecording.glade.h:1
-msgid "<b>Recording period</b>"
-msgstr "<b>录制间隔</b>"
-
-#: ../data/ui/addrecording.glade.h:2
msgid "Add a recording"
msgstr "添加录像任务"
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "选中频道:"
+
#: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr "时长:"
+msgid "Title:"
+msgstr "标题:"
#: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr "终止时间:"
+msgid "Start time:"
+msgstr "起始时间:"
#: ../data/ui/addrecording.glade.h:5
-msgid "Selected channel:"
-msgstr "选中频道:"
+msgid "Duration:"
+msgstr "时长:"
#: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr "起始时间:"
+msgid "End time:"
+msgstr "终止时间:"
#: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr "标题:"
-
-#: ../data/ui/addrecording.glade.h:8
msgid "minutes"
msgstr "分钟"
+#: ../data/ui/addrecording.glade.h:8
+msgid "<b>Recording period</b>"
+msgstr "<b>录制间隔</b>"
+
#: ../data/ui/addchannelsgroups.glade.h:1
-#: ../data/ui/freetuxtv.glade.h:10
-msgid "<b>Processing of channels' name</b>"
-msgstr "<b>正在处理频道名称</b>"
+msgid "Add a group"
+msgstr "添加组"
#: ../data/ui/addchannelsgroups.glade.h:2
-msgid "<b>Special group type:</b>"
-msgstr "<b>特殊组类:</b>"
+msgid "Channels groups file:"
+msgstr "频道组文件:"
#: ../data/ui/addchannelsgroups.glade.h:3
-msgid "Add a group"
-msgstr "添加组"
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
#: ../data/ui/addchannelsgroups.glade.h:4
-msgid "Channels groups file:"
-msgstr "频道组文件:"
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr "选择希望添加的一个或多个频道组并点击添加按钮。"
#: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "自定义频道组"
+msgid "Languages/Channels group"
+msgstr "语言/频道组"
#: ../data/ui/addchannelsgroups.glade.h:6
-#: ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr "删除名称前的这些文字:"
+msgid "Required ISP"
+msgstr "所需 ISP"
#: ../data/ui/addchannelsgroups.glade.h:7
-#: ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
-msgstr "删除名称后的这些文字:"
+msgid "URI"
+msgstr "URI"
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
msgstr "现有频道组"
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "收藏"
-
-#: ../data/ui/addchannelsgroups.glade.h:10
-#: ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
msgid "Group's name:"
msgstr "组名:"
-#: ../data/ui/addchannelsgroups.glade.h:11
-msgid "Languages/Channels group"
-msgstr "语言/频道组"
-
-#: ../data/ui/addchannelsgroups.glade.h:12
-#: ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
msgid "Name of the group which will be added"
msgstr "将添加的组名"
-#: ../data/ui/addchannelsgroups.glade.h:13
-#: ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr "将添加组的播放列表 URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:14
-#: ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
msgid "Playlist's URI:"
msgstr "播放列表 URI:"
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr "所需 ISP"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "将添加组的播放列表 URI"
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid "Select one or several channels group you want to add and click on the add button."
-msgstr "选择希望添加的一个或多个频道组并点击添加按钮。"
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "删除名称前的这些文字:"
-#: ../data/ui/addchannelsgroups.glade.h:17
-msgid "Special group"
-msgstr "特殊组"
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr "频道名称末尾必须删除的文本或正则表达式"
-#: ../data/ui/addchannelsgroups.glade.h:18
-#: ../data/ui/freetuxtv.glade.h:68
-msgid "Text or regexp which must be deleted at the beginning of the channel's name"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "删除名称后的这些文字:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
msgstr "频道名称开头必须删除的文本或正则表达式"
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"您可以使用正则表达式删除组中频道名称的部分文字。例如，如果您的播放列表中有类"
+"似 \"11 - NT1\" 或 \"12 - NRJ 12\" 的名称，FreetuxTV 可以使用正则表达式 "
+"\"[0-9]* - \" 移除名称前的频道号。"
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>正在处理频道名称</b>"
+
#: ../data/ui/addchannelsgroups.glade.h:19
-#: ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr "频道名称末尾必须删除的文本或正则表达式"
+msgid "Custom channels group"
+msgstr "自定义频道组"
#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"
+msgid "Favourites"
+msgstr "收藏"
#: ../data/ui/addchannelsgroups.glade.h:21
-#: ../data/ui/freetuxtv.glade.h:80
-msgid "You can easily use regular expressions to delete some text in the channel's name of the groupe. For example, if in your playlist, you have a name like \"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's number before the name, by using the regular expression \"[0-9]* - \"."
-msgstr "您可以使用正则表达式删除组中频道名称的部分文字。例如，如果您的播放列表中有类似 \"11 - NT1\" 或 \"12 - NRJ 12\" 的名称，FreetuxTV 可以使用正则表达式 \"[0-9]* - \" 移除名称前的频道号。"
+msgid "<b>Special group type:</b>"
+msgstr "<b>特殊组类:</b>"
#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
-msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgid "Special group"
+msgstr "特殊组"
#: ../data/ui/channelproperties.glade.h:1
-msgid "<b>Channel VLC options:</b>"
-msgstr "<b>频道 VLC 选项:</b>"
-
-#: ../data/ui/channelproperties.glade.h:2
msgid "Channel properties"
msgstr "频道属性"
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "频道名称:"
+
#: ../data/ui/channelproperties.glade.h:3
msgid "Channel's URI:"
msgstr "频道 URI:"
#: ../data/ui/channelproperties.glade.h:4
-msgid "Channel's name:"
-msgstr "频道名称:"
-
-#: ../data/ui/channelproperties.glade.h:5
-msgid "Deinterlacement:"
-msgstr "反交错:"
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>频道 VLC 选项:</b>"
-#: ../data/ui/channelproperties.glade.h:6
-#: ../data/ui/freetuxtv.glade.h:30
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
msgid "General"
msgstr "常规"
-#: ../data/ui/channelproperties.glade.h:7
-msgid "Options"
-msgstr "选项"
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "反交错:"
-#: ../data/ui/channelproperties.glade.h:8
-#: ../src/freetuxtv-window-channel-properties.c:175
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
msgid "none"
msgstr "无"
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "选项"
+
#: ../data/ui/freetuxtv.glade.h:1
-msgid " channels"
-msgstr " 频道"
+msgid "GNU General Public License v3"
+msgstr "GNU 通用公共授权许可 第三版"
#: ../data/ui/freetuxtv.glade.h:2
-msgid "+"
-msgstr "+"
+msgid "Web TV channels player"
+msgstr "网络电视频道播放器"
#: ../data/ui/freetuxtv.glade.h:3
-msgid "-"
-msgstr "-"
-
-#: ../data/ui/freetuxtv.glade.h:4
-msgid "0"
-msgstr "0"
+msgid "Project's Web Site"
+msgstr "项目网站"
+#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+msgid "translator-credits"
+msgstr "Dean Lee <xslidian+freetuxtv at gmail.com>"
#: ../data/ui/freetuxtv.glade.h:6
-msgid "<b>Configuration file (vlcrc)</b>"
-msgstr "<b>配置文件 (vlcrc)</b>"
-
-#: ../data/ui/freetuxtv.glade.h:7
-msgid "<b>Connection</b>"
-msgstr "<b>连接</b>"
-
-#: ../data/ui/freetuxtv.glade.h:8
-msgid "<b>Destination</b>"
-msgstr "<b>目标</b>"
-
-#: ../data/ui/freetuxtv.glade.h:9
-msgid "<b>Notifications</b>"
-msgstr "<b>通知</b>"
-
-#: ../data/ui/freetuxtv.glade.h:11
-msgid "<b>Proxy</b>"
-msgstr "<b>代理</b>"
-
-#: ../data/ui/freetuxtv.glade.h:12
-msgid "<b>Search of channels</b>"
-msgstr "<b>搜索频道</b>"
-
-#: ../data/ui/freetuxtv.glade.h:13
-msgid "<b>Startup</b>"
-msgstr "<b>启动</b>"
-
-#: ../data/ui/freetuxtv.glade.h:14
-msgid "<b>Transcoding options</b>"
-msgstr "<b>转码选项</b>"
-
-#: ../data/ui/freetuxtv.glade.h:15
-msgid "<i>Restart the application after changing this option.</i>"
-msgstr "<i>更改此选项后请重新启动程序。</i>"
-
-#: ../data/ui/freetuxtv.glade.h:16
-msgid "Activate/Deactivate the window always on top"
-msgstr "启用/禁用窗口总在最前"
-
-#: ../data/ui/freetuxtv.glade.h:17
-msgid "Channels"
-msgstr "频道"
+msgid "Group properties"
+msgstr "组属性"
#: ../data/ui/freetuxtv.glade.h:18
-msgid "Channels' search text area"
-msgstr "频道搜索文本域"
+msgid "Number of channels:"
+msgstr "频道数:"
#: ../data/ui/freetuxtv.glade.h:19
-msgid "Delete the search text area"
-msgstr "删除搜索文本域"
+msgid "0"
+msgstr "0"
-#: ../data/ui/freetuxtv.glade.h:22
+#: ../data/ui/freetuxtv.glade.h:20
msgid "Details"
msgstr "详细信息"
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "查看文件"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "首选项"
+
#: ../data/ui/freetuxtv.glade.h:23
-msgid "Directory Record:"
-msgstr "录制目录:"
+msgid "Play last channel on startup"
+msgstr "启动时播放上次播放的频道"
#: ../data/ui/freetuxtv.glade.h:24
-msgid "Download timeout (seconds) :"
-msgstr "下载超时 (秒) :"
+msgid "<b>Startup</b>"
+msgstr "<b>启动</b>"
#: ../data/ui/freetuxtv.glade.h:25
msgid "Enable desktop notifications"
msgstr "启用桌面通知"
#: ../data/ui/freetuxtv.glade.h:26
-msgid "Format:"
-msgstr "格式:"
+msgid "<b>Notifications</b>"
+msgstr "<b>通知</b>"
#: ../data/ui/freetuxtv.glade.h:27
-#: ../data/menu/freetuxtv.desktop.in.h:1
-msgid "FreetuxTV"
-msgstr "FreetuxTV"
+msgid "Ignore diacritics"
+msgstr "忽略变音符"
#: ../data/ui/freetuxtv.glade.h:28
-msgid "Fullscreen mode"
-msgstr "全屏模式"
+msgid "<b>Search of channels</b>"
+msgstr "<b>搜索频道</b>"
#: ../data/ui/freetuxtv.glade.h:29
-msgid "GNU General Public License v3"
-msgstr "GNU 通用公共授权许可 第三版"
+msgid "None"
+msgstr "无"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "使用自定义配置文件"
#: ../data/ui/freetuxtv.glade.h:31
-msgid "Go back to the normal mode"
-msgstr "返回常规模式"
+msgid "Use the VLC configuration file"
+msgstr "使用 VLC 配置文件"
#: ../data/ui/freetuxtv.glade.h:32
-msgid "Go to the current channel playing"
-msgstr "转到当前正在播放的频道"
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>更改此选项后请重新启动程序。</i>"
#: ../data/ui/freetuxtv.glade.h:33
-msgid "Group properties"
-msgstr "组属性"
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>配置文件 (vlcrc)</b>"
-#: ../data/ui/freetuxtv.glade.h:35
-msgid "HTTP"
-msgstr "HTTP"
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
+msgstr "LibVLC"
+
+#: ../data/ui/freetuxtv.glade.h:35
+msgid "Directory Record:"
+msgstr "录制目录:"
#: ../data/ui/freetuxtv.glade.h:36
-msgid "Ignore diacritics"
-msgstr "忽略变音符"
+msgid "Select a directory"
+msgstr "选择目录"
#: ../data/ui/freetuxtv.glade.h:37
-msgid "In progress"
-msgstr "正在进行"
+msgid "<b>Destination</b>"
+msgstr "<b>目标</b>"
#: ../data/ui/freetuxtv.glade.h:38
-msgid "Jump to current channel"
-msgstr "跳至当前频道"
+msgid "No transcoding"
+msgstr "无转码"
#: ../data/ui/freetuxtv.glade.h:39
-msgid "LibVLC"
-msgstr "LibVLC"
+msgid "Predefined transcoding formats"
+msgstr "预定义的转码格式"
#: ../data/ui/freetuxtv.glade.h:40
-msgid "Manual proxy configuration"
-msgstr "手动配置代理"
+msgid "Format:"
+msgstr "格式:"
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
+msgstr "<b>转码选项</b>"
#: ../data/ui/freetuxtv.glade.h:42
-msgid "Network"
-msgstr "网络"
+msgid "Recordings"
+msgstr "录像"
#: ../data/ui/freetuxtv.glade.h:43
-msgid "Next channel"
-msgstr "下一频道"
+msgid "Download timeout (seconds) :"
+msgstr "下载超时 (秒) :"
#: ../data/ui/freetuxtv.glade.h:44
-msgid "No proxy"
-msgstr "无代理"
+msgid "<b>Connection</b>"
+msgstr "<b>连接</b>"
#: ../data/ui/freetuxtv.glade.h:45
-msgid "No transcoding"
-msgstr "无转码"
+msgid "No proxy"
+msgstr "无代理"
#: ../data/ui/freetuxtv.glade.h:46
-msgid "None"
-msgstr "无"
+msgid "Manual proxy configuration"
+msgstr "手动配置代理"
#: ../data/ui/freetuxtv.glade.h:47
-msgid "Number of channels:"
-msgstr "频道数:"
+msgid "Proxy server:"
+msgstr "代理服务器:"
#: ../data/ui/freetuxtv.glade.h:48
-msgid "Password:"
-msgstr "密码:"
+msgid "Proxy port:"
+msgstr "代理端口:"
#: ../data/ui/freetuxtv.glade.h:49
-msgid "Play last channel on startup"
-msgstr "启动时播放上次播放的频道"
+msgid "Proxy type:"
+msgstr "代理类型:"
#: ../data/ui/freetuxtv.glade.h:50
-msgid "Play the current channel"
-msgstr "播放当前频道"
+msgid "Use authentification"
+msgstr "使用身份认证"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "用户名:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "密码:"
#: ../data/ui/freetuxtv.glade.h:53
-msgid "Predefined transcoding formats"
-msgstr "预定义的转码格式"
+msgid "<b>Proxy</b>"
+msgstr "<b>代理</b>"
#: ../data/ui/freetuxtv.glade.h:54
-msgid "Preferences"
-msgstr "首选项"
+msgid "Network"
+msgstr "网络"
#: ../data/ui/freetuxtv.glade.h:55
-msgid "Previous channel"
-msgstr "上一频道"
+msgid "HTTP"
+msgstr "HTTP"
#: ../data/ui/freetuxtv.glade.h:56
-msgid "Project's Web Site"
-msgstr "项目网站"
+msgid "SOCKS"
+msgstr "SOCKS"
#: ../data/ui/freetuxtv.glade.h:57
-msgid "Proxy port:"
-msgstr "代理端口:"
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr "视频 - Theora + Vorbis (OGG)"
#: ../data/ui/freetuxtv.glade.h:58
-msgid "Proxy server:"
-msgstr "代理服务器:"
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
#: ../data/ui/freetuxtv.glade.h:59
-msgid "Proxy type:"
-msgstr "代理类型:"
+msgid "ogg"
+msgstr "ogg"
#: ../data/ui/freetuxtv.glade.h:60
-msgid "Record the current channel"
-msgstr "录制当前频道"
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr "视频 - H.264 + MPGA (MP4)"
#: ../data/ui/freetuxtv.glade.h:61
-msgid "Recordings"
-msgstr "录像"
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
#: ../data/ui/freetuxtv.glade.h:62
-msgid "SOCKS"
-msgstr "SOCKS"
+msgid "mp4"
+msgstr "mp4"
#: ../data/ui/freetuxtv.glade.h:63
-msgid "Search:"
-msgstr "搜索:"
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr "视频 - MPEG-2 + MPGA (TS)"
#: ../data/ui/freetuxtv.glade.h:64
-msgid "Select a directory"
-msgstr "选择目录"
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
#: ../data/ui/freetuxtv.glade.h:65
-msgid "Small mode"
-msgstr "最简模式"
+msgid "ts"
+msgstr "ts"
-#: ../data/ui/freetuxtv.glade.h:66
-msgid "Stop playing the current channel"
-msgstr "停止播放当前频道"
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
#: ../data/ui/freetuxtv.glade.h:67
-msgid "Terminated"
-msgstr "已终止"
+msgid "Search:"
+msgstr "搜索:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "频道搜索文本域"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "删除搜索文本域"
#: ../data/ui/freetuxtv.glade.h:70
-msgid "Use a custom configuration file"
-msgstr "使用自定义配置文件"
+msgid "Jump to current channel"
+msgstr "跳至当前频道"
#: ../data/ui/freetuxtv.glade.h:71
-msgid "Use authentification"
-msgstr "使用身份认证"
+msgid "Go to the current channel playing"
+msgstr "转到当前正在播放的频道"
#: ../data/ui/freetuxtv.glade.h:72
-msgid "Use the VLC configuration file"
-msgstr "使用 VLC 配置文件"
+msgid "Channels"
+msgstr "频道"
#: ../data/ui/freetuxtv.glade.h:73
-msgid "Username:"
-msgstr "用户名:"
+msgid "In progress"
+msgstr "正在进行"
#: ../data/ui/freetuxtv.glade.h:74
-msgid "Video - H.264 + MPGA (MP4)"
-msgstr "视频 - H.264 + MPGA (MP4)"
+msgid "Terminated"
+msgstr "已终止"
#: ../data/ui/freetuxtv.glade.h:75
-msgid "Video - MPEG-2 + MPGA (TS)"
-msgstr "视频 - MPEG-2 + MPGA (TS)"
+msgid "00:00:00"
+msgstr "00:00:00"
#: ../data/ui/freetuxtv.glade.h:76
-msgid "Video - Theora + Vorbis (OGG)"
-msgstr "视频 - Theora + Vorbis (OGG)"
+msgid "Previous channel"
+msgstr "上一频道"
#: ../data/ui/freetuxtv.glade.h:77
-msgid "View file"
-msgstr "查看文件"
+msgid "Play the current channel"
+msgstr "播放当前频道"
#: ../data/ui/freetuxtv.glade.h:78
-msgid "Vol:"
-msgstr "音量:"
+msgid "Stop playing the current channel"
+msgstr "停止播放当前频道"
#: ../data/ui/freetuxtv.glade.h:79
-msgid "Web TV channels player"
-msgstr "网络电视频道播放器"
+msgid "Record the current channel"
+msgstr "录制当前频道"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "下一频道"
#: ../data/ui/freetuxtv.glade.h:81
-msgid "mp4"
-msgstr "mp4"
+msgid "Vol:"
+msgstr "音量:"
#: ../data/ui/freetuxtv.glade.h:82
-msgid "ogg"
-msgstr "ogg"
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
-#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:84
-msgid "translator-credits"
-msgstr "Dean Lee <xslidian+freetuxtv at gmail.com>"
+msgid "Fullscreen mode"
+msgstr "全屏模式"
#: ../data/ui/freetuxtv.glade.h:85
-msgid "ts"
-msgstr "ts"
+msgid "Small mode"
+msgstr "最简模式"
#: ../data/ui/freetuxtv.glade.h:86
-msgid "vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,channels=2"
-msgstr "vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,channels=2"
+msgid " channels"
+msgstr " 频道"
#: ../data/ui/freetuxtv.glade.h:87
-msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
-msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgid "Go back to the normal mode"
+msgstr "返回常规模式"
#: ../data/ui/freetuxtv.glade.h:88
-msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
-msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgid "Activate/Deactivate the window always on top"
+msgstr "启用/禁用窗口总在最前"
#: ../data/channels_groups.xml.in.h:1
msgid "Alice (Unofficial)"
msgstr "Alice (非官方)"
#: ../data/channels_groups.xml.in.h:2
-msgid "Arabic Web TV and Radio"
-msgstr "阿拉伯语网络电视与电台"
+msgid "SFR TV (Unofficial)"
+msgstr "SFR TV (非官方)"
#: ../data/channels_groups.xml.in.h:3
-msgid "Catalan Web TV and Radio"
-msgstr "加泰罗尼亚语网络电视与电台"
+#, fuzzy
+msgid "Afrikaans Web TV and Radio"
+msgstr "波斯语网络电视与电台"
#: ../data/channels_groups.xml.in.h:4
-msgid "Chinese Web TV and Radio"
-msgstr "汉语网络电视与电台"
+#, fuzzy
+msgid "Web TV (Afrikaans)"
+msgstr "网络电视 (波斯语)"
#: ../data/channels_groups.xml.in.h:5
-msgid "Czech Web TV and Radio"
-msgstr "捷克语网络电视与电台"
+#, fuzzy
+msgid "Albanian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
#: ../data/channels_groups.xml.in.h:6
-msgid "Dutch Web TV and Radio"
-msgstr "荷兰语网络电视与电台"
+#, fuzzy
+msgid "Web TV (Albanian)"
+msgstr "网络电视 (罗马尼亚语)"
#: ../data/channels_groups.xml.in.h:7
-msgid "English Web TV and Radio"
-msgstr "英语网络电视与电台"
+#, fuzzy
+msgid "Amharic Web TV and Radio"
+msgstr "阿拉伯语网络电视与电台"
#: ../data/channels_groups.xml.in.h:8
-msgid "French Web TV and Radio"
-msgstr "法语网络电视与电台"
+#, fuzzy
+msgid "Web TV (Amharic)"
+msgstr "网络电视 (阿拉伯语)"
#: ../data/channels_groups.xml.in.h:9
-msgid "German Web TV and Radio"
-msgstr "德语网络电视与电台"
+msgid "Arabic Web TV and Radio"
+msgstr "阿拉伯语网络电视与电台"
#: ../data/channels_groups.xml.in.h:10
-msgid "Greek Web TV and Radio"
-msgstr "希腊语网络电视与电台"
+msgid "Web TV (Arabic)"
+msgstr "网络电视 (阿拉伯语)"
#: ../data/channels_groups.xml.in.h:11
-msgid "Hungarian Web TV and Radio"
-msgstr "匈牙利语网络电视与电台"
+msgid "Web Radio (Arabic)"
+msgstr "网络电台 (阿拉伯语)"
#: ../data/channels_groups.xml.in.h:12
-msgid "Italian Web TV and Radio"
-msgstr "意大利语网络电视与电台"
+#, fuzzy
+msgid "Web Cam (Arabic)"
+msgstr "网络电视 (阿拉伯语)"
#: ../data/channels_groups.xml.in.h:13
-msgid "Japanese Web TV and Radio"
-msgstr "日语网络电视与电台"
+#, fuzzy
+msgid "Armenian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
#: ../data/channels_groups.xml.in.h:14
-msgid "Korean Web TV and Radio"
-msgstr "朝鲜语网络电视与电台"
+#, fuzzy
+msgid "Web TV (Armenian)"
+msgstr "网络电视 (罗马尼亚语)"
#: ../data/channels_groups.xml.in.h:15
-msgid "Latin Web TV and Radio"
-msgstr "拉丁语网络电视与电台"
+#, fuzzy
+msgid "Azerbaijani Web TV and Radio"
+msgstr "波斯语网络电视与电台"
#: ../data/channels_groups.xml.in.h:16
-msgid "Modern Greek Web TV and Radio"
-msgstr "现代希腊语网络电视与电台"
+#, fuzzy
+msgid "Web TV (Azerbaijani)"
+msgstr "网络电视 (波斯语)"
#: ../data/channels_groups.xml.in.h:17
-msgid "No lang Web TV and Radio"
-msgstr "未归类语言的网络电视与电台"
+#, fuzzy
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "匈牙利语网络电视与电台"
#: ../data/channels_groups.xml.in.h:18
+#, fuzzy
+msgid "Web TV (Bengali/Bangla)"
+msgstr "网络电视 (匈牙利语)"
+
+#: ../data/channels_groups.xml.in.h:19
+#, fuzzy
+msgid "Bulgarian Web TV and Radio"
+msgstr "匈牙利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:20
+#, fuzzy
+msgid "Web TV (Bulgarian)"
+msgstr "网络电视 (匈牙利语)"
+
+#: ../data/channels_groups.xml.in.h:21
+#, fuzzy
+msgid "Cambodian Web TV and Radio"
+msgstr "意大利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:22
+#, fuzzy
+msgid "Web TV (Cambodian)"
+msgstr "网络电视 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:23
+msgid "Catalan Web TV and Radio"
+msgstr "加泰罗尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr "网络电视 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr "网络电台 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:26
+msgid "Chinese Web TV and Radio"
+msgstr "汉语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr "网络电视 (汉语)"
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr "网络电台 (汉语)"
+
+#: ../data/channels_groups.xml.in.h:29
+#, fuzzy
+msgid "Croatian Web TV and Radio"
+msgstr "加泰罗尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:30
+#, fuzzy
+msgid "Web TV (Croatian)"
+msgstr "网络电视 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:31
+#, fuzzy
+msgid "Web Radio (Croatian)"
+msgstr "网络电台 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:32
+msgid "Czech Web TV and Radio"
+msgstr "捷克语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr "网络电视 (捷克语)"
+
+#: ../data/channels_groups.xml.in.h:34
+#, fuzzy
+msgid "Web Radio (Czech)"
+msgstr "网络电台 (法语)"
+
+#: ../data/channels_groups.xml.in.h:35
+#, fuzzy
+msgid "Danish Web TV and Radio"
+msgstr "西班牙语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:36
+#, fuzzy
+msgid "Web TV (Danish)"
+msgstr "网络电视 (西班牙语)"
+
+#: ../data/channels_groups.xml.in.h:37
+msgid "Dutch Web TV and Radio"
+msgstr "荷兰语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr "网络电视 (荷兰语)"
+
+#: ../data/channels_groups.xml.in.h:39
+#, fuzzy
+msgid "Web Radio (Dutch)"
+msgstr "网络电台 (法语)"
+
+#: ../data/channels_groups.xml.in.h:40
+#, fuzzy
+msgid "Web Cam (Dutch)"
+msgstr "网络电视 (荷兰语)"
+
+#: ../data/channels_groups.xml.in.h:41
+msgid "English Web TV and Radio"
+msgstr "英语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr "网络电视 (英语)"
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr "网络电台 (英语)"
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr "网络节目 (英语)"
+
+#: ../data/channels_groups.xml.in.h:45
+#, fuzzy
+msgid "Web Cam (English)"
+msgstr "网络电视 (英语)"
+
+#: ../data/channels_groups.xml.in.h:46
+#, fuzzy
+msgid "Estonian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:47
+#, fuzzy
+msgid "Web TV (Estonian)"
+msgstr "网络电视 (罗马尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:48
+#, fuzzy
+msgid "Finnish Web TV and Radio"
+msgstr "西班牙语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:49
+#, fuzzy
+msgid "Web TV (Finnish)"
+msgstr "网络电视 (西班牙语)"
+
+#: ../data/channels_groups.xml.in.h:50
+msgid "French Web TV and Radio"
+msgstr "法语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr "网络电视 (法语)"
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr "网络电台 (法语)"
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr "网络节目 (法语)"
+
+#: ../data/channels_groups.xml.in.h:54
+#, fuzzy
+msgid "Georgian Web TV and Radio"
+msgstr "德语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:55
+#, fuzzy
+msgid "Web TV (Georgian)"
+msgstr "网络电视 (德语)"
+
+#: ../data/channels_groups.xml.in.h:56
+msgid "German Web TV and Radio"
+msgstr "德语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr "网络电视 (德语)"
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr "网络电台 (德语)"
+
+#: ../data/channels_groups.xml.in.h:59
+msgid "Greek Web TV and Radio"
+msgstr "希腊语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr "网络电视 (希腊语)"
+
+#: ../data/channels_groups.xml.in.h:61
+#, fuzzy
+msgid "Web Radio (Greek)"
+msgstr "网络电台 (德语)"
+
+#: ../data/channels_groups.xml.in.h:62
+#, fuzzy
+msgid "Hebrew Web TV and Radio"
+msgstr "希腊语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:63
+#, fuzzy
+msgid "Web TV (Hebrew)"
+msgstr "网络电视 (希腊语)"
+
+#: ../data/channels_groups.xml.in.h:64
+#, fuzzy
+msgid "Web Radio (Hebrew)"
+msgstr "网络电台 (法语)"
+
+#: ../data/channels_groups.xml.in.h:65
+#, fuzzy
+msgid "Web Cam (Hebrew)"
+msgstr "网络电视 (希腊语)"
+
+#: ../data/channels_groups.xml.in.h:66
+#, fuzzy
+msgid "Hindi Web TV and Radio"
+msgstr "拉丁语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:67
+#, fuzzy
+msgid "Web TV (Hindi)"
+msgstr "网络电视 (拉丁语)"
+
+#: ../data/channels_groups.xml.in.h:68
+#, fuzzy
+msgid "Web Radio (Hindi)"
+msgstr "网络电台 (汉语)"
+
+#: ../data/channels_groups.xml.in.h:69
+msgid "Hungarian Web TV and Radio"
+msgstr "匈牙利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr "网络电视 (匈牙利语)"
+
+#: ../data/channels_groups.xml.in.h:71
+#, fuzzy
+msgid "Icelandic Web TV and Radio"
+msgstr "意大利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:72
+#, fuzzy
+msgid "Web TV (Icelandic)"
+msgstr "网络电视 (意大利语)"
+
+#: ../data/channels_groups.xml.in.h:73
+#, fuzzy
+msgid "Indonesian Web TV and Radio"
+msgstr "波斯语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:74
+#, fuzzy
+msgid "Web TV (Indonesian)"
+msgstr "网络电视 (波斯语)"
+
+#: ../data/channels_groups.xml.in.h:75
+#, fuzzy
+msgid "Interlingua Web TV and Radio"
+msgstr "意大利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:76
+#, fuzzy
+msgid "Web Radio (Interlingua)"
+msgstr "网络电台 (意大利语)"
+
+#: ../data/channels_groups.xml.in.h:77
+#, fuzzy
+msgid "Irish Web TV and Radio"
+msgstr "土耳其语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:78
+#, fuzzy
+msgid "Web TV (Irish)"
+msgstr "网络电视 (土耳其语)"
+
+#: ../data/channels_groups.xml.in.h:79
+#, fuzzy
+msgid "Web Radio (Irish)"
+msgstr "网络电台 (英语)"
+
+#: ../data/channels_groups.xml.in.h:80
+msgid "Italian Web TV and Radio"
+msgstr "意大利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr "网络电视 (意大利语)"
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr "网络电台 (意大利语)"
+
+#: ../data/channels_groups.xml.in.h:83
+msgid "Japanese Web TV and Radio"
+msgstr "日语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr "网络电视 (日语)"
+
+#: ../data/channels_groups.xml.in.h:85
+#, fuzzy
+msgid "Web Radio (Japanese)"
+msgstr "网络电台 (汉语)"
+
+#: ../data/channels_groups.xml.in.h:86
+#, fuzzy
+msgid "Web Cam (Japanese)"
+msgstr "网络电视 (日语)"
+
+#: ../data/channels_groups.xml.in.h:87
+#, fuzzy
+msgid "Kazakh Web TV and Radio"
+msgstr "捷克语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:88
+#, fuzzy
+msgid "Web TV (Kazakh)"
+msgstr "网络电视 (捷克语)"
+
+#: ../data/channels_groups.xml.in.h:89
+msgid "Korean Web TV and Radio"
+msgstr "朝鲜语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr "网络电视 (朝鲜语)"
+
+#: ../data/channels_groups.xml.in.h:91
+#, fuzzy
+msgid "Kurdish Web TV and Radio"
+msgstr "土耳其语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:92
+#, fuzzy
+msgid "Web TV (Kurdish)"
+msgstr "网络电视 (土耳其语)"
+
+#: ../data/channels_groups.xml.in.h:93
+msgid "Latin Web TV and Radio"
+msgstr "拉丁语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
+msgstr "网络电视 (拉丁语)"
+
+#: ../data/channels_groups.xml.in.h:95
+#, fuzzy
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "拉丁语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:96
+#, fuzzy
+msgid "Web TV (Latvian/Lettish)"
+msgstr "网络电视 (拉丁语)"
+
+#: ../data/channels_groups.xml.in.h:97
+#, fuzzy
+msgid "Lithuanian Web TV and Radio"
+msgstr "意大利语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:98
+#, fuzzy
+msgid "Web TV (Lithuanian)"
+msgstr "网络电视 (意大利语)"
+
+#: ../data/channels_groups.xml.in.h:99
+#, fuzzy
+msgid "Macedonian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:100
+#, fuzzy
+msgid "Web TV (Macedonian)"
+msgstr "网络电视 (罗马尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:101
+#, fuzzy
+msgid "Web Radio (Macedonian)"
+msgstr "网络电台 (意大利语)"
+
+#: ../data/channels_groups.xml.in.h:102
+#, fuzzy
+msgid "Malay Web TV and Radio"
+msgstr "加泰罗尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:103
+#, fuzzy
+msgid "Web TV (Malay)"
+msgstr "网络电视 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:104
+#, fuzzy
+msgid "Malayalam Web TV and Radio"
+msgstr "加泰罗尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:105
+#, fuzzy
+msgid "Web TV (Malayalam)"
+msgstr "网络电视 (加泰罗尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:106
+#, fuzzy
+msgid "Maltese Web TV and Radio"
+msgstr "日语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:107
+#, fuzzy
+msgid "Web TV (Maltese)"
+msgstr "网络电视 (日语)"
+
+#: ../data/channels_groups.xml.in.h:108
+#, fuzzy
+msgid "Web Radio (Maltese)"
+msgstr "网络电台 (汉语)"
+
+#: ../data/channels_groups.xml.in.h:109
+#, fuzzy
+msgid "Moldavian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:110
+#, fuzzy
+msgid "Web TV (Moldavian)"
+msgstr "网络电视 (罗马尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:111
+#, fuzzy
+msgid "Mongolian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:112
+#, fuzzy
+msgid "Web TV (Mongolian)"
+msgstr "网络电视 (罗马尼亚语)"
+
+#: ../data/channels_groups.xml.in.h:113
msgid "Norwegian Web TV and Radio"
msgstr "挪威语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:19
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
+msgstr "网络电视 (挪威语)"
+
+#: ../data/channels_groups.xml.in.h:115
msgid "Persian Web TV and Radio"
msgstr "波斯语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:20
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
+msgstr "网络电视 (波斯语)"
+
+#: ../data/channels_groups.xml.in.h:117
msgid "Polish Web TV and Radio"
msgstr "波兰语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:21
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
+msgstr "网络电视 (波兰语)"
+
+#: ../data/channels_groups.xml.in.h:119
+#, fuzzy
+msgid "Web Radio (Polish)"
+msgstr "网络电台 (英语)"
+
+#: ../data/channels_groups.xml.in.h:120
+#, fuzzy
+msgid "Web Cam (Polish)"
+msgstr "网络电视 (波兰语)"
+
+#: ../data/channels_groups.xml.in.h:121
msgid "Portuguese Web TV and Radio"
msgstr "葡萄牙语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:22
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
+msgstr "网络电视 (葡萄牙语)"
+
+#: ../data/channels_groups.xml.in.h:123
+#, fuzzy
+msgid "Web Radio (Portuguese)"
+msgstr "网络电视 (葡萄牙语)"
+
+#: ../data/channels_groups.xml.in.h:124
+#, fuzzy
+msgid "Punjabi Web TV and Radio"
+msgstr "阿拉伯语网络电视与电台"
+
+#: ../data/channels_groups.xml.in.h:125
+#, fuzzy
+msgid "Web TV (Punjabi)"
+msgstr "网络电视 (阿拉伯语)"
+
+#: ../data/channels_groups.xml.in.h:126
msgid "Romanian Web TV and Radio"
msgstr "罗马尼亚语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:23
-msgid "Russian Web TV and Radio"
-msgstr "俄语网络电视与电台"
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
+msgstr "网络电视 (罗马尼亚语)"
-#: ../data/channels_groups.xml.in.h:24
-msgid "SFR TV (Unofficial)"
-msgstr "SFR TV (非官方)"
+#: ../data/channels_groups.xml.in.h:128
+#, fuzzy
+msgid "Web Radio (Romanian)"
+msgstr "网络电台 (俄语)"
-#: ../data/channels_groups.xml.in.h:25
-msgid "Slovak Web TV and Radio"
-msgstr "斯洛伐克语网络电视与电台"
+#: ../data/channels_groups.xml.in.h:129
+msgid "Russian Web TV and Radio"
+msgstr "俄语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:26
-msgid "Spanish Web TV and Radio"
-msgstr "西班牙语网络电视与电台"
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
+msgstr "网络电视 (俄语)"
-#: ../data/channels_groups.xml.in.h:27
-msgid "Swedish Web TV and Radio"
-msgstr "瑞典语网络电视与电台"
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
+msgstr "网络电台 (俄语)"
-#: ../data/channels_groups.xml.in.h:28
-msgid "Thai Web TV and Radio"
-msgstr "泰语网络电视与电台"
+#: ../data/channels_groups.xml.in.h:132
+#, fuzzy
+msgid "Serbian Web TV and Radio"
+msgstr "波斯语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:29
-msgid "Turkish Web TV and Radio"
-msgstr "土耳其语网络电视与电台"
+#: ../data/channels_groups.xml.in.h:133
+#, fuzzy
+msgid "Web TV (Serbian)"
+msgstr "网络电视 (波斯语)"
-#: ../data/channels_groups.xml.in.h:30
-msgid "Web Programmes (English)"
-msgstr "网络节目 (英语)"
+#: ../data/channels_groups.xml.in.h:134
+#, fuzzy
+msgid "Web Radio (Serbian)"
+msgstr "网络电台 (德语)"
-#: ../data/channels_groups.xml.in.h:31
-msgid "Web Programmes (French)"
-msgstr "网络节目 (法语)"
+#: ../data/channels_groups.xml.in.h:135
+#, fuzzy
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "波斯语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:32
-msgid "Web Radio (Arabic)"
-msgstr "网络电台 (阿拉伯语)"
+#: ../data/channels_groups.xml.in.h:136
+#, fuzzy
+msgid "Web TV (Serbo-Croatian)"
+msgstr "网络电视 (波斯语)"
-#: ../data/channels_groups.xml.in.h:33
-msgid "Web Radio (Catalan)"
+#: ../data/channels_groups.xml.in.h:137
+#, fuzzy
+msgid "Web Radio (Serbo-Croatian)"
msgstr "网络电台 (加泰罗尼亚语)"
-#: ../data/channels_groups.xml.in.h:34
-msgid "Web Radio (Chinese)"
-msgstr "网络电台 (汉语)"
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
+msgstr "斯洛伐克语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:35
-msgid "Web Radio (English)"
-msgstr "网络电台 (英语)"
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
+msgstr "网络电视 (斯洛伐克语)"
-#: ../data/channels_groups.xml.in.h:36
-msgid "Web Radio (French)"
-msgstr "网络电台 (法语)"
+#: ../data/channels_groups.xml.in.h:140
+#, fuzzy
+msgid "Web Radio (Slovak)"
+msgstr "网络电视 (斯洛伐克语)"
-#: ../data/channels_groups.xml.in.h:37
-msgid "Web Radio (German)"
-msgstr "网络电台 (德语)"
+#: ../data/channels_groups.xml.in.h:141
+#, fuzzy
+msgid "Slovenian Web TV and Radio"
+msgstr "斯洛伐克语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:38
-msgid "Web Radio (Italian)"
+#: ../data/channels_groups.xml.in.h:142
+#, fuzzy
+msgid "Web TV (Slovenian)"
+msgstr "网络电视 (斯洛伐克语)"
+
+#: ../data/channels_groups.xml.in.h:143
+#, fuzzy
+msgid "Web Radio (Slovenian)"
msgstr "网络电台 (意大利语)"
-#: ../data/channels_groups.xml.in.h:39
-msgid "Web Radio (No lang)"
-msgstr "网络电台 (无语言归类)"
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr "西班牙语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:40
-msgid "Web Radio (Russian)"
-msgstr "网络电台 (俄语)"
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
+msgstr "网络电视 (西班牙语)"
-#: ../data/channels_groups.xml.in.h:41
+#: ../data/channels_groups.xml.in.h:146
msgid "Web Radio (Spanish)"
msgstr "网络电台 (西班牙语)"
-#: ../data/channels_groups.xml.in.h:42
-msgid "Web TV (Arabic)"
-msgstr "网络电视 (阿拉伯语)"
+#: ../data/channels_groups.xml.in.h:147
+#, fuzzy
+msgid "Web Programmes (Spanish)"
+msgstr "网络节目 (英语)"
-#: ../data/channels_groups.xml.in.h:43
-msgid "Web TV (Catalan)"
-msgstr "网络电视 (加泰罗尼亚语)"
+#: ../data/channels_groups.xml.in.h:148
+#, fuzzy
+msgid "Web Cam (Spanish)"
+msgstr "网络电视 (西班牙语)"
-#: ../data/channels_groups.xml.in.h:44
-msgid "Web TV (Chinese)"
-msgstr "网络电视 (汉语)"
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
+msgstr "瑞典语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:45
-msgid "Web TV (Czech)"
-msgstr "网络电视 (捷克语)"
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
+msgstr "网络电视 (瑞典语)"
-#: ../data/channels_groups.xml.in.h:46
-msgid "Web TV (Dutch)"
-msgstr "网络电视 (荷兰语)"
+#: ../data/channels_groups.xml.in.h:151
+#, fuzzy
+msgid "Tagalog Web TV and Radio"
+msgstr "泰语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:47
-msgid "Web TV (English)"
-msgstr "网络电视 (英语)"
+#: ../data/channels_groups.xml.in.h:152
+#, fuzzy
+msgid "Web TV (Tagalog)"
+msgstr "网络电视 (泰语)"
-#: ../data/channels_groups.xml.in.h:48
-msgid "Web TV (French)"
-msgstr "网络电视 (法语)"
+#: ../data/channels_groups.xml.in.h:153
+#, fuzzy
+msgid "Tamil Web TV and Radio"
+msgstr "泰语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:49
-msgid "Web TV (German)"
-msgstr "网络电视 (德语)"
+#: ../data/channels_groups.xml.in.h:154
+#, fuzzy
+msgid "Web TV (Tamil)"
+msgstr "网络电视 (泰语)"
-#: ../data/channels_groups.xml.in.h:50
-msgid "Web TV (Greek)"
-msgstr "网络电视 (希腊语)"
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
+msgstr "泰语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:51
-msgid "Web TV (Hungarian)"
-msgstr "网络电视 (匈牙利语)"
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
+msgstr "网络电视 (泰语)"
-#: ../data/channels_groups.xml.in.h:52
-msgid "Web TV (Italian)"
-msgstr "网络电视 (意大利语)"
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
+msgstr "土耳其语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:53
-msgid "Web TV (Japanese)"
-msgstr "网络电视 (日语)"
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
+msgstr "网络电视 (土耳其语)"
-#: ../data/channels_groups.xml.in.h:54
-msgid "Web TV (Korean)"
-msgstr "网络电视 (朝鲜语)"
+#: ../data/channels_groups.xml.in.h:159
+#, fuzzy
+msgid "Web Radio (Turkish)"
+msgstr "网络电视 (土耳其语)"
-#: ../data/channels_groups.xml.in.h:55
-msgid "Web TV (Latin)"
-msgstr "网络电视 (拉丁语)"
+#: ../data/channels_groups.xml.in.h:160
+#, fuzzy
+msgid "Turkmen Web TV and Radio"
+msgstr "土耳其语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:56
-msgid "Web TV (Modern Greek)"
-msgstr "网络电视 (现代希腊语)"
+#: ../data/channels_groups.xml.in.h:161
+#, fuzzy
+msgid "Web TV (Turkmen)"
+msgstr "网络电视 (土耳其语)"
-#: ../data/channels_groups.xml.in.h:57
-msgid "Web TV (No lang)"
-msgstr "网络电视 (无语言归类)"
+#: ../data/channels_groups.xml.in.h:162
+#, fuzzy
+msgid "Ukrainian Web TV and Radio"
+msgstr "罗马尼亚语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:58
-msgid "Web TV (Norwegian)"
-msgstr "网络电视 (挪威语)"
+#: ../data/channels_groups.xml.in.h:163
+#, fuzzy
+msgid "Web TV (Ukrainian)"
+msgstr "网络电视 (罗马尼亚语)"
-#: ../data/channels_groups.xml.in.h:59
-msgid "Web TV (Persian)"
-msgstr "网络电视 (波斯语)"
+#: ../data/channels_groups.xml.in.h:164
+#, fuzzy
+msgid "Web Cam (Ukrainian)"
+msgstr "网络电视 (罗马尼亚语)"
-#: ../data/channels_groups.xml.in.h:60
-msgid "Web TV (Polish)"
-msgstr "网络电视 (波兰语)"
+#: ../data/channels_groups.xml.in.h:165
+#, fuzzy
+msgid "Urdu Web TV and Radio"
+msgstr "荷兰语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:61
-msgid "Web TV (Portuguese)"
-msgstr "网络电视 (葡萄牙语)"
+#: ../data/channels_groups.xml.in.h:166
+#, fuzzy
+msgid "Web TV (Urdu)"
+msgstr "网络电视 (荷兰语)"
-#: ../data/channels_groups.xml.in.h:62
-msgid "Web TV (Romanian)"
-msgstr "网络电视 (罗马尼亚语)"
+#: ../data/channels_groups.xml.in.h:167
+#, fuzzy
+msgid "Uzbek Web TV and Radio"
+msgstr "希腊语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:63
-msgid "Web TV (Russian)"
-msgstr "网络电视 (俄语)"
+#: ../data/channels_groups.xml.in.h:168
+#, fuzzy
+msgid "Web TV (Uzbek)"
+msgstr "网络电视 (捷克语)"
-#: ../data/channels_groups.xml.in.h:64
-msgid "Web TV (Slovak)"
-msgstr "网络电视 (斯洛伐克语)"
+#: ../data/channels_groups.xml.in.h:169
+#, fuzzy
+msgid "Vietnamese Web TV and Radio"
+msgstr "汉语网络电视与电台"
-#: ../data/channels_groups.xml.in.h:65
-msgid "Web TV (Spanish)"
-msgstr "网络电视 (西班牙语)"
+#: ../data/channels_groups.xml.in.h:170
+#, fuzzy
+msgid "Web TV (Vietnamese)"
+msgstr "网络电视 (汉语)"
-#: ../data/channels_groups.xml.in.h:66
-msgid "Web TV (Swedish)"
-msgstr "网络电视 (瑞典语)"
+#: ../data/channels_groups.xml.in.h:171
+#, fuzzy
+msgid "Web Radio (Vietnamese)"
+msgstr "网络电台 (汉语)"
-#: ../data/channels_groups.xml.in.h:67
-msgid "Web TV (Thai)"
-msgstr "网络电视 (泰语)"
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
+msgstr "未归类语言的网络电视与电台"
-#: ../data/channels_groups.xml.in.h:68
-msgid "Web TV (Turkish)"
-msgstr "网络电视 (土耳其语)"
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
+msgstr "网络电视 (无语言归类)"
-#: ../data/channels_groups.xml.in.h:69
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
+msgstr "网络电台 (无语言归类)"
+
+#: ../data/channels_groups.xml.in.h:175
+#, fuzzy
+msgid "Web Programmes (No lang)"
+msgstr "网络节目 (英语)"
+
+#: ../data/channels_groups.xml.in.h:176
+#, fuzzy
+msgid "Web Cam (No lang)"
+msgstr "网络电视 (无语言归类)"
+
+#: ../data/channels_groups.xml.in.h:177
msgid "WebCam"
msgstr "摄像头"
#: ../data/menu/freetuxtv.desktop.in.h:2
-msgid "FreetuxTV Television Channels Player"
-msgstr "FreetuxTV 电视频道播放器"
-
-#: ../data/menu/freetuxtv.desktop.in.h:3
msgid "Television Channels Player"
msgstr "电视频道播放器"
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "FreetuxTV 电视频道播放器"
+
#: ../data/menu/freetuxtv.desktop.in.h:4
msgid "Watch television channels from internet"
msgstr "在网上观看电视频道"
-#: ../src/freetuxtv-cellrenderer-recordingslist.c:348
-#, c-format
-msgid "%lld min"
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
+#, fuzzy, c-format
+msgid "%ld min"
msgstr "%lld 分钟"
#. Update status bar
-#: ../src/freetuxtv-channels-list.c:319
-#: ../src/freetuxtv-channels-list.c:439
+#: ../src/freetuxtv-channels-list.c:319 ../src/freetuxtv-channels-list.c:439
#, c-format
msgid "Update \"%s\" channels list"
msgstr "更新 \"%s\" 频道列表"
#. Get the file of the playlist
-#: ../src/freetuxtv-channels-list.c:327
-#: ../src/freetuxtv-channels-list.c:447
+#: ../src/freetuxtv-channels-list.c:327 ../src/freetuxtv-channels-list.c:447
#, c-format
msgid "Getting the file: \"%s\""
msgstr "正在获取文件: \"%s\""
-#: ../src/freetuxtv-channels-list.c:358
-#: ../src/freetuxtv-channels-list.c:478
+#: ../src/freetuxtv-channels-list.c:358 ../src/freetuxtv-channels-list.c:478
#, c-format
msgid ""
"Error when adding the channels.\n"
@@ -808,17 +1349,17 @@ msgstr ""
"M3U 解析器返回错误:\n"
"%s."
-#: ../src/freetuxtv-channels-list.c:1322
+#: ../src/freetuxtv-channels-list.c:1335
msgid "Delete group's channels"
msgstr "删除组内频道"
#. Add to favourite is only for channels
-#: ../src/freetuxtv-channels-list.c:1372
+#: ../src/freetuxtv-channels-list.c:1385
msgid "Add to favourites"
msgstr "添加到收藏"
#. Add favourites to a new group
-#: ../src/freetuxtv-channels-list.c:1388
+#: ../src/freetuxtv-channels-list.c:1401
msgid "New group"
msgstr "新建组"
@@ -835,8 +1376,7 @@ msgstr ""
"SQLite 返回错误:\n"
"%s."
-#: ../src/freetuxtv-db-sync.c:317
-#: ../src/freetuxtv-db-sync.c:420
+#: ../src/freetuxtv-db-sync.c:317 ../src/freetuxtv-db-sync.c:420
#: ../src/freetuxtv-db-sync.c:1446
#, c-format
msgid ""
@@ -902,8 +1442,7 @@ msgstr ""
"SQLite 返回错误:\n"
"%s."
-#: ../src/freetuxtv-db-sync.c:669
-#: ../src/freetuxtv-db-sync.c:708
+#: ../src/freetuxtv-db-sync.c:669 ../src/freetuxtv-db-sync.c:708
#, c-format
msgid ""
"Error when getting the channel by name.\n"
@@ -916,8 +1455,7 @@ msgstr ""
"SQLite 返回错误:\n"
"%s."
-#: ../src/freetuxtv-db-sync.c:748
-#: ../src/freetuxtv-db-sync.c:991
+#: ../src/freetuxtv-db-sync.c:748 ../src/freetuxtv-db-sync.c:991
#: ../src/freetuxtv-db-sync.c:1014
#, c-format
msgid ""
@@ -931,8 +1469,7 @@ msgstr ""
"SQLite 返回错误:\n"
"%s."
-#: ../src/freetuxtv-db-sync.c:803
-#: ../src/freetuxtv-db-sync.c:837
+#: ../src/freetuxtv-db-sync.c:803 ../src/freetuxtv-db-sync.c:837
#, c-format
msgid ""
"Error when adding the group \"%s\" in database.\n"
@@ -945,8 +1482,7 @@ msgstr ""
"SQLite 返回错误:\n"
"%s."
-#: ../src/freetuxtv-db-sync.c:881
-#: ../src/freetuxtv-db-sync.c:922
+#: ../src/freetuxtv-db-sync.c:881 ../src/freetuxtv-db-sync.c:922
#: ../src/freetuxtv-db-sync.c:945
#, c-format
msgid ""
@@ -1012,8 +1548,7 @@ msgstr ""
"SQLite 返回错误:\n"
"%s."
-#: ../src/freetuxtv-db-sync.c:1184
-#: ../src/freetuxtv-db-sync.c:1220
+#: ../src/freetuxtv-db-sync.c:1184 ../src/freetuxtv-db-sync.c:1220
#, c-format
msgid ""
"Error when updating the channels of the group \"%s\".\n"
@@ -1185,7 +1720,7 @@ msgstr "%m/%d/%Y %H:%M"
msgid "Do you want to move the related file on the hard disk to the trash?"
msgstr "是否希望将硬盘上的相关文件移入回收站?"
-#: ../src/freetuxtv-tv-channels-list.c:67
+#: ../src/freetuxtv-tv-channels-list.c:69
#, c-format
msgid "Synchronizing the tv channels list"
msgstr "正在同步电视频道列表"
@@ -1225,113 +1760,142 @@ msgstr "%1.1f MB"
msgid "%1.1f GB"
msgstr "%1.1f GB"
-#: ../src/freetuxtv-window-add-channels-group.c:376
+#: ../src/freetuxtv-window-add-channels-group.c:395
#, c-format
msgid "Please select a least one group !"
msgstr "请至少选择一个组!"
-#: ../src/freetuxtv-window-add-channels-group.c:382
-#: ../src/freetuxtv-window-add-channels-group.c:530
-#: ../src/freetuxtv-window-add-channels-group.c:584
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
msgid "Adding channels groups"
msgstr "正在添加频道组"
#. Update progress dialog
-#: ../src/freetuxtv-window-add-channels-group.c:422
-#: ../src/freetuxtv-window-add-channels-group.c:466
-#: ../src/freetuxtv-window-add-channels-group.c:548
-#: ../src/freetuxtv-window-add-channels-group.c:592
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
#, c-format
msgid "Adding channels group: <i>%s</i>"
msgstr "正在添加频道组: <i>%s</i>"
-#: ../src/freetuxtv-window-add-channels-group.c:494
-#: ../src/freetuxtv-window-add-channels-group.c:561
-#: ../src/freetuxtv-window-add-channels-group.c:605
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
#, c-format
msgid "%d channels group(s) have been successfully added."
msgstr "%d 频道组已成功添加。"
-#: ../src/freetuxtv-window-add-channels-group.c:522
-#: ../src/freetuxtv-window-add-channels-group.c:579
-#: ../src/freetuxtv-window-main.c:1980
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
#, c-format
msgid "Please enter the group's name !"
msgstr "请输入组名!"
-#: ../src/freetuxtv-window-add-channels-group.c:525
-#: ../src/freetuxtv-window-main.c:1985
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
#, c-format
msgid "Please enter the group's URI !"
msgstr "请输入组 URI !"
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "更新电视频道列表(_U)"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, fuzzy, c-format
+msgid "Downloading the file '%s'"
+msgstr "正在获取文件: \"%s\""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+#, fuzzy
+msgid "Synchronizing TV channels from file"
+msgstr "正在同步电视频道列表"
+
#. Menu : FreetuxTV
-#: ../src/freetuxtv-window-main.c:277
+#: ../src/freetuxtv-window-main.c:278
msgid "_FreetuxTV"
msgstr "_FreetuxTV"
#. End Menu : FreetuxTV
#. Menu : Channels
-#: ../src/freetuxtv-window-main.c:298
+#: ../src/freetuxtv-window-main.c:299
msgid "_Channels"
msgstr "频道(_C)"
-#: ../src/freetuxtv-window-main.c:302
+#: ../src/freetuxtv-window-main.c:303
msgid "_Add a group"
msgstr "添加组(_A)"
-#: ../src/freetuxtv-window-main.c:308
-msgid "_Update TV channels list"
-msgstr "更新电视频道列表(_U)"
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:311
+#, fuzzy
+msgid "_Synchronize TV channels database"
+msgstr "正在同步电视频道列表"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
#. End Menu : Channels
#. Menu : Video
-#: ../src/freetuxtv-window-main.c:317
+#: ../src/freetuxtv-window-main.c:322
msgid "_Video"
msgstr "视频(_V)"
#. SubMenu : Deinterlace
-#: ../src/freetuxtv-window-main.c:322
+#: ../src/freetuxtv-window-main.c:327
msgid "_Deinterlace"
msgstr "反交错(_D)"
-#: ../src/freetuxtv-window-main.c:327
+#: ../src/freetuxtv-window-main.c:332
msgid "Disable"
msgstr "禁用"
-#: ../src/freetuxtv-window-main.c:339
+#: ../src/freetuxtv-window-main.c:344
msgid "Blend"
msgstr "混合"
-#: ../src/freetuxtv-window-main.c:348
+#: ../src/freetuxtv-window-main.c:353
msgid "Bob"
msgstr "摆动"
-#: ../src/freetuxtv-window-main.c:357
+#: ../src/freetuxtv-window-main.c:362
msgid "Discard"
msgstr "丢弃"
-#: ../src/freetuxtv-window-main.c:366
+#: ../src/freetuxtv-window-main.c:371
msgid "Linear"
msgstr "线性"
-#: ../src/freetuxtv-window-main.c:375
+#: ../src/freetuxtv-window-main.c:380
msgid "Mean"
msgstr "平均"
-#: ../src/freetuxtv-window-main.c:384
+#: ../src/freetuxtv-window-main.c:389
msgid "X"
msgstr "X"
#. End SubMenu : Deinterlace
#. End Menu : Video
#. Menu : Help
-#: ../src/freetuxtv-window-main.c:396
+#: ../src/freetuxtv-window-main.c:401
msgid "_Help"
msgstr "帮助(_H)"
#. Create the menu items
-#: ../src/freetuxtv-window-main.c:1024
+#: ../src/freetuxtv-window-main.c:1029
msgid "Mute"
msgstr "静音"
@@ -1355,54 +1919,64 @@ msgstr ""
msgid "An error occurred"
msgstr "出现错误"
-#: ../src/main.c:627
+#: ../src/main.c:607
+#, fuzzy, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "正在同步电视频道列表..."
+
+#: ../src/main.c:642
msgid "Initializing user configuration..."
msgstr "正在初始化用户配置..."
-#: ../src/main.c:634
+#: ../src/main.c:649
msgid "Loading user configuration..."
msgstr "正在载入用户配置..."
-#: ../src/main.c:693
+#: ../src/main.c:719
msgid "Synchronizing the list of tv channels..."
msgstr "正在同步电视频道列表..."
-#: ../src/main.c:726
+#: ../src/main.c:752
msgid "Loading the list of channels..."
msgstr "正在载入频道列表..."
-#: ../src/main.c:735
+#: ../src/main.c:761
msgid "Loading the list of recordings..."
msgstr "正在载入录像列表..."
-#: ../src/main.c:1051
-#: ../src/main.c:1247
+#: ../src/main.c:1080 ../src/main.c:1276
#, c-format
msgid "Playing: %s"
msgstr "正在播放: %s"
-#: ../src/main.c:1060
+#: ../src/main.c:1089
msgid "is playing"
msgstr "正在播放"
-#: ../src/main.c:1249
+#: ../src/main.c:1278
#, c-format
msgid "Stopping channel: %s"
msgstr "正在停止频道: %s"
-#: ../src/main.c:1293
+#: ../src/main.c:1322
msgid "is recording"
msgstr "正在录制"
-#: ../src/main.c:1340
+#: ../src/main.c:1369
#, c-format
msgid "Recording: %s"
msgstr "正在录制: %s"
-#: ../src/main.c:1465
+#: ../src/main.c:1494
msgid "Are you sure you want to quit?"
msgstr "您是否确定要退出?"
+#~ msgid "Modern Greek Web TV and Radio"
+#~ msgstr "现代希腊语网络电视与电台"
+
+#~ msgid "Web TV (Modern Greek)"
+#~ msgstr "网络电视 (现代希腊语)"
+
#~ msgid "60"
#~ msgstr "60"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 88c1d6f..bd14965 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,132 +8,116 @@ msgid ""
msgstr ""
"Project-Id-Version: freetuxtv 0.6.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
"PO-Revision-Date: 2011-11-25 10:59+0800\n"
"Last-Translator: Wei-Lun Chao <william.chao at ossii.com.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/ui/addrecording.glade.h:1
-msgid "<b>Recording period</b>"
-msgstr "<b>錄製時段</b>"
-
-#: ../data/ui/addrecording.glade.h:2
msgid "Add a recording"
msgstr "加入錄製"
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "所選頻道"
+
#: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr "時間:"
+msgid "Title:"
+msgstr "標題:"
#: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr "終止時間:"
+msgid "Start time:"
+msgstr "起始時間:"
#: ../data/ui/addrecording.glade.h:5
-msgid "Selected channel:"
-msgstr "所選頻道"
+msgid "Duration:"
+msgstr "時間:"
#: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr "起始時間:"
+msgid "End time:"
+msgstr "終止時間:"
#: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr "標題:"
-
-#: ../data/ui/addrecording.glade.h:8
msgid "minutes"
msgstr "分鐘"
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "<b>Processing of channels' name</b>"
-msgstr "<b>正在處理頻道名稱</b>"
-
-#: ../data/ui/addchannelsgroups.glade.h:2
-msgid "<b>Special group type:</b>"
-msgstr "<b>特殊群組類別:</b>"
+#: ../data/ui/addrecording.glade.h:8
+msgid "<b>Recording period</b>"
+msgstr "<b>錄製時段</b>"
-#: ../data/ui/addchannelsgroups.glade.h:3
+#: ../data/ui/addchannelsgroups.glade.h:1
msgid "Add a group"
msgstr "加入群組"
-#: ../data/ui/addchannelsgroups.glade.h:4
+#: ../data/ui/addchannelsgroups.glade.h:2
msgid "Channels groups file:"
msgstr "頻道群組檔案:"
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr "選擇希望加入的一個或多個頻道群組並點擊加入按鈕。"
+
#: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "自訂頻道群組"
+msgid "Languages/Channels group"
+msgstr "語言/頻道群組"
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr "刪除名稱前的這些文字:"
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "所需 ISP"
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
-msgstr "刪除名稱後的這些文字:"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
#: ../data/ui/addchannelsgroups.glade.h:8
msgid "Existing channels group"
msgstr "現有頻道群組"
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "收藏"
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
msgid "Group's name:"
msgstr "群組名稱:"
-#: ../data/ui/addchannelsgroups.glade.h:11
-msgid "Languages/Channels group"
-msgstr "語言/頻道群組"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
msgid "Name of the group which will be added"
msgstr "將加入的群組名稱"
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr "將加入群組的播放清單 URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
msgid "Playlist's URI:"
msgstr "播放清單 URI:"
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr "所需 ISP"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "將加入群組的播放清單 URI"
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
-msgstr "選擇希望加入的一個或多個頻道群組並點擊加入按鈕。"
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "刪除名稱前的這些文字:"
-#: ../data/ui/addchannelsgroups.glade.h:17
-msgid "Special group"
-msgstr "特殊群組"
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr "頻道名稱末尾必須刪除的文字或正規表示式"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "刪除名稱後的這些文字:"
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
msgid ""
"Text or regexp which must be deleted at the beginning of the channel's name"
msgstr "頻道名稱開頭必須刪除的文字或正規表示式"
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr "頻道名稱末尾必須刪除的文字或正規表示式"
-
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
msgid ""
"You can easily use regular expressions to delete some text in the channel's "
"name of the groupe. For example, if in your playlist, you have a name like "
@@ -144,645 +128,1203 @@ msgstr ""
"類似「11 - NT1」或「12 - NRJ 12」的名稱，FreetuxTV 可以使用正規表示式「[0-9]"
"* - 」移除名稱前的頻道號。"
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "<b>Processing of channels' name</b>"
+msgstr "<b>正在處理頻道名稱</b>"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "自訂頻道群組"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "收藏"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "<b>Special group type:</b>"
+msgstr "<b>特殊群組類別:</b>"
+
#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
-msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgid "Special group"
+msgstr "特殊群組"
#: ../data/ui/channelproperties.glade.h:1
-msgid "<b>Channel VLC options:</b>"
-msgstr "<b>頻道 VLC 選項:</b>"
-
-#: ../data/ui/channelproperties.glade.h:2
msgid "Channel properties"
msgstr "頻道屬性"
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "頻道名稱:"
+
#: ../data/ui/channelproperties.glade.h:3
msgid "Channel's URI:"
msgstr "頻道 URI:"
#: ../data/ui/channelproperties.glade.h:4
-msgid "Channel's name:"
-msgstr "頻道名稱:"
-
-#: ../data/ui/channelproperties.glade.h:5
-msgid "Deinterlacement:"
-msgstr "反交錯:"
+msgid "<b>Channel VLC options:</b>"
+msgstr "<b>頻道 VLC 選項:</b>"
-#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
msgid "General"
msgstr "一般"
-#: ../data/ui/channelproperties.glade.h:7
-msgid "Options"
-msgstr "選項"
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "反交錯:"
-#: ../data/ui/channelproperties.glade.h:8
-#: ../src/freetuxtv-window-channel-properties.c:175
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
msgid "none"
msgstr "無"
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "選項"
+
#: ../data/ui/freetuxtv.glade.h:1
-msgid " channels"
-msgstr " 頻道"
+msgid "GNU General Public License v3"
+msgstr "GNU 通用公共授權許可 第三版"
#: ../data/ui/freetuxtv.glade.h:2
-msgid "+"
-msgstr "+"
+msgid "Web TV channels player"
+msgstr "網路電視頻道播放器"
#: ../data/ui/freetuxtv.glade.h:3
-msgid "-"
-msgstr "-"
-
-#: ../data/ui/freetuxtv.glade.h:4
-msgid "0"
-msgstr "0"
+msgid "Project's Web Site"
+msgstr "項目網站"
+#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:5
-msgid "00:00:00"
-msgstr "00:00:00"
+msgid "translator-credits"
+msgstr ""
+"Dean Lee <xslidian+freetuxtv at gmail.com>\n"
+"趙惟倫 <william.chao at ossii.com.tw>"
#: ../data/ui/freetuxtv.glade.h:6
-msgid "<b>Configuration file (vlcrc)</b>"
-msgstr "<b>配置檔案 (vlcrc)</b>"
-
-#: ../data/ui/freetuxtv.glade.h:7
-msgid "<b>Connection</b>"
-msgstr "<b>連接</b>"
-
-#: ../data/ui/freetuxtv.glade.h:8
-msgid "<b>Destination</b>"
-msgstr "<b>目標</b>"
-
-#: ../data/ui/freetuxtv.glade.h:9
-msgid "<b>Notifications</b>"
-msgstr "<b>通知</b>"
-
-#: ../data/ui/freetuxtv.glade.h:11
-msgid "<b>Proxy</b>"
-msgstr "<b>代理</b>"
-
-#: ../data/ui/freetuxtv.glade.h:12
-msgid "<b>Search of channels</b>"
-msgstr "<b>搜尋頻道</b>"
-
-#: ../data/ui/freetuxtv.glade.h:13
-msgid "<b>Startup</b>"
-msgstr "<b>啟動</b>"
-
-#: ../data/ui/freetuxtv.glade.h:14
-msgid "<b>Transcoding options</b>"
-msgstr "<b>轉碼選項</b>"
-
-#: ../data/ui/freetuxtv.glade.h:15
-msgid "<i>Restart the application after changing this option.</i>"
-msgstr "<i>變更此選項後請重新啟動程式。</i>"
-
-#: ../data/ui/freetuxtv.glade.h:16
-msgid "Activate/Deactivate the window always on top"
-msgstr "啟用/停用視窗總在最上層"
-
-#: ../data/ui/freetuxtv.glade.h:17
-msgid "Channels"
-msgstr "頻道"
+msgid "Group properties"
+msgstr "群組屬性"
#: ../data/ui/freetuxtv.glade.h:18
-msgid "Channels' search text area"
-msgstr "頻道搜尋文字欄位"
+msgid "Number of channels:"
+msgstr "頻道數:"
#: ../data/ui/freetuxtv.glade.h:19
-msgid "Delete the search text area"
-msgstr "刪除搜尋文字欄位"
+msgid "0"
+msgstr "0"
-#: ../data/ui/freetuxtv.glade.h:22
+#: ../data/ui/freetuxtv.glade.h:20
msgid "Details"
msgstr "詳細資訊"
+#: ../data/ui/freetuxtv.glade.h:21
+msgid "View file"
+msgstr "檢視檔案"
+
+#: ../data/ui/freetuxtv.glade.h:22
+msgid "Preferences"
+msgstr "偏好設定"
+
#: ../data/ui/freetuxtv.glade.h:23
-msgid "Directory Record:"
-msgstr "錄製目錄:"
+msgid "Play last channel on startup"
+msgstr "啟動時播放上次播放的頻道"
#: ../data/ui/freetuxtv.glade.h:24
-msgid "Download timeout (seconds) :"
-msgstr "下載逾時 (秒) :"
+msgid "<b>Startup</b>"
+msgstr "<b>啟動</b>"
#: ../data/ui/freetuxtv.glade.h:25
msgid "Enable desktop notifications"
msgstr "啟用桌面通知"
#: ../data/ui/freetuxtv.glade.h:26
-msgid "Format:"
-msgstr "格式:"
+msgid "<b>Notifications</b>"
+msgstr "<b>通知</b>"
-#: ../data/ui/freetuxtv.glade.h:27 ../data/menu/freetuxtv.desktop.in.h:1
-msgid "FreetuxTV"
-msgstr "FreetuxTV"
+#: ../data/ui/freetuxtv.glade.h:27
+msgid "Ignore diacritics"
+msgstr "忽略變音符"
#: ../data/ui/freetuxtv.glade.h:28
-msgid "Fullscreen mode"
-msgstr "全螢幕模式"
+msgid "<b>Search of channels</b>"
+msgstr "<b>搜尋頻道</b>"
#: ../data/ui/freetuxtv.glade.h:29
-msgid "GNU General Public License v3"
-msgstr "GNU 通用公共授權許可 第三版"
+msgid "None"
+msgstr "無"
+
+#: ../data/ui/freetuxtv.glade.h:30
+msgid "Use a custom configuration file"
+msgstr "使用自訂配置檔案"
#: ../data/ui/freetuxtv.glade.h:31
-msgid "Go back to the normal mode"
-msgstr "回傳一般模式"
+msgid "Use the VLC configuration file"
+msgstr "使用 VLC 配置檔案"
#: ../data/ui/freetuxtv.glade.h:32
-msgid "Go to the current channel playing"
-msgstr "轉到目前正在播放的頻道"
+msgid "<i>Restart the application after changing this option.</i>"
+msgstr "<i>變更此選項後請重新啟動程式。</i>"
#: ../data/ui/freetuxtv.glade.h:33
-msgid "Group properties"
-msgstr "群組屬性"
+msgid "<b>Configuration file (vlcrc)</b>"
+msgstr "<b>配置檔案 (vlcrc)</b>"
-#: ../data/ui/freetuxtv.glade.h:35
-msgid "HTTP"
-msgstr "HTTP"
+#: ../data/ui/freetuxtv.glade.h:34
+msgid "LibVLC"
+msgstr "LibVLC"
+
+#: ../data/ui/freetuxtv.glade.h:35
+msgid "Directory Record:"
+msgstr "錄製目錄:"
#: ../data/ui/freetuxtv.glade.h:36
-msgid "Ignore diacritics"
-msgstr "忽略變音符"
+msgid "Select a directory"
+msgstr "選擇目錄"
#: ../data/ui/freetuxtv.glade.h:37
-msgid "In progress"
-msgstr "正在進行"
+msgid "<b>Destination</b>"
+msgstr "<b>目標</b>"
#: ../data/ui/freetuxtv.glade.h:38
-msgid "Jump to current channel"
-msgstr "跳至目前頻道"
+msgid "No transcoding"
+msgstr "無轉碼"
#: ../data/ui/freetuxtv.glade.h:39
-msgid "LibVLC"
-msgstr "LibVLC"
+msgid "Predefined transcoding formats"
+msgstr "預定義的轉碼格式"
#: ../data/ui/freetuxtv.glade.h:40
-msgid "Manual proxy configuration"
-msgstr "手動配置代理"
+msgid "Format:"
+msgstr "格式:"
+
+#: ../data/ui/freetuxtv.glade.h:41
+msgid "<b>Transcoding options</b>"
+msgstr "<b>轉碼選項</b>"
#: ../data/ui/freetuxtv.glade.h:42
-msgid "Network"
-msgstr "網路"
+msgid "Recordings"
+msgstr "錄影"
#: ../data/ui/freetuxtv.glade.h:43
-msgid "Next channel"
-msgstr "下一頻道"
+msgid "Download timeout (seconds) :"
+msgstr "下載逾時 (秒) :"
#: ../data/ui/freetuxtv.glade.h:44
-msgid "No proxy"
-msgstr "無代理"
+msgid "<b>Connection</b>"
+msgstr "<b>連接</b>"
#: ../data/ui/freetuxtv.glade.h:45
-msgid "No transcoding"
-msgstr "無轉碼"
+msgid "No proxy"
+msgstr "無代理"
#: ../data/ui/freetuxtv.glade.h:46
-msgid "None"
-msgstr "無"
+msgid "Manual proxy configuration"
+msgstr "手動配置代理"
#: ../data/ui/freetuxtv.glade.h:47
-msgid "Number of channels:"
-msgstr "頻道數:"
+msgid "Proxy server:"
+msgstr "代理伺服器:"
#: ../data/ui/freetuxtv.glade.h:48
-msgid "Password:"
-msgstr "密碼:"
+msgid "Proxy port:"
+msgstr "代理連接埠:"
#: ../data/ui/freetuxtv.glade.h:49
-msgid "Play last channel on startup"
-msgstr "啟動時播放上次播放的頻道"
+msgid "Proxy type:"
+msgstr "代理類型:"
#: ../data/ui/freetuxtv.glade.h:50
-msgid "Play the current channel"
-msgstr "播放目前頻道"
+msgid "Use authentification"
+msgstr "使用身分認證"
+
+#: ../data/ui/freetuxtv.glade.h:51
+msgid "Username:"
+msgstr "使用者名稱:"
+
+#: ../data/ui/freetuxtv.glade.h:52
+msgid "Password:"
+msgstr "密碼:"
#: ../data/ui/freetuxtv.glade.h:53
-msgid "Predefined transcoding formats"
-msgstr "預定義的轉碼格式"
+msgid "<b>Proxy</b>"
+msgstr "<b>代理</b>"
#: ../data/ui/freetuxtv.glade.h:54
-msgid "Preferences"
-msgstr "偏好設定"
+msgid "Network"
+msgstr "網路"
#: ../data/ui/freetuxtv.glade.h:55
-msgid "Previous channel"
-msgstr "上一頻道"
+msgid "HTTP"
+msgstr "HTTP"
#: ../data/ui/freetuxtv.glade.h:56
-msgid "Project's Web Site"
-msgstr "項目網站"
+msgid "SOCKS"
+msgstr "SOCKS"
#: ../data/ui/freetuxtv.glade.h:57
-msgid "Proxy port:"
-msgstr "代理連接埠:"
+msgid "Video - Theora + Vorbis (OGG)"
+msgstr "視訊 - Theora + Vorbis (OGG)"
#: ../data/ui/freetuxtv.glade.h:58
-msgid "Proxy server:"
-msgstr "代理伺服器:"
+msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
#: ../data/ui/freetuxtv.glade.h:59
-msgid "Proxy type:"
-msgstr "代理類型:"
+msgid "ogg"
+msgstr "ogg"
#: ../data/ui/freetuxtv.glade.h:60
-msgid "Record the current channel"
-msgstr "錄製目前頻道"
+msgid "Video - H.264 + MPGA (MP4)"
+msgstr "視訊 - H.264 + MPGA (MP4)"
#: ../data/ui/freetuxtv.glade.h:61
-msgid "Recordings"
-msgstr "錄影"
+msgid ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
+msgstr ""
+"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
+"channels=2"
#: ../data/ui/freetuxtv.glade.h:62
-msgid "SOCKS"
-msgstr "SOCKS"
+msgid "mp4"
+msgstr "mp4"
#: ../data/ui/freetuxtv.glade.h:63
-msgid "Search:"
-msgstr "搜尋:"
+msgid "Video - MPEG-2 + MPGA (TS)"
+msgstr "視訊 - MPEG-2 + MPGA (TS)"
#: ../data/ui/freetuxtv.glade.h:64
-msgid "Select a directory"
-msgstr "選擇目錄"
+msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
#: ../data/ui/freetuxtv.glade.h:65
-msgid "Small mode"
-msgstr "最簡模式"
+msgid "ts"
+msgstr "ts"
-#: ../data/ui/freetuxtv.glade.h:66
-msgid "Stop playing the current channel"
-msgstr "停止播放目前頻道"
+#: ../data/ui/freetuxtv.glade.h:66 ../data/menu/freetuxtv.desktop.in.h:1
+msgid "FreetuxTV"
+msgstr "FreetuxTV"
#: ../data/ui/freetuxtv.glade.h:67
-msgid "Terminated"
-msgstr "已終止"
+msgid "Search:"
+msgstr "搜尋:"
+
+#: ../data/ui/freetuxtv.glade.h:68
+msgid "Channels' search text area"
+msgstr "頻道搜尋文字欄位"
+
+#: ../data/ui/freetuxtv.glade.h:69
+msgid "Delete the search text area"
+msgstr "刪除搜尋文字欄位"
#: ../data/ui/freetuxtv.glade.h:70
-msgid "Use a custom configuration file"
-msgstr "使用自訂配置檔案"
+msgid "Jump to current channel"
+msgstr "跳至目前頻道"
#: ../data/ui/freetuxtv.glade.h:71
-msgid "Use authentification"
-msgstr "使用身分認證"
+msgid "Go to the current channel playing"
+msgstr "轉到目前正在播放的頻道"
#: ../data/ui/freetuxtv.glade.h:72
-msgid "Use the VLC configuration file"
-msgstr "使用 VLC 配置檔案"
+msgid "Channels"
+msgstr "頻道"
#: ../data/ui/freetuxtv.glade.h:73
-msgid "Username:"
-msgstr "使用者名稱:"
+msgid "In progress"
+msgstr "正在進行"
#: ../data/ui/freetuxtv.glade.h:74
-msgid "Video - H.264 + MPGA (MP4)"
-msgstr "視訊 - H.264 + MPGA (MP4)"
+msgid "Terminated"
+msgstr "已終止"
#: ../data/ui/freetuxtv.glade.h:75
-msgid "Video - MPEG-2 + MPGA (TS)"
-msgstr "視訊 - MPEG-2 + MPGA (TS)"
+msgid "00:00:00"
+msgstr "00:00:00"
#: ../data/ui/freetuxtv.glade.h:76
-msgid "Video - Theora + Vorbis (OGG)"
-msgstr "視訊 - Theora + Vorbis (OGG)"
+msgid "Previous channel"
+msgstr "上一頻道"
#: ../data/ui/freetuxtv.glade.h:77
-msgid "View file"
-msgstr "檢視檔案"
+msgid "Play the current channel"
+msgstr "播放目前頻道"
#: ../data/ui/freetuxtv.glade.h:78
-msgid "Vol:"
-msgstr "音量:"
+msgid "Stop playing the current channel"
+msgstr "停止播放目前頻道"
#: ../data/ui/freetuxtv.glade.h:79
-msgid "Web TV channels player"
-msgstr "網路電視頻道播放器"
+msgid "Record the current channel"
+msgstr "錄製目前頻道"
+
+#: ../data/ui/freetuxtv.glade.h:80
+msgid "Next channel"
+msgstr "下一頻道"
#: ../data/ui/freetuxtv.glade.h:81
-msgid "mp4"
-msgstr "mp4"
+msgid "Vol:"
+msgstr "音量:"
#: ../data/ui/freetuxtv.glade.h:82
-msgid "ogg"
-msgstr "ogg"
+msgid "-"
+msgstr "-"
+
+#: ../data/ui/freetuxtv.glade.h:83
+msgid "+"
+msgstr "+"
-#. TRANSLATORS: Replace this string with your names, one name per line.
#: ../data/ui/freetuxtv.glade.h:84
-msgid "translator-credits"
-msgstr ""
-"Dean Lee <xslidian+freetuxtv at gmail.com>\n"
-"趙惟倫 <william.chao at ossii.com.tw>"
+msgid "Fullscreen mode"
+msgstr "全螢幕模式"
#: ../data/ui/freetuxtv.glade.h:85
-msgid "ts"
-msgstr "ts"
+msgid "Small mode"
+msgstr "最簡模式"
#: ../data/ui/freetuxtv.glade.h:86
-msgid ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
-msgstr ""
-"vcodec=h264,vb=768,width=368,height=208,fps=29.97,acodec=mpga,ab=64,"
-"channels=2"
+msgid " channels"
+msgstr " 頻道"
#: ../data/ui/freetuxtv.glade.h:87
-msgid "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
-msgstr "vcodec=mp2v,vb=800,scale=1,acodec=mpga,ab=128,channels=2"
+msgid "Go back to the normal mode"
+msgstr "回傳一般模式"
#: ../data/ui/freetuxtv.glade.h:88
-msgid "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
-msgstr "vcodec=theo,vb=800,scale=1,acodec=vorb,ab=128,channels=2"
+msgid "Activate/Deactivate the window always on top"
+msgstr "啟用/停用視窗總在最上層"
#: ../data/channels_groups.xml.in.h:1
msgid "Alice (Unofficial)"
msgstr "Alice (非官方)"
#: ../data/channels_groups.xml.in.h:2
-msgid "Arabic Web TV and Radio"
-msgstr "阿拉伯語網路電視與電台"
+msgid "SFR TV (Unofficial)"
+msgstr "SFR TV (非官方)"
#: ../data/channels_groups.xml.in.h:3
-msgid "Catalan Web TV and Radio"
-msgstr "加泰羅尼亞語網路電視與電台"
+#, fuzzy
+msgid "Afrikaans Web TV and Radio"
+msgstr "波斯語網路電視與電台"
#: ../data/channels_groups.xml.in.h:4
-msgid "Chinese Web TV and Radio"
-msgstr "漢語網路電視與電台"
+#, fuzzy
+msgid "Web TV (Afrikaans)"
+msgstr "網路電視 (波斯語)"
#: ../data/channels_groups.xml.in.h:5
-msgid "Czech Web TV and Radio"
-msgstr "捷克語網路電視與電台"
+#, fuzzy
+msgid "Albanian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
#: ../data/channels_groups.xml.in.h:6
-msgid "Dutch Web TV and Radio"
-msgstr "荷蘭語網路電視與電台"
+#, fuzzy
+msgid "Web TV (Albanian)"
+msgstr "網路電視 (羅馬尼亞語)"
#: ../data/channels_groups.xml.in.h:7
-msgid "English Web TV and Radio"
-msgstr "英語網路電視與電台"
+#, fuzzy
+msgid "Amharic Web TV and Radio"
+msgstr "阿拉伯語網路電視與電台"
#: ../data/channels_groups.xml.in.h:8
-msgid "French Web TV and Radio"
-msgstr "法語網路電視與電台"
+#, fuzzy
+msgid "Web TV (Amharic)"
+msgstr "網路電視 (阿拉伯語)"
#: ../data/channels_groups.xml.in.h:9
-msgid "German Web TV and Radio"
-msgstr "德語網路電視與電台"
+msgid "Arabic Web TV and Radio"
+msgstr "阿拉伯語網路電視與電台"
#: ../data/channels_groups.xml.in.h:10
-msgid "Greek Web TV and Radio"
-msgstr "希臘語網路電視與電台"
+msgid "Web TV (Arabic)"
+msgstr "網路電視 (阿拉伯語)"
#: ../data/channels_groups.xml.in.h:11
-msgid "Hungarian Web TV and Radio"
-msgstr "匈牙利語網路電視與電台"
+msgid "Web Radio (Arabic)"
+msgstr "網路電台 (阿拉伯語)"
#: ../data/channels_groups.xml.in.h:12
-msgid "Italian Web TV and Radio"
-msgstr "義大利語網路電視與電台"
+#, fuzzy
+msgid "Web Cam (Arabic)"
+msgstr "網路電視 (阿拉伯語)"
#: ../data/channels_groups.xml.in.h:13
+#, fuzzy
+msgid "Armenian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:14
+#, fuzzy
+msgid "Web TV (Armenian)"
+msgstr "網路電視 (羅馬尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:15
+#, fuzzy
+msgid "Azerbaijani Web TV and Radio"
+msgstr "波斯語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:16
+#, fuzzy
+msgid "Web TV (Azerbaijani)"
+msgstr "網路電視 (波斯語)"
+
+#: ../data/channels_groups.xml.in.h:17
+#, fuzzy
+msgid "Bengali/Bangla Web TV and Radio"
+msgstr "匈牙利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:18
+#, fuzzy
+msgid "Web TV (Bengali/Bangla)"
+msgstr "網路電視 (匈牙利語)"
+
+#: ../data/channels_groups.xml.in.h:19
+#, fuzzy
+msgid "Bulgarian Web TV and Radio"
+msgstr "匈牙利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:20
+#, fuzzy
+msgid "Web TV (Bulgarian)"
+msgstr "網路電視 (匈牙利語)"
+
+#: ../data/channels_groups.xml.in.h:21
+#, fuzzy
+msgid "Cambodian Web TV and Radio"
+msgstr "義大利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:22
+#, fuzzy
+msgid "Web TV (Cambodian)"
+msgstr "網路電視 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:23
+msgid "Catalan Web TV and Radio"
+msgstr "加泰羅尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:24
+msgid "Web TV (Catalan)"
+msgstr "網路電視 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:25
+msgid "Web Radio (Catalan)"
+msgstr "網路電台 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:26
+msgid "Chinese Web TV and Radio"
+msgstr "漢語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:27
+msgid "Web TV (Chinese)"
+msgstr "網路電視 (漢語)"
+
+#: ../data/channels_groups.xml.in.h:28
+msgid "Web Radio (Chinese)"
+msgstr "網路電台 (漢語)"
+
+#: ../data/channels_groups.xml.in.h:29
+#, fuzzy
+msgid "Croatian Web TV and Radio"
+msgstr "加泰羅尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:30
+#, fuzzy
+msgid "Web TV (Croatian)"
+msgstr "網路電視 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:31
+#, fuzzy
+msgid "Web Radio (Croatian)"
+msgstr "網路電台 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:32
+msgid "Czech Web TV and Radio"
+msgstr "捷克語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:33
+msgid "Web TV (Czech)"
+msgstr "網路電視 (捷克語)"
+
+#: ../data/channels_groups.xml.in.h:34
+#, fuzzy
+msgid "Web Radio (Czech)"
+msgstr "網路電台 (法語)"
+
+#: ../data/channels_groups.xml.in.h:35
+#, fuzzy
+msgid "Danish Web TV and Radio"
+msgstr "西班牙語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:36
+#, fuzzy
+msgid "Web TV (Danish)"
+msgstr "網路電視 (西班牙語)"
+
+#: ../data/channels_groups.xml.in.h:37
+msgid "Dutch Web TV and Radio"
+msgstr "荷蘭語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:38
+msgid "Web TV (Dutch)"
+msgstr "網路電視 (荷蘭語)"
+
+#: ../data/channels_groups.xml.in.h:39
+#, fuzzy
+msgid "Web Radio (Dutch)"
+msgstr "網路電台 (法語)"
+
+#: ../data/channels_groups.xml.in.h:40
+#, fuzzy
+msgid "Web Cam (Dutch)"
+msgstr "網路電視 (荷蘭語)"
+
+#: ../data/channels_groups.xml.in.h:41
+msgid "English Web TV and Radio"
+msgstr "英語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:42
+msgid "Web TV (English)"
+msgstr "網路電視 (英語)"
+
+#: ../data/channels_groups.xml.in.h:43
+msgid "Web Radio (English)"
+msgstr "網路電台 (英語)"
+
+#: ../data/channels_groups.xml.in.h:44
+msgid "Web Programmes (English)"
+msgstr "網路節目 (英語)"
+
+#: ../data/channels_groups.xml.in.h:45
+#, fuzzy
+msgid "Web Cam (English)"
+msgstr "網路電視 (英語)"
+
+#: ../data/channels_groups.xml.in.h:46
+#, fuzzy
+msgid "Estonian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:47
+#, fuzzy
+msgid "Web TV (Estonian)"
+msgstr "網路電視 (羅馬尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:48
+#, fuzzy
+msgid "Finnish Web TV and Radio"
+msgstr "西班牙語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:49
+#, fuzzy
+msgid "Web TV (Finnish)"
+msgstr "網路電視 (西班牙語)"
+
+#: ../data/channels_groups.xml.in.h:50
+msgid "French Web TV and Radio"
+msgstr "法語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:51
+msgid "Web TV (French)"
+msgstr "網路電視 (法語)"
+
+#: ../data/channels_groups.xml.in.h:52
+msgid "Web Radio (French)"
+msgstr "網路電台 (法語)"
+
+#: ../data/channels_groups.xml.in.h:53
+msgid "Web Programmes (French)"
+msgstr "網路節目 (法語)"
+
+#: ../data/channels_groups.xml.in.h:54
+#, fuzzy
+msgid "Georgian Web TV and Radio"
+msgstr "德語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:55
+#, fuzzy
+msgid "Web TV (Georgian)"
+msgstr "網路電視 (德語)"
+
+#: ../data/channels_groups.xml.in.h:56
+msgid "German Web TV and Radio"
+msgstr "德語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:57
+msgid "Web TV (German)"
+msgstr "網路電視 (德語)"
+
+#: ../data/channels_groups.xml.in.h:58
+msgid "Web Radio (German)"
+msgstr "網路電台 (德語)"
+
+#: ../data/channels_groups.xml.in.h:59
+msgid "Greek Web TV and Radio"
+msgstr "希臘語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:60
+msgid "Web TV (Greek)"
+msgstr "網路電視 (希臘語)"
+
+#: ../data/channels_groups.xml.in.h:61
+#, fuzzy
+msgid "Web Radio (Greek)"
+msgstr "網路電台 (德語)"
+
+#: ../data/channels_groups.xml.in.h:62
+#, fuzzy
+msgid "Hebrew Web TV and Radio"
+msgstr "希臘語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:63
+#, fuzzy
+msgid "Web TV (Hebrew)"
+msgstr "網路電視 (希臘語)"
+
+#: ../data/channels_groups.xml.in.h:64
+#, fuzzy
+msgid "Web Radio (Hebrew)"
+msgstr "網路電台 (法語)"
+
+#: ../data/channels_groups.xml.in.h:65
+#, fuzzy
+msgid "Web Cam (Hebrew)"
+msgstr "網路電視 (希臘語)"
+
+#: ../data/channels_groups.xml.in.h:66
+#, fuzzy
+msgid "Hindi Web TV and Radio"
+msgstr "拉丁語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:67
+#, fuzzy
+msgid "Web TV (Hindi)"
+msgstr "網路電視 (拉丁語)"
+
+#: ../data/channels_groups.xml.in.h:68
+#, fuzzy
+msgid "Web Radio (Hindi)"
+msgstr "網路電台 (漢語)"
+
+#: ../data/channels_groups.xml.in.h:69
+msgid "Hungarian Web TV and Radio"
+msgstr "匈牙利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:70
+msgid "Web TV (Hungarian)"
+msgstr "網路電視 (匈牙利語)"
+
+#: ../data/channels_groups.xml.in.h:71
+#, fuzzy
+msgid "Icelandic Web TV and Radio"
+msgstr "義大利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:72
+#, fuzzy
+msgid "Web TV (Icelandic)"
+msgstr "網路電視 (義大利語)"
+
+#: ../data/channels_groups.xml.in.h:73
+#, fuzzy
+msgid "Indonesian Web TV and Radio"
+msgstr "波斯語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:74
+#, fuzzy
+msgid "Web TV (Indonesian)"
+msgstr "網路電視 (波斯語)"
+
+#: ../data/channels_groups.xml.in.h:75
+#, fuzzy
+msgid "Interlingua Web TV and Radio"
+msgstr "義大利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:76
+#, fuzzy
+msgid "Web Radio (Interlingua)"
+msgstr "網路電台 (義大利語)"
+
+#: ../data/channels_groups.xml.in.h:77
+#, fuzzy
+msgid "Irish Web TV and Radio"
+msgstr "土耳其語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:78
+#, fuzzy
+msgid "Web TV (Irish)"
+msgstr "網路電視 (土耳其語)"
+
+#: ../data/channels_groups.xml.in.h:79
+#, fuzzy
+msgid "Web Radio (Irish)"
+msgstr "網路電台 (英語)"
+
+#: ../data/channels_groups.xml.in.h:80
+msgid "Italian Web TV and Radio"
+msgstr "義大利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:81
+msgid "Web TV (Italian)"
+msgstr "網路電視 (義大利語)"
+
+#: ../data/channels_groups.xml.in.h:82
+msgid "Web Radio (Italian)"
+msgstr "網路電台 (義大利語)"
+
+#: ../data/channels_groups.xml.in.h:83
msgid "Japanese Web TV and Radio"
msgstr "日語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:14
+#: ../data/channels_groups.xml.in.h:84
+msgid "Web TV (Japanese)"
+msgstr "網路電視 (日語)"
+
+#: ../data/channels_groups.xml.in.h:85
+#, fuzzy
+msgid "Web Radio (Japanese)"
+msgstr "網路電台 (漢語)"
+
+#: ../data/channels_groups.xml.in.h:86
+#, fuzzy
+msgid "Web Cam (Japanese)"
+msgstr "網路電視 (日語)"
+
+#: ../data/channels_groups.xml.in.h:87
+#, fuzzy
+msgid "Kazakh Web TV and Radio"
+msgstr "捷克語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:88
+#, fuzzy
+msgid "Web TV (Kazakh)"
+msgstr "網路電視 (捷克語)"
+
+#: ../data/channels_groups.xml.in.h:89
msgid "Korean Web TV and Radio"
msgstr "韓語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:15
+#: ../data/channels_groups.xml.in.h:90
+msgid "Web TV (Korean)"
+msgstr "網路電視 (韓語)"
+
+#: ../data/channels_groups.xml.in.h:91
+#, fuzzy
+msgid "Kurdish Web TV and Radio"
+msgstr "土耳其語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:92
+#, fuzzy
+msgid "Web TV (Kurdish)"
+msgstr "網路電視 (土耳其語)"
+
+#: ../data/channels_groups.xml.in.h:93
msgid "Latin Web TV and Radio"
msgstr "拉丁語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:16
-msgid "Modern Greek Web TV and Radio"
-msgstr "現代希臘語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:94
+msgid "Web TV (Latin)"
+msgstr "網路電視 (拉丁語)"
-#: ../data/channels_groups.xml.in.h:17
-msgid "No lang Web TV and Radio"
-msgstr "無語言網路電視與電台"
+#: ../data/channels_groups.xml.in.h:95
+#, fuzzy
+msgid "Latvian/Lettish Web TV and Radio"
+msgstr "拉丁語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:18
+#: ../data/channels_groups.xml.in.h:96
+#, fuzzy
+msgid "Web TV (Latvian/Lettish)"
+msgstr "網路電視 (拉丁語)"
+
+#: ../data/channels_groups.xml.in.h:97
+#, fuzzy
+msgid "Lithuanian Web TV and Radio"
+msgstr "義大利語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:98
+#, fuzzy
+msgid "Web TV (Lithuanian)"
+msgstr "網路電視 (義大利語)"
+
+#: ../data/channels_groups.xml.in.h:99
+#, fuzzy
+msgid "Macedonian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:100
+#, fuzzy
+msgid "Web TV (Macedonian)"
+msgstr "網路電視 (羅馬尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:101
+#, fuzzy
+msgid "Web Radio (Macedonian)"
+msgstr "網路電台 (義大利語)"
+
+#: ../data/channels_groups.xml.in.h:102
+#, fuzzy
+msgid "Malay Web TV and Radio"
+msgstr "加泰羅尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:103
+#, fuzzy
+msgid "Web TV (Malay)"
+msgstr "網路電視 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:104
+#, fuzzy
+msgid "Malayalam Web TV and Radio"
+msgstr "加泰羅尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:105
+#, fuzzy
+msgid "Web TV (Malayalam)"
+msgstr "網路電視 (加泰羅尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:106
+#, fuzzy
+msgid "Maltese Web TV and Radio"
+msgstr "日語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:107
+#, fuzzy
+msgid "Web TV (Maltese)"
+msgstr "網路電視 (日語)"
+
+#: ../data/channels_groups.xml.in.h:108
+#, fuzzy
+msgid "Web Radio (Maltese)"
+msgstr "網路電台 (漢語)"
+
+#: ../data/channels_groups.xml.in.h:109
+#, fuzzy
+msgid "Moldavian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:110
+#, fuzzy
+msgid "Web TV (Moldavian)"
+msgstr "網路電視 (羅馬尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:111
+#, fuzzy
+msgid "Mongolian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:112
+#, fuzzy
+msgid "Web TV (Mongolian)"
+msgstr "網路電視 (羅馬尼亞語)"
+
+#: ../data/channels_groups.xml.in.h:113
msgid "Norwegian Web TV and Radio"
msgstr "挪威語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:19
+#: ../data/channels_groups.xml.in.h:114
+msgid "Web TV (Norwegian)"
+msgstr "網路電視 (挪威語)"
+
+#: ../data/channels_groups.xml.in.h:115
msgid "Persian Web TV and Radio"
msgstr "波斯語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:20
+#: ../data/channels_groups.xml.in.h:116
+msgid "Web TV (Persian)"
+msgstr "網路電視 (波斯語)"
+
+#: ../data/channels_groups.xml.in.h:117
msgid "Polish Web TV and Radio"
msgstr "波蘭語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:21
+#: ../data/channels_groups.xml.in.h:118
+msgid "Web TV (Polish)"
+msgstr "網路電視 (波蘭語)"
+
+#: ../data/channels_groups.xml.in.h:119
+#, fuzzy
+msgid "Web Radio (Polish)"
+msgstr "網路電台 (英語)"
+
+#: ../data/channels_groups.xml.in.h:120
+#, fuzzy
+msgid "Web Cam (Polish)"
+msgstr "網路電視 (波蘭語)"
+
+#: ../data/channels_groups.xml.in.h:121
msgid "Portuguese Web TV and Radio"
msgstr "葡萄牙語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:22
+#: ../data/channels_groups.xml.in.h:122
+msgid "Web TV (Portuguese)"
+msgstr "網路電視 (葡萄牙語)"
+
+#: ../data/channels_groups.xml.in.h:123
+#, fuzzy
+msgid "Web Radio (Portuguese)"
+msgstr "網路電視 (葡萄牙語)"
+
+#: ../data/channels_groups.xml.in.h:124
+#, fuzzy
+msgid "Punjabi Web TV and Radio"
+msgstr "阿拉伯語網路電視與電台"
+
+#: ../data/channels_groups.xml.in.h:125
+#, fuzzy
+msgid "Web TV (Punjabi)"
+msgstr "網路電視 (阿拉伯語)"
+
+#: ../data/channels_groups.xml.in.h:126
msgid "Romanian Web TV and Radio"
msgstr "羅馬尼亞語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:23
-msgid "Russian Web TV and Radio"
-msgstr "俄語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:127
+msgid "Web TV (Romanian)"
+msgstr "網路電視 (羅馬尼亞語)"
-#: ../data/channels_groups.xml.in.h:24
-msgid "SFR TV (Unofficial)"
-msgstr "SFR TV (非官方)"
+#: ../data/channels_groups.xml.in.h:128
+#, fuzzy
+msgid "Web Radio (Romanian)"
+msgstr "網路電台 (俄語)"
-#: ../data/channels_groups.xml.in.h:25
-msgid "Slovak Web TV and Radio"
-msgstr "斯洛伐克語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:129
+msgid "Russian Web TV and Radio"
+msgstr "俄語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:26
-msgid "Spanish Web TV and Radio"
-msgstr "西班牙語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:130
+msgid "Web TV (Russian)"
+msgstr "網路電視 (俄語)"
-#: ../data/channels_groups.xml.in.h:27
-msgid "Swedish Web TV and Radio"
-msgstr "瑞典語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:131
+msgid "Web Radio (Russian)"
+msgstr "網路電台 (俄語)"
-#: ../data/channels_groups.xml.in.h:28
-msgid "Thai Web TV and Radio"
-msgstr "泰語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:132
+#, fuzzy
+msgid "Serbian Web TV and Radio"
+msgstr "波斯語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:29
-msgid "Turkish Web TV and Radio"
-msgstr "土耳其語網路電視與電台"
+#: ../data/channels_groups.xml.in.h:133
+#, fuzzy
+msgid "Web TV (Serbian)"
+msgstr "網路電視 (波斯語)"
-#: ../data/channels_groups.xml.in.h:30
-msgid "Web Programmes (English)"
-msgstr "網路節目 (英語)"
+#: ../data/channels_groups.xml.in.h:134
+#, fuzzy
+msgid "Web Radio (Serbian)"
+msgstr "網路電台 (德語)"
-#: ../data/channels_groups.xml.in.h:31
-msgid "Web Programmes (French)"
-msgstr "網路節目 (法語)"
+#: ../data/channels_groups.xml.in.h:135
+#, fuzzy
+msgid "Serbo-Croatian Web TV and Radio"
+msgstr "波斯語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:32
-msgid "Web Radio (Arabic)"
-msgstr "網路電台 (阿拉伯語)"
+#: ../data/channels_groups.xml.in.h:136
+#, fuzzy
+msgid "Web TV (Serbo-Croatian)"
+msgstr "網路電視 (波斯語)"
-#: ../data/channels_groups.xml.in.h:33
-msgid "Web Radio (Catalan)"
+#: ../data/channels_groups.xml.in.h:137
+#, fuzzy
+msgid "Web Radio (Serbo-Croatian)"
msgstr "網路電台 (加泰羅尼亞語)"
-#: ../data/channels_groups.xml.in.h:34
-msgid "Web Radio (Chinese)"
-msgstr "網路電台 (漢語)"
+#: ../data/channels_groups.xml.in.h:138
+msgid "Slovak Web TV and Radio"
+msgstr "斯洛伐克語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:35
-msgid "Web Radio (English)"
-msgstr "網路電台 (英語)"
+#: ../data/channels_groups.xml.in.h:139
+msgid "Web TV (Slovak)"
+msgstr "網路電視 (斯洛伐克語)"
-#: ../data/channels_groups.xml.in.h:36
-msgid "Web Radio (French)"
-msgstr "網路電台 (法語)"
+#: ../data/channels_groups.xml.in.h:140
+#, fuzzy
+msgid "Web Radio (Slovak)"
+msgstr "網路電視 (斯洛伐克語)"
-#: ../data/channels_groups.xml.in.h:37
-msgid "Web Radio (German)"
-msgstr "網路電台 (德語)"
+#: ../data/channels_groups.xml.in.h:141
+#, fuzzy
+msgid "Slovenian Web TV and Radio"
+msgstr "斯洛伐克語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:38
-msgid "Web Radio (Italian)"
+#: ../data/channels_groups.xml.in.h:142
+#, fuzzy
+msgid "Web TV (Slovenian)"
+msgstr "網路電視 (斯洛伐克語)"
+
+#: ../data/channels_groups.xml.in.h:143
+#, fuzzy
+msgid "Web Radio (Slovenian)"
msgstr "網路電台 (義大利語)"
-#: ../data/channels_groups.xml.in.h:39
-msgid "Web Radio (No lang)"
-msgstr "網路電台 (無語言)"
+#: ../data/channels_groups.xml.in.h:144
+msgid "Spanish Web TV and Radio"
+msgstr "西班牙語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:40
-msgid "Web Radio (Russian)"
-msgstr "網路電台 (俄語)"
+#: ../data/channels_groups.xml.in.h:145
+msgid "Web TV (Spanish)"
+msgstr "網路電視 (西班牙語)"
-#: ../data/channels_groups.xml.in.h:41
+#: ../data/channels_groups.xml.in.h:146
msgid "Web Radio (Spanish)"
msgstr "網路電台 (西班牙語)"
-#: ../data/channels_groups.xml.in.h:42
-msgid "Web TV (Arabic)"
-msgstr "網路電視 (阿拉伯語)"
+#: ../data/channels_groups.xml.in.h:147
+#, fuzzy
+msgid "Web Programmes (Spanish)"
+msgstr "網路節目 (英語)"
-#: ../data/channels_groups.xml.in.h:43
-msgid "Web TV (Catalan)"
-msgstr "網路電視 (加泰羅尼亞語)"
+#: ../data/channels_groups.xml.in.h:148
+#, fuzzy
+msgid "Web Cam (Spanish)"
+msgstr "網路電視 (西班牙語)"
-#: ../data/channels_groups.xml.in.h:44
-msgid "Web TV (Chinese)"
-msgstr "網路電視 (漢語)"
+#: ../data/channels_groups.xml.in.h:149
+msgid "Swedish Web TV and Radio"
+msgstr "瑞典語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:45
-msgid "Web TV (Czech)"
-msgstr "網路電視 (捷克語)"
+#: ../data/channels_groups.xml.in.h:150
+msgid "Web TV (Swedish)"
+msgstr "網路電視 (瑞典語)"
-#: ../data/channels_groups.xml.in.h:46
-msgid "Web TV (Dutch)"
-msgstr "網路電視 (荷蘭語)"
+#: ../data/channels_groups.xml.in.h:151
+#, fuzzy
+msgid "Tagalog Web TV and Radio"
+msgstr "泰語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:47
-msgid "Web TV (English)"
-msgstr "網路電視 (英語)"
+#: ../data/channels_groups.xml.in.h:152
+#, fuzzy
+msgid "Web TV (Tagalog)"
+msgstr "網路電視 (泰語)"
-#: ../data/channels_groups.xml.in.h:48
-msgid "Web TV (French)"
-msgstr "網路電視 (法語)"
+#: ../data/channels_groups.xml.in.h:153
+#, fuzzy
+msgid "Tamil Web TV and Radio"
+msgstr "泰語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:49
-msgid "Web TV (German)"
-msgstr "網路電視 (德語)"
+#: ../data/channels_groups.xml.in.h:154
+#, fuzzy
+msgid "Web TV (Tamil)"
+msgstr "網路電視 (泰語)"
-#: ../data/channels_groups.xml.in.h:50
-msgid "Web TV (Greek)"
-msgstr "網路電視 (希臘語)"
+#: ../data/channels_groups.xml.in.h:155
+msgid "Thai Web TV and Radio"
+msgstr "泰語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:51
-msgid "Web TV (Hungarian)"
-msgstr "網路電視 (匈牙利語)"
+#: ../data/channels_groups.xml.in.h:156
+msgid "Web TV (Thai)"
+msgstr "網路電視 (泰語)"
-#: ../data/channels_groups.xml.in.h:52
-msgid "Web TV (Italian)"
-msgstr "網路電視 (義大利語)"
+#: ../data/channels_groups.xml.in.h:157
+msgid "Turkish Web TV and Radio"
+msgstr "土耳其語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:53
-msgid "Web TV (Japanese)"
-msgstr "網路電視 (日語)"
+#: ../data/channels_groups.xml.in.h:158
+msgid "Web TV (Turkish)"
+msgstr "網路電視 (土耳其語)"
-#: ../data/channels_groups.xml.in.h:54
-msgid "Web TV (Korean)"
-msgstr "網路電視 (韓語)"
+#: ../data/channels_groups.xml.in.h:159
+#, fuzzy
+msgid "Web Radio (Turkish)"
+msgstr "網路電視 (土耳其語)"
-#: ../data/channels_groups.xml.in.h:55
-msgid "Web TV (Latin)"
-msgstr "網路電視 (拉丁語)"
+#: ../data/channels_groups.xml.in.h:160
+#, fuzzy
+msgid "Turkmen Web TV and Radio"
+msgstr "土耳其語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:56
-msgid "Web TV (Modern Greek)"
-msgstr "網路電視 (現代希臘語)"
+#: ../data/channels_groups.xml.in.h:161
+#, fuzzy
+msgid "Web TV (Turkmen)"
+msgstr "網路電視 (土耳其語)"
-#: ../data/channels_groups.xml.in.h:57
-msgid "Web TV (No lang)"
-msgstr "網路電視 (無語言)"
+#: ../data/channels_groups.xml.in.h:162
+#, fuzzy
+msgid "Ukrainian Web TV and Radio"
+msgstr "羅馬尼亞語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:58
-msgid "Web TV (Norwegian)"
-msgstr "網路電視 (挪威語)"
+#: ../data/channels_groups.xml.in.h:163
+#, fuzzy
+msgid "Web TV (Ukrainian)"
+msgstr "網路電視 (羅馬尼亞語)"
-#: ../data/channels_groups.xml.in.h:59
-msgid "Web TV (Persian)"
-msgstr "網路電視 (波斯語)"
+#: ../data/channels_groups.xml.in.h:164
+#, fuzzy
+msgid "Web Cam (Ukrainian)"
+msgstr "網路電視 (羅馬尼亞語)"
-#: ../data/channels_groups.xml.in.h:60
-msgid "Web TV (Polish)"
-msgstr "網路電視 (波蘭語)"
+#: ../data/channels_groups.xml.in.h:165
+#, fuzzy
+msgid "Urdu Web TV and Radio"
+msgstr "荷蘭語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:61
-msgid "Web TV (Portuguese)"
-msgstr "網路電視 (葡萄牙語)"
+#: ../data/channels_groups.xml.in.h:166
+#, fuzzy
+msgid "Web TV (Urdu)"
+msgstr "網路電視 (荷蘭語)"
-#: ../data/channels_groups.xml.in.h:62
-msgid "Web TV (Romanian)"
-msgstr "網路電視 (羅馬尼亞語)"
+#: ../data/channels_groups.xml.in.h:167
+#, fuzzy
+msgid "Uzbek Web TV and Radio"
+msgstr "希臘語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:63
-msgid "Web TV (Russian)"
-msgstr "網路電視 (俄語)"
+#: ../data/channels_groups.xml.in.h:168
+#, fuzzy
+msgid "Web TV (Uzbek)"
+msgstr "網路電視 (捷克語)"
-#: ../data/channels_groups.xml.in.h:64
-msgid "Web TV (Slovak)"
-msgstr "網路電視 (斯洛伐克語)"
+#: ../data/channels_groups.xml.in.h:169
+#, fuzzy
+msgid "Vietnamese Web TV and Radio"
+msgstr "漢語網路電視與電台"
-#: ../data/channels_groups.xml.in.h:65
-msgid "Web TV (Spanish)"
-msgstr "網路電視 (西班牙語)"
+#: ../data/channels_groups.xml.in.h:170
+#, fuzzy
+msgid "Web TV (Vietnamese)"
+msgstr "網路電視 (漢語)"
-#: ../data/channels_groups.xml.in.h:66
-msgid "Web TV (Swedish)"
-msgstr "網路電視 (瑞典語)"
+#: ../data/channels_groups.xml.in.h:171
+#, fuzzy
+msgid "Web Radio (Vietnamese)"
+msgstr "網路電台 (漢語)"
-#: ../data/channels_groups.xml.in.h:67
-msgid "Web TV (Thai)"
-msgstr "網路電視 (泰語)"
+#: ../data/channels_groups.xml.in.h:172
+msgid "No lang Web TV and Radio"
+msgstr "無語言網路電視與電台"
-#: ../data/channels_groups.xml.in.h:68
-msgid "Web TV (Turkish)"
-msgstr "網路電視 (土耳其語)"
+#: ../data/channels_groups.xml.in.h:173
+msgid "Web TV (No lang)"
+msgstr "網路電視 (無語言)"
-#: ../data/channels_groups.xml.in.h:69
+#: ../data/channels_groups.xml.in.h:174
+msgid "Web Radio (No lang)"
+msgstr "網路電台 (無語言)"
+
+#: ../data/channels_groups.xml.in.h:175
+#, fuzzy
+msgid "Web Programmes (No lang)"
+msgstr "網路節目 (英語)"
+
+#: ../data/channels_groups.xml.in.h:176
+#, fuzzy
+msgid "Web Cam (No lang)"
+msgstr "網路電視 (無語言)"
+
+#: ../data/channels_groups.xml.in.h:177
msgid "WebCam"
msgstr "攝影機"
#: ../data/menu/freetuxtv.desktop.in.h:2
-msgid "FreetuxTV Television Channels Player"
-msgstr "FreetuxTV 電視頻道播放器"
-
-#: ../data/menu/freetuxtv.desktop.in.h:3
msgid "Television Channels Player"
msgstr "電視頻道播放器"
+#: ../data/menu/freetuxtv.desktop.in.h:3
+msgid "FreetuxTV Television Channels Player"
+msgstr "FreetuxTV 電視頻道播放器"
+
#: ../data/menu/freetuxtv.desktop.in.h:4
msgid "Watch television channels from internet"
msgstr "在網上觀看電視頻道"
-#: ../src/freetuxtv-cellrenderer-recordingslist.c:348
-#, c-format
-msgid "%lld min"
+#: ../src/freetuxtv-cellrenderer-recordingslist.c:339
+#, fuzzy, c-format
+msgid "%ld min"
msgstr "%lld 分鐘"
#. Update status bar
@@ -810,17 +1352,17 @@ msgstr ""
"M3U 解析器回傳錯誤:\n"
"%s。"
-#: ../src/freetuxtv-channels-list.c:1322
+#: ../src/freetuxtv-channels-list.c:1335
msgid "Delete group's channels"
msgstr "刪除群組內頻道"
#. Add to favourite is only for channels
-#: ../src/freetuxtv-channels-list.c:1372
+#: ../src/freetuxtv-channels-list.c:1385
msgid "Add to favourites"
msgstr "加入到收藏"
#. Add favourites to a new group
-#: ../src/freetuxtv-channels-list.c:1388
+#: ../src/freetuxtv-channels-list.c:1401
msgid "New group"
msgstr "新增群組"
@@ -1181,7 +1723,7 @@ msgstr "%m/%d/%Y %H:%M"
msgid "Do you want to move the related file on the hard disk to the trash?"
msgstr "是否希望將硬碟上的相關檔案移入回收筒 ?"
-#: ../src/freetuxtv-tv-channels-list.c:67
+#: ../src/freetuxtv-tv-channels-list.c:69
#, c-format
msgid "Synchronizing the tv channels list"
msgstr "正在同步電視頻道清單"
@@ -1221,113 +1763,142 @@ msgstr "%1.1f MB"
msgid "%1.1f GB"
msgstr "%1.1f GB"
-#: ../src/freetuxtv-window-add-channels-group.c:376
+#: ../src/freetuxtv-window-add-channels-group.c:395
#, c-format
msgid "Please select a least one group !"
msgstr "請至少選擇一個群組 !"
-#: ../src/freetuxtv-window-add-channels-group.c:382
-#: ../src/freetuxtv-window-add-channels-group.c:530
-#: ../src/freetuxtv-window-add-channels-group.c:584
+#: ../src/freetuxtv-window-add-channels-group.c:401
+#: ../src/freetuxtv-window-add-channels-group.c:549
+#: ../src/freetuxtv-window-add-channels-group.c:603
msgid "Adding channels groups"
msgstr "正在加入頻道群組"
#. Update progress dialog
-#: ../src/freetuxtv-window-add-channels-group.c:422
-#: ../src/freetuxtv-window-add-channels-group.c:466
-#: ../src/freetuxtv-window-add-channels-group.c:548
-#: ../src/freetuxtv-window-add-channels-group.c:592
+#: ../src/freetuxtv-window-add-channels-group.c:441
+#: ../src/freetuxtv-window-add-channels-group.c:485
+#: ../src/freetuxtv-window-add-channels-group.c:567
+#: ../src/freetuxtv-window-add-channels-group.c:611
#, c-format
msgid "Adding channels group: <i>%s</i>"
msgstr "正在加入頻道群組: <i>%s</i>"
-#: ../src/freetuxtv-window-add-channels-group.c:494
-#: ../src/freetuxtv-window-add-channels-group.c:561
-#: ../src/freetuxtv-window-add-channels-group.c:605
+#: ../src/freetuxtv-window-add-channels-group.c:513
+#: ../src/freetuxtv-window-add-channels-group.c:580
+#: ../src/freetuxtv-window-add-channels-group.c:624
#, c-format
msgid "%d channels group(s) have been successfully added."
msgstr "%d 頻道群組已成功加入。"
-#: ../src/freetuxtv-window-add-channels-group.c:522
-#: ../src/freetuxtv-window-add-channels-group.c:579
-#: ../src/freetuxtv-window-main.c:1980
+#: ../src/freetuxtv-window-add-channels-group.c:541
+#: ../src/freetuxtv-window-add-channels-group.c:598
+#: ../src/freetuxtv-window-main.c:1982
#, c-format
msgid "Please enter the group's name !"
msgstr "請輸入群組名稱 !"
-#: ../src/freetuxtv-window-add-channels-group.c:525
-#: ../src/freetuxtv-window-main.c:1985
+#: ../src/freetuxtv-window-add-channels-group.c:544
+#: ../src/freetuxtv-window-main.c:1987
#, c-format
msgid "Please enter the group's URI !"
msgstr "請輸入群組 URI !"
+#: ../src/freetuxtv-window-tv-channels-database.c:85
+#, fuzzy, c-format
+msgid "Updating TV channel: %s"
+msgstr "更新電視頻道清單(_U)"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:140
+msgid "TV channels synchronisation"
+msgstr ""
+
+#: ../src/freetuxtv-window-tv-channels-database.c:149
+#, fuzzy, c-format
+msgid "Downloading the file '%s'"
+msgstr "正在獲取檔案:「%s」"
+
+#: ../src/freetuxtv-window-tv-channels-database.c:164
+#, fuzzy
+msgid "Synchronizing TV channels from file"
+msgstr "正在同步電視頻道清單"
+
#. Menu : FreetuxTV
-#: ../src/freetuxtv-window-main.c:277
+#: ../src/freetuxtv-window-main.c:278
msgid "_FreetuxTV"
msgstr "_FreetuxTV"
#. End Menu : FreetuxTV
#. Menu : Channels
-#: ../src/freetuxtv-window-main.c:298
+#: ../src/freetuxtv-window-main.c:299
msgid "_Channels"
msgstr "頻道(_C)"
-#: ../src/freetuxtv-window-main.c:302
+#: ../src/freetuxtv-window-main.c:303
msgid "_Add a group"
msgstr "加入群組(_A)"
-#: ../src/freetuxtv-window-main.c:308
-msgid "_Update TV channels list"
-msgstr "更新電視頻道清單(_U)"
+#: ../src/freetuxtv-window-main.c:305
+msgid "Add/create a channels group from different sources"
+msgstr ""
+
+#: ../src/freetuxtv-window-main.c:311
+#, fuzzy
+msgid "_Synchronize TV channels database"
+msgstr "正在同步電視頻道清單"
+
+#: ../src/freetuxtv-window-main.c:313
+msgid ""
+"Synchronize the TV channels list in the local database from the XML database"
+msgstr ""
#. End Menu : Channels
#. Menu : Video
-#: ../src/freetuxtv-window-main.c:317
+#: ../src/freetuxtv-window-main.c:322
msgid "_Video"
msgstr "視訊(_V)"
#. SubMenu : Deinterlace
-#: ../src/freetuxtv-window-main.c:322
+#: ../src/freetuxtv-window-main.c:327
msgid "_Deinterlace"
msgstr "反交錯(_D)"
-#: ../src/freetuxtv-window-main.c:327
+#: ../src/freetuxtv-window-main.c:332
msgid "Disable"
msgstr "停用"
-#: ../src/freetuxtv-window-main.c:339
+#: ../src/freetuxtv-window-main.c:344
msgid "Blend"
msgstr "混合"
-#: ../src/freetuxtv-window-main.c:348
+#: ../src/freetuxtv-window-main.c:353
msgid "Bob"
msgstr "擺動"
-#: ../src/freetuxtv-window-main.c:357
+#: ../src/freetuxtv-window-main.c:362
msgid "Discard"
msgstr "丟棄"
-#: ../src/freetuxtv-window-main.c:366
+#: ../src/freetuxtv-window-main.c:371
msgid "Linear"
msgstr "線性"
-#: ../src/freetuxtv-window-main.c:375
+#: ../src/freetuxtv-window-main.c:380
msgid "Mean"
msgstr "平均"
-#: ../src/freetuxtv-window-main.c:384
+#: ../src/freetuxtv-window-main.c:389
msgid "X"
msgstr "X"
#. End SubMenu : Deinterlace
#. End Menu : Video
#. Menu : Help
-#: ../src/freetuxtv-window-main.c:396
+#: ../src/freetuxtv-window-main.c:401
msgid "_Help"
msgstr "求助(_H)"
#. Create the menu items
-#: ../src/freetuxtv-window-main.c:1024
+#: ../src/freetuxtv-window-main.c:1029
msgid "Mute"
msgstr "靜音"
@@ -1351,49 +1922,60 @@ msgstr ""
msgid "An error occurred"
msgstr "出現錯誤"
-#: ../src/main.c:627
+#: ../src/main.c:607
+#, fuzzy, c-format
+msgid "Synchronizing the list of tv channels: %s..."
+msgstr "正在同步電視頻道清單…"
+
+#: ../src/main.c:642
msgid "Initializing user configuration..."
msgstr "正在初始化使用者配置…"
-#: ../src/main.c:634
+#: ../src/main.c:649
msgid "Loading user configuration..."
msgstr "正在載入使用者配置…"
-#: ../src/main.c:693
+#: ../src/main.c:719
msgid "Synchronizing the list of tv channels..."
msgstr "正在同步電視頻道清單…"
-#: ../src/main.c:726
+#: ../src/main.c:752
msgid "Loading the list of channels..."
msgstr "正在載入頻道清單…"
-#: ../src/main.c:735
+#: ../src/main.c:761
msgid "Loading the list of recordings..."
msgstr "正在載入錄影清單…"
-#: ../src/main.c:1051 ../src/main.c:1247
+#: ../src/main.c:1080 ../src/main.c:1276
#, c-format
msgid "Playing: %s"
msgstr "正在播放: %s"
-#: ../src/main.c:1060
+#: ../src/main.c:1089
msgid "is playing"
msgstr "正在播放"
-#: ../src/main.c:1249
+#: ../src/main.c:1278
#, c-format
msgid "Stopping channel: %s"
msgstr "正在停止頻道: %s"
-#: ../src/main.c:1293
+#: ../src/main.c:1322
msgid "is recording"
msgstr "正在錄製"
-#: ../src/main.c:1340
+#: ../src/main.c:1369
#, c-format
msgid "Recording: %s"
msgstr "正在錄製: %s"
-#: ../src/main.c:1465
+#: ../src/main.c:1494
msgid "Are you sure you want to quit?"
msgstr "您是否確定要離開 ?"
+
+#~ msgid "Modern Greek Web TV and Radio"
+#~ msgstr "現代希臘語網路電視與電台"
+
+#~ msgid "Web TV (Modern Greek)"
+#~ msgstr "網路電視 (現代希臘語)"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d9b9a3..47304d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,12 +62,14 @@ freetuxtv_SOURCES = \
freetuxtv-utils.h \
freetuxtv-window-add-channels-group.c \
freetuxtv-window-add-channels-group.h \
+ freetuxtv-window-add-recording.c \
+ freetuxtv-window-add-recording.h \
freetuxtv-window-channel-properties.c \
freetuxtv-window-channel-properties.h \
freetuxtv-window-main.c \
freetuxtv-window-main.h \
- freetuxtv-window-add-recording.c \
- freetuxtv-window-add-recording.h \
+ freetuxtv-window-tv-channels-database.c \
+ freetuxtv-window-tv-channels-database.h \
lib-gmmkeys.c \
lib-gmmkeys.h \
lib-m3uparser.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 7e08c70..9e635e3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.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.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,12 +80,13 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = freetuxtv$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -64,33 +109,81 @@ am_freetuxtv_OBJECTS = gtk-builder-dialog.$(OBJEXT) \
freetuxtv-tv-channel-infos.$(OBJEXT) \
freetuxtv-tv-channels-list.$(OBJEXT) freetuxtv-utils.$(OBJEXT) \
freetuxtv-window-add-channels-group.$(OBJEXT) \
+ freetuxtv-window-add-recording.$(OBJEXT) \
freetuxtv-window-channel-properties.$(OBJEXT) \
freetuxtv-window-main.$(OBJEXT) \
- freetuxtv-window-add-recording.$(OBJEXT) lib-gmmkeys.$(OBJEXT) \
- lib-m3uparser.$(OBJEXT) main.$(OBJEXT)
+ freetuxtv-window-tv-channels-database.$(OBJEXT) \
+ lib-gmmkeys.$(OBJEXT) lib-m3uparser.$(OBJEXT) main.$(OBJEXT)
freetuxtv_OBJECTS = $(am_freetuxtv_OBJECTS)
am__DEPENDENCIES_1 =
freetuxtv_DEPENDENCIES = $(am__DEPENDENCIES_1) \
../lib/libvlc-gtk/libvlc-gtk.la \
../lib/libdbevolution/libdbevolution.la
-freetuxtv_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+freetuxtv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(freetuxtv_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_ at AM_V@)
+am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(freetuxtv_SOURCES)
DIST_SOURCES = $(freetuxtv_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -325,12 +418,14 @@ freetuxtv_SOURCES = \
freetuxtv-utils.h \
freetuxtv-window-add-channels-group.c \
freetuxtv-window-add-channels-group.h \
+ freetuxtv-window-add-recording.c \
+ freetuxtv-window-add-recording.h \
freetuxtv-window-channel-properties.c \
freetuxtv-window-channel-properties.h \
freetuxtv-window-main.c \
freetuxtv-window-main.h \
- freetuxtv-window-add-recording.c \
- freetuxtv-window-add-recording.h \
+ freetuxtv-window-tv-channels-database.c \
+ freetuxtv-window-tv-channels-database.h \
lib-gmmkeys.c \
lib-gmmkeys.h \
lib-m3uparser.c \
@@ -378,14 +473,19 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -406,7 +506,8 @@ uninstall-binPROGRAMS:
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -419,9 +520,10 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+
freetuxtv$(EXEEXT): $(freetuxtv_OBJECTS) $(freetuxtv_DEPENDENCIES) $(EXTRA_freetuxtv_DEPENDENCIES)
@rm -f freetuxtv$(EXEEXT)
- $(freetuxtv_LINK) $(freetuxtv_OBJECTS) $(freetuxtv_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(freetuxtv_LINK) $(freetuxtv_OBJECTS) $(freetuxtv_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -448,6 +550,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/freetuxtv-window-add-recording.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/freetuxtv-window-channel-properties.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/freetuxtv-window-main.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/freetuxtv-window-tv-channels-database.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtk-builder-dialog.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtk-builder-object.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtk-builder-widget.Po at am__quote@
@@ -459,25 +562,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -485,26 +588,15 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -516,15 +608,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -533,6 +621,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -676,19 +779,19 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS 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 \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/freetuxtv-fileutils.c b/src/freetuxtv-fileutils.c
index 200e9da..0ebb45a 100644
--- a/src/freetuxtv-fileutils.c
+++ b/src/freetuxtv-fileutils.c
@@ -35,7 +35,7 @@ freetuxtv_curl_error_quark () {
}
void
-freetuxtv_fileutils_get_file (gchar* url, gchar* dst_file, const GProxyStruct* pProxySctruct, int timeout, GError **error)
+freetuxtv_fileutils_get_file (const gchar* url, const gchar* dst_file, const GProxyStruct* pProxySctruct, int timeout, GError **error)
{
g_return_if_fail(url != NULL);
g_return_if_fail(dst_file != NULL);
diff --git a/src/freetuxtv-fileutils.h b/src/freetuxtv-fileutils.h
index 377ae21..3e15a60 100644
--- a/src/freetuxtv-fileutils.h
+++ b/src/freetuxtv-fileutils.h
@@ -46,7 +46,7 @@ typedef struct _GProxyStruct {
} GProxyStruct;
void
-freetuxtv_fileutils_get_file (gchar* url, gchar* dst_file, const GProxyStruct* pProxySctruct, int timeout, GError **error);
+freetuxtv_fileutils_get_file (const gchar* url, const gchar* dst_file, const GProxyStruct* pProxySctruct, int timeout, GError **error);
gchar*
gproxystruct_to_string(const GProxyStruct* pProxySctruct, gboolean protocol, gboolean server, gboolean auth);
diff --git a/src/freetuxtv-gladexml.h b/src/freetuxtv-gladexml.h
index c0fc8e9..ddd2d0d 100644
--- a/src/freetuxtv-gladexml.h
+++ b/src/freetuxtv-gladexml.h
@@ -23,6 +23,7 @@
#define FREETUXTV_GUIFILE_ADDRECORDING "addrecording.glade"
#define FREETUXTV_GUIFILE_ADDCHANNELSGROUPS "addchannelsgroups.glade"
#define FREETUXTV_GUIFILE_CHANNELPROPERTIES "channelproperties.glade"
+#define FREETUXTV_GUIFILE_TVCHANNELSDATABASE "tvchannelsdatabase.glade"
// List of windows and dialogs
#define FREETUXTV_GUI_DIALOG_ADDRECORDING "dialogaddrecording"
\ No newline at end of file
diff --git a/src/freetuxtv-player-error-dialog.c b/src/freetuxtv-player-error-dialog.c
index a5c07f3..335b5d6 100644
--- a/src/freetuxtv-player-error-dialog.c
+++ b/src/freetuxtv-player-error-dialog.c
@@ -61,7 +61,7 @@ freetuxtv_player_error_dialog_init (FreetuxTVPlayerErrorDialog *object)
//gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(pScroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GtkWidget* vbox;
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_box_pack_start (GTK_BOX (vbox),
GTK_WIDGET(pScroll), TRUE, TRUE, 5);
diff --git a/src/freetuxtv-tv-channels-list.c b/src/freetuxtv-tv-channels-list.c
index 5feec78..d103f01 100644
--- a/src/freetuxtv-tv-channels-list.c
+++ b/src/freetuxtv-tv-channels-list.c
@@ -26,12 +26,16 @@
#include "freetuxtv-window-main.h"
#include "freetuxtv-tv-channel-infos.h"
#include "freetuxtv-channels-list.h"
+#include "freetuxtv-utils.h"
typedef struct _CBXMLData
{
FreetuxTVApp *app;
DBSync *dbsync;
FreetuxTVTvChannelInfos *tv_channels_infos;
+ const gchar* szLogosURL;
+ SynchronizeProgressCB progressCB;
+ void* progressCBUserData;
} CBXMLData;
static void
@@ -57,7 +61,8 @@ xml_text_cb(GMarkupParseContext *context,
void
tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
- GError** error)
+ const gchar* szLogosURL,
+ SynchronizeProgressCB funcCB, void* user_data, GError** error)
{
g_return_if_fail(dbsync != NULL);
g_return_if_fail(error != NULL);
@@ -79,6 +84,9 @@ tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
cbxmldata.app = app;
cbxmldata.dbsync = dbsync;
cbxmldata.tv_channels_infos = NULL;
+ cbxmldata.szLogosURL = szLogosURL,
+ cbxmldata.progressCB = funcCB;
+ cbxmldata.progressCBUserData = user_data;
gsize filelen;
static GMarkupParser parser = { xml_start_cb, xml_end_cb, xml_text_cb,
@@ -89,17 +97,31 @@ tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG,
&cbxmldata, NULL);
gchar *xml_data;
- gchar *filename;
- filename = g_build_filename(app->paths.datadir, "tv_channels.xml", NULL);
- g_file_get_contents (filename, &xml_data, &filelen, NULL);
- g_free(filename);
- filename = NULL;
+ gchar *szFileName = NULL;
+
+ szFileName = g_build_filename(g_get_user_cache_dir(), "freetuxtv", "tv_channels.dat", NULL);
+ if(szFileName){
+ if(!g_file_test(szFileName, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)){
+ g_free(szFileName);
+ szFileName = NULL;
+ }
+ }
+ if(!szFileName){
+ szFileName = g_build_filename(app->paths.datadir, "tv_channels.xml", NULL);
+ }
+ g_file_get_contents (szFileName, &xml_data, &filelen, NULL);
+ g_free(szFileName);
+ szFileName = NULL;
g_markup_parse_context_parse (context, xml_data, -1, error);
}
windowmain_statusbar_pop (app, "UpdateMsg");
}
+static gchar* tvchannels_list_get_usr_img_path()
+{
+ return g_build_filename(g_get_user_data_dir(), "freetuxtv", "images", "channels", NULL);
+}
static gchar*
tvchannels_list_get_tvchannel_logo_path(FreetuxTVApp *app,
@@ -109,8 +131,7 @@ tvchannels_list_get_tvchannel_logo_path(FreetuxTVApp *app,
gchar *szUserImgChannelsDir;
gboolean bFound = FALSE;
- szUserImgChannelsDir = g_build_filename(g_get_user_data_dir(),
- "freetuxtv", "images", "channels", NULL);
+ szUserImgChannelsDir = tvchannels_list_get_usr_img_path();
if(szLogoName != NULL){
// We look in the user logo directory
@@ -173,6 +194,27 @@ tvchannels_list_get_tvchannel_logo_path_for_recording(FreetuxTVApp *app,
return tvchannels_list_get_tvchannel_logo_path_for_channel(app, pChannelInfos, bNoneIcon);
}
+static void tvchannels_list_download_logos(FreetuxTVApp *app, const gchar* szLogosDirectoryURL, const gchar* szUserImgChannelsDir, const char* szLogoName)
+{
+ gchar* szLogoURL = NULL;
+ gchar* szDstFile = NULL;
+ if(g_str_has_suffix(szLogosDirectoryURL, "/")){
+ szLogoURL = g_strconcat (szLogosDirectoryURL, szLogoName, NULL);
+ }else{
+ szLogoURL = g_strconcat (szLogosDirectoryURL, "/", szLogoName, NULL);
+ }
+
+ GError* error = NULL;
+ szDstFile = g_build_filename(szUserImgChannelsDir, szLogoName, NULL);
+
+ g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Downloading file : %s\n", szLogoURL);
+ freetuxtv_fileutils_get_file (szLogoURL, szDstFile, &(app->prefs.proxy), app->prefs.timeout, &error);
+
+ if(error != NULL){
+ g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error : %s\n", error->message);
+ g_error_free(error);
+ }
+}
static void
xml_start_cb(GMarkupParseContext *context,
@@ -188,6 +230,7 @@ xml_start_cb(GMarkupParseContext *context,
if(g_ascii_strcasecmp(element_name, "tvchannel") == 0){
name = (gchar*)attribute_values[0];
+ cbxmldata->progressCB(name, cbxmldata->progressCBUserData);
cbxmldata->tv_channels_infos = freetuxtv_tv_channel_infos_new(name);
}
@@ -206,6 +249,7 @@ xml_end_cb(GMarkupParseContext *context,
CBXMLData* cbxmldata = (CBXMLData*)user_data;
FreetuxTVTvChannelInfos *tv_channels_infos = NULL;
+ gchar* szUserImgChannelsDir;
if(g_ascii_strcasecmp(element_name, "tvchannel") == 0){
tv_channels_infos = cbxmldata->tv_channels_infos;
@@ -213,6 +257,20 @@ xml_end_cb(GMarkupParseContext *context,
// We have a channel pending, we add it in database
dbsync_add_tvchannel (cbxmldata->dbsync, tv_channels_infos, error);
+ const gchar* szLogoName = freetuxtv_tv_channel_infos_get_logo_filename(tv_channels_infos);
+
+ // Download logo for the channel if required
+ if(szLogoName && cbxmldata->szLogosURL){
+ szUserImgChannelsDir = tvchannels_list_get_usr_img_path();
+
+ tvchannels_list_download_logos(cbxmldata->app, cbxmldata->szLogosURL, szUserImgChannelsDir, szLogoName);
+
+ if(szUserImgChannelsDir){
+ g_free(szUserImgChannelsDir);
+ szUserImgChannelsDir = NULL;
+ }
+ }
+
g_object_unref(cbxmldata->tv_channels_infos);
cbxmldata->tv_channels_infos = NULL;
}
diff --git a/src/freetuxtv-tv-channels-list.h b/src/freetuxtv-tv-channels-list.h
index 0e7be78..2e30740 100644
--- a/src/freetuxtv-tv-channels-list.h
+++ b/src/freetuxtv-tv-channels-list.h
@@ -23,8 +23,12 @@
#include "freetuxtv-app.h"
#include "freetuxtv-db-sync.h"
+typedef void (*SynchronizeProgressCB)(gchar* szTVChannelName, void* user_data);
+
void
tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
+ const gchar* szLogosURL,
+ SynchronizeProgressCB funcCB, void* user_data,
GError** error);
gchar*
diff --git a/src/freetuxtv-window-main.c b/src/freetuxtv-window-main.c
index f8c3393..1553c4e 100644
--- a/src/freetuxtv-window-main.c
+++ b/src/freetuxtv-window-main.c
@@ -25,6 +25,7 @@
#include "freetuxtv-window-main.h"
#include "freetuxtv-window-add-recording.h"
#include "freetuxtv-window-add-channels-group.h"
+#include "freetuxtv-window-tv-channels-database.h"
#include "freetuxtv-app.h"
#include "freetuxtv-i18n.h"
@@ -1582,20 +1583,19 @@ on_windowmain_menuitemupdatetvchannels_activate (GtkMenuItem *menuitem,
FreetuxTVApp *app = (FreetuxTVApp *) user_data;
GError* error = NULL;
+
+ GtkWindow* pWindow;
+ GtkWidget* pParent;
+ pParent = (GtkWidget *) gtk_builder_get_object (app->gui, "windowmain");
- DBSync dbsync;
- dbsync_open_db (&dbsync, &error);
-
- if(error == NULL){
- tvchannels_list_synchronize (app, &dbsync, &error);
- }
+ FreetuxTVWindowTVChannelsDatabase* pWindowTVChannelsDatabase;
+ pWindowTVChannelsDatabase = freetuxtv_window_tv_channels_database_new(GTK_WINDOW(pParent), app);
if(error == NULL){
- channels_list_load_channels (app, &dbsync, &error);
+ pWindow = gtk_builder_window_get_top_window (GTK_BUILDER_WINDOW(pWindowTVChannelsDatabase));
+ gtk_widget_show(GTK_WIDGET(pWindow));
}
- dbsync_close_db(&dbsync);
-
if(error != NULL){
windowmain_show_gerror (app, error);
g_error_free (error);
diff --git a/src/freetuxtv-window-tv-channels-database.c b/src/freetuxtv-window-tv-channels-database.c
new file mode 100644
index 0000000..6657c4a
--- /dev/null
+++ b/src/freetuxtv-window-tv-channels-database.c
@@ -0,0 +1,267 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * freetuxtv
+ * Copyright (C) Eric Beuque 2012 <eric.beuque at gmail.com>
+ *
+freetuxtv 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * freetuxtv 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "freetuxtv-window-tv-channels-database.h"
+
+#include "freetuxtv-gladexml.h"
+#include "freetuxtv-db-sync.h"
+#include "freetuxtv-channels-list.h"
+#include "freetuxtv-tv-channels-list.h"
+#include "freetuxtv-window-main.h"
+
+#include "freetuxtv-fileutils.h"
+
+#include "gtk-progress-dialog.h"
+
+typedef struct _FreetuxTVWindowTVChannelsDatabasePrivate FreetuxTVWindowTVChannelsDatabasePrivate;
+struct _FreetuxTVWindowTVChannelsDatabasePrivate
+{
+ FreetuxTVApp* app;
+};
+
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabasePrivate))
+
+G_DEFINE_TYPE (FreetuxTVWindowTVChannelsDatabase, freetuxtv_window_tv_channels_database, GTK_TYPE_BUILDER_WINDOW);
+
+static void
+freetuxtv_window_tv_channels_database_init (FreetuxTVWindowTVChannelsDatabase *pWindowTVChannelsDatabase)
+{
+
+}
+
+static void
+freetuxtv_window_tv_channels_database_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (freetuxtv_window_tv_channels_database_parent_class)->finalize (object);
+}
+
+static void
+freetuxtv_window_tv_channels_database_class_init (FreetuxTVWindowTVChannelsDatabaseClass *klass)
+{
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
+ //GtkBuilderDialogClass* parent_class = GTK_BUILDER_DIALOG_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (FreetuxTVWindowTVChannelsDatabasePrivate));
+
+ object_class->finalize = freetuxtv_window_tv_channels_database_finalize;
+}
+
+static gboolean
+do_idle_destroy_window (gpointer user_data)
+{
+ g_return_val_if_fail(GTK_IS_BUILDER_WIDGET(user_data), FALSE);
+ gtk_builder_widget_destroy (GTK_BUILDER_WIDGET(user_data));
+
+ return FALSE;
+}
+
+static void
+on_buttonclose_clicked (GtkButton *button, gpointer user_data)
+{
+ // We do the destruction after the button clicked event is finished
+ g_idle_add (do_idle_destroy_window, user_data);
+}
+
+static void synchronize_progress_cb(gchar* szTVChannelName, void* user_data)
+{
+ GtkProgressDialog* pProgressDialog = (GtkProgressDialog*)user_data;
+
+ gchar* szTmp = g_strdup_printf(_("Updating TV channel: %s"), szTVChannelName);
+
+ gtk_progress_dialog_set_text(pProgressDialog, szTmp);
+ gtk_progress_dialog_pulse(pProgressDialog);
+
+ if(szTmp){
+ g_free(szTmp);
+ szTmp = NULL;
+ }
+}
+
+static void
+on_buttonapply_clicked (GtkButton *button, gpointer user_data)
+{
+ FreetuxTVWindowTVChannelsDatabase* pWindowTVChannelsDatabase;
+ FreetuxTVWindowTVChannelsDatabasePrivate* priv;
+
+ pWindowTVChannelsDatabase = (FreetuxTVWindowTVChannelsDatabase*)user_data;
+ priv = FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_PRIVATE(pWindowTVChannelsDatabase);
+
+ GError* error = NULL;
+
+ GtkBuilder *builder;
+ builder = gtk_builder_object_get_builder(GTK_BUILDER_OBJECT(pWindowTVChannelsDatabase));
+
+ DBSync dbsync;
+
+ gchar* szTmp = NULL;
+
+ gboolean bSynchronize = FALSE;
+ gboolean bDownloadFile = FALSE;
+ gboolean bUpdateLogos = FALSE;
+
+ const gchar *szDatabaseUrl;
+ const gchar *szLogosUrl;
+ gchar *szDstFile = NULL;
+
+ GtkWidget* pWidget;
+ GtkWindow* pParent;
+
+ // Check if must synchronize
+ pWidget = (GtkWidget *) gtk_builder_get_object (builder, "checkbutton_synchronize");
+ bSynchronize = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pWidget));
+
+ // Check if must update file
+ pWidget = (GtkWidget *) gtk_builder_get_object (builder, "checkbutton_download");
+ bDownloadFile = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pWidget));
+ pWidget = (GtkWidget *) gtk_builder_get_object (builder, "entry_url");
+ szDatabaseUrl = gtk_entry_get_text(GTK_ENTRY(pWidget));
+
+ // Check if must update logos
+ pWidget = (GtkWidget *) gtk_builder_get_object (builder, "checkbutton_logos");
+ bUpdateLogos = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pWidget));
+ pWidget = (GtkWidget *) gtk_builder_get_object (builder, "entry_logosurl");
+ szLogosUrl = gtk_entry_get_text(GTK_ENTRY(pWidget));
+
+ pParent = gtk_builder_window_get_top_window(GTK_BUILDER_WINDOW(pWindowTVChannelsDatabase));
+
+ // Start progress dialog
+ GtkProgressDialog* pProgressDialog = NULL;
+ gdouble progress = 0.0;
+ if(bSynchronize){
+ pProgressDialog = gtk_progress_dialog_new(pParent);
+ gtk_progress_dialog_set_title(pProgressDialog, _("TV channels synchronisation"));
+ gtk_progress_dialog_set_percent(pProgressDialog, progress);
+ gtk_widget_show(GTK_WIDGET(pProgressDialog));
+ }
+
+ // Do download file
+ if(bDownloadFile && (error == NULL)){
+ szDstFile = g_build_filename(g_get_user_cache_dir(), "freetuxtv", "tv_channels.dat", NULL);
+
+ szTmp = g_strdup_printf(_("Downloading the file '%s'"), szDatabaseUrl);
+ g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+ "Downloading the file '%s'\n", szDatabaseUrl);
+
+ gtk_progress_dialog_set_text(pProgressDialog, szTmp);
+ if(szTmp){
+ g_free(szTmp);
+ szTmp = NULL;
+ }
+
+ freetuxtv_fileutils_get_file (szDatabaseUrl, szDstFile, &(priv->app->prefs.proxy), priv->app->prefs.timeout, &error);
+ }
+
+ // Do synchronize
+ if(bSynchronize && (error == NULL)){
+ gtk_progress_dialog_set_text(pProgressDialog, _("Synchronizing TV channels from file"));
+ dbsync_open_db (&dbsync, &error);
+
+ if(error == NULL){
+ tvchannels_list_synchronize (priv->app, &dbsync,
+ (bUpdateLogos ? szLogosUrl : NULL),
+ synchronize_progress_cb, (void*)pProgressDialog, &error);
+ }
+
+ if(error == NULL){
+ channels_list_load_channels (priv->app, &dbsync, &error);
+ }
+
+ dbsync_close_db(&dbsync);
+
+ gtk_progress_dialog_set_percent(pProgressDialog, 0.90);
+ }
+
+ if(szDstFile){
+ g_free(szDstFile);
+ szDstFile = NULL;
+ }
+
+ // On error we destroy the progress dialog view
+ if(pProgressDialog){
+ if(error != NULL){
+ gtk_widget_destroy (GTK_WIDGET(pProgressDialog));
+ pProgressDialog = NULL;
+ }else{
+ gtk_progress_dialog_set_percent(pProgressDialog, 1.0);
+ gtk_progress_dialog_set_button_close_enabled(pProgressDialog, TRUE);
+ }
+ }
+
+ if(error != NULL){
+ windowmain_show_gerror (priv->app, error);
+ g_error_free (error);
+ }
+}
+
+FreetuxTVWindowTVChannelsDatabase*
+freetuxtv_window_tv_channels_database_new (GtkWindow *parent, FreetuxTVApp* app)
+{
+ g_return_val_if_fail(parent != NULL, NULL);
+ g_return_val_if_fail(GTK_IS_WINDOW(parent), NULL);
+ g_return_val_if_fail(app != NULL, NULL);
+
+ FreetuxTVWindowTVChannelsDatabase* pWindowTVChannelsDatabase;
+ GtkWidget *widget;
+ GtkWindow *pWindow;
+
+ gchar* szUiFile = NULL;
+ szUiFile = g_build_filename (app->paths.szPathGladeXml, FREETUXTV_GUIFILE_TVCHANNELSDATABASE, NULL);
+
+ pWindowTVChannelsDatabase = g_object_new (FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE,
+ "ui-file", szUiFile,
+ "toplevel-widget-name", "dialogtvchannelsdatabase",
+ NULL);
+
+ if(szUiFile){
+ g_free(szUiFile);
+ szUiFile = NULL;
+ }
+
+ // Private members
+ FreetuxTVWindowTVChannelsDatabasePrivate* priv;
+ priv = FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_PRIVATE(pWindowTVChannelsDatabase);
+ priv->app = app;
+
+ pWindow = gtk_builder_window_get_top_window (
+ GTK_BUILDER_WINDOW(pWindowTVChannelsDatabase));
+
+ // Set the parent
+ gtk_window_set_transient_for (pWindow, parent);
+ gtk_window_set_position (pWindow, GTK_WIN_POS_CENTER_ON_PARENT);
+
+ // Signal to connect instance
+ widget = (GtkWidget *)gtk_builder_object_get_object (
+ GTK_BUILDER_OBJECT(pWindowTVChannelsDatabase),
+ "button_apply");
+ g_signal_connect(G_OBJECT(widget),
+ "clicked",
+ G_CALLBACK(on_buttonapply_clicked),
+ pWindowTVChannelsDatabase);
+
+ widget = (GtkWidget *)gtk_builder_object_get_object (
+ GTK_BUILDER_OBJECT(pWindowTVChannelsDatabase),
+ "button_close");
+ g_signal_connect(G_OBJECT(widget),
+ "clicked",
+ G_CALLBACK(on_buttonclose_clicked),
+ pWindowTVChannelsDatabase);
+
+ return pWindowTVChannelsDatabase;
+}
+
diff --git a/src/freetuxtv-window-tv-channels-database.h b/src/freetuxtv-window-tv-channels-database.h
new file mode 100644
index 0000000..2d90b55
--- /dev/null
+++ b/src/freetuxtv-window-tv-channels-database.h
@@ -0,0 +1,59 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * freetuxtv
+ * Copyright (C) Eric Beuque 2012 <eric.beuque at gmail.com>
+ *
+freetuxtv 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * freetuxtv 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_H_
+#define _FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_H_
+
+#include <glib-object.h>
+
+#include "gtk-builder-window.h"
+#include "freetuxtv-app.h"
+
+G_BEGIN_DECLS
+
+#define FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE (freetuxtv_window_tv_channels_database_get_type ())
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabase))
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabaseClass))
+#define FREETUXTV_IS_WINDOW_TV_CHANNELS_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE))
+#define FREETUXTV_IS_WINDOW_TV_CHANNELS_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE))
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabaseClass))
+
+typedef struct _FreetuxTVWindowTVChannelsDatabaseClass FreetuxTVWindowTVChannelsDatabaseClass;
+typedef struct _FreetuxTVWindowTVChannelsDatabase FreetuxTVWindowTVChannelsDatabase;
+
+
+
+struct _FreetuxTVWindowTVChannelsDatabaseClass
+{
+ GtkBuilderWindowClass parent_class;
+};
+
+struct _FreetuxTVWindowTVChannelsDatabase
+{
+ GtkBuilderWindow parent_instance;
+};
+
+GType freetuxtv_window_tv_channels_database_get_type (void) G_GNUC_CONST;
+
+FreetuxTVWindowTVChannelsDatabase*
+freetuxtv_window_tv_channels_database_new (GtkWindow *parent, FreetuxTVApp* app);
+
+G_END_DECLS
+
+#endif /* _FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_H_ */
diff --git a/src/gtk-date-time-picker.c b/src/gtk-date-time-picker.c
index 4480262..fe72fe8 100644
--- a/src/gtk-date-time-picker.c
+++ b/src/gtk-date-time-picker.c
@@ -123,7 +123,7 @@ gtk_date_time_picker_init (GtkDateTimePicker *object)
NULL);*/
// Hour
- hbox_time = gtk_hbox_new(FALSE, 0);
+ hbox_time = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox_time);
gtk_box_pack_start(GTK_BOX(object), hbox_time, FALSE, FALSE, 0);
diff --git a/src/gtk-progress-dialog.c b/src/gtk-progress-dialog.c
index 94d0a3b..65235fd 100644
--- a/src/gtk-progress-dialog.c
+++ b/src/gtk-progress-dialog.c
@@ -87,7 +87,7 @@ gtk_progress_dialog_new(GtkWindow* parent)
// Construct the dialog
GtkWidget* vbox;
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER(vbox), 10);
priv->title_widget = gtk_label_new("");
@@ -96,6 +96,7 @@ gtk_progress_dialog_new(GtkWindow* parent)
priv->progress_widget = gtk_progress_bar_new();
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(priv->progress_widget), 0.0);
+ gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(priv->progress_widget), 1.0);
gtk_progress_bar_set_text (GTK_PROGRESS_BAR(priv->progress_widget), "0 %");
gtk_box_pack_start (GTK_BOX(vbox), priv->progress_widget, FALSE, FALSE, 0);
@@ -194,6 +195,22 @@ gtk_progress_dialog_set_percent(GtkProgressDialog* dialog, gdouble percent)
}
void
+gtk_progress_dialog_pulse(GtkProgressDialog* dialog)
+{
+ g_return_if_fail(dialog!=NULL);
+ g_return_if_fail(GTK_IS_PROGRESS_DIALOG(dialog));
+
+ GtkProgressDialogPrivate* priv;
+ priv = GTK_PROGRESS_DIALOG_PRIVATE(dialog);
+
+ gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_widget));
+
+ while (gtk_events_pending()) {
+ gtk_main_iteration();
+ }
+}
+
+void
gtk_progress_dialog_set_button_close_enabled(GtkProgressDialog* dialog, gboolean enabled)
{
g_return_if_fail(dialog!=NULL);
diff --git a/src/gtk-progress-dialog.h b/src/gtk-progress-dialog.h
index acdacdf..2e37ac8 100644
--- a/src/gtk-progress-dialog.h
+++ b/src/gtk-progress-dialog.h
@@ -62,6 +62,9 @@ void
gtk_progress_dialog_set_percent(GtkProgressDialog* dialog, gdouble percent);
void
+gtk_progress_dialog_pulse(GtkProgressDialog* dialog);
+
+void
gtk_progress_dialog_set_button_close_enabled(GtkProgressDialog* dialog, gboolean enabled);
#endif /* _GTK_PROGRESS_DIALOG_H_ */
diff --git a/src/main.c b/src/main.c
index 582e3bf..e5d9c52 100644
--- a/src/main.c
+++ b/src/main.c
@@ -600,6 +600,21 @@ static void on_mediaplayer_event_occurred (
}
}
+static void synchronize_progress_cb(gchar* szTVChannelName, void* user_data)
+{
+ FreetuxTVApp* app = (FreetuxTVApp*)user_data;
+
+ gchar* szTmp = g_strdup_printf(_("Synchronizing the list of tv channels: %s..."), szTVChannelName);
+
+ splashscreen_statusbar_pop (app);
+ splashscreen_statusbar_push (app, szTmp);
+
+ if(szTmp){
+ g_free(szTmp);
+ szTmp = NULL;
+ }
+}
+
static gboolean
splashscreen_app_init(gpointer data)
{
@@ -652,6 +667,7 @@ splashscreen_app_init(gpointer data)
gint major, minor;
gtk_libvlc_get_libvlc_version(&major, &minor, NULL);
+ //list_options_add_option(&options, "-vvv"); // verbose mode
if(major>=1 || (major == 1 && minor>= 1)){
list_options_add_option(&options, "--no-xlib"); // Tell VLC to not use Xlib
}
@@ -706,7 +722,7 @@ splashscreen_app_init(gpointer data)
filename = g_build_filename(app->paths.datadir, "tv_channels.xml", NULL);
if(g_stat (filename, &file_stat) == 0){
if(app->config.logosfiledate < (gint)file_stat.st_mtime){
- tvchannels_list_synchronize(app, &dbsync, &error);
+ tvchannels_list_synchronize(app, &dbsync, NULL, &synchronize_progress_cb, app, &error);
if(error == NULL){
app->config.logosfiledate = (gint)file_stat.st_mtime;
}
@@ -1101,17 +1117,17 @@ freetuxtv_play_channel (FreetuxTVApp *app, GtkTreePath* path_channel, GError** e
szMode = NULL;
}
- if(g_strcasecmp (pChannelInfos->deinterlace_mode, "blend") == 0){
+ if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "blend") == 0){
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceBlend), TRUE);
- }else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "bob") == 0){
+ }else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "bob") == 0){
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceBob), TRUE);
- }else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "discard") == 0){
+ }else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "discard") == 0){
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceDiscard), TRUE);
- }else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "linear") == 0){
+ }else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "linear") == 0){
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceLinear), TRUE);
- }else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "mean") == 0){
+ }else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "mean") == 0){
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceMean), TRUE);
- }else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "x") == 0){
+ }else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "x") == 0){
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceX), TRUE);
}
}else{
@@ -1131,7 +1147,7 @@ freetuxtv_play_channel (FreetuxTVApp *app, GtkTreePath* path_channel, GError** e
if(app->prefs.proxy.proxy_mode == G_PROXY_MODE_MANUAL){
gchar* szUser = NULL;
- if(g_strcasecmp ("0", app->prefs.proxy.proxy_type) == 0){
+ if(g_ascii_strcasecmp ("0", app->prefs.proxy.proxy_type) == 0){
// Mode HTTP
if(app->prefs.proxy.proxy_use_auth){
szUser = g_strconcat(app->prefs.proxy.proxy_username, "@", NULL);
@@ -1153,7 +1169,7 @@ freetuxtv_play_channel (FreetuxTVApp *app, GtkTreePath* path_channel, GError** e
g_free(text);
text = NULL;
}
- }else if(g_strcasecmp ("1", app->prefs.proxy.proxy_type) == 0){
+ }else if(g_ascii_strcasecmp ("1", app->prefs.proxy.proxy_type) == 0){
// Mode SOCK
text = g_strdup_printf(":socks=%s:%s", app->prefs.proxy.proxy_server, app->prefs.proxy.proxy_port);
list_options_add_option(&options, text);
--
freetuxtv packaging
More information about the pkg-multimedia-commits
mailing list