From: <var...@us...> - 2013-06-14 14:44:10
|
Revision: 8808 http://sourceforge.net/p/phpwiki/code/8808 Author: vargenau Date: 2013-06-14 14:44:05 +0000 (Fri, 14 Jun 2013) Log Message: ----------- Update WikiAdminSearchReplace plugin Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/de/LC_MESSAGES/phpwiki.php trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.php trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.php trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.php 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/sv/LC_MESSAGES/phpwiki.php trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/lib/PageList.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -57,17 +57,14 @@ $this->_heading = $default_heading; if ($align) { - $this->_tdattr['align'] = $align; + $this->_tdattr['class'] = "align-".$align; } } function format($pagelist, $page_handle, &$revision_handle) { - $nbsp = HTML::raw(' '); return HTML::td($this->_tdattr, - $nbsp, - $this->_getValue($page_handle, $revision_handle), - $nbsp); + $this->_getValue($page_handle, $revision_handle)); } function getHeading() @@ -84,7 +81,6 @@ function heading() { global $request; - $nbsp = HTML::raw(' '); // allow sorting? if (1 /* or in_array($this->_field, PageList::sortable_columns())*/) { // multiple comma-delimited sortby args: "+hits,+pagename" @@ -96,11 +92,11 @@ $request->GetURLtoSelf(array('sortby' => $sortby)), 'class' => 'pagetitle', 'title' => sprintf(_("Sort by %s"), $this->_field)), - $nbsp, HTML::u($this->_heading), $nbsp); + HTML::u($this->_heading)); } else { - $s = HTML($nbsp, HTML::u($this->_heading), $nbsp); + $s = HTML::u($this->_heading); } - return HTML::th(array('align' => 'center'), $s); + return HTML::th($s); } // new grid-style sortable heading @@ -109,7 +105,6 @@ { global $WikiTheme, $request; // allow sorting? - $nbsp = HTML::raw(' '); if (!$WikiTheme->DUMP_MODE /* or in_array($this->_field, PageList::sortable_columns()) */) { // TODO: add to multiple comma-delimited sortby args: "+hits,+pagename" $src = false; @@ -118,7 +113,7 @@ $noimg = HTML::img(array('src' => $noimg_src, 'alt' => '.')); else - $noimg = $nbsp; + $noimg = HTML::raw(''); if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg $sortby = $pagelist->sortby($colNum, 'flip_order'); $desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename @@ -142,14 +137,12 @@ 'id' => $pagelist->id)), 'class' => 'gridbutton', 'title' => sprintf(_("Click to sort by %s"), $reverse . $this->_field)), - $nbsp, $this->_heading, - $nbsp, $img, - $nbsp); + $this->_heading, + $img); } else { - $s = HTML($nbsp, $this->_heading, $nbsp); + $s = HTML($this->_heading); } - return HTML::th(array('align' => 'center', 'valign' => 'middle', - 'class' => 'gridbutton'), $s); + return HTML::th(array('class' => 'gridbutton'), $s); } /** @@ -233,9 +226,7 @@ function format($pagelist, $page_handle, &$revision_handle) { return HTML::td($this->_tdattr, - HTML::raw(' '), - $this->_getValuePageList($pagelist, $page_handle, $revision_handle), - HTML::raw(' ')); + $this->_getValuePageList($pagelist, $page_handle, $revision_handle)); } function _getValuePageList($pagelist, $page_handle, &$revision_handle) @@ -321,17 +312,14 @@ function format($pagelist, $page_handle, &$revision_handle) { return HTML::td($this->_tdattr, - HTML::raw(' '), - $this->_getValuePageList($pagelist, $page_handle, $revision_handle), - HTML::raw(' ')); + $this->_getValuePageList($pagelist, $page_handle, $revision_handle)); } // don't sort this javascript button function button_heading($pagelist, $colNum) { - $s = HTML(HTML::raw(' '), $this->_heading, HTML::raw(' ')); - return HTML::th(array('align' => 'center', 'valign' => 'middle', - 'class' => 'gridbutton'), $s); + $s = HTML($this->_heading); + return HTML::th(array('class' => 'gridbutton'), $s); } } @@ -439,11 +427,8 @@ . "..." . " " . ($score ? sprintf("[%0.1f]", $score) : "")))); } else { - if (strpos($c, " ") !== false) - $c = ""; - else - $c = sprintf(_("%s not found"), '»' . $search . '«'); - return HTML::div(array('style' => 'font-size:x-small', 'align' => 'center'), + $c = sprintf(_("“%s” not found"), $search); + return HTML::div(array('class' => 'align-center'), $c . " " . ($score ? sprintf("[%0.1f]", $score) : "")); } } elseif (($len = strlen($c)) > $this->bytes) { @@ -1270,7 +1255,6 @@ => new _PageList_Column('hits', _("Hits"), 'right'), 'size' => new _PageList_Column_size('rev:size', _("Size"), 'right'), - /*array('align' => 'char', 'char' => ' ')*/ 'summary' => new _PageList_Column('rev:summary', _("Last Summary")), 'version' @@ -1570,17 +1554,12 @@ $one_row = $this->_renderPageRow($page, $i++); $rows[] = $one_row; } - $table = HTML::table(array('cellpadding' => 0, - 'cellspacing' => 1, - 'border' => 0, - 'width' => '100%', - 'class' => 'pagelist')); + $table = HTML::table(array('class' => 'fullwidth pagelist')); if ($caption) { $table->pushContent(HTML::caption(array('align' => 'top'), $caption)); } $row = HTML::tr(); - $table_summary = array(); $i = 1; // start with 1! foreach ($this->_columns as $col) { $heading = $col->button_heading($this, $i); @@ -1591,13 +1570,8 @@ ) { } $row->pushContent($heading); - if (is_string($col->getHeading())) - $table_summary[] = $col->getHeading(); $i++; } - // Table summary for non-visual browsers. - $table->setAttr('summary', sprintf(_("Columns: %s."), - join(", ", $table_summary))); $table->pushContent(HTML::colgroup(array('span' => count($this->_columns)))); if ($do_paging) { if ($tokens === false) { Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/lib/plugin/AppendText.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -51,7 +51,7 @@ private function fallback($addtext, $oldtext, $notfound, &$message) { - $message->pushContent(sprintf(_("%s not found"), $notfound) . ". " . + $message->pushContent(sprintf(_("“%s” not found"), $notfound) . ". " . _("Appending at the end.") . "\n"); return $oldtext . "\n" . $addtext; } Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -48,68 +48,6 @@ )); } - private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) - { - $page = $dbi->getPage($pagename); - if ($page->exists()) { // don't replace default contents - $current = $page->getCurrentRevision(); - $version = $current->getVersion(); - $text = $current->getPackedContent(); - if ($regex) { - $newtext = preg_replace("/" . $from . "/" . ($case_exact ? '' : 'i'), $to, $text); - } else { - if ($case_exact) { - $newtext = str_replace($from, $to, $text); - } else { - $newtext = str_ireplace($from, $to, $text); - } - } - if ($text != $newtext) { - $meta = $current->_data; - $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to); - $meta['is_minor_edit'] = 0; - $meta['author'] = $request->_user->UserName(); - unset($meta['mtime']); // force new date - return $page->save($newtext, $version + 1, $meta); - } - } - return false; - } - - private function searchReplacePages(&$dbi, &$request, $pages, $from, $to) - { - if (empty($from)) return HTML::p(HTML::strong(fmt("Error: Empty search string."))); - $result = HTML::div(); - $ul = HTML::ul(); - $count = 0; - $post_args = $request->getArg('admin_replace'); - $case_exact = !empty($post_args['case_exact']); - $regex = !empty($post_args['regex']); - foreach ($pages as $pagename) { - if (!mayAccessPage('edit', $pagename)) { - $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename))); - } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) { - $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.", - $from, $to, WikiLink($pagename)))); - $count++; - } - } - if ($count) { - $dbi->touch(); - $result->setAttr('class', 'feedback'); - if ($count == 1) { - $result->pushContent(HTML::p(_("One page has been changed:"))); - } else { - $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count))); - } - $result->pushContent($ul); - } else { - $result->setAttr('class', 'error'); - $result->pushContent(HTML::p(_("No pages changed."))); - } - return $result; - } - function run($dbi, $argstr, &$request, $basepage) { // no action=replace support yet @@ -124,19 +62,20 @@ $this->preSelectS($args, $request); $p = $request->getArg('p'); - if (!$p) $p = $this->_list; + if (!$p) { + $p = $this->_list; + } $post_args = $request->getArg('admin_replace'); $next_action = 'select'; $pages = array(); - if ($p && !$request->isPost()) + if ($p && !$request->isPost()) { $pages = $p; - if ($p && $request->isPost() && - empty($post_args['cancel']) - ) { + } + if ($p && $request->isPost() && empty($post_args['cancel'])) { // without individual PagePermissions: if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) { $request->_notAuthorized(WIKIAUTH_ADMIN); - $this->disabled("! user->isAdmin"); + $this->disabled(_("You must be an administrator to use this plugin.")); } if ($post_args['action'] == 'verify' and !empty($post_args['from'])) { @@ -152,6 +91,11 @@ } } } + $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!"))); + } if ($next_action == 'select' and empty($pages)) { // List all pages to select from. //TODO: check for permissions and list only the allowed @@ -159,46 +103,36 @@ $args['limit'], $args['exclude']); } - if ($next_action == 'verify') { - $args['info'] = "checkbox,pagename"; + $args['info'] = "checkbox,pagename,mtime,author"; + if ($next_action == 'select') { + $columns = $args; } else { - // Avoid warning about "hi_content" - // $args['info'] = "checkbox,pagename,hi_content,mtime,author"; - $args['info'] = "checkbox,pagename,mtime,author"; + $columns = array_merge($args, + // with highlighted search for SearchReplace + array('types' => array('hi_content' + => new _PageList_Column_content('rev:hi_content', _("Content"))))); } - $pagelist = new PageList_Selectable - ($args['info'], $args['exclude'], - array_merge - ( - $args, - array('types' => array - ( - 'hi_content' // with highlighted search for SearchReplace - => new _PageList_Column_content('rev:hi_content', _("Content")))))); - + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); $pagelist->addPageList($pages); $header = HTML::fieldset(); - if (empty($post_args['from'])) - $header->pushContent( - HTML::p(HTML::em(_("Warning: The search string cannot be empty!")))); + $header->pushContent(HTML::legend(_("Select the pages to search and replace"))); if ($next_action == 'verify') { - $button_label = _("Yes"); + $button_label = _("Replace"); $header->pushContent( HTML::p(HTML::strong( _("Are you sure you want to replace text in the selected files?")))); $this->replaceForm($header, $post_args); } else { - $button_label = _("Search & Replace"); + $button_label = _("Search"); $this->replaceForm($header, $post_args); - $header->pushContent(HTML::legend(_("Select the pages to search and replace"))); } $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'), Button('submit:admin_replace[cancel]', _("Cancel"), 'button')); $header->pushContent($buttons); - return HTML::form(array('action' => $request->getPostURL(), + $result->pushContent(HTML::form(array('action' => $request->getPostURL(), 'method' => 'post'), $header, $pagelist->getContent(), @@ -208,9 +142,71 @@ HiddenInputs(array('admin_replace[action]' => $next_action)), ENABLE_PAGEPERM ? '' - : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN))); + : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)))); + return $result; } + private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) + { + $page = $dbi->getPage($pagename); + if ($page->exists()) { // don't replace default contents + $current = $page->getCurrentRevision(); + $version = $current->getVersion(); + $text = $current->getPackedContent(); + if ($regex) { + $newtext = preg_replace("/" . $from . "/" . ($case_exact ? '' : 'i'), $to, $text); + } else { + if ($case_exact) { + $newtext = str_replace($from, $to, $text); + } else { + $newtext = str_ireplace($from, $to, $text); + } + } + if ($text != $newtext) { + $meta = $current->_data; + $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to); + $meta['is_minor_edit'] = 0; + $meta['author'] = $request->_user->UserName(); + unset($meta['mtime']); // force new date + return $page->save($newtext, $version + 1, $meta); + } + } + return false; + } + + private function searchReplacePages(&$dbi, &$request, $pages, $from, $to) + { + $result = HTML::div(); + $ul = HTML::ul(); + $count = 0; + $post_args = $request->getArg('admin_replace'); + $case_exact = !empty($post_args['case_exact']); + $regex = !empty($post_args['regex']); + foreach ($pages as $pagename) { + if (!mayAccessPage('edit', $pagename)) { + $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename))); + } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) { + $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.", + $from, $to, WikiLink($pagename)))); + $count++; + } + } + if ($count) { + $dbi->touch(); + $result->setAttr('class', 'feedback'); + if ($count == 1) { + $result->pushContent(HTML::p(_("One page has been changed:"))); + } else { + $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count))); + } + $result->pushContent($ul); + } else { + $result->setAttr('class', 'error'); + $result->pushContent(HTML::p(_("No pages changed."))); + } + return $result; + } + private function checkBox(&$post_args, $name, $msg) { $id = 'admin_replace-' . $name; @@ -218,16 +214,16 @@ 'name' => 'admin_replace[' . $name . ']', 'id' => $id, 'value' => 1)); - if (!empty($post_args[$name])) + if (!empty($post_args[$name])) { $checkbox->setAttr('checked', 'checked'); + } return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg)); } private function replaceForm(&$header, $post_args) { - $header->pushContent(HTML::div(array('class' => 'hint'), - _("Replace all occurences of the given string in the content of all pages.")), - HTML::br()); + $header->pushContent(HTML::p(array('class' => 'hint'), + _("Replace all occurences of the given string in the content of all selected pages."))); $table = HTML::table(); $this->tablePush($table, _("Replace") . _(": "), HTML::input(array('name' => 'admin_replace[from]', Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -3,7 +3,7 @@ $locale[" %d%% (%d/%d)"] = " %d%% (%d/%d)"; $locale[" %s AUTH ignored."] = "%s AUTH ignoriert."; $locale[" (to pages linked from \"%s\")"] = "(auf Seiten verlinkt von \"%s\")"; -$locale[" ... around %s"] = "... cirka %s"; +$locale[" ... around “%s”"] = "... cirka “%s”"; $locale[" ... first %d bytes"] = " ... erste %d Bytes"; $locale[" ... first %d lines"] = " ... erste %d Zeilen"; $locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %d einzelne Autoren Revisionen."; @@ -51,7 +51,6 @@ $locale["%s is not writable."] = "%s is nicht änderbar."; $locale["%s is only allowed in locked pages."] = "%s wird/werden nur in gesperrten Seiten erlaubt."; $locale["%s not defined"] = "%s nicht definiert"; -$locale["%s not found"] = "%s nicht gefunden"; $locale["%s not found in %s"] = "%s nicht gefunden in %s"; $locale["%s of this page"] = "%s von dieser Seite"; $locale["%s on %s:"] = "%s um %s:"; @@ -394,7 +393,6 @@ $locale["Enumeration"] = "Num. Liste"; $locale["Error sending e-mail with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s."; $locale["Error: Couldn't send %s to %s"] = "Fehler: Konnte nicht %s an %s senden"; -$locale["Error: Empty search string."] = "Fehler: Leeres Suchwort."; $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden."; $locale["Every"] = "Jeder"; $locale["Exit toolbar"] = "Beende Werkzeugleiste"; @@ -1319,6 +1317,7 @@ $locale["weeks"] = "Wochen"; $locale["yesterday"] = "gestern"; $locale["“%s” is no ModeratedPage anymore."] = "»%s« ist keine ModeratierteSeite mehr."; +$locale["“%s” not found"] = "“%s” nicht gefunden"; $locale["“%s”: Bad page name"] = "»%s«: Ungültiger Seitenname"; $locale["“%s”: Bad page name: %s"] = "»%s«: Ungültiger Seitenname: %s"; $locale["“%s”: corrupt file"] = Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/es/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -1,6 +1,6 @@ <?php -$locale[" ... around %s"] = " ... alrededor de %s"; +$locale[" ... around “%s”"] = " ... alrededor de “%s”"; $locale[" ... first %d bytes"] = " ... primeros octetos de %d"; $locale[" Sorry, cannot merge."] = " Apesadumbrado, no puede combinarse."; $locale[" and "] = " y "; @@ -27,7 +27,6 @@ $locale["%s is not locked!"] = "¡%s no está bloqueado!"; $locale["%s is not writable."] = "%s no es escribible."; $locale["%s not defined"] = "%s no definido"; -$locale["%s not found"] = "%s: fichero no encontrado"; $locale["%s: %s"] = "%s: %s"; $locale["%s: Bad action"] = "%s: Mala acción"; $locale["%s: Can't open dba database"] = "%s: No puede abrir la base de datos del DBA"; @@ -583,6 +582,7 @@ $locale["view this page"] = "para visión esta página"; $locale["weeks"] = "semanas"; $locale["yesterday"] = "ayer"; +$locale["“%s” not found"] = "“%s” no encontrado"; $locale["“%s”: Bad page name"] = "“%s”: Mal nombre de la página"; $locale["“%s”: corrupt file"] = "“%s”: archivo corrupto"; Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -4,7 +4,7 @@ $locale[" (syntax error for latex) "] = " (erreur de syntaxe pour latex) "; $locale[" (to pages linked from \"%s\")"] = " (aux pages liées à \"%s\")"; $locale[" - %d / %d - "] = " - %d / %d - "; -$locale[" ... around %s"] = "... autour de %s"; +$locale[" ... around “%s”"] = "... autour de « %s »"; $locale[" ... first %d bytes"] = "... %d premiers octets"; $locale[" ... first %d lines"] = "... %d premières lignes"; $locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d versions par auteur."; @@ -57,7 +57,6 @@ $locale["%s is not writable."] = "%s n'est pas modifiable."; $locale["%s is only allowed in locked pages."] = "%s n'est autorisé que dans les pages verrouillées."; $locale["%s not defined"] = "%s non défini"; -$locale["%s not found"] = "%s non trouvé"; $locale["%s not found in %s"] = "%s non trouvé dans %s"; $locale["%s of this page"] = "%s de cette page"; $locale["%s on %s:"] = "%s on %s :"; @@ -415,7 +414,6 @@ $locale["Error"] = "Erreur"; $locale["Error:"] = "Erreur :"; $locale["Error: Couldn't send %s to %s"] = "Erreur : impossible d'envoyer %s à %s"; -$locale["Error: Empty search string."] = "Erreur : la chaîne à rechercher est vide."; $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées."; $locale["Every"] = "Toutes"; $locale["Expiry parameters"] = "Expiration des paramètres"; @@ -913,6 +911,7 @@ $locale["Renamed page from “%s” to “%s”."] = "Page renommée de « %s » à « %s »."; $locale["Renaming created redirect page from “%s” to “%s”"] = "Le renommage a créé une redirection de « %s » à « %s »"; $locale["Replace"] = "Remplacer"; +$locale["Replace all occurences of the given string in the content of all selected pages."] = "Remplacer tous les occurences de la chaîne dans toutes les pages sélectionnées."; $locale["Replace with"] = "Remplacer par"; $locale["Replace “%s” by “%s”"] = "Remplacer « %s » par « %s »"; $locale["Replaced “%s” with “%s” in page “%s”."] = "« %s » a bien été remplacé par « %s » dans la page « %s »."; @@ -1389,6 +1388,7 @@ $locale["view this page"] = "voir cette page"; $locale["weeks"] = "semaines"; $locale["yesterday"] = "hier"; +$locale["“%s” not found"] = "« %s » non trouvé"; $locale["“%s”: Bad page name"] = "« %s » : nom de page non valide"; $locale["“%s”: corrupt file"] = "« %s » : ce fichier est abîmé"; Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/it/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/it/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -12,7 +12,6 @@ $locale["%s bytes"] = "%s byte"; $locale["%s days"] = "%s giorni"; $locale["%s not defined"] = "%s: non definito"; -$locale["%s not found"] = "%s non trovato"; $locale["%s not found in %s"] = "%s non trovato in %s"; $locale["%s of this page"] = "%s di questa pagina"; $locale["%s on %s:"] = "%s a %s:"; @@ -285,5 +284,6 @@ $locale["version %s"] = "versione %s"; $locale["version <em>%s</em>"] = "versione <em>%s</em>"; $locale["yesterday"] = "ieri"; +$locale["“%s” not found"] = "“%s” non trovato"; $locale["“%s”: corrupt file"] = "“%s”: file corrotto"; 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 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/de.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\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." @@ -1034,12 +1034,12 @@ msgstr " ... erste %d Bytes" #, php-format -msgid " ... around %s" -msgstr "... cirka %s" +msgid " ... around “%s”" +msgstr "... cirka “%s”" #, php-format -msgid "%s not found" -msgstr "%s nicht gefunden" +msgid "“%s” not found" +msgstr "“%s” nicht gefunden" #, php-format msgid "page permission inherited from %s" @@ -1114,10 +1114,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "Spalten: %s." - msgid "Rename" msgstr "Umbenennen" @@ -3367,6 +3363,10 @@ msgid "Count" msgstr "Anzahl" +#, php-format +msgid "Columns: %s." +msgstr "Spalten: %s." + msgid "Wanted From" msgstr "Benötigt von" @@ -3679,36 +3679,37 @@ msgid "Search and replace text in selected wiki pages." msgstr "Suche und ersetze Text in den gewählten Seiten." -#, php-format -msgid "Replace “%s” by “%s”" +msgid "You must be an administrator to use this plugin." msgstr "" +"Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen." -msgid "Error: Empty search string." -msgstr "Fehler: Leeres Suchwort." - -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." -msgstr "»%s« mit »%s« in Seite »%s« ersetzt." - msgid "Warning: The search string cannot be empty!" msgstr "Achtung! Das Suchwort darf nicht leer sein!" +msgid "Select the pages to search and replace" +msgstr "Seiten auswählen:" + +msgid "Replace" +msgstr "Ersetze" + msgid "Are you sure you want to replace text in the selected files?" msgstr "" "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen " "wollen?" -msgid "Select the pages to search and replace" -msgstr "Seiten auswählen:" +#, php-format +msgid "Replace “%s” by “%s”" +msgstr "" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "»%s« mit »%s« in Seite »%s« ersetzt." + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "Ersetze alle Wörter in den angegebenen Seiten." -msgid "Replace" -msgstr "Ersetze" - msgid "by" msgstr "mit" @@ -3810,10 +3811,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" -"Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen." - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "WikiAdminUtils %s gibt zurück:" @@ -6159,6 +6156,13 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "%s nicht gefunden" + +#~ msgid "Error: Empty search string." +#~ msgstr "Fehler: Leeres Suchwort." + #~ msgid "chmod page “%s” to “%s”." #~ msgstr "Berechtigung der Seite »%s« auf »%s« geändert." @@ -6246,9 +6250,6 @@ #~ msgid "argument “%s” not declared by plugin" #~ msgstr "Argument »%s« nicht im Zusatzprogramm deklariert" -#~ msgid "file %s not found" -#~ msgstr "%s nicht gefunden" - #~ msgid "Who Is Online" #~ msgstr "Wer ist Online" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/es.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1014,12 +1014,12 @@ msgstr " ... primeros octetos de %d" #, php-format -msgid " ... around %s" -msgstr " ... alrededor de %s" +msgid " ... around “%s”" +msgstr " ... alrededor de “%s”" #, php-format -msgid "%s not found" -msgstr "%s: fichero no encontrado" +msgid "“%s” not found" +msgstr "“%s” no encontrado" #, php-format msgid "page permission inherited from %s" @@ -1094,10 +1094,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "Columnas: %s." - msgid "Rename" msgstr "Retitule" @@ -3263,6 +3259,10 @@ msgid "Count" msgstr "" +#, php-format +msgid "Columns: %s." +msgstr "Columnas: %s." + msgid "Wanted From" msgstr "" @@ -3573,34 +3573,34 @@ msgid "Search and replace text in selected wiki pages." msgstr "" -#, php-format -msgid "Replace “%s” by “%s”" +msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Error: Empty search string." +msgid "Warning: The search string cannot be empty!" msgstr "" -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." +msgid "Select the pages to search and replace" msgstr "" -msgid "Warning: The search string cannot be empty!" -msgstr "" +msgid "Replace" +msgstr "Substituya" msgid "Are you sure you want to replace text in the selected files?" msgstr "" -msgid "Select the pages to search and replace" +#, php-format +msgid "Replace “%s” by “%s”" msgstr "" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "" + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -msgid "Replace" -msgstr "Substituya" - msgid "by" msgstr "por" @@ -3697,9 +3697,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" @@ -5966,6 +5963,10 @@ msgstr "Corrija esta página" #, fuzzy +#~ msgid "%s not found" +#~ msgstr "fichero %s no encontrado" + +#, fuzzy #~ msgid "period" #~ msgstr "versión %d" @@ -5993,9 +5994,6 @@ #~ msgid "Included from %s:" #~ msgstr "Inserción de “%s”:" -#~ msgid "file %s not found" -#~ msgstr "fichero %s no encontrado" - #~ msgid "View the current version" #~ msgstr "Vea la versión actual" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/fr.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\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." @@ -1012,12 +1012,12 @@ msgstr "... %d premiers octets" #, php-format -msgid " ... around %s" -msgstr "... autour de %s" +msgid " ... around “%s”" +msgstr "... autour de « %s »" #, php-format -msgid "%s not found" -msgstr "%s non trouvé" +msgid "“%s” not found" +msgstr "« %s » non trouvé" #, php-format msgid "page permission inherited from %s" @@ -1092,10 +1092,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "Colonnes : %s." - msgid "Rename" msgstr "Renommer" @@ -3302,6 +3298,10 @@ msgid "Count" msgstr "Nombre" +#, php-format +msgid "Columns: %s." +msgstr "Colonnes : %s." + msgid "Wanted From" msgstr "Recherchées par" @@ -3611,38 +3611,40 @@ msgid "Search and replace text in selected wiki pages." msgstr "Recherche puis remplace le texte dans les pages sélectionnées." -#, php-format -msgid "Replace “%s” by “%s”" -msgstr "Remplacer « %s » par « %s »" +msgid "You must be an administrator to use this plugin." +msgstr "Vous devez être un administrateur pour utiliser ce greffon." -msgid "Error: Empty search string." -msgstr "Erreur : la chaîne à rechercher est vide." - -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." -msgstr "« %s » a bien été remplacé par « %s » dans la page « %s »." - msgid "Warning: The search string cannot be empty!" msgstr "Attention : vous devez entrez au moins une lettre pour la recherche!" +msgid "Select the pages to search and replace" +msgstr "" +"Sélectionner ci-dessous les pages dans lesquelles la recherche sera " +"effectuée :" + +msgid "Replace" +msgstr "Remplacer" + msgid "Are you sure you want to replace text in the selected files?" msgstr "" "Êtes-vous sur de vouloir rechercher et remplacer dans les fichiers " "sélectionnés ?" -msgid "Select the pages to search and replace" -msgstr "" -"Sélectionner ci-dessous les pages dans lesquelles la recherche sera " -"effectuée :" +#, php-format +msgid "Replace “%s” by “%s”" +msgstr "Remplacer « %s » par « %s »" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "« %s » a bien été remplacé par « %s » dans la page « %s »." + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" +"Remplacer tous les occurences de la chaîne dans toutes les pages " +"sélectionnées." -msgid "Replace" -msgstr "Remplacer" - msgid "by" msgstr "par" @@ -3744,9 +3746,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "Vous devez être un administrateur pour utiliser ce greffon." - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" @@ -6044,6 +6043,13 @@ msgid "Edit this page" msgstr "Modifier cette page" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "%s non trouvé dans %s" + +#~ msgid "Error: Empty search string." +#~ msgstr "Erreur : la chaîne à rechercher est vide." + #~ msgid "chmod page “%s” to “%s”." #~ msgstr "Changement de mode %s à %s." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/it.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\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" @@ -998,12 +998,12 @@ msgstr " ... i primi %d byte" #, php-format -msgid " ... around %s" +msgid " ... around “%s”" msgstr "" #, php-format -msgid "%s not found" -msgstr "%s non trovato" +msgid "“%s” not found" +msgstr "“%s” non trovato" #, php-format msgid "page permission inherited from %s" @@ -1078,10 +1078,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "Caratteri: %s." - msgid "Rename" msgstr "" @@ -3236,6 +3232,10 @@ msgid "Count" msgstr "" +#, php-format +msgid "Columns: %s." +msgstr "Caratteri: %s." + msgid "Wanted From" msgstr "" @@ -3542,34 +3542,34 @@ msgid "Search and replace text in selected wiki pages." msgstr "" -#, php-format -msgid "Replace “%s” by “%s”" +msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Error: Empty search string." +msgid "Warning: The search string cannot be empty!" msgstr "" -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." +msgid "Select the pages to search and replace" msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "Replace" msgstr "" msgid "Are you sure you want to replace text in the selected files?" msgstr "" -msgid "Select the pages to search and replace" +#, php-format +msgid "Replace “%s” by “%s”" msgstr "" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "" + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -msgid "Replace" -msgstr "" - msgid "by" msgstr "" @@ -3666,9 +3666,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" @@ -5901,6 +5898,10 @@ msgstr "" #, fuzzy +#~ msgid "%s not found" +#~ msgstr "file %s non trovato" + +#, fuzzy #~ msgid "period" #~ msgstr "versione %d" @@ -5917,9 +5918,6 @@ #~ msgid "Included from %s:" #~ msgstr "Inserire dalla %s:" -#~ msgid "file %s not found" -#~ msgstr "file %s non trovato" - #~ msgid "View the current version" #~ msgstr "Mostra il versione corrente" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/ja.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -998,12 +998,12 @@ msgstr "" #, php-format -msgid " ... around %s" +msgid " ... around “%s”" msgstr "" -#, php-format -msgid "%s not found" -msgstr "" +#, fuzzy, php-format +msgid "“%s” not found" +msgstr "%s: ファイルが見つかりません。" #, php-format msgid "page permission inherited from %s" @@ -1080,10 +1080,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "" - #, fuzzy msgid "Rename" msgstr "名称" @@ -3292,6 +3288,10 @@ msgid "Count" msgstr "カウント" +#, php-format +msgid "Columns: %s." +msgstr "" + #, fuzzy msgid "Wanted From" msgstr "データフォーマット" @@ -3631,35 +3631,35 @@ msgid "Search and replace text in selected wiki pages." msgstr "" -#, fuzzy, php-format -msgid "Replace “%s” by “%s”" -msgstr "“%s” の削除に成功しました。" - -msgid "Error: Empty search string." +msgid "You must be an administrator to use this plugin." msgstr "" -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." +msgid "Warning: The search string cannot be empty!" msgstr "" -msgid "Warning: The search string cannot be empty!" +#, fuzzy +msgid "Select the pages to search and replace" +msgstr "貴方個人の言語を選択" + +msgid "Replace" msgstr "" msgid "Are you sure you want to replace text in the selected files?" msgstr "" -#, fuzzy -msgid "Select the pages to search and replace" -msgstr "貴方個人の言語を選択" +#, fuzzy, php-format +msgid "Replace “%s” by “%s”" +msgstr "“%s” の削除に成功しました。" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "" + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -msgid "Replace" -msgstr "" - msgid "by" msgstr "" @@ -3758,9 +3758,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" @@ -6153,6 +6150,10 @@ msgstr "ページを編集しています。" #, fuzzy +#~ msgid "%s not found" +#~ msgstr "%s: ファイルが見つかりません。" + +#, fuzzy #~ msgid "Select the pages to change:" #~ msgstr "貴方個人の言語を選択" @@ -6194,9 +6195,6 @@ #~ msgid "%s is empty" #~ msgstr "%s が空です。" -#~ msgid "file %s not found" -#~ msgstr "%s: ファイルが見つかりません。" - #~ msgid "View the current version" #~ msgstr "現在のバージョンを表示する" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/nl.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -989,12 +989,12 @@ msgid " ... first %d bytes" msgstr "" -#, php-format -msgid " ... around %s" -msgstr "" +#, fuzzy, php-format +msgid " ... around “%s”" +msgstr "van %s" #, php-format -msgid "%s not found" +msgid "“%s” not found" msgstr "" #, php-format @@ -1070,10 +1070,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "" - msgid "Rename" msgstr "" @@ -3228,6 +3224,10 @@ msgid "Count" msgstr "" +#, php-format +msgid "Columns: %s." +msgstr "" + msgid "Wanted From" msgstr "" @@ -3534,34 +3534,34 @@ msgid "Search and replace text in selected wiki pages." msgstr "" -#, php-format -msgid "Replace “%s” by “%s”" +msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Error: Empty search string." +msgid "Warning: The search string cannot be empty!" msgstr "" -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." +msgid "Select the pages to search and replace" msgstr "" -msgid "Warning: The search string cannot be empty!" -msgstr "" +msgid "Replace" +msgstr "Vervangt" msgid "Are you sure you want to replace text in the selected files?" msgstr "" -msgid "Select the pages to search and replace" +#, php-format +msgid "Replace “%s” by “%s”" msgstr "" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "" + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -msgid "Replace" -msgstr "Vervangt" - msgid "by" msgstr "" @@ -3658,9 +3658,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/phpwiki.pot 2013-06-14 14:44:05 UTC (rev 8808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -982,11 +982,11 @@ msgstr "" #, php-format -msgid " ... around %s" +msgid " ... around “%s”" msgstr "" #, php-format -msgid "%s not found" +msgid "“%s” not found" msgstr "" #, php-format @@ -1062,10 +1062,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "" - msgid "Rename" msgstr "" @@ -3220,6 +3216,10 @@ msgid "Count" msgstr "" +#, php-format +msgid "Columns: %s." +msgstr "" + msgid "Wanted From" msgstr "" @@ -3526,34 +3526,34 @@ msgid "Search and replace text in selected wiki pages." msgstr "" -#, php-format -msgid "Replace “%s” by “%s”" +msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Error: Empty search string." +msgid "Warning: The search string cannot be empty!" msgstr "" -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." +msgid "Select the pages to search and replace" msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "Replace" msgstr "" msgid "Are you sure you want to replace text in the selected files?" msgstr "" -msgid "Select the pages to search and replace" +#, php-format +msgid "Replace “%s” by “%s”" msgstr "" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "" + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -msgid "Replace" -msgstr "" - msgid "by" msgstr "" @@ -3650,9 +3650,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/sv.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -985,12 +985,12 @@ msgstr "" #, php-format -msgid " ... around %s" +msgid " ... around “%s”" msgstr "" #, php-format -msgid "%s not found" -msgstr "%s ingen funna" +msgid "“%s” not found" +msgstr "“%s” ingen funna" #, php-format msgid "page permission inherited from %s" @@ -1065,10 +1065,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "" - msgid "Rename" msgstr "" @@ -3223,6 +3219,10 @@ msgid "Count" msgstr "" +#, php-format +msgid "Columns: %s." +msgstr "" + msgid "Wanted From" msgstr "" @@ -3529,34 +3529,34 @@ msgid "Search and replace text in selected wiki pages." msgstr "" -#, php-format -msgid "Replace “%s” by “%s”" +msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Error: Empty search string." +msgid "Warning: The search string cannot be empty!" msgstr "" -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." +msgid "Select the pages to search and replace" msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "Replace" msgstr "" msgid "Are you sure you want to replace text in the selected files?" msgstr "" -msgid "Select the pages to search and replace" +#, php-format +msgid "Replace “%s” by “%s”" msgstr "" +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "" + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -msgid "Replace" -msgstr "" - msgid "by" msgstr "" @@ -3653,9 +3653,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "" - #, php-format msgid "WikiAdminUtils %s returned:" msgstr "" @@ -5886,5 +5883,9 @@ msgstr "" #, fuzzy +#~ msgid "%s not found" +#~ msgstr "%s: fila ingen funna" + +#, fuzzy #~ msgid "period" #~ msgstr "version %d" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/po/zh.po 2013-06-14 14:44:05 UTC (rev 8808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-14 11:53+0200\n" +"POT-Creation-Date: 2013-06-14 16:42+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -338,13 +338,11 @@ msgid "Search & Replace" msgstr "搜尋與取代" -#, fuzzy msgid "Search for" msgstr "搜尋" -#, fuzzy msgid "Replace with" -msgstr "取代:" +msgstr "取代" msgid "OK" msgstr "" @@ -1034,12 +1032,12 @@ msgstr " ... 頭 %d bytes" #, php-format -msgid " ... around %s" -msgstr "... 包圍 %s" +msgid " ... around “%s”" +msgstr "... 包圍 “%s”" #, php-format -msgid "%s not found" -msgstr "%s 找不到." +msgid "“%s” not found" +msgstr "“%s” 找不到" #, php-format msgid "page permission inherited from %s" @@ -1117,10 +1115,6 @@ msgid "Illegal 'limit' argument: must be numeric" msgstr "" -#, php-format -msgid "Columns: %s." -msgstr "行: %s." - msgid "Rename" msgstr "更名" @@ -3390,6 +3384,10 @@ msgid "Count" msgstr "計數" +#, php-format +msgid "Columns: %s." +msgstr "行: %s." + #, fuzzy msgid "Wanted From" msgstr "日期格式" @@ -3732,37 +3730,36 @@ msgid "Search and replace text in selected wiki pages." msgstr "在選定的頁面中搜尋並更換文字." -#, fuzzy, php-format -msgid "Replace “%s” by “%s”" -msgstr "更名頁面 “%s” 為 “%s”." +msgid "You must be an administrator to use this plugin." +msgstr "你必須是管理者才能使用此 plugin." -msgid "Error: Empty search string." -msgstr "錯誤: 空白的搜尋字串." - -#, php-format -msgid "Replaced “%s” with “%s” in page “%s”." -msgstr "取代 “%s” 以 “%s” 在頁面 “%s”." - msgid "Warning: The search string cannot be empty!" msgstr "警告: 搜尋字串不能是空白!" #, fuzzy +msgid "Select the pages to search and replace" +msgstr "選擇頁面以進行搜尋:" + +msgid "Replace" +msgstr "取代" + +#, fuzzy msgid "Are you sure you want to replace text in the selected files?" msgstr "你確定你想要永久新增並取代選定檔案中的文字?" -#, fuzzy -msgid "Select the pages to search and replace" -msgstr "選擇頁面以進行搜尋:" +#, fuzzy, php-format +msgid "Replace “%s” by “%s”" +msgstr "更名頁面 “%s” 為 “%s”." +#, php-format +msgid "Replaced “%s” with “%s” in page “%s”." +msgstr "取代 “%s” 以 “%s” 在頁面 “%s”." + msgid "" "Replace all occurences of the given string in the content of all selected " "pages." msgstr "" -#, fuzzy -msgid "Replace" -msgstr "取代:" - msgid "by" msgstr "被" @@ -3868,9 +3865,6 @@ msgid "Bad action requested: %s" msgstr "" -msgid "You must be an administrator to use this plugin." -msgstr "你必須是管理者才能使用此 plugin." - #, fuzzy, php-format msgid "WikiAdminUtils %s returned:" msgstr "WikiAdminUtils 說:" @@ -6271,6 +6265,13 @@ msgid "Edit this page" msgstr "編輯此頁面" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "%s 找不到." + +#~ msgid "Error: Empty search string." +#~ msgstr "錯誤: 空白的搜尋字串." + #~ msgid "chmod page “%s” to “%s”." #~ msgstr "改變頁面 “%s” 權限為 “%s”." Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/sv/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/sv/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -8,7 +8,6 @@ $locale["%d most popular nearby: "] = "De %d mest populära grannarna: "; $locale["%s at %s"] = "%s i %s"; $locale["%s days"] = "%s dar"; -$locale["%s not found"] = "%s ingen funna"; $locale["%s of this page"] = "%s för den här sidan"; $locale["%s: %s"] = "%s: %s"; $locale["%s: file not found"] = "%s: fila ingen funna"; @@ -144,5 +143,6 @@ $locale["today"] = "i dag"; $locale["version %d"] = "version %d"; $locale["version %s"] = "version %s"; -$locale["yesterday"] = - "i går"; +$locale["yesterday"] = "i går"; +$locale["“%s” not found"] = + "“%s” ingen funna"; Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807) +++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808) @@ -1,7 +1,7 @@ <?php $locale[" %d%% (%d/%d)"] = " %d%% (%d/%d)"; -$locale[" ... around %s"] = "... 包圍 %s"; +$locale[" ... around “%s”"] = "... 包圍 “%s”"; $locale[" ... first %d bytes"] = " ... 頭 %d bytes"; $locale[" ... first %d lines"] = " ... 頭 %d 列"; $locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = " 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) 但是沒保存超過 %d 份單一作者修訂."; @@ -28,7 +28,6 @@ $locale["%s is empty."] = "%s 是空白的."; $locale["%s is not writable."] = "%s 無法寫入."; $locale["%s is only allowed in locked pages."] = "%s 只允許在鎖定的頁面中."; -$locale["%s not found"] = "%s 找不到."; $locale["%s of this page"] = "此頁面的 %s"; $locale["%s or %s parameter missing"] = "%s 或 %s 參數遺漏"; $locale["%s pages link to %s:"] = "%s 個頁面連結到 %s:"; @@ -194,7 +193,6 @@ $locale["Empty pagename!"] = "空白的頁面名稱!"; $locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing)."; $locale["Enter your UserId to sign in"] = "輸入你的帳號進行簽入"; -$locale["Error: Empty search string."] = "錯誤: 空白的搜尋字串."; $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存."; $locale["Every"] = "每"; $locale["Expiry parameters"] = "過期參數"; @@ -383,6 +381,8 @@ $locale["Rename"] = "更名"; $locale["Rename selected pages"] = "更名已選定的頁面"; $locale["Rename to"] = "更名為"; +$locale["Replace"] = "取代"; +$locale["Replace with"] = "取代"; $locale["Replaced “%s” with “%s” in page “%s”."] = "取代 “%s” 以 “%s” 在頁面 “%s”."; $locale["Requires WikiAdmin privileges to edit."] = "需要 WikiAdmin 權限方能編輯."; $locale["Reset"] = "重設"; @@ -396,6 +396,7 @@ $locale["Search"] = "搜尋"; $locale["Search & Replace"] = "搜尋與取代"; $locale["Search and replace text in selected wiki pages."] = "在選定的頁面中搜尋並更換文字."; +$locale["Search for"] = "搜尋"; $locale["Search for page titles similar to %s."] = "搜尋與 %s 相似的頁面標題"; $locale["Search the content of all pages in this wiki."] = "在此 wiki 所有頁面中搜尋內容."; $locale["Search the titles of all pages in this wiki."] = "在此 wiki 的所有頁面搜尋標題."; @@ -630,6 +631,7 @@ $locale["view the source of this page"] = "查看此頁面源碼"; $locale["view this page"] = "查看此頁面"; $locale["yesterday"] = "昨天"; +$locale["“%s” not found"] = "“%s” 找不到"; $locale["“%s”: Bad page name"] = "“%s”: 錯誤的頁面名稱"; $locale["“%s”: Bad page name: %s"] = "“%s”: 錯誤頁面名稱: %s"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |