[phpwiki-checkins] SF.net SVN: phpwiki:[9985] trunk

[<var...@us...>]

Revision: 9985
          http://sourceforge.net/p/phpwiki/code/9985
Author:   vargenau
Date:     2016-12-05 15:15:07 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
No need to display internal time; less strings

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/upgrade.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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/lib/loadsave.php	2016-12-05 15:15:07 UTC (rev 9985)
@@ -340,7 +340,7 @@
         flush();
 
         if (in_array($pagename, $excludeList)) {
-            PrintXML(_("Skipped."));
+            PrintXML(_("Skipped"));
             flush();
             continue;
         }
@@ -619,7 +619,7 @@
         }
         if (in_array($pagename, $excludeList)) {
             if (!$silent) {
-                PrintXML(_("Skipped."));
+                PrintXML(_("Skipped"));
                 flush();
             }
             continue;

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/lib/plugin/SyncWiki.php	2016-12-05 15:15:07 UTC (rev 9985)
@@ -142,7 +142,7 @@
                     if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) {
                         // our was deleted after sync, and changed after last sync.
                         $this->_addConflict('delete', $args, $our);
-                        $reaction = (_(" skipped") . " (" . "locally deleted or moved" . ")");
+                        $reaction = ' ' . _('skipped') . ' (' . _('locally deleted or moved') . ')';
                     } else {
                         $reaction = $this->_import($args, $our, $extdate);
                     }
