r108963 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108962‎ | r108963 | r108964 >
Date:10:45, 15 January 2012
Author:multichill
Status:ok
Tags:
Comment:
Some more: FEMA, military & NOAA.
Modified paths:
  • /trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
@@ -289,12 +289,19 @@
290290 'wm-license-pd-author-with-author-any-purpose' => '$1 grants anyone the right to use this work \'\'\'for any purpose\'\'\', without any conditions, unless such conditions are required by law.',
291291 'wm-license-pd-usgov-wiki-link' => 'w:en:Federal government of the United States',
292292 'wm-license-pd-usgov-work-wiki-link' => 'w:en:Copyright status of work by the U.S. government',
 293+ 'wm-license-pd-usgov-fema-text' => 'This file is a work of an employee of the [[{{int:wm-license-pd-usgov-fema-wiki-link}}|Federal Emergency Management Agency]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 294+ 'wm-license-pd-usgov-fema-wiki-link' => 'w:en:Federal Emergency Management Agency',
 295+ 'wm-license-pd-usgov-military-text' => 'This file is a work of a [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}|U.S. military]] or [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}|Department of Defense]] employee, taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 296+ 'wm-license-pd-usgov-military-armed-forces-wiki-link' => 'w:en:United States Armed Forces',
 297+ 'wm-license-pd-usgov-military-dod-wiki-link' => 'w:en:United States Department of Defense',
293298 'wm-license-pd-usgov-military-air-force-text' => 'This file is a work of an airman or employee of the [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}|U.S. Air Force]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
294299 'wm-license-pd-usgov-military-air-force-wiki-link' => 'w:en:United States Air Force',
295300 'wm-license-pd-usgov-military-army-text' => 'This file is a work of a soldier or employee of the [[{{int:wm-license-pd-usgov-military-army-wiki-link}}|U.S. Army]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
296301 'wm-license-pd-usgov-military-army-wiki-link' => 'w:en:United States Army',
297302 'wm-license-pd-usgov-military-navy-text' => 'This file is a work of a sailor or employee of the [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}|U.S. Navy]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
298303 'wm-license-pd-usgov-military-navy-wiki-link' => 'w:en:United States Navy',
 304+ 'wm-license-pd-usgov-noaa-text' => 'This file is a work of an employee of the [[{{int:wm-license-pd-usgov-noaa-wiki-link}}|U.S. National Oceanic and Atmospheric Administration]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 305+ 'wm-license-pd-usgov-noaa-wiki-link' => 'w:en:National Oceanic and Atmospheric Administration',
299306 'wm-license-pd-wiki-link' => 'w:en:public domain',
300307 'wm-license-self-one-license' => 'I, the copyright holder of this work, hereby publish it under the following license:',
301308 'wm-license-self-one-license-with-author' => '$1, the copyright holder of this work, hereby publishes it under the following license:',

Follow-up revisions

RevisionCommit summaryAuthorDate
r109000Follow-up r108915, r108963. Base the pd-usgov-work templates...platonides20:53, 15 January 2012

Status & tagging log