r77174 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r77173‎ \| r77174 \| r77175 >
Date:	18:47, 23 November 2010
Author:	awjrichards
Status:	deferred
Tags:
Comment:	Merging from r77040 thru r77173 of trunk
Modified paths:	/branches/fundraising/deployment/DonationInterface (modified) (history) /branches/fundraising/deployment/DonationInterface/donate_interface/donate_interface.i18n.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/RapidHtml.php (added) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php (added) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css (added) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/html (added) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history) /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
—	—	@@ -107,12 +107,12 @@
108	108	require_once( 'includes/payflowUser.inc' );
109	109
110	110	$payflow_data = payflowUser();
111		-
	111	+
112	112	// make a log entry if the user has submitted the cc form
113	113	if ( $wgRequest->wasPosted() && $wgRequest->getText( 'process', 0 )) {
114	114	wfDebugLog( 'payflowpro_gateway', $payflow_data[ 'order_id' ] . " Transaction initiated." );
115	115	}
116		-
	116	+
117	117	// if _cache_ is requested by the user, do not set a session/token; dynamic data will be loaded via ajax
118	118	if ( $wgRequest->getText( '_cache_', false ) ) {
119	119	$cache = true;
—	—	@@ -158,6 +158,7 @@
159	159
160	160	// Check form for errors and redisplay with messages
161	161	$form_errors = $this->fnPayflowValidateForm( $data, $this->errors );
	162	+
162	163	if ( $form_errors ) {
163	164	$this->fnPayflowDisplayForm( $data, $this->errors );
164	165	} else { // The submitted form data is valid, so process it
—	—	@@ -256,7 +257,6 @@
257	258	}
258	259	}
259	260	}
260		-
261	261	$this->form_class = $class_name;
262	262	}
263	263
—	—	@@ -299,7 +299,7 @@
300	300
301	301	// find all empty fields and create message
302	302	foreach ( $data as $key => $value ) {
303		~~- if ( $value == '' \|\| $data['state'] == 'YY' ) {~~
	303	+ if ( $value == '' \|\| ($key == 'state' && $value == 'YY' )) {
304	304	// ignore fields that are not required
305	305	if ( isset( $msg[$key] ) ) {
306	306	$error[$key] = "" . wfMsg( 'payflowpro_gateway-error-msg', $msg[$key] ) . "<br />";
—	—	@@ -376,7 +376,6 @@
377	377
378	378
379	379	} // end switch
380		-
381	380	return $error_result;
382	381	}
383	382
—	—	@@ -471,9 +470,9 @@
472	471	if ( $headers['http_code'] != 200 ) {
473	472	$wgOut->addHTML( '<h3>No response from credit card processor. Please try again later!</h3><p>' );
474	473	$when = time();
475		~~- wfDebugLog( 'payflowpro_gateway', $data[ 'order_id' ] . ' No response from credit card processor ' . $when );~~
	474	+ wfDebugLog( 'payflowpro_gateway', $data[ 'order_id' ] . ' No response from credit card processor: ' . curl_error( $ch ));
476	475	curl_close( $ch );
477		~~- exit;~~
	476	+ return;
478	477	}
479	478
480	479	curl_close( $ch );
—	—	@@ -943,6 +942,9 @@
944	943	* @return int The id for the reference URL - 0 if not found
945	944	*/
946	945	function get_owa_ref_id( $ref ) {
	946	+ if ( !defined( 'OWA' ) ) {
	947	+ return 0;
	948	+ }
947	949	// Replication lag means sometimes a new event will not exist in the table yet
948	950	$dbw = payflowGatewayConnection();
949	951	$id_num = $dbw->selectField(
—	—	@@ -979,7 +981,7 @@
980	982	}
981	983
982	984	// if we're in testing mode and an action hasn't yet be specified, prepopulate the form
983		~~- if ( !$wgRequest->getText( 'action', false ) && !$numAttempt && $wgPayflowGatewayTest ) {~~
	985	+ if ( !$wgRequest->getText( 'action', false ) && !$wgRequest->getText( 'process', 0 ) && $wgPayflowGatewayTest ) {
984	986	// define arrays of cc's and cc #s for random selection
985	987	$cards = array( 'american' );
986	988	$card_nums = array(
—	—	@@ -1006,8 +1008,8 @@
1007	1009	'state' => 'CA',
1008	1010	'zip' => '94104',
1009	1011	'country' => 840,
	1012	+ 'card_num' => $card_nums[ $cards[ $card_index ]][ $card_num_index ],
1010	1013	'card' => $cards[ $card_index ],
1011		~~- 'card_num' => $card_nums[ $cards[ $card_index ]][ $card_num_index ],~~
1012	1014	'expiration' => date( 'my', strtotime( '+1 year 1 month' ) ),
1013	1015	'cvv' => '001',
1014	1016	'currency' => 'USD',
—	—	@@ -1019,8 +1021,8 @@
1020	1022	'utm_medium' => $wgRequest->getText( 'utm_medium' ),
1021	1023	'utm_campaign' => $wgRequest->getText( 'utm_campaign' ),
1022	1024	'language' => 'en',
	1025	+ 'comment-option' => $wgRequest->getText( 'comment-option' ),
1023	1026	'comment' => $wgRequest->getText( 'comment' ),
1024		~~- 'comment-option' => $wgRequest->getText( 'comment-option' ),~~
1025	1027	'email-opt' => $wgRequest->getText( 'email-opt' ),
1026	1028	'test_string' => $wgRequest->getText( 'process' ),
1027	1029	'token' => $token,
—	—	@@ -1043,9 +1045,9 @@
1044	1046	'city' => $wgRequest->getText( 'city' ),
1045	1047	'state' => $wgRequest->getText( 'state' ),
1046	1048	'zip' => $wgRequest->getText( 'zip' ),
1047		~~- 'country' => $wgRequest->getText( 'country' ),~~
	1049	+ 'country' => $wgRequest->getText( 'country', "840" ),
	1050	+ 'card_num' => str_replace( ' ', '', $wgRequest->getText( 'card_num' ) ),
1048	1051	'card' => $wgRequest->getText( 'card' ),
1049		~~- 'card_num' => str_replace( ' ', '', $wgRequest->getText( 'card_num' ) ),~~
1050	1052	'expiration' => $wgRequest->getText( 'mos' ) . substr( $wgRequest->getText( 'year' ), 2, 2 ),
1051	1053	'cvv' => $wgRequest->getText( 'cvv' ),
1052	1054	'currency' => $wgRequest->getText( 'currency_code' ),
—	—	@@ -1058,8 +1060,8 @@
1059	1061	'utm_campaign' => $wgRequest->getText( 'utm_campaign' ),
1060	1062	// try to honr the user-set language (uselang), otherwise the language set in the URL (language)
1061	1063	'language' => $wgRequest->getText( 'uselang', $wgRequest->getText( 'language' ) ),
	1064	+ 'comment-option' => $wgRequest->getText( 'comment-option' ),
1062	1065	'comment' => $wgRequest->getText( 'comment' ),
1063		~~- 'comment-option' => $wgRequest->getText( 'comment-option' ),~~
1064	1066	'email-opt' => $wgRequest->getText( 'email-opt' ),
1065	1067	'test_string' => $wgRequest->getText( 'process' ), // for showing payflow string during testing
1066	1068	'token' => $token,
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php
—	—	@@ -0,0 +1,446 @@
	2	+<?php
	3	+
	4	+class PayflowProGateway_Form_TwoColumnLetter7 extends PayflowProGateway_Form_OneStepTwoColumn {
	5	+
	6	+ public function __construct( &$form_data, &$form_errors ) {
	7	+ global $wgScriptPath;
	8	+
	9	+ // set the path to css, before the parent constructor is called, checking to make sure some child class hasn't already set this
	10	+ if ( !strlen( $this->getStylePath() ) ) {
	11	+ $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css' );
	12	+ }
	13	+
	14	+ parent::__construct( $form_data, $form_errors );
	15	+ }
	16	+
	17	+ public function loadPlaceholders() {
	18	+ global $wgOut;
	19	+ // form placeholder values
	20	+ $other = wfMsg( 'payflowpro_gateway-other' );
	21	+ $first = wfMsg( 'payflowpro_gateway-first' );
	22	+ $last = wfMsg( 'payflowpro_gateway-last' );
	23	+ $street = wfMsg( 'payflowpro_gateway-donor-street' );
	24	+ $city = wfMsg( 'payflowpro_gateway-donor-city' );
	25	+ $zip = wfMsg( 'payflowpro_gateway-zip-code' );
	26	+ $email = wfMsg( 'payflowpro_gateway-donor-email' );
	27	+ $js = <<<EOT
	28	+<script type="text/javascript">
	29	+function loadPlaceholders() {
	30	+ var otherRadio = document.getElementById('otherRadio');
	31	+ var amountOther = document.getElementById('amountOther');
	32	+ var fname = document.getElementById('fname');
	33	+ var lname = document.getElementById('lname');
	34	+ var street = document.getElementById('street');
	35	+ var city = document.getElementById('city');
	36	+ var zip = document.getElementById('zip');
	37	+ var email = document.getElementById('emailAdd');
	38	+ if (typeof otherRadio != "undefined" && amountOther.value == '') {
	39	+ amountOther.style.color = '#999999';
	40	+ amountOther.value = '$other';
	41	+ }
	42	+ if (fname.value == '') {
	43	+ fname.style.color = '#999999';
	44	+ fname.value = '$first';
	45	+ }
	46	+ if (lname.value == '') {
	47	+ lname.style.color = '#999999';
	48	+ lname.value = '$last';
	49	+ }
	50	+ if (street.value == '') {
	51	+ street.style.color = '#999999';
	52	+ street.value = '$street';
	53	+ }
	54	+ if (city.value == '') {
	55	+ city.style.color = '#999999';
	56	+ city.value = '$city';
	57	+ }
	58	+ if (zip.value == '') {
	59	+ zip.style.color = '#999999';
	60	+ zip.value = '$zip';
	61	+ }
	62	+ if (email.value == '') {
	63	+ email.style.color = '#999999';
	64	+ email.value = '$email';
	65	+ }
	66	+}
	67	+addEvent( window, 'load', loadPlaceholders );
	68	+
	69	+function formCheck( ccform ) {
	70	+ var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'State', 'Zip', 'CardNum', 'Cvv' ];
	71	+
	72	+ var fields = ["emailAdd","fname","lname","street","city","state","zip","card_num","cvv" ],
	73	+ numFields = fields.length,
	74	+ i,
	75	+ output = '',
	76	+ currField = '';
	77	+
	78	+ var doCheck = true;
	79	+ if( typeof( document.payment.PaypalRedirect.value ) !== 'undefined' ) {
	80	+ if( document.payment.PaypalRedirect.value == 1 ) {
	81	+ doCheck = false;
	82	+ }
	83	+ }
	84	+
	85	+ if( doCheck ) {
	86	+ for( i = 0; i < numFields; i++ ) {
	87	+ if( document.getElementById( fields[i] ).value == '' ) {
	88	+ currField = window['payflowproGatewayErrorMsg'+ msg[i]];
	89	+ output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\\r\\n';
	90	+ }
	91	+ }
	92	+
	93	+ if (document.getElementById('fname').value == '$first') {
	94	+ output += payflowproGatewayErrorMsgJs + ' first name.\\r\\n';
	95	+ }
	96	+ if (document.getElementById('lname').value == '$last') {
	97	+ output += payflowproGatewayErrorMsgJs + ' last name.\\r\\n';
	98	+ }
	99	+ if (document.getElementById('street').value == '$street') {
	100	+ output += payflowproGatewayErrorMsgJs + ' street address.\\r\\n';
	101	+ }
	102	+ if (document.getElementById('city').value == '$city') {
	103	+ output += payflowproGatewayErrorMsgJs + ' city.\\r\\n';
	104	+ }
	105	+ if (document.getElementById('zip').value == '$zip') {
	106	+ output += payflowproGatewayErrorMsgJs + ' zip code.\\r\\n';
	107	+ }
	108	+
	109	+ // validate email address
	110	+ var apos = document.payment.emailAdd.value.indexOf("@");
	111	+ var dotpos = document.payment.emailAdd.value.lastIndexOf(".");
	112	+
	113	+ if( apos < 1 \|\| dotpos-apos < 2 ) {
	114	+ output += payflowproGatewayErrorMsgEmail;
	115	+ }
	116	+ }
	117	+
	118	+ if( output ) {
	119	+ alert( output );
	120	+ return false;
	121	+ } else {
	122	+ return true;
	123	+ }
	124	+}
	125	+</script>
	126	+EOT;
	127	+ $wgOut->addHeadItem( 'placeholders', $js );
	128	+ }
	129	+
	130	+ public function generateFormStart() {
	131	+ global $wgOut, $wgRequest;
	132	+
	133	+ $form = parent::generateBannerHeader();
	134	+
	135	+ $form .= Xml::openElement( 'table', array( 'width' => '100%', 'cellspacing' => 0, 'cellpadding' => 0, 'border' => 0 ) );
	136	+ $form .= Xml::openElement( 'tr' );
	137	+ $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
	138	+
	139	+ $text_template = $wgRequest->getText( 'text_template', '2010/JimmyAppealLong' );
	140	+ // if the user has uselang set, honor that, otherwise default to the language set for the form defined by 'language' in the query string
	141	+ if ( $wgRequest->getText( 'language' ) ) $text_template .= '/' . $this->form_data[ 'language' ];
	142	+
	143	+ $template = ( strlen( $text_template ) ) ? $wgOut->parse( '{{' . $text_template . '}}' ) : '';
	144	+ // if the template doesn't exist, prevent the display of the red link
	145	+ if ( preg_match( '/redlink\=1/', $template ) ) $template = NULL;
	146	+ $form .= $template;
	147	+
	148	+ $form .= Xml::closeElement( 'td' );
	149	+
	150	+ $form .= Xml::openElement( 'td', array( 'id' => 'donate', 'valign' => 'top' ) );
	151	+
	152	+ // add noscript tags for javascript disabled browsers
	153	+ $form .= $this->getNoScript();
	154	+
	155	+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
	156	+
	157	+ // provide a place at the top of the form for displaying general messages
	158	+ if ( $this->form_errors['general'] ) {
	159	+ $form .= Xml::openElement( 'div', array( 'id' => 'mw-payflow-general-error' ) );
	160	+ if ( is_array( $this->form_errors['general'] ) ) {
	161	+ foreach ( $this->form_errors['general'] as $this->form_errors_msg ) {
	162	+ $form .= Xml::tags( 'p', array( 'class' => 'creditcard-error-msg' ), $this->form_errors_msg );
	163	+ }
	164	+ } else {
	165	+ $form .= Xml::tags( 'p', array( 'class' => 'creditcard-error-msg' ), $this->form_errors_msg );
	166	+ }
	167	+ $form .= Xml::closeElement( 'div' ); // close div#mw-payflow-general-error
	168	+ }
	169	+
	170	+ // Xml::element seems to convert html to htmlentities
	171	+ $form .= "<p class='creditcard-error-msg'>" . $this->form_errors['retryMsg'] . "</p>";
	172	+ $form .= Xml::openElement( 'form', array( 'name' => 'payment', 'method' => 'post', 'action' => $this->getNoCacheAction(), 'onsubmit' => 'return formCheck(this)', 'autocomplete' => 'off' ) );
	173	+
	174	+ $form .= $this->generateBillingContainer();
	175	+ return $form;
	176	+ }
	177	+
	178	+ public function generateFormEnd() {
	179	+ $form = '';
	180	+ $form .= $this->generateFormClose();
	181	+ return $form;
	182	+ }
	183	+
	184	+ protected function generateBillingContainer() {
	185	+ $form = '';
	186	+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) );
	187	+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
	188	+ $form .= $this->generateBillingFields();
	189	+ $form .= Xml::closeElement( 'table' ); // close table#payflow-table-donor
	190	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-personal-info
	191	+
	192	+ return $form;
	193	+ }
	194	+
	195	+ protected function generateBillingFields() {
	196	+ global $wgScriptPath, $wgPayflowGatewayPaypalURL, $wgRequest;
	197	+ $scriptPath = "$wgScriptPath/extensions/DonationInterface/payflowpro_gateway/includes";
	198	+
	199	+ $form = '';
	200	+
	201	+ /*
	202	+ $form .= '<tr>';
	203	+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
	204	+ $form .= '</tr>';
	205	+ */
	206	+
	207	+ // amount
	208	+ $otherChecked = false;
	209	+ $amount = -1;
	210	+ if ( $this->form_data['amount'] != 250 && $this->form_data['amount'] != 150 && $this->form_data['amount'] != 100 && $this->form_data['amount'] != 75 && $this->form_data['amount'] != 50 && $this->form_data['amount'] != 35 && $this->form_data['amount'] != 20 && $this->form_data['amountOther'] > 0 ) {
	211	+ $otherChecked = true;
	212	+ $amount = $this->form_data['amountOther'];
	213	+ }
	214	+ $form .= '<tr>';
	215	+ $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
	216	+ $form .= '</tr>';
	217	+ $form .= '<tr>';
	218	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
	219	+ $form .= '<td>' .
	220	+ '<table cellspacing="3" cellpadding="0" border="0" style="margin-bottom:0.5em;"><tr>' .
	221	+ '<td>'.Xml::radio( 'amount', 20, $this->form_data['amount'] == 20, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$20 '.'</td>'.
	222	+ '<td>'.Xml::radio( 'amount', 35, $this->form_data['amount'] == 35, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$35 '.'</td>'.
	223	+ '<td>'.Xml::radio( 'amount', 50, $this->form_data['amount'] == 50, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$50 '.'</td>'.
	224	+ '<td>'.Xml::radio( 'amount', 75, $this->form_data['amount'] == 75, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$75 '.'</td>'.
	225	+ '</tr><tr>' .
	226	+ '<td>'.Xml::radio( 'amount', 100, $this->form_data['amount'] == 100, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$100 '.'</td>'.
	227	+ '<td>'.Xml::radio( 'amount', 150, $this->form_data['amount'] == 150, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$150 '.'</td>'.
	228	+ '<td>'.Xml::radio( 'amount', 250, $this->form_data['amount'] == 250, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$250 '.'</td>'.
	229	+ '<td>'.Xml::radio( 'amount', $amount, $otherChecked, array( 'id' => 'otherRadio' ) ) . Xml::input( 'amountOther', '7', $this->form_data['amountOther'], array( 'type' => 'text', 'onfocus' => 'clearField(this, "Other");document.getElementById("otherRadio").checked=true;', 'maxlength' => '10', 'onblur' => 'document.getElementById("otherRadio").value = this.value;', 'id' => 'amountOther' ) ).Html::hidden( 'currency_code', 'USD' ).'</td>'.
	230	+ '</tr></table>' .
	231	+ '</td>';
	232	+ $form .= '</tr>';
	233	+
	234	+ // email opt-in
	235	+ /*
	236	+ $email_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'email-opt' ] : true;
	237	+ $form .= '<tr>';
	238	+ $form .= '<td class="label"> </td>';
	239	+ $form .= '<td class="check-option">' . Xml::check( 'email-opt', $email_opt_value );
	240	+ $form .= ' ';
	241	+ $form .= Xml::openElement( 'label', array( 'for' => 'email-opt' ) );
	242	+ $form .= wfMsg( 'donate_interface-email-agreement' );
	243	+ $form .= Xml::closeElement( 'label' );
	244	+ $form .= '</td>';
	245	+ $form .= '</tr>';
	246	+ */
	247	+
	248	+ $form .= '<tr>';
	249	+ $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
	250	+ $form .= '<td>' .
	251	+ Xml::radio( 'card', 'cc1', $this->form_data['card'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' .
	252	+ Xml::radio( 'card', 'cc2', $this->form_data['card'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' .
	253	+ Xml::radio( 'card', 'cc3', $this->form_data['card'] == 'cc3', array( 'id' => 'cc3radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc3radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' .
	254	+ Xml::radio( 'card', 'cc4', $this->form_data['card'] == 'cc4', array( 'id' => 'cc4radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc4radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' .
	255	+ Xml::radio( 'card', 'pp', $this->form_data['card'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) . '</label>' .
	256	+ '</td>';
	257	+ $form .= '</tr>';
	258	+
	259	+ $form .= '</table>';
	260	+
	261	+ if ( $this->form_data['card'] == 'cc1' \|\| $this->form_data['card'] == 'cc2' \|\| $this->form_data['card'] == 'cc3' \|\| $this->form_data['card'] == 'cc4' ) {
	262	+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc' ) );
	263	+ } else {
	264	+ $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc', 'style' => 'display: none;' ) );
	265	+ }
	266	+
	267	+ $form .= '<tr>';
	268	+ $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
	269	+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
	270	+ $form .= '</tr>';
	271	+
	272	+ // card number
	273	+ $form .= $this->getCardNumberField();
	274	+
	275	+ // expiry
	276	+ $form .= '<tr>';
	277	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>';
	278	+ $form .= '<td>' . $this->generateExpiryMonthDropdown() . ' / ' . $this->generateExpiryYearDropdown() . '</td>';
	279	+ $form .= '</tr>';
	280	+
	281	+ // cvv
	282	+ $form .= $this->getCvvField();
	283	+
	284	+ // name
	285	+ $form .= '<tr>';
	286	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['fname'] . '</span></td>';
	287	+ $form .= '</tr>';
	288	+ $form .= '<tr>';
	289	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>';
	290	+ $form .= '</tr>';
	291	+ $form .= '<tr>';
	292	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-name-on-card' ), 'fname' ) . '</td>';
	293	+ $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-first' ).'\' )', 'maxlength' => '25', 'class' => 'required', 'id' => 'fname' ) ) .
	294	+ Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-last' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
	295	+ $form .= "</tr>";
	296	+
	297	+ // street
	298	+ $form .= '<tr>';
	299	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['street'] . '</span></td>';
	300	+ $form .= '</tr>';
	301	+ $form .= '<tr>';
	302	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-billing-address' ), 'street' ) . '</td>';
	303	+ $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
	304	+ '</td>';
	305	+ $form .= '</tr>';
	306	+
	307	+ // city
	308	+ $form .= '<tr>';
	309	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['city'] . '</span></td>';
	310	+ $form .= '</tr>';
	311	+ $form .= '<tr>';
	312	+ $form .= '<td class="label"> </td>';
	313	+ $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
	314	+ $this->generateStateDropdown() . ' ' .
	315	+ Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
	316	+ Html::hidden( 'country', 840 ) .
	317	+ '</td>';
	318	+ $form .= '</tr>';
	319	+
	320	+ // country
	321	+ /*
	322	+ $form .= '<tr>';
	323	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['country'] . '</span></td>';
	324	+ $form .= '</tr>';
	325	+ $form .= '<tr>';
	326	+ $form .= '<td class="label"> </td>';
	327	+ $form .= '<td>' . $this->generateCountryDropdown() . '</td>';
	328	+ $form .= '</tr>';
	329	+ */
	330	+
	331	+ // email
	332	+ $form .= '<tr>';
	333	+ $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['emailAdd'] . '</span></td>';
	334	+ $form .= '</tr>';
	335	+ $form .= '<tr>';
	336	+ $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-email-receipt' ), 'emailAdd' ) . '</td>';
	337	+ $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
	338	+ '</td>';
	339	+ $form .= '</tr>';
	340	+
	341	+ /*
	342	+ $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
	343	+ $form .= '<tr>';
	344	+ $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
	345	+ $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
	346	+ $form .= '</tr>';
	347	+
	348	+ $form .= $this->getEmailOptField();
	349	+ */
	350	+
	351	+ return $form;
	352	+ }
	353	+
	354	+ public function generateFormSubmit() {
	355	+ global $wgScriptPath;
	356	+
	357	+ // cc submit button
	358	+ if ( $this->form_data['card'] == 'cc1' \|\| $this->form_data['card'] == 'cc2' \|\| $this->form_data['card'] == 'cc3' \|\| $this->form_data['card'] == 'cc4' ) {
	359	+ $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) );
	360	+ } else {
	361	+ $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) );
	362	+ }
	363	+ $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
	364	+ $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'image' ) );
	365	+ $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
	366	+ $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
	367	+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be securely processed.';
	368	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
	369	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
	370	+
	371	+ // paypal submit button
	372	+ if ( $this->form_data['card'] == 'cc1' \|\| $this->form_data['card'] == 'cc2' \|\| $this->form_data['card'] == 'cc3' \|\| $this->form_data['card'] == 'cc4' ) {
	373	+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal', 'style' => 'display: none;' ) );
	374	+ } else {
	375	+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) );
	376	+ }
	377	+ $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
	378	+ $form .= Html::hidden( 'PaypalRedirect', 0 );
	379	+ $form .= Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'image' ) );
	380	+ $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
	381	+ $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
	382	+ Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your donation will be securely processed.';
	383	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
	384	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-submit-paypal
	385	+ return $form;
	386	+ }
	387	+
	388	+ /**
	389	+ * Generate form closing elements
	390	+ */
	391	+ public function generateFormClose() {
	392	+ $form = '';
	393	+ // add hidden fields
	394	+ $hidden_fields = $this->getHiddenFields();
	395	+ foreach ( $hidden_fields as $field => $value ) {
	396	+ $form .= Html::hidden( $field, $value );
	397	+ }
	398	+
	399	+ $form .= Xml::closeElement( 'form' ); // close form 'payment'
	400	+ $form .= $this->generateDonationFooter();
	401	+ $form .= Xml::closeElement( 'td' );
	402	+ $form .= Xml::closeElement( 'tr' );
	403	+ $form .= Xml::closeElement( 'table' );
	404	+ return $form;
	405	+ }
	406	+
	407	+ public function generateDonationFooter() {
	408	+ global $wgScriptPath;
	409	+ $form = '';
	410	+ $form .= Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
	411	+ $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
	412	+ $form .= Xml::tags( 'div', array( 'style' => 'text-align:center;' ), '* * *' );
	413	+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
	414	+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-alt' ) );
	415	+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
	416	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
	417	+ $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
	418	+ return $form;
	419	+ }
	420	+
	421	+ public function generateStateDropdown() {
	422	+ require_once( dirname( __FILE__ ) . '/../includes/stateAbbreviations.inc' );
	423	+
	424	+ $states = statesMenuXML();
	425	+
	426	+ $state_opts = Xml::option( '', '' );
	427	+
	428	+ // generate dropdown of state opts
	429	+ foreach ( $states as $value => $state_name ) {
	430	+ if ( $value !== 'YY' && $value !== 'XX' ) {
	431	+ $selected = ( $this->form_data[ 'state' ] == $value ) ? true : false;
	432	+ $state_opts .= Xml::option( $value, $value, $selected );
	433	+ }
	434	+ }
	435	+
	436	+ $state_menu = Xml::openElement(
	437	+ 'select',
	438	+ array(
	439	+ 'name' => 'state',
	440	+ 'id' => 'state'
	441	+ ) );
	442	+ $state_menu .= $state_opts;
	443	+ $state_menu .= Xml::closeElement( 'select' );
	444	+
	445	+ return $state_menu;
	446	+ }
	447	+}
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css
—	—	@@ -0,0 +1,155 @@
	2	+table#donation_amount {
	3	+ background-color:transparent;
	4	+ border:1px solid #AAAAAA;
	5	+ border-collapse:collapse;
	6	+ width: 394px;
	7	+}
	8	+table#donation_amount td.amount_header {
	9	+ background-color:#eef2f7;
	10	+ font-size:90%;
	11	+}
	12	+table#donation_amount td.amount_data {
	13	+ background-color:#daf2db;
	14	+}
	15	+h3.cc_header {
	16	+ padding-bottom: 0;
	17	+ font-weight: normal;
	18	+}
	19	+div#payflowpro_gateway-donate-addl-info-text {
	20	+ font-size: 90%;
	21	+ line-height: 140%;
	22	+}
	23	+div#payflowpro_gateway-donate-submessage {
	24	+ font-size: 90%;
	25	+ line-height: 120%;
	26	+}
	27	+#payflow-table-donor td.label, #payflow-table-comment td.label, #payflow-table-cc td.label {
	28	+ padding-right:1em;
	29	+ text-align:right;
	30	+ width:94px;
	31	+}
	32	+input#city {
	33	+ width: 166px;
	34	+}
	35	+input#zip {
	36	+ width: 65px;
	37	+}
	38	+
	39	+.payflow-cc-form-section {
	40	+ float: none;
	41	+ margin-right: 0em;
	42	+ margin-bottom: 1em;
	43	+}
	44	+
	45	+#payflowpro_gateway-cc_form_container {
	46	+ width: 100%;
	47	+}
	48	+
	49	+#payflowpro_gateway-cc_form_form {
	50	+ width: 475px;
	51	+ float: right;
	52	+ margin-left: 2em;
	53	+ padding-left: 2em;
	54	+ border-left: 1px solid #BBBBBB;
	55	+}
	56	+
	57	+#payflowpro_gateway-cc_form_letter {
	58	+ height: 100%;
	59	+}
	60	+
	61	+#payflowpro_gateway-cc_form_letter p {
	62	+ font-size: 1.125em;
	63	+ margin-bottom: 1.2em;
	64	+}
	65	+
	66	+#payflowpro_gateway-personal-info {
	67	+ margin-right:0 !important;
	68	+}
	69	+
	70	+#payflowpro_gateway-donate-addl-info-secure-logos {
	71	+ float: left;
	72	+ margin-right: 2em;
	73	+}
	74	+
	75	+#payflowpro_gateway-cc_form_letter_inside {
	76	+ padding-top: .5em;
	77	+}
	78	+
	79	+#payflowpro_gateway-cc_otherways {
	80	+ padding-top: .5em;
	81	+ display: block;
	82	+}
	83	+#payflowpro_gateway-donate-addl-info {
	84	+ margin-top:2em !important;
	85	+ margin-bottom:1em !important;
	86	+}
	87	+
	88	+#appeal {
	89	+ background-color:transparent;
	90	+ border-color:transparent;
	91	+ border-style:solid;
	92	+ border-width:1px 0 1px 1px;
	93	+ padding:16px 24px 24px;
	94	+}
	95	+#appeal-head {
	96	+ font-size:1.5em;
	97	+ line-height:1.125em;
	98	+ padding-bottom:0.5em;
	99	+ padding-top:0.125em;
	100	+}
	101	+#appeal-body {
	102	+ font-size:1.125em;
	103	+ margin-bottom:1em;
	104	+ padding:0.2em 0;
	105	+}
	106	+#donate {
	107	+ background-color:#cce7cd;
	108	+ border:1px solid #5EAC58;
	109	+ padding:16px 24px 24px;
	110	+ width:450px;
	111	+}
	112	+#donate-head {
	113	+ border:none;
	114	+ font-size:1.5em;
	115	+ line-height:1.125em;
	116	+ padding-bottom:0em;
	117	+ padding-top:0.125em;
	118	+}
	119	+#donate-body {
	120	+ font-size:1.125em;
	121	+ margin-bottom:1em;
	122	+}
	123	+input#fname {
	124	+ width:133px !important;
	125	+}
	126	+input#lname {
	127	+ width:155px !important;
	128	+}
	129	+input.fullwidth {
	130	+ width:300px !important;
	131	+}
	132	+
	133	+/* Move the form up */
	134	+#mw-head-base {
	135	+ height: 1em !important;
	136	+}
	137	+
	138	+/* Hiding content border */
	139	+table {
	140	+ background-color: transparent;
	141	+}
	142	+div#content {
	143	+ background-color: transparent !important;
	144	+ background-image: none !important;
	145	+}
	146	+div#mw-head-base {
	147	+ background-image: none !important;
	148	+}
	149	+#footer {
	150	+ background-image: none !important;
	151	+}
	152	+
	153	+/* Hiding stuff we don't need */
	154	+h1#firstHeading, div#contentSub {
	155	+ display: none;
	156	+}
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/html/demo.html
—	—	@@ -0,0 +1,161 @@
	2	+<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td id="appeal" valign="top"><h2 id="appeal-head"> <span class="mw-headline" id="An_appeal_from_Wikipedia_founder_Jimmy_Wales">An appeal from Wikipedia founder Jimmy Wales</span></h2>
	3	+<div class="plainlinks" id="appeal-body">I got a lot of funny looks ten years ago when I started talking to people about Wikipedia.
	4	+<p>Let’s just say some people were skeptical of the notion that volunteers from all across the world could come together to create a remarkable pool of human knowledge – all for the simple purpose of sharing.</p>
	5	+<p>No ads. No agenda. No strings attached.</p>
	6	+<p>A decade after its founding, nearly 400 million people use Wikipedia and its sister sites every month - almost a third of the Internet-connected world.</p>
	7	+<p>It is the 5th most popular website in the world but Wikipedia isn’t anything like a commercial website. It is a community creation, written by volunteers making one entry at a time. You are part of our community. And I’m writing today to ask you to protect and sustain Wikipedia.</p>
	8	+<p>Together, we can keep it free of charge and free of advertising. We can keep it open – you can use the information in Wikipedia any way you want. We can keep it growing – spreading knowledge everywhere, and inviting participation from everyone.</p>
	9	+
	10	+<p>Each year at this time, we reach out to ask you and others all across the Wikimedia community to help sustain our joint enterprise with a modest donation of $20, $35, $50 or more.</p>
	11	+<p>If you value Wikipedia as a source of information – and a source of inspiration – I hope you’ll choose to act right now.</p>
	12	+<p>All the best,</p>
	13	+<p><b>Jimmy Wales</b></p>
	14	+<p>Founder, Wikipedia</p>
	15	+<p>P.S. Wikipedia is about the power of people like us to do extraordinary things. People like us write Wikipedia, one word at a time. People like us fund it, one donation at a time. It's proof of our collective potential to change the world.</p>
	16	+<p><br />
	17	+</p>
	18	+</div>
	19	+</td><td id="donate" valign="top">
	20	+<noscript><div id="noscript"><p id="noscript-msg">It appears that you do not have JavaScript enabled, or your browser does not support it.
	21	+In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p></div></noscript>
	22	+
	23	+<h2 id="donate-head">Make your donation now</h2>
	24	+<p class='creditcard-error-msg'>#general</p>
	25	+<form name="payment" method="post" action="/index.php/Special:PayflowProGateway?form_name=RapidHtml&ffname=demo" autocomplete="off">
	26	+ <div id="payflowpro_gateway-personal-info"><table id="payflow-table-donor">
	27	+ <tr>
	28	+ <td colspan=2><span class="creditcard-error-msg">#fname</span></td>
	29	+ </tr>
	30	+ <tr>
	31	+ <td colspan=2><span class="creditcard-error-msg">#lname</span></td>
	32	+ </tr>
	33	+ <tr>
	34	+ <td class="label"><label for="fname">Name</label></td>
	35	+ <td>
	36	+ <input name="fname" size="30" value="@fname" type="text" onfocus="clearField( this, 'First' )" maxlength="25" class="required" id="fname" />
	37	+ <input name="lname" size="30" value="@lname" type="text" onfocus="clearField( this, 'Last' )" maxlength="25" id="lname" />
	38	+ </td>
	39	+ </tr>
	40	+ <tr>
	41	+ <td colspan=2><span class="creditcard-error-msg">#emailAdd</span></td>
	42	+ </tr>
	43	+ <tr>
	44	+ <td class="label"><label for="emailAdd">Email address</label></td>
	45	+ <td><input name="emailAdd" size="30" value="@emailAdd" type="text" maxlength="64" id="emailAdd" class="fullwidth" /></td>
	46	+ </tr>
	47	+ <tr>
	48	+ <td colspan="2"><span class="creditcard-error-msg">#amount</span></td>
	49	+ </tr>
	50	+ <tr>
	51	+ <td class="label"><label for="amount">Amount</label></td>
	52	+ <td>
	53	+ <input name="amount" size="7" value="@amount" type="text" maxlength="10" id="amount" />
	54	+ <select name="currency_code" id="input_currency_code">
	55	+ <option value="USD">USD: U.S. Dollar</option><option value="GBP">GBP: British Pound</option><option value="EUR">EUR: Euro</option><option value="AUD">AUD: Australian Dollar</option><option value="CAD">CAD: Canadian Dollar</option><option value="JPY">JPY: Japanese Yen</option>
	56	+ </select>
	57	+ </td>
	58	+ </tr>
	59	+ <tr>
	60	+ <td />
	61	+ <td><img src="/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" /></td>
	62	+ </tr>
	63	+ <tr>
	64	+ <td class="label"><label for="card_num">Card number</label></td>
	65	+ <td><input name="card_num" size="30" value="@card_num" type="text" maxlength="100" id="card_num" class="fullwidth" autocomplete="off" /></td>
	66	+ </tr>
	67	+ <tr>
	68	+ <td colspan=2><span class="creditcard-error-msg">#cvv</span></td>
	69	+ <tr>
	70	+ <td class="label"><label for="cvv">Security code</label></td>
	71	+ <td><input name="cvv" size="5" value="@cvv" type="text" maxlength="10" id="cvv" autocomplete="off" /> <a href="javascript:PopupCVV();">Where is this?</a></td>
	72	+ </tr>
	73	+ <tr>
	74	+ <td class="label"><label for="expiration">Expiration date</label></td>
	75	+ <td>
	76	+ <select name="mos" id="expiration">
	77	+ <option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option>
	78	+ </select>
	79	+ <select name="year" id="year">
	80	+ <option value="2010">2010</option><option value="2011">2011</option><option value="2012">2012</option><option value="2013">2013</option><option value="2014">2014</option><option value="2015">2015</option><option value="2016">2016</option><option value="2017">2017</option><option value="2018">2018</option><option value="2019">2019</option><option value="2020">2020</option>
	81	+ </select>
	82	+ </td>
	83	+ </tr>
	84	+ <tr>
	85	+ <td colspan=2><span class="creditcard-error-msg">#street</span></td>
	86	+ </tr>
	87	+ <tr>
	88	+ <td class="label"><label for="street">Street</label></td>
	89	+ <td><input name="street" size="30" value="@street" type="text" maxlength="100" id="street" class="fullwidth" /></td>
	90	+ </tr>
	91	+ <tr>
	92	+ <td colspan=2><span class="creditcard-error-msg">#city</span></td>
	93	+ </tr>
	94	+ <tr>
	95	+ <td class="label"><label for="city">City</label></td>
	96	+ <td><input name="city" size="30" value="@city" type="text" maxlength="40" id="city" class="fullwidth" /></td>
	97	+ </tr>
	98	+ <tr>
	99	+ <td colspan=2><span class="creditcard-error-msg">#state</span></td>
	100	+ </tr>
	101	+ <tr>
	102	+ <td class="label"><label for="state">State</label></td>
	103	+ <td>
	104	+ <select name="state" id="state">
	105	+ <option value="YY">Select a State</option><option value="XX">Outside the U.S.</option><option value="AK">Alaska</option><option value="AL">Alabama</option><option value="AR">Arkansas</option><option value="AZ">Arizona</option><option value="CA">California</option><option value="CO">Colorado</option><option value="CT">Connecticut</option><option value="DC">Washington D.C.</option><option value="DE">Delaware</option><option value="FL">Florida</option><option value="GA">Georgia</option><option value="HI">Hawaii</option><option value="IA">Iowa</option><option value="ID">Idaho</option><option value="IL">Illinois</option><option value="IN">Indiana</option><option value="KS">Kansas</option><option value="KY">Kentucky</option><option value="LA">Louisiana</option><option value="MA">Massachusetts</option><option value="MD">Maryland</option><option value="ME">Maine</option><option value="MI">Michigan</option><option value="MN">Minnesota</option><option value="MO">Missouri</option><option value="MS">Mississippi</option><option value="MT">Montana</option><option value="NC">North Carolina</option><option value="ND">North Dakota</option><option value="NE">Nebraska</option><option value="NH">New Hampshire</option><option value="NJ">New Jersey</option><option value="NM">New Mexico</option><option value="NV">Nevada</option><option value="NY">New York</option><option value="OH">Ohio</option><option value="OK">Oklahoma</option><option value="OR">Oregon</option><option value="PA">Pennsylvania</option><option value="PR">Puerto Rico</option><option value="RI">Rhode Island</option><option value="SC">South Carolina</option><option value="SD">South Dakota</option><option value="TN">Tennessee</option><option value="TX">Texas</option><option value="UT">Utah</option><option value="VA">Virginia</option><option value="VT">Vermont</option><option value="WA">Washington</option><option value="WI">Wisconsin</option><option value="WV">West Virginia</option><option value="WY">Wyoming</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
	106	+ </select>
	107	+ </td>
	108	+ </tr>
	109	+ <tr>
	110	+ <td colspan=2><span class="creditcard-error-msg">#zip</span></td>
	111	+ </tr>
	112	+ <tr>
	113	+ <td class="label"><label for="zip">Postal code</label></td>
	114	+ <td><input name="zip" size="30" value="@zip" type="text" maxlength="9" id="zip" class="fullwidth" /></td>
	115	+ </tr>
	116	+ <tr>
	117	+ <td colspan=2><span class="creditcard-error-msg">#country</span></td>
	118	+ </tr>
	119	+ <tr>
	120	+ <td class="label"><label for="country">Country/Region</label></td>
	121	+ <td>
	122	+ <select name="country" id="country" onchange="return disableStates( this )">
	123	+ <option value="004">Afghanistan</option><option value="008">Albania</option><option value="012">Algeria</option><option value="016">American Samoa</option><option value="020">Andorra</option><option value="024">Angola</option><option value="660">Anguilla</option><option value="010">Antarctica</option><option value="028">Antigua and Barbuda</option><option value="032">Argentina</option><option value="051">Armenia</option><option value="533">Aruba</option><option value="036">Australia</option><option value="040">Austria</option><option value="031">Azerbaijan</option><option value="044">Bahamas</option><option value="048">Bahrain</option><option value="050">Bangladesh</option><option value="052">Barbados</option><option value="112">Belarus</option><option value="056">Belgium</option><option value="084">Belize</option><option value="204">Benin</option><option value="060">Bermuda</option><option value="064">Bhutan</option><option value="068">Bolivia, Plurinational State of</option><option value="070">Bosnia and Herzegovina</option><option value="072">Botswana</option><option value="074">Bouvet Island</option><option value="076">Brazil</option><option value="086">British Indian Ocean Territory</option><option value="096">Brunei Darussalam</option><option value="100">Bulgaria</option><option value="854">Burkina Faso</option><option value="108">Burundi</option><option value="116">Cambodia</option><option value="120">Cameroon</option><option value="124">Canada</option><option value="132">Cape Verde</option><option value="136">Cayman Islands</option><option value="140">Central African Republic</option><option value="148">Chad</option><option value="152">Chile</option><option value="156">China</option><option value="162">Christmas Island</option><option value="166">Cocos (Keeling) Islands</option><option value="017">Colombia</option><option value="174">Comoros</option><option value="178">Congo</option><option value="180">Congo, the Democratic Republic of the</option><option value="184">Cook Islands</option><option value="188">Costa Rica</option><option value="384">Cote D'Ivoire</option><option value="191">Croatia</option><option value="192">Cuba</option><option value="196">Cyprus</option><option value="203">Czech Republic</option><option value="208">Denmark</option><option value="262">Djibouti</option><option value="212">Dominica</option><option value="214">Dominican Republic</option><option value="626">East Timor</option><option value="218">Ecuador</option><option value="818">Egypt</option><option value="222">El Salvador</option><option value="226">Equatorial Guinea</option><option value="232">Eritrea</option><option value="233">Estonia</option><option value="231">Ethiopia</option><option value="238">Falkland Islands (Malvinas)</option><option value="234">Faroe Islands</option><option value="242">Fiji</option><option value="246">Finland</option><option value="250">France</option><option value="254">French Guiana</option><option value="258">French Polynesia</option><option value="260">French Southern Territories</option><option value="266">Gabon</option><option value="270">Gambia</option><option value="268">Georgia</option><option value="276">Germany</option><option value="288">Ghana</option><option value="292">Gibraltar</option><option value="300">Greece</option><option value="304">Greenland</option><option value="308">Grenada</option><option value="312">Guadeloupe</option><option value="316">Guam</option><option value="320">Guatemala</option><option value="324">Guinea</option><option value="624">Guinea-Bissau</option><option value="328">Guyana</option><option value="332">Haiti</option><option value="334">Heard Island and McDonald Islands</option><option value="340">Honduras</option><option value="344">Hong Kong</option><option value="348">Hungary</option><option value="352">Iceland</option><option value="356">India</option><option value="360">Indonesia</option><option value="364">Iran, Islamic Republic of</option><option value="368">Iraq</option><option value="372">Ireland</option><option value="376">Israel</option><option value="380">Italy</option><option value="388">Jamaica</option><option value="392">Japan</option><option value="400">Jordan</option><option value="398">Kazakhstan</option><option value="404">Kenya</option><option value="296">Kiribati</option><option value="408">Korea, Democratic People's Republic of</option><option value="410">Korea, Republic of</option><option value="414">Kuwait</option><option value="417">Kyrgyzstan</option><option value="418">Laos</option><option value="428">Latvia</option><option value="422">Lebanon</option><option value="426">Lesotho</option><option value="430">Liberia</option><option value="434">Libyan Arab Jamahiriya</option><option value="438">Liechtenstein</option><option value="440">Lithuania</option><option value="442">Luxembourg</option><option value="446">Macao</option><option value="807">Macedonia</option><option value="450">Madagascar</option><option value="454">Malawi</option><option value="458">Malaysia</option><option value="462">Maldives</option><option value="466">Mali</option><option value="470">Malta</option><option value="584">Marshall Islands</option><option value="474">Martinique</option><option value="478">Mauritania</option><option value="480">Mauritius</option><option value="175">Mayotte</option><option value="484">Mexico</option><option value="583">Micronesia, Federated States of</option><option value="498">Moldova, Republic of</option><option value="492">Monaco</option><option value="496">Mongolia</option><option value="499">Montenegro</option><option value="500">Montserrat</option><option value="504">Morocco</option><option value="508">Mozambique</option><option value="104">Myanmar</option><option value="516">Namibia</option><option value="520">Nauru</option><option value="524">Nepal</option><option value="528">Netherlands</option><option value="530">Netherlands Antilles</option><option value="540">New Caledonia</option><option value="554">New Zealand</option><option value="558">Nicaragua</option><option value="562">Niger</option><option value="566">Nigeria</option><option value="570">Niue</option><option value="574">Norfolk Island</option><option value="580">Northern Mariana Islands</option><option value="578">Norway</option><option value="512">Oman</option><option value="586">Pakistan</option><option value="585">Palau</option><option value="591">Panama</option><option value="598">Papua New Guinea</option><option value="600">Paraguay</option><option value="604">Peru</option><option value="608">Philippines</option><option value="612">Pitcairn</option><option value="616">Poland</option><option value="620">Portugal</option><option value="630">Puerto Rico</option><option value="634">Qatar</option><option value="642">Romania</option><option value="643">Russian Federation</option><option value="646">Rwanda</option><option value="654">Saint Helena</option><option value="659">Saint Kitts and Nevis</option><option value="662">Saint Lucia</option><option value="666">Saint Pierre and Miquelon</option><option value="670">Saint Vincent and the Grenadines</option><option value="674">San Marino</option><option value="678">Sao Tome and Principe</option><option value="682">Saudi Arabia</option><option value="686">Senegal</option><option value="688">Serbia</option><option value="690">Seychelles</option><option value="694">Sierra Leone</option><option value="702">Singapore</option><option value="703">Slovakia</option><option value="705">Slovenia</option><option value="090">Solomon Islands</option><option value="706">Somalia</option><option value="710">South Africa</option><option value="724">Spain</option><option value="144">Sri Lanka</option><option value="736">Sudan</option><option value="740">Suriname</option><option value="744">Svalbard and Jan Mayen</option><option value="748">Swaziland</option><option value="752">Sweden</option><option value="756">Switzerland</option><option value="760">Syrian Arab Republic</option><option value="158">Taiwan</option><option value="762">Tajikistan</option><option value="834">Tanzania, United Republic of</option><option value="764">Thailand</option><option value="768">Togo</option><option value="772">Tokelau</option><option value="776">Tonga</option><option value="780">Trinidad and Tobago</option><option value="788">Tunisia</option><option value="792">Turkey</option><option value="795">Turkmenistan</option><option value="796">Turks and Caicos Islands</option><option value="798">Tuvalu</option><option value="800">Uganda</option><option value="804">Ukraine</option><option value="784">United Arab Emirates</option><option value="826">United Kingdom</option><option value="840">United States</option><option value="581">United States Minor Outlying Islands</option><option value="858">Uruguay</option><option value="860">Uzbekistan</option><option value="548">Vanuatu</option><option value="336">Vatican City State</option><option value="862">Venezuela, Bolivarian Republic of</option><option value="704">Viet Nam</option><option value="092">Virgin Islands, British</option><option value="850">Virgin Islands, U.S.</option><option value="876">Wallis and Futuna</option><option value="732">Western Sahara</option><option value="882">Western Samoa</option><option value="887">Yemen</option><option value="894">Zambia</option><option value="716">Zimbabwe</option>
	124	+ </select>
	125	+ </td>
	126	+ </tr>
	127	+ </table>
	128	+ </div>
	129	+ <!-- captcha -->
	130	+ @captcha
	131	+ <!-- end captcha -->
	132	+ <div id="payflowpro_gateway-form-submit">
	133	+ <div id="mw-donate-submit-button">
	134	+ <input class="button-plain" value="Donate by Credit Card" type="submit" />
	135	+ </div>
	136	+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
	137	+ Your credit card will be securely processed.
	138	+ </div>
	139	+ </div>
	140	+ <input type="hidden" value="@utm_source" name="utm_source" />
	141	+ <input type="hidden" value="@utm_medium" name="utm_medium" />
	142	+ <input type="hidden" value="@utm_campaign" name="utm_campaign" />
	143	+ <input type="hidden" value="@language" name="language" />
	144	+ <input type="hidden" value="@referrer" name="referrer" />
	145	+ <input type="hidden" value="@comment" name="comment" />
	146	+ <input type="hidden" value="@comment-option" name="comment-option" />
	147	+ <input type="hidden" value="@email-opt" name="email-opt" />
	148	+ <input type="hidden" value="CreditCard" name="process" />
	149	+ <input type="hidden" value="processed" name="payment_method" />
	150	+ <input type="hidden" value="@token" name="token" />
	151	+ <input type="hidden" value="@orderid" name="orderid" />
	152	+ <input type="hidden" value="@numAttempt" name="numAttempt" />
	153	+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id" />
	154	+ <input type="hidden" value="@data_hash" name="data_hash" />
	155	+ <input type="hidden" value="@action" name="action" />
	156	+ <input type="hidden" value="@owa_session" name="owa_session" />
	157	+ <input type="hidden" value="@owa_ref" name="owa_ref" />
	158	+</form>
	159	+<div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info"><div id="payflowpro_gateway-donate-addl-info-secure-logos"><p class=""><img src="/extensions/DonationInterface/payflowpro_gateway/includes/rapidssl_ssl_certificate-nonanimated.png"></p></div><div id="payflowpro_gateway-donate-addl-info-text"><p class=""><a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a></p><p class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privacy policy</a>.</p><p class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a></p></div></div></td></tr></table><div class="printfooter">
	160	+
	161	+Retrieved from "<a href="https://payments.wikimedia.org/index.php/Special:PayflowProGateway">https://payments.wikimedia.org/index.php/Special:PayflowProGateway</a>"</div>
	162	+
