From f211dcb86ab43d55cef65575dd2aa8b0c56263c2 Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Mon, 13 Mar 2006 14:06:52 +0000 Subject: [PATCH] language fix added; added more info, error fixes, setup handling in postinst Package-Manager: portage-2.0.54 --- media-plugins/vdr-setup/ChangeLog | 6 +- media-plugins/vdr-setup/Manifest | 11 +- .../vdr-setup/files/vdr-setup-0.3.1-lang.diff | 507 ++++++++++++++++++ .../vdr-setup/vdr-setup-0.3.1.ebuild | 6 +- 4 files changed, 523 insertions(+), 7 deletions(-) create mode 100644 media-plugins/vdr-setup/files/vdr-setup-0.3.1-lang.diff diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog index bf84a0b504f8..9f0c79c2d21c 100644 --- a/media-plugins/vdr-setup/ChangeLog +++ b/media-plugins/vdr-setup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-setup # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.3 2006/03/11 20:35:57 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.4 2006/03/13 14:06:51 hd_brummy Exp $ + + 13 Mar 2006; Joerg Bornkessel + +files/vdr-setup-0.3.1-lang.diff, vdr-setup-0.3.1.ebuild: + language fix added; added more info, error fixes, setup handling in postinst *vdr-setup-0.3.1 (11 Mar 2006) diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest index d0c06405e380..9c3ce1b48bbb 100644 --- a/media-plugins/vdr-setup/Manifest +++ b/media-plugins/vdr-setup/Manifest @@ -1,21 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 1799e1639fa8ecedecdea56566ed2579 ChangeLog 851 +MD5 313f8c5427b001a7a0431d6136bde014 ChangeLog 1046 MD5 7e7798b807c8766b6331d33684ac3b98 files/digest-vdr-setup-0.2.3 63 MD5 3675ed9249bf7584ce1c4331fa2fbf42 files/digest-vdr-setup-0.3.1 63 MD5 4dd1e551d51e11df975e6743ea2ead01 files/vdr-setup-0.2.3-gentoo.diff 6713 MD5 41cf39f874c71c97dbe151092e736715 files/vdr-setup-0.3.1-gentoo.diff 6469 +MD5 2dab383f62b554eb038347bed47c18fb files/vdr-setup-0.3.1-lang.diff 6546 MD5 92ddb2fe7e0e61f6cace4ca8ff84dedd files/vdr-setup-0.3.1-timers.diff 312 MD5 13134d72f70ed4077f1783e4b9640e0c files/vdr-setup.xml 8338 MD5 b76f00a750adf92ee7defa4febc4b88d metadata.xml 544 MD5 8f022e87ee9ece56950ef705e7780109 vdr-setup-0.2.3.ebuild 1797 -MD5 56c82b72f1774b4e9d0f078b7fdfef8b vdr-setup-0.3.1.ebuild 1785 +MD5 57a27ab2f5217cb265c5057a026df2ba vdr-setup-0.3.1.ebuild 2018 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: no further Information -iD8DBQFEEzS9dn07HTTCgIoRAkErAJsFyKBBQHvXQnoWONus8556tRg2ggCeIhbW -ojWwmkR/0Lzwv1xLMM9nQmQ= -=e+Iw +iD8DBQFEFXyLdn07HTTCgIoRAr6yAJ0Zqnlub3OuwZLvvdzT327TmkH2pgCgujmI +HHW3bpXhgAu1ZaRxcWMth1M= +=9UIX -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-setup/files/vdr-setup-0.3.1-lang.diff b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-lang.diff new file mode 100644 index 000000000000..8a2461a2d09b --- /dev/null +++ b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-lang.diff @@ -0,0 +1,507 @@ +diff -Naur setup-0.3.1-orig/i18n.cpp setup-0.3.1/i18n.cpp +--- setup-0.3.1-orig/i18n.cpp 2006-03-13 14:03:16.420823500 +0100 ++++ setup-0.3.1/i18n.cpp 2006-03-13 14:33:37.790652000 +0100 +@@ -12,24 +12,28 @@ + + const tI18nPhrase Phrases[] = { + { +- "Setup - VDR", +- "Setup - VDR", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", +- "", ++ "Setup - VDR", // English ++ "Setup - VDR", // Deutsch ++ "", // Slovenski ++ "", // Italiano ++ "", // Nederlands ++ "", // Portugus ++ "", // ++ "", // Norsk ++ "", // suomi ++ "", // Polski ++ "", // ++ "", // // svenska ++ "", // Romaneste ++ "", // Magyar ++ "", // ++ "", // Catal` ++ "", // Croatian ++ "", // Eesti ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Activate Plugins", +@@ -50,6 +54,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -71,6 +79,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "no", +@@ -91,6 +103,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "yes", +@@ -111,6 +127,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Move", +@@ -131,6 +151,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Create", +@@ -151,6 +175,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Edit", +@@ -171,6 +199,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Create Menu", +@@ -191,6 +223,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Edit Menu", +@@ -211,6 +247,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Delete Menu?", +@@ -231,6 +271,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "change menu name", +@@ -251,6 +295,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Delete", +@@ -271,6 +319,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -292,6 +344,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -313,6 +369,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "After", +@@ -333,6 +393,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Into", +@@ -353,6 +417,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "sort asc", +@@ -373,6 +441,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "sort desc", +@@ -393,6 +465,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -414,6 +490,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Plugins activate / deactivate", +@@ -434,6 +514,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Save", +@@ -454,6 +538,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Reboot", +@@ -474,10 +562,14 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Restart VDR", +- "Starte VDR", ++ "Restarte VDR", + "", + "", + "", +@@ -494,6 +586,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "protected", +@@ -514,6 +610,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -535,6 +635,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -556,11 +660,15 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { + "Error in configuration files", +- "Fehler in MiniVDR-Konfigration", ++ "Fehler in VDR-Konfigration", + "", + "", + "", +@@ -577,6 +685,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -598,6 +710,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -619,6 +735,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -640,6 +760,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -661,6 +785,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Execute", +@@ -681,6 +809,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + // Standard VDR Setup pages: +@@ -935,6 +1067,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -956,6 +1092,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + +@@ -978,6 +1118,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { +@@ -999,6 +1143,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Up/Dn for new location - color key to move", +@@ -1019,6 +1167,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + { + "Help", +@@ -1039,6 +1191,10 @@ + "", + "", + "", ++ "", // Dansk ++#if VDRVERSNUM >= 10342 ++ "", // Czech ++#endif + }, + + { "Really restart?", +@@ -1084,6 +1240,26 @@ + "Reboot?", + "", + }, +- ++{ "Setup - Gentoo-VDR", ++ "Setup - Gentoo-VDR", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "Setup - Gentoo-VDR", ++ "", ++}, + { NULL } + }; diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild index a7513a3b66f8..f72c8aa90b3f 100644 --- a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild +++ b/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild,v 1.1 2006/03/11 20:35:57 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild,v 1.2 2006/03/13 14:06:51 hd_brummy Exp $ inherit vdr-plugin @@ -65,6 +65,10 @@ pkg_postinst() { echo einfo "Edit /etc/vdr/plugins/setup/*" echo + eerror "vdr-setup is very sensible on Error's in your setup.conf" + einfo "Best way to fix this: Stop (at first) VDR , move setup.conf to setup.conf.bak" + einfo "and let create VDR a new setup.conf on next Start automatically" + echo ewarn "Setup-Plugin will change the path of your channels.conf" einfo "You will find a backup copy on /etc/vdr/channels/channels.conf.bak" echo -- 2.26.2