| Index: trunk/extensions/UploadWizard/UploadWizard.config.php |
| — | — | @@ -248,7 +248,8 @@ |
| 249 | 249 | ) |
| 250 | 250 | ), |
| 251 | 251 | array( |
| 252 | | - 'head' => 'mwe-upwiz-license-public-domain-head', |
| | 252 | + 'head' => 'mwe-upwiz-license-public-domain-usa-head', |
| | 253 | + 'subhead' => 'mwe-upwiz-license-public-domain-usa-subhead', |
| 253 | 254 | 'licenses' => array( |
| 254 | 255 | 'pd-old-100', |
| 255 | 256 | 'pd-old', |
| — | — | @@ -264,12 +265,6 @@ |
| 265 | 266 | 'pd-usgov-nasa' |
| 266 | 267 | ) |
| 267 | 268 | ), |
| 268 | | - array( |
| 269 | | - 'head' => 'mwe-upwiz-license-misc', |
| 270 | | - 'licenses' => array( |
| 271 | | - 'fal' |
| 272 | | - ) |
| 273 | | - ), |
| 274 | 269 | array( |
| 275 | 270 | 'head' => 'mwe-upwiz-license-none-applicable-head', |
| 276 | 271 | 'subhead' => 'mwe-upwiz-license-none-applicable-subhead', |
| Index: trunk/extensions/UploadWizard/UploadWizardHooks.php |
| — | — | @@ -324,8 +324,8 @@ |
| 325 | 325 | 'mwe-upwiz-license-cc-subhead', |
| 326 | 326 | 'mwe-upwiz-license-flickr-head', |
| 327 | 327 | 'mwe-upwiz-license-flickr-subhead', |
| 328 | | - 'mwe-upwiz-license-public-domain-head', |
| 329 | | - 'mwe-upwiz-license-public-domain-subhead', |
| | 328 | + 'mwe-upwiz-license-public-domain-usa-head', |
| | 329 | + 'mwe-upwiz-license-public-domain-usa-subhead', |
| 330 | 330 | 'mwe-upwiz-license-usgov-head', |
| 331 | 331 | 'mwe-upwiz-license-misc', |
| 332 | 332 | 'mwe-upwiz-license-custom-head', |
| Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -103,13 +103,13 @@ |
| 104 | 104 | 'mwe-upwiz-source-ownwork-assert-any-license' => 'I, $2, the copyright holder of {{PLURAL:$1|this work|these works}}, hereby irrevocably grant anyone the right to use, modify and redistribute {{PLURAL:$1|this work|these works}} for any purpose, and I therefore publish {{PLURAL:$1|it|them}} under the following terms:', |
| 105 | 105 | 'mwe-upwiz-source-ownwork-assert' => 'I, $2, the copyright holder of {{PLURAL:$1|this work|these works}}, hereby irrevocably grant anyone the right to use {{PLURAL:$1|this work|these works}} for any purpose, as long as they credit me and share derivative work under the same terms.', |
| 106 | 106 | 'mwe-upwiz-source-ownwork-assert-custom' => 'I, $2, the copyright holder of {{PLURAL:$1|this work|these works}}, hereby publish {{PLURAL:$1|this work|these works}} under the following license:', |
| 107 | | - 'mwe-upwiz-source-ownwork-assert-note' => 'This means you release your work under the following license: $1', |
| | 107 | + 'mwe-upwiz-source-ownwork-assert-note' => 'I, copyright holder of these works, publish these works under the $1 license.', |
| 108 | 108 | 'mwe-upwiz-source-permission' => 'Their author gave you explicit permission to upload them', |
| 109 | 109 | 'mwe-upwiz-source-thirdparty' => '{{PLURAL:$1|This file is|These files are}} not my own work.', |
| 110 | 110 | 'mwe-upwiz-source-thirdparty-intro' => 'Please enter the address where you found each file.', |
| 111 | 111 | 'mwe-upwiz-source-thirdparty-custom-multiple-intro' => 'If all files have the same source, author, and copyright status, you may enter them only once for all of them.', |
| 112 | 112 | 'mwe-upwiz-source-thirdparty-license' => 'The copyright holder of {{PLURAL:$1|this work|these works}} published {{PLURAL:$1|it|them}} under the following license(s):', |
| 113 | | - 'mwe-upwiz-source-thirdparty-cases' => 'Now tell us why you are sure this site has the right to publish {{PLURAL:$1|this work|these works}}:', |
| | 113 | + 'mwe-upwiz-source-thirdparty-cases' => 'Now tell us why you are sure you have the right to publish {{PLURAL:$1|this work|these works}}:', |
| 114 | 114 | 'mwe-upwiz-source-thirdparty-accept' => 'OK', |
| 115 | 115 | 'mwe-upwiz-source-custom' => 'Provide copyright information for each file individually on the next page.', |
| 116 | 116 | 'mwe-upwiz-more-options' => 'add categories and more information...', |
| — | — | @@ -222,7 +222,7 @@ |
| 223 | 223 | 'mwe-upwiz-license-cc-by-2.5' => 'Creative Commons Attribution 2.5', |
| 224 | 224 | 'mwe-upwiz-license-cc-by-sa-2.0' => 'Creative Commons Attribution ShareAlike 2.0', |
| 225 | 225 | 'mwe-upwiz-license-cc-by-2.0' => 'Creative Commons Attribution 2.0', |
| 226 | | - 'mwe-upwiz-license-cc-zero' => 'Creative Commons CC0 Waiver (public domain)', |
| | 226 | + 'mwe-upwiz-license-cc-zero' => 'Creative Commons CC0 Waiver (release all rights, like public domain)', |
| 227 | 227 | 'mwe-upwiz-license-fal' => 'Free Art License', |
| 228 | 228 | 'mwe-upwiz-license-own-pd' => 'Public domain (all rights waived with Creative Commons Zero license)', |
| 229 | 229 | 'mwe-upwiz-license-pd-old-100' => 'Author died more than 100 years ago', |
| — | — | @@ -246,7 +246,8 @@ |
| 247 | 247 | 'mwe-upwiz-license-flickr-head' => 'The copyright holder published their {{PLURAL:$1|photo or video|photos or videos}} on Flickr with the right license', |
| 248 | 248 | 'mwe-upwiz-license-flickr-subhead' => 'Check the "License" header on the side of the Flickr page. Both the icons and license name that they used have to match one of the choices here.', |
| 249 | 249 | |
| 250 | | - 'mwe-upwiz-license-public-domain-head' => 'The copyright has definitely expired', |
| | 250 | + 'mwe-upwiz-license-public-domain-usa-head' => 'The copyright has definitely expired in the USA.', |
| | 251 | + 'mwe-upwiz-license-public-domain-usa-subhead' => '{{SITENAME}} is located in the USA, so the work must be out of copyright in that country.', |
| 251 | 252 | |
| 252 | 253 | 'mwe-upwiz-license-usgov-head' => '{{PLURAL:$1|This work was|These works were}} made by the United States government', |
| 253 | 254 | 'mwe-upwiz-license-misc' => 'Miscellaneous reasons', |