Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10748] trunk
|
From: <var...@us...> - 2021-12-08 18:13:25
|
Revision: 10748
http://sourceforge.net/p/phpwiki/code/10748
Author: vargenau
Date: 2021-12-08 18:13:22 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update help page and error message for Video plugin
Modified Paths:
--------------
trunk/lib/plugin/Video.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/pgsrc/Help%2FVideoPlugin
Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/lib/plugin/Video.php 2021-12-08 18:13:22 UTC (rev 10748)
@@ -91,7 +91,7 @@
}
if (!$url && !$file) {
- return $this->error(_("Both 'url' or 'file' parameters missing."));
+ return $this->error(_("Both 'url' and 'file' parameters missing."));
} elseif ($url && $file) {
return $this->error(_("Choose only one of 'url' or 'file' parameters."));
} elseif ($file) {
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/de.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2709,7 +2709,6 @@
msgstr ""
"Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
msgid "'href' or 'page' parameter missing."
msgstr ""
@@ -3369,8 +3368,7 @@
msgid "Display video in HTML5."
msgstr ""
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
@@ -6059,7 +6057,6 @@
#~ msgid "Recursive inclusion of page %s"
#~ msgstr "Rekursiver Selbstaufruf der Seite %s"
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
#~ msgid "%s or %s parameter missing"
#~ msgstr "%s oder %s Argument fehlt"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/es.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -3290,7 +3290,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/fr.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3358,7 +3358,7 @@
msgid "Display video in HTML5."
msgstr "Afficher une vidéo en HTML5."
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr "Les paramètres « url » et « file » manquent tous les deux."
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/it.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -3267,7 +3267,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/ja.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3253,7 +3253,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/nl.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -3259,7 +3259,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/phpwiki.pot 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3253,7 +3253,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/sv.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -3254,7 +3254,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/locale/po/zh.po 2021-12-08 18:13:22 UTC (rev 10748)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-01 17:38+0100\n"
+"POT-Creation-Date: 2021-12-08 19:09+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -3264,7 +3264,7 @@
msgid "Display video in HTML5."
msgstr ""
-msgid "Both 'url' or 'file' parameters missing."
+msgid "Both 'url' and 'file' parameters missing."
msgstr ""
msgid "Choose only one of 'url' or 'file' parameters."
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin 2021-12-08 09:28:46 UTC (rev 10747)
+++ trunk/pgsrc/Help%2FVideoPlugin 2021-12-08 18:13:22 UTC (rev 10748)
@@ -1,4 +1,4 @@
-Date: Wed, 16 Jun 2021 19:20:34 +0000
+Date: Wed, 8 Dec 2021 19:01:09 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FVideoPlugin;
@@ -7,7 +7,7 @@
Content-Transfer-Encoding: binary
The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
-Video file must be an HTML 5 format:
+Video file must be in an HTML 5 format:
* [[WikiPedia:Ogg|Ogg]] (##.ogg## suffix),
* [[WikiPedia:MP4|MP4]] (##.mp4## suffix),
* [[WikiPedia:WebM|WebM]] (##.webm## suffix).
@@ -16,7 +16,7 @@
== Arguments ==
-Use only one of ##url## or ##file## arguments at a time.
+You must provide a ##url## or a ##file## argument (but not both).
{| class="bordered"
|-
@@ -25,12 +25,12 @@
! Default value
|-
| **url**
-| The url of a video file.
-| none
+| The URL of a video file.
+| //empty//
|-
| **file**
| The name of a video file that has been uploaded.
-| none
+| //empty//
|-
| **width**
| The width of the video (in pixels).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