\ No newline at end of file
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/RapidHtml.php
—	—	@@ -0,0 +1,227 @@
	2	+<?php
	3	+
	4	+class PayflowProGateway_Form_RapidHtml extends PayflowProGateway_Form {
	5	+
	6	+ /**
	7	+ * Full path of HTML form to load
	8	+ * @var string
	9	+ */
	10	+ protected $html_file_path = '';
	11	+
	12	+ /**
	13	+ * Tokens used in HTML form for data replacement
	14	+ *
	15	+ * Note that these NEED to be in the same order as the variables in $data in
	16	+ * order for str_replace to work as expected
	17	+ * @var array
	18	+ */
	19	+ protected $data_tokens = array(
	20	+ '@amount', // => $amount,
	21	+ '@amountOther', // => $wgRequest->getText( 'amountOther' ),
	22	+ '@emailAdd', //'email' => $wgRequest->getText( 'emailAdd' ),
	23	+ '@fname', // => $wgRequest->getText( 'fname' ),
	24	+ '@mname', // => $wgRequest->getText( 'mname' ),
	25	+ '@lname', // => $wgRequest->getText( 'lname' ),
	26	+ '@street', // => $wgRequest->getText( 'street' ),
	27	+ '@city', // => $wgRequest->getText( 'city' ),
	28	+ '@state', // => $wgRequest->getText( 'state' ),
	29	+ '@zip', // => $wgRequest->getText( 'zip' ),
	30	+ '@country', // => $wgRequest->getText( 'country' ),
	31	+ '@card_num', // => str_replace( ' ', '', $wgRequest->getText( 'card_num' ) ),
	32	+ '@card', // => $wgRequest->getText( 'card' ),
	33	+ '@expiration', // => $wgRequest->getText( 'mos' ) . substr( $wgRequest->getText( 'year' ), 2, 2 ),
	34	+ '@cvv', // => $wgRequest->getText( 'cvv' ),
	35	+ '@currency_code', //'currency' => $wgRequest->getText( 'currency_code' ),
	36	+ '@payment_method', // => $wgRequest->getText( 'payment_method' ),
	37	+ '@orderid', // => $order_id,
	38	+ '@numAttempt', // => $numAttempt,
	39	+ '@referrer', // => ( $wgRequest->getVal( 'referrer' ) ) ? $wgRequest->getVal( 'referrer' ) : $wgRequest->getHeader( 'referer' ),
	40	+ '@utm_source', // => self::getUtmSource(),
	41	+ '@utm_medium', // => $wgRequest->getText( 'utm_medium' ),
	42	+ '@utm_campaign', // => $wgRequest->getText( 'utm_campaign' ),
	43	+ // try to honr the user-set language (uselang), otherwise the language set in the URL (language)
	44	+ '@language', // => $wgRequest->getText( 'uselang', $wgRequest->getText( 'language' ) ),
	45	+ '@comment-option', // => $wgRequest->getText( 'comment-option' ),
	46	+ '@comment', // => $wgRequest->getText( 'comment' ),
	47	+ '@email-opt', // => $wgRequest->getText( 'email-opt' ),
	48	+ '@test_string', // => $wgRequest->getText( 'process' ), // for showing payflow string during testing
	49	+ '@token', // => $token,
	50	+ '@contribution_tracking_id', // => $wgRequest->getText( 'contribution_tracking_id' ),
	51	+ '@data_hash', // => $wgRequest->getText( 'data_hash' ),
	52	+ '@action', // => $wgRequest->getText( 'action' ),
	53	+ '@gateway', // => 'payflowpro', // this may need to become dynamic in the future
	54	+ '@owa_session', // => $wgRequest->getText( 'owa_session', null ),
	55	+ '@owa_ref', // => $owa_ref,
	56	+ );
	57	+
	58	+ /**
	59	+ * Error field names used as tokens
	60	+ * @var array
	61	+ * @FIXME
	62	+ * THERE IS A PROBLEM WITH 'general' - this is an array in the gateway body!!!
	63	+ */
	64	+ protected $error_tokens = array(
	65	+ '#general',
	66	+ '#retryMsg',
	67	+ '#amount',
	68	+ '#card_num',
	69	+ '#card',
	70	+ '#cvv',
	71	+ '#fname',
	72	+ '#lname',
	73	+ '#city',
	74	+ '#country',
	75	+ '#street',
	76	+ '#state',
	77	+ '#zip',
	78	+ '#emailAdd',
	79	+ );
	80	+
	81	+ public function __construct( &$form_data, &$form_errors ) {
	82	+ global $wgRequest;
	83	+
	84	+ parent::__construct( $form_data, $form_errors );
	85	+
	86	+ $this->loadValidateJs();
	87	+
	88	+ $this->set_html_file_path( $wgRequest->getText( 'ffname', 'default' ) );
	89	+
	90	+ // fix general form error messages so it's not an array of msgs
	91	+ if ( count( $form_errors[ 'general' ] )) {
	92	+ $general_errors = "";
	93	+ foreach ( $form_errors[ 'general' ] as $general_error ) {
	94	+ $general_errors .= "<p class='creditcard'>$general_error</p>";
	95	+ }
	96	+ $form_errors[ 'general' ] = $general_errors;
	97	+ }
	98	+ }
	99	+
	100	+ /**
	101	+ * Return the HTML form with data added
	102	+ */
	103	+ public function getForm() {
	104	+ $html = $this->load_html();
	105	+ return $this->add_data( $html );
	106	+ }
	107	+
	108	+ /**
	109	+ * Load the HTML form from a file into a string
	110	+ * @return string
	111	+ */
	112	+ public function load_html() {
	113	+ return file_get_contents( $this->html_file_path );
	114	+ }
	115	+
	116	+ /**
	117	+ * Add data into the HTML form
	118	+ *
	119	+ * @param string $html Form with tokens as placehodlers for data
	120	+ * @return string The HTML form with real data in it
	121	+ */
	122	+ public function add_data( $html ) {
	123	+ // replace data
	124	+ $form = str_replace( $this->data_tokens, $this->form_data, $html );
	125	+
	126	+ // replace errors
	127	+ $form = str_replace( $this->error_tokens, $this->form_errors, $form );
	128	+
	129	+ // handle captcha
	130	+ $form = str_replace( "@captcha", $this->getCaptchaHtml(), $form );
	131	+
	132	+ $form = $this->fix_dropdowns( $form );
	133	+
	134	+ return $form;
	135	+ }
	136	+
	137	+ /**
	138	+ * Set dropdowns to 'selected' where appropriate
	139	+ *
	140	+ * This is basically a hackish fix to make sure that dropdowns stay
	141	+ * 'sticky' on form submit. This could no doubt be better.
	142	+ * @param $html
	143	+ * @return string
	144	+ */
	145	+ public function fix_dropdowns( $html ) {
	146	+ // currency code
	147	+ $start = strpos( $html, 'name="currency_code"' );
	148	+ if ( $start ) {
	149	+ $currency_code = $this->form_data[ 'currency' ];
	150	+ $end = strpos( $html, '</select>', $start );
	151	+ $str = substr( $html, $start, ( $end - $start ));
	152	+ $str = str_replace( 'value="' . $currency_code . '"', 'value="' . $currency_code . '" selected="selected"', $str );
	153	+ $html = substr_replace( $html, $str, $start, $end-$start );
	154	+ }
	155	+
	156	+ // mos
	157	+ $month = substr( $this->form_data[ 'expiration' ], 0, 2 );
	158	+ $start = strpos( $html, 'name="mos"' );
	159	+ if ( $start ) {
	160	+ $end = strpos( $html, '</select>', $start );
	161	+ $str = substr( $html, $start, ( $end - $start ));
	162	+ $str = str_replace( 'value="' . $month . '"', 'value="' . $month . '" selected="selected"', $str );
	163	+ $html = substr_replace( $html, $str, $start, $end-$start );
	164	+ }
	165	+
	166	+ // year
	167	+ $year = substr( $this->form_data[ 'expiration' ], 2, 2 );
	168	+ $start = strpos( $html, 'name="year"' );
	169	+ if ( $start ) {
	170	+ $end = strpos( $html, '</select>', $start );
	171	+ $str = substr( $html, $start, ( $end - $start ));
	172	+ // dbl extra huge hack alert! note the '20' prefix...
	173	+ $str = str_replace( 'value="20' . $year . '"', 'value="20' . $year . '" selected="selected"', $str );
	174	+ $html = substr_replace( $html, $str, $start, $end-$start );
	175	+ }
	176	+
	177	+ // state
	178	+ $state = $this->form_data[ 'state' ];
	179	+ $start = strpos( $html, 'name="state"' );
	180	+ if ( $start ) {
	181	+ $end = strpos( $html, '</select>', $start );
	182	+ $str = substr( $html, $start, ( $end - $start ));
	183	+ $str = str_replace( 'value="' . $state . '"', 'value="' . $state . '" selected="selected"', $str );
	184	+ $html = substr_replace( $html, $str, $start, $end-$start );
	185	+ }
	186	+
	187	+ //country
	188	+ $country = $this->form_data[ 'country' ];
	189	+ $start = strpos( $html, 'name="country"' );
	190	+ if ( $start ) {
	191	+ $end = strpos( $html, '</select>', $start );
	192	+ $str = substr( $html, $start, ( $end - $start ));
	193	+ $str = str_replace( 'value="' . $country . '"', 'value="' . $country . '" selected="selected"', $str );
	194	+ $html = substr_replace( $html, $str, $start, $end-$start );
	195	+ }
	196	+
	197	+ return $html;
	198	+ }
	199	+
	200	+ /**
	201	+ * Validate and set the path to the HTML file
	202	+ *
	203	+ * @param string $file_name
	204	+ */
	205	+ public function set_html_file_path( $file_name ) {
	206	+ global $wgPayflowHtmlFormDir;
	207	+
	208	+ // Get the dirname - the "/." helps ensure we get a consistent path name with no trailing slash
	209	+ $html_dir = dirname( $wgPayflowHtmlFormDir . "/." );
	210	+
	211	+ if ( !is_dir( $html_dir )) {
	212	+ // throw some error
	213	+ }
	214	+
	215	+ // make sure our file name is clean - strip extension and any other cruft like relpaths, dirs, etc
	216	+ $file_info = pathinfo( $file_name );
	217	+ $file_name = $file_info[ 'filename' ];
	218	+
	219	+ $full_path = $html_dir . '/' . $file_name . '.html';
	220	+
	221	+ if ( !file_exists( $full_path )) {
	222	+ // throw some error or use default or both?
	223	+ }
	224	+
	225	+ $this->html_file_path = $full_path;
	226	+ }
	227	+
	228	+}
