| Property changes on: branches/wmf/1.17wmf1/includes/upload/UploadFromFile.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/includes/upload/UploadFromFile.php:r90217 |
| Property changes on: branches/wmf/1.17wmf1/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/phase3/includes/HistoryPage.php:r90217 |
| Property changes on: branches/wmf/1.17wmf1/includes/MessageBlobStore.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/phase3/includes/MessageBlobStore.php:r89003,90217 |
| Index: branches/wmf/1.17wmf1/languages/Names.php |
| — | — | @@ -244,7 +244,7 @@ |
| 245 | 245 | 'oc' => 'Occitan', # Occitan |
| 246 | 246 | 'om' => 'Oromoo', # Oromo |
| 247 | 247 | 'or' => 'ଓଡ଼ିଆ', # Oriya |
| 248 | | - 'os' => 'Иронау', # Ossetic |
| | 248 | + 'os' => 'Ирон', # Ossetic -- fixed per bug 29091 |
| 249 | 249 | 'pa' => 'ਪੰਜਾਬੀ', # Eastern Punjabi (Gurmukhi script) (pan) |
| 250 | 250 | 'pag' => 'Pangasinan', # Pangasinan |
| 251 | 251 | 'pam' => 'Kapampangan', # Pampanga |
| Property changes on: branches/wmf/1.17wmf1/languages/Names.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 252 | 252 | Merged /trunk/phase3/languages/Names.php:r90217 |