diff -Nru telegnome-0.3.4/ChangeLog telegnome-0.3.5/ChangeLog --- telegnome-0.3.4/ChangeLog 2019-01-11 21:35:53.000000000 +0000 +++ telegnome-0.3.5/ChangeLog 2019-09-05 09:19:28.000000000 +0000 @@ -1,3 +1,85 @@ +commit d0ff23d48851983c5e50b5d393634adaa4ea89a3 +Author: Colin Watson +Date: Thu Sep 5 10:18:37 2019 +0100 + + Release version 0.3.5 + + NEWS | 8 ++++++++ + telegnome.appdata.xml.in | 7 +++++++ + 2 files changed, 15 insertions(+) + +commit a48577b847b45e8203cee9d348b97f9c761aba73 +Author: Serdar Sağlam +Date: Fri Jul 26 17:20:28 2019 +0000 + + Update Turkish translation + + po/tr.po | 367 ++++++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 256 insertions(+), 111 deletions(-) + +commit 5ca70c06bdac2091f629bdb8fda27f7892bad649 +Author: Ask Hjorth Larsen +Date: Sun Apr 28 00:49:47 2019 +0200 + + Updated Danish translation + + doc/da/da.po | 225 ++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 116 insertions(+), 109 deletions(-) + +commit bd4f1bdd70f12341af7ef6d30959ec9a6552ffb3 +Author: Ask Hjorth Larsen +Date: Sun Mar 10 02:47:38 2019 +0100 + + updated Danish translation + + po/da.po | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 65b06126925ce072a9fa07a80e71c045b87a4166 +Author: Nathan Follens +Date: Mon Mar 4 16:44:42 2019 +0000 + + Update Dutch translation + + po/nl.po | 377 ++++++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 263 insertions(+), 114 deletions(-) + +commit 71daa6b0a68f14f954e9755d944d3f5cd0cf4a1c +Merge: 21037d0 9579837 +Author: Colin Watson +Date: Tue Feb 5 22:32:21 2019 +0000 + + Merge branch 'remove-dconf' into 'master' + + Remove dconf dependency + + See merge request GNOME/telegnome!1 + +commit 9579837553b2a8b0cdf5c89a8cd0ae6a322d605d +Author: Tomasz Miąsko +Date: Tue Feb 5 00:00:00 2019 +0000 + + Remove dconf dependency + + In the case of dconf gsettings backend, g_settings_reset can be used for + recursive delete. This does not introduce an explicit dependency on dconf. + + README | 1 - + configure.ac | 2 +- + src/Makefile.am | 3 +-- + src/prefs.vala | 14 +++----------- + 4 files changed, 5 insertions(+), 15 deletions(-) + +commit 21037d06a1352a7e7d6cbf4d3bddc424030e38cb +Author: Colin Watson +Date: Fri Jan 11 21:40:25 2019 +0000 + + Version: 0.3.5 (post-release increment) + + NEWS | 3 +++ + configure.ac | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + commit 87c6e5a8f3dc5c0d981912bf98d7add506fd8eec Author: Colin Watson Date: Fri Jan 11 21:02:32 2019 +0000 diff -Nru telegnome-0.3.4/configure telegnome-0.3.5/configure --- telegnome-0.3.4/configure 2019-01-11 21:15:37.000000000 +0000 +++ telegnome-0.3.5/configure 2019-09-05 09:19:16.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeleGNOME 0.3.4. +# Generated by GNU Autoconf 2.69 for TeleGNOME 0.3.5. # # Report bugs to . # @@ -640,8 +640,8 @@ # Identity of this package. PACKAGE_NAME='TeleGNOME' PACKAGE_TARNAME='telegnome' -PACKAGE_VERSION='0.3.4' -PACKAGE_STRING='TeleGNOME 0.3.4' +PACKAGE_VERSION='0.3.5' +PACKAGE_STRING='TeleGNOME 0.3.5' PACKAGE_BUGREPORT='cjwatson@debian.org' PACKAGE_URL='' @@ -1385,7 +1385,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeleGNOME 0.3.4 to adapt to many kinds of systems. +\`configure' configures TeleGNOME 0.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1456,7 +1456,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeleGNOME 0.3.4:";; + short | recursive ) echo "Configuration of TeleGNOME 0.3.5:";; esac cat <<\_ACEOF @@ -1594,7 +1594,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeleGNOME configure 0.3.4 +TeleGNOME configure 0.3.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1774,7 +1774,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeleGNOME $as_me 0.3.4, which was +It was created by TeleGNOME $as_me 0.3.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2644,7 +2644,7 @@ # Define the identity of the package. PACKAGE='telegnome' - VERSION='0.3.4' + VERSION='0.3.5' cat >>confdefs.h <<_ACEOF @@ -2902,11 +2902,11 @@ if test "x$enable_debug" = "xyes"; then : -$as_echo "#define GNOME_ENABLE_DEBUG /**/" >>confdefs.h +$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h else -$as_echo "#define NDEBUG /**/" >>confdefs.h +$as_echo "#define NDEBUG 1" >>confdefs.h fi ax_enable_debug=$enable_debug @@ -4269,12 +4269,13 @@ if test "$ax_enable_compile_warnings" != "no"; then : - # "yes" flags + if test "$ax_compiler_cxx" = "no" ; then + # C-only flags. Warn in C++ -for flag in -Wall -Wextra -Wundef -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wformat=2 -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wreturn-type -Wswitch-enum -Wswitch-default -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -Wnull-dereference -Wdouble-promotion ; do +for flag in -Wnested-externs -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -Wimplicit-function-declaration -Wold-style-definition -Wjump-misses-init ; do as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 $as_echo_n "checking whether C compiler accepts $flag... " >&6; } @@ -4345,13 +4346,14 @@ done - if test "$ax_compiler_cxx" = "no" ; then - # C-only flags. Warn in C++ + fi + + # "yes" flags -for flag in -Wnested-externs -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement -Wimplicit-function-declaration -Wold-style-definition -Wjump-misses-init ; do +for flag in -Wall -Wextra -Wundef -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wformat=2 -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wreturn-type -Wswitch-enum -Wswitch-default -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -Wnull-dereference -Wdouble-promotion ; do as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 $as_echo_n "checking whether C compiler accepts $flag... " >&6; } @@ -4422,7 +4424,6 @@ done - fi fi if test "$ax_enable_compile_warnings" = "error"; then : @@ -7961,12 +7962,12 @@ pkg_cv_TELEGNOME_CFLAGS="$TELEGNOME_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_TELEGNOME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid" 2>/dev/null` + pkg_cv_TELEGNOME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7978,12 +7979,12 @@ pkg_cv_TELEGNOME_LIBS="$TELEGNOME_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_TELEGNOME_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid" 2>/dev/null` + pkg_cv_TELEGNOME_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -8004,14 +8005,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TELEGNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid" 2>&1` + TELEGNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid" 2>&1` else - TELEGNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid" 2>&1` + TELEGNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TELEGNOME_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid) were not met: + as_fn_error $? "Package requirements (gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid) were not met: $TELEGNOME_PKG_ERRORS @@ -10798,7 +10799,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeleGNOME $as_me 0.3.4, which was +This file was extended by TeleGNOME $as_me 0.3.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10864,7 +10865,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeleGNOME config.status 0.3.4 +TeleGNOME config.status 0.3.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru telegnome-0.3.4/configure.ac telegnome-0.3.5/configure.ac --- telegnome-0.3.4/configure.ac 2018-02-10 02:27:29.000000000 +0000 +++ telegnome-0.3.5/configure.ac 2019-02-05 22:32:38.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([TeleGNOME], [0.3.4], [cjwatson@debian.org], [telegnome]) +AC_INIT([TeleGNOME], [0.3.5], [cjwatson@debian.org], [telegnome]) AC_PREREQ(2.50) AC_CONFIG_SRCDIR([src/main.vala]) AC_CONFIG_MACRO_DIRS([m4]) @@ -28,7 +28,7 @@ AM_PROG_VALAC AM_PATH_GLIB_2_0([2.44.0], [], [AC_MSG_ERROR([GLib >= 2.44.0 is required])], [gobject gio]) -PKG_CHECK_MODULES([TELEGNOME], [gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 dconf uuid]) +PKG_CHECK_MODULES([TELEGNOME], [gtk+-3.0 >= 3.22 gdk-pixbuf-2.0 >= 2.26 cairo >= 1.10 uuid]) AC_ARG_VAR([XMLLINT], [the xmllint program]) AC_PATH_PROG([XMLLINT], [xmllint]) diff -Nru telegnome-0.3.4/debian/changelog telegnome-0.3.5/debian/changelog --- telegnome-0.3.4/debian/changelog 2019-01-11 21:51:46.000000000 +0000 +++ telegnome-0.3.5/debian/changelog 2019-09-05 09:56:33.000000000 +0000 @@ -1,3 +1,10 @@ +telegnome (0.3.5-1) unstable; urgency=medium + + * New upstream release. + * Use debhelper-compat instead of debian/compat. + + -- Colin Watson Thu, 05 Sep 2019 10:56:33 +0100 + telegnome (0.3.4-1) unstable; urgency=medium * New upstream release. diff -Nru telegnome-0.3.4/debian/compat telegnome-0.3.5/debian/compat --- telegnome-0.3.4/debian/compat 2019-01-11 21:43:10.000000000 +0000 +++ telegnome-0.3.5/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru telegnome-0.3.4/debian/control telegnome-0.3.5/debian/control --- telegnome-0.3.4/debian/control 2019-01-11 21:43:50.000000000 +0000 +++ telegnome-0.3.5/debian/control 2019-09-05 09:56:33.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Colin Watson Standards-Version: 3.9.6 -Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9~), pkg-config, valac, libglib2.0-dev (>= 2.44), libgtk-3-dev (>= 3.22), libgdk-pixbuf2.0-dev (>= 2.26), libcairo2-dev, libdconf-dev, uuid-dev, libxml2-utils, yelp-tools, docbook-xml, dh-autoreconf +Build-Depends: dpkg-dev (>= 1.16.1~), debhelper-compat (= 9), pkg-config, valac, libglib2.0-dev (>= 2.44), libgtk-3-dev (>= 3.22), libgdk-pixbuf2.0-dev (>= 2.26), libcairo2-dev, uuid-dev, libxml2-utils, yelp-tools, docbook-xml, dh-autoreconf Homepage: http://telegnome.sourceforge.net/ Vcs-Git: https://salsa.debian.org/debian/telegnome.git Vcs-Browser: https://salsa.debian.org/debian/telegnome diff -Nru telegnome-0.3.4/debian/.git-dpm telegnome-0.3.5/debian/.git-dpm --- telegnome-0.3.4/debian/.git-dpm 2019-01-11 21:43:10.000000000 +0000 +++ telegnome-0.3.5/debian/.git-dpm 2019-09-05 09:56:33.000000000 +0000 @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -48a4297e981ab4ae0bcac6d7db0cb64718e44280 -48a4297e981ab4ae0bcac6d7db0cb64718e44280 -48a4297e981ab4ae0bcac6d7db0cb64718e44280 -48a4297e981ab4ae0bcac6d7db0cb64718e44280 -telegnome_0.3.4.orig.tar.xz -6f954ea927d65f6d087ee8219315cd9d0270a82d -354088 +068efb031efb282f900e26226393d3b3466c27ff +068efb031efb282f900e26226393d3b3466c27ff +068efb031efb282f900e26226393d3b3466c27ff +068efb031efb282f900e26226393d3b3466c27ff +telegnome_0.3.5.orig.tar.xz +ad3b3b5da6a5b2bbd055cbfe6fc5fed597f4b935 +355832 diff -Nru telegnome-0.3.4/debian/.gitignore telegnome-0.3.5/debian/.gitignore --- telegnome-0.3.4/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ telegnome-0.3.5/debian/.gitignore 2019-09-05 09:56:33.000000000 +0000 @@ -0,0 +1,4 @@ +files +telegnome +*.debhelper* +*.substvars diff -Nru telegnome-0.3.4/doc/da/da.po telegnome-0.3.5/doc/da/da.po --- telegnome-0.3.4/doc/da/da.po 2014-02-14 02:17:55.000000000 +0000 +++ telegnome-0.3.5/doc/da/da.po 2019-09-05 08:38:07.000000000 +0000 @@ -2,92 +2,88 @@ # Copyright (C) 2010 telegnome's COPYRIGHT HOLDER # This file is distributed under the same license as the telegnome package. # Joe Hansen , 2010. +# scootergrisen, 2019. # msgid "" msgstr "" "Project-Id-Version: telegnome master\n" -"POT-Creation-Date: 2010-02-03 23:40+0000\n" -"PO-Revision-Date: 2013-03-20 13:01+01:00\n" -"Last-Translator: Joe Hansen \n" +"POT-Creation-Date: 2019-03-10 01:48+0000\n" +"PO-Revision-Date: 2019-04-25 00:00+0200\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: C/telegnome.xml:8(title) +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "" +"Joe Hansen , 2010.\n" +"\n" +"Dansk-gruppen Arjan Scherpenisse " +"
acscherp@wins.uva.nl
" +msgstr "" +"Arjan Scherpenisse " +"
acscherp@wins.uva.nl
" + +#. (itstool) path: authorgroup/author +#: C/index.docbook:23 +msgid "" +"Dirk-Jan Binnema " +"
djcb@dds.nl
" +msgstr "" +"Dirk-Jan Binnema " +"
djcb@dds.nl
" + +#. (itstool) path: authorgroup/author +#: C/index.docbook:31 +msgid "" +"Ork de Rooij " +"
ork.derooij@student.uva.nl
" +msgstr "" +"Ork de Rooij " +"
ork.derooij@student.uva.nl
" -#: C/telegnome.xml:55(para) +#. (itstool) path: authorgroup/author +#: C/index.docbook:39 +msgid "" +"Colin Watson " +"
cjwatson@debian.org
" +msgstr "" +"Colin Watson " +"
cjwatson@debian.org
" + +#. (itstool) path: articleinfo/copyright +#: C/index.docbook:48 +msgid "1999, 2000 Arjan Scherpenisse" +msgstr "1999, 2000 Arjan Scherpenisse" + +#. (itstool) path: articleinfo/copyright +#: C/index.docbook:51 +msgid "2008 Colin Watson" +msgstr "2008 Colin Watson" + +#. (itstool) path: legalnotice/para +#: C/index.docbook:55 msgid "" "This documentation is free software; you can redistribute it and/or modify " "it under the terms of the GNU General Public License as published by the " @@ -99,7 +95,8 @@ "License, som er udgivet af Free Software Foundation. Enten version 2 af " "licensen eller (efter eget valg) enhver senere version." -#: C/telegnome.xml:61(para) +#. (itstool) path: legalnotice/para +#: C/index.docbook:61 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -111,43 +108,49 @@ "SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan " "læses i GNU General Public License." -#: C/telegnome.xml:66(para) +#. (itstool) path: legalnotice/para +#: C/index.docbook:66 msgid "" "You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02111-1307 USA" +"this program; if not, see " msgstr "" -"Du bør have modtaget en kopi af GNU General Public License sammen med denne " -"dokumentation. Hvis ikke, så skriv til Free software Foundation, Inc., 59 " -"Temple Place, Suite 330, Boston, MA 02111-1307 USA" +"Du bør have modtaget en kopi af GNU General Public License sammen med " +"programmet. Hvis ikke, så se " -#: C/telegnome.xml:71(para) +#. (itstool) path: legalnotice/para +#: C/index.docbook:70 msgid "" "For more details see the file COPYING in the source distribution of GNOME." msgstr "" "For yderligere detaljer se filen COPYING i kildedistributionen af GNOME." -#: C/telegnome.xml:76(revnumber) -msgid "TeleGNOME User's Guide 0.1.0" -msgstr "TeleGNOMEs brugervejledning 0.1.0" - -#: C/telegnome.xml:77(date) -msgid "2008-04-27" -msgstr "2008-04-27" +#. (itstool) path: revhistory/revision +#: C/index.docbook:74 +msgid "" +"TeleGNOME User's Guide 0.1.0 2008-04-27" +msgstr "" +"TeleGNOMEs brugervejledning 0.1.0 27. april " +"2008" -#: C/telegnome.xml:83(title) +#. (itstool) path: sect1/title +#: C/index.docbook:82 msgid "Introduction" msgstr "Introduktion" -#: C/telegnome.xml:84(para) +#. (itstool) path: sect1/para +#: C/index.docbook:83 msgid "TBD." msgstr "TBD." -#: C/telegnome.xml:88(title) +#. (itstool) path: sect1/title +#: C/index.docbook:87 msgid "The User Interface" msgstr "Brugergrænsefladen" -#: C/telegnome.xml:90(para) +#. (itstool) path: sect1/para +#: C/index.docbook:89 msgid "" "The main interface consists of a menubar, a toolbar, the currently viewed " "page, and the status bar." @@ -155,11 +158,13 @@ "Hovedgrænsefladen består af en menubjælke, en værktøjsbjælke, den aktuelt " "viste side og statusbjælken." -#: C/telegnome.xml:94(title) +#. (itstool) path: sect2/title +#: C/index.docbook:93 msgid "The menu" msgstr "Menuen" -#: C/telegnome.xml:96(para) +#. (itstool) path: sect2/para +#: C/index.docbook:95 msgid "" "The menubar consists of 3 pull-down menus, called \"File\", \"Settings\", " "and \"Help\". The following options are available in each of these menus." @@ -167,27 +172,33 @@ "Menubjælken består af 3 nedtrækningsmenuer, \"Fil\", \"Opsætning\", og " "\"Hjælp\". De følgende tilvalg er tilgængelige i hver af disse menuer." -#: C/telegnome.xml:102(para) +#. (itstool) path: listitem/para +#: C/index.docbook:101 msgid "File" msgstr "Fil" -#: C/telegnome.xml:105(para) +#. (itstool) path: listitem/para +#: C/index.docbook:104 msgid "Settings" msgstr "Opsætning" -#: C/telegnome.xml:108(para) +#. (itstool) path: listitem/para +#: C/index.docbook:107 msgid "Channels" msgstr "Kanaler" -#: C/telegnome.xml:111(para) +#. (itstool) path: listitem/para +#: C/index.docbook:110 msgid "Help" msgstr "Hjælp" -#: C/telegnome.xml:119(title) +#. (itstool) path: sect1/title +#: C/index.docbook:118 msgid "Using TeleGNOME" msgstr "Brug af TeleGNOME" -#: C/telegnome.xml:121(para) +#. (itstool) path: sect1/para +#: C/index.docbook:120 msgid "" "Normal teletext consists of a series of pages, which are transmitted in " "quick succession by the broadcaster. Whenever you want your TV to tune in on " @@ -198,7 +209,8 @@ "af udgiveren. Når du ønsker, at dit tv skal vise en specifik side, vil dit " "tv kun opfange denne side og vise den på skærmen." -#: C/telegnome.xml:126(para) +#. (itstool) path: sect1/para +#: C/index.docbook:125 msgid "" "Every page can have subpages, that is: the page consists of a couple of " "subpages. This way the numbering of pages can stay the same, but the amount " @@ -224,7 +236,8 @@ "hurtigt, kan siden også være forsvundet, før du har nået at læse den, " "hvilket betyder du igen skal vente på, at den kommer frem igen." -#: C/telegnome.xml:141(para) +#. (itstool) path: sect1/para +#: C/index.docbook:140 msgid "" "Using TeleGNOME is very similar to using teletext " "on any regular television set, but without the sometimes irritating long " @@ -234,7 +247,8 @@ "et normalt fjernsyn, men uden de irriterende lange ventetider på en bestemt " "side." -#: C/telegnome.xml:145(para) +#. (itstool) path: sect1/para +#: C/index.docbook:144 msgid "" "Just like teletext on a TV, you can simply type a page number and press " "ENTER to load that page. This number can be any number " @@ -242,11 +256,12 @@ "numbers shown on the current page." msgstr "" "På samme måde som på tv'et kan du taste et sidenummer og trykker på " -"RETUR for at se den side. Tallet kan være ethvert nummer som " -"udsendes af den aktuelle tekst-tv-kanal, og det er ikke begrænset til de tal " -"som vises på den aktuelle side." +"RETUR for at se den side. Tallet kan være ethvert nummer " +"som udsendes af den aktuelle tekst-tv-kanal, og det er ikke begrænset til de " +"tal som vises på den aktuelle side." -#: C/telegnome.xml:151(para) +#. (itstool) path: sect1/para +#: C/index.docbook:150 msgid "" "You can load subpages directly by typing the page number, a dash or a slash " "and the subpage number. For example: if you want to load the second page of " @@ -256,7 +271,8 @@ "eller skråstreg og undersidens nummer. For eksempel: Hvis du ønsker at se " "den anden underside på side 201, taster du 201/2." -#: C/telegnome.xml:156(para) +#. (itstool) path: sect1/para +#: C/index.docbook:155 msgid "" "When you're ready to read the next subpage (if any) you can press the " "next button. This will load the next subpage. Alternatively " @@ -266,12 +282,3 @@ "trykke på knappen Næste. Dette vil indlæse den næste " "underside. Alternativt kan du direkte indtaste den ønskede underside ved " "brug af tastaturet." - -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/telegnome.xml:0(None) -msgid "translator-credits" -msgstr "" -"Joe Hansen , 2010.\n" -"\n" -"Dansk-gruppen
- TeleGNOME's brugervejledning + TeleGNOMEs brugervejledning TeleGNOME henter og viser tekst-tv fra internettet. - - Arjan Scherpenisse - -
- acscherp@wins.uva.nl -
- - - - Dirk-Jan Binnema - -
- djcb@dds.nl -
- - - - Ork de Rooij - -
- ork.derooij@student.uva.nl -
- - - - Colin Watson - -
- cjwatson@debian.org -
- - + Arjan Scherpenisse
acscherp@wins.uva.nl
+ Dirk-Jan Binnema
djcb@dds.nl
+ Ork de Rooij
ork.derooij@student.uva.nl
+ Colin Watson
cjwatson@debian.org
- - 1999, 2000 Arjan Scherpenisse - - - 2008 Colin Watson - + 1999, 2000 Arjan Scherpenisse + 2008 Colin Watson Denne dokumentation er fri software. Du kan redistribuere og/eller modificere det under de betingelserne som er angivet i GNU General Public License, som er udgivet af Free Software Foundation. Enten version 2 af licensen eller (efter eget valg) enhver senere version. Denne dokumentation distribueres i håb om at det vil vise sig nyttigt, men UDEN NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan læses i GNU General Public License. - You should have received a copy of the GNU General Public - License along with this program; if not, see - + Du bør have modtaget en kopi af GNU General Public License sammen med programmet. Hvis ikke, så se For yderligere detaljer se filen COPYING i kildedistributionen af GNOME. - - TeleGNOME User's Guide 0.1.0 - 2008-04-27 - + TeleGNOMEs brugervejledning 0.1.0 27. april 2008 + + + + Joe Hansen + + joedalton2@yahoo.dk + + + + 2010. + + Joe Hansen + diff -Nru telegnome-0.3.4/m4/ax_append_compile_flags.m4 telegnome-0.3.5/m4/ax_append_compile_flags.m4 --- telegnome-0.3.4/m4/ax_append_compile_flags.m4 2018-09-08 08:58:10.000000000 +0000 +++ telegnome-0.3.5/m4/ax_append_compile_flags.m4 2019-09-05 09:19:03.000000000 +0000 @@ -30,33 +30,12 @@ # # Copyright (c) 2011 Maarten Bosmans # -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 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. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. -#serial 6 +#serial 7 AC_DEFUN([AX_APPEND_COMPILE_FLAGS], [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) diff -Nru telegnome-0.3.4/m4/ax_append_flag.m4 telegnome-0.3.5/m4/ax_append_flag.m4 --- telegnome-0.3.4/m4/ax_append_flag.m4 2018-09-08 08:58:10.000000000 +0000 +++ telegnome-0.3.5/m4/ax_append_flag.m4 2019-09-05 09:19:03.000000000 +0000 @@ -23,33 +23,12 @@ # Copyright (c) 2008 Guido U. Draheim # Copyright (c) 2011 Maarten Bosmans # -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 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. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. -#serial 7 +#serial 8 AC_DEFUN([AX_APPEND_FLAG], [dnl diff -Nru telegnome-0.3.4/m4/ax_append_link_flags.m4 telegnome-0.3.5/m4/ax_append_link_flags.m4 --- telegnome-0.3.4/m4/ax_append_link_flags.m4 2018-09-08 08:58:10.000000000 +0000 +++ telegnome-0.3.5/m4/ax_append_link_flags.m4 2019-09-05 09:19:03.000000000 +0000 @@ -28,33 +28,12 @@ # # Copyright (c) 2011 Maarten Bosmans # -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 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. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. -#serial 6 +#serial 7 AC_DEFUN([AX_APPEND_LINK_FLAGS], [AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) diff -Nru telegnome-0.3.4/m4/ax_check_compile_flag.m4 telegnome-0.3.5/m4/ax_check_compile_flag.m4 --- telegnome-0.3.4/m4/ax_check_compile_flag.m4 2018-09-08 08:58:10.000000000 +0000 +++ telegnome-0.3.5/m4/ax_check_compile_flag.m4 2019-09-05 09:19:03.000000000 +0000 @@ -29,33 +29,12 @@ # Copyright (c) 2008 Guido U. Draheim # Copyright (c) 2011 Maarten Bosmans # -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 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. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. -#serial 5 +#serial 6 AC_DEFUN([AX_CHECK_COMPILE_FLAG], [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF diff -Nru telegnome-0.3.4/m4/ax_check_enable_debug.m4 telegnome-0.3.5/m4/ax_check_enable_debug.m4 --- telegnome-0.3.4/m4/ax_check_enable_debug.m4 2018-09-08 08:58:10.000000000 +0000 +++ telegnome-0.3.5/m4/ax_check_enable_debug.m4 2019-09-05 09:19:03.000000000 +0000 @@ -42,7 +42,7 @@ # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. -#serial 8 +#serial 9 AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[ AC_BEFORE([$0],[AC_PROG_CC])dnl @@ -118,7 +118,7 @@ dnl Define various variables if debugging is disabled. dnl assert.h is a NOP if NDEBUG is defined, so define it by default. AS_IF([test "x$enable_debug" = "xyes"], - [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])], - [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])]) + [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,[1],[Define if debugging is enabled])])], + [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,[1],[Define if debugging is disabled])])]) ax_enable_debug=$enable_debug ]) diff -Nru telegnome-0.3.4/m4/ax_check_link_flag.m4 telegnome-0.3.5/m4/ax_check_link_flag.m4 --- telegnome-0.3.4/m4/ax_check_link_flag.m4 2018-09-08 08:58:10.000000000 +0000 +++ telegnome-0.3.5/m4/ax_check_link_flag.m4 2019-09-05 09:19:03.000000000 +0000 @@ -29,33 +29,12 @@ # Copyright (c) 2008 Guido U. Draheim # Copyright (c) 2011 Maarten Bosmans # -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 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. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. -#serial 5 +#serial 6 AC_DEFUN([AX_CHECK_LINK_FLAG], [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF diff -Nru telegnome-0.3.4/m4/ax_compiler_flags_cflags.m4 telegnome-0.3.5/m4/ax_compiler_flags_cflags.m4 --- telegnome-0.3.4/m4/ax_compiler_flags_cflags.m4 2019-01-11 21:15:28.000000000 +0000 +++ telegnome-0.3.5/m4/ax_compiler_flags_cflags.m4 2019-09-05 09:19:03.000000000 +0000 @@ -26,7 +26,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 16 +#serial 17 AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ AC_REQUIRE([AC_PROG_SED]) @@ -72,6 +72,19 @@ ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + if test "$ax_compiler_cxx" = "no" ; then + # C-only flags. Warn in C++ + AX_APPEND_COMPILE_FLAGS([ dnl + -Wnested-externs dnl + -Wmissing-prototypes dnl + -Wstrict-prototypes dnl + -Wdeclaration-after-statement dnl + -Wimplicit-function-declaration dnl + -Wold-style-definition dnl + -Wjump-misses-init dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + fi + # "yes" flags AX_APPEND_COMPILE_FLAGS([ dnl -Wall dnl @@ -113,18 +126,6 @@ $6 dnl $7 dnl ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) - if test "$ax_compiler_cxx" = "no" ; then - # C-only flags. Warn in C++ - AX_APPEND_COMPILE_FLAGS([ dnl - -Wnested-externs dnl - -Wmissing-prototypes dnl - -Wstrict-prototypes dnl - -Wdeclaration-after-statement dnl - -Wimplicit-function-declaration dnl - -Wold-style-definition dnl - -Wjump-misses-init dnl - ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) - fi ]) AS_IF([test "$ax_enable_compile_warnings" = "error"],[ # "error" flags; -Werror has to be appended unconditionally because diff -Nru telegnome-0.3.4/NEWS telegnome-0.3.5/NEWS --- telegnome-0.3.4/NEWS 2019-01-11 21:01:54.000000000 +0000 +++ telegnome-0.3.5/NEWS 2019-09-05 08:59:40.000000000 +0000 @@ -1,3 +1,14 @@ +Changes in TeleGNOME 0.3.5 +========================== + + * Remove dconf dependency (Tomasz Miąsko). + +UI translations: + da (Ask Hjorth Larsen), nl (Nathan Follens), tr (Serdar Sağlam) + +Doc translations: + da (Ask Hjorth Larsen) + Changes in TeleGNOME 0.3.4 ========================== Binary files /tmp/tmpF6ZBLN/DM8dHxAASF/telegnome-0.3.4/po/da.gmo and /tmp/tmpF6ZBLN/RIGt_MEi5e/telegnome-0.3.5/po/da.gmo differ diff -Nru telegnome-0.3.4/po/da.po telegnome-0.3.5/po/da.po --- telegnome-0.3.4/po/da.po 2017-11-16 07:08:50.000000000 +0000 +++ telegnome-0.3.5/po/da.po 2019-09-05 08:38:07.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: telegnome master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-28 18:00+0000\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/telegnome/issues\n" +"POT-Creation-Date: 2018-06-10 14:01+0000\n" "PO-Revision-Date: 2016-11-15 22:46+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" @@ -305,13 +305,13 @@ msgid "GNU General Public License, version 2 or later" msgstr "GNU General Public License, version 2 eller senere" -#: src/telegnome.ui:154 +#: src/telegnome.ui:153 msgid "translator-credits" msgstr "" "Joe Hansen , 2009.\n" "Ask Hjorth Larsen , 2016.\n" "\n" -"Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" #: telegnome.appdata.xml.in:28 telegnome.desktop.in:4 @@ -331,3 +331,4 @@ #~ msgid "Proxy server" #~ msgstr "Proxyserver" + Binary files /tmp/tmpF6ZBLN/DM8dHxAASF/telegnome-0.3.4/po/nl.gmo and /tmp/tmpF6ZBLN/RIGt_MEi5e/telegnome-0.3.5/po/nl.gmo differ diff -Nru telegnome-0.3.4/po/nl.po telegnome-0.3.5/po/nl.po --- telegnome-0.3.4/po/nl.po 2016-08-09 21:46:07.000000000 +0000 +++ telegnome-0.3.5/po/nl.po 2019-09-05 08:38:07.000000000 +0000 @@ -1,177 +1,332 @@ -# SOME DESCRIPTIVE TITLE. +# Dutch translation for TeleGNOME # Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. +# Nathan Follens , 2019. # msgid "" msgstr "" "Project-Id-Version: telegnome 0.0.10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-28 23:40+0100\n" -"PO-Revision-Date: 2000-04-12 19:30+0200\n" -"Last-Translator: Unknown :-(\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/telegnome/issues\n" +"POT-Creation-Date: 2018-06-10 14:01+0000\n" +"PO-Revision-Date: 2019-03-04 17:43+0100\n" +"Last-Translator: Nathan Follens \n" "Language-Team: Dutch\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.2.1\n" -#. the app -#: ../src/gui.c:71 -msgid "TeleGNOME: Teletext for GNOME" -msgstr "TeleGNOME: NOS Teletekst voor GNOME" +#: data/org.gnome.telegnome.gschema.xml:5 +msgid "Legacy migration complete" +msgstr "Migratie van verouderde versie voltooid" -#: ../src/gui.c:263 -msgid "Page:" -msgstr "Pagina:" +#: data/org.gnome.telegnome.gschema.xml:6 +msgid "" +"Set internally to true to indicate that TeleGNOME has checked for legacy " +"gnome-config settings and migrated any that existed." +msgstr "" +"Stel dit intern in op true om aan te duiden dat TeleGNOME gecontroleerd " +"heeft op verouderde gnome-config-instellingen en deze, indien aanwezig, " +"heeft gemigreerd." + +# Misschien kanaaldochters - Nathan +#: data/org.gnome.telegnome.gschema.xml:10 +msgid "Channel children" +msgstr "Dochterkanalen" -#: ../src/gui.c:268 -msgid "Page number" -msgstr "Pagina nummer" +#: data/org.gnome.telegnome.gschema.xml:11 +msgid "" +"List of channel IDs. Each channel folder uses the org.gnome.telegnome." +"channel schema." +msgstr "" +"Lijst met kanaal-ID’s. Elke kanaalmap maakt gebruik van het org.gnome." +"telegnome.channel-schema." -#: ../src/gui.c:276 -msgid "Go To Page" -msgstr "Ga naar pagina..." +#: data/org.gnome.telegnome.gschema.xml:15 +msgid "Current channel" +msgstr "Huidige kanaal" + +#: data/org.gnome.telegnome.gschema.xml:16 +msgid "ID of current channel." +msgstr "ID van het huidige kanaal." + +#: data/org.gnome.telegnome.gschema.xml:20 +msgid "Zoom factor" +msgstr "Zoomfactor" + +#: data/org.gnome.telegnome.gschema.xml:21 +msgid "Page zoom factor. Larger numbers produce larger text." +msgstr "Paginazoomfactor. Hoe hoger het getal, des te groter de tekst." + +#: data/org.gnome.telegnome.gschema.xml:25 +msgid "Automatically switch page at periodic intervals" +msgstr "Pagina’s automatisch omslaan op periodieke intervallen" + +#: data/org.gnome.telegnome.gschema.xml:26 +msgid "The frequency of paging is controlled by the \"paging-interval\" key." +msgstr "De omslafrequentie wordt bepaald door de ‘paging-interval’-sleutel." -#: ../src/gui.c:282 -msgid "Get Previous Page" -msgstr "Vorige Pagina" +#: data/org.gnome.telegnome.gschema.xml:30 src/prefs.ui:164 +msgid "Paging interval" +msgstr "Auto-omslatijd" -#: ../src/gui.c:288 -msgid "Get Next Page" -msgstr "Volgende Pagina" +#: data/org.gnome.telegnome.gschema.xml:31 src/prefs.ui:165 +msgid "Specifies the interval for the auto-pager, in milliseconds." +msgstr "Bepaalt het interval voor het automatisch omslaan, in milliseconden." -#: ../src/gui.c:294 -msgid "Go to the home page" -msgstr "Ga naar de startpagina" +#: data/org.gnome.telegnome.gschema.xml:35 +msgid "Current page number" +msgstr "Huidige paginanummer" -#: ../src/gui.c:304 -msgid "Toggles auto-paging" -msgstr "Automatisch omslaan wisselen" +#: data/org.gnome.telegnome.gschema.xml:39 +msgid "Current subpage number" +msgstr "Huidige subpaginanummer" -#: ../src/gui.c:387 ../src/prefs.c:96 -msgid "Channels" -msgstr "Kanalen" +#: data/org.gnome.telegnome.gschema.xml:45 +msgid "Channel name" +msgstr "Kanaalnaam" -#: ../src/gui.c:400 -#, fuzzy, c-format -msgid "TeleGNOME: %s (%s)" -msgstr "TeleGNOME: Instellingen" +#: data/org.gnome.telegnome.gschema.xml:49 +msgid "Channel description" +msgstr "Kanaalbeschrijving" -#: ../src/gui.c:551 -#, fuzzy -msgid "Teletext for GNOME" -msgstr "TeleGNOME: NOS Teletekst voor GNOME" +#: data/org.gnome.telegnome.gschema.xml:53 src/prefs.ui:264 +msgid "Page URL" +msgstr "Pagina-URL" -#: ../src/gui.c:552 -msgid "GNU General Public License, version 2 or later" +#: data/org.gnome.telegnome.gschema.xml:54 +msgid "" +"URL pattern for pages. Must contain one C format string substitution " +"accepting an int (e.g. %d), for the page number." msgstr "" +"URL-patroon voor pagina’s. Moet een tekenreekssubstitutie in C-formaat " +"bevatten, die een int (bv. %d) aanvaardt als paginanummer." -#: ../src/gui.c:555 -msgid "translator-credits" +#: data/org.gnome.telegnome.gschema.xml:58 src/prefs.ui:282 +msgid "Subpage URL" +msgstr "Subpagina-URL" + +#: data/org.gnome.telegnome.gschema.xml:59 +msgid "" +"URL pattern for subpages. Must contain two C format string substitution " +"accepting ints (e.g. %d), for the page and subpage numbers respectively." msgstr "" +"URL-patroon voor subpagina’s. Moet twee tekenreekssubstituties in C-formaat " +"bevatten, die ints (bv. %d) aanvaarden als pagina- respectievelijk " +"subpaginanummers." + +#: data/org.gnome.telegnome.gschema.xml:63 +msgid "Country code" +msgstr "Landcode" -#: ../src/gui.c:616 -msgid "Error in page entry" -msgstr "Fout in pagina-invoer" +#: src/gui.vala:169 +#, c-format +msgid "TeleGNOME: %s (%s)" +msgstr "TeleGNOME: %s (%s)" -#: ../src/prefs.c:91 -msgid "TeleGNOME: Preferences" -msgstr "TeleGNOME: Instellingen" +#: src/gui.vala:377 +msgid "Web server error: Wrong page number?" +msgstr "Webserverfout: paginanummer onjuist?" -#: ../src/prefs.c:101 -msgid "Misc" -msgstr "Allerlei" +#: src/gui.vala:390 +msgid "Error making HTTP connection" +msgstr "Fout bij het opzetten van de HTTP-verbinding" -#: ../src/prefs.c:163 -msgid "Paging interval" -msgstr "Auto-omslaan tijd" +#: src/gui.vala:393 +msgid "Internal error in HTTP query code" +msgstr "Interne fout in HTTP-opvraagcode" -#: ../src/prefs.c:164 -msgid "Specifies the interval for the auto-pager, in milliseconds." -msgstr "Bepaalt het interval voor het automatisch omslaan, in milliseconden" +#: src/gui.vala:512 +msgid "Error in page entry" +msgstr "Fout in pagina-invoer" -#: ../src/prefs.c:174 -msgid "Proxy server" -msgstr "Proxy server" +#: src/menus.ui:24 +msgid "_File" +msgstr "_Bestand" + +#: src/menus.ui:26 +msgid "_Quit" +msgstr "Af_sluiten" + +#: src/menus.ui:32 +msgid "_Settings" +msgstr "_Instellingen" + +#: src/menus.ui:34 +msgid "_Preferences" +msgstr "_Voorkeuren" + +#: src/menus.ui:39 +msgid "_Channels" +msgstr "_Kanalen" + +#: src/menus.ui:42 +msgid "_Help" +msgstr "_Hulp" + +#: src/menus.ui:44 +msgid "_Contents" +msgstr "In_houd" + +#: src/menus.ui:49 +msgid "_About" +msgstr "I_nfo" -#: ../src/prefs.c:183 -msgid "Miscellaneous" -msgstr "Allerlei" +#: src/prefs.ui:40 +msgid "TeleGNOME: Preferences" +msgstr "TeleGNOME: instellingen" -#: ../src/prefs.c:198 ../src/prefs.c:318 +#: src/prefs.ui:61 src/prefs.ui:300 msgid "Country" msgstr "Land" -#: ../src/prefs.c:198 ../src/prefs.c:286 +#: src/prefs.ui:72 src/prefs.ui:228 msgid "Name" msgstr "Naam" -#. move up button -#: ../src/prefs.c:226 +#: src/prefs.ui:100 msgid "Move up" -msgstr "" +msgstr "Omhoog verplaatsen" -#. move down button -#: ../src/prefs.c:231 +#: src/prefs.ui:109 msgid "Move down" -msgstr "" +msgstr "Omlaag verplaatsen" -#. add button -#: ../src/prefs.c:236 +#: src/prefs.ui:118 msgid "Add..." -msgstr "Toevoegen..." +msgstr "Toevoegen…" -#. delete button -#: ../src/prefs.c:242 +#: src/prefs.ui:127 msgid "Delete" -msgstr "Verwijder" +msgstr "Verwijderen" -#. edit buton -#: ../src/prefs.c:248 +#: src/prefs.ui:136 msgid "Edit" msgstr "Bewerken" -#: ../src/prefs.c:276 +#: src/prefs.ui:154 +msgid "Channels" +msgstr "Kanalen" + +#: src/prefs.ui:186 +msgid "Miscellaneous" +msgstr "Allerlei" + +#: src/prefs.ui:195 src/prefs.ui:324 +msgid "_Cancel" +msgstr "_Annuleren" + +#: src/prefs.ui:201 src/prefs.ui:330 +msgid "_OK" +msgstr "_Oké" + +#: src/prefs.ui:212 msgid "New/Edit Channel" -msgstr "Nieuw kanaal/kanaal bewerken" +msgstr "Kanaal toevoegen/bewerken" + +#: src/prefs.ui:220 +msgid "Channel Information" +msgstr "Kanaalinformatie" -#: ../src/prefs.c:294 +#: src/prefs.ui:246 msgid "Description" msgstr "Omschrijving" -#: ../src/prefs.c:302 -#, fuzzy -msgid "Page url" -msgstr "Pagina url" +#: src/telegnome.ui:23 +msgid "TeleGNOME: Teletext for GNOME" +msgstr "TeleGNOME: teletekst voor Gnome" -#: ../src/prefs.c:310 -msgid "Subpage url" -msgstr "Subpagina url" +#: src/telegnome.ui:35 +msgid "Page:" +msgstr "Pagina:" -#: ../src/prefs.c:326 -msgid "Channel Information" -msgstr "Kanaal informatie" +#: src/telegnome.ui:47 +msgid "Page number" +msgstr "Paginanummer" -#: ../src/view.c:115 -msgid "Web server error: Wrong page number?" -msgstr "Web Server Foutmelding: Paginanummer onjuist?" +#: src/telegnome.ui:61 +msgid "_Jump to" +msgstr "_Ga naar" -#: ../src/view.c:134 -msgid "Error making HTTP connection" -msgstr "Fout bij het maken van de HTTP verbinding" +#: src/telegnome.ui:63 +msgid "Go To Page" +msgstr "Ga naar pagina" -#: ../src/view.c:137 -msgid "Internal error in HTTP query code" -msgstr "Interne HTTP foutmelding" +#: src/telegnome.ui:68 +msgid "_Back" +msgstr "_Terug" -#: ../telegnome.desktop.in.h:1 -#, fuzzy +#: src/telegnome.ui:70 +msgid "Get Previous Page" +msgstr "Vorige pagina" + +#: src/telegnome.ui:75 +msgid "_Forward" +msgstr "_Vooruit" + +#: src/telegnome.ui:77 +msgid "Get Next Page" +msgstr "Volgende pagina" + +#: src/telegnome.ui:82 +msgid "_Home" +msgstr "_Startpagina" + +#: src/telegnome.ui:84 +msgid "Go to the home page" +msgstr "Ga naar de startpagina" + +#: src/telegnome.ui:89 +msgid "_Play" +msgstr "Afs_pelen" + +#: src/telegnome.ui:91 +msgid "Toggles auto-paging" +msgstr "Automatisch omslaan in-/uitschakelen" + +#: src/telegnome.ui:145 telegnome.appdata.xml.in:27 telegnome.desktop.in:3 msgid "TeleGNOME" -msgstr "TeleGNOME: Instellingen" +msgstr "TeleGNOME" -#: ../telegnome.desktop.in.h:2 +#: src/telegnome.ui:147 +msgid "Teletext for GNOME" +msgstr "Teletekst voor Gnome" + +#: src/telegnome.ui:148 +msgid "GNU General Public License, version 2 or later" +msgstr "GNU General Public License, versie 2 of later" + +#: src/telegnome.ui:153 +msgid "translator-credits" +msgstr "" +"Nathan Follens\n" +"\n" +"Meer info over Gnome-NL http://nl.gnome.org" + +#: telegnome.appdata.xml.in:28 telegnome.desktop.in:4 msgid "Viewer for Teletext pages" -msgstr "Bladerprogramma voor Teletekstpagina's" +msgstr "Bladerprogramma voor teletekstpagina’s" + +#: telegnome.appdata.xml.in:31 +msgid "" +"TeleGNOME is a program to display teletext pages over the internet, based on " +"image feeds from a variety of broadcasters." +msgstr "" +"TeleGNOME is een toepassing om teletekstpagina’s via het internet weer te " +"geven, gebaseerd op afbeeldingsfeeds van verschillende omroepen." + +#~ msgid "Misc" +#~ msgstr "Allerlei" + +#~ msgid "Proxy server" +#~ msgstr "Proxy server" + +#, fuzzy +#~ msgid "Page url" +#~ msgstr "Pagina url" + +#~ msgid "Subpage url" +#~ msgstr "Subpagina url" #~ msgid "" #~ "Teletext for GNOME\n" @@ -201,15 +356,9 @@ #~ msgid "URL's" #~ msgstr "URL's" -#~ msgid "Page URL" -#~ msgstr "Pagina URL" - #~ msgid "URL to look up the teletext pages" #~ msgstr "URL voor de teletekst pagina's" -#~ msgid "Sub-page URL" -#~ msgstr "Sub-pagina URL" - #~ msgid "URL to look up the teletext sub-pages" #~ msgstr "URL voor de teletekst sub-pagina" Binary files /tmp/tmpF6ZBLN/DM8dHxAASF/telegnome-0.3.4/po/tr.gmo and /tmp/tmpF6ZBLN/RIGt_MEi5e/telegnome-0.3.5/po/tr.gmo differ diff -Nru telegnome-0.3.4/po/tr.po telegnome-0.3.5/po/tr.po --- telegnome-0.3.4/po/tr.po 2016-01-30 12:22:51.000000000 +0000 +++ telegnome-0.3.5/po/tr.po 2019-09-05 08:38:07.000000000 +0000 @@ -1,179 +1,324 @@ # Turkish translation for telegnome. # Copyright (C) 2015 telegnome's COPYRIGHT HOLDER # This file is distributed under the same license as the telegnome package. -# # Necdet Yücel , 2015. - +# Serdar Sağlam , 2019. +# msgid "" msgstr "" "Project-Id-Version: telegnome master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-12 14:11+0000\n" -"PO-Revision-Date: 2015-02-14 23:02+0000\n" -"Last-Translator: Necdet Yücel \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/telegnome/issues\n" +"POT-Creation-Date: 2019-01-11 21:41+0000\n" +"PO-Revision-Date: 2019-01-29 05:38+0300\n" +"Last-Translator: Serdar Sağlam \n" "Language-Team: Turkish \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: Pootle 2.5.1.1\n" +"X-Generator: Poedit 2.2.1\n" "X-POOTLE-MTIME: 1423954936.000000\n" -#: ../src/gui.c:46 -msgid "TeleGNOME: %s (%s)" -msgstr "TeleGNOME: %s (%s)" +#: data/org.gnome.telegnome.gschema.xml:5 +msgid "Legacy migration complete" +msgstr "Eski geçiş tamamlandı" -#: ../src/gui.c:193 -#: ../src/prefs.c:446 -msgid "Channels" -msgstr "Kanallar" +#: data/org.gnome.telegnome.gschema.xml:6 +msgid "" +"Set internally to true to indicate that TeleGNOME has checked for legacy " +"gnome-config settings and migrated any that existed." +msgstr "" +"TeleGNOME'un eski gnome-config ayarlarını kontrol ettiğini ve var olanları " +"geçirdiğini göstermek için dahili olarak etkin edin." -#: ../src/gui.c:334 -msgid "Page:" -msgstr "Sayfa:" +#: data/org.gnome.telegnome.gschema.xml:10 +msgid "Channel children" +msgstr "Kanal çocukları" -#: ../src/gui.c:339 -msgid "Page number" -msgstr "Sayfa numarası" +#: data/org.gnome.telegnome.gschema.xml:11 +msgid "" +"List of channel IDs. Each channel folder uses the org.gnome.telegnome." +"channel schema." +msgstr "" +"Kanal kimlikleri listesi. Her kanal klasörü org.gnome.telegnome.channel " +"şemasını kullanır." -#: ../src/gui.c:347 -msgid "Go To Page" -msgstr "Sayfaya Git" +#: data/org.gnome.telegnome.gschema.xml:15 +msgid "Current channel" +msgstr "Mevcut kanal" + +#: data/org.gnome.telegnome.gschema.xml:16 +msgid "ID of current channel." +msgstr "Geçerli kanalın kimliği." + +#: data/org.gnome.telegnome.gschema.xml:20 +msgid "Zoom factor" +msgstr "Yakınlaştırma etkeni" -#: ../src/gui.c:353 -msgid "Get Previous Page" -msgstr "Önceki Sayfayı Getir" +#: data/org.gnome.telegnome.gschema.xml:21 +msgid "Page zoom factor. Larger numbers produce larger text." +msgstr "" +"Sayfa yakınlaştırma etkeni, Daha büyük sayılar daha büyük metin üretir." -#: ../src/gui.c:359 -msgid "Get Next Page" -msgstr "Sonraki Sayfayı Getir" +#: data/org.gnome.telegnome.gschema.xml:25 +msgid "Automatically switch page at periodic intervals" +msgstr "Sayfayı düzenli aralıklarla otomatik olarak değiştir" -#: ../src/gui.c:365 -msgid "Go to the home page" -msgstr "Giriş sayfasına git" +#: data/org.gnome.telegnome.gschema.xml:26 +msgid "The frequency of paging is controlled by the \"paging-interval\" key." +msgstr "Çağrı frekansı \"çağrı-aralığı\" tuşu ile kontrol edilir." -#: ../src/gui.c:375 -msgid "Toggles auto-paging" -msgstr "Otomatik sayfalamayı değiştir" +#: data/org.gnome.telegnome.gschema.xml:30 src/prefs.ui:164 +msgid "Paging interval" +msgstr "Sayfalama aralığı" -#. the app -#: ../src/gui.c:406 -msgid "TeleGNOME: Teletext for GNOME" -msgstr "TeleGNOME: GNOME için teletext" +#: data/org.gnome.telegnome.gschema.xml:31 src/prefs.ui:165 +msgid "Specifies the interval for the auto-pager, in milliseconds." +msgstr "" +"Otomatik sayfa değiştirme aralığının milisaniye cinsinden miktarını belirtir." -#: ../src/gui.c:587 -msgid "Teletext for GNOME" -msgstr "GNOME için teletext" +#: data/org.gnome.telegnome.gschema.xml:35 +msgid "Current page number" +msgstr "Mevcut sayfa numarası" -#: ../src/gui.c:588 -msgid "GNU General Public License, version 2 or later" -msgstr "GNU Genel Kamu Lisansı, Sürüm 2 veya sonrası" +#: data/org.gnome.telegnome.gschema.xml:39 +msgid "Current subpage number" +msgstr "Mevcut alt sayfa numarası" -#: ../src/gui.c:591 -msgid "translator-credits" -msgstr "Necdet Yücel " +#: data/org.gnome.telegnome.gschema.xml:45 +msgid "Channel name" +msgstr "Kanal adı" -#: ../src/gui.c:675 -msgid "Error in page entry" -msgstr "Sayfa girdisinde hata" +#: data/org.gnome.telegnome.gschema.xml:49 +msgid "Channel description" +msgstr "Kanal tanımı" -#: ../src/prefs.c:99 -msgid "New/Edit Channel" -msgstr "Yeni Kanal/Kanalı Düzenle" +#: data/org.gnome.telegnome.gschema.xml:53 src/prefs.ui:264 +msgid "Page URL" +msgstr "Sayfa URL'si" -#: ../src/prefs.c:109 -#: ../src/prefs.c:368 -msgid "Name" -msgstr "İsim" +#: data/org.gnome.telegnome.gschema.xml:54 +msgid "" +"URL pattern for pages. Must contain one C format string substitution " +"accepting an int (e.g. %d), for the page number." +msgstr "" +"Sayfalar için URL düzeni. Sayfa numarası için bir (örn. %d) kabul edilen bir " +"C dili dizesi içermelidir." -#: ../src/prefs.c:117 -msgid "Description" -msgstr "Tanımlama" +#: data/org.gnome.telegnome.gschema.xml:58 src/prefs.ui:282 +msgid "Subpage URL" +msgstr "Alt sayfa URL'si" -#: ../src/prefs.c:125 -msgid "Page url" -msgstr "Sayfa adresi" - -#: ../src/prefs.c:133 -msgid "Subpage url" -msgstr "Alt sayfa adresi" +#: data/org.gnome.telegnome.gschema.xml:59 +msgid "" +"URL pattern for subpages. Must contain two C format string substitution " +"accepting ints (e.g. %d), for the page and subpage numbers respectively." +msgstr "" +"Alt sayfalar için URL düzeni. Sırasıyla sayfa ve alt sayfa numaraları için " +"iki C dili dize değişimini kabul eden girişleri (ör.%d) içermelidir." -#: ../src/prefs.c:141 -#: ../src/prefs.c:368 -msgid "Country" -msgstr "Ülke" +#: data/org.gnome.telegnome.gschema.xml:63 +msgid "Country code" +msgstr "Ülke kodu" -#: ../src/prefs.c:149 -msgid "Channel Information" -msgstr "Kanal Bilgisi" +#: src/gui.vala:169 +#, c-format +msgid "TeleGNOME: %s (%s)" +msgstr "TeleGNOME: %s (%s)" -#: ../src/prefs.c:333 -msgid "Paging interval" -msgstr "Sayfalama aralığı" +#: src/gui.vala:377 +msgid "Web server error: Wrong page number?" +msgstr "Web sunucu hatası: Hatalı sayfa numarası olabilir mi?" -#: ../src/prefs.c:334 -msgid "Specifies the interval for the auto-pager, in milliseconds." -msgstr "" -"Otomatik sayfa değiştirme aralığının milisaniye cinsinden miktarını belirtir" +#: src/gui.vala:390 +msgid "Error making HTTP connection" +msgstr "HTTP bağlantısı kurulurken hata oluştu" -#: ../src/prefs.c:344 -msgid "Proxy server" -msgstr "Vekil sunucu" +#: src/gui.vala:393 +msgid "Internal error in HTTP query code" +msgstr "HTTP sorgu kodunda iç hata" -#: ../src/prefs.c:353 -msgid "Miscellaneous" -msgstr "Çeşitli" +#: src/gui.vala:512 +msgid "Error in page entry" +msgstr "Sayfa girdisinde hata" + +#: src/menus.ui:24 +msgid "_File" +msgstr "_Dosya" + +#: src/menus.ui:26 +msgid "_Quit" +msgstr "_Çıkış" + +#: src/menus.ui:32 +msgid "_Settings" +msgstr "_Ayarlar" + +#: src/menus.ui:34 +msgid "_Preferences" +msgstr "_Tercihler" + +#: src/menus.ui:39 +msgid "_Channels" +msgstr "_Kanallar" + +#: src/menus.ui:42 +msgid "_Help" +msgstr "_Yardım" + +#: src/menus.ui:44 +msgid "_Contents" +msgstr "_İçerik" + +#: src/menus.ui:49 +msgid "_About" +msgstr "_Hakkında" -#. move up button -#: ../src/prefs.c:396 +#: src/prefs.ui:40 +msgid "TeleGNOME: Preferences" +msgstr "TeleGNOME: Tercihler" + +#: src/prefs.ui:61 src/prefs.ui:300 +msgid "Country" +msgstr "Ülke" + +#: src/prefs.ui:72 src/prefs.ui:228 +msgid "Name" +msgstr "İsim" + +#: src/prefs.ui:100 msgid "Move up" msgstr "Yukarı taşı" -#. move down button -#: ../src/prefs.c:401 +#: src/prefs.ui:109 msgid "Move down" msgstr "Aşağı taşı" -#. add button -#: ../src/prefs.c:406 +#: src/prefs.ui:118 msgid "Add..." msgstr "Ekle..." -#. delete button -#: ../src/prefs.c:412 +#: src/prefs.ui:127 msgid "Delete" msgstr "Sil" -#. edit buton -#: ../src/prefs.c:418 +#: src/prefs.ui:136 msgid "Edit" msgstr "Düzenle" -#: ../src/prefs.c:441 -msgid "TeleGNOME: Preferences" -msgstr "TeleGNOME: Tercihler" +#: src/prefs.ui:154 +msgid "Channels" +msgstr "Kanallar" -#: ../src/prefs.c:451 -msgid "Misc" +#: src/prefs.ui:186 +msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/view.c:114 -msgid "Web server error: Wrong page number?" -msgstr "Web sunucu hatası: Hatalı sayfa numarası olabilir mi?" +#: src/prefs.ui:195 src/prefs.ui:324 +msgid "_Cancel" +msgstr "_İptal" + +#: src/prefs.ui:201 src/prefs.ui:330 +msgid "_OK" +msgstr "_Tamam" -#: ../src/view.c:133 -msgid "Error making HTTP connection" -msgstr "HTTP bağlantısı kurulurken hata oluştu" +#: src/prefs.ui:212 +msgid "New/Edit Channel" +msgstr "Yeni Kanal/Kanalı Düzenle" -#: ../src/view.c:136 -msgid "Internal error in HTTP query code" -msgstr "HTTP sorgu kodunda iç hata" +#: src/prefs.ui:220 +msgid "Channel Information" +msgstr "Kanal Bilgisi" + +#: src/prefs.ui:246 +msgid "Description" +msgstr "Tanımlama" + +#: src/telegnome.ui:23 +msgid "TeleGNOME: Teletext for GNOME" +msgstr "TeleGNOME: GNOME için teletext" + +#: src/telegnome.ui:35 +msgid "Page:" +msgstr "Sayfa:" + +#: src/telegnome.ui:47 +msgid "Page number" +msgstr "Sayfa numarası" + +#: src/telegnome.ui:61 +msgid "_Jump to" +msgstr "_Atla" + +#: src/telegnome.ui:63 +msgid "Go To Page" +msgstr "Sayfaya Git" + +#: src/telegnome.ui:68 +msgid "_Back" +msgstr "_Geri" + +#: src/telegnome.ui:70 +msgid "Get Previous Page" +msgstr "Önceki Sayfayı Getir" + +#: src/telegnome.ui:75 +msgid "_Forward" +msgstr "_İleri" + +#: src/telegnome.ui:77 +msgid "Get Next Page" +msgstr "Sonraki Sayfayı Getir" + +#: src/telegnome.ui:82 +msgid "_Home" +msgstr "_Ev" + +#: src/telegnome.ui:84 +msgid "Go to the home page" +msgstr "Giriş sayfasına git" + +#: src/telegnome.ui:89 +msgid "_Play" +msgstr "_oynat" -#: ../telegnome.desktop.in.h:1 +#: src/telegnome.ui:91 +msgid "Toggles auto-paging" +msgstr "Otomatik sayfalamayı değiştir" + +#: src/telegnome.ui:145 telegnome.appdata.xml.in:27 telegnome.desktop.in:3 msgid "TeleGNOME" msgstr "TeleGNOME" -#: ../telegnome.desktop.in.h:2 +#: src/telegnome.ui:147 +msgid "Teletext for GNOME" +msgstr "GNOME için teletext" + +#: src/telegnome.ui:148 +msgid "GNU General Public License, version 2 or later" +msgstr "GNU Genel Kamu Lisansı, Sürüm 2 veya sonrası" + +#: src/telegnome.ui:153 +msgid "translator-credits" +msgstr "" +"Necdet Yücel \n" +"Serdar Sağlam " + +#: telegnome.appdata.xml.in:28 telegnome.desktop.in:4 msgid "Viewer for Teletext pages" msgstr "Teletext sayfası görüntüleyici" + +#: telegnome.appdata.xml.in:31 +msgid "" +"TeleGNOME is a program to display teletext pages over the internet, based on " +"image feeds from a variety of broadcasters." +msgstr "" +"TeleGNOME, çeşitli yayıncıların görüntü yayınlarından, teletekst sayfalarını " +"internet üzerinden görüntülemek için bir uygulamadır." + +#~ msgid "Proxy server" +#~ msgstr "Vekil sunucu" + +#~ msgid "Misc" +#~ msgstr "Çeşitli" diff -Nru telegnome-0.3.4/README telegnome-0.3.5/README --- telegnome-0.3.4/README 2018-02-10 02:27:36.000000000 +0000 +++ telegnome-0.3.5/README 2019-02-05 22:32:38.000000000 +0000 @@ -10,7 +10,6 @@ GTK+ >= 3.22 gdk-pixbuf >= 2.26 cairo >= 1.10 -dconf uuid If you want to rebuild the generated C files from their Vala source files, diff -Nru telegnome-0.3.4/src/app.c telegnome-0.3.5/src/app.c --- telegnome-0.3.4/src/app.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/app.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* app.c generated by valac 0.42.2, the Vala compiler +/* app.c generated by valac 0.42.5, the Vala compiler * generated from app.vala, do not modify */ /* @@ -347,7 +347,7 @@ { tg_app_parent_class = g_type_class_peek_parent (klass); g_type_class_adjust_private_offset (klass, &TgApp_private_offset); - ((GApplicationClass *) klass)->activate = (void (*) (GApplication *)) tg_app_real_activate; + ((GApplicationClass *) klass)->activate = (void (*) (GApplication*)) tg_app_real_activate; G_OBJECT_CLASS (klass)->get_property = _vala_tg_app_get_property; G_OBJECT_CLASS (klass)->finalize = tg_app_finalize; g_object_class_install_property (G_OBJECT_CLASS (klass), TG_APP_GUI_PROPERTY, tg_app_properties[TG_APP_GUI_PROPERTY] = g_param_spec_object ("gui", "gui", "gui", TG_TYPE_GUI, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); diff -Nru telegnome-0.3.4/src/channel.c telegnome-0.3.5/src/channel.c --- telegnome-0.3.4/src/channel.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/channel.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* channel.c generated by valac 0.42.2, the Vala compiler +/* channel.c generated by valac 0.42.5, the Vala compiler * generated from channel.vala, do not modify */ /* diff -Nru telegnome-0.3.4/src/gui.c telegnome-0.3.5/src/gui.c --- telegnome-0.3.4/src/gui.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/gui.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* gui.c generated by valac 0.42.2, the Vala compiler +/* gui.c generated by valac 0.42.5, the Vala compiler * generated from gui.vala, do not modify */ /* @@ -35,6 +35,11 @@ #include #include +typedef enum { + TG_INPUT_STATUS_NEW, + TG_INPUT_STATUS_CONTINUED +} TgInputStatus; + #define TG_TYPE_INPUT_STATUS (tg_input_status_get_type ()) @@ -102,11 +107,6 @@ #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); -typedef enum { - TG_INPUT_STATUS_NEW, - TG_INPUT_STATUS_CONTINUED -} TgInputStatus; - struct _TgGui { GObject parent_instance; TgGuiPrivate * priv; @@ -1044,7 +1044,7 @@ GKeyFile* file = NULL; GKeyFile* _tmp13_; GKeyFile* _tmp21_; - gsize _tmp22_; + gsize _tmp22_ = 0; gchar** _tmp23_; GSettings* _tmp52_; gchar** _tmp53_; @@ -1091,7 +1091,7 @@ { GKeyFile* _tmp14_; GBytes* _tmp15_; - gsize _tmp16_; + gsize _tmp16_ = 0; guint8* _tmp17_; GBytes* _tmp18_; gint _tmp19_; diff -Nru telegnome-0.3.4/src/http.c telegnome-0.3.5/src/http.c --- telegnome-0.3.4/src/http.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/http.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* http.c generated by valac 0.42.2, the Vala compiler +/* http.c generated by valac 0.42.5, the Vala compiler * generated from http.vala, do not modify */ /* @@ -77,7 +77,7 @@ GQuark tg_http_error_quark (void) { - return g_quark_from_static_string ("tg_http_error-quark"); + return g_quark_from_static_string ("tg-http-error-quark"); } diff -Nru telegnome-0.3.4/src/legacy-config.c telegnome-0.3.5/src/legacy-config.c --- telegnome-0.3.4/src/legacy-config.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/legacy-config.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* legacy-config.c generated by valac 0.42.2, the Vala compiler +/* legacy-config.c generated by valac 0.42.5, the Vala compiler * generated from legacy-config.vala, do not modify */ /* @@ -302,8 +302,8 @@ gchar** _tmp36_; gint children_length1; gint _children_size_; - gchar** _tmp96_; - gint _tmp96__length1; + gchar** _tmp95_; + gint _tmp95__length1; g_return_if_fail (settings != NULL); if (g_settings_get_boolean (settings, "legacy-migration-complete")) { return; @@ -459,32 +459,31 @@ gint _tmp57_; const gchar* _tmp58_; gchar* _tmp59_; - gchar* _tmp60_; GSettings* channel_settings = NULL; - const gchar* _tmp61_; - GSettings* _tmp62_; - GSList* _tmp63_; - const gchar* _tmp64_; - gchar* _tmp65_; - const gchar* _tmp66_; - GSList* _tmp69_; - const gchar* _tmp70_; - gchar* _tmp71_; - const gchar* _tmp72_; - GSList* _tmp75_; - const gchar* _tmp76_; - gchar* _tmp77_; - const gchar* _tmp78_; - GSList* _tmp81_; - const gchar* _tmp82_; - gchar* _tmp83_; - const gchar* _tmp84_; - GSList* _tmp87_; - const gchar* _tmp88_; - gchar* _tmp89_; - const gchar* _tmp90_; + const gchar* _tmp60_; + GSettings* _tmp61_; + GSList* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + const gchar* _tmp65_; + GSList* _tmp68_; + const gchar* _tmp69_; + gchar* _tmp70_; + const gchar* _tmp71_; + GSList* _tmp74_; + const gchar* _tmp75_; + gchar* _tmp76_; + const gchar* _tmp77_; + GSList* _tmp80_; + const gchar* _tmp81_; + gchar* _tmp82_; + const gchar* _tmp83_; + GSList* _tmp86_; + const gchar* _tmp87_; + gchar* _tmp88_; + const gchar* _tmp89_; + gint _tmp92_; gint _tmp93_; - gint _tmp94_; if (!_tmp37_) { gint _tmp38_; _tmp38_ = i; @@ -534,81 +533,80 @@ _tmp59_ = g_strdup (_tmp58_); _g_free0 (_tmp56_[_tmp57_]); _tmp56_[_tmp57_] = _tmp59_; - _tmp60_ = _tmp56_[_tmp57_]; - _tmp61_ = child_path; - _tmp62_ = g_settings_new_with_path ("org.gnome.telegnome.channel", _tmp61_); - channel_settings = _tmp62_; - _tmp63_ = keyfiles; - _tmp64_ = channel_group; - _tmp65_ = tg_get_value (_tmp63_, _tmp64_, "name"); + _tmp60_ = child_path; + _tmp61_ = g_settings_new_with_path ("org.gnome.telegnome.channel", _tmp60_); + channel_settings = _tmp61_; + _tmp62_ = keyfiles; + _tmp63_ = channel_group; + _tmp64_ = tg_get_value (_tmp62_, _tmp63_, "name"); _g_free0 (val); - val = _tmp65_; - _tmp66_ = val; - if (_tmp66_ != NULL) { - GSettings* _tmp67_; - const gchar* _tmp68_; - _tmp67_ = channel_settings; - _tmp68_ = val; - g_settings_set_string (_tmp67_, "name", _tmp68_); - } - _tmp69_ = keyfiles; - _tmp70_ = channel_group; - _tmp71_ = tg_get_value (_tmp69_, _tmp70_, "desc"); + val = _tmp64_; + _tmp65_ = val; + if (_tmp65_ != NULL) { + GSettings* _tmp66_; + const gchar* _tmp67_; + _tmp66_ = channel_settings; + _tmp67_ = val; + g_settings_set_string (_tmp66_, "name", _tmp67_); + } + _tmp68_ = keyfiles; + _tmp69_ = channel_group; + _tmp70_ = tg_get_value (_tmp68_, _tmp69_, "desc"); _g_free0 (val); - val = _tmp71_; - _tmp72_ = val; - if (_tmp72_ != NULL) { - GSettings* _tmp73_; - const gchar* _tmp74_; - _tmp73_ = channel_settings; - _tmp74_ = val; - g_settings_set_string (_tmp73_, "description", _tmp74_); - } - _tmp75_ = keyfiles; - _tmp76_ = channel_group; - _tmp77_ = tg_get_value (_tmp75_, _tmp76_, "page_url"); + val = _tmp70_; + _tmp71_ = val; + if (_tmp71_ != NULL) { + GSettings* _tmp72_; + const gchar* _tmp73_; + _tmp72_ = channel_settings; + _tmp73_ = val; + g_settings_set_string (_tmp72_, "description", _tmp73_); + } + _tmp74_ = keyfiles; + _tmp75_ = channel_group; + _tmp76_ = tg_get_value (_tmp74_, _tmp75_, "page_url"); _g_free0 (val); - val = _tmp77_; - _tmp78_ = val; - if (_tmp78_ != NULL) { - GSettings* _tmp79_; - const gchar* _tmp80_; - _tmp79_ = channel_settings; - _tmp80_ = val; - g_settings_set_string (_tmp79_, "page-url", _tmp80_); - } - _tmp81_ = keyfiles; - _tmp82_ = channel_group; - _tmp83_ = tg_get_value (_tmp81_, _tmp82_, "subpage_url"); + val = _tmp76_; + _tmp77_ = val; + if (_tmp77_ != NULL) { + GSettings* _tmp78_; + const gchar* _tmp79_; + _tmp78_ = channel_settings; + _tmp79_ = val; + g_settings_set_string (_tmp78_, "page-url", _tmp79_); + } + _tmp80_ = keyfiles; + _tmp81_ = channel_group; + _tmp82_ = tg_get_value (_tmp80_, _tmp81_, "subpage_url"); _g_free0 (val); - val = _tmp83_; - _tmp84_ = val; - if (_tmp84_ != NULL) { - GSettings* _tmp85_; - const gchar* _tmp86_; - _tmp85_ = channel_settings; - _tmp86_ = val; - g_settings_set_string (_tmp85_, "subpage-url", _tmp86_); - } - _tmp87_ = keyfiles; - _tmp88_ = channel_group; - _tmp89_ = tg_get_value (_tmp87_, _tmp88_, "country"); + val = _tmp82_; + _tmp83_ = val; + if (_tmp83_ != NULL) { + GSettings* _tmp84_; + const gchar* _tmp85_; + _tmp84_ = channel_settings; + _tmp85_ = val; + g_settings_set_string (_tmp84_, "subpage-url", _tmp85_); + } + _tmp86_ = keyfiles; + _tmp87_ = channel_group; + _tmp88_ = tg_get_value (_tmp86_, _tmp87_, "country"); _g_free0 (val); - val = _tmp89_; - _tmp90_ = val; - if (_tmp90_ != NULL) { - GSettings* _tmp91_; - const gchar* _tmp92_; - _tmp91_ = channel_settings; - _tmp92_ = val; - g_settings_set_string (_tmp91_, "country", _tmp92_); - } - _tmp93_ = i; - _tmp94_ = current_channel; - if (_tmp93_ == _tmp94_) { - const gchar* _tmp95_; - _tmp95_ = uuid; - g_settings_set_string (settings, "current-channel", _tmp95_); + val = _tmp88_; + _tmp89_ = val; + if (_tmp89_ != NULL) { + GSettings* _tmp90_; + const gchar* _tmp91_; + _tmp90_ = channel_settings; + _tmp91_ = val; + g_settings_set_string (_tmp90_, "country", _tmp91_); + } + _tmp92_ = i; + _tmp93_ = current_channel; + if (_tmp92_ == _tmp93_) { + const gchar* _tmp94_; + _tmp94_ = uuid; + g_settings_set_string (settings, "current-channel", _tmp94_); } _g_object_unref0 (channel_settings); _g_free0 (child_path); @@ -619,9 +617,9 @@ } } } - _tmp96_ = children; - _tmp96__length1 = children_length1; - g_settings_set_strv (settings, "channel-children", _tmp96_); + _tmp95_ = children; + _tmp95__length1 = children_length1; + g_settings_set_strv (settings, "channel-children", _tmp95_); g_settings_set_boolean (settings, "legacy-migration-complete", TRUE); g_settings_sync (); children = (_vala_array_free (children, children_length1, (GDestroyNotify) g_free), NULL); diff -Nru telegnome-0.3.4/src/main.c telegnome-0.3.5/src/main.c --- telegnome-0.3.4/src/main.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/main.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.42.2, the Vala compiler +/* main.c generated by valac 0.42.5, the Vala compiler * generated from main.vala, do not modify */ /* diff -Nru telegnome-0.3.4/src/Makefile.am telegnome-0.3.5/src/Makefile.am --- telegnome-0.3.4/src/Makefile.am 2018-02-10 02:26:16.000000000 +0000 +++ telegnome-0.3.5/src/Makefile.am 2019-02-05 22:32:38.000000000 +0000 @@ -3,8 +3,7 @@ AM_VALAFLAGS = \ --pkg posix \ --pkg gtk+-3.0 \ - --pkg cairo \ - --pkg dconf + --pkg cairo bin_PROGRAMS = telegnome diff -Nru telegnome-0.3.4/src/Makefile.in telegnome-0.3.5/src/Makefile.in --- telegnome-0.3.4/src/Makefile.in 2019-01-11 21:15:38.000000000 +0000 +++ telegnome-0.3.5/src/Makefile.in 2019-09-05 09:19:17.000000000 +0000 @@ -345,8 +345,7 @@ AM_VALAFLAGS = \ --pkg posix \ --pkg gtk+-3.0 \ - --pkg cairo \ - --pkg dconf + --pkg cairo telegnome_SOURCES = \ app.vala \ diff -Nru telegnome-0.3.4/src/pixpack.c telegnome-0.3.5/src/pixpack.c --- telegnome-0.3.4/src/pixpack.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/pixpack.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* pixpack.c generated by valac 0.42.2, the Vala compiler +/* pixpack.c generated by valac 0.42.5, the Vala compiler * generated from pixpack.vala, do not modify */ /* @@ -340,8 +340,8 @@ { tg_pixpack_parent_class = g_type_class_peek_parent (klass); g_type_class_adjust_private_offset (klass, &TgPixpack_private_offset); - ((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) tg_pixpack_real_realize; - ((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) tg_pixpack_real_draw; + ((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget*)) tg_pixpack_real_realize; + ((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget*, cairo_t*)) tg_pixpack_real_draw; G_OBJECT_CLASS (klass)->get_property = _vala_tg_pixpack_get_property; G_OBJECT_CLASS (klass)->set_property = _vala_tg_pixpack_set_property; G_OBJECT_CLASS (klass)->finalize = tg_pixpack_finalize; diff -Nru telegnome-0.3.4/src/prefs.c telegnome-0.3.5/src/prefs.c --- telegnome-0.3.4/src/prefs.c 2018-10-27 21:24:52.000000000 +0000 +++ telegnome-0.3.5/src/prefs.c 2019-02-05 22:32:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* prefs.c generated by valac 0.42.2, the Vala compiler +/* prefs.c generated by valac 0.42.5, the Vala compiler * generated from prefs.vala, do not modify */ /* @@ -27,7 +27,12 @@ #include #include #include -#include + +typedef enum { + TG_COLUMN_COUNTRY, + TG_COLUMN_NAME, + TG_COLUMN_CHANNEL +} TgColumn; #define TG_TYPE_COLUMN (tg_column_get_type ()) @@ -76,12 +81,6 @@ #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); -typedef enum { - TG_COLUMN_COUNTRY, - TG_COLUMN_NAME, - TG_COLUMN_CHANNEL -} TgColumn; - struct _TgPrefs { GObject parent_instance; TgPrefsPrivate * priv; @@ -654,8 +653,8 @@ gchar* description = NULL; GtkTreeIter _tmp0_ = {0}; gboolean _tmp1_; - GtkLabel* _tmp9_; - const gchar* _tmp10_; + GtkLabel* _tmp10_; + const gchar* _tmp11_; g_return_if_fail (self != NULL); g_return_if_fail (selection != NULL); _tmp1_ = gtk_tree_selection_get_selected (selection, NULL, &_tmp0_); @@ -664,29 +663,32 @@ TgChannel* channel = NULL; GtkListStore* _tmp2_; GtkTreeIter _tmp3_; - TgChannel* _tmp4_; - const gchar* _tmp5_; + TgChannel* _tmp4_ = NULL; + TgChannel* _tmp5_; const gchar* _tmp6_; - gchar* _tmp7_; + const gchar* _tmp7_; + gchar* _tmp8_; _tmp2_ = self->priv->channel_store; _tmp3_ = iter; - gtk_tree_model_get ((GtkTreeModel*) _tmp2_, &_tmp3_, TG_COLUMN_CHANNEL, &channel, -1, -1); - _tmp4_ = channel; - _tmp5_ = tg_channel_get_description (_tmp4_); - _tmp6_ = _tmp5_; - _tmp7_ = g_strdup (_tmp6_); + gtk_tree_model_get ((GtkTreeModel*) _tmp2_, &_tmp3_, TG_COLUMN_CHANNEL, &_tmp4_, -1, -1); + _g_object_unref0 (channel); + channel = _tmp4_; + _tmp5_ = channel; + _tmp6_ = tg_channel_get_description (_tmp5_); + _tmp7_ = _tmp6_; + _tmp8_ = g_strdup (_tmp7_); _g_free0 (description); - description = _tmp7_; + description = _tmp8_; _g_object_unref0 (channel); } else { - gchar* _tmp8_; - _tmp8_ = g_strdup (""); + gchar* _tmp9_; + _tmp9_ = g_strdup (""); _g_free0 (description); - description = _tmp8_; + description = _tmp9_; } - _tmp9_ = self->priv->channel_label; - _tmp10_ = description; - gtk_label_set_text (_tmp9_, _tmp10_); + _tmp10_ = self->priv->channel_label; + _tmp11_ = description; + gtk_label_set_text (_tmp10_, _tmp11_); _g_free0 (description); } @@ -750,13 +752,13 @@ TgChannel* channel = NULL; GtkListStore* _tmp15_; GtkTreeIter _tmp16_; - gchar** _tmp17_; - gint _tmp17__length1; - gint _tmp18_; - TgChannel* _tmp19_; - const gchar* _tmp20_; + TgChannel* _tmp17_ = NULL; + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + TgChannel* _tmp20_; const gchar* _tmp21_; - gchar* _tmp22_; + const gchar* _tmp22_; gchar* _tmp23_; GtkListStore* _tmp24_; gboolean _tmp25_; @@ -769,18 +771,19 @@ _vala_assert (_tmp13_ < _tmp14_, "i < rows"); _tmp15_ = self->priv->channel_store; _tmp16_ = iter; - gtk_tree_model_get ((GtkTreeModel*) _tmp15_, &_tmp16_, TG_COLUMN_CHANNEL, &channel, -1, -1); - _tmp17_ = children; - _tmp17__length1 = children_length1; - _tmp18_ = i; - i = _tmp18_ + 1; - _tmp19_ = channel; - _tmp20_ = tg_channel_get_uuid (_tmp19_); - _tmp21_ = _tmp20_; - _tmp22_ = g_strdup (_tmp21_); - _g_free0 (_tmp17_[_tmp18_]); - _tmp17_[_tmp18_] = _tmp22_; - _tmp23_ = _tmp17_[_tmp18_]; + gtk_tree_model_get ((GtkTreeModel*) _tmp15_, &_tmp16_, TG_COLUMN_CHANNEL, &_tmp17_, -1, -1); + _g_object_unref0 (channel); + channel = _tmp17_; + _tmp18_ = children; + _tmp18__length1 = children_length1; + _tmp19_ = i; + i = _tmp19_ + 1; + _tmp20_ = channel; + _tmp21_ = tg_channel_get_uuid (_tmp20_); + _tmp22_ = _tmp21_; + _tmp23_ = g_strdup (_tmp22_); + _g_free0 (_tmp18_[_tmp19_]); + _tmp18_[_tmp19_] = _tmp23_; _tmp24_ = self->priv->channel_store; _tmp25_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp24_, &iter); valid = _tmp25_; @@ -865,7 +868,7 @@ gint _tmp11_; gint* indices = NULL; GtkTreePath* _tmp12_; - gint _tmp13_; + gint _tmp13_ = 0; gint* _tmp14_; gint* _tmp15_; gint _tmp15__length1; @@ -993,7 +996,8 @@ TgChannel* channel = NULL; GtkListStore* _tmp6_; GtkTreeIter _tmp7_; - TgChannel* _tmp8_; + TgChannel* _tmp8_ = NULL; + TgChannel* _tmp9_; g_return_if_fail (self != NULL); _tmp0_ = self->priv->channel_view; _tmp1_ = gtk_tree_view_get_selection (_tmp0_); @@ -1008,42 +1012,34 @@ } _tmp6_ = self->priv->channel_store; _tmp7_ = iter; - gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, TG_COLUMN_CHANNEL, &channel, -1, -1); - _tmp8_ = channel; - if (tg_prefs_edit_channel (self, _tmp8_)) { - GtkListStore* _tmp9_; - GtkTreeIter _tmp10_; - TgChannel* _tmp11_; - const gchar* _tmp12_; + gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, TG_COLUMN_CHANNEL, &_tmp8_, -1, -1); + _g_object_unref0 (channel); + channel = _tmp8_; + _tmp9_ = channel; + if (tg_prefs_edit_channel (self, _tmp9_)) { + GtkListStore* _tmp10_; + GtkTreeIter _tmp11_; + TgChannel* _tmp12_; const gchar* _tmp13_; - TgChannel* _tmp14_; - const gchar* _tmp15_; + const gchar* _tmp14_; + TgChannel* _tmp15_; const gchar* _tmp16_; - _tmp9_ = self->priv->channel_store; - _tmp10_ = iter; - _tmp11_ = channel; - _tmp12_ = tg_channel_get_country (_tmp11_); - _tmp13_ = _tmp12_; - _tmp14_ = channel; - _tmp15_ = tg_channel_get_name (_tmp14_); - _tmp16_ = _tmp15_; - gtk_list_store_set (_tmp9_, &_tmp10_, TG_COLUMN_COUNTRY, _tmp13_, TG_COLUMN_NAME, _tmp16_, -1, -1); + const gchar* _tmp17_; + _tmp10_ = self->priv->channel_store; + _tmp11_ = iter; + _tmp12_ = channel; + _tmp13_ = tg_channel_get_country (_tmp12_); + _tmp14_ = _tmp13_; + _tmp15_ = channel; + _tmp16_ = tg_channel_get_name (_tmp15_); + _tmp17_ = _tmp16_; + gtk_list_store_set (_tmp10_, &_tmp11_, TG_COLUMN_COUNTRY, _tmp14_, TG_COLUMN_NAME, _tmp17_, -1, -1); } _g_object_unref0 (channel); _g_object_unref0 (selection); } -static const gchar* -string_to_string (const gchar* self) -{ - const gchar* result = NULL; - g_return_val_if_fail (self != NULL, NULL); - result = self; - return result; -} - - static void tg_prefs_on_channel_delete (TgPrefs* self) { @@ -1058,19 +1054,15 @@ TgChannel* channel = NULL; GtkListStore* _tmp6_; GtkTreeIter _tmp7_; - gchar* old_uuid = NULL; - TgChannel* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - GtkListStore* _tmp12_; + TgChannel* _tmp8_ = NULL; + GtkListStore* _tmp9_; + GSettings* settings = NULL; + TgChannel* _tmp10_; + GSettings* _tmp11_; + GSettings* _tmp12_; GSettings* _tmp13_; - GSettingsBackend* _tmp14_; - GSettingsBackend* _tmp15_; - GSettingsBackend* _tmp16_; - const gchar* _tmp17_; - gboolean _tmp18_; - GError * _inner_error_ = NULL; + GSettings* _tmp14_; + GSettings* _tmp15_; g_return_if_fail (self != NULL); _tmp0_ = self->priv->channel_view; _tmp1_ = gtk_tree_view_get_selection (_tmp0_); @@ -1085,71 +1077,22 @@ } _tmp6_ = self->priv->channel_store; _tmp7_ = iter; - gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, TG_COLUMN_CHANNEL, &channel, -1, -1); - _tmp8_ = channel; - _tmp9_ = tg_channel_get_uuid (_tmp8_); - _tmp10_ = _tmp9_; - _tmp11_ = g_strdup (_tmp10_); - old_uuid = _tmp11_; - _tmp12_ = self->priv->channel_store; - gtk_list_store_remove (_tmp12_, &iter); + gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, TG_COLUMN_CHANNEL, &_tmp8_, -1, -1); + _g_object_unref0 (channel); + channel = _tmp8_; + _tmp9_ = self->priv->channel_store; + gtk_list_store_remove (_tmp9_, &iter); tg_prefs_sync_channel_children (self); - _tmp13_ = self->priv->settings; - g_object_get (_tmp13_, "backend", &_tmp14_, NULL); - _tmp15_ = _tmp14_; - _tmp16_ = _tmp15_; - _tmp17_ = g_type_name (G_TYPE_FROM_INSTANCE ((GObject*) _tmp16_)); - _tmp18_ = g_strcmp0 (_tmp17_, "DConfSettingsBackend") == 0; - _g_object_unref0 (_tmp16_); - if (_tmp18_) { - gchar* path = NULL; - const gchar* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - DConfClient* client = NULL; - DConfClient* _tmp22_; - _tmp19_ = old_uuid; - _tmp20_ = string_to_string (_tmp19_); - _tmp21_ = g_strconcat ("/org/gnome/telegnome/channel/", _tmp20_, "/", NULL); - path = _tmp21_; - _tmp22_ = dconf_client_new (); - client = _tmp22_; - { - DConfClient* _tmp23_; - const gchar* _tmp24_; - _tmp23_ = client; - _tmp24_ = path; - dconf_client_write_sync (_tmp23_, _tmp24_, NULL, NULL, NULL, &_inner_error_); - if (G_UNLIKELY (_inner_error_ != NULL)) { - goto __catch14_g_error; - } - } - goto __finally14; - __catch14_g_error: - { - GError* e = NULL; - GError* _tmp25_; - e = _inner_error_; - _inner_error_ = NULL; - _tmp25_ = e; - _vala_assert (_tmp25_, "e"); - _g_error_free0 (e); - } - __finally14: - if (G_UNLIKELY (_inner_error_ != NULL)) { - _g_object_unref0 (client); - _g_free0 (path); - _g_free0 (old_uuid); - _g_object_unref0 (channel); - _g_object_unref0 (selection); - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; - } - _g_object_unref0 (client); - _g_free0 (path); - } - _g_free0 (old_uuid); + _tmp10_ = channel; + _tmp11_ = tg_channel_get_settings (_tmp10_); + _tmp12_ = _tmp11_; + _tmp13_ = _g_object_ref0 (_tmp12_); + settings = _tmp13_; + _tmp14_ = settings; + g_settings_reset (_tmp14_, ""); + _tmp15_ = settings; + g_settings_apply (_tmp15_); + _g_object_unref0 (settings); _g_object_unref0 (channel); _g_object_unref0 (selection); } diff -Nru telegnome-0.3.4/src/prefs.vala telegnome-0.3.5/src/prefs.vala --- telegnome-0.3.4/src/prefs.vala 2018-02-10 02:13:39.000000000 +0000 +++ telegnome-0.3.5/src/prefs.vala 2019-02-05 22:32:38.000000000 +0000 @@ -238,7 +238,6 @@ Channel channel; channel_store.get (iter, Column.CHANNEL, out channel, -1); - string old_uuid = channel.uuid; #if VALA_0_36 channel_store.remove (ref iter); #else @@ -249,16 +248,9 @@ /* Clear out settings debris from the deleted channel if * possible. */ - if (settings.backend.get_type ().name () == - "DConfSettingsBackend") { - var path = @"/org/gnome/telegnome/channel/$old_uuid/"; - var client = new DConf.Client (); - try { - client.write_sync (path, null); - } catch (Error e) { - assert_no_error (e); - } - } + var settings = channel.settings; + settings.reset (""); + settings.apply (); } public void show () { diff -Nru telegnome-0.3.4/telegnome.appdata.xml.in telegnome-0.3.5/telegnome.appdata.xml.in --- telegnome-0.3.4/telegnome.appdata.xml.in 2019-01-11 20:58:02.000000000 +0000 +++ telegnome-0.3.5/telegnome.appdata.xml.in 2019-09-05 09:18:17.000000000 +0000 @@ -43,6 +43,13 @@ + + +
    +
  • Remove dconf dependency (Tomasz Miąsko).
    • +
+ +