\ No newline at end of file
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
—	—	@@ -1391,6 +1391,7 @@
1392	1392	'payflowpro_gateway-question-comment' => 'Goulennoù pe soñjoù ? Darempred : <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
1393	1393	'payflowpro_gateway-donate-click' => 'Ho kartenn-gred a vo implijet en un doare suraet.',
1394	1394	'payflowpro_gateway-otherways' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Doareoù all zo da reiñ, evel gant PayPal, dre chekenn pe dre lizher</a>.',
	1395	+ 'payflowpro_gateway-otherways-alt' => 'Bez\' ez eus <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">doareoù all da reiñ</a>, evel dre chekenn, da skouer.',
1395	1396	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Doareoù all da reiñ</a>',
1396	1397	'payflowpro_gateway-paypal' => 'Hag ur gont PayPal ho peus? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Reiñ dre PayPal</a>.',
1397	1398	'payflowpro_gateway-credit-storage-processing' => 'Ne viromp ket roadennoù ho kartenn-gred ha gwarezet eo an titouroù personel a resevomp dre hor <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">politikerezh prevezded</a>.',
—	—	@@ -1487,8 +1488,10 @@
1488	1489	'payflowpro_gateway-payment' => 'Paeamant',
1489	1490	'payflowpro_gateway-payment-type' => 'Seurt paeamant',
1490	1491	'payflowpro_gateway-month' => '$1 ($2)',
	1492	+ 'payflowpro_gateway-please-complete' => 'Kasit da benn vat ho donezon a-is...',
