| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -142,6 +142,7 @@ |
| 143 | 143 | 'mytalk', |
| 144 | 144 | 'anontalk', |
| 145 | 145 | 'navigation', |
| | 146 | + 'and', |
| 146 | 147 | ), |
| 147 | 148 | 'metadata_help' => array( |
| 148 | 149 | 'metadata_help', |
| — | — | @@ -1723,7 +1724,6 @@ |
| 1724 | 1725 | 'anonymous', |
| 1725 | 1726 | 'siteuser', |
| 1726 | 1727 | 'lastmodifiedatby', |
| 1727 | | - 'and', |
| 1728 | 1728 | 'othercontribs', |
| 1729 | 1729 | 'others', |
| 1730 | 1730 | 'siteusers', |
| Index: trunk/phase3/includes/SpecialVersion.php |
| — | — | @@ -256,7 +256,7 @@ |
| 257 | 257 | $t = array_slice( $list, 0, $cnt - 1 ); |
| 258 | 258 | $one = array_map( array( &$this, 'arrayToString' ), $t ); |
| 259 | 259 | $two = $this->arrayToString( $list[$cnt - 1] ); |
| 260 | | - $and = wfMsg( 'version-and' ); |
| | 260 | + $and = wfMsg( 'and' ); |
| 261 | 261 | |
| 262 | 262 | return implode( ', ', $one ) . " $and $two"; |
| 263 | 263 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -593,6 +593,7 @@ |
| 594 | 594 | 'mytalk' => 'My talk', |
| 595 | 595 | 'anontalk' => 'Talk for this IP', |
| 596 | 596 | 'navigation' => 'Navigation', |
| | 597 | +'and' => 'and', |
| 597 | 598 | |
| 598 | 599 | # Metadata in edit box |
| 599 | 600 | 'metadata_help' => 'Metadata:', |
| — | — | @@ -2470,7 +2471,6 @@ |
| 2471 | 2472 | 'anonymous' => 'Anonymous user(s) of {{SITENAME}}', |
| 2472 | 2473 | 'siteuser' => '{{SITENAME}} user $1', |
| 2473 | 2474 | 'lastmodifiedatby' => 'This page was last modified $2, $1 by $3.', # $1 date, $2 time, $3 user |
| 2474 | | -'and' => 'and', |
| 2475 | 2475 | 'othercontribs' => 'Based on work by $1.', |
| 2476 | 2476 | 'others' => 'others', |
| 2477 | 2477 | 'siteusers' => '{{SITENAME}} user(s) $1', |
| — | — | @@ -3149,6 +3149,5 @@ |
| 3150 | 3150 | 'version-skin-extension-functions' => 'Skin extension functions', |
| 3151 | 3151 | 'version-hook-name' => 'Hook name', |
| 3152 | 3152 | 'version-hook-subscribedby' => 'Subscribed by', |
| 3153 | | -'version-and' => 'and', |
| 3154 | 3153 | 'version-version' => 'Version', |
| 3155 | 3154 | ); |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -307,6 +307,7 @@ |
| 308 | 308 | 'mytalk' => 'Eigene Diskussion', |
| 309 | 309 | 'anontalk' => 'Diskussionsseite dieser IP', |
| 310 | 310 | 'navigation' => 'Navigation', |
| | 311 | +'and' => 'und', |
| 311 | 312 | |
| 312 | 313 | # Metadata in edit box |
| 313 | 314 | 'metadata_help' => 'Metadaten:', |
| — | — | @@ -1988,7 +1989,6 @@ |
| 1989 | 1990 | 'anonymous' => 'Anonyme(r) Benutzer auf {{SITENAME}}', |
| 1990 | 1991 | 'siteuser' => '{{SITENAME}}-Benutzer $1', |
| 1991 | 1992 | 'lastmodifiedatby' => 'Diese Seite wurde zuletzt am $1 um $2 Uhr von $3 geändert.', # $1 date, $2 time, $3 user |
| 1992 | | -'and' => 'und', |
| 1993 | 1993 | 'othercontribs' => 'Basiert auf der Arbeit von $1', |
| 1994 | 1994 | 'others' => 'andere', |
| 1995 | 1995 | 'siteusers' => '{{SITENAME}}-Benutzer $1', |
| — | — | @@ -2496,6 +2496,5 @@ |
| 2497 | 2497 | 'version-skin-extension-functions' => 'Skin-Erweiterungs-Funktionen', |
| 2498 | 2498 | 'version-hook-name' => 'Schnittstellenname', |
| 2499 | 2499 | 'version-hook-subscribedby' => 'Aufruf von', |
| 2500 | | -'version-and' => 'und', |
| 2501 | 2500 | 'version-version' => 'Version', |
| 2502 | 2501 | ); |