SF.net SVN: phpwiki:[10819] trunk

vargenau--- via phpwiki-checkins <[email protected]> Wed, 05 Jan 2022 12:22:19 +0000
Newsgroups gmane.comp.web.wiki.phpwiki.checkins
Message-ID <[email protected]> 
Revision: 10819
          http://sourceforge.net/p/phpwiki/code/10819
Author:   vargenau
Date:     2022-01-05 12:22:19 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Put "Warning:" in bold in editpage.tmpl, split "Warning:" from rest of message

Modified Paths:
--------------
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/plugin/PasswordReset.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/WikiAdminSearchReplace.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/themes/Crao/templates/editpage.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2022-01-05 12:22:19 UTC (rev 10819)
@@ -135,7 +135,7 @@
         $iframe0 = new RawXml('<iframe id="iframe0" src="blank.htm" height="0" width="0" frameborder="0"></iframe>');
         if ($request->getArg('mode') and $request->getArg('mode') == 'wysiwyg') {
             $out = HTML(HTML::div(array('class' => 'hint'),
-                    _("Warning: This Wikiwyg editor has only Beta quality!")),
+                    _("Warning")._(": ")._("This Wikiwyg editor has only Beta quality!")),
                 $textarea,
                 $iframe0,
                 "\n");

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/lib/plugin/PageDump.php	2022-01-05 12:22:19 UTC (rev 10819)
@@ -214,8 +214,7 @@
             HTML::pre($mailified),
             $altpreviewbuttons,
             HTML::div(array('class' => 'error'),
-                HTML::strong(_("Warning:")),
-                " ", $warning),
+                HTML::strong(_("Warning")), _(": "), $warning),
             $dl, $Sep, $dlall, $Sep, $dlsvn
         );
     }

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/lib/plugin/PasswordReset.php	2022-01-05 12:22:19 UTC (rev 10819)
@@ -151,7 +151,7 @@
                 return $this->doForm($request, $userid);
             }
             if (!$userid) {
-                $alert = new Alert(_("Warning:"),
+                $alert = new Alert(_("Warning")._(": "),
                     _("You need to specify the userid!"));
                 $alert->show();
                 return $this->doForm($request);
@@ -195,7 +195,7 @@
                     }
                     $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
                     if (!$verified)
-                        $header->pushContent(HTML::br(), _("Warning: This users email address is unverified!"));
+                        $header->pushContent(HTML::br(), _("Warning")._(": ")._("This user's email address is unverified!"));
                 }
                 return $this->doForm($request, $userid,
                     $header,

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/lib/plugin/SemanticSearch.php	2022-01-05 12:22:19 UTC (rev 10819)
@@ -289,7 +289,7 @@
         if (isset($this->_norelations_warning))
             $form->pushContent
             (HTML::div(array('class' => 'warning'),
-                _("Warning:"), HTML::br(),
+                _("Warning")._(":"), HTML::br(),
                 _("No relations nor attributes in the whole wikidb defined!")
                 , "\n"
                 , fmt("See %s", WikiLink(_("Help").":"._("SemanticRelations")))));

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2022-01-05 12:22:19 UTC (rev 10819)
@@ -146,7 +146,7 @@
         $form = $this->showForm($dbi, $request, $args, $allrelations);
         if (isset($this->_norelations_warning))
             $form->pushContent(HTML::div(array('class' => 'warning'),
-                _("Warning:") . $this->_norelations_warning));
+                _("Warning")._(": ") . $this->_norelations_warning));
 
         extract($args);
 

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2022-01-05 12:22:19 UTC (rev 10819)
@@ -104,7 +104,7 @@
         $result = HTML::div();
         if ($request->isPost() and empty($post_args['from'])) {
             $result->pushContent(HTML::p(array('class' => 'warning'),
-                                         _("Warning: The search string cannot be empty!")));
+                                         _("Warning")._(": ")._("The search string cannot be empty!")));
         }
         if ($next_action == 'select' and empty($pages)) {
             // List all pages to select from.

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	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/de.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <[email protected]>, Carsten Klapp "
 "<[email protected]>, Helmer Pardun <pardunpress@t-online."
@@ -2154,8 +2154,8 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
-msgstr "Achtung:"
+msgid "Warning"
+msgstr "Achtung"
 
 #, php-format
 msgid "PageGroup for %s."
@@ -2277,7 +2277,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3655,8 +3655,8 @@
 msgstr ""
 "Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen."
 
-msgid "Warning: The search string cannot be empty!"
-msgstr "Achtung! Das Suchwort darf nicht leer sein!"
+msgid "The search string cannot be empty!"
+msgstr "Das Suchwort darf nicht leer sein!"
 
 msgid "Select the pages to search and replace"
 msgstr "Seiten auswählen"
@@ -5052,7 +5052,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -5074,6 +5074,9 @@
 msgid "Note:"
 msgstr "Hinweis:"
 
+msgid "This page has been locked and cannot be edited."
+msgstr "Diese Seite wurde gesperrt und kann nicht bearbeitet werden."
+
 msgid "You are viewing an old revision of this page."
 msgstr "Sie sehen eine alte Version dieser Seite."
 
@@ -5105,9 +5108,6 @@
 msgid "Page Trail"
 msgstr "Spur"
 
-msgid "This page has been locked and cannot be edited."
-msgstr "Diese Seite wurde gesperrt und kann nicht bearbeitet werden."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr "Kommentare am %s geändert von %s"
@@ -5159,8 +5159,8 @@
 "page.)"
 msgstr ""
 
-msgid "Warning: You are editing an old revision."
-msgstr "Achtung: Sie bearbeiten eine alte Version."
+msgid "You are editing an old revision."
+msgstr "Sie bearbeiten eine alte Version."
 
 msgid "Saving this page will overwrite the current version."
 msgstr ""
@@ -5974,13 +5974,6 @@
 #~ msgid "edit area"
 #~ msgstr "Texteingabe Fenster"
 
-#~ msgid ""
-#~ "Warning: You are editing an old revision. Saving this page will overwrite "
-#~ "the current version."
-#~ msgstr ""
-#~ "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version "
-#~ "überschrieben."
-
 #~ msgid "ActionPage"
 #~ msgstr "Aktion Seite"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/es.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <[email protected]>\n"
 "Language-Team: \n"
@@ -2097,7 +2097,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
+msgid "Warning"
 msgstr ""
 
 #, php-format
@@ -2219,7 +2219,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3571,7 +3571,7 @@
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-msgid "Warning: The search string cannot be empty!"
+msgid "The search string cannot be empty!"
 msgstr ""
 
 msgid "Select the pages to search and replace"
@@ -4950,7 +4950,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4972,6 +4972,9 @@
 msgid "Note:"
 msgstr "Nota:"
 
+msgid "This page has been locked and cannot be edited."
+msgstr "Esta página ha sido bloqueada y no puede ser editada."
+
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
@@ -5003,9 +5006,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr "Esta página ha sido bloqueada y no puede ser editada."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr "Comentario modificado en %s por %s"
@@ -5054,7 +5054,7 @@
 "page.)"
 msgstr ""
 
-msgid "Warning: You are editing an old revision."
+msgid "You are editing an old revision."
 msgstr ""
 
 msgid "Saving this page will overwrite the current version."

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/fr.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <[email protected]>, Roland "
 "Trique <[email protected]>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2137,8 +2137,8 @@
 "fichiers téléchargés avant de les éditer sous Emacs et les publier sous "
 "Subversion."
 
-msgid "Warning:"
-msgstr "Attention :"
+msgid "Warning"
+msgstr "Attention"
 
 #, php-format
 msgid "PageGroup for %s."
@@ -2259,9 +2259,8 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
-msgstr ""
-"Attention : l'adresse électronique de cet utilsateur n'a pas été vérifiée !"
+msgid "This user's email address is unverified!"
+msgstr "l'adresse électronique de cet utilsateur n'a pas été vérifiée !"
 
 #, php-format
 msgid "Do you really want to reset the password of user %s?"
@@ -3645,8 +3644,8 @@
 msgid "You must be an administrator to use this plugin."
 msgstr "Vous devez être un administrateur pour utiliser ce greffon."
 
-msgid "Warning: The search string cannot be empty!"
-msgstr "Attention : vous devez entrez au moins une lettre pour la recherche!"
+msgid "The search string cannot be empty!"
+msgstr "vous devez entrez au moins une lettre pour la recherche !"
 
 msgid "Select the pages to search and replace"
 msgstr "Sélectionner les pages dans lesquelles la recherche sera effectuée"
@@ -5041,7 +5040,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -5063,6 +5062,9 @@
 msgid "Note:"
 msgstr "Note :"
 
+msgid "This page has been locked and cannot be edited."
+msgstr "Cette page a été verrouillée et ne peut pas être modifiée."
+
 msgid "You are viewing an old revision of this page."
 msgstr "Vous lisez une ancienne version de cette page."
 
@@ -5094,9 +5096,6 @@
 msgid "Page Trail"
 msgstr "Fil d'Ariane"
 
-msgid "This page has been locked and cannot be edited."
-msgstr "Cette page a été verrouillée et ne peut pas être modifiée."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr "Commentaire modifié le %s par %s"
@@ -5149,8 +5148,8 @@
 "Veuillez continuer vos modifications. (Vous trouverez votre zone de "
 "modification en bas de page)."
 
-msgid "Warning: You are editing an old revision."
-msgstr "Attention : vous modifiez une ancienne version."
+msgid "You are editing an old revision."
+msgstr "vous modifiez une ancienne version."
 
 msgid "Saving this page will overwrite the current version."
 msgstr "Enregistrer cette page écrasera la version actuelle."
@@ -5831,9 +5830,6 @@
 #~ msgid "no cache used"
 #~ msgstr "pas de cache utilisé"
 
-#~ msgid "Warning: leaving the page will lose all your modifications!"
-#~ msgstr "Attention : quitter cette page annulera toutes vos modifications !"
-
 #~ msgid "Tutorial"
 #~ msgstr "Tutoriel"
 
@@ -6058,20 +6054,6 @@
 #~ msgid "edit area"
 #~ msgstr "zone d'édition"
 
-#~ msgid ""
-#~ "Preview only! Changes not saved. Please continue editing. (You'll find "
-#~ "your edit area at the bottom of the page.)"
-#~ msgstr ""
-#~ "Vous êtes en prévisualisation ! Veuillez continuer votre édition. (Vous "
-#~ "trouverez votre zone d'édition en bas de page)."
-
-#~ msgid ""
-#~ "Warning: You are editing an old revision. Saving this page will overwrite "
-#~ "the current version."
-#~ msgstr ""
-#~ "Attention : vous modifiez une ancienne version de cette page. Enregistrer "
-#~ "cette page écrasera la version actuelle."
-
 #~ msgid "ActionPage"
 #~ msgstr "Pages d'action"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/it.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+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"
@@ -2078,8 +2078,8 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
-msgstr "Avvertimento:"
+msgid "Warning"
+msgstr "Avvertimento"
 
 #, php-format
 msgid "PageGroup for %s."
@@ -2200,7 +2200,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3548,7 +3548,7 @@
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-msgid "Warning: The search string cannot be empty!"
+msgid "The search string cannot be empty!"
 msgstr ""
 
 msgid "Select the pages to search and replace"
@@ -4910,7 +4910,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4932,6 +4932,9 @@
 msgid "Note:"
 msgstr "Nota:"
 
+msgid "This page has been locked and cannot be edited."
+msgstr "Questa pagina è stata bloccata e non può essere modificata."
+
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
@@ -4963,9 +4966,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr "Questa pagina è stata bloccata e non può essere modificata."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr ""
@@ -5014,7 +5014,7 @@
 "page.)"
 msgstr ""
 
-msgid "Warning: You are editing an old revision."
+msgid "You are editing an old revision."
 msgstr ""
 
 msgid "Saving this page will overwrite the current version."

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/ja.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2064,8 +2064,8 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
-msgstr "警告:"
+msgid "Warning"
+msgstr "警告"
 
 #, php-format
 msgid "PageGroup for %s."
@@ -2186,7 +2186,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3534,7 +3534,7 @@
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-msgid "Warning: The search string cannot be empty!"
+msgid "The search string cannot be empty!"
 msgstr ""
 
 msgid "Select the pages to search and replace"
@@ -4896,7 +4896,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4918,6 +4918,9 @@
 msgid "Note:"
 msgstr "ノート:"
 
+msgid "This page has been locked and cannot be edited."
+msgstr ""
+
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
@@ -4949,9 +4952,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr ""
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr ""
@@ -5000,8 +5000,8 @@
 "page.)"
 msgstr "編集を続けて下さい。 (編集エリアのページの下部も見てください)"
 
-msgid "Warning: You are editing an old revision."
-msgstr "警告: あなたは古いリビジョンを編集しています。"
+msgid "You are editing an old revision."
+msgstr "あなたは古いリビジョンを編集しています。"
 
 msgid "Saving this page will overwrite the current version."
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/nl.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -2070,7 +2070,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
+msgid "Warning"
 msgstr ""
 
 #, php-format
@@ -2192,7 +2192,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3540,7 +3540,7 @@
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-msgid "Warning: The search string cannot be empty!"
+msgid "The search string cannot be empty!"
 msgstr ""
 
 msgid "Select the pages to search and replace"
@@ -4902,7 +4902,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4924,6 +4924,9 @@
 msgid "Note:"
 msgstr ""
 
+msgid "This page has been locked and cannot be edited."
+msgstr "Deze pagina is afgesloten en kan niet veranderd worden."
+
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
@@ -4955,9 +4958,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr "Deze pagina is afgesloten en kan niet veranderd worden."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr ""
@@ -5006,7 +5006,7 @@
 "page.)"
 msgstr ""
 
-msgid "Warning: You are editing an old revision."
+msgid "You are editing an old revision."
 msgstr ""
 
 msgid "Saving this page will overwrite the current version."

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/phpwiki.pot	2022-01-05 12:22:19 UTC (rev 10819)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2064,7 +2064,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
+msgid "Warning"
 msgstr ""
 
 #, php-format
@@ -2186,7 +2186,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3534,7 +3534,7 @@
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-msgid "Warning: The search string cannot be empty!"
+msgid "The search string cannot be empty!"
 msgstr ""
 
 msgid "Select the pages to search and replace"
@@ -4896,7 +4896,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4918,6 +4918,9 @@
 msgid "Note:"
 msgstr ""
 
+msgid "This page has been locked and cannot be edited."
+msgstr ""
+
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
@@ -4949,9 +4952,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr ""
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr ""
@@ -5000,7 +5000,7 @@
 "page.)"
 msgstr ""
 
-msgid "Warning: You are editing an old revision."
+msgid "You are editing an old revision."
 msgstr ""
 
 msgid "Saving this page will overwrite the current version."

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/sv.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <[email protected]>\n"
 "Language-Team: \n"
@@ -2065,7 +2065,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-msgid "Warning:"
+msgid "Warning"
 msgstr ""
 
 #, php-format
@@ -2187,7 +2187,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3535,7 +3535,7 @@
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-msgid "Warning: The search string cannot be empty!"
+msgid "The search string cannot be empty!"
 msgstr ""
 
 msgid "Select the pages to search and replace"
@@ -4897,7 +4897,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4919,6 +4919,9 @@
 msgid "Note:"
 msgstr ""
 
+msgid "This page has been locked and cannot be edited."
+msgstr "Den här sidan är låst och kan ej redigeras."
+
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
@@ -4950,9 +4953,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr "Den här sidan är låst och kan ej redigeras."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr ""
@@ -5001,7 +5001,7 @@
 "page.)"
 msgstr ""
 
-msgid "Warning: You are editing an old revision."
+msgid "You are editing an old revision."
 msgstr ""
 
 msgid "Saving this page will overwrite the current version."

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/locale/po/zh.po	2022-01-05 12:22:19 UTC (rev 10819)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-03 11:54+0100\n"
+"POT-Creation-Date: 2022-01-05 13:02+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <[email protected]>\n"
 "Language-Team: DruryL <[email protected]>\n"
@@ -2073,8 +2073,8 @@
 "在以 emacs 重包裝與簽入之前,PhpWiki 開發者應會因為巢狀標記而手動審閱已下載的"
 "檔案."
 
-msgid "Warning:"
-msgstr "警告:"
+msgid "Warning"
+msgstr "警告"
 
 #, php-format
 msgid "PageGroup for %s."
@@ -2195,7 +2195,7 @@
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-msgid "Warning: This users email address is unverified!"
+msgid "This user's email address is unverified!"
 msgstr ""
 
 #, php-format
@@ -3545,8 +3545,8 @@
 msgid "You must be an administrator to use this plugin."
 msgstr "你必須是管理者才能使用此 plugin."
 
-msgid "Warning: The search string cannot be empty!"
-msgstr "警告: 搜尋字串不能是空白!"
+msgid "The search string cannot be empty!"
+msgstr "搜尋字串不能是空白!"
 
 msgid "Select the pages to search and replace"
 msgstr "選擇頁面以進行搜尋"
@@ -4918,7 +4918,7 @@
 msgid "Sub"
 msgstr ""
 
-msgid "Warning: This Wikiwyg editor has only Beta quality!"
+msgid "This Wikiwyg editor has only Beta quality!"
 msgstr ""
 
 msgid "xml-rpc change"
@@ -4940,6 +4940,9 @@
 msgid "Note:"
 msgstr "注意:"
 
+msgid "This page has been locked and cannot be edited."
+msgstr "此頁面已經被管理者鎖定,並且無法編輯."
+
 msgid "You are viewing an old revision of this page."
 msgstr "你正在查看此頁面的較舊修訂."
 
@@ -4971,9 +4974,6 @@
 msgid "Page Trail"
 msgstr ""
 
-msgid "This page has been locked and cannot be edited."
-msgstr "此頁面已經被管理者鎖定,並且無法編輯."
-
 #, php-format
 msgid "Comment modified on %s by %s"
 msgstr "意見在 %s 被 %s 變更"
@@ -5022,8 +5022,8 @@
 "page.)"
 msgstr "請繼續編輯. (你將在頁面的底部找到你的編輯區域.)"
 
-msgid "Warning: You are editing an old revision."
-msgstr "警告: 你正在編輯較舊的修訂."
+msgid "You are editing an old revision."
+msgstr "你正在編輯較舊的修訂."
 
 msgid "Saving this page will overwrite the current version."
 msgstr "儲存此頁面將會覆寫掉目前版本."

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/themes/Crao/templates/editpage.tmpl	2022-01-05 12:22:19 UTC (rev 10819)
@@ -10,10 +10,11 @@
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 <?php if (! $IS_CURRENT) { ?>
-  <p class="warning_msg">
-      <?php echo _("Warning: You are editing an old revision.")?>
-      <?php echo _("Saving this page will overwrite the current version.")?>
-  </p>
+      <p class="warning_msg">
+      <strong><?php echo _("Warning")._(": ") ?></strong>
+      <?php echo _("You are editing an old revision.") ?>
+      <?php echo _("Saving this page will overwrite the current version.") ?>
+      </p>
 <?php } ?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
@@ -33,8 +34,8 @@
   </fieldset>
 <?php if (ENABLE_CAPTCHA) { ?>
   <fieldset class="toolbar" style="text-align: center;">
-    <?php echo $CAPTCHA_IMAGE ?><br/>
-    <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
+  <?php echo $CAPTCHA_IMAGE ?><br/>
+  <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
   </fieldset>
   <?php } ?>
   <fieldset class="toolbar">

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/themes/Portland/templates/editpage.tmpl	2022-01-05 12:22:19 UTC (rev 10819)
@@ -7,8 +7,11 @@
     <?php echo $PAGE_LOCKED_MESSAGE ?>
     <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
     <?php if (!$IS_CURRENT) { ?>
-      <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
-            <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
+      <p class="warning_msg">
+      <strong><?php echo _("Warning")._(": ") ?></strong>
+      <?php echo _("You are editing an old revision.") ?>
+      <?php echo _("Saving this page will overwrite the current version.") ?>
+      </p>
     <?php } ?>
   </td>
 </tr>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2022-01-05 12:22:19 UTC (rev 10819)
@@ -9,8 +9,11 @@
     <?php echo $PAGE_LOCKED_MESSAGE ?>
     <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
     <?php if (!$IS_CURRENT) { ?>
-      <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
-            <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
+      <p class="warning_msg">
+      <strong><?php echo _("Warning")._(": ") ?></strong>
+      <?php echo _("You are editing an old revision.") ?>
+      <?php echo _("Saving this page will overwrite the current version.") ?>
+      </p>
     <?php } ?>
   </td>
   <td>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/themes/default/templates/editpage.tmpl	2022-01-05 12:22:19 UTC (rev 10819)
@@ -10,10 +10,11 @@
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 <?php if (! $IS_CURRENT) { ?>
-  <p class="warning_msg">
-      <?php echo _("Warning: You are editing an old revision.")?>
-      <?php echo _("Saving this page will overwrite the current version.")?>
-  </p>
+      <p class="warning_msg">
+      <strong><?php echo _("Warning")._(": ") ?></strong>
+      <?php echo _("You are editing an old revision.") ?>
+      <?php echo _("Saving this page will overwrite the current version.") ?>
+      </p>
 <?php } ?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2022-01-04 17:42:19 UTC (rev 10818)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2022-01-05 12:22:19 UTC (rev 10819)
@@ -8,10 +8,11 @@
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 <?php if (! $IS_CURRENT) { ?>
-  <p class="warning_msg">
-      <?php echo _("Warning: You are editing an old revision.")?>
-      <?php echo _("Saving this page will overwrite the current version.")?>
-  </p>
+      <p class="warning_msg">
+      <strong><?php echo _("Warning")._(": ") ?></strong>
+      <?php echo _("You are editing an old revision.") ?>
+      <?php echo _("Saving this page will overwrite the current version.") ?>
+      </p>
 <?php } ?>
 <?php if (forge_get_config('use_jquery_form_navigate')) { ?>
 <script type="text/javascript">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



_______________________________________________
phpwiki-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpwiki-checkins