1491	1493	'payflowpro_gateway-description' => 'Deskrivadur',
1492	1494	'payflowpro_gateway-donation' => 'Donezon',
	1495	+ 'payflowpro_gateway-email-receipt' => 'Kas an notenn degemer dre bostel da',
1493	1496	'payflowpro_gateway-state-dropdown-YY' => 'Dibab ur Stad',
1494	1497	'payflowpro_gateway-state-dropdown-XX' => 'Er-maez SUA',
1495	1498	);
—	—	@@ -1691,7 +1694,7 @@
1692	1695	* @author Solde
1693	1696	*/
1694	1697	$messages['ca'] = array(
1695		~~- 'payflowprogateway' => 'Doneu suport a Wikimedia',~~
	1698	+ 'payflowprogateway' => 'Feu ara un donatiu',
1696	1699	'payflowpro_gateway-desc' => 'Processament de targetes de crèdit amb PayPal Payflow Pro',
1697	1700	'payflowpro_gateway-accessible' => 'Aquesta pàgina només és accessible des de la pàgina de donatius.',
1698	1701	'payflowpro_gateway-form-message' => 'Utilitzeu el següent formulari per donar amb targeta de crèdit, o',
—	—	@@ -1773,6 +1776,7 @@
1774	1777	'payflowpro_gateway-question-comment' => 'Preguntes o comentaris? Contacte: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
1775	1778	'payflowpro_gateway-donate-click' => 'La vostra targeta de crèdit serà processada de manera segura.',
1776	1779	'payflowpro_gateway-otherways' => 'Hi ha <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/ca">altres maneres de fer donatius, incloent PayPal, xecs, o per correu</a>.',
	1780	+ 'payflowpro_gateway-otherways-alt' => 'Hi ha <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/ca">altres maneres de donar</a>, incloent per xec.',
1777	1781	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/ca">Altres maneres de donar</a>',
1778	1782	'payflowpro_gateway-paypal' => 'Teniu un compte PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=ca&utm_source=$3&utm_medium=$4&utm_campaign=$5">Feu un donatiu amb PayPal</a>.',
1779	1783	'payflowpro_gateway-credit-storage-processing' => 'Nosaltres no emmagatzemem la informació de la targeta de crèdit, i les vostres dades personals estan subjectes a la nostra <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">política de privadesa</a>.',
—	—	@@ -1868,6 +1872,10 @@
1869	1873	'payflowpro_gateway-cancel' => 'Canceŀla',
1870	1874	'payflowpro_gateway-payment' => 'Pagament',
1871	1875	'payflowpro_gateway-payment-type' => 'Tipus de pagament',
	1876	+ 'payflowpro_gateway-please-complete' => 'Si us plau, completeu el donatiu a sota...',
	1877	+ 'payflowpro_gateway-description' => 'Descripció',
	1878	+ 'payflowpro_gateway-donation' => 'Donatiu',
	1879	+ 'payflowpro_gateway-email-receipt' => 'Adreça electrònica per al rebut',
1872	1880	'payflowpro_gateway-state-dropdown-YY' => 'Seleccioneu un estat',
1873	1881	'payflowpro_gateway-state-dropdown-XX' => 'No sóc als EUA',
1874	1882	);
—	—	@@ -2167,6 +2175,7 @@
2168	2176	'payflowpro_gateway-question-comment' => 'Oes cwestiynau neu sylwadau gennych? Cysylltwch â Sefydliad Wikimedia: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
2169	2177	'payflowpro_gateway-donate-click' => 'Bydd eich cerdyn credyd yn cael ei brosesu yn ddiogel.',
2170	2178	'payflowpro_gateway-otherways' => 'Mae <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/cy">ffyrdd eraill o roi i gael, megis PayPal, siec, neu drwy\'r post</a>.',
	2179	+ 'payflowpro_gateway-otherways-alt' => 'Mae <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">ffyrdd eraill o roi i gael</a>, megis â siec.',
2171	2180	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/cy">Moddau eraill o roi</a>',
2172	2181	'payflowpro_gateway-paypal' => 'Oes cyfrif Paypal gennych? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Rhoi â PayPal</a>.',
2173	2182	'payflowpro_gateway-credit-storage-processing' => 'Nid ydym yn cadw manylion eich cerdyn credyd, ac mae\'ch data personol yn cael ei drin yn ôl gofynion ein <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">polisi preifatrwydd</a>.',
—	—	@@ -2263,6 +2272,8 @@
2264	2273	'payflowpro_gateway-payment' => 'Talu',
2265	2274	'payflowpro_gateway-payment-type' => 'Math y taliad',
2266	2275	'payflowpro_gateway-month' => '$1 ($2)',
	2276	+ 'payflowpro_gateway-description' => 'Disgrifiad',
	2277	+ 'payflowpro_gateway-email-receipt' => 'Anfon derbynneb at y cyfeiriad e-bost',
2267	2278	'payflowpro_gateway-state-dropdown-YY' => 'Dewiswch Dalaith',
2268	2279	'payflowpro_gateway-state-dropdown-XX' => "Y tu allan i'r Unol Daleithiau",
2269	2280	);
—	—	@@ -3051,6 +3062,7 @@
3052	3063	'payflowpro_gateway-donate-click' => 'La información de tu tarjeta de crédito se procesará de manera segura.',
3053	3064	'payflowpro_gateway-otherways' => 'Hay <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">otra maneras de dar, como PayPal, cheques o por correo electrónico</a>.',
3054	3065	'payflowpro_gateway-otherways-alt' => 'Existen <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">otras maneras de donar</a>, incluído el cheque.',
	3066	+ 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Otras maneras de donar</a>',
3055	3067	'payflowpro_gateway-paypal' => '¿tienes una cuenta Paypal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Dona con PayPal</a>.',
3056	3068	'payflowpro_gateway-credit-storage-processing' => 'Nosotros no guardamos tu información de tarjeta de crédito, y tus datos personales están sujetos a nuestra <a href="http://wikimediafoundation.org/wiki/Política_de_privacidad_para_donantes">política de privacidad</a>.',
3057	3069	'payflowpro_gateway-token-mismatch' => 'Tu sesión ha expirado. Intente llenar y enviar el formulario otra vez.',
—	—	@@ -3070,13 +3082,28 @@
3071	3083	'payflowpro_gateway-or' => 'o',
3072	3084	'payflowpro_gateway-your-information' => 'Su información',
3073	3085	'payflowpro_gateway-title' => 'Título',
	3086	+ 'payflowpro_gateway-company-name' => 'Nombre de la compañía o de la organización',
	3087	+ 'payflowpro_gateway-address-1' => 'Dirección 1',
	3088	+ 'payflowpro_gateway-address-2' => 'Dirección 2',
3074	3089	'payflowpro_gateway-country' => 'País',
	3090	+ 'payflowpro_gateway-select-country' => 'Seleccione el país',
3075	3091	'payflowpro_gateway-confirm-email' => 'Confirmar e-mail',
3076	3092	'payflowpro_gateway-confirmation-email' => 'E-mail de confirmación',
3077	3093	'payflowpro_gateway-phone' => 'Teléfono',
3078	3094	'payflowpro_gateway-telephone' => 'Teléfono',
3079	3095	'payflowpro_gateway-telephone-home' => 'Tel. (domicilio)',
3080	3096	'payflowpro_gateway-donation-information' => 'Información de la donación',
	3097	+ 'payflowpro_gateway-pay-by-credit-card' => 'Pagar con tarjeta de crédito',
	3098	+ 'payflowpro_gateway-which-card' => '¿Qué tarjeta desea usar?',
	3099	+ 'payflowpro_gateway-choose-donation-method' => 'Seleccionar el método de donación',
	3100	+ 'payflowpro_gateway-cardholders-name' => 'Nombre del titular de la tarjeta',
	3101	+ 'payflowpro_gateway-type-of-card' => 'Tipo de tarjeta',
	3102	+ 'payflowpro_gateway-cards-accepted' => 'Tarjetas aceptadas',
	3103	+ 'payflowpro_gateway-card-type' => 'Tipo de tarjeta',
	3104	+ 'payflowpro_gateway-credit-card-type' => 'Tipo de tarjeta de crédito',
	3105	+ 'payflowpro_gateway-credit-card-number' => 'Número de la tarjeta de crédito',
	3106	+ 'payflowpro_gateway-credit-card-number-abbreviated' => 'Tarjeta de crédito número #',
	3107	+ 'payflowpro_gateway-credit-card-expiration' => 'Fecha de caducidad de la tarjeta de crédito',
