diff options
-rw-r--r-- | CREDITS | 2 | ||||
-rw-r--r-- | po/cs.po | 10 | ||||
-rw-r--r-- | po/de.po | 32 | ||||
-rw-r--r-- | po/es.po | 10 | ||||
-rw-r--r-- | po/fi.po | 10 | ||||
-rw-r--r-- | po/fr.po | 10 | ||||
-rw-r--r-- | po/it.po | 10 | ||||
-rw-r--r-- | po/nl.po | 10 | ||||
-rw-r--r-- | po/ru.po | 8 | ||||
-rw-r--r-- | po/vdradmin.pot | 8 | ||||
-rw-r--r-- | template/default/about.html | 2 | ||||
-rw-r--r-- | template/default/help_no.html | 2 | ||||
-rwxr-xr-x | tools/update-po | 2 | ||||
-rwxr-xr-x | vdradmind.pl | 3 | ||||
-rw-r--r-- | vdradmind.pl.1 | 2 |
15 files changed, 60 insertions, 61 deletions
@@ -1,5 +1,5 @@ Current author (-AM branch): -Andreas Mair, mail@andreas.vdr-developer.org +Andreas Mair, amair.sob@googlemail.com Original author: Thomas Koch, tom@linvdr.org @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # Karel Borkovec <her-ur@her-ur.org>, 2006. @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:43+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Czech <cs@li.org>\n" @@ -1094,8 +1094,8 @@ msgstr "" msgid "No Help Available" msgstr "Nápověda není dostupná" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" -msgstr "<p>Nápověda zatím není dostupná. Pro přidání nebo změnu textu pište prosím sem: <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>. </p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" +msgstr "<p>Nápověda zatím není dostupná. Pro přidání nebo změnu textu pište prosím sem: <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>. </p>" msgid "Recordings" msgstr "Nahrávky" @@ -1,16 +1,16 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # -# Andreas Mair <mail@andreas.vdr-developer.org>, 2007 +# Andreas Mair <amair.sob@googlemail.com>, 2007 # msgid "" msgstr "" -"Project-Id-Version: VDRAdmin-AM-3.6.5+cvs\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" -"PO-Revision-Date: 2011-11-18 23:43+0200\n" -"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" -"Language-Team: German <mail@andreas.vdr-developer.org>\n" +"Project-Id-Version: VDRAdmin-AM-3.6.9\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" +"PO-Revision-Date: 2011-11-19 08:55+0100\n" +"Last-Translator: Andreas Mair <amair.sob@googlemail.com>\n" +"Language-Team: German <amair.sob@googlemail.com>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,19 +77,19 @@ msgid "Supported features in VDR:" msgstr "Unterstützte Funktionen im VDR:" msgid "EPGSearch" -msgstr "" +msgstr "EPGSearch" msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" msgstr "<a href=\"http://winni.vdr-developer.org/epgsearch/\" target=\"_blank\">EPGSearch Plugin</a>" msgid "LiveTV Streaming" -msgstr "" +msgstr "LiveTV Streaming" msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" -msgstr "" +msgstr "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" msgid "<a href=\"http://sourceforge.net/projects/xineliboutput/\" target=\"_blank\">Xineliboutput Plugin</a>" -msgstr "" +msgstr "<a href=\"http://sourceforge.net/projects/xineliboutput/\" target=\"_blank\">Xineliboutput Plugin</a>" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Aufnahmen umbenennen (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" @@ -407,7 +407,7 @@ msgid "HTTP Port of Streamdev (also possible 3000/ts):" msgstr "HTTP-Port von Streamdev (auch möglich 3000/ts):" msgid "HTTP Port of Xineliboutput (e.g. 37890):" -msgstr "" +msgstr "HTTP-Port von Xineliboutput (z.B. 37890):" msgid "Recordings Streaming:" msgstr "Aufnahmen streamen:" @@ -1012,8 +1012,8 @@ msgstr "Die verfügbaren Audiospuren. Das Feld kann nicht verändert werden." msgid "No Help Available" msgstr "Keine Hilfe verfügbar" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" -msgstr "Bisher keine Hilfe vorhanden. Zum Hinzufügen oder Ändern eines Textes bitte an <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a> wenden." +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" +msgstr "Bisher keine Hilfe vorhanden. Zum Hinzufügen oder Ändern eines Textes bitte an <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a> wenden." msgid "Recordings" msgstr "Aufnahmen" @@ -1135,7 +1135,7 @@ msgid "edit" msgstr "Bearbeiten" msgid "Length" -msgstr "" +msgstr "Länge" msgid "Video tracks:" msgstr "Videospuren:" @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # rudiberto <r_jung@web.de>, 2007 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.6\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:42+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Spanish <r_jung@web.de>\n" @@ -1070,10 +1070,10 @@ msgstr "Si disponible, muestra las pistas de audio. No se puede modificar." msgid "No Help Available" msgstr "No hay ayuda" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgstr "" "<p>Para esta función no dispone ayuda hasta ahora. Para añadir o modificar un texto, escribe un e-mail a \n" -"<a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +"<a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgid "Recordings" msgstr "Grabaciones" @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # Rolf Ahrenberg, 2007 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:36+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -1013,8 +1013,8 @@ msgstr "" msgid "No Help Available" msgstr "Ei opastetta" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" -msgstr "<p>Valittua opastetta ei ole saatavilla. Jos haluat lisätä tai muokata opastetta, ota yhteyttä sähköpostitse: <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" +msgstr "<p>Valittua opastetta ei ole saatavilla. Jos haluat lisätä tai muokata opastetta, ota yhteyttä sähköpostitse: <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgid "Recordings" msgstr "Tallenteet" @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # Trois Six <trois.six@free.fr>, 2007 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.0\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:42+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: French <trois.six@free.fr>\n" @@ -1035,8 +1035,8 @@ msgstr "Si des piste(s) audio existe(nt), ce champ les montrera. Il ne peut pas msgid "No Help Available" msgstr "Pas d'aide disponible" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" -msgstr "<p>Aucune aide n'est disponible. Pour ajouter ou changer du texte contactez <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org.</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" +msgstr "<p>Aucune aide n'est disponible. Pour ajouter ou changer du texte contactez <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com.</a>.</p>" msgid "Recordings" msgstr "Enregistrements" @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # Diego Pierotto <vdr-italian@tiscali.it>, 2007 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.6\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:42+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Italian <vdr-italian@tiscali.it>\n" @@ -1016,8 +1016,8 @@ msgstr "Se disponibile questo campo mostra le tracce audio. Non può essere modi msgid "No Help Available" msgstr "Nessun aiuto disponibile" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" -msgstr "<p>Nessun aiuto ancora disponibile. Per aggiungere o cambiare il testo contatta <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" +msgstr "<p>Nessun aiuto ancora disponibile. Per aggiungere o cambiare il testo contatta <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgid "Recordings" msgstr "Registrazioni" @@ -1,6 +1,6 @@ # Vertaling van @VDRADMIN-AM@.po to @Nederlands@ # translation of nl.po to -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.7\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:41+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -1017,8 +1017,8 @@ msgstr "Indien beschikbaar toont dit veld de audio sporen. Dit kan niet verander msgid "No Help Available" msgstr "Geen help beschikbaar" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" -msgstr "<p>Nog geen hulp beschikbaar: Voor toevoegen of veranderen van tekst graag contact opnemen met<a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" +msgstr "<p>Nog geen hulp beschikbaar: Voor toevoegen of veranderen van tekst graag contact opnemen met<a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgid "Recordings" msgstr "Opnames" @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <mail@andreas.vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # Oleg Roitburd <oleg@roitburd.de>, 2007 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: 2011-11-18 23:41+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Russian <LL@li.org>\n" @@ -1047,7 +1047,7 @@ msgstr "" msgid "No Help Available" msgstr "Помощь недоступна" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgstr "<p>До сих пор нет помощи. Для создания или исправления текста свяжитесь с<a href=\"mailto:freex@free-x.de\">freex@free-x.de</a>.</p>" msgid "Recordings" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index ed11d22..25de565 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -1,4 +1,4 @@ -# Copyright (C) Andreas Mair <andreas@vdr-developer.org> +# Copyright (C) Andreas Mair <amair.sob@googlemail.com> # This file is distributed under the same license as the VDRAdmin-AM package. # # TRANSLATOR <EMAIL>, YEAR @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM 3.6.8\n" -"Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2011-11-18 23:36+0200\n" +"Report-Msgid-Bugs-To: Andreas Mair <amair.sob@googlemail.com>\n" +"POT-Creation-Date: 2011-11-19 09:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1026,7 +1026,7 @@ msgstr "" msgid "No Help Available" msgstr "" -msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>.</p>" +msgid "<p>No help available yet. For adding or changing text please contact <a href=\"mailto:amair.sob@googlemail.com\">amair.sob@googlemail.com</a>.</p>" msgstr "" msgid "Recordings" diff --git a/template/default/about.html b/template/default/about.html index fc7676f..b9b13e5 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -52,7 +52,7 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Current author (VDRAdmin-AM branch):') %?></h5></td> - <td class="col_value"><a href="mailto:mail@andreas.vdr-developer.org">Andreas Mair</a> (<a href="http://andreas.vdr-developer.org" target="_blank">Homepage</a>)</td> + <td class="col_value"><a href="mailto:amair.sob@googlemail.com">Andreas Mair</a> (<a href="http://andreas.vdr-developer.org" target="_blank">Homepage</a>)</td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Original author (VDRAdmin):') %?></h5></td> diff --git a/template/default/help_no.html b/template/default/help_no.html index 82f8408..44a911e 100644 --- a/template/default/help_no.html +++ b/template/default/help_no.html @@ -18,7 +18,7 @@ </tr> <tr class="row_even"> <td> - <?% gettext('<p>No help available yet. For adding or changing text please contact <a href="mailto:mail@andreas.vdr-developer.org">mail@andreas.vdr-developer.org</a>.</p>') %?> + <?% gettext('<p>No help available yet. For adding or changing text please contact <a href="mailto:amair.sob@googlemail.com">amair.sob@googlemail.com</a>.</p>') %?> </td> </tr> </table> diff --git a/tools/update-po b/tools/update-po index 8954afa..5e5471e 100755 --- a/tools/update-po +++ b/tools/update-po @@ -7,7 +7,7 @@ if [ "$1" = "--check-only" ]; then exit 0 fi -export MY_EMAIL="Andreas Mair <andreas@vdr-developer.org>" +export MY_EMAIL="Andreas Mair <amair.sob@googlemail.com>" export VERSION="$(grep "^my \$VERSION = " vdradmind.pl | sed -e 's#.*\"\(.*\)\".*#\1#')" export PACKAGE="VDRAdmin-AM" diff --git a/vdradmind.pl b/vdradmind.pl index 56553dc..ec6ea4e 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # vim:et:sw=4:ts=4: # -# VDRAdmin-AM 2005 - 2011 by Andreas Mair <mail@andreas.vdr-developer.org> +# VDRAdmin-AM 2005 - 2011 by Andreas Mair <amair.sob@googlemail.com> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -338,7 +338,6 @@ for (my $i = 0 ; $i < scalar(@ARGV) ; $i++) { print(" -l [level] --log [level] set log level for this session [0 - 7]\n"); print(" -L [file] --logfile [file] set log file for this session\n"); print(" -h --help this message\n"); - print("\nReport bugs to <mail\@andreas.vdr-developer.org>.\n"); exit(0); } if (/^(--nofork|-n)/) { diff --git a/vdradmind.pl.1 b/vdradmind.pl.1 index 501976b..a9be20a 100644 --- a/vdradmind.pl.1 +++ b/vdradmind.pl.1 @@ -58,7 +58,7 @@ set log level for this session [0 - 7]. Display a short message about the options of vdradmind. .SH AUTHOR -This man-page has been written by Thomas Schmidt <thomas@thsnet.de> and has been updated by Andreas Mair <andreas@vdr-developer.org>. +This man-page has been written by Thomas Schmidt <thomas@thsnet.de> and has been updated by Andreas Mair <amair.sob@googlemail.com>. .PP Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any |