r71851 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r71850‎ \| r71851 \| r71852 >
Date:	12:01, 28 August 2010
Author:	werdna
Status:	deferred
Tags:
Comment:	Re-merge r71332, adding r71850. Going to test on testwiki then roll out
Modified paths:	/branches/wmf/1.16wmf4/extensions/AbuseFilter (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/AbuseFilter.class.php (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/AbuseFilter.i18n.php (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/AbuseFilter.php (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/ApiQueryAbuseLog.php (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/SpecialAbuseLog.php (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/abusefilter.tables.sql (modified) (history) /branches/wmf/1.16wmf4/extensions/AbuseFilter/db_patches/patch-hide_patrol.sql (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/SpecialAbuseLog.php
—	—	@@ -36,8 +36,16 @@
37	37	}
38	38
39	39	$detailsid = $wgRequest->getIntOrNull( 'details' );
	40	+ $hideid = $wgRequest->getIntOrNull( 'hide' );
	41	+
	42	+ if ( $parameter ) {
	43	+ $detailsid = $parameter;
	44	+ }
	45	+
40	46	if ( $detailsid ) {
41	47	$this->showDetails( $detailsid );
	48	+ } elseif ( $hideid ) {
	49	+ $this->showHideForm( $hideid );
42	50	} else {
43	51	// Show the search form.
44	52	$this->searchForm();
—	—	@@ -61,7 +69,7 @@
62	70
63	71	$this->mSearchTitle = $wgRequest->getText( 'wpSearchTitle' );
64	72	$this->mSearchFilter = null;
65		~~- if ( $this->canSeeDetails() ) {~~
	73	+ if ( self::canSeeDetails() ) {
66	74	$this->mSearchFilter = $wgRequest->getIntOrNull( 'wpSearchFilter' );
67	75	}
68	76	}
—	—	@@ -75,7 +83,7 @@
76	84	// Search conditions
77	85	$fields['abusefilter-log-search-user'] =
78	86	Xml::input( 'wpSearchUser', 45, $this->mSearchUser );
79		~~- if ( $this->canSeeDetails() ) {~~
	87	+ if ( self::canSeeDetails() ) {
80	88	$fields['abusefilter-log-search-filter'] =
81	89	Xml::input( 'wpSearchFilter', 45, $this->mSearchFilter );
82	90	}
—	—	@@ -92,7 +100,72 @@
93	101
94	102	$wgOut->addHTML( $output );
95	103	}
	104	+
	105	+ function showHideForm( $id ) {
	106	+ global $wgOut, $wgUser;
	107	+
	108	+ if ( ! $wgUser->isAllowed( 'abusefilter-hide-log' ) ) {
	109	+ $wgOut->addWikiMsg( 'abusefilter-log-hide-forbidden' );
	110	+ return;
	111	+ }
	112	+
	113	+ $dbr = wfGetDB( DB_SLAVE );
96	114
	115	+ $row = $dbr->selectRow( array( 'abuse_filter_log', 'abuse_filter' ), '*',
	116	+ array( 'afl_id' => $id ), __METHOD__, array(),
	117	+ array( 'abuse_filter' => array( 'LEFT JOIN', 'af_id=afl_filter' ) ) );
	118	+
	119	+ if ( !$row ) {
	120	+ return;
	121	+ }
	122	+
	123	+ $formInfo = array(
	124	+ 'logid' => array(
	125	+ 'type' => 'info',
	126	+ 'default' => $id,
	127	+ 'label-message' => 'abusefilter-log-hide-id',
	128	+ ),
	129	+ 'reason' => array(
	130	+ 'type' => 'text',
	131	+ 'label-message' => 'abusefilter-log-hide-reason',
	132	+ ),
	133	+ 'hidden' => array(
	134	+ 'type' => 'toggle',
	135	+ 'default' => $row->afl_deleted,
	136	+ 'label-message' => 'abusefilter-log-hide-hidden',
	137	+ ),
	138	+ );
	139	+
	140	+ $form = new HTMLForm( $formInfo );
	141	+ $form->setTitle( $this->getTitle() );
	142	+ $form->addHiddenField( 'hide', $id );
	143	+ $form->setSubmitCallback( array( $this, 'saveHideForm' ) );
	144	+ $form->show();
	145	+ }
	146	+
	147	+ function saveHideForm( $fields ) {
	148	+ global $wgRequest, $wgOut;
	149	+ $logid = $wgRequest->getVal( 'hide' );
	150	+
	151	+ $dbw = wfGetDB( DB_MASTER );
	152	+
	153	+ $dbw->update(
	154	+ 'abuse_filter_log',
	155	+ array( 'afl_deleted' => $fields['hidden'] ),
	156	+ array( 'afl_id' => $logid ),
	157	+ __METHOD__
	158	+ );
	159	+
	160	+ $logPage = new LogPage( 'suppress' );
	161	+ $action = $fields['hidden'] ? 'hide-afl' : 'unhide-afl';
	162	+
	163	+ $logPage->addEntry( $action, $this->getTitle( $logid ), $fields['reason'] );
	164	+
	165	+ $wgOut->redirect( SpecialPage::getTitleFor( 'AbuseLog' )->getFullURL() );
	166	+
	167	+ return true;
	168	+ }
	169	+
97	170	function showList() {
98	171	global $wgOut;
99	172
—	—	@@ -130,7 +203,7 @@
131	204	}
132	205
133	206	function showDetails( $id ) {
134		~~- if ( !$this->canSeeDetails() ) {~~
	207	+ if ( !self::canSeeDetails() ) {
135	208	return;
136	209	}
137	210
—	—	@@ -143,6 +216,12 @@
144	217	if ( !$row ) {
145	218	return;
146	219	}
	220	+
	221	+ if ( $row->afl_deleted && !self::canSeeHidden() ) {
	222	+ global $wgOut;
	223	+ $wgOut->addWikiMsg( 'abusefilter-log-details-hidden' );
	224	+ return;
	225	+ }
147	226
148	227	$output = '';
149	228
—	—	@@ -185,7 +264,7 @@
186	265	// Build a table.
187	266	$output .= AbuseFilter::buildVarDumpTable( $vars );
188	267
189		~~- if ( $this->canSeePrivate() ) {~~
	268	+ if ( self::canSeePrivate() ) {
190	269	// Private stuff, like IPs.
191	270	$header =
192	271	Xml::element( 'th', null, wfMsg( 'abusefilter-log-details-var' ) ) .
—	—	@@ -220,24 +299,28 @@
221	300	$wgOut->addHTML( $output );
222	301	}
223	302
224		~~- function canSeeDetails() {~~
	303	+ static function canSeeDetails() {
225	304	global $wgUser;
226		~~- return !count( $this->getTitle()->getUserPermissionsErrors(~~
227		~~- 'abusefilter-log-detail', $wgUser, true, array( 'ns-specialprotected' ) ) );~~
	305	+ return $wgUser->isAllowed( 'abusefilter-log-detail' );
228	306	}
229	307
230		~~- function canSeePrivate() {~~
	308	+ static function canSeePrivate() {
231	309	global $wgUser;
232		~~- return !count(~~
233		~~- $this->getTitle()->getUserPermissionsErrors(~~
234		~~- 'abusefilter-private', $wgUser, true, array( 'ns-specialprotected' ) ) );~~
	310	+ return $wgUser->isAllowed( 'abusefilter-private' );
235	311	}
	312	+
	313	+ static function canSeeHidden() {
	314	+ global $wgUser;
	315	+ return $wgUser->isAllowed( 'abusefilter-hidden-log' );
	316	+ }
236	317
237	318	function formatRow( $row, $li = true ) {
238	319	global $wgLang, $wgUser;
239	320
240	321	# # One-time setup
241	322	static $sk = null;
	323	+
	324	+ $actionLinks = array();
242	325
243	326	if ( is_null( $sk ) ) {
244	327	$sk = $wgUser->getSkin();
—	—	@@ -288,18 +371,31 @@
289	372	$parsed_comments = $wgOut->parseInline( $row->af_public_comments );
290	373	}
291	374
292		~~- if ( $this->canSeeDetails() ) {~~
	375	+ if ( self::canSeeDetails() ) {
293	376	$examineTitle = SpecialPage::getTitleFor( 'AbuseFilter', 'examine/log/' . $row->afl_id );
294	377	$detailsLink = $sk->makeKnownLinkObj(
295		~~- $this->getTitle(),~~
296		~~- wfMsg( 'abusefilter-log-detailslink' ),~~
297		~~- 'details=' . $row->afl_id~~
	378	+ $this->getTitle($row->afl_id),
	379	+ wfMsg( 'abusefilter-log-detailslink' )
298	380	);
299	381	$examineLink = $sk->link(
300	382	$examineTitle,
301	383	wfMsgExt( 'abusefilter-changeslist-examine', 'parseinline' ),
302	384	array()
303	385	);
	386	+
	387	+ $actionLinks[] = $detailsLink;
	388	+ $actionLinks[] = $examineLink;
	389	+
	390	+ if ( $wgUser->isAllowed( 'abusefilter-hide-log' ) ) {
	391	+ $hideLink = $sk->link(
	392	+ $this->getTitle(),
	393	+ wfMsg( 'abusefilter-log-hidelink' ),
	394	+ array(),
	395	+ array( 'hide' => $row->afl_id )
	396	+ );
	397	+
	398	+ $actionLinks[] = $hideLink;
	399	+ }
304	400
305	401	if ( $globalIndex ) {
306	402	global $wgAbuseFilterCentralDB;
—	—	@@ -327,8 +423,7 @@
328	424	$pageLink,
329	425	$actions_taken,
330	426	$parsed_comments,
331		~~- $detailsLink,~~
332		~~- $examineLink~~
	427	+ $wgLang->pipeList( $actionLinks ),
333	428	)
334	429	);
335	430	} else {
—	—	@@ -345,9 +440,25 @@
346	441	)
347	442	);
348	443	}
	444	+
	445	+ if ( $row->afl_deleted ) {
	446	+ $description .= ' '.
	447	+ wfMsgExt( 'abusefilter-log-hidden', 'parseinline' );
	448	+ }
349	449
350	450	return $li ? Xml::tags( 'li', null, $description ) : $description;
351	451	}
	452	+
	453	+ public static function getNotDeletedCond( $db ) {
	454	+ $deletedZeroCond = $db->makeList(
	455	+ array( 'afl_deleted' => 0 ), LIST_AND );
	456	+ $deletedNullCond = $db->makeList(
	457	+ array( 'afl_deleted' => null ), LIST_AND );
	458	+ $notDeletedCond = $db->makeList(
	459	+ array( $deletedZeroCond, $deletedNullCond ), LIST_OR );
	460	+
	461	+ return $notDeletedCond;
	462	+ }
352	463	}
353	464
354	465	class AbuseLogPager extends ReverseChronologicalPager {
—	—	@@ -366,7 +477,7 @@
367	478	function getQueryInfo() {
368	479	$conds = $this->mConds;
369	480
370		~~- return array(~~
	481	+ $info = array(
371	482	'tables' => array( 'abuse_filter_log', 'abuse_filter' ),
372	483	'fields' => '*',
373	484	'conds' => $conds,
—	—	@@ -378,6 +489,13 @@
379	490	),
380	491	),
381	492	);
	493	+
	494	+ if ( ! $this->mForm->canSeeHidden() ) {
	495	+ $db = $this->mDb;
	496	+ $info['conds'][] = SpecialAbuseLog::getNotDeletedCond($db);
	497	+ }
	498	+
	499	+ return $info;
382	500	}
383	501
384	502	function getIndexField() {
Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/AbuseFilter.php
—	—	@@ -78,11 +78,15 @@
79	79	$wgAvailableRights[] = 'abusefilter-modify-restricted';
80	80	$wgAvailableRights[] = 'abusefilter-revert';
81	81	$wgAvailableRights[] = 'abusefilter-view-private';
	82	+$wgAvailableRights[] = 'abusefilter-hidden-log';
	83	+$wgAvailableRights[] = 'abusefilter-hide-log';
82	84
83	85	$wgLogTypes[] = 'abusefilter';
84	86	$wgLogNames['abusefilter'] = 'abusefilter-log-name';
85	87	$wgLogHeaders['abusefilter'] = 'abusefilter-log-header';
86	88	$wgLogActionsHandlers['abusefilter/modify'] = array( 'AbuseFilter', 'modifyActionText' );
	89	+$wgLogActions['suppress/hide-afl'] = 'abusefilter-logentry-suppress';
	90	+$wgLogActions['suppress/unhide-afl'] = 'abusefilter-logentry-unsuppress';
87	91
88	92	$wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag' );
89	93
Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/db_patches/patch-hide_patrol.sql
—	—	@@ -1,5 +1,5 @@
2	2	-- Add hiding and patrolling ability to abuse filter log
3	3	-- Andrew Garrett, June 2009
4	4
5		~~-ALTER TABLE /_/abuse_filter_log ADD COLUMN afl_deleted tinyint(1) NULL;~~
6		~~-ALTER TABLE /_/abuse_filter_log ADD COLUMN afl_patrolled_by int unsigned NULL;~~
	5	+ALTER TABLE /_/abuse_filter_log ADD COLUMN afl_deleted tinyint(1) NOT NULL DEFAULT 0;
	6	+ALTER TABLE /_/abuse_filter_log ADD COLUMN afl_patrolled_by int unsigned NOT NULL DEFAULT 0;
Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/AbuseFilter.class.php
—	—	@@ -643,7 +643,7 @@
644	644
645	645	if ( !empty( $actions['warn'] ) ) {
646	646	$parameters = $actions['warn']['parameters'];
647		~~- $warnKey = 'abusefilter-warned-' . $title->getPrefixedText();~~
	647	+ $warnKey = 'abusefilter-warned-' . $title->getPrefixedText() . '-' . $filter;
648	648	if ( !isset( $_SESSION[$warnKey] ) \|\| !$_SESSION[$warnKey] ) {
649	649	$_SESSION[$warnKey] = true;
650	650
Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/ApiQueryAbuseLog.php
—	—	@@ -52,6 +52,7 @@
53	53	$fld_details = isset( $prop['details'] );
54	54	$fld_result = isset( $prop['result'] );
55	55	$fld_timestamp = isset( $prop['timestamp'] );
	56	+ $fld_hidden = isset( $prop['hidden'] );
56	57
57	58	if ( $fld_ip && !$wgUser->isAllowed( 'abusefilter-private' ) )
58	59	$this->dieUsage( 'You don\'t have permission to view IP addresses', 'permissiondenied' );
—	—	@@ -69,6 +70,8 @@
70	71	$this->addFieldsIf( 'afl_action', $fld_action );
71	72	$this->addFieldsIf( 'afl_var_dump', $fld_details );
72	73	$this->addFieldsIf( 'afl_actions', $fld_result );
	74	+ $this->addFieldsIf( 'afl_deleted', $fld_hidden );
	75	+
73	76	if ( $fld_filter ) {
74	77	$this->addTables( 'abuse_filter' );
75	78	$this->addFields( 'af_public_comments' );
—	—	@@ -79,9 +82,13 @@
80	83	$this->addOption( 'LIMIT', $params['limit'] + 1 );
81	84
82	85	$this->addWhereRange( 'afl_timestamp', $params['dir'], $params['start'], $params['end'] );
	86	+
	87	+ $db = $this->getDatabase();
	88	+ $notDeletedCond = SpecialAbuseLog::getNotDeletedCondition($db);
83	89
84	90	$this->addWhereIf( array( 'afl_user_text' => $params['user'] ), isset( $params['user'] ) );
85	91	$this->addWhereIf( array( 'afl_filter' => $params['filter'] ), isset( $params['filter'] ) );
	92	+ $this->addWhereIf( $notDeletedCond, !SpecialAbuseLog::canSeeHidden() );
86	93
87	94	$title = $params['title'];
88	95	if ( !is_null( $title ) ) {
—	—	@@ -129,6 +136,11 @@
130	137	$entry['details'] = array_change_key_case( $vars, CASE_LOWER );
131	138	}
132	139	}
	140	+
	141	+ if ( $fld_hidden ) {
	142	+ $entry['hidden'] = $row->afl_deleted;
	143	+ }
	144	+
133	145	if ( $entry ) {
134	146	$fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $entry );
135	147	if ( !$fit ) {
—	—	@@ -166,7 +178,7 @@
167	179	ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
168	180	),
169	181	'prop' => array(
170		~~- ApiBase::PARAM_DFLT => 'ids\|user\|title\|action\|result\|timestamp',~~
	182	+ ApiBase::PARAM_DFLT => 'ids\|user\|title\|action\|result\|timestamp\|hidden',
171	183	ApiBase::PARAM_TYPE => array(
172	184	'ids',
173	185	'filter',
—	—	@@ -177,6 +189,7 @@
178	190	'details',
179	191	'result',
180	192	'timestamp',
	193	+ 'hidden',
181	194	),
182	195	ApiBase::PARAM_ISMULTI => true
183	196	)
Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/AbuseFilter.i18n.php
—	—	@@ -63,6 +63,8 @@
64	64	'right-abusefilter-modify-restricted' => 'Modify abuse filters with restricted actions',
65	65	'right-abusefilter-revert' => 'Revert all changes by a given abuse filter',
66	66	'right-abusefilter-view-private' => 'View abuse filters marked as private',
	67	+ 'right-abusefilter-hide-log' => 'Hide entries in the abuse log',
	68	+ 'right-abusefilter-hidden-log' => 'View hidden abuse log entries',
67	69
68	70	'action-abusefilter-modify' => 'modify abuse filters',
69	71	'action-abusefilter-view' => 'view abuse filters',
—	—	@@ -80,16 +82,18 @@
81	83	'abusefilter-log-search-user' => 'User:',
82	84	'abusefilter-log-search-filter' => 'Filter ID:',
83	85	'abusefilter-log-search-title' => 'Title:',
	86	+ 'abusefilter-log-show-deleted' => 'Show hidden entries',
84	87	'abusefilter-log-search-submit' => 'Search',
85	88	'abusefilter-log-entry' => '$1: $2 triggered an abuse filter, performing the action "$3" on $4.
86	89	Actions taken: $5;
87	90	Filter description: $6',
88	91	'abusefilter-log-detailedentry-meta' => '$1: $2 triggered $3, performing the action "$4" on $5.
89	92	Actions taken: $6;
90		~~-Filter description: $7 ($8{{int:pipe-separator}}$9)',~~
	93	+Filter description: $7 ($8)',
91	94	'abusefilter-log-detailedentry-global' => 'global filter $1',
92	95	'abusefilter-log-detailedentry-local' => 'filter $1',
93	96	'abusefilter-log-detailslink' => 'details',
	97	+ 'abusefilter-log-hidelink' => 'adjust visibility',
94	98	'abusefilter-log-details-legend' => 'Details for log entry $1',
95	99	'abusefilter-log-details-var' => 'Variable',
96	100	'abusefilter-log-details-val' => 'Value',
—	—	@@ -100,7 +104,19 @@
101	105	'abusefilter-log-details-diff' => 'Changes made in edit',
102	106	'abusefilter-log-linkoncontribs' => 'abuse log',
103	107	'abusefilter-log-linkoncontribs-text' => 'Abuse Log for this user',
	108	+ 'abusefilter-log-hidden' => '(entry hidden)',
	109	+ 'abusefilter-log-hide' => 'hide or unhide',
	110	+ 'abusefilter-log-details-hidden' => 'You cannot view the details for this entry because it is hidden from public view.',
104	111
	112	+ // Hiding log entries
	113	+ 'abusefilter-log-hide-id' => 'Log entry ID:',
	114	+ 'abusefilter-log-hide-hidden' => 'Hide this entry from public view',
	115	+ 'abusefilter-log-hide-reason' => 'Reason:',
	116	+ 'abusefilter-log-hide-forbidden' => 'You do not have permission to hide
	117	+abuse log entries.',
	118	+ 'abusefilter-logentry-suppress' => 'hid [[$1]]',
	119	+ 'abusefilter-logentry-unsuppress' => 'unhid [[$1]]',
	120	+
105	121	// Abuse filter management
106	122	'abusefilter-management' => 'Abuse filter management',
107	123	'abusefilter-list' => 'All filters',
—	—	@@ -895,7 +911,7 @@
896	912	وصف المرشح: $6',
897	913	'abusefilter-log-detailedentry-meta' => '$1: $2 أطلق $3، مؤديا الفعل "$4" في $5.
898	914	الأفعال المتخذة: $6;
899		~~-وصف المرشح: $7 ($8{{int:pipe-separator}}$9)',~~
	915	+وصف المرشح: $7 ($8)',
900	916	'abusefilter-log-detailedentry-global' => 'المرشح العام $1',
901	917	'abusefilter-log-detailedentry-local' => 'المرشح $1',
902	918	'abusefilter-log-detailslink' => 'التفاصيل',
—	—	@@ -1311,7 +1327,7 @@
1312	1328	وصف المرشح: $6',
1313	1329	'abusefilter-log-detailedentry-meta' => '$1: $2 أطلق $3، مؤديا الفعل "$4" فى $5.
1314	1330	الأفعال المتخذة: $6;
1315		~~-وصف المرشح: $7 ($8{{int:pipe-separator}}$9)',~~
	1331	+وصف المرشح: $7 ($8)',
1316	1332	'abusefilter-log-detailedentry-global' => 'المرشح العام $1',
1317	1333	'abusefilter-log-detailedentry-local' => 'المرشح $1',
1318	1334	'abusefilter-log-detailslink' => 'التفاصيل',
—	—	@@ -1711,7 +1727,7 @@
1712	1728	Апісаньне фільтру: $6',
1713	1729	'abusefilter-log-detailedentry-meta' => '$1: $2 выклікаў $3, выконваючы дзеяньне «$4» на $5.
1714	1730	Прынятыя меры: $6;
1715		~~-Апісаньне фільтру: $7 ($8{{int:pipe-separator}}$9)',~~
	1731	+Апісаньне фільтру: $7 ($8)',
1716	1732	'abusefilter-log-detailedentry-global' => 'глябальны фільтар $1',
1717	1733	'abusefilter-log-detailedentry-local' => 'фільтар $1',
1718	1734	'abusefilter-log-detailslink' => 'падрабязнасьці',
—	—	@@ -2105,7 +2121,7 @@
2106	2122	Описание на филтъра: $6',
2107	2123	'abusefilter-log-detailedentry-meta' => '$1: $2 задейства $3, извършвайки действие "$4" на $5.
2108	2124	Предприети действия: $6;
2109		~~-Описание на филтъра: $7 ($8{{int:pipe-separator}}$9)',~~
	2125	+Описание на филтъра: $7 ($8)',
2110	2126	'abusefilter-log-detailedentry-global' => 'глобален филтър $1',
2111	2127	'abusefilter-log-detailedentry-local' => 'филтър $1',
2112	2128	'abusefilter-log-detailslink' => 'детайли',
—	—	@@ -2780,7 +2796,7 @@
2781	2797	'abusefilter-log-entry' => '$1: Korisnik $2 je pokrenuo filter za zloupotrebu, napravivši akciju "$3" na $4.
2782	2798	Napravljena akcija: $5;
2783	2799	Opis filtera: $6',
2784		~~- 'abusefilter-log-detailedentry-meta' => '$1: Korisnik $2 pokrenuo $3, napravivši akciju "$4" na $5. Napravljena akcija: $6; Opis filtera: $7 ($8{{int:pipe-separator}}$9)',~~
	2800	+ 'abusefilter-log-detailedentry-meta' => '$1: Korisnik $2 pokrenuo $3, napravivši akciju "$4" na $5. Napravljena akcija: $6; Opis filtera: $7 ($8)',
2785	2801	'abusefilter-log-detailedentry-global' => 'globalni filter $1',
2786	2802	'abusefilter-log-detailedentry-local' => 'filter $1',
2787	2803	'abusefilter-log-detailslink' => 'detalji',
—	—	@@ -3348,7 +3364,7 @@
3349	3365	'abusefilter-log-entry' => '$1: $2 {{GENDER:$2\|spustil\|spustila\|spustil}} filtr zneužívání při činnosti „$3“ na $4.
3350	3366	Provedená opatření: $5; popis filtru: $6',
3351	3367	'abusefilter-log-detailedentry-meta' => '$1: $2 {{GENDER:$2\|spustil\|spustila\|spustil}} $3 při činnosti „$4“ na $5.
3352		~~-Provedená opatření: $6; popis filtru: $7 ($8{{int:pipe-separator}}$9)',~~
	3368	+Provedená opatření: $6; popis filtru: $7 ($8)',
3353	3369	'abusefilter-log-detailedentry-global' => 'globální filtr $1',
3354	3370	'abusefilter-log-detailedentry-local' => 'filtr $1',
3355	3371	'abusefilter-log-detailslink' => 'podrobnosti',
—	—	@@ -4105,7 +4121,7 @@
4106	4122	Filterbeschreibung: „$6“',
4107	4123	'abusefilter-log-detailedentry-meta' => '$1: $2 löste den $3 aus, indem er die Aktion „$4“ auf „$5“ anwendete.
4108	4124	Ergriffene Maßnahmen: $6;
4109		~~-Filterbeschreibung: $7 ($8{{int:pipe-separator}}$9)',~~
	4125	+Filterbeschreibung: $7 ($8)',
4110	4126	'abusefilter-log-detailedentry-global' => 'globaler Filter $1',
4111	4127	'abusefilter-log-detailedentry-local' => 'Filter $1',
4112	4128	'abusefilter-log-detailslink' => 'Details',
—	—	@@ -4547,7 +4563,7 @@
4548	4564	Deskripsiyonê filitreyî: $6',
4549	4565	'abusefilter-log-detailedentry-meta' => '$1: $2 kerd $3, ser $5 de hereketê "$4"î kerd.
4550	4566	Hereket: $6;
4551		~~-Deskripsiyonê filitreyî: $7 ($8{{int:pipe-separator}}$9)',~~
	4567	+Deskripsiyonê filitreyî: $7 ($8)',
4552	4568	'abusefilter-log-detailedentry-global' => 'filitreyê globalî $1',
4553	4569	'abusefilter-log-detailedentry-local' => 'filitreyê $1î',
4554	4570	'abusefilter-log-detailslink' => 'detayî',
—	—	@@ -4932,7 +4948,7 @@
4933	4949	'abusefilter-log-search-title' => 'Titel:',
4934	4950	'abusefilter-log-search-submit' => 'Pytaś',
4935	4951	'abusefilter-log-entry' => '$1: $2 jo filter znjewužywanja zapušćił a cynił akciju $3 na $4. Wuwjeźone akcije: $5; Wopisanje filtra: $6',
4936		~~- 'abusefilter-log-detailedentry-meta' => '$1: $2 jo zapušćił $3 a jo pśewjadł akciju "$4" na $5. Wuwjeźone akcije: $6; Wopisanje filtra: $7 ($8{{int:pipe-separator}}$9)',~~
	4952	+ 'abusefilter-log-detailedentry-meta' => '$1: $2 jo zapušćił $3 a jo pśewjadł akciju "$4" na $5. Wuwjeźone akcije: $6; Wopisanje filtra: $7 ($8)',
4937	4953	'abusefilter-log-detailedentry-global' => 'globalny filter $1',
4938	4954	'abusefilter-log-detailedentry-local' => 'filter $1',
4939	4955	'abusefilter-log-detailslink' => 'Drobnosći',
—	—	@@ -5331,7 +5347,7 @@
5332	5348	Περιγραφή φίλτρου: $6',
5333	5349	'abusefilter-log-detailedentry-meta' => '$1: Ο $2 προκάλεσε το $3, εκτελώντας την ενέργεια "$4" στο $5.
5334	5350	Ενέργειες που λήφθηκαν: $6;
5335		~~-Περιγραφή φίλτρου: $7 ($8{{int:pipe-separator}}$9)',~~
	5351	+Περιγραφή φίλτρου: $7 ($8)',
5336	5352	'abusefilter-log-detailedentry-global' => 'καθολικό φίλτρο $1',
5337	5353	'abusefilter-log-detailedentry-local' => 'φίλτρο $1',
5338	5354	'abusefilter-log-detailslink' => 'λεπτομέρειες',
—	—	@@ -5727,7 +5743,7 @@
5728	5744	Filtrila priskribo: $6',
5729	5745	'abusefilter-log-detailedentry-meta' => '$1: $2 ŝpronis $3, farante agon "$4" en $5.
5730	5746	Agoj fariĝis: $6;
5731		~~-Filtrila priskribo: $7 ($8{{int:pipe-separator}}$9)',~~
	5747	+Filtrila priskribo: $7 ($8)',
5732	5748	'abusefilter-log-detailedentry-global' => 'ĝenerala filtrilo $1',
5733	5749	'abusefilter-log-detailedentry-local' => 'filtrilo $1',
5734	5750	'abusefilter-log-detailslink' => 'detaloj',
—	—	@@ -6135,7 +6151,7 @@
6136	6152	Descripción del filtro: $6',
6137	6153	'abusefilter-log-detailedentry-meta' => '$1: $2 disparó $3 realizando la acción "$4" en $5.
6138	6154	Acciones tomadas: $6;
6139		~~-Descripción del filtro: $7 ($8{{int:pipe-separator}}$9)',~~
	6155	+Descripción del filtro: $7 ($8)',
6140	6156	'abusefilter-log-detailedentry-global' => 'filtro global $1',
6141	6157	'abusefilter-log-detailedentry-local' => 'filtro $1',
6142	6158	'abusefilter-log-detailslink' => 'detalles',
—	—	@@ -6927,7 +6943,7 @@
6928	6944	توضیحات پالایه: $6',
6929	6945	'abusefilter-log-detailedentry-meta' => '$1:$2 $3 را در حالی که قصد داشت عمل «$4» را روی $5 انجام دهد فعال کرد.
6930	6946	اقدامی که توسط پالایه گرفته شد: $6
6931		~~-توضیحات پالایه: $7 ($8{{int:pipe-separator}}$9)',~~
	6947	+توضیحات پالایه: $7 ($8)',
6932	6948	'abusefilter-log-detailedentry-global' => 'پالایه سراسری $1',
6933	6949	'abusefilter-log-detailedentry-local' => 'پالایه $1',
6934	6950	'abusefilter-log-detailslink' => 'جزئیات',
—	—	@@ -7227,7 +7243,7 @@
7228	7244	Suodattimen kuvaus: $6',
7229	7245	'abusefilter-log-detailedentry-meta' => '$1: $2 laukaisi suodattimen $3 käyttäessään toimintoa ”$4” osoitteessa $5.
7230	7246	Laukaistut toiminnot: $6
7231		~~-Suodattimen kuvaus: $7 ($8{{int:pipe-separator}}$9)',~~
	7247	+Suodattimen kuvaus: $7 ($8)',
7232	7248	'abusefilter-log-detailedentry-local' => 'suodatin $1',
7233	7249	'abusefilter-log-detailslink' => 'tiedot',
7234	7250	'abusefilter-log-details-legend' => 'Yksityiskohdat lokitapahtumalle $1',
—	—	@@ -7628,7 +7644,7 @@
7629	7645	Description du filtre : $6',
7630	7646	'abusefilter-log-detailedentry-meta' => '$1 : $2 a déclenché le $3, lors de l’action « $4 » sur $5.
7631	7647	Actions prises : $6 ;
7632		~~-Description du filtre : $7 ($8{{int:pipe-separator}}$9)',~~
	7648	+Description du filtre : $7 ($8)',
7633	7649	'abusefilter-log-detailedentry-global' => 'filtre global $1',
7634	7650	'abusefilter-log-detailedentry-local' => 'filtre antiabus $1',
7635	7651	'abusefilter-log-detailslink' => 'détails',
—	—	@@ -8002,7 +8018,7 @@
8003	8019	Dèscripcion du filtro : $6',
8004	8020	'abusefilter-log-detailedentry-meta' => '$1 : $2 at dècllenchiê lo $3, pendent l’accion « $4 » dessus $5.
8005	8021	Accions prêses : $6 ;
8006		~~-Dèscripcion du filtro : $7 ($8{{int:pipe-separator}}$9)',~~
	8022	+Dèscripcion du filtro : $7 ($8)',
8007	8023	'abusefilter-log-detailedentry-global' => 'filtro globâl $1',
8008	8024	'abusefilter-log-detailedentry-local' => 'filtro $1',
8009	8025	'abusefilter-log-detailslink' => 'dètalys',
—	—	@@ -8387,7 +8403,7 @@
8388	8404	Descrición do filtro: $6',
8389	8405	'abusefilter-log-detailedentry-meta' => '$1: $2 accionou $3, levando a cabo a acción "$4" en $5.
8390	8406	Accións levadas a cabo: $6.
8391		~~-Descrición do filtro: $7 ($8{{int:pipe-separator}}$9)',~~
	8407	+Descrición do filtro: $7 ($8)',
8392	8408	'abusefilter-log-detailedentry-global' => 'o filtro global $1',
8393	8409	'abusefilter-log-detailedentry-local' => 'o filtro $1',
8394	8410	'abusefilter-log-detailslink' => 'detalles',
—	—	@@ -8881,7 +8897,7 @@
8882	8898	'abusefilter-log-search-title' => 'Titel:',
8883	8899	'abusefilter-log-search-submit' => 'Sueche',
8884	8900	'abusefilter-log-entry' => '$1: $2 het e Missbrauchsfilter uusglest dur d Aawändig vu $3 uf $4. Aktion: $5; Filterbschryybig: $6',
8885		~~- 'abusefilter-log-detailedentry-meta' => '$1: $2 het dr $3 uusglest. Dees verursacht het e „$4“ uf $5. Ergriffeni Maßnahme: $6; Filterbschryybung: $7 ($8{{int:pipe-separator}}$9)',~~
	8901	+ 'abusefilter-log-detailedentry-meta' => '$1: $2 het dr $3 uusglest. Dees verursacht het e „$4“ uf $5. Ergriffeni Maßnahme: $6; Filterbschryybung: $7 ($8)',
8886	8902	'abusefilter-log-detailedentry-global' => 'Wältwyte Filter $1',
8887	8903	'abusefilter-log-detailedentry-local' => 'Filter $1',
8888	8904	'abusefilter-log-detailslink' => 'Detail',
—	—	@@ -9304,7 +9320,7 @@
9305	9321	תיאור המסנן: $6',
9306	9322	'abusefilter-log-detailedentry-meta' => '$1: $2 הפעיל את $3 כשביצע את הפעולה "$4" על $5.
9307	9323	הפעולות שננקטו: $6;
9308		~~-תיאור המסנן: $7 ($8{{int:pipe-separator}}$9)',~~
	9324	+תיאור המסנן: $7 ($8)',
9309	9325	'abusefilter-log-detailedentry-global' => 'המסנן הגלובלי $1',
9310	9326	'abusefilter-log-detailedentry-local' => 'המסנן $1',
9311	9327	'abusefilter-log-detailslink' => 'פרטים',
—	—	@@ -9699,7 +9715,7 @@
9700	9716	Opis filtra: $6',
9701	9717	'abusefilter-log-detailedentry-meta' => '$1: $2 pokrenuo je $3, vršeći radnju "$4" na $5.
9702	9718	Poduzete radnje: $6;
9703		~~-Opis filtra: $7 ($8{{int:pipe-separator}}$9)',~~
	9719	+Opis filtra: $7 ($8)',
9704	9720	'abusefilter-log-detailedentry-local' => 'filtar $1',
9705	9721	'abusefilter-log-detailslink' => 'detalji',
9706	9722	'abusefilter-log-details-legend' => 'Detalji zapisa $1',
—	—	@@ -9977,7 +9993,7 @@
9978	9994	Wopisanje filtra: $6',
9979	9995	'abusefilter-log-detailedentry-meta' => '$1: $2 pušći $3 přez wuwjedźenje akcije "$4" na $5.
9980	9996	Přewjedźene akcije: $6;
9981		~~-Wopisanje filtra:: $7 ($8{{int:pipe-separator}}$9)',~~
	9997	+Wopisanje filtra:: $7 ($8)',
9982	9998	'abusefilter-log-detailedentry-global' => 'globalny filter $1',
9983	9999	'abusefilter-log-detailedentry-local' => 'filter $1',
9984	10000	'abusefilter-log-detailslink' => 'podrobnosće',
—	—	@@ -10383,7 +10399,7 @@
10384	10400	A vandálszűrő leírása: $6',
10385	10401	'abusefilter-log-detailedentry-meta' => '$1: $2 „$4” műveletével beindította a(z) $3 a(z) $5 lapon.
10386	10402	Végrehajtott intézkedések: $6;
10387		~~-A vandálszűrő leírása: $7 ($8{{int:pipe-separator}}$9)',~~
	10403	+A vandálszűrő leírása: $7 ($8)',
10388	10404	'abusefilter-log-detailedentry-global' => '$1 azonosítójú globális szűrőt',
10389	10405	'abusefilter-log-detailedentry-local' => '$1 azonosítójú szűrőt',
10390	10406	'abusefilter-log-detailslink' => 'részletek',
—	—	@@ -10774,7 +10790,7 @@
10775	10791	Description del filtro: $6',
10776	10792	'abusefilter-log-detailedentry-meta' => '$1: $2 activava le $3, executante le action "$4" in $5.
10777	10793	Actiones interprendite: $6;
10778		~~-Description del filtro: $7 ($8{{int:pipe-separator}}$9)',~~
	10794	+Description del filtro: $7 ($8)',
10779	10795	'abusefilter-log-detailedentry-global' => 'filtro global $1',
10780	10796	'abusefilter-log-detailedentry-local' => 'filtro $1',
10781	10797	'abusefilter-log-detailslink' => 'detalios',
—	—	@@ -11172,7 +11188,7 @@
11173	11189	Keterangan filter: $6',
11174	11190	'abusefilter-log-detailedentry-meta' => '!$1: $2 memicu $3, karena melakukan "$4" pada $5.
11175	11191	Tindakan yang diambil: $6;
11176		~~-Keterangan filter: $7 ($8{{int:pipe-separator}}$9)',~~
	11192	+Keterangan filter: $7 ($8)',
11177	11193	'abusefilter-log-detailedentry-global' => 'filter global $1',
11178	11194	'abusefilter-log-detailedentry-local' => 'filter $1',
11179	11195	'abusefilter-log-detailslink' => 'rincian',
—	—	@@ -11620,7 +11636,7 @@
11621	11637	Descrizione del filtro: $6',
11622	11638	'abusefilter-log-detailedentry-meta' => '$1: $2 ha provocato l\'attivazione $3 con l\'azione "$4" su $5.
11623	11639	Azioni intraprese: $6;
11624		~~-Descrizione del filtro: $7 ($8{{int:pipe-separator}}$9)',~~
	11640	+Descrizione del filtro: $7 ($8)',
11625	11641	'abusefilter-log-detailedentry-global' => 'filtro globale $1',
11626	11642	'abusefilter-log-detailedentry-local' => 'del filtro $1',
11627	11643	'abusefilter-log-detailslink' => 'dettagli',
—	—	@@ -12001,7 +12017,7 @@
12002	12018	フィルター解説: $6',
12003	12019	'abusefilter-log-detailedentry-meta' => '$1: $2 が $5 で「$4」操作を行い$3 に引っかかりました。
12004	12020	対処アクション: $6;
12005		~~-フィルター解説: $7 ($8{{int:pipe-separator}}$9)',~~
	12021	+フィルター解説: $7 ($8)',
12006	12022	'abusefilter-log-detailedentry-global' => 'グローバルフィルター $1',
12007	12023	'abusefilter-log-detailedentry-local' => 'フィルター $1',
12008	12024	'abusefilter-log-detailslink' => '詳細',
—	—	@@ -12739,7 +12755,7 @@
12740	12756	필터 설명: $6',
12741	12757	'abusefilter-log-detailedentry-meta' => '$1: $2 사용자가 $5에서 "$4"하는 도중 $3을 위반하였습니다.
12742	12758	조치: $6;
12743		~~-필터 설명: $7 ($8{{int:pipe-separator}}$9)',~~
	12759	+필터 설명: $7 ($8)',
12744	12760	'abusefilter-log-detailedentry-global' => '공통 필터 $1',
12745	12761	'abusefilter-log-detailedentry-local' => '필터 $1',
12746	12762	'abusefilter-log-detailslink' => '자세한 정보',
—	—	@@ -13079,7 +13095,7 @@
13080	13096	dä Meßbruchsfelter op der Plan jeroofe, un dä däät dat: $5. De Rääjel explezeet: ''$6''.",
13081	13097	'abusefilter-log-detailedentry-meta' => '$1: {{GENDER:$2\|dä\|et\|dä Metmaacher\|dat\|de}} $2 hät met „$4“ op dä Sigg $5
13082	13098	däm $3 jetroffe,
13083		~~-un dä Felter hät: $6. De Rääjel explezeet: $7 ($8{{int:pipe-separator}}$9)',~~
	13099	+un dä Felter hät: $6. De Rääjel explezeet: $7 ($8)',
13084	13100	'abusefilter-log-detailedentry-global' => 'jemeinsame Felter $1 för diverse Wikis',
13085	13101	'abusefilter-log-detailedentry-local' => 'Meßbruchsfelter sing Rääjel $1',
13086	13102	'abusefilter-log-detailslink' => 'Einzelheite aanloore',
—	—	@@ -13531,7 +13547,7 @@
13532	13548	Beschreiwung vum Filter: $6',
13533	13549	'abusefilter-log-detailedentry-meta' => '$1: $2 huet e Mëssbrauchsfilter $3 ausgeléist, bäi der Aktioun $4 op $5.
13534	13550	Aktioun vum Filter: $6;
13535		~~-Beschreiwung vum Filter: $7 ($8{{int:pipe-separator}}$9)',~~
	13551	+Beschreiwung vum Filter: $7 ($8)',
13536	13552	'abusefilter-log-detailedentry-global' => 'globale Filter $1',
13537	13553	'abusefilter-log-detailedentry-local' => 'Filter $1',
13538	13554	'abusefilter-log-detailslink' => 'Detailer',
—	—	@@ -13917,7 +13933,7 @@
13918	13934	Filterbesjrieving: $6',
13919	13935	'abusefilter-log-detailedentry-meta' => '$1: $2 leet $3 aafgaon bie \'t oetveure van de hanjeling "$4" op $5.
13920	13936	Genaome maatregel: $6.
13921		~~-Filterbesjrieving: $7 ($8{{int:pipe-separator}}$9)',~~
	13937	+Filterbesjrieving: $7 ($8)',
13922	13938	'abusefilter-log-detailedentry-global' => 'globaal filter $1',
13923	13939	'abusefilter-log-detailedentry-local' => 'filter $1',
13924	13940	'abusefilter-log-detailslink' => 'kleinighijjer',
—	—	@@ -14217,7 +14233,7 @@
14218	14234	Filtro aprašymas: $6',
14219	14235	'abusefilter-log-detailedentry-meta' => '$1: $2 iššaukė piktnaudžiavimo filtrą $3, atlikdamas veiksmą "$4" puslapiui $5.
14220	14236	Buvo panaudotas veiksmas: $6;
14221		~~-Filtro aprašymas: $7 ($8{{int:pipe-separator}}$9)',~~
	14237	+Filtro aprašymas: $7 ($8)',
14222	14238	'abusefilter-log-detailedentry-global' => 'visuotinis filtras $1',
14223	14239	'abusefilter-log-detailedentry-local' => 'filtras $1',
14224	14240	'abusefilter-log-detailslink' => 'detalės',
—	—	@@ -14605,7 +14621,7 @@
14606	14622	Опис од филтерот: $6',
14607	14623	'abusefilter-log-detailedentry-meta' => '$1: $2 предизвика $3, извршувајќи го дејството „$4“ на $5.
14608	14624	Преземени мерки: $6;
14609		~~-Опис од филтерот: $7 ($8{{int:pipe-separator}}$9)',~~
	14625	+Опис од филтерот: $7 ($8)',
14610	14626	'abusefilter-log-detailedentry-global' => 'глобален филтер $1',
14611	14627	'abusefilter-log-detailedentry-local' => 'филтер $1',
14612	14628	'abusefilter-log-detailslink' => 'детали',
—	—	@@ -15001,7 +15017,7 @@
15002	15018	അരിപ്പയുടെ വിവരണം: $6',
15003	15019	'abusefilter-log-detailedentry-meta' => '$1: $2 $3 അരിപ്പയെ ഉണർത്തിയിരിക്കുന്നു, "$4" എന്ന പ്രവൃത്തി $5 താളിൽ ചെയ്യുന്നു.
15004	15020	എടുത്ത നടപടി: $6;
15005		~~-അരിപ്പയുടെ വിവരണം: $7 ($8{{int:pipe-separator}}$9)',~~
	15021	+അരിപ്പയുടെ വിവരണം: $7 ($8)',
15006	15022	'abusefilter-log-detailedentry-global' => '$1 ആഗോള അരിപ്പ',
15007	15023	'abusefilter-log-detailedentry-local' => '$1 അരിപ്പ',
15008	15024	'abusefilter-log-detailslink' => 'വിവരണങ്ങൾ',
—	—	@@ -15541,7 +15557,7 @@
15542	15558	Wat dat för’n Filter is: „$6“',
15543	15559	'abusefilter-log-detailedentry-meta' => '$1: $2 hett den $3 utlööst, as he de Akschoon „$4“ op „$5“ anwennt hett.
15544	15560	Filterakschoon: $6;
15545		~~-Wat dat för’n Filter is: $7 ($8{{int:pipe-separator}}$9)',~~
	15561	+Wat dat för’n Filter is: $7 ($8)',
15546	15562	'abusefilter-log-detailedentry-global' => 'globaal Filter $1',
15547	15563	'abusefilter-log-detailedentry-local' => 'Filter $1',
15548	15564	'abusefilter-log-detailslink' => 'Details',
—	—	@@ -15940,7 +15956,7 @@
15941	15957	Filterbeschrijving: $6',
15942	15958	'abusefilter-log-detailedentry-meta' => '$1: $2 liet $3 afgaan bij het uitvoeren van de handeling "$4" op $5.
15943	15959	Genomen maatregel: $6.
15944		~~-Filterbeschrijving: $7 ($8{{int:pipe-separator}}$9)',~~
	15960	+Filterbeschrijving: $7 ($8)',
15945	15961	'abusefilter-log-detailedentry-global' => 'globale filter $1',
15946	15962	'abusefilter-log-detailedentry-local' => 'filter $1',
15947	15963	'abusefilter-log-detailslink' => 'details',
—	—	@@ -16327,7 +16343,7 @@
16328	16344	'abusefilter-log-search-title' => 'Tittel:',
16329	16345	'abusefilter-log-search-submit' => 'Søk',
16330	16346	'abusefilter-log-entry' => '$1: $2 utløyste eit misbruksfilter ved å gjera handlinga «$3» på $4. Reaksjon: $5; Filterskildring: $6',
16331		~~- 'abusefilter-log-detailedentry-meta' => '$1: $2 utløyste $3 ved å utføra handlinga «$4» på $5. Reaksjon: $6; Filterskildring: $7 ($8{{int:pipe-separator}}$9)',~~
	16347	+ 'abusefilter-log-detailedentry-meta' => '$1: $2 utløyste $3 ved å utføra handlinga «$4» på $5. Reaksjon: $6; Filterskildring: $7 ($8)',
16332	16348	'abusefilter-log-detailedentry-global' => 'globalt filter $1',
16333	16349	'abusefilter-log-detailedentry-local' => 'misbruksfilter $1',
16334	16350	'abusefilter-log-detailslink' => 'detaljar',
—	—	@@ -16704,7 +16720,7 @@
16705	16721	filterbeskrivelse: $6',
16706	16722	'abusefilter-log-detailedentry-meta' => '$1: $2 utløste misbruksfilter $3, ved å gjøre en $4 på $5.
16707	16723	Reaksjon: $6;
16708		~~-Filterbeskrivelse: $7 ($8{{int:pipe-separator}}$9)',~~
	16724	+Filterbeskrivelse: $7 ($8)',
16709	16725	'abusefilter-log-detailedentry-global' => 'globalt filter $1',
16710	16726	'abusefilter-log-detailedentry-local' => 'filter $1',
16711	16727	'abusefilter-log-detailslink' => 'detaljer',
—	—	@@ -17102,7 +17118,7 @@
17103	17119	Descripcion del filtre : $6",
17104	17120	'abusefilter-log-detailedentry-meta' => "$1 : $2 a desenclavat lo $3, en executant l'accion « $4 » sur $5.
17105	17121	Accions presas : $6 ;
17106		~~-Descripcion del filtre : $7 ($8{{int:pipe-separator}}$9)",~~
	17122	+Descripcion del filtre : $7 ($8)",
17107	17123	'abusefilter-log-detailedentry-global' => 'filtre global $1',
17108	17124	'abusefilter-log-detailedentry-local' => 'filtre $1 dels abuses',
17109	17125	'abusefilter-log-detailslink' => 'detalhs',
—	—	@@ -17560,7 +17576,7 @@
17561	17577	Opis filtru: $6',
17562	17578	'abusefilter-log-detailedentry-meta' => '$1: $2 uruchomił $3, wykonał „$4” na $5.
17563	17579	Podjęta akcja: $6.
17564		~~-Opis filtru: $7 ($8{{int:pipe-separator}}$9)',~~
	17580	+Opis filtru: $7 ($8)',
17565	17581	'abusefilter-log-detailedentry-global' => 'filtr globalny $1',
17566	17582	'abusefilter-log-detailedentry-local' => 'filtr $1',
17567	17583	'abusefilter-log-detailslink' => 'szczegóły',
—	—	@@ -18001,7 +18017,7 @@
18002	18018	Descrição do filtro: $6',
18003	18019	'abusefilter-log-detailedentry-meta' => '$1: $2 despoletou o $3, executando a ação "$4" em $5.
18004	18020	Ações tomadas: $6;
18005		~~-Descrição do filtro: $7 ($8{{int:pipe-separator}}$9)',~~
	18021	+Descrição do filtro: $7 ($8)',
18006	18022	'abusefilter-log-detailedentry-global' => 'filtro global $1',
18007	18023	'abusefilter-log-detailedentry-local' => 'filtro $1',
18008	18024	'abusefilter-log-detailslink' => 'detalhes',
—	—	@@ -18570,7 +18586,7 @@
18571	18587	Descrierea filtrului: $6',
18572	18588	'abusefilter-log-detailedentry-meta' => '$1: $2 a desclanşat $3, executând acţiunea "$4" asupra $5.
18573	18589	Măsura luată: $6;
18574		~~-Descrierea filtrului: $7 ($8{{int:pipe-separator}}$9)',~~
	18590	+Descrierea filtrului: $7 ($8)',
18575	18591	'abusefilter-log-detailedentry-global' => 'filtru global $1',
18576	18592	'abusefilter-log-detailedentry-local' => 'filtrul $1',
18577	18593	'abusefilter-log-detailslink' => 'detalii',
—	—	@@ -18939,7 +18955,7 @@
18940	18956	Описание фильтра: $6',
18941	18957	'abusefilter-log-detailedentry-meta' => '$1: $2 вызвал срабатывание $3, действие «$4» на странице $5.
18942	18958	Предпринятые меры: $6.
18943		~~-Описание фильтра: $7 ($8{{int:pipe-separator}}$9)',~~
	18959	+Описание фильтра: $7 ($8)',
18944	18960	'abusefilter-log-detailedentry-global' => 'глобальный фильтр $1',
18945	18961	'abusefilter-log-detailedentry-local' => 'фильтра $1',
18946	18962	'abusefilter-log-detailslink' => 'подробности',
—	—	@@ -19331,7 +19347,7 @@
19332	19348	Сиидэ туһунан: $6',
19333	19349	'abusefilter-log-detailedentry-meta' => '$1: $2 кыттааччыттан сылтаан $3 үлэлээбит, «$4» дьайыыны $5 сирэйгэ оҥорбут.
19334	19350	Оҥоһуллубут дьайыылар: $6.
19335		~~-Сиидэ туһунан: $7 ($8{{int:pipe-separator}}$9)',~~
	19351	+Сиидэ туһунан: $7 ($8)',
19336	19352	'abusefilter-log-detailedentry-global' => 'аан (глобальнай) сиидэ $1',
19337	19353	'abusefilter-log-detailedentry-local' => '$1 сиидэ',
19338	19354	'abusefilter-log-detailslink' => 'сиһилии',
—	—	@@ -19719,7 +19735,7 @@
19720	19736	Popis filtra: $6',
19721	19737	'abusefilter-log-detailedentry-meta' => '$1: $2 spustil filter $3, vykonaná operácia „$4“ na $5.
19722	19738	Vykonané opatrenia: $6;
19723		~~-Popis filtra: $7 ($8{{int:pipe-separator}}$9)',~~
	19739	+Popis filtra: $7 ($8)',
19724	19740	'abusefilter-log-detailedentry-global' => 'globálny filter $1',
19725	19741	'abusefilter-log-detailedentry-local' => 'filter $1',
19726	19742	'abusefilter-log-detailslink' => 'podrobnosti',
—	—	@@ -20392,7 +20408,7 @@
20393	20409	'abusefilter-log-entry' => '$1: $2 löösde ne Misbruuks-Sieuwe uut, truch dät hie $3 ap $4 moakede. Aktion: $5; Sieuwe-Beschrieuwenge: $6',
20394	20410	'abusefilter-log-detailedentry-meta' => '$1: $2 häd ju $3 uutlöösd, wät n $4 ap $5 feruurseeked.
20395	20411	Ärgriepene Mäitenoamen: $6;
20396		~~-Sieuwebeschrieuwenge: $7 ($8{{int:pipe-separator}}$9)',~~
	20412	+Sieuwebeschrieuwenge: $7 ($8)',
20397	20413	'abusefilter-log-detailedentry-local' => 'Sieuwe $1',
20398	20414	'abusefilter-log-detailslink' => 'Eenpeldhaide',
20399	20415	'abusefilter-log-details-legend' => 'Eenpeldhaide foar dän Logbouk-Iendraach $1',
—	—	@@ -20635,7 +20651,7 @@
20636	20652	Filterbeskrivning: $6',
20637	20653	'abusefilter-log-detailedentry-meta' => '$1: $2 utlöste $3, genom att göra handlingen "$4" på $5.
20638	20654	Utförd handling: $6;
20639		~~-Filterbeskrivning: $7 ($8{{int:pipe-separator}}$9)',~~
	20655	+Filterbeskrivning: $7 ($8)',
20640	20656	'abusefilter-log-detailedentry-global' => 'globalt filter $1',
20641	20657	'abusefilter-log-detailedentry-local' => 'filter $1',
20642	20658	'abusefilter-log-detailslink' => 'detaljer',
—	—	@@ -21231,7 +21247,7 @@
21232	21248	Filtr düşündirişi: $6',
21233	21249	'abusefilter-log-detailedentry-meta' => '$1: $2 şuny işletdi:$3, $5 sahypasynda "$4" hereketi ýerine ýetirilýär.
21234	21250	Edilen hereketler: $6;
21235		~~-Filtr düşündirişi: $7 ($8{{int:pipe-separator}}$9)',~~
	21251	+Filtr düşündirişi: $7 ($8)',
21236	21252	'abusefilter-log-detailedentry-global' => 'global filtr $1',
21237	21253	'abusefilter-log-detailedentry-local' => 'filtr $1',
21238	21254	'abusefilter-log-detailslink' => 'jikme-jiklikler',
—	—	@@ -21549,7 +21565,7 @@
21550	21566	'abusefilter-log-entry' => '$1: nagpagalaw si $2 ng isang pansala ng pang-aabuso, na nagsagawa ng $3 sa $4.
21551	21567	Mga kilos na ginawa: $5;
21552	21568	Paglalarawan ng pansala: $6',
21553		~~- 'abusefilter-log-detailedentry-meta' => '$1: nagpagalaw si $2 ng $3, na nagsagawa ng kilos na $4 sa $5. Mga kilos na ginawa: $6; Paglalarawan ng pansala: $7 ($8{{int:pipe-separator}}$9)',~~
	21569	+ 'abusefilter-log-detailedentry-meta' => '$1: nagpagalaw si $2 ng $3, na nagsagawa ng kilos na $4 sa $5. Mga kilos na ginawa: $6; Paglalarawan ng pansala: $7 ($8)',
21554	21570	'abusefilter-log-detailedentry-global' => 'Pansalang pandaigdigang $1',
21555	21571	'abusefilter-log-detailedentry-local' => 'pansalang $1',
21556	21572	'abusefilter-log-detailslink' => 'mga detalye',
—	—	@@ -21926,7 +21942,7 @@
21927	21943	Filtre açıklaması: $6',
21928	21944	'abusefilter-log-detailedentry-meta' => '$1: $2, $3 tetikledi, $5 sayfasında "$4" eylemi yapılıyor.
21929	21945	Yapılan eylemler: $6;
21930		~~-Süzgeç açıklaması: $7 ($8{{int:pipe-separator}}$9)',~~
	21946	+Süzgeç açıklaması: $7 ($8)',
21931	21947	'abusefilter-log-detailedentry-global' => 'küresel süzgeç $1',
21932	21948	'abusefilter-log-detailedentry-local' => '$1 süzgecini',
21933	21949	'abusefilter-log-detailslink' => 'detaylar',
—	—	@@ -22326,7 +22342,7 @@
22327	22343	Опис фільтру: $6',
22328	22344	'abusefilter-log-detailedentry-meta' => '$1: $2 запустив $3, виконуючи "$4" на сторінці "$5".
22329	22345	Вжиті заходи: $6.
22330		~~-Опис фільтру: $7 ($8{{int:pipe-separator}}$9)',~~
	22346	+Опис фільтру: $7 ($8)',
22331	22347	'abusefilter-log-detailedentry-global' => 'глобальний фільтр $1',
22332	22348	'abusefilter-log-detailedentry-local' => 'фільтр $1',
22333	22349	'abusefilter-log-detailslink' => 'деталі',
—	—	@@ -23109,7 +23125,7 @@
23110	23126	'abusefilter-log-entry' => '$1: $2 đã kích hoạt bộ lọc lạm dụng, thực hiện tác động “$3” vào lúc $4. Tác vụ diễn ra: $5; Mô tả bộ lọc: $6',
23111	23127	'abusefilter-log-detailedentry-meta' => '$1: $2 đã kích hoạt $3, thực hiện tác vụ “$4” trên $5.
23112	23128	Tác vụ thực hiện: $6;
23113		~~-Mô tả bộ lọc: $7 ($8{{int:pipe-separator}}$9)',~~
	23129	+Mô tả bộ lọc: $7 ($8)',
23114	23130	'abusefilter-log-detailedentry-global' => 'bộ lọc toàn bộ $1',
23115	23131	'abusefilter-log-detailedentry-local' => 'bộ lọc $1',
23116	23132	'abusefilter-log-detailslink' => 'chi tiết',
—	—	@@ -23562,7 +23578,7 @@
23563	23579	過濾器描述: $6',
23564	23580	'abusefilter-log-detailedentry-meta' => '$1: $2觸發咗$3，響$5做咗『$4』動作。
23565	23581	做咗嘅嘢: $6;
23566		~~-過濾器描述: $7 ($8{{int:pipe-separator}}$9)',~~
	23582	+過濾器描述: $7 ($8)',
23567	23583	'abusefilter-log-detailedentry-global' => '全域過濾器$1',
23568	23584	'abusefilter-log-detailedentry-local' => '過濾器$1',
23569	23585	'abusefilter-log-detailslink' => '細節',
—	—	@@ -23956,7 +23972,7 @@
23957	23973	'abusefilter-log-search-title' => '标题：',
23958	23974	'abusefilter-log-search-submit' => '搜索',
23959	23975	'abusefilter-log-entry' => '$1：$2在$4上进行了“$3”的操作，触发了过滤器。采取的行动：$5；过滤器描述：$6',
23960		~~- 'abusefilter-log-detailedentry-meta' => '$1：$2在$5上进行了“$4”的操作，触发了$3。采取的行动：$6；过滤器描述：$7（$8{{int:pipe-separator}}$9）',~~
	23976	+ 'abusefilter-log-detailedentry-meta' => '$1：$2在$5上进行了“$4”的操作，触发了$3。采取的行动：$6；过滤器描述：$7（$8）',
23961	23977	'abusefilter-log-detailedentry-global' => '全域过滤器$1',
23962	23978	'abusefilter-log-detailedentry-local' => '过滤器$1',
23963	23979	'abusefilter-log-detailslink' => '详情',
—	—	@@ -24334,7 +24350,7 @@
24335	24351	過濾器描述：$6',
24336	24352	'abusefilter-log-detailedentry-meta' => '$2於$1觸發$3，於$5執行$4操作。
24337	24353	採取的行動：$6；
24338		~~-過濾器描述：$7（$8{{int:pipe-separator}}$9）',~~
	24354	+過濾器描述：$7（$8）',
24339	24355	'abusefilter-log-detailedentry-global' => '全域過濾器 $1',
24340	24356	'abusefilter-log-detailedentry-local' => '過濾器 $1',
24341	24357	'abusefilter-log-detailslink' => '詳情',
Index: branches/wmf/1.16wmf4/extensions/AbuseFilter/abusefilter.tables.sql
—	—	@@ -42,7 +42,7 @@
43	43	afl_namespace tinyint NOT NULL,
44	44	afl_title varchar(255) binary NOT NULL,
45	45	afl_wiki varchar(64) binary NULL,
46		~~- afl_deleted tinyint(1) NULL,~~
	46	+ afl_deleted tinyint(1) NOT NULL DEFAULT 0,
47	47	afl_patrolled_by int unsigned NULL,
48	48
49	49	PRIMARY KEY (afl_id),
Property changes on: branches/wmf/1.16wmf4/extensions/AbuseFilter
___________________________________________________________________
Modified: svn:mergeinfo
50	50	Merged /trunk/extensions/AbuseFilter:r68584,68590,68681,71331,71850

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r71332	Merge r68584, r68590, r68681, r71331: AbuseFilter log entry suppression, for ...	werdna	06:33, 20 August 2010
r71850	AbuseFilter log deletion: cause afl_deleted=NULL to be treated like afl_delet...	werdna	11:54, 28 August 2010

Status & tagging log

19:30, 21 November 2010 Reedy (talk | contribs) changed the status of r71851 [removed: new added: deferred]