3081	3108	'payflowpro_gateway-expires' => 'Expira',
3082	3109	'payflowpro_gateway-what-is-this' => '¿Qué es esto?',
3083	3110	'payflowpro_gateway-donate-now' => 'Dona ahora',
—	—	@@ -3186,8 +3213,9 @@
3187	3214	* @author An13sa
3188	3215	*/
3189	3216	$messages['eu'] = array(
3190		~~- 'payflowprogateway' => 'Wikimedia lagundu',~~
	3217	+ 'payflowprogateway' => 'Egin orain zure dohaintza',
3191	3218	'payflowpro_gateway-accessible' => 'Orrialde honetara dohaintzak orrialdetik bakarrik iritsi daiteke.',
	3219	+ 'payflowpro_gateway-form-message' => 'Bete ondorengo orria kreditu-txartelarekin dohaintza egiteko, edo',
3192	3220	'payflowpro_gateway-paypal-button' => 'Dohaintza egin PayPalen bidez',
3193	3221	'payflowpro_gateway-cc-button' => 'Dohaintza egin kreditu txartel bidez',
3194	3222	'payflowpro_gateway-donor-legend' => 'Emailaren informazioa',
—	—	@@ -3217,6 +3245,7 @@
3218	3246	'payflowpro_gateway-error-msg-invalid-amount' => 'Mesedez idatzi baliozko kopurua',
3219	3247	'payflowpro_gateway-error-msg-email' => 'Mesedez idatzi baliozko e-posta helbidea',
3220	3248	'payflowpro_gateway-error-msg-amex' => 'Mesedez idatzi baliozko American Express txartel zenbakia.',
	3249	+ 'payflowpro_gateway-error-msg-mc' => '*Mesedez idatzi baliozko MasterCard txartel zenbakia.',
3221	3250	'payflowpro_gateway-error-msg-visa' => '*Mesedez idatzi baliozko Visa txartel zenbakia.',
3222	3251	'payflowpro_gateway-error-msg-discover' => 'Mesedez idatzi baliozko Discover txartel zenbakia.',
3223	3252	'payflowpro_gateway-error-msg-amount' => 'dohaintza kopurua',
—	—	@@ -3233,10 +3262,54 @@
3234	3263	'payflowpro_gateway-response-4' => 'Kopuru okerra.',
3235	3264	'payflowpro_gateway-thankyou' => 'Mileser zure dohaintzagatik!',
3236	3265	'payflowpro_gateway-submit-button' => 'Dohaintza egin',
	3266	+ 'payflowpro_gateway-question-comment' => 'Galdera edo iruzkinik? Jarri harremanetan: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
	3267	+ 'payflowpro_gateway-state-in-us' => 'AEBen barruan',
3237	3268	'payflowpro_gateway-comment' => 'Iruzkina',
3238	3269	'payflowpro_gateway-first' => 'Lehena',
3239	3270	'payflowpro_gateway-last' => 'Azkena',
3240	3271	'payflowpro_gateway-other' => 'Bestelakoa',
	3272	+ 'payflowpro_gateway-or' => 'edo',
	3273	+ 'payflowpro_gateway-your-information' => 'Zure informazioa',
	3274	+ 'payflowpro_gateway-title' => 'Izenburua',
	3275	+ 'payflowpro_gateway-suffix' => 'Atzizkia',
	3276	+ 'payflowpro_gateway-address-1' => 'Helbidea 1',
	3277	+ 'payflowpro_gateway-address-2' => 'Helbidea 2',
	3278	+ 'payflowpro_gateway-street-address' => 'Kalearen helbidea',
	3279	+ 'payflowpro_gateway-street-1' => 'Kalea 1',
	3280	+ 'payflowpro_gateway-street-2' => 'Kalea 2',
	3281	+ 'payflowpro_gateway-apartment-number' => 'Apt. #',
	3282	+ 'payflowpro_gateway-city-town' => 'Hiria/Herria',
	3283	+ 'payflowpro_gateway-town-city' => 'Herria/Hiria',
	3284	+ 'payflowpro_gateway-state-province' => 'Estatua/Probintzia',
	3285	+ 'payflowpro_gateway-zip' => 'Zip',
	3286	+ 'payflowpro_gateway-zip-code' => 'Zip kodea',
	3287	+ 'payflowpro_gateway-zip-postal' => 'Zip/Posta',
	3288	+ 'payflowpro_gateway-zip-postal-code' => 'Zip/Posta kodea',
	3289	+ 'payflowpro_gateway-country' => 'Herrialdea',
	3290	+ 'payflowpro_gateway-select-country' => 'Herrialdea aukeratu',
	3291	+ 'payflowpro_gateway-confirm-email' => 'E-posta baieztatu',
	3292	+ 'payflowpro_gateway-phone' => 'Telefonoa',
	3293	+ 'payflowpro_gateway-telephone' => 'Telefonoa',
	3294	+ 'payflowpro_gateway-telephone-home' => 'Tel. (etxekoa)',
	3295	+ 'payflowpro_gateway-pay-by-credit-card' => 'Ordainketa kreditu-txartelarekin',
	3296	+ 'payflowpro_gateway-which-card' => 'Zein txartel erabili nahi duzu',
	3297	+ 'payflowpro_gateway-type-of-card' => 'Txartel mota',
	3298	+ 'payflowpro_gateway-cards-accepted' => 'Onartutako txartelak',
	3299	+ 'payflowpro_gateway-credit-card-number' => 'Kreditu-txartel zenbakia',
	3300	+ 'payflowpro_gateway-card-security-code' => 'Txartelaren segurtasun kodea',
	3301	+ 'payflowpro_gateway-what-is-this' => 'Zer da hau?',
	3302	+ 'payflowpro_gateway-donate-now' => 'Dohaintza egin orain',
	3303	+ 'payflowpro_gateway-select-amount' => 'Kopurua aukeratu',
	3304	+ 'payflowpro_gateway-amount' => 'Kopurua',
	3305	+ 'payflowpro_gateway-next' => 'Hurrengoa',
	3306	+ 'payflowpro_gateway-continue' => 'Jarraitu',
	3307	+ 'payflowpro_gateway-cancel' => 'Utzi',
	3308	+ 'payflowpro_gateway-payment' => 'Ordainketa',
	3309	+ 'payflowpro_gateway-payment-type' => 'Ordainketa mota',
	3310	+ 'payflowpro_gateway-description' => 'Deskribapena',
	3311	+ 'payflowpro_gateway-donation' => 'Dohaintza',
	3312	+ 'payflowpro_gateway-state-dropdown-YY' => 'Estatua aukeratu',
	3313	+ 'payflowpro_gateway-state-dropdown-XX' => 'AEBetatik kanpo',
3241	3314	);
3242	3315
3243	3316	/** Persian (فارسی)
—	—	@@ -3471,6 +3544,7 @@
3472	3545	* @author Jean-Frédéric
3473	3546	* @author Peter17
3474	3547	* @author PieRRoMaN
	3548	+ * @author Quentinv57
3475	3549	* @author Verdy p
3476	3550	*/
3477	3551	$messages['fr'] = array(
—	—	@@ -3485,7 +3559,7 @@
3486	3560	'payflowpro_gateway-card-legend' => 'Informations sur la carte de crédit',
3487	3561	'payflowpro_gateway-amount-legend' => 'Montant du don :',
3488	3562	'payflowpro_gateway-cvv-link' => 'Où est-ce ?',
3489		~~- 'payflowpro_gateway-donor-amount' => 'Montant :',~~
	3563	+ 'payflowpro_gateway-donor-amount' => 'Montant',
3490	3564	'payflowpro_gateway-donor-currency-label' => 'Devise',
3491	3565	'payflowpro_gateway-donor-email' => 'Adresse électronique :',
3492	3566	'payflowpro_gateway-donor-name' => 'Nom :',
—	—	@@ -3557,6 +3631,7 @@
3558	3632	'payflowpro_gateway-question-comment' => 'Questions ou commentaires ? Contact : <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
3559	3633	'payflowpro_gateway-donate-click' => 'Votre carte de crédit sera prise en charge de manière sécurisée.',
3560	3634	'payflowpro_gateway-otherways' => 'Il y a <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/fr">d’autres moyens de donner, notamment par PayPal, par chèque ou par courrier postal</a>.',
	3635	+ 'payflowpro_gateway-otherways-alt' => 'Il y a <a href="http://wikimediafoundation.org/wiki/Donate/WaysToGive/fr">d\'autres moyens de donner</a>, notamment par chèque.',
3561	3636	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Autres façons de donner</a>',
3562	3637	'payflowpro_gateway-paypal' => 'Vous avez un compte PayPal ? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donnez avec PayPal</a>.',
3563	3638	'payflowpro_gateway-credit-storage-processing' => 'Nous ne stockons pas vos informations de carte de crédit et vos données personnelles sont soumises à notre <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">politique de confidentialité</a> .',
—	—	@@ -3567,6 +3642,7 @@
3568	3643	'payflowpro_gateway-state-in-us' => 'si vous êtes aux États-Unis',
3569	3644	'payflowpro_gateway-comment' => 'Commentaire',
3570	3645	'payflowpro_gateway-first' => 'Premier',
	3646	+ 'payflowpro_gateway-middle' => 'Milieu',
3571	3647	'payflowpro_gateway-last' => 'Dernier',
3572	3648	'payflowpro_gateway-other' => 'Autre',
3573	3649	'payflowpro_gateway-noscript-msg' => 'Il semble que le JavaScript ne soit pas activé sur votre navigateur, ou alors il ne le supporte pas.
—	—	@@ -3584,14 +3660,80 @@
3585	3661	'payflowpro_gateway-company-name' => 'Nom de société ou organisation',
3586	3662	'payflowpro_gateway-address-1' => 'Adresse 1',
3587	3663	'payflowpro_gateway-address-2' => 'Adresse 2',
	3664	+ 'payflowpro_gateway-address-lines' => 'Adresse',
3588	3665	'payflowpro_gateway-address-line-2' => 'Adresse (ligne 2)',
	3666	+ 'payflowpro_gateway-street-address' => 'Rue',
	3667	+ 'payflowpro_gateway-street-address-line-2' => 'Rue (ligne 2)',
	3668	+ 'payflowpro_gateway-street-1' => 'Rue 1',
	3669	+ 'payflowpro_gateway-street-2' => 'Rue 2',
	3670	+ 'payflowpro_gateway-apartment-number' => 'Appt. nº',
3589	3671	'payflowpro_gateway-city-town' => 'Ville',
3590	3672	'payflowpro_gateway-town-city' => 'Ville',
	3673	+ 'payflowpro_gateway-state-province' => 'État / Province',
	3674	+ 'payflowpro_gateway-zip' => 'Code postal',
	3675	+ 'payflowpro_gateway-zip-code' => 'Code postal',
	3676	+ 'payflowpro_gateway-zip-postal' => 'Code postal',
	3677	+ 'payflowpro_gateway-zip-postal-code' => 'Code postal',
	3678	+ 'payflowpro_gateway-billing-code' => 'Code postal de facturation',
3591	3679	'payflowpro_gateway-country' => 'Pays',
	3680	+ 'payflowpro_gateway-select-country' => 'Choisir un pays',
	3681	+ 'payflowpro_gateway-confirm-email' => 'Confirmer le courriel',
	3682	+ 'payflowpro_gateway-confirmation-email' => 'Courriel de confirmation',
	3683	+ 'payflowpro_gateway-phone' => 'Numéro de téléphone',
	3684	+ 'payflowpro_gateway-telephone' => 'Téléphone',
	3685	+ 'payflowpro_gateway-telephone-home' => 'Tél. (domicile)',
	3686	+ 'payflowpro_gateway-billing-phone-number' => 'Numéro de téléphone de facturation',
	3687	+ 'payflowpro_gateway-donation-information' => 'Informations sur le don',
	3688	+ 'payflowpro_gateway-cc-billing-information' => 'Informations sur la facturation par carte de crédit',
3592	3689	'payflowpro_gateway-pay-by-credit-card' => 'Paiement par carte de crédit',
3593	3690	'payflowpro_gateway-which-card' => 'Quelle carte voulez-vous utiliser',
	3691	+ 'payflowpro_gateway-choose-donation-method' => 'Choisissez la méthode de don',
	3692	+ 'payflowpro_gateway-cardholders-name' => 'Nom du titulaire de la carte',
	3693	+ 'payflowpro_gateway-name-on-card' => 'Nom sur la carte',
	3694	+ 'payflowpro_gateway-type-of-card' => 'Type de carte',
	3695	+ 'payflowpro_gateway-cards-accepted' => 'Cartes acceptées',
	3696	+ 'payflowpro_gateway-card-type' => 'Type de carte',
	3697	+ 'payflowpro_gateway-credit-card-type' => 'Numéro de carte de crédit',
	3698	+ 'payflowpro_gateway-credit-card-number' => 'Numéro de carte de crédit',
	3699	+ 'payflowpro_gateway-credit-card-number-abbreviated' => 'Nº de carte de crédit',
	3700	+ 'payflowpro_gateway-credit-card-expiration' => 'Expiration de la carte de crédit',
	3701	+ 'payflowpro_gateway-card-expiration' => 'Expiration de la carte',
	3702	+ 'payflowpro_gateway-select-month-of-expiration' => 'Sélectionnez le mois d’expiration',
	3703	+ 'payflowpro_gateway-select-year-of-expiration' => 'Sélectionnez l’année d’expiration',
	3704	+ 'payflowpro_gateway-expires-question' => 'Expire ?',
	3705	+ 'payflowpro_gateway-expires' => 'Date d’expiration',
	3706	+ 'payflowpro_gateway-card-security-code' => 'Code de sécurité de la carte',
	3707	+ 'payflowpro_gateway-cvv' => 'CVV',
	3708	+ 'payflowpro_gateway-cvv-number-abbreviated' => 'Nº CVV',
	3709	+ 'payflowpro_gateway-cvv2' => 'CVV2',
	3710	+ 'payflowpro_gateway-cvv-number' => 'N° CVV',
	3711	+ 'payflowpro_gateway-verification-number' => 'Numéro de vérification',
	3712	+ 'payflowpro_gateway-what-is-this' => 'Qu’est-ce que ceci ?',
	3713	+ 'payflowpro_gateway-do-not-include-dashes' => 'Veuillez ne pas inclure de tirets',
	3714	+ 'payflowpro_gateway-please-donate-today' => 'Faites un don aujourd’hui',
	3715	+ 'payflowpro_gateway-donate-now' => 'Faites un don dès maintenant',
	3716	+ 'payflowpro_gateway-please-select-gift-amount' => 'Veuillez sélectionner un montant du don',
	3717	+ 'payflowpro_gateway-select-gift-amount' => 'Sélectionnez le montant du don',
	3718	+ 'payflowpro_gateway-select-amount' => 'Sélectionnez le montant',
3594	3719	'payflowpro_gateway-amount' => 'Montant',
	3720	+ 'payflowpro_gateway-make-a-donation' => 'Faire un don',
	3721	+ 'payflowpro_gateway-enter-your-amount' => 'Ou entrez votre montant dans la case ci-dessus',
	3722	+ 'payflowpro_gateway-will-support-with-gift' => 'J’apporterai mon soutien avec un don de :',
	3723	+ 'payflowpro_gateway-will-make-tax-deductible-gift' => 'Je ferai un don déductible d’impôts de :',
	3724	+ 'payflowpro_gateway-select-dollar-amount' => 'Sélectionnez le montant en dollars',
	3725	+ 'payflowpro_gateway-submit-my-secure-donation' => 'Soumettre mon don sécurisé',
	3726	+ 'payflowpro_gateway-next' => 'Suivant',
	3727	+ 'payflowpro_gateway-continue' => 'Continuer',
3595	3728	'payflowpro_gateway-cancel' => 'Annuler',
	3729	+ 'payflowpro_gateway-payment' => 'Paiement',
	3730	+ 'payflowpro_gateway-payment-type' => 'Type de paiement',
	3731	+ 'payflowpro_gateway-month' => '$1 ($2)',
	3732	+ 'payflowpro_gateway-please-complete' => 'Veuillez compléter votre don ci-dessous...',
	3733	+ 'payflowpro_gateway-description' => 'Description',
	3734	+ 'payflowpro_gateway-donation' => 'Don',
	3735	+ 'payflowpro_gateway-email-receipt' => 'Envoyer le courriel de reçu à',
	3736	+ 'payflowpro_gateway-state-dropdown-YY' => 'Choisir un pays',
	3737	+ 'payflowpro_gateway-state-dropdown-XX' => 'Hors des États-Unis',
3596	3738	);
3597	3739
3598	3740	/** Franco-Provençal (Arpetan)
—	—	@@ -4856,17 +4998,17 @@
4857	4999	* @author Kenrick95
4858	5000	*/
4859	5001	$messages['id'] = array(
4860		~~- 'payflowprogateway' => 'Dukung Wikimedia',~~
	5002	+ 'payflowprogateway' => 'Menyumbanglah sekarang',
4861	5003	'payflowpro_gateway-desc' => 'Pemrosesan kartu credit PayPal Payflow Pro',
4862	5004	'payflowpro_gateway-accessible' => 'Halaman ini hanya dapat diakses dari halaman donasi.',
4863		~~- 'payflowpro_gateway-form-message' => 'Berkontribusi dengan kartu kredit Anda.',~~
	5005	+ 'payflowpro_gateway-form-message' => 'Gunakan formulir berikut untuk menyumbang dengan kartu kredit, atau',
4864	5006	'payflowpro_gateway-paypal-button' => 'Sumbangkan melalui PayPal',
4865	5007	'payflowpro_gateway-cc-button' => 'Sumbangkan melalui kartu kredit',
4866	5008	'payflowpro_gateway-form-message-2' => 'Untuk mengganti nilai atau mata uang, kembali ke <a href="https://www.mediawiki.org/index.php?title=Donate">halaman donasi</a>',
4867	5009	'payflowpro_gateway-donor-legend' => 'Informasi donor',
4868	5010	'payflowpro_gateway-card-legend' => 'Informasi kartu kredit',
4869	5011	'payflowpro_gateway-amount-legend' => 'Nilai donasi:',
4870		~~- 'payflowpro_gateway-cvv-link' => 'Contoh',~~
	5012	+ 'payflowpro_gateway-cvv-link' => 'Di mana ini?',
4871	5013	'payflowpro_gateway-donor-amount' => 'Nilai:',
4872	5014	'payflowpro_gateway-donor-currency-label' => 'Mata uang:',
4873	5015	'payflowpro_gateway-donor-email' => 'Alamat surel:',
—	—	@@ -4882,10 +5024,11 @@
4883	5025	'payflowpro_gateway-donor-address' => 'Alamat:',
4884	5026	'payflowpro_gateway-donor-card' => 'Kartu kredit:',
4885	5027	'payflowpro_gateway-donor-card-num' => 'Nomor kartu:',
4886		~~- 'payflowpro_gateway-donor-expiration' => 'Tanggal kadaluarsa:',~~
	5028	+ 'payflowpro_gateway-donor-expiration' => 'Tanggal kedaluwarsa:',
4887	5029	'payflowpro_gateway-donor-security' => 'Kode keamanan:',
4888	5030	'payflowpro_gateway-donor-submit' => 'Donasikan',
4889	5031	'payflowpro_gateway-donor-currency-msg' => 'Donasi ini dibuat dalam $1',
	5032	+ 'payflow_gateway-error-msg-nopaypal' => 'Karena kesalahan teknis, kami tidak dapat mengirim permintaan Anda ke PayPal. Silakan mencoba dengan formulir sumbangan kartu kredit biasa kami.',
4890	5033	'payflowpro_gateway-error-msg' => 'Tolong masukkan $1 Anda',
4891	5034	'payflowpro_gateway-error-msg-js' => 'Silakan masukkan',
4892	5035	'payflowpro_gateway-error-msg-invalid-amount' => 'Harap masukkan nilai yang valid',
—	—	@@ -4915,15 +5058,15 @@
4916	5059	'payflowpro_gateway-response-13' => 'Transaksi Anda membutuhkan otorisasi suara.
4917	5060	Silakan hubungi kami untuk melanjutkan transaksi Anda.',
4918	5061	'payflowpro_gateway-response-114' => 'Silakan hubungi penyedia kartu kredit Anda untuk informasi lebih lanjut.',
4919		~~- 'payflowpro_gateway-response-23' => 'Nomor atau tanggal kadaluarsa kartu kredit Anda salah.',~~
	5062	+ 'payflowpro_gateway-response-23' => 'Nomor atau tanggal kedaluwarsa kartu kredit Anda salah.',
4920	5063	'payflowpro_gateway-response-4' => 'Nilai tidak benar.',
4921		~~- 'payflowpro_gateway-response-24' => 'Nomor atau tanggal kadaluarsa kartu kredit Anda salah.',~~
	5064	+ 'payflowpro_gateway-response-24' => 'Nomor atau tanggal kedaluwarsa kartu kredit Anda salah.',
4922	5065	'payflowpro_gateway-response-112' => 'Alamat atau nomor CVV (kode keamanan) Anda salah.',
4923	5066	'payflowpro_gateway-response-125' => 'Transaksi Anda telah ditolak oleh Fraud Prevention Services.',
4924	5067	'payflowpro_gateway-response-125-2' => 'Kartu kredit Anda tidak dapat divalidasi. Harap verifikasikan bahwa semua informasi yang disediakan sesuai dengan profil kartu kredit, atau cobalah kartu yang berbeda. Anda juga dapat menggunakan salah satu <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">cara lain untuk menyumbang</a> atau hubungi kami di <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>. Terima kasih atas dukungan Anda.',
4925	5068	'payflowpro_gateway-response-default' => 'Terjadi kesalahan dalam pemrosesan transaksi Anda.
4926	5069	Silakan coba lagi nanti.',
4927		~~- 'php-response-declined' => 'Transaksi Anda telah ditolak.',~~
	5070	+ 'php-response-declined' => 'Transaksi Anda tidak dapat diterima.',
4928	5071	'payflowpro_gateway-thankyou' => 'Terima kasih atas donasi Anda!',
4929	5072	'payflowpro_gateway-post-transaction' => 'Detail transaksi',
4930	5073	'payflowpro_gateway-submit-button' => 'Donasikan',
—	—	@@ -4935,17 +5078,112 @@
4936	5079	<h4>American Express</h4>
4937	5080	<p>Kode ini <i>selalu</i> terletak <i>di atas</i> nomor rekening yang timbul (terangkat) di muka kartu.
4938	5081	Dalam beberapa kasus, kode ini terletak di sisi kiri kartu, tetapi selalu di atas nomor rekening.</p><br />',
4939		- 'payflowpro_gateway-question-comment' => 'Wikipedia adalah suatu proyek dari Wikimedia Foundation. Pertanyaan atau komentar? Hubungi Wikimedia Foundation: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
4940		~~- 'payflowpro_gateway-donate-click' => 'Setelah mengeklik "Donate", informasi kartu kredit Anda akan diproses.',~~
4941		- 'payflowpro_gateway-credit-storage-processing' => 'Kami tidak menyimpan informasi kartu kredit dan data pribadi Anda sesuai dengan <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">kebijakan privasi</a> kami.',
	5082	+ 'payflowpro_gateway-question-comment' => 'Pertanyaan atau komentar? Hubungi: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
	5083	+ 'payflowpro_gateway-donate-click' => 'Kartu kredit Anda akan diproses secara aman.',
	5084	+ 'payflowpro_gateway-otherways' => 'Ada <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">cara lain untuk menyumbang, termasuk PayPal, cek, atau surat</a>.',
	5085	+ 'payflowpro_gateway-otherways-alt' => 'Ada <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">cara lain untuk menyumbang</a>, termasuk dengan cek.',
	5086	+ 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Cara lain untuk menyumbang</a>',
	5087	+ 'payflowpro_gateway-paypal' => 'Memiliki akun PayPal? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Menyumbang dengan PayPal</a>.',
	5088	+ 'payflowpro_gateway-credit-storage-processing' => 'Kami tidak menyimpan informasi kartu kredit Anda dan data pribadi Anda diperlakukan sesuai dengan <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">kebijakan privasi</a> kami.',
4942	5089	'payflowpro_gateway-token-mismatch' => 'Sesi Anda telah berakhir. Silakan coba mengisi formulir dan mengirimkannya lagi.',
	5090	+ 'payflowpro_gateway-cc-form-header-personal' => 'Informasi penagihan',
	5091	+ 'payflowpro_gateway-cc-form-header-payment' => 'Informasi pembayaran',
	5092	+ 'payflowpro_gateway-make-your-donation' => 'Menyumbanglah sekarang',
	5093	+ 'payflowpro_gateway-state-in-us' => 'jika di AS',
	5094	+ 'payflowpro_gateway-comment' => 'Komentar',
	5095	+ 'payflowpro_gateway-first' => 'Depan',
	5096	+ 'payflowpro_gateway-middle' => 'Tengah',
	5097	+ 'payflowpro_gateway-last' => 'Belakang',
	5098	+ 'payflowpro_gateway-other' => 'Lainnya',
	5099	+ 'payflowpro_gateway-noscript-msg' => 'Tampaknya Anda tidak mengaktifkan JavaScript, atau peramban Anda tidak mendukung itu.
	5100	+Dalam rangka memberikan pengalaman yang aman dan menyenangkan, formulir sumbangan kami perlu dukungan JavaScript.',
	5101	+ 'payflowpro_gateway-noscript-redirect-msg' => 'Jika Anda tidak dapat atau tidak ingin mengaktifkan JavaScript, Anda masih dapat menyumbang dengan mengunjungi:',
	5102	+ 'payflowpro_gateway-anon-message' => 'Tolong cantumkan nama saya dalam daftar donatur publik.',
	5103	+ 'payflowpro_gateway-donate-wikipedia' => 'Menyumbang untuk Wikipedia',
4943	5104	'payflowpro_gateway-or' => 'atau',
	5105	+ 'payflowpro_gateway-your-information' => 'Informasi Anda',
	5106	+ 'payflowpro_gateway-mailing-address' => 'Alamat surat',
	5107	+ 'payflowpro_gateway-billing-address' => 'Alamat penagihan',
	5108	+ 'payflowpro_gateway-billing-name' => 'Nama penagihan',
	5109	+ 'payflowpro_gateway-title' => 'Gelar',
	5110	+ 'payflowpro_gateway-suffix' => 'Sufiks',
	5111	+ 'payflowpro_gateway-company-name' => 'Nama perusahaan atau organisasi',
4944	5112	'payflowpro_gateway-address-1' => 'Alamat 1',
4945	5113	'payflowpro_gateway-address-2' => 'Alamat 2',
4946	5114	'payflowpro_gateway-address-lines' => 'Jalur alamat',
4947	5115	'payflowpro_gateway-address-line-2' => 'Alamat (jalur 2)',
4948	5116	'payflowpro_gateway-street-address' => 'Jalan alamat',
4949	5117	'payflowpro_gateway-street-address-line-2' => 'Jalan alamat (jalur 2)',
	5118	+ 'payflowpro_gateway-street-1' => 'Alamat 1',
	5119	+ 'payflowpro_gateway-street-2' => 'Alamat 2',
	5120	+ 'payflowpro_gateway-apartment-number' => 'Apt. #',
	5121	+ 'payflowpro_gateway-city-town' => 'Kota',
	5122	+ 'payflowpro_gateway-town-city' => 'Kota',
	5123	+ 'payflowpro_gateway-state-province' => 'Negara bagian/Provinsi',
	5124	+ 'payflowpro_gateway-zip' => 'Kode pos',
	5125	+ 'payflowpro_gateway-zip-code' => 'Kode pos',
	5126	+ 'payflowpro_gateway-zip-postal' => 'Kode pos',
	5127	+ 'payflowpro_gateway-zip-postal-code' => 'Kode pos',
	5128	+ 'payflowpro_gateway-billing-code' => 'Kode pos penagihan',
	5129	+ 'payflowpro_gateway-country' => 'Negara',
	5130	+ 'payflowpro_gateway-select-country' => 'Pilih negara',
	5131	+ 'payflowpro_gateway-confirm-email' => 'Konfirmasi surel',
	5132	+ 'payflowpro_gateway-confirmation-email' => 'Konfirmasi surel',
	5133	+ 'payflowpro_gateway-phone' => 'Telepon',
	5134	+ 'payflowpro_gateway-telephone' => 'Telepon',
	5135	+ 'payflowpro_gateway-telephone-home' => 'Tel. (rumah)',
	5136	+ 'payflowpro_gateway-billing-phone-number' => 'Nomor telepon penagihan',
	5137	+ 'payflowpro_gateway-donation-information' => 'Informasi sumbangan',
	5138	+ 'payflowpro_gateway-cc-billing-information' => 'Informasi penagihan kartu kredit',
	5139	+ 'payflowpro_gateway-pay-by-credit-card' => 'Bayar dengan kartu kredit',
	5140	+ 'payflowpro_gateway-which-card' => 'Kartu yang ingin Anda gunakan',
	5141	+ 'payflowpro_gateway-choose-donation-method' => 'Pilih metode sumbangan',
	5142	+ 'payflowpro_gateway-cardholders-name' => 'Nama pemegang kartu',
	5143	+ 'payflowpro_gateway-name-on-card' => 'Nama pada kartu',
	5144	+ 'payflowpro_gateway-type-of-card' => 'Jenis kartu',
	5145	+ 'payflowpro_gateway-cards-accepted' => 'Kartu yang diterima',
	5146	+ 'payflowpro_gateway-card-type' => 'Jenis kartu',
	5147	+ 'payflowpro_gateway-credit-card-type' => 'Jenis kartu kredit',
	5148	+ 'payflowpro_gateway-credit-card-number' => 'Nomor kartu kredit',
	5149	+ 'payflowpro_gateway-credit-card-number-abbreviated' => 'Kartu kredit #',
	5150	+ 'payflowpro_gateway-credit-card-expiration' => 'Kedaluwarsa kartu kredit',
	5151	+ 'payflowpro_gateway-card-expiration' => 'Kedaluwarsa kartu',
	5152	+ 'payflowpro_gateway-select-month-of-expiration' => 'Pilih bulan kedaluwarsa',
	5153	+ 'payflowpro_gateway-select-year-of-expiration' => 'Pilih tahun kedaluwarsa',
	5154	+ 'payflowpro_gateway-expires-question' => 'Kedaluwarsa?',
	5155	+ 'payflowpro_gateway-expires' => 'Kedaluwarsa',
	5156	+ 'payflowpro_gateway-card-security-code' => 'Kode keamanan kartu',
	5157	+ 'payflowpro_gateway-cvv' => 'CVV',
	5158	+ 'payflowpro_gateway-cvv-number-abbreviated' => 'CVV #',
	5159	+ 'payflowpro_gateway-cvv2' => 'CVV2',
	5160	+ 'payflowpro_gateway-cvv-number' => 'Nomor CVV',
	5161	+ 'payflowpro_gateway-verification-number' => 'Nomor verifikasi',
	5162	+ 'payflowpro_gateway-what-is-this' => 'Apa ini?',
	5163	+ 'payflowpro_gateway-do-not-include-dashes' => 'Tolong jangan sertakan tanda hubung',
	5164	+ 'payflowpro_gateway-please-donate-today' => 'Menyumbanglah hari ini',
	5165	+ 'payflowpro_gateway-donate-now' => 'Menyumbang',
	5166	+ 'payflowpro_gateway-please-select-gift-amount' => 'Silakan pilih nilai hadiah',
	5167	+ 'payflowpro_gateway-select-gift-amount' => 'Pilih nilai hadiah',
	5168	+ 'payflowpro_gateway-select-amount' => 'Pilih nilai',
	5169	+ 'payflowpro_gateway-amount' => 'Nilai',
	5170	+ 'payflowpro_gateway-make-a-donation' => 'Menyumbang',
	5171	+ 'payflowpro_gateway-enter-your-amount' => 'Atau masukkan nilai dalam kotak di atas',
	5172	+ 'payflowpro_gateway-will-support-with-gift' => 'Saya akan menyumbang dengan hadiah:',
	5173	+ 'payflowpro_gateway-will-make-tax-deductible-gift' => 'Saya akan menyumbang hadiah bebas pajak:',
	5174	+ 'payflowpro_gateway-select-dollar-amount' => 'Pilih nilai dolar',
	5175	+ 'payflowpro_gateway-submit-my-secure-donation' => 'Kirim sumbangan aman saya',
	5176	+ 'payflowpro_gateway-next' => 'Selanjutnya',
	5177	+ 'payflowpro_gateway-continue' => 'Lanjutkan',
	5178	+ 'payflowpro_gateway-cancel' => 'Batalkan',
	5179	+ 'payflowpro_gateway-payment' => 'Pembayaran',
	5180	+ 'payflowpro_gateway-payment-type' => 'Jenis pembayaran',
	5181	+ 'payflowpro_gateway-month' => '$1 ($2)',
	5182	+ 'payflowpro_gateway-please-complete' => 'Silakan lengkapi sumbangan Anda di bawah ini ...',
	5183	+ 'payflowpro_gateway-description' => 'Deskripsi',
	5184	+ 'payflowpro_gateway-donation' => 'Sumbangan',
	5185	+ 'payflowpro_gateway-email-receipt' => 'Kirim tanda terima ke',
	5186	+ 'payflowpro_gateway-state-dropdown-YY' => 'Pilih negara bagian',
	5187	+ 'payflowpro_gateway-state-dropdown-XX' => 'Di luar AS',
4950	5188	);
4951	5189
4952	5190	/** Ido (Ido)
—	—	@@ -5717,6 +5955,7 @@
5718	5956	'payflowpro_gateway-question-comment' => 'Froen oder Bemierkungen? Kontaktéiert: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
5719	5957	'payflowpro_gateway-donate-click' => 'Är Kreditkaartinformatioune gi mat enger sécherer Technik verschafft.',
5720	5958	'payflowpro_gateway-otherways' => 'Et gëtt <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Manéiere fir en Don ze maachen, wéi PayPal, check, oder Mail</a>.',
	5959	+ 'payflowpro_gateway-otherways-alt' => 'Et gëtt <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">aner Manéiere fir en Don ze maachen</a>, inklusiv per Scheck.',
5721	5960	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Aner Méiglechkeete fir en Don ze maachen</a>',
5722	5961	'payflowpro_gateway-paypal' => 'Hutt Dir e PayPal-Kont? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Maacht en Don iwwer PayPal</a>.',
5723	5962	'payflowpro_gateway-credit-storage-processing' => 'Mir späicheren d\'Informatioune vun Ärer Kreditkaart net, an Är perséinlech Daten ënnerleien eisen <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">Dateschutz Richtlinnen</a>.',
—	—	@@ -5753,6 +5992,9 @@
5754	5993	'payflowpro_gateway-town-city' => 'Duerf/Stad',
5755	5994	'payflowpro_gateway-state-province' => 'Staat/Provënz',
5756	5995	'payflowpro_gateway-zip' => 'Postcode',
	5996	+ 'payflowpro_gateway-zip-code' => 'Post Code',
	5997	+ 'payflowpro_gateway-zip-postal' => 'Post Code',
	5998	+ 'payflowpro_gateway-zip-postal-code' => 'Post Code',
5757	5999	'payflowpro_gateway-country' => 'Land',
5758	6000	'payflowpro_gateway-select-country' => "Sicht d'Land eraus",
5759	6001	'payflowpro_gateway-confirm-email' => 'E-Mailadress confirméieren',
—	—	@@ -5776,6 +6018,8 @@
5777	6019	'payflowpro_gateway-credit-card-number-abbreviated' => 'Kreditkaart #',
5778	6020	'payflowpro_gateway-credit-card-expiration' => 'Gültegkeet vun der Kreditkaart',
5779	6021	'payflowpro_gateway-card-expiration' => 'Gültegkeet vun der Kreditkaart',
	6022	+ 'payflowpro_gateway-select-month-of-expiration' => 'Sicht de Mount vum Ënn vun der Gëltegkeet eraus',
	6023	+ 'payflowpro_gateway-select-year-of-expiration' => "Sicht d'Joer vum Ënn vun der Gëltegkeet eraus",
5780	6024	'payflowpro_gateway-expires-question' => 'Gülteg bis?',
5781	6025	'payflowpro_gateway-expires' => 'Gülteg bis',
5782	6026	'payflowpro_gateway-card-security-code' => 'Sécherheetscode vun der Kaart',
—	—	@@ -5804,6 +6048,10 @@
5805	6049	'payflowpro_gateway-payment' => 'Bezuelen',
5806	6050	'payflowpro_gateway-payment-type' => 'Bezuelmanéier',
5807	6051	'payflowpro_gateway-month' => '$1 ($2)',
	6052	+ 'payflowpro_gateway-please-complete' => 'Completéiert Är Donnéeën hei drënner ...',
	6053	+ 'payflowpro_gateway-description' => 'Beschreiwung',
	6054	+ 'payflowpro_gateway-donation' => 'Don',
	6055	+ 'payflowpro_gateway-email-receipt' => 'E-Mail mam Recu op',
5808	6056	'payflowpro_gateway-state-dropdown-YY' => 'Sicht e Staat eraus',
5809	6057	'payflowpro_gateway-state-dropdown-XX' => 'Ausserhalb de Vereenegte Staate vun Amerika',
5810	6058	);
—	—	@@ -5881,7 +6129,7 @@
5882	6130	'payflowpro_gateway-donor-fname' => 'Vardas',
5883	6131	'payflowpro_gateway-donor-mname' => 'Antrasis vardas',
5884	6132	'payflowpro_gateway-donor-lname' => 'Pavardė',
5885		~~- 'payflowpro_gateway-donor-street' => 'Gatvė',~~
	6133	+ 'payflowpro_gateway-donor-street' => 'Adresas (gatvė)',
5886	6134	'payflowpro_gateway-donor-city' => 'Miestas',
5887	6135	'payflowpro_gateway-donor-state' => 'Valstija',
5888	6136	'payflowpro_gateway-donor-postal' => 'Pašto kodas',
—	—	@@ -5946,6 +6194,7 @@
5947	6195	'payflowpro_gateway-question-comment' => 'Klausimai arba komentarai? Susisiekite: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
5948	6196	'payflowpro_gateway-donate-click' => 'Jūsų kreditinė kortelė bus saugiai apdorojama.',
5949	6197	'payflowpro_gateway-otherways' => 'Yra ir <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">kiti aukojimo būdai, įskaitant aukojimą per PayPal, čekiu ar paštu</a>.',
	6198	+ 'payflowpro_gateway-otherways-alt' => 'Yra ir <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">kitų būdų paaukoti</a>, įskaitant ir aukojimą čekiu.',
5950	6199	'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Kiti aukojimo būdai</a>',
5951	6200	'payflowpro_gateway-paypal' => 'Turite PayPal sąskaitą? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Galite paaukoti per PayPal</a>.',
5952	6201	'payflowpro_gateway-credit-storage-processing' => 'Mes nesaugome jūsų kredito kortelės informacijos, o Jūsų asmens duomenys yra saugomi mūsų <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">privatumo politikos</a>.',
—	—	@@ -5955,7 +6204,7 @@
5956	6205	'payflowpro_gateway-make-your-donation' => 'Atlikite aukojimą',
5957	6206	'payflowpro_gateway-state-in-us' => 'jei JAV viduje',
5958	6207	'payflowpro_gateway-comment' => 'Komentaras',
5959		~~- 'payflowpro_gateway-first' => 'Pirmasis',~~
	6208	+ 'payflowpro_gateway-first' => 'Vardas',
5960	6209	'payflowpro_gateway-middle' => 'Vidurinysis',
5961	6210	'payflowpro_gateway-last' => 'Pavardė',
5962	6211	'payflowpro_gateway-other' => 'Kita',
—	—	@@ -6042,6 +6291,10 @@
6043	6292	'payflowpro_gateway-payment' => 'Mokėjimas',
6044	6293	'payflowpro_gateway-payment-type' => 'Mokėjimo tipas',
6045	6294	'payflowpro_gateway-month' => '$1 ($2)',
	6295	+ 'payflowpro_gateway-please-complete' => 'Prašome užpildyti aukojimą žemiau ...',
	6296	+ 'payflowpro_gateway-description' => 'Aprašymas',
	6297	+ 'payflowpro_gateway-donation' => 'Aukojimas',
	6298	+ 'payflowpro_gateway-email-receipt' => 'Aukojimo išrašą siųsti el. paštu',
6046	6299	'payflowpro_gateway-state-dropdown-YY' => 'Pasirinkite valstiją',
6047	6300	'payflowpro_gateway-state-dropdown-XX' => 'Už JAV ribų',
6048	6301	);
—	—	@@ -6633,15 +6886,15 @@
6634	6887	* @author Servien
6635	6888	*/
6636	6889	$messages['nds-nl'] = array(
6637		~~- 'payflowprogateway' => 'Steun Wikimedia',~~
	6890	+ 'payflowprogateway' => 'Noen geld geven',
6638	6891	'payflowpro_gateway-desc' => 'Kredietkaortverwarking via PayPal PayFlow Pro',
6639	6892	'payflowpro_gateway-accessible' => 'Disse pagina ku-j allinnig bekieken via de doneteurspagina.',
6640		~~- 'payflowpro_gateway-form-message' => 'Draag bie mit de kredietkaorte.',~~
	6893	+ 'payflowpro_gateway-form-message' => "Gebruik 't formelier hieronder um geld te geven mit de kredietkaorte, of",
6641	6894	'payflowpro_gateway-form-message-2' => 'Um \'t bedrag of de munteenheid te wiezigen, gao-j weerumme naor de <a href="https://www.mediawiki.org/index.php?title=Donate">doneteurspagina</a>.',
6642	6895	'payflowpro_gateway-donor-legend' => 'Doneteursinfermasie',
6643	6896	'payflowpro_gateway-card-legend' => 'Kredietkaortgegevens',
6644	6897	'payflowpro_gateway-amount-legend' => 'Bedrag:',
6645		~~- 'payflowpro_gateway-cvv-link' => 'Veurbeeld',~~
	6898	+ 'payflowpro_gateway-cvv-link' => 'Waor ka-k dat vienen?',
6646	6899	'payflowpro_gateway-donor-amount' => 'Bedrag:',
6647	6900	'payflowpro_gateway-donor-currency-label' => 'Munteenheid:',
6648	6901	'payflowpro_gateway-donor-email' => 'Netposadres',
—	—	@@ -6708,8 +6961,9 @@
6709	6962	<h4>American Express</h4>
6710	6963	<p>De code steet <i>altied</i> drek <i>boven</i> 't nummer an de veurkaante van de kaorte.
6711	6964	In sommige gevallen steet de code an de linkerzied van de kaorte, mar dit steet altied boven 't nummer van de kaorte.</p><br />",
6712		- 'payflowpro_gateway-question-comment' => 'Wikipedie is a prejek van de Wikimedia Foundation. A-j vragen of opmarkingen hebben, dan mu-j effen kontak opnemen mit de Wikimedia Foundation: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
6713		~~- 'payflowpro_gateway-donate-click' => 'Naoda-j op "{{int:payflowpro_gateway-donor-submit}}" klikken, wönnen joew kredietkaortgegevens verwark.',~~
	6965	+ 'payflowpro_gateway-question-comment' => 'Vragen of opmarkingen? Neem dan kontak op mit <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
	6966	+ 'payflowpro_gateway-donate-click' => 'Joew kredietkaortgegevens wönnen beveilig verwörken.',
	6967	+ 'payflowpro_gateway-otherways' => 'Der bin <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">aandere menieren um geld te geven, waoronder PayPal, cheque of per pos</a>.',
6714	6968	'payflowpro_gateway-credit-storage-processing' => 'Joew kredietkaortgevens wönnen neet op-esleugen, en joew persoonlijke infermasie vuilt onder ons <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">gegevensbeleid</a>.',
6715	6969	);
6716	6970
—	—	@@ -9223,7 +9477,7 @@
9224	9478	* @author Per
9225	9479	*/
9226	9480	$messages['sv'] = array(
9227		~~- 'payflowprogateway' => 'Stöd Wikimedia',~~
	9481	+ 'payflowprogateway' => 'Donera nu',
9228	9482	'payflowpro_gateway-desc' => 'PayPal Payflow Pro kreditkortsbearbetning',
9229	9483	'payflowpro_gateway-accessible' => 'Denna sida är endast åtkomlig från givarsidan.',
9230	9484	'payflowpro_gateway-form-message' => 'Använd formuläret nedan för att donera med kreditkort eller',
—	—	@@ -9325,22 +9579,161 @@
9326	9580	* @author Lloffiwr
9327	9581	*/
9328	9582	$messages['sw'] = array(
	9583	+ 'payflowprogateway' => 'Changia sasa',
	9584	+ 'payflowpro_gateway-paypal-button' => 'Changia kwa kupitia Paypal',
	9585	+ 'payflowpro_gateway-cc-button' => 'Changia kwa kupitia kadi ya mkopo',
	9586	+ 'payflowpro_gateway-form-message-2' => 'Ukitaka kubadilisha kiasi au aina ya fedha, rudi katika <a href="https://www.mediawiki.org/index.php?title=Donate">ukurasa wa kuchangia</a>',
	9587	+ 'payflowpro_gateway-donor-legend' => 'Taarifa ya mfadhili',
	9588	+ 'payflowpro_gateway-card-legend' => 'Taarifa ya kadi ya mkopo',
	9589	+ 'payflowpro_gateway-amount-legend' => 'Kiasi cha mchango',
9329	9590	'payflowpro_gateway-cvv-link' => 'Mfano',
9330	9591	'payflowpro_gateway-donor-amount' => 'Kiwango:',
9331	9592	'payflowpro_gateway-donor-currency-label' => 'Fedha:',
9332	9593	'payflowpro_gateway-donor-email' => 'Anwani ya meili-e:',
9333	9594	'payflowpro_gateway-donor-name' => 'Jina:',
9334	9595	'payflowpro_gateway-donor-fname' => 'Jina la Kwanza:',
9335		~~- 'payflowpro_gateway-donor-city' => 'Jiji:',~~
	9596	+ 'payflowpro_gateway-donor-mname' => 'Jina la pili',
	9597	+ 'payflowpro_gateway-donor-lname' => 'Jina la ukoo',
	9598	+ 'payflowpro_gateway-donor-street' => 'SLP',
	9599	+ 'payflowpro_gateway-donor-city' => 'Mji',
	9600	+ 'payflowpro_gateway-donor-state' => 'Jimbo',
9336	9601	'payflowpro_gateway-donor-postal' => 'Simbo:',
9337		~~- 'payflowpro_gateway-donor-address' => 'Anwani:',~~
	9602	+ 'payflowpro_gateway-donor-country' => 'Nchi',
	9603	+ 'payflowpro_gateway-donor-address' => 'Anwani',
	9604	+ 'payflowpro_gateway-donor-card' => 'Kadi ya mkopo',
	9605	+ 'payflowpro_gateway-donor-card-num' => 'Namba ya kadi',
	9606	+ 'payflowpro_gateway-donor-expiration' => 'Tarehe itakayokwisha',
	9607	+ 'payflowpro_gateway-donor-security' => 'Kodi ya usalama',
9338	9608	'payflowpro_gateway-donor-submit' => 'Michango',
	9609	+ 'payflowpro_gateway-donor-currency-msg' => 'Mchango huu inalipwa na fedha ya $1',
	9610	+ 'payflow_gateway-error-msg-nopaypal' => 'Kutokana na hitilafu ya kiufundi, hatuwezi kutuma maombi yako kwa PayPal. Tafadhali jaribu kutumia fomu yetu ya kawaida ya kuchangia kwa kupitia kadi ya mkopo.',
	9611	+ 'payflowpro_gateway-error-msg' => 'Tafadhali ingiza $1',
	9612	+ 'payflowpro_gateway-error-msg-js' => 'Tafadhali ingiza',
	9613	+ 'payflowpro_gateway-error-msg-invalid-amount' => 'Tafadhali ingiza kiasi halali',
	9614	+ 'payflowpro_gateway-error-msg-email' => 'Tafadhali ingiza anwani halali ya barua pepe',
	9615	+ 'payflowpro_gateway-error-msg-amex' => 'Tafadhali ingiza namba sahihi kwa ajili ya kadi ya American Express.',
	9616	+ 'payflowpro_gateway-error-msg-mc' => 'Tafadhali ingiza namba sahihi kwa ajili ya kadi ya Mastercard.',
	9617	+ 'payflowpro_gateway-error-msg-visa' => 'Tafadhali ingiza namba sahihi kwa ajili ya kadi ya Visa.',
	9618	+ 'payflowpro_gateway-error-msg-discover' => 'Tafadhali ingiza namba sahihi kwa ajili ya kadi ya Discover.',
	9619	+ 'payflowpro_gateway-error-msg-amount' => 'kiasi cha mchango',
9339	9620	'payflowpro_gateway-error-msg-emailAdd' => 'anwani ya meili-e',
9340	9621	'payflowpro_gateway-error-msg-fname' => 'jina la Kwanza',
	9622	+ 'payflowpro_gateway-error-msg-lname' => 'jina la ukoo',
	9623	+ 'payflowpro_gateway-error-msg-street' => 'sanduku la posta',
	9624	+ 'payflowpro_gateway-error-msg-city' => 'mji',
	9625	+ 'payflowpro_gateway-error-msg-state' => 'jimbo',
9341	9626	'payflowpro_gateway-error-msg-zip' => 'simbo',
	9627	+ 'payflowpro_gateway-error-msg-card_num' => 'namba ya kadi ya mkopo',
	9628	+ 'payflowpro_gateway-error-msg-expiration' => 'tarehe itakayokwisha kadi',
	9629	+ 'payflowpro_gateway-error-msg-cvv' => 'CVV (kodi ya usalama) iliopo nyuma ya kadi yako',
	9630	+ 'payflowpro_gateway-response-0' => 'Malipo yako yamepitishwa.
	9631	+Ahsante kwa mchango wako!',
	9632	+ 'payflowpro_gateway-response-12' => 'Tafadhali uwasiliane na kampuni ya kadi yako ya mkopo ili kupata maelezo mengine.',
	9633	+ 'payflowpro_gateway-response-114' => 'Tafadhali wasiliana na kampuni ya kadi yako ya mkopo ili kupata maelezo zaidi.',
	9634	+ 'payflowpro_gateway-response-23' => 'Ama namba ya kadi ya mkopo au tarehe yake ya kuishia haipo sahihi.',
	9635	+ 'payflowpro_gateway-response-4' => 'Kiasi batili.',
	9636	+ 'payflowpro_gateway-response-24' => 'Ama namba ya kadi ya mkopo au tarehe yake ya kuishia haipo sahihi.',
	9637	+ 'payflowpro_gateway-response-112' => 'Ama anwani au namba yako ya CVV (kodi ya usalama) hayapo sahihi.',
	9638	+ 'payflowpro_gateway-response-default' => 'Ilitokea hitilafu wakati wa kufanyika malipo.
	9639	+Tafadhali jaribu baadaye tena.',
	9640	+ 'php-response-declined' => 'Malipo yako hayakubaliwa.',
	9641	+ 'payflowpro_gateway-thankyou' => 'Ahsante kwa mchango wako!',
	9642	+ 'payflowpro_gateway-post-transaction' => 'Taarifa ya malipo',
9342	9643	'payflowpro_gateway-submit-button' => 'Michango',
	9644	+ 'payflowpro_gateway-cvv-explain' => '<h4>CVV ni nini?</h4>
	9645	+<p>Namba ya Kumthibitisha Mwenyekadi (CVV): Namba hii ina tarakimu tatu au nne. Namba inasaidia kuhakikisha kwamba yule anayelipa anaye kadi yenyewe papo hapo. Hii husaidia kuzuia matumizi yasiyoidhinishwa au ulaghai.</p>
	9646	+<h4>Visa, Mastercard</h4>
	9647	+<p>Namba yenye tarakimu 3 iko nyuma ya kadi yako, ndani ya eneo la sahihi.
	9648	+Kwa kawaida eneo la sahihi litakuwa na mlolongo wa namba, lakini ni tarakimu tatu za mwisho tu ambazo ni kodi ya CVV.</p>
	9649	+<h4>American Express</h4>
	9650	+<p>Kodi iko <i>juu</i> ya namba iliyotunishwa, yaani namba ya akaunti iliyopo upande wa mbele ya kadi.
	9651	+Wakati mwingine, kodi iko upande wa kushoto wa kadi, lakini <i>kila wakati</i> iko juu ya namba ya akaunti.</p><br />',
	9652	+ 'payflowpro_gateway-question-comment' => 'Maswali au maoni? Wasiliana na: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
	9653	+ 'payflowpro_gateway-donate-click' => 'Malipo ya kadi yako ya mkopo yatafanikiwa salama.',
	9654	+ 'payflowpro_gateway-otherways' => 'Kuna <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">njia zingine za kuchangia, kwa mfano kwa kupitia PayPal, kwa hundi, au kwa posta</a>.',
	9655	+ 'payflowpro_gateway-otherways-alt' => 'Kuna <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">njia zingine za kuchangia, kwa mfano kwa hundi</a>.',
	9656	+ 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Njia zingine za kuchangia</a>.',
	9657	+ 'payflowpro_gateway-credit-storage-processing' => 'Hatuhifadhi taarifa ya kadi yako ya mkopo, na taarifa juu yako binafsi iko chini ya <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">sera ya faragha</a> yetu.',
	9658	+ 'payflowpro_gateway-make-your-donation' => 'Changia sasa',
	9659	+ 'payflowpro_gateway-state-in-us' => 'kama ndani ya Marekani',
	9660	+ 'payflowpro_gateway-comment' => 'Maoni',
9343	9661	'payflowpro_gateway-first' => 'Kwanza',
	9662	+ 'payflowpro_gateway-middle' => 'la pili',
9344	9663	'payflowpro_gateway-last' => 'Mwisho',
	9664	+ 'payflowpro_gateway-other' => 'Nyingine',
	9665	+ 'payflowpro_gateway-anon-message' => 'Tafadhali andika jina langu katika orodha ya wafadhili iliyo wazi kwa umma.',
	9666	+ 'payflowpro_gateway-donate-wikipedia' => 'Changia kwenye Wikipedia',
	9667	+ 'payflowpro_gateway-or' => 'au',
	9668	+ 'payflowpro_gateway-your-information' => 'Taarifa juu yako',
	9669	+ 'payflowpro_gateway-mailing-address' => 'Anwani ya posta',
	9670	+ 'payflowpro_gateway-company-name' => 'Jina la kampuni au shirika',
	9671	+ 'payflowpro_gateway-address-1' => 'Anwani 1',
	9672	+ 'payflowpro_gateway-address-2' => 'Anwani 2',
	9673	+ 'payflowpro_gateway-address-lines' => 'Mistari ya anwani',
	9674	+ 'payflowpro_gateway-address-line-2' => 'Anwani (mstari wa 2)',
	9675	+ 'payflowpro_gateway-street-address' => 'Sanduku la posta',
	9676	+ 'payflowpro_gateway-street-address-line-2' => 'Anwani (mstari wa 2)',
	9677	+ 'payflowpro_gateway-street-1' => 'Anwani 1',
	9678	+ 'payflowpro_gateway-street-2' => 'Anwani 2',
	9679	+ 'payflowpro_gateway-city-town' => 'Mji/Jiji',
	9680	+ 'payflowpro_gateway-town-city' => 'Mji/Jiji',
	9681	+ 'payflowpro_gateway-zip-code' => 'Kodi ya posta',
	9682	+ 'payflowpro_gateway-zip-postal-code' => 'Kodi ya posta',
	9683	+ 'payflowpro_gateway-country' => 'Nchi',
	9684	+ 'payflowpro_gateway-select-country' => 'Chagua nchi',
	9685	+ 'payflowpro_gateway-confirm-email' => 'Thibitisha anwani ya barua pepe',
	9686	+ 'payflowpro_gateway-phone' => 'Simu',
	9687	+ 'payflowpro_gateway-telephone' => 'Namba ya simu',
	9688	+ 'payflowpro_gateway-telephone-home' => 'Simu (ya nyumbani)',
	9689	+ 'payflowpro_gateway-donation-information' => 'Taarifa ya mchango',
	9690	+ 'payflowpro_gateway-cc-billing-information' => 'Taarifa ya kudai kadi ya mkopo',
	9691	+ 'payflowpro_gateway-pay-by-credit-card' => 'Lipa kwa kupitia kadi ya mkopo',
	9692	+ 'payflowpro_gateway-which-card' => 'Chagua kadi utakayotumia',
	9693	+ 'payflowpro_gateway-choose-donation-method' => 'Chagua njia ya kulipa',
	9694	+ 'payflowpro_gateway-cardholders-name' => 'Jina la mwenyekadi',
	9695	+ 'payflowpro_gateway-name-on-card' => 'Jina kwenye kadi',
	9696	+ 'payflowpro_gateway-type-of-card' => 'Aina ya kadi',
	9697	+ 'payflowpro_gateway-cards-accepted' => 'Kadi zinazokubaliwa',
	9698	+ 'payflowpro_gateway-card-type' => 'Aina ya kadi',
	9699	+ 'payflowpro_gateway-credit-card-type' => 'Aina ya kadi ya mkopo',
	9700	+ 'payflowpro_gateway-credit-card-number' => 'Namba na kadi ya mkopo',
	9701	+ 'payflowpro_gateway-credit-card-number-abbreviated' => 'Namba ya kadi ya mkopo',
	9702	+ 'payflowpro_gateway-credit-card-expiration' => 'Tarehe itakayokwisha kadi ya mkopo',
	9703	+ 'payflowpro_gateway-card-expiration' => 'Tarehe itakayokwisha kadi',
	9704	+ 'payflowpro_gateway-select-month-of-expiration' => 'Chagua mwezi itakayokwisha',
	9705	+ 'payflowpro_gateway-select-year-of-expiration' => 'Chagua mwaka itakayokwisha',
	9706	+ 'payflowpro_gateway-expires-question' => 'Itakwisha?',
	9707	+ 'payflowpro_gateway-expires' => 'Itakwisha',
	9708	+ 'payflowpro_gateway-card-security-code' => 'Kodi ya usalama wa kadi',
	9709	+ 'payflowpro_gateway-cvv' => 'CVV',
	9710	+ 'payflowpro_gateway-cvv-number-abbreviated' => '# ya CVV',
	9711	+ 'payflowpro_gateway-cvv2' => 'CVV2',
	9712	+ 'payflowpro_gateway-cvv-number' => 'Namba ya CVV',
	9713	+ 'payflowpro_gateway-verification-number' => 'Namba ya kuthibitisha',
	9714	+ 'payflowpro_gateway-what-is-this' => 'Ni kitu gani?',
	9715	+ 'payflowpro_gateway-do-not-include-dashes' => 'Tafadhali usiandike alama za -',
	9716	+ 'payflowpro_gateway-please-donate-today' => 'Tafadhali changia leo',
	9717	+ 'payflowpro_gateway-donate-now' => 'Changia sasa',
	9718	+ 'payflowpro_gateway-please-select-gift-amount' => 'Tafadhali chagua kiasi cha mchango',
	9719	+ 'payflowpro_gateway-select-gift-amount' => 'Chagua kiasi cha mchango',
	9720	+ 'payflowpro_gateway-select-amount' => 'Chagua kiasi',
	9721	+ 'payflowpro_gateway-amount' => 'Kiasi',
	9722	+ 'payflowpro_gateway-make-a-donation' => 'Changia',
	9723	+ 'payflowpro_gateway-enter-your-amount' => 'Au ingiza kiasi cha mchango katika sanduku la juu',
	9724	+ 'payflowpro_gateway-will-support-with-gift' => 'Nitatoa mchango wa:',
	9725	+ 'payflowpro_gateway-select-dollar-amount' => 'Kuchagua kiasi cha dola',
	9726	+ 'payflowpro_gateway-submit-my-secure-donation' => 'Wasilisha mchango wangu salama',
	9727	+ 'payflowpro_gateway-next' => 'Ijayo',
	9728	+ 'payflowpro_gateway-continue' => 'Endelea',
	9729	+ 'payflowpro_gateway-cancel' => 'Batilisha',
	9730	+ 'payflowpro_gateway-payment' => 'Malipo',
	9731	+ 'payflowpro_gateway-payment-type' => 'Aina ya malipo',
	9732	+ 'payflowpro_gateway-please-complete' => 'Tafadhali kamilisha mchango wako chini ...',
	9733	+ 'payflowpro_gateway-description' => 'Maelezo',
	9734	+ 'payflowpro_gateway-donation' => 'Mchango',
	9735	+ 'payflowpro_gateway-email-receipt' => 'Stakabadhi iende kwa barua pepe ya',
	9736	+ 'payflowpro_gateway-state-dropdown-YY' => 'Chagua Jimbo',
	9737	+ 'payflowpro_gateway-state-dropdown-XX' => 'Nje ya Marekani',
9345	9738	);
9346	9739
9347	9740	/** Tamil (தமிழ்)
—	—	@@ -9867,15 +10260,17 @@
9868	10261	* @author Vito Genovese
9869	10262	*/
9870	10263	$messages['tr'] = array(
9871		~~- 'payflowprogateway' => "Wikimedia'yı destekleyin",~~
	10264	+ 'payflowprogateway' => 'Bağışınızı şimdi yapın',
9872	10265	'payflowpro_gateway-desc' => 'PayPal Payflow Pro kredi kartı işlemi',
9873	10266	'payflowpro_gateway-accessible' => 'Bu sayfa sadece bağış sayfasından erişilebilirdir.',
9874		~~- 'payflowpro_gateway-form-message' => 'Kredi kartınızla katkıda bulunun.',~~
	10267	+ 'payflowpro_gateway-form-message' => 'Kredi kartıyla bağış yapmak için aşağıdaki formu doldurun, yada',
	10268	+ 'payflowpro_gateway-paypal-button' => 'PayPal ile bağış yap',
	10269	+ 'payflowpro_gateway-cc-button' => 'Kredi kartı ile bağış yap',
9875	10270	'payflowpro_gateway-form-message-2' => 'Miktarı ya da para birimini değiştirmek için <a href="https://www.mediawiki.org/index.php?title=Donate">bağış sayfasına</a> geri dönün',
9876	10271	'payflowpro_gateway-donor-legend' => 'Bağışçı bilgisi',
9877	10272	'payflowpro_gateway-card-legend' => 'Kredi kartı bilgisi',
9878	10273	'payflowpro_gateway-amount-legend' => 'Bağış miktarı:',
9879		~~- 'payflowpro_gateway-cvv-link' => 'Örnek',~~
	10274	+ 'payflowpro_gateway-cvv-link' => 'Bu nerededir?',
9880	10275	'payflowpro_gateway-donor-amount' => 'Miktar:',
9881	10276	'payflowpro_gateway-donor-currency-label' => 'Para birimi:',
9882	10277	'payflowpro_gateway-donor-email' => 'E-posta adresi:',
—	—	@@ -9895,6 +10290,7 @@
9896	10291	'payflowpro_gateway-donor-security' => 'Güvenlik kodu:',
9897	10292	'payflowpro_gateway-donor-submit' => 'Bağışla',
9898	10293	'payflowpro_gateway-donor-currency-msg' => 'Bu bağış $1 para biriminde yapılıyor',
	10294	+ 'payflow_gateway-error-msg-nopaypal' => "Teknik bir hatadan dolayı, isteğinizi PayPal'a gönderemedik. Lütfen her zamanki kredi kartı bağış formumuzu kullanmayı deneyin.",
9899	10295	'payflowpro_gateway-error-msg' => 'Şu alan gereklidir: $1',
9900	10296	'payflowpro_gateway-error-msg-js' => 'Girilmesi istenen bilginiz:',
9901	10297	'payflowpro_gateway-error-msg-invalid-amount' => 'Lütfen geçerli bir miktar girin',
—	—	@@ -9914,6 +10310,8 @@
9915	10311	'payflowpro_gateway-error-msg-card_num' => 'kredi kartı numarası',
9916	10312	'payflowpro_gateway-error-msg-expiration' => 'kartın son kullanma tarihi',
9917	10313	'payflowpro_gateway-error-msg-cvv' => 'Kartınızın arkasındaki CVV',
	10314	+ 'payflowpro_gateway-error-msg-captcha' => 'Girdiğiniz Captcha değeri yanlış. Lütfen tekrar deneyin.',
	10315	+ 'payflowpro_gateway-error-msg-captcha-please' => 'Kredi kartı güvenliğiniz için, lütfen yukarıda gördüğünüz karakterleri girin.',
9918	10316	'payflowpro_gateway-response-0' => 'İşleminiz onaylandı.
9919	10317	Bağışınız için teşekkürler!',
9920	10318	'payflowpro_gateway-response-126' => 'İşleminiz onay bekliyor.',
—	—	@@ -9930,7 +10328,7 @@
9931	10329	'payflowpro_gateway-response-125-2' => 'Kredi kartınız doğrulanamadı. Lütfen verdiğiniz tüm bilgilerin kredi kartınız profiliniz ile ile uyuştuğunu doğrulayın, ya da farklı bir kart deneyin. Ayrıca, <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">vermenin diğer yolları\'nı</a> kullanabilir ya da bizimle <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a> adresinde ilteişime geçebilirsiniz. Desteğiniz için teşekkürler.',
9932	10330	'payflowpro_gateway-response-default' => 'İşleminiz işlenirken bir hata oluştu.
9933	10331	Lütfen daha sonra tekrar deneyin.',
9934		~~- 'php-response-declined' => 'İşleminiz reddedildi.',~~
	10332	+ 'php-response-declined' => 'İşleminiz kabul edilmedi.',
9935	10333	'payflowpro_gateway-thankyou' => 'Bağışınız için teşekkürler!',
9936	10334	'payflowpro_gateway-post-transaction' => 'İşlem detayları',
9937	10335	'payflowpro_gateway-submit-button' => 'Bağışla',
—	—	@@ -9942,9 +10340,109 @@
9943	10341	<h4>American Express</h4>
9944	10342	<p>Kod <i>her zaman</i> kartın yüzündeki kabartmalı (yükseltilmiş) hesap numarasının <i>üstündedir</i>.
9945	10343	Bazı durumlarda, kod kartın sol tarafındadır, ama her zaman hesap numarasının üstündedir.</p><br />',
9946		- 'payflowpro_gateway-question-comment' => 'Wikipedia, Wikimedia Vakfı\'nın bir projesidir. Soru veya yorum? Wikimedia Vakfı ile irtibat kurun: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
9947		~~- 'payflowpro_gateway-donate-click' => '"{{int:payflowpro_gateway-donor-submit}}" düğmesine tıkladıktan sonra, kredi kartı bilginiz işlenecektir.',~~
	10344	+ 'payflowpro_gateway-question-comment' => 'Soru veya yorum? İrtibat için: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
	10345	+ 'payflowpro_gateway-donate-click' => 'Kredi kartınız güvenli bir şekilde işlenecektir.',
	10346	+ 'payflowpro_gateway-otherways' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Bağış için başka yollar da vardır, PayPal, çek ya da posta gibi</a>.',
	10347	+ 'payflowpro_gateway-otherways-alt' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Bağış için başka yollar da vardır</a>, çek gibi.',
	10348	+ 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Bağış için başka yollar</a>',
	10349	+ 'payflowpro_gateway-paypal' => 'PayPal hesabınız mı var? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">PayPal ile bağış yapın</a>.',
9948	10350	'payflowpro_gateway-credit-storage-processing' => 'Kredi kartı bilginizi saklamıyoruz, ve kişisel veriniz <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">gizlilik ilkemize</a> tabidir.',
	10351	+ 'payflowpro_gateway-token-mismatch' => 'Oturumunuz sona erdi. Lütfen formu tekrar doldurup göndermeyi deneyin.',
	10352	+ 'payflowpro_gateway-cc-form-header-personal' => 'Fatura bilgileri',
	10353	+ 'payflowpro_gateway-cc-form-header-payment' => 'Ödeme bilgileri',
	10354	+ 'payflowpro_gateway-make-your-donation' => 'Bağışınızı şimdi yapın',
	10355	+ 'payflowpro_gateway-state-in-us' => 'ABD içinde ise',
	10356	+ 'payflowpro_gateway-comment' => 'Yorum',
	10357	+ 'payflowpro_gateway-first' => 'İlk',
	10358	+ 'payflowpro_gateway-middle' => 'Orta',
	10359	+ 'payflowpro_gateway-last' => 'Son',
	10360	+ 'payflowpro_gateway-other' => 'Diğer',
	10361	+ 'payflowpro_gateway-noscript-msg' => 'JavScript etkin değil gibi görünüyor, yada tarayıcınız desteklemiyor.
	10362	+Güvenli, emniyetli ve güzel bir deneyim sağlamak için, bağış formumuzda JavaScript gereklidir.',
	10363	+ 'payflowpro_gateway-noscript-redirect-msg' => 'Javascript etkinleştirmek istemiyorsanız yada yapamıyorsanız, şurayı ziyaret ederek katkıda bulunabilirsiniz:',
	10364	+ 'payflowpro_gateway-anon-message' => 'Lütfen ismimi umumi bağışçı listesinde listeleyin.',
	10365	+ 'payflowpro_gateway-donate-wikipedia' => "Vikipedi'ye bağış yapın",
	10366	+ 'payflowpro_gateway-or' => 'yada',
	10367	+ 'payflowpro_gateway-your-information' => 'Bilgileriniz',
	10368	+ 'payflowpro_gateway-mailing-address' => 'Posta adresi',
	10369	+ 'payflowpro_gateway-billing-address' => 'Fatura adresi',
	10370	+ 'payflowpro_gateway-billing-name' => 'Fatura adı',
	10371	+ 'payflowpro_gateway-title' => 'Başlık',
	10372	+ 'payflowpro_gateway-suffix' => 'Sonek',
	10373	+ 'payflowpro_gateway-company-name' => 'Şirket ya da kuruluş adı',
	10374	+ 'payflowpro_gateway-address-1' => 'Adres 1',
	10375	+ 'payflowpro_gateway-address-2' => 'Adres 2',
	10376	+ 'payflowpro_gateway-address-lines' => 'Adres satırları',
	10377	+ 'payflowpro_gateway-address-line-2' => 'Adres (2. satır)',
	10378	+ 'payflowpro_gateway-street-address' => 'Sokak adresi',
	10379	+ 'payflowpro_gateway-street-address-line-2' => 'Sokak adresi (2. satır)',
	10380	+ 'payflowpro_gateway-street-1' => 'Sokak 1',
	10381	+ 'payflowpro_gateway-street-2' => 'Sokak 2',
	10382	+ 'payflowpro_gateway-apartment-number' => 'Apt. #',
	10383	+ 'payflowpro_gateway-city-town' => 'Şehir/Kasaba',
	10384	+ 'payflowpro_gateway-town-city' => 'Kasaba/Şehir',
	10385	+ 'payflowpro_gateway-state-province' => 'Eyalet/İl',
	10386	+ 'payflowpro_gateway-zip' => 'Posta kodu',
	10387	+ 'payflowpro_gateway-zip-code' => 'Posta kodu',
	10388	+ 'payflowpro_gateway-zip-postal' => 'Posta kodu',
	10389	+ 'payflowpro_gateway-zip-postal-code' => 'Zip/posta kodu',
	10390	+ 'payflowpro_gateway-billing-code' => 'Fatura posta kodu',
	10391	+ 'payflowpro_gateway-country' => 'Ülke',
	10392	+ 'payflowpro_gateway-select-country' => 'Ülke seçin',
	10393	+ 'payflowpro_gateway-confirm-email' => 'E-posta onaylayın',
	10394	+ 'payflowpro_gateway-confirmation-email' => 'Doğrulama e-postası',
	10395	+ 'payflowpro_gateway-phone' => 'Telefon',
	10396	+ 'payflowpro_gateway-telephone' => 'Telefon',
	10397	+ 'payflowpro_gateway-telephone-home' => 'Tel. (Ev)',
	10398	+ 'payflowpro_gateway-billing-phone-number' => 'Fatura telefon numarası',
	10399	+ 'payflowpro_gateway-donation-information' => 'Bağış bilgileri',
	10400	+ 'payflowpro_gateway-cc-billing-information' => 'Kredi kartı fatura bilgileri',
	10401	+ 'payflowpro_gateway-pay-by-credit-card' => 'Kredi kartı ile öde',
	10402	+ 'payflowpro_gateway-which-card' => 'Hangi kartı kullanmak istiyorsunuz',
	10403	+ 'payflowpro_gateway-choose-donation-method' => 'Bağış yöntemi seçin',
	10404	+ 'payflowpro_gateway-cardholders-name' => 'Kart sahibinin adı',
	10405	+ 'payflowpro_gateway-name-on-card' => 'Kart üzerindeki isim',
	10406	+ 'payflowpro_gateway-type-of-card' => 'Kart türü',
	10407	+ 'payflowpro_gateway-cards-accepted' => 'Kabul edilen kartlar',
	10408	+ 'payflowpro_gateway-card-type' => 'Kart türü',
	10409	+ 'payflowpro_gateway-credit-card-type' => 'Kredi kartı türü',
	10410	+ 'payflowpro_gateway-credit-card-number' => 'Kredi kartı numarası',
	10411	+ 'payflowpro_gateway-credit-card-number-abbreviated' => 'Kredi kartı #',
	10412	+ 'payflowpro_gateway-credit-card-expiration' => 'Kredi kartı son kullanma tarihi',
	10413	+ 'payflowpro_gateway-card-expiration' => 'Kart son kullanma tarihi',
	10414	+ 'payflowpro_gateway-select-month-of-expiration' => 'Btişi ayını seçin',
	10415	+ 'payflowpro_gateway-select-year-of-expiration' => 'Bitiş yılını seçin',
	10416	+ 'payflowpro_gateway-expires-question' => 'Bitiş tarihi?',
	10417	+ 'payflowpro_gateway-expires' => 'Bitiş tarihi',
	10418	+ 'payflowpro_gateway-card-security-code' => 'Kart güvenlik kodu',
	10419	+ 'payflowpro_gateway-cvv' => 'CVV',
	10420	+ 'payflowpro_gateway-cvv-number-abbreviated' => 'CVV #',
	10421	+ 'payflowpro_gateway-cvv2' => 'CVV2',
	10422	+ 'payflowpro_gateway-cvv-number' => 'CVV numarası',
	10423	+ 'payflowpro_gateway-verification-number' => 'Doğrulama numarası',
	10424	+ 'payflowpro_gateway-what-is-this' => 'Bu nedir?',
	10425	+ 'payflowpro_gateway-do-not-include-dashes' => 'Lütfen tire eklemeyin',
	10426	+ 'payflowpro_gateway-please-donate-today' => 'Lütfen bugün bağış yapın',
	10427	+ 'payflowpro_gateway-donate-now' => 'Şimdi bağış yapın',
	10428	+ 'payflowpro_gateway-please-select-gift-amount' => 'Lütfen bir hediye miktarı seçin',
	10429	+ 'payflowpro_gateway-select-gift-amount' => 'Hediye miktarı seçin',
	10430	+ 'payflowpro_gateway-select-amount' => 'Miktarı seçin',
	10431	+ 'payflowpro_gateway-amount' => 'Miktar',
	10432	+ 'payflowpro_gateway-make-a-donation' => 'Bir bağışta bulunun',
	10433	+ 'payflowpro_gateway-enter-your-amount' => 'Ya da, yukarıdaki kutuya miktarınızı girin',
	10434	+ 'payflowpro_gateway-select-dollar-amount' => 'Dolar miktarını seçin',
	10435	+ 'payflowpro_gateway-submit-my-secure-donation' => 'Güvenli bağışımı gönderin',
	10436	+ 'payflowpro_gateway-next' => 'Sonraki',
	10437	+ 'payflowpro_gateway-continue' => 'Devam',
	10438	+ 'payflowpro_gateway-cancel' => 'İptal',
	10439	+ 'payflowpro_gateway-payment' => 'Ödeme',
	10440	+ 'payflowpro_gateway-payment-type' => 'Ödeme türü',
	10441	+ 'payflowpro_gateway-please-complete' => 'Lütfen aşağıdaki bağışınızı tamamlayın ...',
	10442	+ 'payflowpro_gateway-description' => 'Açıklama',
	10443	+ 'payflowpro_gateway-donation' => 'Bağış',
	10444	+ 'payflowpro_gateway-email-receipt' => 'E-posta makbuzu alıcısı',
	10445	+ 'payflowpro_gateway-state-dropdown-YY' => 'Bir eyalet seçin',
	10446	+ 'payflowpro_gateway-state-dropdown-XX' => 'ABD dışında',
9949	10447	);
9950	10448
9951	10449	/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic))
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
—	—	@@ -31,10 +31,12 @@
32	32	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoColumnLetter4' ] = $dir . 'forms/TwoColumnLetter4.php';
33	33	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoColumnLetter5' ] = $dir . 'forms/TwoColumnLetter5.php';
34	34	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoColumnLetter6' ] = $dir . 'forms/TwoColumnLetter6.php';
	35	+$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoColumnLetter7' ] = $dir . 'forms/TwoColumnLetter7.php';
