SF.net SVN: phpwiki:[10900] trunk

Revision: 10900
          http://sourceforge.net/p/phpwiki/code/10900
Author:   vargenau
Date:     2022-01-14 14:33:17 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
themes/Portland/templates/actionbar.tmpl: add separator, better link message

Modified Paths:
--------------
    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/Portland/templates/actionbar.tmpl

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-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/de.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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."
@@ -5737,6 +5737,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Diese Seite bearbeiten"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s von dieser Seite"
@@ -5806,9 +5809,6 @@
 #~ msgid "EditText"
 #~ msgstr "TextBearbeiten"
 
-#~ msgid "Edit this page"
-#~ msgstr "Diese Seite bearbeiten"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Ungültiger Dateiname."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/es.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <[email protected]>\n"
 "Language-Team: \n"
@@ -5612,6 +5612,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Corrija esta página"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5666,9 +5669,6 @@
 #~ msgid "EditText"
 #~ msgstr "Editar"
 
-#~ msgid "Edit this page"
-#~ msgstr "Corrija esta página"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Nombre de archivo inválido."
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/fr.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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."
@@ -5726,6 +5726,9 @@
 msgid "Favorite Categories"
 msgstr "Catégories populaires"
 
+msgid "Edit this page"
+msgstr "Modifier cette page"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s de cette page"
@@ -5799,9 +5802,6 @@
 #~ msgid "EditText"
 #~ msgstr "ÉditerLeContenu"
 
-#~ msgid "Edit this page"
-#~ msgstr "Modifier cette page"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Nom de fichier incorrect."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/it.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5572,6 +5572,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Modifica la pagina"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s di questa pagina"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/ja.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5558,6 +5558,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "ページを編集しています"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5621,9 +5624,6 @@
 #~ msgid "Language"
 #~ msgstr "言語"
 
-#~ msgid "Edit this page"
-#~ msgstr "ページを編集しています"
-
 #~ msgid "Deleted"
 #~ msgstr "削除しました"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/nl.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5564,6 +5564,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Verander pagina"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/phpwiki.pot	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5558,6 +5558,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr ""
+
 #, php-format
 msgid "%s of this page"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/sv.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <[email protected]>\n"
 "Language-Team: \n"
@@ -5559,6 +5559,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Redigera den här sidan"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s för den här sidan"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/zh.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <[email protected]>\n"
 "Language-Team: DruryL <[email protected]>\n"
@@ -5586,6 +5586,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "編輯此頁面"
+
 #, php-format
 msgid "%s of this page"
 msgstr "此頁面的 %s"
@@ -5649,9 +5652,6 @@
 #~ msgid "Language"
 #~ msgstr "語言"
 
-#~ msgid "Edit this page"
-#~ msgstr "編輯此頁面"
-
 #~ msgid "Deleted"
 #~ 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/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/themes/Portland/templates/actionbar.tmpl	2022-01-14 14:33:17 UTC (rev 10900)
@@ -1,15 +1,21 @@
 <?php
 if ($revision && (!$page->get('locked') || $user->isAdmin())) {
-    $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+    if ($revision->isCurrent()) {
+        $EditB = Button("edit", _("Edit this page"));
+    } else {
+        $EditB = Button("edit", _("Edit Old Revision"));
+        $EditB = fmt("%s of this page", $EditB);
+    }
 } else {
     $EditB = Button("viewsource", _("View Source"));
+    $EditB = fmt("%s of this page", $EditB);
 }
-$EditB = fmt("%s of this page", $EditB);
 if (empty($revision)) {
     $revision = $page->getCurrentRevision(false);
 }
 ?>
 <?php echo $EditB ?>
+<?php echo $SEP?>
 <a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <?php echo $SEP?>
 <?php echo Button(__("PageHistory"), _("Page History")) ?>

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