@@ -195,7 +195,7 @@
             while ($our = $ouriter->next()) {
                 $name = $our->getName();
                 if ($done[$name]) continue;
-                $reaction = _(" skipped");
+                $reaction = ' ' . _('skipped');
                 $ext = wiki_xmlrpc_post('wiki.getPageInfo', $name, $args['url']);
                 if (is_array($ext)) {
                     $extdate = iso8601_decode($ext['lastModified']->scalar, 1);
@@ -230,7 +230,7 @@
                 $file = substr($path, $len);
                 $ourdate = filemtime($path);
                 $oursize = filesize($path);
-                $reaction = _(" skipped");
+                $reaction = ' ' . _('skipped');
                 $ext = wiki_xmlrpc_post('wiki.getUploadedFileInfo', $file, $args['url']);
                 if (is_array($ext)) {
                     $extdate = iso8601_decode($ext['lastModified']->scalar, 1);
@@ -294,7 +294,9 @@
     private function _import($args, $our, $extdate = null)
     {
         $reaction = 'import ';
-        if ($args['noimport']) return ($reaction . _("skipped"));
+        if ($args['noimport']) {
+            return ($reaction . _('skipped'));
+        }
         //$userid = $request->_user->_userid;
         $name = $our->getName();
         $pagedata = wiki_xmlrpc_post('wiki.getPage', $name, $args['url']);
@@ -303,7 +305,7 @@
             $ourrev = $our->getCurrentRevision(true);
             $content = $ourrev->getPackedContent();
             if ($pagedata == $content)
-                return $reaction . _("skipped") . ' ' . _("same content");
+                return $reaction . _('skipped') . ' ' . _('same content');
             if (is_null($extdate))
                 $extdate = time();
             $our->save(utf8_decode($pagedata), -1, array('author' => $userid,
@@ -319,7 +321,9 @@
     {
         global $request;
         $reaction = 'export ';
-        if ($args['noexport']) return ($reaction . _("skipped"));
+        if ($args['noexport']) {
+            return ($reaction . _('skipped'));
+        }
         $userid = $request->_user->_userid;
         $name = $our->getName();
         $ourrev = $our->getCurrentRevision(true);
@@ -328,7 +332,7 @@
         if (is_object($extdata)) {
             $extdata = $extdata->scalar;
             if ($extdata == $content)
-                return $reaction . _("skipped") . ' ' . _("same content");
+                return $reaction . _('skipped') . ' ' . _('same content');
         }
         $mypass = $request->getPref('passwd'); // this usually fails
         $success = wiki_xmlrpc_post('wiki.putPage',
@@ -347,7 +351,9 @@
     private function _upload($args, $path, $timeout)
     {
         $reaction = 'upload ';
-        if ($args['noupload']) return ($reaction . _("skipped"));
+        if ($args['noupload']) {
+            return ($reaction . _('skipped'));
+        }
 
         //$userid  = $request->_user->_userid;
         $url = $args['url'];

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/lib/upgrade.php	2016-12-05 15:15:07 UTC (rev 9985)
@@ -76,7 +76,7 @@
             or ($pagename == _("HomePage"))
             or ($pagename == "HomePage")
         ) {
-            echo "$path/$pagename: " . _("always skip the HomePage") . " ... " . _("Skipped."), "<br />\n";
+            echo "$path/$pagename: " . _("always skip the HomePage") . " ... " . _("Skipped"), "<br />\n";
             return;
         }
 
@@ -102,15 +102,15 @@
                     $new_mtime = $stat[9];
                 if ($new_mtime > $page_mtime) {
                     echo "$path/$pagename" . _(": ") . _("newer than the existing page")
-                         . " ... " . _("Replace") . " " . "($new_mtime &gt; $page_mtime)" . "<br />\n";
+                         . " ... " . _("Replace") . "<br />\n";
                     LoadAny($this->request, $path . "/" . $filename);
                     echo "<br />\n";
                 } else {
                     echo "$path/$pagename" . _(": ") . _("older than the existing page")
-                         . " ... " . _("Skipped."), "<br />\n";
+                         . " ... " . _("Skipped"), "<br />\n";
                 }
             } else {
-                echo "$path/$pagename" . _(": ") . _("unknown format") . " ... " . _("Skipped.") . "<br />\n";
+                echo "$path/$pagename" . _(": ") . _("unknown format") . " ... " . _("Skipped") . "<br />\n";
             }
         } else {
             echo sprintf(_("%s does not exist"), $pagename), "<br />\n";
@@ -202,7 +202,7 @@
                     $this->_rename_to_help_page($pagename);
                 }
                 if (in_array($pagename, $themepgsrc)) {
-                    echo sprintf(_('%s already checked in theme pgsrc'), $pagename).' ... '._('Skipped.').'<br />';
+                    echo sprintf(_('%s already checked in theme pgsrc'), $pagename).' ... '._('Skipped').'<br />';
                 } else {
                     $this->doPgsrcUpdate($pagename, $path, $filename);
                 }
@@ -220,7 +220,7 @@
                 echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n";
             }
         } else {
-            echo " " . _("Skipped.") . "<br />\n";
+            echo " " . _("Skipped") . "<br />\n";
         }
     }
 
@@ -1010,7 +1010,7 @@
     { // not applicable
         if (isset($this->silent_skip))
             return true;
-        echo " ... " . _("Skipped.") . "<br />\n";
+        echo " ... " . _("Skipped") . "<br />\n";
         flush();
         return true;
     }

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	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/de.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+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."
@@ -564,8 +564,8 @@
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-msgid "Skipped."
-msgstr "Ausgelassen."
+msgid "Skipped"
+msgstr "Ausgelassen"
 
 #, php-format
 msgid "saved as %s"
@@ -2882,9 +2882,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
-msgstr " ausgelassen"
+msgid "skipped"
+msgstr "ausgelassen"
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2910,9 +2913,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr "ausgelassen"
-
 msgid "same content"
 msgstr "gleiche Seiteninalt"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/es.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -553,8 +553,8 @@
 msgid "Dumping Pages"
 msgstr "Descargar Las Páginas"
 
-msgid "Skipped."
-msgstr "Saltado."
+msgid "Skipped"
+msgstr "Saltado"
 
 #, php-format
 msgid "saved as %s"
@@ -2805,9 +2805,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
 msgstr ""
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2833,9 +2836,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr ""
-
 msgid "same content"
 msgstr "mismo contenido"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/fr.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+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."
@@ -561,8 +561,8 @@
 msgid "Dumping Pages"
 msgstr "Récupération des pages"
 
-msgid "Skipped."
-msgstr "Ignoré."
+msgid "Skipped"
+msgstr "Ignoré"
 
 #, php-format
 msgid "saved as %s"
@@ -2843,9 +2843,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
-msgstr " ignoré"
+msgid "skipped"
+msgstr "ignoré"
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2871,9 +2874,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr "ignoré"
-
 msgid "same content"
 msgstr "même contenu"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/it.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+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"
@@ -544,7 +544,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-msgid "Skipped."
+msgid "Skipped"
 msgstr ""
 
 #, php-format
@@ -2778,9 +2778,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
 msgstr ""
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2806,9 +2809,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr ""
-
 msgid "same content"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/ja.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+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"
@@ -531,7 +531,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-msgid "Skipped."
+msgid "Skipped"
 msgstr ""
 
 #, php-format
@@ -2819,9 +2819,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
 msgstr ""
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2847,9 +2850,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr ""
-
 msgid "same content"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/nl.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+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"
@@ -533,8 +533,8 @@
 msgid "Dumping Pages"
 msgstr ""
 
-msgid "Skipped."
-msgstr "Overgeslagen."
+msgid "Skipped"
+msgstr "Overgeslagen"
 
 #, php-format
 msgid "saved as %s"
@@ -2768,9 +2768,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
 msgstr ""
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2796,9 +2799,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr ""
-
 msgid "same content"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/phpwiki.pot	2016-12-05 15:15:07 UTC (rev 9985)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+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"
@@ -527,7 +527,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-msgid "Skipped."
+msgid "Skipped"
 msgstr ""
 
 #, php-format
@@ -2760,9 +2760,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
 msgstr ""
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2788,9 +2791,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr ""
-
 msgid "same content"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/sv.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -528,7 +528,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-msgid "Skipped."
+msgid "Skipped"
 msgstr ""
 
 #, php-format
@@ -2761,9 +2761,12 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
 msgstr ""
 
+msgid "locally deleted or moved"
+msgstr ""
+
 msgid "same date"
 msgstr ""
 
@@ -2789,9 +2792,6 @@
 msgid "Postponed %s for %s."
 msgstr ""
 
-msgid "skipped"
-msgstr ""
-
 msgid "same content"
 msgstr "Samma innehåll"
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2016-12-05 14:20:31 UTC (rev 9984)
+++ trunk/locale/po/zh.po	2016-12-05 15:15:07 UTC (rev 9985)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 14:34+0100\n"
+"POT-Creation-Date: 2016-12-05 15:54+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -553,8 +553,8 @@
 msgid "Dumping Pages"
 msgstr "傾印頁面中"
 
-msgid "Skipped."
-msgstr "跳過."
+msgid "Skipped"
+msgstr "跳過"
 
 #, php-format
 msgid "saved as %s"
@@ -2885,7 +2885,10 @@
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-msgid " skipped"
+msgid "skipped"
+msgstr "跳過"
+
+msgid "locally deleted or moved"
 msgstr ""
 
 msgid "same date"
@@ -2914,10 +2917,6 @@
 msgstr "遺失了 %s 的 %s."
 
 #, fuzzy
-msgid "skipped"
-msgstr "跳過"
-
-#, fuzzy
 msgid "same content"
 msgstr "下載頁面內容"
 

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

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

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