35	36	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter' ] = $dir . 'forms/TwoStepTwoColumnLetter.php';
36	37	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetterCA' ] = $dir . 'forms/TwoStepTwoColumnLetterCA.php';
37	38	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter2' ] = $dir . 'forms/TwoStepTwoColumnLetter2.php';
38	39	$wgAutoloadClasses[ 'PayflowProGateway_Form_TwoStepTwoColumnLetter3' ] = $dir . 'forms/TwoStepTwoColumnLetter3.php';
	40	+$wgAutoloadClasses[ 'PayflowProGateway_Form_RapidHtml' ] = $dir . 'forms/RapidHtml.php';
39	41	$wgAutoloadClasses[ 'PayflowProGateway_Form_SingleColumn' ] = $dir . 'forms/SingleColumn.php';
40	42	$wgExtensionMessagesFiles['PayflowProGateway'] = $dir . 'payflowpro_gateway.i18n.php';
41	43	$wgExtensionMessagesFiles['PayflowProGatewayCountries'] = $dir . 'payflowpro_gateway.countries.i18n.php';
—	—	@@ -122,6 +124,12 @@
123	125	$wgPayflowSMaxAge = 6000;
124	126
125	127	/**
	128	+ * Directory for HTML forms (used by RapidHtml form class)
	129	+ * @var string
	130	+ */
	131	+$wgPayflowHtmlFormDir = dirname( __FILE__ ) . "/forms/html";
	132	+
	133	+/**
126	134	* Hooks required to interface with the donation extension (include <donate> on page)
127	135	*
128	136	* gwValue supplies the value of the form option, the name that appears on the form
Index: branches/fundraising/deployment/DonationInterface/donate_interface/donate_interface.i18n.php
—	—	@@ -65,6 +65,20 @@
66	66	'donate_interface-comment-label' => '{{Identical\|Comment}}',
67	67	);
68	68
	69	+/** Angika (अंगिका)
	70	+ * @author Angpradesh
	71	+ */
	72	+$messages['anp'] = array(
	73	+ 'donate_interface' => 'विकिपीडिया कॆ मदद करॊ',
	74	+ 'donate_interface-desc' => 'गेटवे विस्तारयुक्त दान पृष्ठ',
	75	+ 'donate_interface-intro' => 'कृपा करी कॆ भुगतान विधि, राशि आरू मुद्रा चुनॊ.',
	76	+ 'donate_interface-amount' => 'दान राशि',
	77	+ 'donate_interface-other-amount' => 'अन्य राशि',
	78	+ 'donate_interface-currency' => 'मुद्रा',
	79	+ 'donate_interface-gateway' => 'भुगतान विधि',
	80	+ 'donate_interface-submit-button' => 'दान करॊ',
	81	+);
	82	+
