| Index: trunk/extensions/UploadWizard/UploadWizard.config.php |
| — | — | @@ -232,7 +232,7 @@ |
| 233 | 233 | 'licenses' => array( |
| 234 | 234 | 'cc-by-sa-3.0', |
| 235 | 235 | 'cc-by-3.0', |
| 236 | | - 'own-pd' |
| | 236 | + 'cc-zero' |
| 237 | 237 | ), |
| 238 | 238 | 'defaults' => array( 'cc-by-sa-3.0' ) |
| 239 | 239 | ), |
| — | — | @@ -273,10 +273,8 @@ |
| 274 | 274 | 'head' => 'mwe-upwiz-license-public-domain-usa-head', |
| 275 | 275 | 'subhead' => 'mwe-upwiz-license-public-domain-usa-subhead', |
| 276 | 276 | 'licenses' => array( |
| 277 | | - 'pd-old-100', |
| 278 | | - 'pd-old', |
| 279 | | - 'pd-art', |
| 280 | 277 | 'pd-us', |
| | 278 | + 'pd-art', |
| 281 | 279 | ) |
| 282 | 280 | ), |
| 283 | 281 | array( |
| Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -236,10 +236,10 @@ |
| 237 | 237 | 'mwe-upwiz-license-cc-zero' => 'Creative Commons CC0 Waiver (release all rights, like public domain)', |
| 238 | 238 | 'mwe-upwiz-license-custom' => 'The license is described by the following wikitext:', |
| 239 | 239 | 'mwe-upwiz-license-fal' => 'Free Art License', |
| 240 | | - 'mwe-upwiz-license-own-pd' => 'Public domain (all rights waived with Creative Commons Zero license)', |
| | 240 | + 'mwe-upwiz-license-own-pd' => 'All rights waived with Creative Commons Zero license (like public domain)', |
| 241 | 241 | 'mwe-upwiz-license-pd-old-100' => 'Author died more than 100 years ago', |
| 242 | 242 | 'mwe-upwiz-license-pd-old' => 'Author died more than 70 years ago', |
| 243 | | - 'mwe-upwiz-license-pd-art' => 'Reproduction of a painting that is in the public domain because of its age', |
| | 243 | + 'mwe-upwiz-license-pd-art' => 'Faithful reproduction of a painting that is in the public domain', |
| 244 | 244 | 'mwe-upwiz-license-pd-us' => 'First published in the United States before 1923', |
| 245 | 245 | 'mwe-upwiz-license-pd-usgov' => 'Original work of the US Federal Government', |
| 246 | 246 | 'mwe-upwiz-license-pd-usgov-nasa' => 'Original work of NASA', |