| Index: branches/liquidthreads/includes/MediaTransformOutput.php |
| — | — | @@ -6,6 +6,8 @@ |
| 7 | 7 | * @addtogroup Media |
| 8 | 8 | */ |
| 9 | 9 | abstract class MediaTransformOutput { |
| | 10 | + var $file, $width, $height, $url, $page, $path; |
| | 11 | + |
| 10 | 12 | /** |
| 11 | 13 | * Get the width of the output box |
| 12 | 14 | */ |
| — | — | @@ -36,12 +38,23 @@ |
| 37 | 39 | |
| 38 | 40 | /** |
| 39 | 41 | * Fetch HTML for this transform output |
| 40 | | - * @param array $attribs Advisory associative array of HTML attributes supplied |
| 41 | | - * by the linker. These can be incorporated into the output in any way. |
| 42 | | - * @param array $linkAttribs Attributes of a suggested enclosing <a> tag. |
| 43 | | - * May be ignored. |
| | 42 | + * |
| | 43 | + * @param array $options Associative array of options. Boolean options |
| | 44 | + * should be indicated with a value of true for true, and false or |
| | 45 | + * absent for false. |
| | 46 | + * |
| | 47 | + * alt Alternate text or caption |
| | 48 | + * desc-link Boolean, show a description link |
| | 49 | + * file-link Boolean, show a file download link |
| | 50 | + * valign vertical-align property, if the output is an inline element |
| | 51 | + * img-class Class applied to the <img> tag, if there is such a tag |
| | 52 | + * |
| | 53 | + * For images, desc-link and file-link are implemented as a click-through. For |
| | 54 | + * sounds and videos, they may be displayed in other ways. |
| | 55 | + * |
| | 56 | + * @return string |
| 44 | 57 | */ |
| 45 | | - abstract function toHtml( $attribs = array() , $linkAttribs = false ); |
| | 58 | + abstract function toHtml( $options = array() ); |
| 46 | 59 | |
| 47 | 60 | /** |
| 48 | 61 | * This will be overridden to return true in error classes |
| — | — | @@ -60,6 +73,19 @@ |
| 61 | 74 | return $contents; |
| 62 | 75 | } |
| 63 | 76 | } |
| | 77 | + |
| | 78 | + function getDescLinkAttribs( $alt = false ) { |
| | 79 | + $query = $this->page ? ( 'page=' . urlencode( $this->page ) ) : ''; |
| | 80 | + $title = $this->file->getTitle(); |
| | 81 | + if ( strval( $alt ) === '' ) { |
| | 82 | + $alt = $title->getText(); |
| | 83 | + } |
| | 84 | + return array( |
| | 85 | + 'href' => $this->file->getTitle()->getLocalURL( $query ), |
| | 86 | + 'class' => 'image', |
| | 87 | + 'title' => $alt |
| | 88 | + ); |
| | 89 | + } |
| 64 | 90 | } |
| 65 | 91 | |
| 66 | 92 | |
| — | — | @@ -74,7 +100,8 @@ |
| 75 | 101 | * @param string $url URL path to the thumb |
| 76 | 102 | * @private |
| 77 | 103 | */ |
| 78 | | - function ThumbnailImage( $url, $width, $height, $path = false ) { |
| | 104 | + function ThumbnailImage( $file, $url, $width, $height, $path = false, $page = false ) { |
| | 105 | + $this->file = $file; |
| 79 | 106 | $this->url = $url; |
| 80 | 107 | # These should be integers when they get here. |
| 81 | 108 | # If not, there's a bug somewhere. But let's at |
| — | — | @@ -82,28 +109,56 @@ |
| 83 | 110 | $this->width = round( $width ); |
| 84 | 111 | $this->height = round( $height ); |
| 85 | 112 | $this->path = $path; |
| | 113 | + $this->page = $page; |
| 86 | 114 | } |
| 87 | 115 | |
| 88 | 116 | /** |
| 89 | 117 | * Return HTML <img ... /> tag for the thumbnail, will include |
| 90 | 118 | * width and height attributes and a blank alt text (as required). |
| | 119 | + * |
| | 120 | + * @param array $options Associative array of options. Boolean options |
| | 121 | + * should be indicated with a value of true for true, and false or |
| | 122 | + * absent for false. |
| 91 | 123 | * |
| 92 | | - * You can set or override additional attributes by passing an |
| 93 | | - * associative array of name => data pairs. The data will be escaped |
| 94 | | - * for HTML output, so should be in plaintext. |
| | 124 | + * alt Alternate text or caption |
| | 125 | + * desc-link Boolean, show a description link |
| | 126 | + * file-link Boolean, show a file download link |
| | 127 | + * valign vertical-align property, if the output is an inline element |
| | 128 | + * img-class Class applied to the <img> tag, if there is such a tag |
| 95 | 129 | * |
| 96 | | - * If $linkAttribs is given, the image will be enclosed in an <a> tag. |
| | 130 | + * For images, desc-link and file-link are implemented as a click-through. For |
| | 131 | + * sounds and videos, they may be displayed in other ways. |
| 97 | 132 | * |
| 98 | | - * @param array $attribs |
| 99 | | - * @param array $linkAttribs |
| 100 | 133 | * @return string |
| 101 | 134 | * @public |
| 102 | 135 | */ |
| 103 | | - function toHtml( $attribs = array(), $linkAttribs = false ) { |
| 104 | | - $attribs['src'] = $this->url; |
| 105 | | - $attribs['width'] = $this->width; |
| 106 | | - $attribs['height'] = $this->height; |
| 107 | | - if( !isset( $attribs['alt'] ) ) $attribs['alt'] = ''; |
| | 136 | + function toHtml( $options = array() ) { |
| | 137 | + if ( count( func_get_args() ) == 2 ) { |
| | 138 | + throw new MWException( __METHOD__ .' called in the old style' ); |
| | 139 | + } |
| | 140 | + |
| | 141 | + $alt = empty( $options['alt'] ) ? '' : $options['alt']; |
| | 142 | + if ( !empty( $options['desc-link'] ) ) { |
| | 143 | + $linkAttribs = $this->getDescLinkAttribs( $alt ); |
| | 144 | + } elseif ( !empty( $options['file-link'] ) ) { |
| | 145 | + $linkAttribs = array( 'href' => $this->file->getURL() ); |
| | 146 | + } else { |
| | 147 | + $linkAttribs = false; |
| | 148 | + } |
| | 149 | + |
| | 150 | + $attribs = array( |
| | 151 | + 'alt' => $alt, |
| | 152 | + 'src' => $this->url, |
| | 153 | + 'width' => $this->width, |
| | 154 | + 'height' => $this->height, |
| | 155 | + 'border' => 0, |
| | 156 | + ); |
| | 157 | + if ( !empty( $options['valign'] ) ) { |
| | 158 | + $attribs['style'] = "vertical-align: {$options['valign']}"; |
| | 159 | + } |
| | 160 | + if ( !empty( $options['img-class'] ) ) { |
| | 161 | + $attribs['class'] = $options['img-class']; |
| | 162 | + } |
| 108 | 163 | return $this->linkWrap( $linkAttribs, Xml::element( 'img', $attribs ) ); |
| 109 | 164 | } |
| 110 | 165 | |
| — | — | @@ -130,7 +185,7 @@ |
| 131 | 186 | $this->path = false; |
| 132 | 187 | } |
| 133 | 188 | |
| 134 | | - function toHtml( $attribs = array(), $linkAttribs = false ) { |
| | 189 | + function toHtml( $options = array() ) { |
| 135 | 190 | return "<table class=\"MediaTransformError\" style=\"" . |
| 136 | 191 | "width: {$this->width}px; height: {$this->height}px;\"><tr><td>" . |
| 137 | 192 | $this->htmlMsg . |
| Index: branches/liquidthreads/includes/ImageGallery.php |
| — | — | @@ -261,13 +261,14 @@ |
| 262 | 262 | . htmlspecialchars( $img->getLastError() ) . '</div>'; |
| 263 | 263 | } else { |
| 264 | 264 | $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2; |
| 265 | | - $linkAttribs = array( |
| 266 | | - 'href' => $nt->getLocalURL(), |
| 267 | | - 'title' => $nt->getPrefixedText(), |
| 268 | | - ); |
| 269 | 265 | |
| 270 | | - $thumbhtml = "\n\t\t\t".'<div class="thumb" style="padding: ' . $vpad . 'px 0; width: '.($this->mWidths+30).'px;">' |
| 271 | | - . $thumb->toHtml( array(), $linkAttribs ) . '</div>'; |
| | 266 | + $thumbhtml = "\n\t\t\t". |
| | 267 | + '<div class="thumb" style="padding: ' . $vpad . 'px 0; width: ' .($this->mWidths+30).'px;">' |
| | 268 | + # Auto-margin centering for block-level elements. Needed now that we have video |
| | 269 | + # handlers since they may emit block-level elements as opposed to simple <img> tags. |
| | 270 | + # ref http://css-discuss.incutio.com/?page=CenteringBlockElement |
| | 271 | + . '<div style="margin-left: auto; margin-right: auto; width: ' .$this->mWidths.'px;">' |
| | 272 | + . $thumb->toHtml( array( 'desc-link' => true ) ) . '</div></div>'; |
| 272 | 273 | |
| 273 | 274 | // Call parser transform hook |
| 274 | 275 | if ( $this->mParser && $img->getHandler() ) { |
| — | — | @@ -350,3 +351,4 @@ |
| 351 | 352 | |
| 352 | 353 | } //class |
| 353 | 354 | |
| | 355 | + |
| Index: branches/liquidthreads/includes/Linker.php |
| — | — | @@ -566,33 +566,13 @@ |
| 567 | 567 | $thumb = false; |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | | - if ( $page ) { |
| 571 | | - $query = 'page=' . urlencode( $page ); |
| 572 | | - } else { |
| 573 | | - $query = ''; |
| 574 | | - } |
| 575 | | - $url = $title->getLocalURL( $query ); |
| 576 | | - $imgAttribs = array( |
| 577 | | - 'alt' => $fp['alt'], |
| 578 | | - 'longdesc' => $url |
| 579 | | - ); |
| 580 | | - |
| 581 | | - if ( isset( $fp['valign'] ) ) { |
| 582 | | - $imgAttribs['style'] = "vertical-align: {$fp['valign']}"; |
| 583 | | - } |
| 584 | | - if ( isset( $fp['border'] ) ) { |
| 585 | | - $imgAttribs['class'] = "thumbborder"; |
| 586 | | - } |
| 587 | | - $linkAttribs = array( |
| 588 | | - 'href' => $url, |
| 589 | | - 'class' => 'image', |
| 590 | | - 'title' => $fp['alt'] |
| 591 | | - ); |
| 592 | | - |
| 593 | 570 | if ( !$thumb ) { |
| 594 | 571 | $s = $this->makeBrokenImageLinkObj( $title ); |
| 595 | 572 | } else { |
| 596 | | - $s = $thumb->toHtml( $imgAttribs, $linkAttribs ); |
| | 573 | + $s = $thumb->toHtml( array( |
| | 574 | + 'desc-link' => true, |
| | 575 | + 'alt' => $fp['alt'], |
| | 576 | + 'valign' => isset( $fp['valign'] ) ? $fp['valign'] : false ) ); |
| 597 | 577 | } |
| 598 | 578 | if ( '' != $fp['align'] ) { |
| 599 | 579 | $s = "<div class=\"float{$fp['align']}\"><span>{$s}</span></div>"; |
| — | — | @@ -684,18 +664,10 @@ |
| 685 | 665 | $s .= htmlspecialchars( wfMsg( 'thumbnail_error', '' ) ); |
| 686 | 666 | $zoomicon = ''; |
| 687 | 667 | } else { |
| 688 | | - $imgAttribs = array( |
| | 668 | + $s .= $thumb->toHtml( array( |
| 689 | 669 | 'alt' => $fp['alt'], |
| 690 | | - 'longdesc' => $url, |
| 691 | | - 'class' => 'thumbimage' |
| 692 | | - ); |
| 693 | | - $linkAttribs = array( |
| 694 | | - 'href' => $url, |
| 695 | | - 'class' => 'internal', |
| 696 | | - 'title' => $fp['alt'] |
| 697 | | - ); |
| 698 | | - |
| 699 | | - $s .= $thumb->toHtml( $imgAttribs, $linkAttribs ); |
| | 670 | + 'img-class' => 'thumbimage', |
| | 671 | + 'desc-link' => true ) ); |
| 700 | 672 | if ( isset( $fp['framed'] ) ) { |
| 701 | 673 | $zoomicon=""; |
| 702 | 674 | } else { |
| Index: branches/liquidthreads/includes/ImagePage.php |
| — | — | @@ -242,14 +242,13 @@ |
| 243 | 243 | $wgOut->addHTML( '<table class="multipageimage"><tr><td>' ); |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | | - $imgAttribs = array( |
| 247 | | - 'border' => 0, |
| 248 | | - 'alt' => $this->img->getTitle()->getPrefixedText() |
| 249 | | - ); |
| 250 | | - |
| 251 | 246 | if ( $thumbnail ) { |
| | 247 | + $options = array( |
| | 248 | + 'alt' => $this->img->getTitle()->getPrefixedText(), |
| | 249 | + 'file-link' => true, |
| | 250 | + ); |
| 252 | 251 | $wgOut->addHTML( '<div class="fullImageLink" id="file">' . |
| 253 | | - $thumbnail->toHtml( $imgAttribs, $linkAttribs ) . |
| | 252 | + $thumbnail->toHtml( $options ) . |
| 254 | 253 | $anchorclose . '</div>' ); |
| 255 | 254 | } |
| 256 | 255 | |
| — | — | @@ -297,9 +296,9 @@ |
| 298 | 297 | if ($this->img->isSafeFile()) { |
| 299 | 298 | $icon= $this->img->iconThumb(); |
| 300 | 299 | |
| 301 | | - $wgOut->addHTML( '<div class="fullImageLink" id="file"><a href="' . $full_url . '">' . |
| 302 | | - $icon->toHtml() . |
| 303 | | - '</a></div>' ); |
| | 300 | + $wgOut->addHTML( '<div class="fullImageLink" id="file">' . |
| | 301 | + $icon->toHtml( array( 'desc-link' => true ) ) . |
| | 302 | + '</div>' ); |
| 304 | 303 | } |
| 305 | 304 | |
| 306 | 305 | $showLink = true; |
| Index: branches/liquidthreads/includes/Sanitizer.php |
| — | — | @@ -330,6 +330,9 @@ |
| 331 | 331 | * @addtogroup Parser |
| 332 | 332 | */ |
| 333 | 333 | class Sanitizer { |
| | 334 | + const NONE = 0; |
| | 335 | + const INITIAL_NONLETTER = 1; |
| | 336 | + |
| 334 | 337 | /** |
| 335 | 338 | * Cleans up HTML, removes dangerous tags and attributes, and |
| 336 | 339 | * removes HTML comments |
| — | — | @@ -778,20 +781,29 @@ |
| 779 | 782 | * name attributes |
| 780 | 783 | * @see http://www.w3.org/TR/html401/struct/links.html#h-12.2.3 Anchors with the id attribute |
| 781 | 784 | * |
| 782 | | - * @static |
| 783 | | - * |
| 784 | | - * @param string $id |
| | 785 | + * @param string $id Id to validate |
| | 786 | + * @param int $flags Currently only two values: Sanitizer::INITIAL_NONLETTER |
| | 787 | + * (default) permits initial non-letter characters, |
| | 788 | + * such as if you're adding a prefix to them. |
| | 789 | + * Sanitizer::NONE will prepend an 'x' if the id |
| | 790 | + * would otherwise start with a nonletter. |
| 785 | 791 | * @return string |
| 786 | 792 | */ |
| 787 | | - static function escapeId( $id ) { |
| | 793 | + static function escapeId( $id, $flags = Sanitizer::INITIAL_NONLETTER ) { |
| 788 | 794 | static $replace = array( |
| 789 | 795 | '%3A' => ':', |
| 790 | 796 | '%' => '.' |
| 791 | 797 | ); |
| 792 | 798 | |
| 793 | 799 | $id = urlencode( Sanitizer::decodeCharReferences( strtr( $id, ' ', '_' ) ) ); |
| 794 | | - |
| 795 | | - return str_replace( array_keys( $replace ), array_values( $replace ), $id ); |
| | 800 | + $id = str_replace( array_keys( $replace ), array_values( $replace ), $id ); |
| | 801 | + |
| | 802 | + if( ~$flags & Sanitizer::INITIAL_NONLETTER |
| | 803 | + && !preg_match( '/[a-zA-Z]/', $id[0] ) ) { |
| | 804 | + // Initial character must be a letter! |
| | 805 | + $id = "x$id"; |
| | 806 | + } |
| | 807 | + return $id; |
| 796 | 808 | } |
| 797 | 809 | |
| 798 | 810 | /** |
| Index: branches/liquidthreads/includes/filerepo/File.php |
| — | — | @@ -559,7 +559,7 @@ |
| 560 | 560 | $path = '/common/images/icons/' . $icon; |
| 561 | 561 | $filepath = $wgStyleDirectory . $path; |
| 562 | 562 | if( file_exists( $filepath ) ) { |
| 563 | | - return new ThumbnailImage( $wgStylePath . $path, 120, 120 ); |
| | 563 | + return new ThumbnailImage( $this, $wgStylePath . $path, 120, 120 ); |
| 564 | 564 | } |
| 565 | 565 | } |
| 566 | 566 | return null; |
| Index: branches/liquidthreads/includes/media/DjVu.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | if ( $flags & self::TRANSFORM_LATER ) { |
| 87 | | - return new ThumbnailImage( $dstUrl, $width, $height, $dstPath ); |
| | 87 | + return new ThumbnailImage( $image, $dstUrl, $width, $height, $dstPath, $page ); |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | if ( !wfMkdirParents( dirname( $dstPath ) ) ) { |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | wfHostname(), $retval, trim($err), $cmd ) ); |
| 112 | 112 | return new MediaTransformError( 'thumbnail_error', $width, $height, $err ); |
| 113 | 113 | } else { |
| 114 | | - return new ThumbnailImage( $dstUrl, $width, $height, $dstPath ); |
| | 114 | + return new ThumbnailImage( $image, $dstUrl, $width, $height, $dstPath, $page ); |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
| Index: branches/liquidthreads/includes/media/Bitmap.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | if ( $physicalWidth == $srcWidth && $physicalHeight == $srcHeight ) { |
| 60 | 60 | # normaliseParams (or the user) wants us to return the unscaled image |
| 61 | 61 | wfDebug( __METHOD__.": returning unscaled image\n" ); |
| 62 | | - return new ThumbnailImage( $image->getURL(), $clientWidth, $clientHeight, $srcPath ); |
| | 62 | + return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath ); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | if ( !$dstPath ) { |
| — | — | @@ -77,11 +77,11 @@ |
| 78 | 78 | if ( $scaler == 'client' ) { |
| 79 | 79 | # Client-side image scaling, use the source URL |
| 80 | 80 | # Using the destination URL in a TRANSFORM_LATER request would be incorrect |
| 81 | | - return new ThumbnailImage( $image->getURL(), $clientWidth, $clientHeight, $srcPath ); |
| | 81 | + return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath ); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | if ( $flags & self::TRANSFORM_LATER ) { |
| 85 | | - return new ThumbnailImage( $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| | 85 | + return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | if ( !wfMkdirParents( dirname( $dstPath ) ) ) { |
| — | — | @@ -201,7 +201,7 @@ |
| 202 | 202 | wfHostname(), $retval, trim($err), $cmd ) ); |
| 203 | 203 | return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err ); |
| 204 | 204 | } else { |
| 205 | | - return new ThumbnailImage( $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| | 205 | + return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| 206 | 206 | } |
| 207 | 207 | } |
| 208 | 208 | |
| Index: branches/liquidthreads/includes/media/Generic.php |
| — | — | @@ -349,7 +349,8 @@ |
| 350 | 350 | return false; |
| 351 | 351 | } |
| 352 | 352 | $url = $script . '&' . wfArrayToCGI( $this->getScriptParams( $params ) ); |
| 353 | | - return new ThumbnailImage( $url, $params['width'], $params['height'] ); |
| | 353 | + $page = isset( $params['page'] ) ? $params['page'] : false; |
| | 354 | + return new ThumbnailImage( $image, $url, $params['width'], $params['height'], $page ); |
| 354 | 355 | } |
| 355 | 356 | |
| 356 | 357 | /** |
| Index: branches/liquidthreads/includes/media/SVG.php |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | $srcPath = $image->getPath(); |
| 51 | 51 | |
| 52 | 52 | if ( $flags & self::TRANSFORM_LATER ) { |
| 53 | | - return new ThumbnailImage( $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| | 53 | + return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | if ( !wfMkdirParents( dirname( $dstPath ) ) ) { |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | wfHostname(), $retval, trim($err), $cmd ) ); |
| 82 | 82 | return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err ); |
| 83 | 83 | } else { |
| 84 | | - return new ThumbnailImage( $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| | 84 | + return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath ); |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
| Index: branches/liquidthreads/includes/api/ApiInstantCommons.php |
| — | — | @@ -1,191 +0,0 @@ |
| 2 | | -<?php |
| 3 | | -/** |
| 4 | | - * @author suuch (mediawiki @ suuch . com) |
| 5 | | - * In the public domain. At least in Ghana. |
| 6 | | - */ |
| 7 | | - |
| 8 | | - |
| 9 | | -if (!defined('MEDIAWIKI')) { |
| 10 | | - // Eclipse helper - will be ignored in production |
| 11 | | - require_once ('ApiBase.php'); |
| 12 | | -} |
| 13 | | - |
| 14 | | -class ApiInstantCommons extends ApiBase { |
| 15 | | - var $arrOutput = array(); |
| 16 | | - var $resParser; |
| 17 | | - var $strXmlData; |
| 18 | | - |
| 19 | | - public function __construct($main, $action) { |
| 20 | | - parent :: __construct($main, $action); |
| 21 | | - } |
| 22 | | - |
| 23 | | - /** |
| 24 | | - * InstantCommons execution happens in the following steps: |
| 25 | | - */ |
| 26 | | - public function execute() { |
| 27 | | - $media = $maint = $meta = null; |
| 28 | | - extract($this->extractRequestParams()); |
| 29 | | - $data = array(); |
| 30 | | - $data = $this->fetchImage($media); |
| 31 | | - if($data!=NULL){ |
| 32 | | - $this->getResult()->addValue('instantcommons', 'image', $data); |
| 33 | | - } |
| 34 | | - } |
| 35 | | - |
| 36 | | - |
| 37 | | - /** |
| 38 | | - * Override the parent to generate help messages for all available query modules. |
| 39 | | - */ |
| 40 | | - public function makeHelpMsg() { |
| 41 | | - |
| 42 | | - // Use parent to make default message for the query module |
| 43 | | - $msg = parent :: makeHelpMsg(); |
| 44 | | - |
| 45 | | - // Make sure the internal object is empty |
| 46 | | - // (just in case a sub-module decides to optimize during instantiation) |
| 47 | | - $this->mPageSet = null; |
| 48 | | - |
| 49 | | - $astriks = str_repeat('--- ', 8); |
| 50 | | - $msg .= "\n$astriks InstantCommons: Prop $astriks\n\n"; |
| 51 | | - $msg .= "\n See http://meta.wikimedia.org/wiki/InstantCommons\n\n"; |
| 52 | | - return $msg; |
| 53 | | - } |
| 54 | | - |
| 55 | | - private function makeHelpMsgHelper($moduleList, $paramName) { |
| 56 | | - |
| 57 | | - $moduleDscriptions = array (); |
| 58 | | - |
| 59 | | - foreach ($moduleList as $moduleName => $moduleClass) { |
| 60 | | - $msg = "* $paramName=$moduleName *"; |
| 61 | | - $module = new $moduleClass ($this, $moduleName, null); |
| 62 | | - $msg2 = $module->makeHelpMsg(); |
| 63 | | - if ($msg2 !== false) |
| 64 | | - $msg .= $msg2; |
| 65 | | - if ($module instanceof ApiInstantCommonsGeneratorBase) |
| 66 | | - $msg .= "Generator:\n This module may be used as a generator\n"; |
| 67 | | - $moduleDscriptions[] = $msg; |
| 68 | | - } |
| 69 | | - |
| 70 | | - return implode("\n", $moduleDscriptions); |
| 71 | | - } |
| 72 | | - |
| 73 | | - protected function getAllowedParams() { |
| 74 | | - return array ( |
| 75 | | - 'media' => null, |
| 76 | | - 'maint' => null, |
| 77 | | - 'meta' => null, |
| 78 | | - ); |
| 79 | | - } |
| 80 | | - protected function getParamDescription() { |
| 81 | | - return array ( |
| 82 | | - 'media' => 'Get properties for the media', |
| 83 | | - 'maint' => 'Which maintenance actions to perform', |
| 84 | | - 'meta' => 'Which meta data to get about this site', |
| 85 | | - ); |
| 86 | | - } |
| 87 | | - |
| 88 | | - protected function getDescription() { |
| 89 | | - return array ( |
| 90 | | - 'InstantCommons API InstantCommons is an API feature of MediaWiki to ' . |
| 91 | | - 'allow the usage of any uploaded media file from the Wikimedia Commons ' . |
| 92 | | - 'in any MediaWiki installation world-wide. InstantCommons-enabled wikis ' . |
| 93 | | - 'cache Commons content so that it is only downloaded once, and subsequent ' . |
| 94 | | - 'pageviews load the locally existing copy.' |
| 95 | | - ); |
| 96 | | - } |
| 97 | | - |
| 98 | | - protected function getExamples() { |
| 99 | | - return array ( |
| 100 | | - 'api.php?action=instantcommons&media=Image:MusekeBannerl.jpg', |
| 101 | | - 'api.php?action=instantcommons&media=Image:MusekeBannerl.jpg&maint=update', //performs update on this media |
| 102 | | - 'api.php?action=instantcommons&media=Image:MusekeBannerl.jpg&maint=delete', //performs delete on this media |
| 103 | | - 'api.php?action=instantcommons&maint=update', //TODO: performs update on all commons media |
| 104 | | - 'api.php?action=instantcommons&maint=delete', //TODO: performs delete on all commons imedia |
| 105 | | - 'api.php?action=instantcommons&maint=both', //TODO: performs update/delete on all commons media |
| 106 | | - 'api.php?action=instantcommons&maint=pending', //TODO: return a GD temp image |
| 107 | | - ); |
| 108 | | - } |
| 109 | | - |
| 110 | | - public function getVersion() { |
| 111 | | - $psModule = new ApiPageSet($this); |
| 112 | | - $vers = array (); |
| 113 | | - $vers[] = __CLASS__ . ': $Id: ApiInstantCommons.php 17074 2006-10-27 05:27:43Z suuch $'; |
| 114 | | - $vers[] = $psModule->getVersion(); |
| 115 | | - return $vers; |
| 116 | | - } |
| 117 | | - |
| 118 | | - /** |
| 119 | | - * Fetch the media from the commons server in the background. |
| 120 | | - * Save it as a local media (but noting its source in the appropriate media table) |
| 121 | | - * @fileName is a fully qualified mediawiki object name (e.g. Image:sing.png) |
| 122 | | - * @return an associative array containing file properties in property=>value pairs |
| 123 | | - */ |
| 124 | | - public function fetchImage($fileName){ |
| 125 | | - global $wgScriptPath; |
| 126 | | - $nt = Title::newFromText( $fileName ); |
| 127 | | - if(is_object($nt)){ |
| 128 | | - $image = new Image ($nt); |
| 129 | | - if($image->exists()){ |
| 130 | | - $image->url = substr(strstr($image->repo->url, $wgScriptPath), strlen($wgScriptPath)).'/'.$image->repo->getHashPath($image->name).$image->name; |
| 131 | | - $image->metadata = addslashes($image->metadata); |
| 132 | | - $ari=(array)$image; |
| 133 | | - //unset non-string elements |
| 134 | | - foreach($ari as $property=>$value){ |
| 135 | | - if(is_object($value)){ |
| 136 | | - unset($ari[$property]); |
| 137 | | - } |
| 138 | | - } |
| 139 | | - return $ari; |
| 140 | | - }else{ |
| 141 | | - return array('error'=>1, 'description'=>'File not found'); //file not found |
| 142 | | - } |
| 143 | | - } |
| 144 | | - else |
| 145 | | - { |
| 146 | | - return array('error'=>2, 'description'=>'Not a valid title'); //not a valid title |
| 147 | | - } |
| 148 | | - } |
| 149 | | - |
| 150 | | - |
| 151 | | - |
| 152 | | - function parse($strInputXML) { |
| 153 | | - $this->resParser = xml_parser_create (); |
| 154 | | - xml_set_object($this->resParser,$this); |
| 155 | | - xml_set_element_handler($this->resParser, "tagOpen", "tagClosed"); |
| 156 | | - |
| 157 | | - xml_set_character_data_handler($this->resParser, "tagData"); |
| 158 | | - |
| 159 | | - $this->strXmlData = xml_parse($this->resParser,$strInputXML ); |
| 160 | | - if(!$this->strXmlData) { |
| 161 | | - die(sprintf("XML error: %s at line %d", |
| 162 | | - xml_error_string(xml_get_error_code($this->resParser)), |
| 163 | | - xml_get_current_line_number($this->resParser))); |
| 164 | | - } |
| 165 | | - |
| 166 | | - xml_parser_free($this->resParser); |
| 167 | | - |
| 168 | | - return $this->arrOutput; |
| 169 | | - } |
| 170 | | - function tagOpen($parser, $name, $attrs) { |
| 171 | | - $tag=array("name"=>$name,"attrs"=>$attrs); |
| 172 | | - array_push($this->arrOutput,$tag); |
| 173 | | - } |
| 174 | | - |
| 175 | | - function tagData($parser, $tagData) { |
| 176 | | - if(trim($tagData)) { |
| 177 | | - if(isset($this->arrOutput[count($this->arrOutput)-1]['tagData'])) { |
| 178 | | - $this->arrOutput[count($this->arrOutput)-1]['tagData'] .= $tagData; |
| 179 | | - } |
| 180 | | - else { |
| 181 | | - $this->arrOutput[count($this->arrOutput)-1]['tagData'] = $tagData; |
| 182 | | - } |
| 183 | | - } |
| 184 | | - } |
| 185 | | - |
| 186 | | - function tagClosed($parser, $name) { |
| 187 | | - $this->arrOutput[count($this->arrOutput)-2]['children'][] = $this->arrOutput[count($this->arrOutput)-1]; |
| 188 | | - array_pop($this->arrOutput); |
| 189 | | - } |
| 190 | | - |
| 191 | | -} |
| 192 | | -?> |
| Index: branches/liquidthreads/includes/api/ApiMain.php |
| — | — | @@ -57,7 +57,6 @@ |
| 58 | 58 | 'opensearch' => 'ApiOpenSearch', |
| 59 | 59 | 'feedwatchlist' => 'ApiFeedWatchlist', |
| 60 | 60 | 'help' => 'ApiHelp', |
| 61 | | - 'instantcommons' => 'ApiInstantCommons' |
| 62 | 61 | ); |
| 63 | 62 | |
| 64 | 63 | /** |
| Index: branches/liquidthreads/includes/SpecialUpload.php |
| — | — | @@ -481,8 +481,8 @@ |
| 482 | 482 | $file->getName(), 'right', array(), false, true ); |
| 483 | 483 | } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) { |
| 484 | 484 | $icon = $file->iconThumb(); |
| 485 | | - $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $file->getURL() . '">' . |
| 486 | | - $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| | 485 | + $dlink2 = '<div style="float:right" id="mw-media-icon">' . |
| | 486 | + $icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . $dlink . '</div>'; |
| 487 | 487 | } else { |
| 488 | 488 | $dlink2 = ''; |
| 489 | 489 | } |
| — | — | @@ -498,8 +498,8 @@ |
| 499 | 499 | $nt_lc->getText(), 'right', array(), false, true ); |
| 500 | 500 | } elseif ( !$file_lc->allowInlineDisplay() && $file_lc->isSafeFile() ) { |
| 501 | 501 | $icon = $file_lc->iconThumb(); |
| 502 | | - $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $file_lc->getURL() . '">' . |
| 503 | | - $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| | 502 | + $dlink2 = '<div style="float:right" id="mw-media-icon">' . |
| | 503 | + $icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . $dlink . '</div>'; |
| 504 | 504 | } else { |
| 505 | 505 | $dlink2 = ''; |
| 506 | 506 | } |
| — | — | @@ -522,8 +522,8 @@ |
| 523 | 523 | $nt_thb->getText(), 'right', array(), false, true ); |
| 524 | 524 | } elseif ( !$file_thb->allowInlineDisplay() && $file_thb->isSafeFile() ) { |
| 525 | 525 | $icon = $file_thb->iconThumb(); |
| 526 | | - $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . |
| 527 | | - $file_thb->getURL() . '">' . $icon->toHtml() . '</a><br />' . |
| | 526 | + $dlink2 = '<div style="float:right" id="mw-media-icon">' . |
| | 527 | + $icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . |
| 528 | 528 | $dlink . '</div>'; |
| 529 | 529 | } else { |
| 530 | 530 | $dlink2 = ''; |
| Index: branches/liquidthreads/includes/AutoLoader.php |
| — | — | @@ -306,7 +306,6 @@ |
| 307 | 307 | 'Spyc' => 'includes/api/ApiFormatYaml_spyc.php', |
| 308 | 308 | 'ApiFormatYaml' => 'includes/api/ApiFormatYaml.php', |
| 309 | 309 | 'ApiHelp' => 'includes/api/ApiHelp.php', |
| 310 | | - 'ApiInstantCommons' => 'includes/api/ApiInstantCommons.php', |
| 311 | 310 | 'ApiLogin' => 'includes/api/ApiLogin.php', |
| 312 | 311 | 'ApiMain' => 'includes/api/ApiMain.php', |
| 313 | 312 | 'ApiOpenSearch' => 'includes/api/ApiOpenSearch.php', |
| Index: branches/liquidthreads/languages/messages/MessagesDe.php |
| — | — | @@ -193,7 +193,7 @@ |
| 194 | 194 | 'tog-enotifwatchlistpages' => 'Bei Änderungen an beobachteten Seiten E-Mails senden.', |
| 195 | 195 | 'tog-enotifusertalkpages' => 'Bei Änderungen an meiner Benutzer-Diskussionsseite E-Mails senden.', |
| 196 | 196 | 'tog-enotifminoredits' => 'Auch bei kleinen Änderungen an beobachteten Seiten E-Mails senden.', |
| 197 | | -'tog-enotifrevealaddr' => 'Deine E-Mail-Adresse wird in Benachrichtigungsmails gezeigt', |
| | 197 | +'tog-enotifrevealaddr' => 'Deine E-Mail-Adresse wird in Benachrichtigungsmails gezeigt.', |
| 198 | 198 | 'tog-shownumberswatching' => 'Anzahl der beobachtenden Benutzer anzeigen', |
| 199 | 199 | 'tog-fancysig' => 'Signatur ohne Verlinkung zur Benutzerseite', |
| 200 | 200 | 'tog-externaleditor' => 'Externen Editor als Standard benutzen', |
| — | — | @@ -431,62 +431,62 @@ |
| 432 | 432 | Alle verfügbaren Spezialseiten sind in der [[{{ns:special}}:Specialpages|Liste der Spezialseiten]] zu finden.", |
| 433 | 433 | |
| 434 | 434 | # General errors |
| 435 | | -'error' => 'Fehler', |
| 436 | | -'databaseerror' => 'Fehler in der Datenbank', |
| 437 | | -'dberrortext' => 'Es gab einen Syntaxfehler in der Datenbankabfrage. |
| | 435 | +'error' => 'Fehler', |
| | 436 | +'databaseerror' => 'Fehler in der Datenbank', |
| | 437 | +'dberrortext' => 'Es gab einen Syntaxfehler in der Datenbankabfrage. |
| 438 | 438 | Die letzte Datenbankabfrage lautete: <blockquote><tt>$1</tt></blockquote> aus der Funktion „<tt>$2</tt>“. |
| 439 | 439 | MySQL meldete den Fehler „<tt>$3: $4</tt>“.', |
| 440 | | -'dberrortextcl' => 'Es gab einen Syntaxfehler in der Datenbankabfrage. |
| | 440 | +'dberrortextcl' => 'Es gab einen Syntaxfehler in der Datenbankabfrage. |
| 441 | 441 | Die letzte Datenbankabfrage lautete: „$1“ aus der Funktion „<tt>$2</tt>“. |
| 442 | 442 | MySQL meldete den Fehler: „<tt>$3: $4</tt>“.', |
| 443 | | -'noconnect' => 'Konnte keine Verbindung zur Datenbank auf $1 herstellen', |
| 444 | | -'nodb' => 'Konnte Datenbank $1 nicht auswählen', |
| 445 | | -'cachederror' => 'Das Folgende ist eine Kopie aus dem Cache und möglicherweise nicht aktuell.', |
| 446 | | -'laggedslavemode' => 'Achtung: Die angezeigte Seite enthält unter Umständen nicht die jüngsten Bearbeitungen.', |
| 447 | | -'readonly' => 'Datenbank ist gesperrt', |
| 448 | | -'enterlockreason' => 'Bitte gebe einen Grund ein, warum die Datenbank gesperrt werden soll und eine Abschätzung über die Dauer der Sperrung', |
| 449 | | -'readonlytext' => 'Die Datenbank ist vorübergehend für Neueinträge und Änderungen gesperrt. Bitte versuchen Sie es später noch einmal. |
| | 443 | +'noconnect' => 'Konnte keine Verbindung zur Datenbank auf $1 herstellen', |
| | 444 | +'nodb' => 'Konnte Datenbank $1 nicht auswählen', |
| | 445 | +'cachederror' => 'Das Folgende ist eine Kopie aus dem Cache und möglicherweise nicht aktuell.', |
| | 446 | +'laggedslavemode' => 'Achtung: Die angezeigte Seite enthält unter Umständen nicht die jüngsten Bearbeitungen.', |
| | 447 | +'readonly' => 'Datenbank ist gesperrt', |
| | 448 | +'enterlockreason' => 'Bitte gebe einen Grund ein, warum die Datenbank gesperrt werden soll und eine Abschätzung über die Dauer der Sperrung', |
| | 449 | +'readonlytext' => 'Die Datenbank ist vorübergehend für Neueinträge und Änderungen gesperrt. Bitte versuchen Sie es später noch einmal. |
| 450 | 450 | |
| 451 | 451 | Grund der Sperrung: $1', |
| 452 | | -'missingarticle' => 'Der Text für „$1“ wurde nicht in der Datenbank gefunden. |
| | 452 | +'missingarticle' => 'Der Text für „$1“ wurde nicht in der Datenbank gefunden. |
| 453 | 453 | |
| 454 | 454 | Die Seite ist möglicherweise gelöscht oder verschoben worden. |
| 455 | 455 | |
| 456 | 456 | Falls dies nicht der Fall ist, hast du eventuell einen Fehler in der Software gefunden. Bitte melde dies einem [[{{MediaWiki:grouppage-sysop}}|Administrator]] unter Nennung der URL.', |
| 457 | | -'readonly_lag' => 'Die Datenbank wurde automatisch für Schreibzugriffe gesperrt, damit sich die verteilten Datenbankserver (slaves) mit dem Hauptdatenbankserver (master) abgleichen können.', |
| 458 | | -'internalerror' => 'Interner Fehler', |
| 459 | | -'internalerror_info' => 'Interner Fehler: $1', |
| 460 | | -'filecopyerror' => 'Die Datei „$1“ konnte nicht nach „$2“ kopiert werden.', |
| 461 | | -'filerenameerror' => 'Die Datei „$1“ konnte nicht nach „$2“ umbenannt werden.', |
| 462 | | -'filedeleteerror' => 'Die Datei „$1“ konnte nicht gelöscht werden.', |
| 463 | | -'directorycreateerror' => 'Das Verzeichnis „$1“ konnte nicht angelegt werden.', |
| 464 | | -'filenotfound' => 'Die Datei „$1“ wurde nicht gefunden.', |
| 465 | | -'fileexistserror' => 'In die Datei „$1“ konnte nicht geschrieben werden, da die Datei bereits vorhanden ist.', |
| 466 | | -'unexpected' => 'Unerwarteter Wert: „$1“=„$2“.', |
| 467 | | -'formerror' => 'Fehler: Die Eingaben konnten nicht verarbeitet werden.', |
| 468 | | -'badarticleerror' => 'Diese Aktion kann auf diese Seite nicht angewendet werden.', |
| 469 | | -'cannotdelete' => 'Die gewählte Seite kann nicht gelöscht werden. Möglicherweise wurde sie bereits gelöscht.', |
| 470 | | -'badtitle' => 'Ungültiger Titel', |
| 471 | | -'badtitletext' => 'Der Titel der angeforderten Seite ist ungültig, leer oder ein ungültiger Sprachlink von einem anderen Wiki.', |
| 472 | | -'perfdisabled' => "'''Entschuldigung!''' Diese Funktion wurde wegen Überlastung des Servers vorübergehend deaktiviert.", |
| 473 | | -'perfcached' => 'Die folgenden Daten stammen aus dem Cache und sind möglicherweise nicht aktuell:', |
| 474 | | -'perfcachedts' => 'Diese Daten stammen aus dem Cache, letztes Update: $1', |
| 475 | | -'querypage-no-updates' => "'''Die Aktualisierungsfunktion für diese Seite ist zur Zeit deaktiviert. Die Daten werden bis auf weiteres nicht erneuert.'''", |
| 476 | | -'wrong_wfQuery_params' => 'Falsche Parameter für wfQuery()<br /> |
| | 457 | +'readonly_lag' => 'Die Datenbank wurde automatisch für Schreibzugriffe gesperrt, damit sich die verteilten Datenbankserver (slaves) mit dem Hauptdatenbankserver (master) abgleichen können.', |
| | 458 | +'internalerror' => 'Interner Fehler', |
| | 459 | +'internalerror_info' => 'Interner Fehler: $1', |
| | 460 | +'filecopyerror' => 'Die Datei „$1“ konnte nicht nach „$2“ kopiert werden.', |
| | 461 | +'filerenameerror' => 'Die Datei „$1“ konnte nicht nach „$2“ umbenannt werden.', |
| | 462 | +'filedeleteerror' => 'Die Datei „$1“ konnte nicht gelöscht werden.', |
| | 463 | +'directorycreateerror' => 'Das Verzeichnis „$1“ konnte nicht angelegt werden.', |
| | 464 | +'filenotfound' => 'Die Datei „$1“ wurde nicht gefunden.', |
| | 465 | +'fileexistserror' => 'In die Datei „$1“ konnte nicht geschrieben werden, da die Datei bereits vorhanden ist.', |
| | 466 | +'unexpected' => 'Unerwarteter Wert: „$1“=„$2“.', |
| | 467 | +'formerror' => 'Fehler: Die Eingaben konnten nicht verarbeitet werden.', |
| | 468 | +'badarticleerror' => 'Diese Aktion kann auf diese Seite nicht angewendet werden.', |
| | 469 | +'cannotdelete' => 'Die gewählte Seite kann nicht gelöscht werden. Möglicherweise wurde sie bereits gelöscht.', |
| | 470 | +'badtitle' => 'Ungültiger Titel', |
| | 471 | +'badtitletext' => 'Der Titel der angeforderten Seite ist ungültig, leer oder ein ungültiger Sprachlink von einem anderen Wiki.', |
| | 472 | +'perfdisabled' => "'''Entschuldigung!''' Diese Funktion wurde wegen Überlastung des Servers vorübergehend deaktiviert.", |
| | 473 | +'perfcached' => 'Die folgenden Daten stammen aus dem Cache und sind möglicherweise nicht aktuell:', |
| | 474 | +'perfcachedts' => 'Diese Daten stammen aus dem Cache, letztes Update: $1', |
| | 475 | +'querypage-no-updates' => "'''Die Aktualisierungsfunktion für diese Seite ist zur Zeit deaktiviert. Die Daten werden bis auf weiteres nicht erneuert.'''", |
| | 476 | +'wrong_wfQuery_params' => 'Falsche Parameter für wfQuery()<br /> |
| 477 | 477 | Funktion: $1<br /> |
| 478 | 478 | Abfrage: $2', |
| 479 | | -'viewsource' => 'Quelltext betrachten', |
| 480 | | -'viewsourcefor' => 'für $1', |
| 481 | | -'protectedpagetext' => 'Diese Seite ist für das Bearbeiten gesperrt.', |
| 482 | | -'viewsourcetext' => 'Quelltext dieser Seite:', |
| 483 | | -'protectedinterface' => 'Diese Seite enthält Text für das Sprach-Interface der Software und ist gesperrt, um Missbrauch zu verhindern.', |
| 484 | | -'editinginterface' => "'''Warnung:''' Diese Seite enthält von der MediaWiki-Software benutzten Text. Änderungen wirken sich auf die Benutzeroberfläche aus.", |
| 485 | | -'sqlhidden' => '(SQL-Abfrage versteckt)', |
| 486 | | -'cascadeprotected' => 'Diese Seite ist zur Bearbeitung gesperrt. Sie ist in die {{PLURAL:$1|folgende Seite|folgenden Seiten}} eingebunden, die mittels der Kaskadensperroption geschützt {{PLURAL:$1|ist|sind}}: |
| | 479 | +'viewsource' => 'Quelltext betrachten', |
| | 480 | +'viewsourcefor' => 'für $1', |
| | 481 | +'protectedpagetext' => 'Diese Seite ist für das Bearbeiten gesperrt.', |
| | 482 | +'viewsourcetext' => 'Quelltext dieser Seite:', |
| | 483 | +'protectedinterface' => 'Diese Seite enthält Text für das Sprach-Interface der Software und ist gesperrt, um Missbrauch zu verhindern.', |
| | 484 | +'editinginterface' => "'''Warnung:''' Diese Seite enthält von der MediaWiki-Software benutzten Text. Änderungen wirken sich auf die Benutzeroberfläche aus.", |
| | 485 | +'sqlhidden' => '(SQL-Abfrage versteckt)', |
| | 486 | +'cascadeprotected' => 'Diese Seite ist zur Bearbeitung gesperrt. Sie ist in die {{PLURAL:$1|folgende Seite|folgenden Seiten}} eingebunden, die mittels der Kaskadensperroption geschützt {{PLURAL:$1|ist|sind}}: |
| 487 | 487 | $2', |
| 488 | | -'namespaceprotected' => "Du hast keine Berechtigung, die Seite in dem '''$1'''-Namensraum zu bearbeiten.", |
| 489 | | -'customcssjsprotected' => 'Du bist nicht berechtigt diese Seite zu bearbeiten, da sie zu den persönlichen Einstellungen eines anderen Benutzers gehört.', |
| 490 | | -'ns-specialprotected' => 'Seiten im {{ns:special}}-Namensraum können nicht bearbeitet werden.', |
| | 488 | +'namespaceprotected' => "Du hast keine Berechtigung, die Seite in dem '''$1'''-Namensraum zu bearbeiten.", |
| | 489 | +'customcssjsprotected' => 'Du bist nicht berechtigt diese Seite zu bearbeiten, da sie zu den persönlichen Einstellungen eines anderen Benutzers gehört.', |
| | 490 | +'ns-specialprotected' => 'Seiten im {{ns:special}}-Namensraum können nicht bearbeitet werden.', |
| 491 | 491 | |
| 492 | 492 | # Login and logout pages |
| 493 | 493 | 'logouttitle' => 'Benutzer-Abmeldung', |
| — | — | @@ -529,8 +529,7 @@ |
| 530 | 530 | 'email' => 'E-Mail', |
| 531 | 531 | 'prefs-help-realname' => 'Optional. Dein echter Name deinen Beiträgen zugeordnet.', |
| 532 | 532 | 'loginerror' => 'Fehler bei der Anmeldung', |
| 533 | | -'prefs-help-email' => 'Optional. Erlaubt anderen Benutzern, dich über deine Benutzerseite zu kontaktieren, |
| 534 | | -ohne dass du deine E-Mail-Adresse veröffentlichen musst. Für den Fall, dass du dein Passwort vergessen hast, kann dir ein temporäres Einmal-Passwort zugesendet werden.', |
| | 533 | +'prefs-help-email' => 'Optional. Ermöglicht anderen Benutzern, über E-Mail Kontakt mit dir aufzunehmen, ohne dass du deine Identität offenlegen musst, sowie das Zustellen eines Ersatzpasswortes.', |
| 535 | 534 | 'nocookiesnew' => 'Der Benutzerzugang wurde erstellt, aber du bist nicht eingeloggt. {{SITENAME}} benötigt für diese Funktion Cookies, bitte aktiviere diese und logge dich dann mit deinem neuen Benutzernamen und dem Passwort ein.', |
| 536 | 535 | 'nocookieslogin' => '{{SITENAME}} benutzt Cookies zum Einloggen der Benutzer. Du hast Cookies deaktiviert, bitte aktiviere diese und versuchen es erneut.', |
| 537 | 536 | 'noname' => 'Du musst einen gültigen Benutzernamen angeben.', |
| — | — | @@ -552,9 +551,8 @@ |
| 553 | 552 | |
| 554 | 553 | Bitte ignoriese diese E-Mail, falls du diese nicht selbst angefordert haben. Das alte Passwort bleibt weiterhin gültig.', |
| 555 | 554 | 'noemail' => 'Benutzer „$1“ hat keine E-Mail-Adresse angegeben.', |
| 556 | | -'passwordsent' => 'Ein temporäres Passwort wurde an die E-Mail-Adresse von Benutzer „$1“ gesendet. |
| 557 | | -Bitte melde dich damit an, sobald du es erhalten hast. |
| 558 | | -Das alte Passwort bleibt weiterhin gültig.', |
| | 555 | +'passwordsent' => 'Ein neues, temporäres Passwort wurde an die E-Mail-Adresse von Benutzer „$1“ gesendet. |
| | 556 | +Bitte melde dich damit an, sobald du es erhalten hast. Das alte Passwort bleibt weiterhin gültig.', |
| 559 | 557 | 'blocked-mailpassword' => 'Die von dir verwendete IP-Adresse ist für das Ändern von Seiten gesperrt. Um einen Missbrauch zu verhindern, wurde die Möglichkeit zur Anforderung eines neuen Passwortes ebenfalls gesperrt.', |
| 560 | 558 | 'eauthentsent' => 'Eine Bestätigungsmail wurde an die angegebene E-Mail-Adresse verschickt. |
| 561 | 559 | |
| — | — | @@ -846,7 +844,7 @@ |
| 847 | 845 | # Search results |
| 848 | 846 | 'searchresults' => 'Suchergebnisse', |
| 849 | 847 | 'searchresulttext' => 'Für mehr Informationen zur Suche siehe die [[{{MediaWiki:helppage}}|Hilfeseite]].', |
| 850 | | -'searchsubtitle' => 'Für deine Suchanfrage „[[:$1]]“.', |
| | 848 | +'searchsubtitle' => 'Für deine Suchanfrage „[[:$1|$1]]“.', |
| 851 | 849 | 'searchsubtitleinvalid' => 'Für deine Suchanfrage „$1“.', |
| 852 | 850 | 'noexactmatch' => "'''Es existiert keine Seite mit dem Titel „$1“.''' |
| 853 | 851 | |
| — | — | @@ -1068,7 +1066,7 @@ |
| 1069 | 1067 | 'uploaddisabled' => 'Entschuldigung, das Hochladen ist deaktiviert.', |
| 1070 | 1068 | 'uploaddisabledtext' => 'Das Hochladen von Dateien ist in {{SITENAME}} deaktiviert.', |
| 1071 | 1069 | 'uploadscripted' => 'Diese Datei enthält HTML- oder Scriptcode, der irrtümlich von einem Webbrowser ausgeführt werden könnte.', |
| 1072 | | -'uploadcorrupt' => 'Die Datei ist beschädigt oder hat einen falschen Namen. Bitte überprüfen Sie die Datei und laden Sie sie erneut hoch.', |
| | 1070 | +'uploadcorrupt' => 'Die Datei ist beschädigt oder hat eine falsche Datei-Erweiterung. Bitte überprüfe die Datei und wiederhole den Hochlade-Vorgang.', |
| 1073 | 1071 | 'uploadvirus' => 'Diese Datei enthält einen Virus! Details: $1', |
| 1074 | 1072 | 'sourcefilename' => 'Quelldatei', |
| 1075 | 1073 | 'destfilename' => 'Zielname', |
| — | — | @@ -1392,7 +1390,6 @@ |
| 1393 | 1391 | 'iteminvalidname' => 'Problem mit dem Eintrag „$1“, ungültiger Name.', |
| 1394 | 1392 | 'wlnote' => "Es {{PLURAL:$1|folgt die letzte Änderung|folgen die letzten '''$1''' Änderungen}} der letzten {{PLURAL:$2|Stunde|'''$2''' Stunden}}.", |
| 1395 | 1393 | 'wlshowlast' => 'Zeige die Änderungen der letzten $1 Stunden, $2 Tage oder $3 (in den letzten 30 Tagen).', |
| 1396 | | -'wlsaved' => 'Dies ist eine gespeicherte Version Ihrer Beobachtungsliste.', |
| 1397 | 1394 | 'watchlist-show-bots' => 'Bot-Änderungen einblenden', |
| 1398 | 1395 | 'watchlist-hide-bots' => 'Bot-Änderungen ausblenden', |
| 1399 | 1396 | 'watchlist-show-own' => 'eigene Änderungen einblenden', |
| — | — | @@ -1526,7 +1523,7 @@ |
| 1527 | 1524 | In diesem Fall darf die aktuellste Version nicht markiert werden oder ihr Status muss auf den einer normalen Version geändert werden. |
| 1528 | 1525 | Versionen von Dateien, auf die du keinen Zugriff habst, werden nicht wiederhergestellt.', |
| 1529 | 1526 | 'undeletehistorynoadmin' => 'Diese Seite wurde gelöscht. Der Grund für die Löschung ist in der Zusammenfassung angegeben, |
| 1530 | | -genauso wie Details zum letzten Benutzer der diese Seite vor der Löschung bearbeitet hat. |
| | 1527 | +genauso wie Details zum letzten Benutzer, der diese Seite vor der Löschung bearbeitet hat. |
| 1531 | 1528 | Der aktuelle Text der gelöschten Seite ist nur Administratoren zugänglich.', |
| 1532 | 1529 | 'undelete-revision' => 'Gelöschte Version von $1 - $2, $3:', |
| 1533 | 1530 | 'undeleterevision-missing' => 'Ungültige oder fehlende Version. Entweder ist der Link falsch oder die Version wurde aus dem Archiv wiederhergestellt oder entfernt.', |
| — | — | @@ -1642,7 +1639,7 @@ |
| 1643 | 1640 | 'ipb-blocklist-addr' => 'Aktuelle Sperre für „$1“ anzeigen', |
| 1644 | 1641 | 'ipb-blocklist' => 'Alle aktuellen Sperren anzeigen', |
| 1645 | 1642 | 'unblockip' => 'IP-Adresse freigeben', |
| 1646 | | -'unblockiptext' => 'In diesem Formular kannst du eine IP-Adresse oder einen Benutzer freigeben.', |
| | 1643 | +'unblockiptext' => 'Mit diesem Formular kannst du eine IP-Adresse oder einen Benutzer freigeben.', |
| 1647 | 1644 | 'ipusubmit' => 'Freigeben', |
| 1648 | 1645 | 'unblocked' => '[[User:$1|$1]] wurde freigegeben', |
| 1649 | 1646 | 'unblocked-id' => 'Sperr-ID $1 wurde freigegeben', |
| — | — | @@ -1862,7 +1859,7 @@ |
| 1863 | 1860 | 'tooltip-preview' => 'Vorschau der Änderungen an dieser Seite. Bitte vor dem Speichern benutzen!', |
| 1864 | 1861 | 'tooltip-diff' => 'Zeigt Änderungen am Text tabellarisch an', |
| 1865 | 1862 | 'tooltip-compareselectedversions' => 'Unterschiede zwischen zwei ausgewählten Versionen dieser Seite vergleichen.', |
| 1866 | | -'tooltip-watch' => 'Diese Seite der persönlichen Beobachtungsliste hinzufügen.', |
| | 1863 | +'tooltip-watch' => 'Füge diese Seite deiner Beobachtungsliste hinzu', |
| 1867 | 1864 | 'tooltip-recreate' => 'Seite neu erstellen, obwohl sie gelöscht wurde.', |
| 1868 | 1865 | 'tooltip-upload' => 'Hochladen starten', |
| 1869 | 1866 | |
| — | — | @@ -1883,7 +1880,7 @@ |
| 1884 | 1881 | # Metadata |
| 1885 | 1882 | 'nodublincore' => 'Dublin-Core-RDF-Metadaten sind für diesen Server deaktiviert.', |
| 1886 | 1883 | 'nocreativecommons' => 'Creative-Commons-RDF-Metadaten sind für diesen Server deaktiviert.', |
| 1887 | | -'notacceptable' => 'Der Wiki-Server kann die Daten nicht für Ihr Ausgabegerät aufbereiten.', |
| | 1884 | +'notacceptable' => 'Der Wiki-Server kann die Daten nicht für dein Ausgabegerät aufbereiten.', |
| 1888 | 1885 | |
| 1889 | 1886 | # Attribution |
| 1890 | 1887 | 'anonymous' => 'Anonyme(r) Benutzer auf {{SITENAME}}', |
| — | — | @@ -1899,7 +1896,7 @@ |
| 1900 | 1897 | # Spam protection |
| 1901 | 1898 | 'spamprotectiontitle' => 'Spamschutzfilter', |
| 1902 | 1899 | 'spamprotectiontext' => 'Die Seite, die du speichern willst, wurde von dem Spamschutzfilter blockiert. Das liegt wahrscheinlich an einem Link zu einer externen Seite.', |
| 1903 | | -'spamprotectionmatch' => "'''Der folgende Text wurde von dem Spam-Filter gefunden: $1'''", |
| | 1900 | +'spamprotectionmatch' => "'''Der folgende Text wurde von dem Spam-Filter gefunden: ''$1'''''", |
| 1904 | 1901 | 'subcategorycount' => '{{PLURAL:$1|Es wird $1 Unterkategorie|Es werden $1 Unterkategorien}} angezeigt.', |
| 1905 | 1902 | 'categoryarticlecount' => '<small>Es {{PLURAL:$1|wird $1 Seite|werden $1 Seiten}} aus dieser Kategorie angezeigt.</small>', |
| 1906 | 1903 | 'category-media-count' => '<small>Es {{PLURAL:$1|wird $1 Datei|werden $1 Dateien}} aus dieser Kategorie angezeigt.</small>', |
| Index: branches/liquidthreads/languages/messages/MessagesEn.php |
| — | — | @@ -1766,7 +1766,6 @@ |
| 1767 | 1767 | 'iteminvalidname' => "Problem with item '$1', invalid name...", |
| 1768 | 1768 | 'wlnote' => "Below {{PLURAL:$1|is the last change|are the last '''$1''' changes}} in the last {{PLURAL:$2|hour|'''$2''' hours}}.", |
| 1769 | 1769 | 'wlshowlast' => 'Show last $1 hours $2 days $3', |
| 1770 | | -'wlsaved' => 'This is a saved version of your watchlist.', |
| 1771 | 1770 | 'watchlist-show-bots' => 'Show bot edits', |
| 1772 | 1771 | 'watchlist-hide-bots' => 'Hide bot edits', |
| 1773 | 1772 | 'watchlist-show-own' => 'Show my edits', |
| Index: branches/liquidthreads/languages/messages/MessagesHe.php |
| — | — | @@ -1364,7 +1364,6 @@ |
| 1365 | 1365 | 'iteminvalidname' => 'בעיה עם $1, שם שגוי…', |
| 1366 | 1366 | 'wlnote' => "להלן {{plural:$1|השינוי האחרון|'''$1''' השינויים האחרונים}} {{plural:$2|בשעה האחרונה|ב־'''$2''' השעות האחרונות}}.", |
| 1367 | 1367 | 'wlshowlast' => '(הצג $1 שעות אחרונות | $2 ימים אחרונים | $3)', |
| 1368 | | -'wlsaved' => 'זוהי גרסה שמורה של רשימת המעקב.', |
| 1369 | 1368 | 'watchlist-show-bots' => 'הצג בוטים', |
| 1370 | 1369 | 'watchlist-hide-bots' => 'הסתר בוטים', |
| 1371 | 1370 | 'watchlist-show-own' => 'הצג עריכות שלי', |
| Index: branches/liquidthreads/languages/messages/MessagesLt.php |
| — | — | @@ -8,8 +8,8 @@ |
| 9 | 9 | $namespaceNames = array( |
| 10 | 10 | NS_MEDIA => 'Medija', |
| 11 | 11 | NS_SPECIAL => 'Specialus', |
| 12 | | - NS_MAIN => '', |
| 13 | | - NS_TALK => 'Aptarimas', |
| | 12 | + NS_MAIN => '', |
| | 13 | + NS_TALK => 'Aptarimas', |
| 14 | 14 | NS_USER => 'Naudotojas', |
| 15 | 15 | NS_USER_TALK => 'Naudotojo_aptarimas', |
| 16 | 16 | # NS_PROJECT set by $wgMetaNamespace |
| — | — | @@ -27,13 +27,13 @@ |
| 28 | 28 | ); |
| 29 | 29 | |
| 30 | 30 | $skinNames = array( |
| 31 | | - 'standard' => 'Klasikinė', |
| 32 | | - 'nostalgia' => 'Nostalgija', |
| | 31 | + 'standard' => 'Klasikinė', |
| | 32 | + 'nostalgia' => 'Nostalgija', |
| 33 | 33 | 'cologneblue' => 'Kelno mėlyna', |
| 34 | | - 'monobook' => 'MonoBook', |
| 35 | | - 'myskin' => 'Mano išvaizda', |
| 36 | | - 'chick' => 'Chick', |
| 37 | | - 'simple' => 'Paprasta', |
| | 34 | + 'monobook' => 'MonoBook', |
| | 35 | + 'myskin' => 'Mano išvaizda', |
| | 36 | + 'chick' => 'Chick', |
| | 37 | + 'simple' => 'Paprasta', |
| 38 | 38 | ); |
| 39 | 39 | $fallback8bitEncoding = 'windows-1257'; |
| 40 | 40 | $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' ); |
| — | — | @@ -281,23 +281,24 @@ |
| 282 | 282 | 'versionrequired' => 'Reikalinga $1 MediaWiki versija', |
| 283 | 283 | 'versionrequiredtext' => 'Reikalinga $1 MediaWiki versija, kad pamatytumėte šį puslapį. Žiūrėkite [[{{ns:special}}:Version|versijos puslapį]].', |
| 284 | 284 | |
| 285 | | -'ok' => 'Gerai', |
| 286 | | -'pagetitle' => '$1 - {{SITENAME}}', |
| 287 | | -'retrievedfrom' => 'Gauta iš „$1“', |
| 288 | | -'youhavenewmessages' => 'Jūs turite $1 ($2).', |
| 289 | | -'newmessageslink' => 'naujų žinučių', |
| 290 | | -'newmessagesdifflink' => 'paskutinis pakeitimas', |
| 291 | | -'editsection' => 'taisyti', |
| 292 | | -'editold' => 'taisyti', |
| 293 | | -'editsectionhint' => 'Redaguoti skyrelį: $1', |
| 294 | | -'toc' => 'Turinys', |
| 295 | | -'showtoc' => 'rodyti', |
| 296 | | -'hidetoc' => 'slėpti', |
| 297 | | -'thisisdeleted' => 'Žiūrėti ar atkurti $1?', |
| 298 | | -'viewdeleted' => 'Rodyti $1?', |
| 299 | | -'restorelink' => '$1 {{PLURAL:$1|ištrintą keitimą|ištrintus keitimus|ištrintų keitimų}}', |
| 300 | | -'feedlinks' => 'Kanalas:', |
| 301 | | -'feed-invalid' => 'Neleistinas kanalo tipas.', |
| | 285 | +'ok' => 'Gerai', |
| | 286 | +'pagetitle' => '$1 - {{SITENAME}}', |
| | 287 | +'retrievedfrom' => 'Gauta iš „$1“', |
| | 288 | +'youhavenewmessages' => 'Jūs turite $1 ($2).', |
| | 289 | +'newmessageslink' => 'naujų žinučių', |
| | 290 | +'newmessagesdifflink' => 'paskutinis pakeitimas', |
| | 291 | +'youhavenewmessagesmulti' => 'Turite naujų žinučių $1', |
| | 292 | +'editsection' => 'taisyti', |
| | 293 | +'editold' => 'taisyti', |
| | 294 | +'editsectionhint' => 'Redaguoti skyrelį: $1', |
| | 295 | +'toc' => 'Turinys', |
| | 296 | +'showtoc' => 'rodyti', |
| | 297 | +'hidetoc' => 'slėpti', |
| | 298 | +'thisisdeleted' => 'Žiūrėti ar atkurti $1?', |
| | 299 | +'viewdeleted' => 'Rodyti $1?', |
| | 300 | +'restorelink' => '$1 {{PLURAL:$1|ištrintą keitimą|ištrintus keitimus|ištrintų keitimų}}', |
| | 301 | +'feedlinks' => 'Kanalas:', |
| | 302 | +'feed-invalid' => 'Neleistinas kanalo tipas.', |
| 302 | 303 | |
| 303 | 304 | # Short words for each namespace, by default used in the 'article' tab in monobook |
| 304 | 305 | 'nstab-main' => 'Straipsnis', |
| — | — | @@ -315,8 +316,10 @@ |
| 316 | 317 | 'nosuchaction' => 'Nėra tokio veiksmo', |
| 317 | 318 | 'nosuchactiontext' => 'Veiksmas, nurodytas adrese, neatpažintas', |
| 318 | 319 | 'nosuchspecialpage' => 'Nėra tokio specialiojo puslapio', |
| 319 | | -'nospecialpagetext' => 'Jūs prašėte neleistino specialiojo puslapio, leistinų specialiųjų puslapių sąrašą rasite [[{{ns:special}}:Specialpages|specialiųjų puslapių sąraše]].', |
| | 320 | +'nospecialpagetext' => "'''<big>Jūs prašėte neleistino specialiojo puslapio</big>''' |
| 320 | 321 | |
| | 322 | +Leistinų specialiųjų puslapių sąrašą galite rasti [[{{ns:special}}:Specialpages|specialiųjų puslapių sąraše]].", |
| | 323 | + |
| 321 | 324 | # General errors |
| 322 | 325 | 'error' => 'Klaida', |
| 323 | 326 | 'databaseerror' => 'Duomenų bazės klaida', |
| — | — | @@ -466,6 +469,7 @@ |
| 467 | 470 | 'invalidemailaddress' => 'El. pašto adresas negali būti priimtas, nes atrodo, kad jis nėra teisingo formato. Prašome įvesti gerai suformuotą adresą arba palikite tą laukelį tuščią.', |
| 468 | 471 | 'accountcreated' => 'Paskyra sukurta', |
| 469 | 472 | 'accountcreatedtext' => 'Naudotojo paskyra $1 buvo sukurta.', |
| | 473 | +'loginlanguagelabel' => 'Kalba: $1', |
| 470 | 474 | |
| 471 | 475 | # Password reset dialog |
| 472 | 476 | 'resetpass' => 'Paskyros slaptažodžio atstatymas', |
| — | — | @@ -543,8 +547,6 @@ |
| 544 | 548 | Jūs negalite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate užregistravę tikro el. pašto adreso savo [[{{ns:special}}:Preferences|naudotojo nustatymuose]] ir nesate užblokuotas nuo jos naudojimo. |
| 545 | 549 | |
| 546 | 550 | Jūsų blokavimo ID yra $5. Prašome nurodyti šį ID visuose prašymuose, kuriuos darote.", |
| 547 | | -'blockedtext-concise' => '$7, kuris atitinka jūsų naudotojo vardą arba IP adresą, užblokavo $1. Duota priežastis buvo $2. Šio blokavimo pabaiga yra $6. Norėdami aptarti užblokavimą jūs galite susisiekti su $1 ar kitu administratoriumi. Jūs negalite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate pateikę tikro savo el. pašto adreso savo paskyros nustatymuose ir nesate užblokuotas nuo jos naudojimo. Jūsų dabartinis IP adresas yra $3, ir blokavimo ID yra #$5. Prašome įtraukti tai visuose prašymuose, kuriuos darote.', |
| 548 | | -'autoblockedtext-concise' => 'Jūsų IP adresas buvo neseniai naudotas nautotojo, kuris buvo užblokuotas. Užblokavima padarė $1. Duota priežastis buvo $2. Šio blokavimo pabaiga yra $6. Norėdami aptarti užblokavimą jūs galite susisiekti su $1 ar kitu administratoriumi. Jūs negalite naudotis funkcija „Rašyti laišką šiam naudotojui“, jei nesate pateikę tikro savo el. pašto adreso savo paskyros nustatymuose ir nesate užblokuotas nuo jos naudojimo. Jūsų dabartinis IP adresas yra $3, ir blokavimo ID yra #$5. Prašome įtraukti tai visuose prašymuose, kuriuos darote.', |
| 549 | 551 | 'blockedoriginalsource' => "Žemiau yra rodomas '''$1''' turinys:", |
| 550 | 552 | 'blockededitsource' => "''Jūsų keitimų''' tekstas puslapiui '''$1''' yra rodomas žemiau:", |
| 551 | 553 | 'whitelistedittitle' => 'Norint redaguoti reikia prisijungti', |
| — | — | @@ -586,7 +588,6 @@ |
| 587 | 589 | |
| 588 | 590 | <strong>Jei tai teisėtas keitimo bandymas, prašome pamėginti vėl. Jei tai nepadeda, pamėginkite atsijungti ir prisijungti atgal.</strong>", |
| 589 | 591 | 'token_suffix_mismatch' => '<strong>Jūsų pakeitimas buvo atmestas, nes jūsų naršyklė iškraipė skyrybos ženklus keitimo žymėje. Keitimas buvo atmestas norint apsaugoti straipsnio tekstą nuo sugadinimo. Taip kartais būna, kai jūs naudojate anoniminį tarpinio serverio paslaugą.</strong>', |
| 590 | | -'importing' => 'Importuojama $1', |
| 591 | 592 | 'editing' => 'Taisomas $1', |
| 592 | 593 | 'editinguser' => 'Taisomas naudotojas <b>$1</b>', |
| 593 | 594 | 'editingsection' => 'Taisomas $1 (skyrelis)', |
| — | — | @@ -743,12 +744,6 @@ |
| 744 | 745 | 'searchresulttext' => 'Daugiau informacijos apie paiešką projekte {{SITENAME}} rasite [[{{MediaWiki:helppage}}|{{int:help}}]].', |
| 745 | 746 | 'searchsubtitle' => 'Ieškoma „[[:$1]]“', |
| 746 | 747 | 'searchsubtitleinvalid' => 'Ieškoma „$1“', |
| 747 | | -'badquery' => 'Blogai suformuota paieškos užklausa', |
| 748 | | -'badquerytext' => 'Nepavyko apdoroti Jūsų užklausos. |
| 749 | | -Tai galėjo būti dėl trumpesnio nei trijų simbolių paieškos rakto, arba neteisingai suformuotos užklausos (pavyzdžiui „tigras and and liūtas“). |
| 750 | | -Pamėginkite kitokią užklausą.', |
| 751 | | -'matchtotals' => 'Užklausa „$1“ atitiko $2 puslapių pavadinimus |
| 752 | | -ir $3 puslapių turinius.', |
| 753 | 748 | 'noexactmatch' => "'''Nėra jokio puslapio, pavadinto „$1“.''' Jūs galite [[:$1|sukurti šį puslapį]].", |
| 754 | 749 | 'titlematches' => 'Straipsnių pavadinimų atitikmenys', |
| 755 | 750 | 'notitlematches' => 'Jokių pavadinimo atitikmenų', |
| — | — | @@ -756,7 +751,7 @@ |
| 757 | 752 | 'notextmatches' => 'Jokių puslapių teksto atitikmenų', |
| 758 | 753 | 'prevn' => 'ankstesnius $1', |
| 759 | 754 | 'nextn' => 'tolimesnius $1', |
| 760 | | -'viewprevnext' => 'Žiūrėti ($1) ($2) ($3).', |
| | 755 | +'viewprevnext' => 'Žiūrėti ($1) ($2) ($3)', |
| 761 | 756 | 'showingresults' => "Žemiau rodoma iki '''$1''' {{PLURAL:$1|rezultato|rezultatų|rezultatų}} pradedant #'''$2'''.", |
| 762 | 757 | 'showingresultsnum' => "Žemiau rodoma '''$3''' {{PLURAL:$3|rezultato|rezultatų|rezultatų}}rezultatų pradedant #'''$2'''.", |
| 763 | 758 | 'nonefound' => "'''Pastaba''': Nesėkminga paieška dažnai būna dėl ieškomų |
| — | — | @@ -766,11 +761,11 @@ |
| 767 | 762 | 'powersearch' => 'Ieškoti', |
| 768 | 763 | 'powersearchtext' => 'Ieškoti šiose vardų srityse:<br />$1<br /><label>$2 Rodyti peradresavimus</label><br />Ieškoti $3 $9', |
| 769 | 764 | 'searchdisabled' => 'Projekto {{SITENAME}} paieška yra uždrausta. Galite pamėginti ieškoti Google paieškos sistemoje. Paieškos sistemoje projekto {{SITENAME}} duomenys gali būti pasenę.', |
| 770 | | -'blanknamespace' => '(Pagrindinė)', |
| 771 | 765 | |
| 772 | 766 | # Preferences page |
| 773 | 767 | 'preferences' => 'Nustatymai', |
| 774 | 768 | 'mypreferences' => 'Mano nustatymai', |
| | 769 | +'prefs-edits' => 'Keitimų skaičius:', |
| 775 | 770 | 'prefsnologin' => 'Neprisijungęs', |
| 776 | 771 | 'prefsnologintext' => 'Jums reikia būti [[Special:Userlogin|prisijungusiam]], kad galėtumėte keisti savo nustatymus.', |
| 777 | 772 | 'prefsreset' => 'Nustatymai buvo atstatyti iš saugyklos.', |
| — | — | @@ -844,19 +839,22 @@ |
| 845 | 840 | 'userrights-available-remove' => 'Jūs galite pašalinti naudotojus iš $1.', |
| 846 | 841 | |
| 847 | 842 | # Groups |
| 848 | | -'group' => 'Grupė:', |
| 849 | | -'group-bot' => 'Robotai', |
| 850 | | -'group-sysop' => 'Administratoriai', |
| 851 | | -'group-bureaucrat' => 'Biurokratai', |
| 852 | | -'group-all' => '(visi)', |
| | 843 | +'group' => 'Grupė:', |
| | 844 | +'group-autoconfirmed' => 'Automatiškai patvirtinti naudotojai', |
| | 845 | +'group-bot' => 'Robotai', |
| | 846 | +'group-sysop' => 'Administratoriai', |
| | 847 | +'group-bureaucrat' => 'Biurokratai', |
| | 848 | +'group-all' => '(visi)', |
| 853 | 849 | |
| 854 | | -'group-bot-member' => 'Robotas', |
| 855 | | -'group-sysop-member' => 'Administratorius', |
| 856 | | -'group-bureaucrat-member' => 'Biurokratas', |
| | 850 | +'group-autoconfirmed-member' => 'Automatiškai patvirtintas naudotojas', |
| | 851 | +'group-bot-member' => 'Robotas', |
| | 852 | +'group-sysop-member' => 'Administratorius', |
| | 853 | +'group-bureaucrat-member' => 'Biurokratas', |
| 857 | 854 | |
| 858 | | -'grouppage-bot' => '{{ns:project}}:Robotai', |
| 859 | | -'grouppage-sysop' => '{{ns:project}}:Administratoriai', |
| 860 | | -'grouppage-bureaucrat' => '{{ns:project}}:Biurokratai', |
| | 855 | +'grouppage-autoconfirmed' => '{{ns:project}}:Automatiškai patvirtinti naudotojai', |
| | 856 | +'grouppage-bot' => '{{ns:project}}:Robotai', |
| | 857 | +'grouppage-sysop' => '{{ns:project}}:Administratoriai', |
| | 858 | +'grouppage-bureaucrat' => '{{ns:project}}:Biurokratai', |
| 861 | 859 | |
| 862 | 860 | # User rights log |
| 863 | 861 | 'rightslog' => 'Naudotojų teisių istorija', |
| — | — | @@ -892,6 +890,7 @@ |
| 893 | 891 | |
| 894 | 892 | # Recent changes linked |
| 895 | 893 | 'recentchangeslinked' => 'Susiję keitimai', |
| | 894 | +'recentchangeslinked-title' => 'Su $1 susiję keitimai', |
| 896 | 895 | 'recentchangeslinked-noresult' => 'Nėra jokių pakeitimų susietuose puslapiuose duotu periodu.', |
| 897 | 896 | 'recentchangeslinked-summary' => "Šiame specialiajame puslapyje rodomi paskutiniai keitimai puslapiuose, į kuriuos yra nurodoma. Puslapiai iš jūsų stebimųjų sąrašo yra '''paryškinti'''.", |
| 898 | 897 | |
| — | — | @@ -948,6 +947,7 @@ |
| 949 | 948 | 'uploadwarning' => 'Dėmesio', |
| 950 | 949 | 'savefile' => 'Išsaugoti failą', |
| 951 | 950 | 'uploadedimage' => 'įkėlė „[[$1]]“', |
| | 951 | +'overwroteimage' => 'įkėlė naują „[[$1]]“ versiją', |
| 952 | 952 | 'uploaddisabled' => 'Įkėlimai uždrausti', |
| 953 | 953 | 'uploaddisabledtext' => 'Šiame projekte failų įkėlimai yra uždrausti.', |
| 954 | 954 | 'uploadscripted' => 'Šis failas turi HTML arba programinį kodą, kuris gali būti klaidingai suprastas interneto naršyklės.', |
| — | — | @@ -980,7 +980,6 @@ |
| 981 | 981 | # Image list |
| 982 | 982 | 'imagelist' => 'Failų sąrašas', |
| 983 | 983 | 'imagelisttext' => "Žemiau yra '''$1''' {{PLURAL:$1|failo|failų}} sąrašas, surūšiuotas $2.", |
| 984 | | -'imagelistforuser' => 'Čia rodomi tik paveikslėliai, kuriuos įkelė $1.', |
| 985 | 984 | 'getimagelist' => 'gauti failų sąrašą', |
| 986 | 985 | 'ilsubmit' => 'Ieškoti', |
| 987 | 986 | 'showlast' => 'Rodyti paskutinius $1 paveikslėlių, rūšiuojant $2.', |
| — | — | @@ -1019,7 +1018,7 @@ |
| 1020 | 1019 | |
| 1021 | 1020 | # File reversion |
| 1022 | 1021 | 'filerevert' => 'Sugrąžinti $1', |
| 1023 | | -'filerevert-legend' => 'Sugrąžinti failą', |
| | 1022 | +'filerevert-legend' => 'Failo sugrąžinimas', |
| 1024 | 1023 | 'filerevert-intro' => '<span class="plainlinks">Jūs grąžinate \'\'\'[[Media:$1|$1]]\'\'\' į versiją $4 ($2, $3).</span>', |
| 1025 | 1024 | 'filerevert-comment' => 'Komentaras:', |
| 1026 | 1025 | 'filerevert-defaultcomment' => 'Grąžinta į $1, $2 versiją', |
| — | — | @@ -1027,6 +1026,19 @@ |
| 1028 | 1027 | 'filerevert-success' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' buvo sugrąžintas į versiją $4 ($2, $3).</span>', |
| 1029 | 1028 | 'filerevert-badversion' => 'Nėra jokių ankstesnių vietinių šio failo versijų su pateiktu laiku.', |
| 1030 | 1029 | |
| | 1030 | +# File deletion |
| | 1031 | +'filedelete' => 'Trinti $1', |
| | 1032 | +'filedelete-legend' => 'Trinti failą', |
| | 1033 | +'filedelete-intro' => "Jūs trinate '''[[Media:$1|$1]]'''.", |
| | 1034 | +'filedelete-intro-old' => '<span class="plainlinks">Jūs trinate \'\'\'[[Media:$1|$1]]\'\'\' [$4 $3, $2] versiją.</span>', |
| | 1035 | +'filedelete-comment' => 'Komentaras:', |
| | 1036 | +'filedelete-submit' => 'Trinti', |
| | 1037 | +'filedelete-success' => "'''$1''' buvo ištrintas.", |
| | 1038 | +'filedelete-success-old' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' $3, $2 versija buvo ištrinta.</span>', |
| | 1039 | +'filedelete-nofile' => "Šioje svetainėje '''$1''' neegzistuoja.", |
| | 1040 | +'filedelete-nofile-old' => "Nėra jokios '''$1''' suarchyvuotos versijos su nurodytais atributais.", |
| | 1041 | +'filedelete-iscurrent' => 'Jūs bandote ištrinti pačią naujiausią šio failo versiją. Pirmiausia prašome grąžinti į senesnę versiją.', |
| | 1042 | + |
| 1031 | 1043 | # MIME search |
| 1032 | 1044 | 'mimesearch' => 'MIME paieška', |
| 1033 | 1045 | 'mimesearch-summary' => 'Šis puslapis leidžia rodyti failus pagal jų MIME tipą. Įveskite: turiniotipas/potipis, pvz. <tt>image/jpeg</tt>.', |
| — | — | @@ -1071,7 +1083,7 @@ |
| 1072 | 1084 | 'disambiguations-text' => "Žemiau išvardinti puslapiai nurodo į '''daugiaprasmių žodžių puslapius'''. Nuorodos turėtų būti patikslintos, kad rodytų į konkretų straipsnį.<br />Puslapis laikomas daugiaprasmiu puslapiu, jei jis naudoja šabloną, kuris yra nurodomas iš [[MediaWiki:disambiguationspage]].", |
| 1073 | 1085 | |
| 1074 | 1086 | 'doubleredirects' => 'Dvigubi peradresavimai', |
| 1075 | | -'doubleredirectstext' => 'Kiekvienoje eilutėje išvardintas pirmasis ir antrasis peradresavimai, taip pat antrojo peradresavimo paskirtis, kuri paprastai ir nurodo į tikrąjį puslapį, į kurį pirmasis peradresavimas ir turėtų rodyti.', |
| | 1087 | +'doubleredirectstext' => 'Šie peradresavimai nurodo į kitus peradresavimo puslapius. Kiekvienoje eilutėje išvardintas pirmasis ir antrasis peradresavimai, taip pat antrojo peradresavimo paskirtis, kuri paprastai ir nurodo į tikrąjį puslapį, į kurį pirmasis peradresavimas ir turėtų rodyti.', |
| 1076 | 1088 | |
| 1077 | 1089 | 'brokenredirects' => 'Peradresavimai į niekur', |
| 1078 | 1090 | 'brokenredirectstext' => 'Žemiau išvardinti peradresavimo puslapiai rodo į neegzistuojančius puslapius:', |
| — | — | @@ -1208,7 +1220,6 @@ |
| 1209 | 1221 | 'watchlistfor' => "(naudotojo '''$1''')", |
| 1210 | 1222 | 'nowatchlist' => 'Neturite nei vieno stebimo puslapio.', |
| 1211 | 1223 | 'watchlistanontext' => 'Prašome $1, kad peržiūrėtumėte ar pakeistumėte elementus savo stebimųjų sąraše.', |
| 1212 | | -'watchlistcount' => "'''Jūs turite $1 {{PLURAL:$1|elementą|elementus|elementų}} stebimųjų sąraše įskaitant aptarimo puslapius.'''", |
| 1213 | 1224 | 'watchnologin' => 'Neprisijungęs', |
| 1214 | 1225 | 'watchnologintext' => 'Jums reikia būti [[{{ns:special}}:Userlogin|prisijungusiam]], kad pakeistumėte savo stebimųjų sąrašą.', |
| 1215 | 1226 | 'addedwatch' => 'Pridėta į Stebimųjų sąrašą', |
| — | — | @@ -1234,7 +1245,6 @@ |
| 1235 | 1246 | 'iteminvalidname' => 'Problema su elementu „$1“, neteisingas vardas...', |
| 1236 | 1247 | 'wlnote' => "{{PLURAL:$1|Rodomas '''$1''' paskutinis pakeitimas, atliktas|Rodomi '''$1''' paskutiniai pakeitimai, atlikti|Rodoma '''$1''' paskutinių pakeitimų, atliktų}} per {{PLURAL:$2|'''$2''' paskutinę valandą|'''$2''' paskutines valandas|'''$2''' paskutinių valandų}}.", |
| 1237 | 1248 | 'wlshowlast' => 'Rodyti paskutinių $1 valandų, $2 dienų ar $3 pakeitimus', |
| 1238 | | -'wlsaved' => 'Tai išsaugota jūsų stebimųjų sąrašo versija.', |
| 1239 | 1249 | 'watchlist-show-bots' => 'Rodyti robotų keitimus', |
| 1240 | 1250 | 'watchlist-hide-bots' => 'Slėpti robotų keitimus', |
| 1241 | 1251 | 'watchlist-show-own' => 'Rodyti mano keitimus', |
| — | — | @@ -1322,7 +1332,7 @@ |
| 1323 | 1333 | 'protectedarticle' => 'užrakino „[[$1]]“', |
| 1324 | 1334 | 'modifiedarticleprotection' => 'pakeistas „[[$1]]“ apsaugos lygis', |
| 1325 | 1335 | 'unprotectedarticle' => 'atrakino „[[$1]]“', |
| 1326 | | -'protectsub' => '(Rakinamas „$1“)', |
| | 1336 | +'protectsub' => '(Nustatomas apsaugos lygis puslapiui „$1“)', |
| 1327 | 1337 | 'confirmprotect' => 'Užrakinimo patvirtinimas', |
| 1328 | 1338 | 'protectcomment' => 'Komentaras:', |
| 1329 | 1339 | 'protectexpiry' => 'Baigia galioti:', |
| — | — | @@ -1339,6 +1349,7 @@ |
| 1340 | 1350 | Čia yra dabartiniai nustatymai puslapiui <strong>$1</strong>:', |
| 1341 | 1351 | 'protect-cascadeon' => 'Šis puslapis dabar yra apsaugotas, nes jis yra įtrauktas į {{PLURAL:$1|šį puslapį, apsaugotą|šiuos puslapius, apsaugotus}} „pakopinės apsaugos“ pasirinktimi. Jūs galite pakeisti šio puslapio apsaugos lygį, bet tai nepaveiks pakopinės apsaugos.', |
| 1342 | 1352 | 'protect-default' => '(pagal nutylėjimą)', |
| | 1353 | +'protect-fallback' => 'Reikalauti „$1“ teisės', |
| 1343 | 1354 | 'protect-level-autoconfirmed' => 'Blokuoti neregistruotus naudotojus', |
| 1344 | 1355 | 'protect-level-sysop' => 'Tik administratoriai', |
| 1345 | 1356 | 'protect-summary-cascade' => 'pakopinė apsauga', |
| — | — | @@ -1379,7 +1390,7 @@ |
| 1380 | 1391 | 'undeletehistorynoadmin' => 'Šis straipsnis buvo ištrintas. Trynimo priežastis yra |
| 1381 | 1392 | rodoma žemiau, taip pat kas redagavo puslapį |
| 1382 | 1393 | iki trynimo. Ištrintų puslapių tekstas yra galimas tik administratoriams.', |
| 1383 | | -'undelete-revision' => 'Ištrinta $1 versija iš $2:', |
| | 1394 | +'undelete-revision' => 'Ištrinta $1 versija, kurią $2 sukūrė $3:', |
| 1384 | 1395 | 'undeleterevision-missing' => 'Neteisinga arba dingusi versija. Jūs turbūt turite blogą nuorodą, arba versija buvo atkurta arba pašalinta iš archyvo.', |
| 1385 | 1396 | 'undeletebtn' => 'Atkurti', |
| 1386 | 1397 | 'undeletereset' => 'Iš naujo', |
| — | — | @@ -1407,8 +1418,9 @@ |
| 1408 | 1419 | $1', |
| 1409 | 1420 | |
| 1410 | 1421 | # Namespace form on various pages |
| 1411 | | -'namespace' => 'Vardų sritis:', |
| 1412 | | -'invert' => 'Žymėti priešingai', |
| | 1422 | +'namespace' => 'Vardų sritis:', |
| | 1423 | +'invert' => 'Žymėti priešingai', |
| | 1424 | +'blanknamespace' => '(Pagrindinė)', |
| 1413 | 1425 | |
| 1414 | 1426 | # Contributions |
| 1415 | 1427 | 'contributions' => 'Naudotojo įnašas', |
| — | — | @@ -1436,6 +1448,7 @@ |
| 1437 | 1449 | |
| 1438 | 1450 | # What links here |
| 1439 | 1451 | 'whatlinkshere' => 'Susiję puslapiai', |
| | 1452 | +'whatlinkshere-title' => 'Puslapiai, kurie nurodo į $1', |
| 1440 | 1453 | 'notargettitle' => 'Nenurodytas objektas', |
| 1441 | 1454 | 'notargettext' => 'Jūs nenurodėte norimo puslapio ar naudotojo, kuriam įvykdyti šią funkciją.', |
| 1442 | 1455 | 'linklistsub' => '(Nuorodų sąrašas)', |
| — | — | @@ -1740,6 +1753,7 @@ |
| 1741 | 1754 | 'tooltip-compareselectedversions' => 'Žiūrėti dviejų pasirinktų puslapio versijų skirtumus.', |
| 1742 | 1755 | 'tooltip-watch' => 'Pridėti šį puslapį į stebimųjų sąrašą', |
| 1743 | 1756 | 'tooltip-recreate' => 'Atkurti puslapį nepaisant to, kad jis buvo ištrintas', |
| | 1757 | +'tooltip-upload' => 'Pradėti įkėlimą', |
| 1744 | 1758 | |
| 1745 | 1759 | # Stylesheets |
| 1746 | 1760 | 'common.css' => '/** Čia įdėtas CSS bus taikomas visoms išvaizdoms */', |
| — | — | @@ -1829,13 +1843,15 @@ |
| 1830 | 1844 | 'mediawarning' => "'''Dėmesio''': Šis failas gali turėti kenksmingą kodą, jį paleidus jūsų sistema gali būti pažeista.<hr />", |
| 1831 | 1845 | 'imagemaxsize' => 'Riboti paveikslėlių dydį jų aprašymo puslapyje iki:', |
| 1832 | 1846 | 'thumbsize' => 'Sumažintų paveikslėlių dydis:', |
| | 1847 | +'widthheightpage' => '$1×$2, $3 puslapiai', |
| 1833 | 1848 | 'file-info' => '(failo dydis: $1, MIME tipas: $2)', |
| 1834 | 1849 | 'file-info-size' => '($1 × $2 taškų, failo dydis: $3, MIME tipas: $4)', |
| 1835 | 1850 | 'file-nohires' => '<small>Geresnė raiška negalima.</small>', |
| 1836 | | -'file-svg' => '<small>Tai vektorinis paveikslėlis, neprarandantis duomenų keičiant dydį. Pagrindinis dydis: $1 × $2 taškų.</small>', |
| | 1851 | +'svg-long-desc' => '(SVG failas, formaliai $1 × $2 taškų, failo dydis: $3)', |
| 1837 | 1852 | 'show-big-image' => 'Pilna raiška', |
| 1838 | 1853 | 'show-big-image-thumb' => '<small>Šios peržiūros dydis: $1 × $2 taškų</small>', |
| 1839 | 1854 | |
| | 1855 | +# Special:Newimages |
| 1840 | 1856 | 'newimages' => 'Naujausių failų galerija', |
| 1841 | 1857 | 'showhidebots' => '($1 robotus)', |
| 1842 | 1858 | 'noimages' => 'Nėra ką parodyti.', |
| — | — | @@ -2187,15 +2203,12 @@ |
| 2188 | 2204 | $1', |
| 2189 | 2205 | 'confirm_purge_button' => 'Gerai', |
| 2190 | 2206 | |
| 2191 | | -'youhavenewmessagesmulti' => 'Turite naujų žinučių $1', |
| 2192 | | - |
| | 2207 | +# AJAX search |
| 2193 | 2208 | 'searchcontaining' => "Ieškoti straipsnių, prasidedančių ''$1''.", |
| 2194 | 2209 | 'searchnamed' => "Ieškoti straipsnių, pavadintų ''$1''.", |
| 2195 | 2210 | 'articletitles' => "Straipsniai, pradedant nuo ''$1''", |
| 2196 | 2211 | 'hideresults' => 'Slėpti rezultatus', |
| 2197 | 2212 | |
| 2198 | | -'loginlanguagelabel' => 'Kalba: $1', |
| 2199 | | - |
| 2200 | 2213 | # Multipage image navigation |
| 2201 | 2214 | 'imgmultipageprev' => '← ankstesnis puslapis', |
| 2202 | 2215 | 'imgmultipagenext' => 'kitas puslapis →', |
| Index: branches/liquidthreads/maintenance/language/messages.inc |
| — | — | @@ -1144,7 +1144,6 @@ |
| 1145 | 1145 | 'iteminvalidname', |
| 1146 | 1146 | 'wlnote', |
| 1147 | 1147 | 'wlshowlast', |
| 1148 | | - 'wlsaved', |
| 1149 | 1148 | 'watchlist-show-bots', |
| 1150 | 1149 | 'watchlist-hide-bots', |
| 1151 | 1150 | 'watchlist-show-own', |
| Index: branches/liquidthreads/maintenance/parserTests.txt |
| — | — | @@ -2946,7 +2946,7 @@ |
| 2947 | 2947 | !! input |
| 2948 | 2948 | [[Image:foobar.jpg]] |
| 2949 | 2949 | !! result |
| 2950 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 2950 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 2951 | 2951 | </p> |
| 2952 | 2952 | !! end |
| 2953 | 2953 | |
| — | — | @@ -2955,7 +2955,7 @@ |
| 2956 | 2956 | !! input |
| 2957 | 2957 | [[Image:foobar.jpg|right]] |
| 2958 | 2958 | !! result |
| 2959 | | -<div class="floatright"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title=""><img alt="" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a></span></div> |
| | 2959 | +<div class="floatright"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div> |
| 2960 | 2960 | |
| 2961 | 2961 | !! end |
| 2962 | 2962 | |
| — | — | @@ -2964,7 +2964,7 @@ |
| 2965 | 2965 | !! input |
| 2966 | 2966 | [[Image:foobar.jpg|right|Caption text]] |
| 2967 | 2967 | !! result |
| 2968 | | -<div class="floatright"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Caption text"><img alt="Caption text" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a></span></div> |
| | 2968 | +<div class="floatright"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Caption text"><img alt="Caption text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div> |
| 2969 | 2969 | |
| 2970 | 2970 | !! end |
| 2971 | 2971 | |
| — | — | @@ -2973,7 +2973,7 @@ |
| 2974 | 2974 | !! input |
| 2975 | 2975 | [[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]]] |
| 2976 | 2976 | !! result |
| 2977 | | -<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="This is a test image Main Page"><img alt="This is a test image Main Page" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> <div class="thumbcaption">This is a test image <a href="https://www.mediawiki.org/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div> |
| | 2977 | +<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="This is a test image Main Page" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a> <div class="thumbcaption">This is a test image <a href="https://www.mediawiki.org/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div> |
| 2978 | 2978 | |
| 2979 | 2979 | !! end |
| 2980 | 2980 | |
| — | — | @@ -2993,7 +2993,7 @@ |
| 2994 | 2994 | !! input |
| 2995 | 2995 | [[Image:foobar.jpg|http://example.com]] |
| 2996 | 2996 | !! result |
| 2997 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 2997 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 2998 | 2998 | </p> |
| 2999 | 2999 | !! end |
| 3000 | 3000 | |
| — | — | @@ -3002,7 +3002,7 @@ |
| 3003 | 3003 | !! input |
| 3004 | 3004 | [[Image:foobar.jpg|thumb|http://example.com]] |
| 3005 | 3005 | !! result |
| 3006 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="http://example.com"><img alt="http://example.com" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div> |
| | 3006 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div> |
| 3007 | 3007 | |
| 3008 | 3008 | !! end |
| 3009 | 3009 | |
| — | — | @@ -3011,7 +3011,7 @@ |
| 3012 | 3012 | !! input |
| 3013 | 3013 | [[Image:foobar.jpg|thumb|ISBN 1235467890]] |
| 3014 | 3014 | !! result |
| 3015 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="ISBN 1235467890"><img alt="ISBN 1235467890" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="https://www.mediawiki.org/index.php?title=Special:Booksources&isbn=1235467890" class="internal">ISBN 1235467890</a></div></div></div> |
| | 3015 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="ISBN 1235467890" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="https://www.mediawiki.org/index.php?title=Special:Booksources&isbn=1235467890" class="internal">ISBN 1235467890</a></div></div></div> |
| 3016 | 3016 | |
| 3017 | 3017 | !! end |
| 3018 | 3018 | |
| — | — | @@ -3020,7 +3020,7 @@ |
| 3021 | 3021 | !! input |
| 3022 | 3022 | [[Image:foobar.jpg|thumb|This is RFC 12354]] |
| 3023 | 3023 | !! result |
| 3024 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="This is RFC 12354"><img alt="This is RFC 12354" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is <a href="http://tools.ietf.org/html/rfc12354" class="external" title="http://tools.ietf.org/html/rfc12354">RFC 12354</a></div></div></div> |
| | 3024 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is RFC 12354"><img alt="This is RFC 12354" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is <a href="http://tools.ietf.org/html/rfc12354" class="external" title="http://tools.ietf.org/html/rfc12354">RFC 12354</a></div></div></div> |
| 3025 | 3025 | |
| 3026 | 3026 | !! end |
| 3027 | 3027 | |
| — | — | @@ -3029,7 +3029,7 @@ |
| 3030 | 3030 | !! input |
| 3031 | 3031 | [[Image:foobar.jpg|thumb|Please mailto:nobody@example.com]] |
| 3032 | 3032 | !! result |
| 3033 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Please mailto:nobody@example.com"><img alt="Please mailto:nobody@example.com" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>Please <a href="mailto:nobody@example.com" class="external free" title="mailto:nobody@example.com" rel="nofollow">mailto:nobody@example.com</a></div></div></div> |
| | 3033 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Please mailto:nobody@example.com"><img alt="Please mailto:nobody@example.com" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>Please <a href="mailto:nobody@example.com" class="external free" title="mailto:nobody@example.com" rel="nofollow">mailto:nobody@example.com</a></div></div></div> |
| 3034 | 3034 | |
| 3035 | 3035 | !! end |
| 3036 | 3036 | |
| — | — | @@ -3039,7 +3039,7 @@ |
| 3040 | 3040 | !! input |
| 3041 | 3041 | [[Image:foobar.jpg|thumb|<math>2+2</math>]] |
| 3042 | 3042 | !! result |
| 3043 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="<math>2+2</math>"><img alt="<math>2+2</math>" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><math>2+2</math></div></div></div> |
| | 3043 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="<math>2+2</math>"><img alt="<math>2+2</math>" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><math>2+2</math></div></div></div> |
| 3044 | 3044 | |
| 3045 | 3045 | !! end |
| 3046 | 3046 | |
| — | — | @@ -3050,7 +3050,7 @@ |
| 3051 | 3051 | !! input |
| 3052 | 3052 | [[Image:foobar.jpg|thumb|<math>2+2</math>]] |
| 3053 | 3053 | !! result |
| 3054 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="2 + 2"><img alt="2 + 2" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><span class="texhtml">2 + 2</span></div></div></div> |
| | 3054 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="2 + 2"><img alt="2 + 2" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><span class="texhtml">2 + 2</span></div></div></div> |
| 3055 | 3055 | |
| 3056 | 3056 | !! end |
| 3057 | 3057 | |
| — | — | @@ -3060,7 +3060,7 @@ |
| 3061 | 3061 | !! input |
| 3062 | 3062 | [[Image:foobar.jpg|text with a [[link]] in it]] |
| 3063 | 3063 | !! result |
| 3064 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3064 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3065 | 3065 | </p> |
| 3066 | 3066 | !! end |
| 3067 | 3067 | |
| — | — | @@ -3069,7 +3069,7 @@ |
| 3070 | 3070 | !! input |
| 3071 | 3071 | [[Image:foobar.jpg|text with a [[link]]foo in it]] |
| 3072 | 3072 | !! result |
| 3073 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a linkfoo in it"><img alt="text with a linkfoo in it" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3073 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a linkfoo in it"><img alt="text with a linkfoo in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3074 | 3074 | </p> |
| 3075 | 3075 | !! end |
| 3076 | 3076 | |
| — | — | @@ -3078,7 +3078,7 @@ |
| 3079 | 3079 | !! input |
| 3080 | 3080 | [[Image:foobar.jpg|text with a [[MeatBall:Link]] in it]] |
| 3081 | 3081 | !! result |
| 3082 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a MeatBall:Link in it"><img alt="text with a MeatBall:Link in it" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3082 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a MeatBall:Link in it"><img alt="text with a MeatBall:Link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3083 | 3083 | </p> |
| 3084 | 3084 | !! end |
| 3085 | 3085 | |
| — | — | @@ -3087,7 +3087,7 @@ |
| 3088 | 3088 | !! input |
| 3089 | 3089 | [[Image:foobar.jpg|text with a [[MeatBall:Link|link]] in it]] |
| 3090 | 3090 | !! result |
| 3091 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3091 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3092 | 3092 | </p> |
| 3093 | 3093 | !! end |
| 3094 | 3094 | |
| — | — | @@ -3096,7 +3096,7 @@ |
| 3097 | 3097 | !! input |
| 3098 | 3098 | [[Image:foobar.jpg|& < > "]] |
| 3099 | 3099 | !! result |
| 3100 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="& < > ""><img alt="& < > "" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3100 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="& < > ""><img alt="& < > "" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3101 | 3101 | </p> |
| 3102 | 3102 | !! end |
| 3103 | 3103 | |
| — | — | @@ -3105,7 +3105,7 @@ |
| 3106 | 3106 | !! input |
| 3107 | 3107 | [[Image:foobar.jpg|♀]] |
| 3108 | 3108 | !! result |
| 3109 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="♀"><img alt="♀" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3109 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="♀"><img alt="♀" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3110 | 3110 | </p> |
| 3111 | 3111 | !! end |
| 3112 | 3112 | |
| — | — | @@ -3123,7 +3123,7 @@ |
| 3124 | 3124 | !! input |
| 3125 | 3125 | [[Image:Foobar.jpg|thumb|This is a caption with another [[Image:icon.png|image]] inside it!]] |
| 3126 | 3126 | !! result |
| 3127 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="This is a caption with another Image:Icon.png inside it!"><img alt="This is a caption with another Image:Icon.png inside it!" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is a caption with another <a href="https://www.mediawiki.org/index.php?title=Special:Upload&wpDestFile=Icon.png" class="new" title="Image:Icon.png">Image:Icon.png</a> inside it!</div></div></div> |
| | 3127 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is a caption with another Image:Icon.png inside it!"><img alt="This is a caption with another Image:Icon.png inside it!" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is a caption with another <a href="https://www.mediawiki.org/index.php?title=Special:Upload&wpDestFile=Icon.png" class="new" title="Image:Icon.png">Image:Icon.png</a> inside it!</div></div></div> |
| 3128 | 3128 | |
| 3129 | 3129 | !! end |
| 3130 | 3130 | |
| — | — | @@ -3133,7 +3133,7 @@ |
| 3134 | 3134 | [[Image:Foobar.jpg|This |
| 3135 | 3135 | *is some text]] |
| 3136 | 3136 | !! result |
| 3137 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This *is some text"><img alt="This *is some text" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3137 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This *is some text"><img alt="This *is some text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3138 | 3138 | </p> |
| 3139 | 3139 | !!end |
| 3140 | 3140 | |
| — | — | @@ -3143,7 +3143,7 @@ |
| 3144 | 3144 | !! input |
| 3145 | 3145 | [[Image:Foobar.jpg|thumb|200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]] |
| 3146 | 3146 | !! result |
| 3147 | | -<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="This caption has irc and Secure ext links in it."><img alt="This caption has irc and Secure ext links in it." longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" width="200" height="23" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This caption has <a href="irc://example.net" class="external text" title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class="external text" title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div> |
| | 3147 | +<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This caption has irc and Secure ext links in it."><img alt="This caption has irc and Secure ext links in it." src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" width="200" height="23" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This caption has <a href="irc://example.net" class="external text" title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class="external text" title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div> |
| 3148 | 3148 | |
| 3149 | 3149 | !! end |
| 3150 | 3150 | |
| — | — | @@ -3503,7 +3503,7 @@ |
| 3504 | 3504 | !! input |
| 3505 | 3505 | http://example.com [[Image:foobar.jpg]] |
| 3506 | 3506 | !! result |
| 3507 | | -<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a> <a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3507 | +<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a> <a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3508 | 3508 | </p> |
| 3509 | 3509 | !!end |
| 3510 | 3510 | |
| — | — | @@ -3512,7 +3512,7 @@ |
| 3513 | 3513 | !! input |
| 3514 | 3514 | http://example.com[[Image:foobar.jpg]] |
| 3515 | 3515 | !! result |
| 3516 | | -<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a> |
| | 3516 | +<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a> |
| 3517 | 3517 | </p> |
| 3518 | 3518 | !!end |
| 3519 | 3519 | |
| — | — | @@ -4787,7 +4787,7 @@ |
| 4788 | 4788 | !!input |
| 4789 | 4789 | [[Image:foobar.jpg|thumbnail= ]] |
| 4790 | 4790 | !!result |
| 4791 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title=""><img alt="" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/3/3a/Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div></div></div></div> |
| | 4791 | +<div class="thumb tright"><div class="thumbinner" style="width:1943px;">Error creating thumbnail: <div class="thumbcaption"></div></div></div> |
| 4792 | 4792 | |
| 4793 | 4793 | !!end |
| 4794 | 4794 | |
| — | — | @@ -6080,7 +6080,7 @@ |
| 6081 | 6081 | !! input |
| 6082 | 6082 | [[Image:foobar.jpg|centre]] |
| 6083 | 6083 | !! result |
| 6084 | | -<div class="center"><div class="floatnone"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title=""><img alt="" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a></span></div></div> |
| | 6084 | +<div class="center"><div class="floatnone"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div></div> |
| 6085 | 6085 | |
| 6086 | 6086 | !!end |
| 6087 | 6087 | |
| — | — | @@ -6089,7 +6089,7 @@ |
| 6090 | 6090 | !! input |
| 6091 | 6091 | [[Image:foobar.jpg|none]] |
| 6092 | 6092 | !! result |
| 6093 | | -<div class="floatnone"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title=""><img alt="" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" /></a></span></div> |
| | 6093 | +<div class="floatnone"><span><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></span></div> |
| 6094 | 6094 | |
| 6095 | 6095 | !!end |
| 6096 | 6096 | |
| — | — | @@ -6098,7 +6098,7 @@ |
| 6099 | 6099 | !! input |
| 6100 | 6100 | [[Image:foobar.jpg|640x480px]] |
| 6101 | 6101 | !! result |
| 6102 | | -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title=""><img alt="" longdesc="/wiki/Image:Foobar.jpg" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" /></a> |
| | 6102 | +<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a> |
| 6103 | 6103 | </p> |
| 6104 | 6104 | !!end |
| 6105 | 6105 | |
| — | — | @@ -6136,7 +6136,7 @@ |
| 6137 | 6137 | !! input |
| 6138 | 6138 | [[image:Foobar.jpg|thumb|An [http://test/?param1=|left|¶m2=|x external] URL]] |
| 6139 | 6139 | !! result |
| 6140 | | -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="An external URL"><img alt="An external URL" longdesc="/wiki/Image:Foobar.jpg" class="thumbimage" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>An <a href="http://test/?param1=|left|&param2=|x" class="external text" title="http://test/?param1=|left|&param2=|x" rel="nofollow">external</a> URL</div></div></div> |
| | 6140 | +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="An external URL"><img alt="An external URL" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify" style="float:right"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>An <a href="http://test/?param1=|left|&param2=|x" class="external text" title="http://test/?param1=|left|&param2=|x" rel="nofollow">external</a> URL</div></div></div> |
| 6141 | 6141 | |
| 6142 | 6142 | !!end |
| 6143 | 6143 | |
| Property changes on: branches/liquidthreads |
| ___________________________________________________________________ |
| Modified: svnmerge-integrated |
| 6144 | 6144 | - /trunk/phase3:1-25302 |
| 6145 | 6145 | + /trunk/phase3:1-25337 |