69	83	/** Afrikaans (Afrikaans)
70	84	* @author Naudefj
71	85	*/
—	—	@@ -1296,7 +1310,7 @@
1297	1311	'donate_interface-comment-message' => 'Hai un pensiero da condividere con il mondo? Inserisci massimo 200 caratteri qui:',
1298	1312	'donate_interface-comment-label' => 'Commenti:',
1299	1313	'donate_interface-anon-message' => "Indica il mio nome, accanto al mio commento, nell'elenco pubblico dei donatori.",
1300		~~- 'donate_interface-email-agreement' => 'Accetto di ricevere in futuro le newsletter o e-mail da Wikimedia Foundation.',~~
	1314	+ 'donate_interface-email-agreement' => 'Accetto di ricevere aggiornamenti occasionali dalla Wikimedia Foundation.',
1301	1315	'donate_interface-comment-title' => 'Commento pubblico',
1302	1316	'donate_interface-amount-error' => 'Si prega di inserire un importo valido',
1303	1317	'donate_interface-GBP' => 'GBP: Sterlina inglese',
—	—	@@ -1746,6 +1760,21 @@
1747	1761	* @author Servien
1748	1762	*/
1749	1763	$messages['nds-nl'] = array(
	1764	+ 'donate_interface' => 'Steun Wikimedia',
	1765	+ 'donate_interface-desc' => 'Laandingspagina veur donasies dee integreert mit gateway-uutbreidingen',
	1766	+ 'donate_interface-intro' => 'Kies een betaolingsmethode, bedrag en munteenheid.',
	1767	+ 'donate_interface-amount' => 'Bedrag:',
	1768	+ 'donate_interface-other-amount' => 'Aander bedrag',
	1769	+ 'donate_interface-currency' => 'Munteenheid:',
	1770	+ 'donate_interface-gateway' => 'Betaolingsmethode:',
	1771	+ 'donate_interface-submit-button' => 'Geld geven',
	1772	+ 'donate_interface-comment-message' => 'Wi-j een gedachte delen mit de wereld? Hieronder ku-j tot tweehonderd kerakters kwiet:',
	1773	+ 'donate_interface-comment-label' => 'Opmarking:',
	1774	+ 'donate_interface-anon-message' => 'Laot mien naam zien naos mien opmarking in de peblieke geldschieterslieste.',
	1775	+ 'donate_interface-email-agreement' => 'Ik stem dermee in da-k netposberichen kriege van de Wikimedia Foundation.',
	1776	+ 'donate_interface-comment-title' => 'Peblieke opmarking',
	1777	+ 'donate_interface-amount-error' => 'Vul een bedrag in',
	1778	+ 'donate_interface-processing-error' => "Der is wat verkeerd egaon bie 't verwarken van joew verzeuk. Der is gien verwarkingsdiens beschikbaor.",
1750	1779	'donate_interface-GBP' => 'GBP: Britse pond',
1751	1780	'donate_interface-EUR' => 'EUR: Euro',
1752	1781	'donate_interface-USD' => 'USD: Amerikaanse dollar',
—	—	@@ -2442,7 +2471,7 @@
2443	2472	'donate_interface-comment-message' => 'Har du en tanke att dela med världen? Skriv upp till 200 tecken här:',
2444	2473	'donate_interface-comment-label' => 'Kommentar:',
2445	2474	'donate_interface-anon-message' => 'Visa mitt namn (bredvid min kommentar) på den offentliga givarlistan.',
2446		~~- 'donate_interface-email-agreement' => 'Jag accepterar att ta emot framtida nyhetsbrev eller e-post från Wikimedia Foundation.',~~
	2475	+ 'donate_interface-email-agreement' => 'Jag accepterar att ta emot sporadiska uppdateringar från Wikimedia Foundation.',
2447	2476	'donate_interface-comment-title' => 'Offentlig kommentar',
2448	2477	'donate_interface-amount-error' => 'Ange ett giltigt belopp',
2449	2478	'donate_interface-processing-error' => 'Det uppstod ett fel när din begäran behandlades.
—	—	@@ -2466,6 +2495,39 @@
2467	2496	'donate_interface-ILS' => 'ILS: Israeliska shekel',
2468	2497	);
2469	2498
	2499	+/** Swahili (Kiswahili)
	2500	+ * @author Lloffiwr
	2501	+ * @author Muddyb Blast Producer
	2502	+ */
	2503	+$messages['sw'] = array(
	2504	+ 'donate_interface' => 'Saidia Wikimedia',
	2505	+ 'donate_interface-desc' => 'Ukurasa wa kwanza wa kuchangia, inayofungamana programu za milango ya malipo',
	2506	+ 'donate_interface-intro' => 'Tafadhali chagua njia ya kulipa, kiasi, na aina ya fedha.',
	2507	+ 'donate_interface-amount' => 'Kiasi cha mchango:',
	2508	+ 'donate_interface-other-amount' => 'Kiasi kingine',
	2509	+ 'donate_interface-currency' => 'Fedha:',
	2510	+ 'donate_interface-gateway' => 'Njia ya kulipa:',
	2511	+ 'donate_interface-submit-button' => 'Changia',
	2512	+ 'donate_interface-comment-message' => 'Una maoni unayotaka kugawana na dunia? Andika herufi hadi 200 hapa:',
	2513	+ 'donate_interface-comment-label' => 'Maoni:',
	2514	+ 'donate_interface-anon-message' => 'Tafadhali andika jina langu (kando ya maoni yangu) katika orodha ya wachangiaji inayotolewa kwa watu wote.',
	2515	+ 'donate_interface-email-agreement' => 'Nakubali nipokee taarifa mara kwa mara kutoka Wikimedia Foundation.',
	2516	+ 'donate_interface-comment-title' => 'Maoni yatakayotolewa kwa watu wote',
	2517	+ 'donate_interface-amount-error' => 'Tafadhali ingiza kiasi halali',
	2518	+ 'donate_interface-processing-error' => 'Imetokea hitilafu wakati wa kufanyika ombi lako.
	2519	+Mashine ya kufanyika malipo haipatikani.',
	2520	+ 'donate_interface-GBP' => 'GBP: Pauni ya Uingereza',
	2521	+ 'donate_interface-EUR' => 'EUR: Euro',
	2522	+ 'donate_interface-USD' => 'USD: Dola ya U.S.A.',
	2523	+ 'donate_interface-AUD' => 'AUD: Dola ya Australia',
	2524	+ 'donate_interface-CAD' => 'CAD: Dola ya Kanada',
	2525	+ 'donate_interface-CZK' => 'CZK: Koruna ya Ucheki',
	2526	+ 'donate_interface-DKK' => 'DKK: Krone ya Udeni',
	2527	+ 'donate_interface-HKD' => 'HKD: Dola ya Hong Kong',
	2528	+ 'donate_interface-NZD' => 'NZD: Dola ya New Zealand',
	2529	+ 'donate_interface-SGD' => 'SGD: Dola ya Singapore',
	2530	+);
	2531	+
