r109005 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r109004‎ \| r109005 \| r109006 >
Date:	22:00, 15 January 2012
Author:	platonides
Status:	reverted (Comments)
Tags:	i18nreview
Comment:	Finish r109000 change. Move to wm-license-pd-usgov-work-template languages be-tarask, de, ia, ko, mg, pms and add to wm-license-pd-usgov-work-template qqq. You may _now_ revert it if you wish, or break the message in different pieces (although the direct object seems quite sensible). You may not like helper messages, but WikimediaMessagesLicense is broken forcing to translate everything. The redundancy is there, no matter the language (anyway, if it couldn't be expressed through wm-license-pd-usgov-work-template, it can be ignored). It is clear in how, despite adding a new message, this saves 5KB. And we want those messages to be consistent! If a language had three ways to say 'U.S. federal government', different messages choosing different variants, just because they were translated at different times, would be wrong (still better than untranslated, but wrong).
Modified paths:	/trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
—	—	@@ -289,18 +289,19 @@
290	290	'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.',
291	291	'wm-license-pd-usgov-wiki-link' => 'w:en:Federal government of the United States',
292	292	'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]]\'\'\'.',
	293	+ 'wm-license-pd-usgov-work-template' => 'This file is a work of {{{1}}}, 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-text' => '{{int:wm-license-pd-usgov-work-template\|an employee of the [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Federal Emergency Management Agency]]}}',
294	295	'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-text' => '{{int:wm-license-pd-usgov-work-template\|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}}',
296	297	'wm-license-pd-usgov-military-armed-forces-wiki-link' => 'w:en:United States Armed Forces',
297	298	'wm-license-pd-usgov-military-dod-wiki-link' => 'w:en:United States Department of Defense',
298		- '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]]\'\'\'.',
	299	+ 'wm-license-pd-usgov-military-air-force-text' => '{{int:wm-license-pd-usgov-work-template\|an airman or employee of the [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|U.S. Air Force]]}}',
299	300	'wm-license-pd-usgov-military-air-force-wiki-link' => 'w:en:United States Air Force',
300		- '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]]\'\'\'.',
	301	+ 'wm-license-pd-usgov-military-army-text' => '{{int:wm-license-pd-usgov-work-template\|a soldier or employee of the [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|U.S. Army]]}}',
301	302	'wm-license-pd-usgov-military-army-wiki-link' => 'w:en:United States Army',
302		- '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]]\'\'\'.',
	303	+ 'wm-license-pd-usgov-military-navy-text' => '{{int:wm-license-pd-usgov-work-template\|a sailor or employee of the [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|U.S. Navy]]}}',
303	304	'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-text' => '{{int:wm-license-pd-usgov-work-template\|an employee of the [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|U.S. National Oceanic and Atmospheric Administration]]}}',
305	306	'wm-license-pd-usgov-noaa-wiki-link' => 'w:en:National Oceanic and Atmospheric Administration',
306	307	'wm-license-pd-wiki-link' => 'w:en:public domain',
307	308	'wm-license-self-one-license' => 'I, the copyright holder of this work, hereby publish it under the following license:',
—	—	@@ -602,6 +603,7 @@
603	604	* {{msg-mw\|wm-license-self-multiple-licenses-with-author}}
604	605	* {{msg-mw\|wm-license-self-one-license}}
605	606	* {{msg-mw\|wm-license-self-one-license-with-author}}',
	607	+ 'wm-license-pd-usgov-work-template' => 'Optional template to write once the description for the works of the US Government. Parameter {{{1}}}: who made the work (names the section employee). wm-license-pd-usgov-work-* may choose not to use it.',
606	608	);
607	609
608	610	/** Afrikaans (Afrikaans)
—	—	@@ -2410,9 +2412,10 @@
2411	2413	'wm-license-pd-author-not-legally-possible' => 'У некаторых краінах гэта ня можа быць юрыдычна магчыма; калі так, то:',
2412	2414	'wm-license-pd-author-self-any-purpose' => "Я дазваляю кожнаму выкарыстоўваць гэтую працу '''ў любых мэтах''', без аніякіх умоваў, калі толькі такія ўмовы не патрабуюцца па закону.",
2413	2415	'wm-license-pd-author-with-author-any-purpose' => "$1 дазволіў кожнаму выкарыстоўваць гэтую працу '''ў любых мэтах''', без аніякіх умоваў, калі толькі такія ўмовы не патрабуюцца па закону.",
2414		- 'wm-license-pd-usgov-military-air-force-text' => "Гэты файл — твор пілёта ці супрацоўніка [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|Паветраных сіл ЗША]], зробленае ў часе выкананьня абавязкаў. Файл знаходзіцца ў '''[[{{int:wm-license-pd-wiki-link}}\|грамадзкім набытку]]''', бо зьяўляецца [[{{int:wm-license-pd-usgov-work-wiki-link}}\|працай]] [[{{int:wm-license-pd-usgov-wiki-link}}\|фэдэральнага ўраду ЗША]].",
2415		- 'wm-license-pd-usgov-military-army-text' => "Гэты файл — твор вайскоўцы ці супрацоўніка [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|Арміі ЗША]], зробленае ў часе выкананьня абавязкаў. Файл знаходзіцца ў '''[[{{int:wm-license-pd-wiki-link}}\|грамадзкім набытку]]''', бо зьяўляецца [[{{int:wm-license-pd-usgov-work-wiki-link}}\|працай]] [[{{int:wm-license-pd-usgov-wiki-link}}\|фэдэральнага ўраду ЗША]].",
2416		- 'wm-license-pd-usgov-military-navy-text' => "Гэты файл — твор матроса ці супрацоўніка [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|Ваенна-марскіх сіл ЗША]], зробленае ў часе выкананьня абавязкаў. Файл знаходзіцца ў '''[[{{int:wm-license-pd-wiki-link}}\|грамадзкім набытку]]''', бо зьяўляецца [[{{int:wm-license-pd-usgov-work-wiki-link}}\|працай]] [[{{int:wm-license-pd-usgov-wiki-link}}\|фэдэральнага ўраду ЗША]].",
	2416	+ 'wm-license-pd-usgov-work-template' => "Гэты файл — твор {{{1}}}, зробленае ў часе выкананьня абавязкаў. Файл знаходзіцца ў '''[[{{int:wm-license-pd-wiki-link}}\|грамадзкім набытку]]''', бо зьяўляецца [[{{int:wm-license-pd-usgov-work-wiki-link}}\|працай]] [[{{int:wm-license-pd-usgov-wiki-link}}\|фэдэральнага ўраду ЗША]].",
	2417	+ 'wm-license-pd-usgov-military-air-force-text' => "{{int:wm-license-pd-usgov-work-template/be-tarask\|пілёта ці супрацоўніка [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|Паветраных сіл ЗША]]}}",
	2418	+ 'wm-license-pd-usgov-military-army-text' => "{{int:wm-license-pd-usgov-work-template/be-tarask\|вайскоўцы ці супрацоўніка [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|Арміі ЗША]]}}",
	2419	+ 'wm-license-pd-usgov-military-navy-text' => "{{int:wm-license-pd-usgov-work-template/be-tarask\|матроса ці супрацоўніка [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|Ваенна-марскіх сіл ЗША]]}}",
2417	2420	'wm-license-pd-wiki-link' => 'w:be-x-old:Грамадзкі набытак',
2418	2421	'wm-license-self-one-license' => 'Я, уладальнік аўтарскіх правоў на гэтую працу, добраахвотна публікую яе на ўмовах наступнай ліцэнзіі:',
2419	2422	'wm-license-self-one-license-with-author' => '$1, уладальнік аўтарскіх правоў на гэтую працу, добраахвотна публікуе яе на ўмовах наступнай ліцэнзіі:',
—	—	@@ -5018,15 +5021,16 @@
5019	5022	'wm-license-pd-author-self-any-purpose' => "Ich gewähre jedem das bedingungslose Recht, dieses Werk für '''jedweden Zweck''' zu nutzen, es sei denn Bedingungen sind gesetzlich erforderlich.",
5020	5023	'wm-license-pd-author-with-author-any-purpose' => "$1 gewährt jedem das bedingungslose Recht, dieses Werk für '''jedweden Zweck''' zu nutzen, es sei denn Bedingungen sind gesetzlich erforderlich.",
5021	5024	'wm-license-pd-usgov-wiki-link' => 'w:de:Bundesregierung (Vereinigte Staaten)',
5022		- 'wm-license-pd-usgov-fema-text' => "Diese Datei ist ein Werk eines Mitglieds der [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Federal Emergency Management Agency]], aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
5023		- 'wm-license-pd-usgov-military-text' => "Diese Datei ist ein Werk eines Mitglieds des [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}\|US-Militärs]] oder [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}\|Verteidigungsministeriums der Vereinigten Staaten]], aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
5024		- 'wm-license-pd-usgov-military-air-force-text' => "Diese Datei ist ein Werk eines Mitglieds der [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|United States Air Force]], aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
	5025	+ 'wm-license-pd-usgov-work-template' => "Diese Datei ist ein Werk {{{1}}}, aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
	5026	+ 'wm-license-pd-usgov-fema-text' => "{{int:wm-license-pd-usgov-work-template/de\|eines Mitglieds der [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Federal Emergency Management Agency]]}}",
	5027	+ 'wm-license-pd-usgov-military-text' => "{{int:wm-license-pd-usgov-work-template/de\|eines Mitglieds des [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}\|US-Militärs]] oder [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}\|Verteidigungsministeriums der Vereinigten Staaten]]}}",
	5028	+ 'wm-license-pd-usgov-military-air-force-text' => "{{int:wm-license-pd-usgov-work-template/de\|eines Mitglieds der [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|United States Air Force]]}}",
5025	5029	'wm-license-pd-usgov-military-air-force-wiki-link' => 'w:de:United States Air Force',
5026		- 'wm-license-pd-usgov-military-army-text' => "Diese Datei ist ein Werk eines Mitglieds der [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|United States Army]], aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
	5030	+ 'wm-license-pd-usgov-military-army-text' => "{{int:wm-license-pd-usgov-work-template/de\|eines Mitglieds der [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|United States Army]]}}",
5027	5031	'wm-license-pd-usgov-military-army-wiki-link' => 'w:de:United States Army',
5028		- 'wm-license-pd-usgov-military-navy-text' => "Diese Datei ist ein Werk eines Mitglieds der [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|United States Navy]], aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
	5032	+ 'wm-license-pd-usgov-military-navy-text' => "{{int:wm-license-pd-usgov-work-template/de\|eines Mitglieds der [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|United States Navy]]}}",
5029	5033	'wm-license-pd-usgov-military-navy-wiki-link' => 'w:de:United States Navy',
5030		- 'wm-license-pd-usgov-noaa-text' => "Diese Datei ist ein Werk eines Mitglieds der [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|National Oceanic and Atmospheric Administration]], aufgenommen oder erstellt während der Ausführung seiner Dienstpflichten. Als [[{{int:wm-license-pd-usgov-work-wiki-link}}\|Werk]] der [[{{int:wm-license-pd-usgov-wiki-link}}\|US-Bundesregierung]] ist diese Datei '''[[{{int:wm-license-pd-wiki-link}}\|gemeinfrei]]'''.",
	5034	+ 'wm-license-pd-usgov-noaa-text' => "{{int:wm-license-pd-usgov-work-template/de\|eines Mitglieds der [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|National Oceanic and Atmospheric Administration]]}}",
5031	5035	'wm-license-pd-wiki-link' => 'w:de:Gemeinfreiheit',
5032	5036	'wm-license-self-one-license' => 'Ich, der Urheber dieses Werkes, veröffentliche es unter der folgenden Lizenz:',
5033	5037	'wm-license-self-one-license-with-author' => '$1, der Nutzungsrechtsinhaber dieses Werkes, veröffentlicht es hiermit unter der folgenden Lizenz:',
—	—	@@ -10088,12 +10092,13 @@
10089	10093	'wm-license-pd-author-not-legally-possible' => 'In alcun paises isto pote non esser legalmente possibile. In tal caso:',
10090	10094	'wm-license-pd-author-self-any-purpose' => "Io concede a omnes le derecto de usar iste obra '''pro non importa qual fin''', sin conditiones, a minus que tal conditiones sia requirite per lege.",
10091	10095	'wm-license-pd-author-with-author-any-purpose' => "$1 concede a omnes le derecto de usar iste obra '''pro non importa qual fin''', sin conditiones, a minus que tal conditiones sia requirite per lege.",
10092		- 'wm-license-pd-usgov-fema-text' => "Iste file es un obra de un empleato del [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Agentia federal de gestion de emergentias]], prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
10093		- 'wm-license-pd-usgov-military-text' => "Iste file es un obra de empleato del [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}\|Armea statounitese]] o del [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}\|Departimento de defensa]], prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
10094		- 'wm-license-pd-usgov-military-air-force-text' => "Iste file es un obra de un aviator o empleato del [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|Fortia aeree statounitese]], prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
10095		- 'wm-license-pd-usgov-military-army-text' => "Iste file es un obra de un soldato o empleato del [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|Armea statounitese]], prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
10096		- 'wm-license-pd-usgov-military-navy-text' => "Iste file es un obra de un marinero o empleato del [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|Marina statounitese]], prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
10097		- 'wm-license-pd-usgov-noaa-text' => "Iste file es un obra de un empleato del [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|Administration national oceanic e atmospheric del Statos Unite]], prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
	10096	+ 'wm-license-pd-usgov-work-template' => "Iste file es un obra de {{1}}}, prendite o facite durante le curso del deberes official de iste persona. Como [[{{int:wm-license-pd-usgov-work-wiki-link}}\|obra]] del [[{{int:wm-license-pd-usgov-wiki-link}}\|Governamento federal statounitese]], iste file es in le '''[[{{int:wm-license-pd-wiki-link}}\|dominio public]]'''.",
	10097	+ 'wm-license-pd-usgov-fema-text' => "{{int:wm-license-pd-usgov-work-template/ia\|un empleato del [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Agentia federal de gestion de emergentias]]}}",
	10098	+ 'wm-license-pd-usgov-military-text' => "{{int:wm-license-pd-usgov-work-template/ia\|empleato del [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}\|Armea statounitese]] o del [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}\|Departimento de defensa]]}}",
	10099	+ 'wm-license-pd-usgov-military-air-force-text' => "{{int:wm-license-pd-usgov-work-template/ia\|un aviator o empleato del [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|Fortia aeree statounitese]]}}",
	10100	+ 'wm-license-pd-usgov-military-army-text' => "{{int:wm-license-pd-usgov-work-template/ia\|un soldato o empleato del [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|Armea statounitese]]}}",
	10101	+ 'wm-license-pd-usgov-military-navy-text' => "{{int:wm-license-pd-usgov-work-template/ia\|un marinero o empleato del [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|Marina statounitese]]}}",
	10102	+ 'wm-license-pd-usgov-noaa-text' => "{{int:wm-license-pd-usgov-work-template/ia\|un empleato del [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|Administration national oceanic e atmospheric del Statos Unite]]}}",
10098	10103	'wm-license-pd-wiki-link' => 'w:ia:Dominio public',
10099	10104	'wm-license-self-one-license' => 'Qua possessor del derectos de autor, io publica le presente obra sub le sequente licentia:',
10100	10105	'wm-license-self-one-license-with-author' => '$1, le possessor del derectos de autor de iste obra, lo publica sub le sequente licentia:',
—	—	@@ -12154,11 +12159,12 @@
12155	12160	'wm-license-pd-author-with-author-any-purpose' => "$1은 이 작품을 법적으로 허용되는 한도 내에서 누구나 자유롭게 '''어떤 목적으로도''' 제한없이 사용할 수 있도록 허용합니다.",
12156	12161	'wm-license-pd-usgov-wiki-link' => 'w:ko:미국 연방 정부',
12157	12162	'wm-license-pd-usgov-work-wiki-link' => 'w:ko:미국 정부의 저작물',
12158		- 'wm-license-pd-usgov-military-air-force-text' => "이 파일은 [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|미국 공군]]의 군인이나 군무원의 저작물로, 공적 업무 수행의 과정에서 창작된 저작물입니다. 이 저작물은 [[{{int:wm-license-pd-usgov-wiki-link}}\|미국 연방정부]]의 [[{{int:wm-license-pd-usgov-work-wiki-link}}\|저작물]]이므로 '''[[{{int:wm-license-pd-wiki-link}}\|퍼블릭 도메인]]'''입니다.",
	12163	+ 'wm-license-pd-usgov-work-template' => "이 파일은 {{1}}}의 군인이나 군무원의 저작물로, 공적 업무 수행의 과정에서 창작된 저작물입니다. 이 저작물은 [[{{int:wm-license-pd-usgov-wiki-link}}\|미국 연방정부]]의 [[{{int:wm-license-pd-usgov-work-wiki-link}}\|저작물]]이므로 '''[[{{int:wm-license-pd-wiki-link}}\|퍼블릭 도메인]]'''입니다.",
	12164	+ 'wm-license-pd-usgov-military-air-force-text' => "{{int:wm-license-pd-usgov-work-template/ko\|[[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|미국 공군]]}}",
12159	12165	'wm-license-pd-usgov-military-air-force-wiki-link' => 'w:ko:미국 공군',
12160		- 'wm-license-pd-usgov-military-army-text' => "이 파일은 [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|미국 육군]]의 군인이나 군무원의 저작물로, 공적 업무 수행의 과정에서 창작된 저작물입니다. 이 저작물은 [[{{int:wm-license-pd-usgov-wiki-link}}\|미국 연방정부]]의 [[{{int:wm-license-pd-usgov-work-wiki-link}}\|저작물]]이므로 '''[[{{int:wm-license-pd-wiki-link}}\|퍼블릭 도메인]]'''입니다.",
	12166	+ 'wm-license-pd-usgov-military-army-text' => "{{int:wm-license-pd-usgov-work-template/ko\|[[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|미국 육군]]}}",
12161	12167	'wm-license-pd-usgov-military-army-wiki-link' => 'w:ko:미국 육군',
12162		- 'wm-license-pd-usgov-military-navy-text' => "이 파일은 [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|미국 해군]]의 군인이나 군무원의 저작물로, 공적 업무 수행의 과정에서 창작된 저작물입니다. 이 저작물은 [[{{int:wm-license-pd-usgov-wiki-link}}\|미국 연방정부]]의 [[{{int:wm-license-pd-usgov-work-wiki-link}}\|저작물]]이므로 '''[[{{int:wm-license-pd-wiki-link}}\|퍼블릭 도메인]]'''입니다.",
	12168	+ 'wm-license-pd-usgov-military-navy-text' => "{{int:wm-license-pd-usgov-work-template/ko\|[[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|미국 해군]]}}",
12163	12169	'wm-license-pd-usgov-military-navy-wiki-link' => 'w:ko:미국 해군',
12164	12170	'wm-license-pd-wiki-link' => 'w:ko:퍼블릭 도메인',
12165	12171	'wm-license-self-one-license' => '나는 아래 작품의 저작권자로서, 이 저작물을 다음과 같은 라이선스로 배포합니다:',
—	—	@@ -13935,11 +13941,13 @@
13936	13942	'wm-license-pd-author-self-any-purpose' => "Дозволувам секому да го користи делово '''за било каква цел''', без било какви услови, освен ако такви услови не ги налага законот.",
13937	13943	'wm-license-pd-author-with-author-any-purpose' => "$1 му дозволува секому да го користи делово '''за било каква цел''', без било какви услови, освен ако такви услови не ги налага законот.",
13938	13944	'wm-license-pd-usgov-wiki-link' => 'w:mk:Федерална влада на САД',
	13945	+ 'wm-license-pd-usgov-work-template' => "Оваа податотека е дело {{{1}}}, направена во склоп на службените должности на лицето. Како [[{{int:wm-license-pd-usgov-work-wiki-link}}\|дело]] на [[{{int:wm-license-pd-usgov-wiki-link}}\|федералната влада на САД]], податотеката е во '''[[{{int:wm-license-pd-wiki-link}}\|јавна сопственост]]'''.",
13939	13946	'wm-license-pd-usgov-military-air-force-text' => "Оваа податотека е дело на авијатичар или службено лице на [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|Военото воздухопловство на САД]], направена во склоп на службените должности на лицето.Како [[{{int:wm-license-pd-usgov-work-wiki-link}}\|дело]] на [[{{int:wm-license-pd-usgov-wiki-link}}\|федералната влада на САД]], податотеката е во '''[[{{int:wm-license-pd-wiki-link}}\|јавна сопственост]]'''.",
13940	13947	'wm-license-pd-usgov-military-air-force-wiki-link' => 'w:mk:Воено воздухопловство на САД',
13941		- 'wm-license-pd-usgov-military-army-text' => "Оваа податотека е дело на војник или службено лице на [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|Армијата на САД]], направена во склоп на службените должности на лицето. Како [[{{int:wm-license-pd-usgov-work-wiki-link}}\|дело]] на [[{{int:wm-license-pd-usgov-wiki-link}}\|федералната влада на САД]], податотеката е во '''[[{{int:wm-license-pd-wiki-link}}\|јавна сопственост]]'''.",
	13948	+ 'wm-license-pd-usgov-military-army-text' => "{{int:wm-license-pd-usgov-work-template/mg\|на војник или службено лице на [[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|Армијата на САД]]}}",
13942	13949	'wm-license-pd-usgov-military-army-wiki-link' => 'w:mk:Армија на САД',
13943		- 'wm-license-pd-usgov-military-navy-text' => "Оваа податотека е дело на морнар или службено лице на [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|Воената морнарица на САД]], направена во склоп на службените должности на лицето. Како [[{{int:wm-license-pd-usgov-work-wiki-link}}\|дело]] на [[{{int:wm-license-pd-usgov-wiki-link}}\|федералната влада на САД]], податотеката е во '''[[{{int:wm-license-pd-wiki-link}}\|јавна сопственост]]'''.",
	13950	+ 'wm-license-pd-usgov-military-navy-text' => "{{int:wm-license-pd-usgov-work-template/mg\|на морнар или службено лице на [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|Воената морнарица на САД]]}}",
	13951	+
13944	13952	'wm-license-pd-usgov-military-navy-wiki-link' => 'w:mk:Воена морнарица на САД',
13945	13953	'wm-license-pd-wiki-link' => 'w:mk:Јавен домен',
13946	13954	'wm-license-self-one-license' => 'Јас, носителот на авторските права на ова дело, со ова го објавувам истото под следнава лиценца:',
—	—	@@ -16859,12 +16867,13 @@
16860	16868	'wm-license-pd-author-not-legally-possible' => 'An quàich ëstat sòn a peul esse pa legalment possìbil; se parèj:',
16861	16869	'wm-license-pd-author-self-any-purpose' => "I don a mincadun ël drit ëd dovré sto travaj-sì '''për qualsëssìa but''', sensa gnun-e condission, gavà ch'a-i sio ëd condission vorsùe da la lej.",
16862	16870	'wm-license-pd-author-with-author-any-purpose' => "$1 a dà a mincadun ël drit ëd dovré sto travaj-sì '''për qualsëssìa but''', sensa gnun-e condission, gavà ch'a-i sio ëd condission vorsùe da la lej.",
16863		- 'wm-license-pd-usgov-fema-text' => "Costo archivi a l'é un travaj ëd n'ampiegà dël [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Federal Emergency Management Agency]], pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
16864		- 'wm-license-pd-usgov-military-text' => "Costo archivi a l'é un travaj d'un [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}\|U.S. military]] o d'un ampiegà dël [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}\|Department of Defense]], pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
16865		- 'wm-license-pd-usgov-military-air-force-text' => "Costo archivi a l'é un travaj d'un aviador o ampiegà dl'[[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|U.S. Air Force]], pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
16866		- 'wm-license-pd-usgov-military-army-text' => "Costo archivi a l'é un travaj d'un soldà o ampiegà dl'[[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|U.S. Army]], pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
16867		- 'wm-license-pd-usgov-military-navy-text' => "Costo archivi a l'é un travaj d'un mariné o ampiegà dl'[[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|U.S. Navy]], pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
16868		- 'wm-license-pd-usgov-noaa-text' => "Costo archivi a l'é un travaj d'un ampiegà dël [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|U.S. National Oceanic and Atmospheric Administration]], pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
	16871	+ 'wm-license-pd-usgov-work-template' => "Costo archivi a l'é un travaj {{{1}}}, pijà o fàit an mente dj'òbligh ufissiaj dla përson-a. Com un [[{{int:wm-license-pd-usgov-work-wiki-link}}\|travaj]] dël [[{{int:wm-license-pd-usgov-wiki-link}}\|U.S. federal government]], 'archivi a l'é an '''[[{{int:wm-license-pd-wiki-link}}\|public domain]]'''.",
	16872	+ 'wm-license-pd-usgov-fema-text' => "{{int:wm-license-pd-usgov-work-template/pms\|ëd n'ampiegà dël [[{{int:wm-license-pd-usgov-fema-wiki-link}}\|Federal Emergency Management Agency]]}}",
	16873	+ 'wm-license-pd-usgov-military-text' => "{{int:wm-license-pd-usgov-work-template/pms\|d'un [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}\|U.S. military]] o d'un ampiegà dël [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}\|Department of Defense]]}}",
	16874	+ 'wm-license-pd-usgov-military-air-force-text' => "{{int:wm-license-pd-usgov-work-template/pms\|d'un aviador o ampiegà dl'[[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}\|U.S. Air Force]]}}",
	16875	+ 'wm-license-pd-usgov-military-army-text' => "{{int:wm-license-pd-usgov-work-template/pms\|d'un soldà o ampiegà dl'[[{{int:wm-license-pd-usgov-military-army-wiki-link}}\|U.S. Army]]}}",
	16876	+ 'wm-license-pd-usgov-military-navy-text' => "{{int:wm-license-pd-usgov-work-template/pms\|d'un mariné o ampiegà dl'[[{{int:wm-license-pd-usgov-military-navy-wiki-link}}\|U.S. Navy]]}}",
	16877	+ 'wm-license-pd-usgov-noaa-text' => "{{int:wm-license-pd-usgov-work-template/pms\|d'un ampiegà dël [[{{int:wm-license-pd-usgov-noaa-wiki-link}}\|U.S. National Oceanic and Atmospheric Administration]]}}",
16869	16878	'wm-license-self-one-license' => "Mi, padron dij drit d'autor dë sto travaj-sì, i lo pùblico ambelessì sota la licensa sì-sota:",
16870	16879	'wm-license-self-one-license-with-author' => "$1, ël padron dij drit d'autor dë sto travaj-sì, a lo pùblica ambelessì sota sta licensa-sì:",
16871	16880	'wm-license-self-multiple-licenses' => "Mi, ël padron dij drit d'autor dë sto travaj-sì, i lo pùblico ambelessì sota ste license-sì:",

Follow-up revisions

Revision	Commit summary	Author	Date
r109058	On hold until r109005 is reviewed	raymond	21:07, 16 January 2012
r109059	On hold until r109005 is reviewed	raymond	21:09, 16 January 2012
r110976	revert r109005	mah	23:07, 8 February 2012

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r109000	Follow-up r108915, r108963. Base the pd-usgov-work templates...	platonides	20:53, 15 January 2012

Comments

#Comment by Nemo bis (talk | contribs) 08:03, 16 January 2012

I guess those messages with int need to be made optional on translatewiki?

#Comment by Platonides (talk | contribs) 22:05, 16 January 2012

Yes, wm-license-pd-usgov-work-template is intended as an optional message.

#Comment by Multichill (talk | contribs) 21:33, 17 January 2012

As I already said in r109001. I don't like these lego messages being introduced. This duplication is there for a reason: Clean translation as recommended by the people of Translatewiki.

#Comment by Platonides (talk | contribs) 22:15, 17 January 2012

If there was just an appropiate to do that in translatewiki... a hint about what changes, and an interface which allowed you to translate the block of message at once.

#Comment by Raymond (talk | contribs) 14:00, 4 February 2012

Setting to FIXME to get a decision which method is better. I want to enable this file on Translatewiki.net as soon as possible again.

Status & tagging log

23:07, 8 February 2012 MarkAHershberger (talk | contribs) changed the status of r109005 [removed: fixme added: reverted]
14:00, 4 February 2012 Raymond (talk | contribs) changed the status of r109005 [removed: new added: fixme]
11:25, 17 January 2012 Hashar (talk | contribs) changed the tags for r109005 [added: i18nreview]