2470	2532	/** Tamil (தமிழ்)
2471	2533	* @author TRYPPN
2472	2534	*/
—	—	@@ -2617,9 +2679,7 @@
2618	2680	'donate_interface-comment-message' => 'Dünya ile paylaşacak bir düşünceniz mi var? Buraya 200 karaktere kadar yazabilirsiniz:',
2619	2681	'donate_interface-comment-label' => 'Yorum:',
2620	2682	'donate_interface-anon-message' => 'Lütfen adımı (yorumumun yanına) umumi bağışçı listesinde listeleyin.',
2621		~~- 'donate_interface-email-agreement' => "İleride Wikimedi Foundation haber postalarını ya da e-postalarını almayı kabul ediyorum.~~
2622		~~-Bilgilerinizi asla satmayız ya da ticaret yapmayız.~~
2623		~~-Bağışçı gizlilik poltikamız <a title='Donate/Donor Privacy' href='/wiki/Donate/Donor_Privacy'>burada</a> bulunabilir.",~~
	2683	+ 'donate_interface-email-agreement' => "Wikimedia Foundation'dan arasıra yapılan güncellemeleri almayı kabul ediyorum.",
2624	2684	'donate_interface-comment-title' => 'Umumi yorum',
2625	2685	'donate_interface-amount-error' => 'Lütfen geçerli bir yorum girin',
2626	2686	'donate_interface-processing-error' => 'İsteğinizin işlenmesinde bir hata oluştu.
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
2627	2687	Merged /trunk/extensions/DonationInterface:r77041-77173

Follow-up revisions

Revision	Commit summary	Author	Date
r77179	Merging from r77174 thru r77178 of trunk	awjrichards	20:05, 23 November 2010

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r77040	Fixed trailing comma.	tparscal	22:35, 19 November 2010
r77173	new 1-step form	kaldari	18:43, 23 November 2010

Status & tagging log

12:51, 8 December 2010 Reedy (talk | contribs) changed the status of r77174 [removed: new added: deferred]